gentoo resync : 18.11.2019

297 files changed, 2969 insertions, 2553 deletions

diff --git a/dev-python/GridDataFormats/GridDataFormats-0.4.0.ebuild b/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild
index df56899b8a3e..8fa5ff05c2ea 100644
--- a/dev-python/GridDataFormats/GridDataFormats-0.4.0.ebuild
+++ b/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ LICENSE="LGPL-3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	>=dev-python/numpy-1.0.3[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]"
diff --git a/dev-python/GridDataFormats/Manifest b/dev-python/GridDataFormats/Manifest
index 21815a565755..35c64cc50a7e 100644
--- a/dev-python/GridDataFormats/Manifest
+++ b/dev-python/GridDataFormats/Manifest
@@ -1,3 +1,3 @@
 DIST GridDataFormats-0.4.0.tar.gz 63643 BLAKE2B cbc0bc259c30c9eccf61b11a7ed6e8004979fe2adb2b049f137caddbb71190291011664462c2c1aa4fe2baf822102d59d3079e9e48620b76d37a4812ca150328 SHA512 b480293e2dd17cb484336aa1469a8f0e739fbe7d925190f6a6502e96d0ab26a36271b0a0676c711716abd3e025e86fbec961cf965e950f89be167e0a83ef904c
-EBUILD GridDataFormats-0.4.0.ebuild 617 BLAKE2B c991324f33c73c27ba3fa4e353b4f4989d2c695e448f18b17d8a7f2d437affdbf99ca4e82363c0a846cef94bb47c1c87746233d8e53935a19ca481cba93a6271 SHA512 f759b99915137b863540f3ffbbb544d6f36a1342aa1500a14516f0ee071d52aba0715941d4cd0f91143cc545ea7484b0d04c444a0998f20ee57896f0882fa340
-MISC metadata.xml 409 BLAKE2B db4d61405b860e8c4f2623bfc4368602daf282d4f9ea847d93c61e471b92c05d394ff537219ae9303f9c6b96c7e1ed1ffbfedd89c04f4c8894f600efbded9c2e SHA512 df3e3ac019c5e6c7f40fc2ff42f22d43c2b70c1a4af159e3c05fe828148cbb2d0d48223201a7a35526a5fdb9bb289bb851d61479dfa6d1bd56f0ff830b35ec6d
+EBUILD GridDataFormats-0.4.0-r1.ebuild 621 BLAKE2B 729b32ee16058728dabd9f653e7eb2dcb832d346252d40b60c2e56818e228a7ef004a1bcdcaba9dc14b93a7c330b97904208f1a3e362b2ab653b81e105acc610 SHA512 baedfa7d2f83d783f0334748a472b45503da1ae5a01a49a8e4d11c5086fd2124fdc0787484d8a06081a49fa2e2faa7165fc13d0839410069cd03fc16dbed72ab
+MISC metadata.xml 506 BLAKE2B 55c662f902e8cb3b70a60da0eb8925e36c762b1fca2987445ec0535c2176c2dbff03fc4eda6f742d94adb40f08d96bbfd24b2d62e2eb148c13a4c9175225f06f SHA512 b5dcea13ad76570e3fd89f7771b42b380fc66954a1a0849240b353382c9eb333df7a48ccee1514b0f32c80e458d6242a9c50c9630aa004f0c000a48400550bb9
diff --git a/dev-python/GridDataFormats/metadata.xml b/dev-python/GridDataFormats/metadata.xml
index cc867877923b..d38019a78463 100644
--- a/dev-python/GridDataFormats/metadata.xml
+++ b/dev-python/GridDataFormats/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">GridDataFormats</remote-id>
-    <remote-id type="github">MDAnalysis/GridDataFormats</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>alexxy@gentoo.org</email>
+		<name>Alexey Shvetsov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">GridDataFormats</remote-id>
+		<remote-id type="github">MDAnalysis/GridDataFormats</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 21b95d105b74..297aee9a9cd8 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyContracts/Manifest b/dev-python/PyContracts/Manifest
index 1320055694ea..64b2803ebb26 100644
--- a/dev-python/PyContracts/Manifest
+++ b/dev-python/PyContracts/Manifest
@@ -1,5 +1,7 @@
 DIST PyContracts-1.7.9.tar.gz 61033 BLAKE2B 5202d39c91d7dff6e07058f3f7dcc29baa750f69ed9b4abb059de67f3be98e568270eb3d977a6e7a18f232880225fcc532fbd576e94dc3483bde9b8fbe68d526 SHA512 1db6491d4be3df96753dcdd6f85329d47409a2424177a52d1e35f5a1d58f671290d22d807b70f632f0376c86c58c093118f7223b7ad59893a85dccdb91d29f50
 DIST PyContracts-1.8.0.tar.gz 90577 BLAKE2B 988662274e3bbea1ede6d00f4a69b3eb23dad439f5355a9b0a2c5a2f76a6250254303b060ef720d13d9a297ded77f7713271a79a810227aa883dc6d4d46ea725 SHA512 7de933dc8b5992be670b4b34fce7d6f51769d3d2dd02a2400eff5991e9e686e36791234588d2dbdeccf437fd5d6abc6461240645e6d3f665394f390bb727413a
+DIST PyContracts-1.8.12.tar.gz 91393 BLAKE2B 083c836a547540f2505cbc02c8696ad2ae236a9ba46529cc60d237c01bd113cb5a9d2729a70038e28f4a6f776cb17b119bdf9ae8dcd6269cbcd05412413aa758 SHA512 9abd5ab5203687ddd8a738998e63e8f3e397b9ba9b9ee22bda945dab4f0d460115ed8e825c9c551d4c067b0f39dbb5b8ca51d365623b10ee8e210efc4edcbf15
 EBUILD PyContracts-1.7.9.ebuild 1040 BLAKE2B 7a37d4f1acc224dee1ae15b66e1ea055ace964f0c08889c6b8e0583b42649ef80d2390b6df8c4b8d7961c294cb8b608d84eb6fcec9eec770c3bf522f01df0dca SHA512 dadbafcc066284347afad43e831ab310f7268a195897daa659668148c7e22216cd33f400dba07af05671108b58080d95237a938d39d8ab7dcaca47f3032728b7
 EBUILD PyContracts-1.8.0.ebuild 1042 BLAKE2B 8ea742711a93342691b5c447ea1d737813c50c60c09a7c7960fa57271b03286becba44c564f5db4eaaa4f4e76e543170a6b6dd9f8e9a68a41aae337f3d920137 SHA512 172994c5817fdbd062f3122cce9ef8824b70cb2010191fd07df6124cd77ea86eb1e5a1f4b84b40a53fefd41ece25e2fb6b5903fb82117b687245c36f441c49b3
+EBUILD PyContracts-1.8.12.ebuild 1077 BLAKE2B 9b87f4742e3a8ecdd96ee875fa7ef27ed5d5a3bafad49374e40e00d20131215530749efb5301cc8a486e390be49acf51d3a6b07407ddf42dc3137445aeffb10b SHA512 7bc0d0b7802dde659c04ba7d990f4bdb59d2ef7680e0c1d739c8ad6805efb0481678010ff9cebfca4e56ac4101e5dfe5e323a3bdd1720fc8acd1246b60575f54
 MISC metadata.xml 387 BLAKE2B e1a27603eeb8fdd909b3b7d8052c69b4f0c4aae087140d36e5b49ce470ee486706fa3bd6a8fea1354a50c17499157e540e3e9ed514802b9cb2640b396905b500 SHA512 b4c9caf597b04617af6bc61357be01e6687ba5b45258dc2f76bf02e3dbc126afe2f44e1298bf62ef502110a56cf6f0932fbe7b1a043a99a61a4d56a87ca17b27
diff --git a/dev-python/PyContracts/PyContracts-1.8.12.ebuild b/dev-python/PyContracts/PyContracts-1.8.12.ebuild
new file mode 100644
index 000000000000..977b82d3faca
--- /dev/null
+++ b/dev-python/PyContracts/PyContracts-1.8.12.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Declare constraints on function parameters and return values"
+HOMEPAGE="https://andreacensi.github.com/contracts/ https://pypi.org/project/PyContracts/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	nosetests -v \
+		$(python_is_python3 || echo "--ignore-files=test_py3k_annotations.py") \
+		|| die
+}
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index 5dc1fd8818ca..1ebcbe928696 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,7 +1,5 @@
 DIST sip-4.19.17.tar.gz 1056156 BLAKE2B b5a7b4cd3f2152e9b7ee7b715c3ad72c2092598e0405cefc24d6283e9da07e54fd65da89e137618d3b84f3138fff719cf226600135d646e7bd7c538c2a02cdfd SHA512 d393cfc1643663926bd315a8df92abd82bec071bf0488b047625bdac43e9074bc8a510ac23244a7a2d2d181f70af9691db9d0b759e79643981d6afd71a49d3cb
-DIST sip-4.19.18.tar.gz 1056840 BLAKE2B 6c674405e28a64c9db635deca8a00ed78bf52d2551ed578a57d31ae96071ca77ba49e3fc92329942ca61de78bc98049694cc48ef54ea645819fc48f2fae56060 SHA512 e3c58cc6c38b277b3b9fd7adf33df91b47e0385e59d52c543e630a194d73d04d91e0a3845cb3973d1955f77049e75246fa7e6f544e02e1efe0086a297cf1d887
 DIST sip-4.19.19.tar.gz 1058422 BLAKE2B 9c27e636a55699e8bf9c9caba9227e3ff9c8476dfd86d4bb8b0b53c9db95d28441d1ac03a0d20a71468d39e5f21066475018cff93b96281b3904f6a619304f92 SHA512 396c625f59ccef67c2e94221b26dd4ed5d536652a9b63a9f23b340ddf16adf34c6bdb0fbd7c0c1cc403e1d59e8ebf716b478a24bade66a2703fcc5f00b62533d
 EBUILD PyQt5-sip-4.19.17.ebuild 2147 BLAKE2B 57a1dc01a4de554d741ccbabacf704ee37434ca27b7f7ba19b7db0719745e9a02f2e514f4e38e11e016e917637caabd08cc4136762fefd5900930dbc3d8e4610 SHA512 b2c71ee834e6d8465d697f24fca460213a0fca50b0841309d9b1729417cfd9e6f80de4e1e2298fbbc0813b1d6a94c835afd6bce94e288bb8a108202c365b6718
-EBUILD PyQt5-sip-4.19.18.ebuild 2151 BLAKE2B 91cbd13d522b46ab030d5f25f41c9aa3783e579dcc7d96d525576ef8d63735a4e7619871c69e87956cadc0c7c9342a319b18f066f30745da839eace27e41486c SHA512 0ba17e1c999fb3b8257dffe62acb0b15b56ae8b4c0b1ad8baa9004cde3a335866d242786f1876d854f3a4fa186f9590d4cd63108ab37bc63ca88632eed0641e9
-EBUILD PyQt5-sip-4.19.19.ebuild 2151 BLAKE2B 91cbd13d522b46ab030d5f25f41c9aa3783e579dcc7d96d525576ef8d63735a4e7619871c69e87956cadc0c7c9342a319b18f066f30745da839eace27e41486c SHA512 0ba17e1c999fb3b8257dffe62acb0b15b56ae8b4c0b1ad8baa9004cde3a335866d242786f1876d854f3a4fa186f9590d4cd63108ab37bc63ca88632eed0641e9
-MISC metadata.xml 654 BLAKE2B f52693b58abff10e80d2fe004ccca0b97aa157e07c27005c72fe79bc9ba3894c33042c9be2d10f8fc15aa8f0451041b60255eaad96ec78dedc422e7ca2f58564 SHA512 4ad600dc1af2a9f6494350a028909e51deea7b18bf6a50a6f1860163310bc0534cd530ac5d6dea043e7b7e532fd2219069e12b33271cedc00c7a9dda9161711f
+EBUILD PyQt5-sip-4.19.19.ebuild 2153 BLAKE2B 87774dba8ec4defcab59d91884212c373551204e922259704473ecccdf29c23938d78a87460d426f83f370966ec70e1045cf93bd1ffab0dd8a300dbd3e4649a0 SHA512 7327eced76dbe6791f4cf0dcdc7e70263426c17a0e62faf2a25f57faf2a1f99d8d5dbcdd5dff0f21506d0b39773754f178970c42715c95db571bf168dd95bc1d
+MISC metadata.xml 648 BLAKE2B 3e1ad5efbd33a225238ca0b7b3847349dd942b116d3a5ab4dc94826b6745b761cbc791ee314ad0c7867fa8f9cd63b659d4d8fcdcd4a488e58371f2f7f122a2e4 SHA512 e9347175c4203ba811b021ef07919cb911c6969c98886c855af1f74cf3140c57d0ae5d0a4e8b2bca5aac8dceccb774be96264f376ecffc777f53de4ddaf4f8f8
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.18.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.18.ebuild
deleted file mode 100644
index 5c2245942214..000000000000
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.18.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Private sip module for PyQt5"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-MY_PN=sip
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	!<dev-python/PyQt5-5.12.2
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		if ! python_is_python3; then
-			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		fi
-
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--sip-module PyQt5.sip
-			--sysroot="${ESYSROOT}/usr"
-			--no-tools
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-}
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild
index 5c2245942214..3fd39ab528f1 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Private sip module for PyQt5"
diff --git a/dev-python/PyQt5-sip/metadata.xml b/dev-python/PyQt5-sip/metadata.xml
index 8c05084f0625..91bdf6926774 100644
--- a/dev-python/PyQt5-sip/metadata.xml
+++ b/dev-python/PyQt5-sip/metadata.xml
@@ -10,7 +10,7 @@
 			<email>phil@riverbankcomputing.com</email>
 			<name>Phil Thompson</name>
 		</maintainer>
-		<changelog>https://www.riverbankcomputing.com/static/Downloads/sip/ChangeLog</changelog>
+		<changelog>https://www.riverbankcomputing.com/hg/sip/raw-file/tip/NEWS</changelog>
 		<doc>https://www.riverbankcomputing.com/static/Docs/sip/</doc>
 		<bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to>
 		<remote-id type="pypi">PyQt5-sip</remote-id>
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 819c1fa5f4da..ec58758f3972 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -8,4 +8,4 @@ EBUILD PyQt5-5.10.1-r1.ebuild 5812 BLAKE2B ceb731b308578c3d8dc511f3bb56b49656bca
 EBUILD PyQt5-5.12.2.ebuild 5904 BLAKE2B 32191a4182088ea16548c68bd45a5081fea20bfd67789380e2150c9ed9c6f919fc6a3cd0620d4b181d393edf5cdfcba8110866f5c51f92e13504d64c4bd9478a SHA512 1ed8f4be78ea9ef0f140d32c5b4fafcb04440237a080a06d88bcac2d8f85a7715c554df4b23de57ba9f332ad7d4c0149dc5e6d831ed1fbf21bf76e8f46cc7ef3
 EBUILD PyQt5-5.13.1.ebuild 5908 BLAKE2B b71caa77bc38e19dcc4edd952aac100bfefae7cd5e77991a71175023eafb264a061bbfa57159e8c88a944e8e0d84732d523f6c85c9dc5d72e7ab2679bd1a15aa SHA512 6915af2b75a45d6d3eced09af924a084a41e5db64cdb2f58200bb87276fa86275702e12629647df6cc04a6503683616600f75b27f49459acbf7bce06f8a002bb
 EBUILD PyQt5-5.13.2.ebuild 5843 BLAKE2B a6abd81a42c6268ef6e8097a007b260426a55bab2ada39767c3bc6a95c21d244d3e164f5d811b8e7de576de2c7fc22489cc468b4bbe2d53db172c1402ba02cfd SHA512 3eefeb66e3e43564da5aa3f38b9e0f335aea6d0be345260ff980c5b83eeb7c9513d51cc253628984cd0c25b6a84b2cfb1bcdba09e85827d6a9c0a29c0f31046b
-MISC metadata.xml 2594 BLAKE2B 3c8c7159c42e050e4e4487ea8c24bd8d7213f9590656c3ae7152c0dcf151d4db99f07546636df0b7142107f506ae72e8d8c31a34aeafbdd325001030088a5493 SHA512 41e4d7e868a9b101d2bb41e8976b20d460544b1d103b3600b5b7cb5fbfc456538027d4b02283587aa747fd1789d7e675e5ce832df71f3dcd9b22eb095087328a
+MISC metadata.xml 2501 BLAKE2B d7a5d2131b9eec75f488bb28583a99de49191bcd8dae4db3ad51395763bcc9be0433f74e6b732c6f585b0a7fbe3d18c1689aa9eaa65e32ec63dc85e0bace0b07 SHA512 8866f1f87d19e7b7ddb76fdeb0891d928dc4e6cf0561f53b6962fc3bbf7b50a03b0257463942804ddc2bed1e0367732cc74cbf9c3c7f4c2759b9bfa5e92e4af6
diff --git a/dev-python/PyQt5/metadata.xml b/dev-python/PyQt5/metadata.xml
index 3ed574acb761..a69c270de40d 100644
--- a/dev-python/PyQt5/metadata.xml
+++ b/dev-python/PyQt5/metadata.xml
@@ -38,7 +38,6 @@
 			<email>phil@riverbankcomputing.com</email>
 			<name>Phil Thompson</name>
 		</maintainer>
-		<changelog>https://www.riverbankcomputing.com/static/Downloads/PyQt5/ChangeLog</changelog>
 		<doc>https://www.riverbankcomputing.com/static/Docs/PyQt5/</doc>
 		<bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to>
 		<remote-id type="pypi">PyQt5</remote-id>
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index f1eb22e27859..acd07cdc6fea 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,7 +1,5 @@
 DIST PyQtWebEngine-5.13.2.tar.gz 45234 BLAKE2B 4ad3aa63856cf3627c2f4ba29d93394f13297deb5e54bdd200bd419f71322d541ae72e45d70cff09cc53808f0d2430f8922d44f18bbf177c42a6b9c827854d6e SHA512 778aff78ea731230029e8dd993f4bc59a32bf74d65f06a8b3d1467efdc67e3b3caf0d9a968682c6c275c8ffdb8d85d9c756cb51727769949656620e944c736d3
 DIST PyQtWebEngine_gpl-5.12.1.tar.gz 42474 BLAKE2B 6cb333d8e429ae6b9f8c20a7486754767639693351605e85c0226ab3f1f065a549d40d69669d91f501fdf2c30346304a547e36b416d275a8bfe4ea621c0633b7 SHA512 2bcb0e4da51de9cfb5128e03c03ada77f2d4b99b0885da910584717681b96759ce4301c325cbbf43602d46746e2d37d81ed62f77dd63b33359fd5fae74d7f010
-DIST PyQtWebEngine_gpl-5.13.2.dev1909181828.tar.gz 45197 BLAKE2B 203dacf4322e8293221a59fd9a2f34a42981aefd5861e47141b3cc58770ff9cff2c0922de1f03c0eaff4b0d1c42bf26b172787cb3fbbc9367e9d8b717e927d50 SHA512 ebb1b6de8cba1619c96a4a120b51bfe885b737669f246f4e5c2cd5023320e74f0927a62a0b87586b519ab5767e0bd7b01444e7298381ffecc036682b4f1fcaae
 EBUILD PyQtWebEngine-5.12.1.ebuild 1703 BLAKE2B d7e28f4b15836437f1ec47c64da008d5e5f3113f2969dd08750d4f324219290e957391ed6d152cd949bb88afeb87d946b22e92223fb92e8d27160c8d184983fe SHA512 0329d51e5df79ddc6ec2de02365e86f49b3f3267abe492079396646bfd93500649b4261adfc68f4e3c1b86ad58b41a70263f9bfebbf5eb385b52a743dd9847cb
 EBUILD PyQtWebEngine-5.13.2.ebuild 1680 BLAKE2B c67b3d71502d986aa09d43255b28fbd07e16bf70851a30d24fa5874b8d5fdd493f372e2c8f23a285ddc6866041f01f72037a5e965bc298c53ecb9a64f5a5eb9d SHA512 8fac5f51cb220bce68a8af2f3ffae742891b8dc279cd975bfc731982bd8666098d25d28c7dcb4a39d3bdf1e1bb7469d7f98aefbc617aa731e0b152a49b440a4c
-EBUILD PyQtWebEngine-5.13.2_pre1909181828.ebuild 1713 BLAKE2B 085effbbb3c43dcd9cd18d08ddf35b4e26dd5c1bcb80e298e422bc6c432aa157026043473612a81f6a6a37cd3c96a649da443b236cebcf49141a690dfb7d49c6 SHA512 b81e603090920d6e2da7ca11d3d8e851be160344282ec6cf25f9ccc621ef1c915ae9f3fddd2032b04b2fa522999fe5d5afe016832dd7c879aa18e739c0e636b9
-MISC metadata.xml 1059 BLAKE2B faf1e1abebc25799040955794a28cdec2f24f1cbe358f15df5fbc400a55453b5281acd7ce0925d122661a3b290771d280d6a2cd7a2d536a5cbe0b0dde4aa9a5b SHA512 b5721a82b18f9c5b9bdac1937d68616c20b290fd609e2cb02dd837b6f435eafc436d68f3aff9593eb43efd30ee2e7201efafad8a38b41a198076305ab9de3862
+MISC metadata.xml 958 BLAKE2B 3d360762116d92a71aee391ba8bb5eaeb4f8347f22c0bad7c05211d82cf9bf9ce04e74baa1691c3a48c7be7c3906c180234a7b3c33b76e56c6b94982ad0045f5 SHA512 06ed8222b239484fdb7d1e7ab35b922b9eea81ec144bace571355302d1b01dbd6bd80d2d5c03d1ec7f7edad851050305d2e87232f5580e92276018c7c4e9753f
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2_pre1909181828.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2_pre1909181828.ebuild
deleted file mode 100644
index 2492f56e0e0e..000000000000
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2_pre1909181828.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
-
-MY_PN=PyQtWebEngine
-MY_P=${MY_PN}_gpl-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.13.1[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-sip-4.19.14:=[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtwebengine:5[widgets]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.14[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--qmake="$(qt5_get_bindir)"/qmake
-			$(usex debug '--debug --trace' '')
-			--verbose
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets' ${MY_PN}.pro || die
-
-		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${MY_PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-}
diff --git a/dev-python/PyQtWebEngine/metadata.xml b/dev-python/PyQtWebEngine/metadata.xml
index a42801546886..79c3ac6b0821 100644
--- a/dev-python/PyQtWebEngine/metadata.xml
+++ b/dev-python/PyQtWebEngine/metadata.xml
@@ -20,7 +20,6 @@
 			<email>phil@riverbankcomputing.com</email>
 			<name>Phil Thompson</name>
 		</maintainer>
-		<changelog>https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/ChangeLog</changelog>
 		<doc>https://www.riverbankcomputing.com/static/Docs/PyQt5/</doc>
 		<bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to>
 		<remote-id type="pypi">PyQtWebEngine</remote-id>
diff --git a/dev-python/apipkg/Manifest b/dev-python/apipkg/Manifest
index dac2f1cfbdeb..086a4138cbaf 100644
--- a/dev-python/apipkg/Manifest
+++ b/dev-python/apipkg/Manifest
@@ -1,3 +1,6 @@
+AUX apipkg-1.5-pytest-4.patch 801 BLAKE2B 4fe40fb766f4e8654ef37f0796a88f74b81e2a1d237382f87745f33ac80e505c9e764f8b83d467c7f5051ce7eb3a80add369595556b5b6abf3e1a569d33cc071 SHA512 d50ecac0382e70124634a403c5010bc929f92f7a6768979497a5d2646626c6244f3c213f18989f71dda137bd4376f81d5d97a5f4979ff0e937046bffeef75b04
 DIST apipkg-1.4.tar.gz 11224 BLAKE2B b59e3fe39030f1f1f7f41e121d7a4e242d7155be5f7b2b8f3cd7550772acceacaf2d9540cf98bdb51e6d132af937d634bce3699b950b9d9aa9a618009cbaebb8 SHA512 118f806706944513f50d3cdef596b32f8ce585cfaf94d2531a6d260f90a0e2147177161aaa6f5d6823150e6182d0f73be3dc01259b8a2f8d710733a22ea54789
-EBUILD apipkg-1.4.ebuild 795 BLAKE2B 40f46d269dd2005e9d44f7d702e8616dc6d67935f8d68d8678b0e6ef3968ab8f75c8d2d38aad54d743d0b129c598af53a66cc597bdb6082bb3ed24b79c67ecae SHA512 798a53e974e22668dcfb7fad89921735ceb88c9b2aa9e1559032239d651aaa1e1c2fa6be49c0e8173298f5fbb5e48399ece358f5d913bd04fee987cc1af2627b
+DIST apipkg-1.5.tar.gz 11186 BLAKE2B f703a37b38b412228348520a9daa0276a69c3be47a9586e1c2797cf525a024bb0fda81dbfad7d4b1404e1ebcd3eec0e9ce2231beef5072bf9915240e2e5fb445 SHA512 828937ca5e203915248fac54db8e7c13f941e006403f2a415c27fa4d1aa114790be3d7b5dd892f528611e5e6dfe75114ee80f4f4589a03c3f789ae6ddfcae0bf
+EBUILD apipkg-1.4.ebuild 822 BLAKE2B 51edc31d7dbca921b9e6ca9cbb7ce197b5a033395dd09da343f55d40bde95302c79e32ba9b3df4b0207c89039dafaec037367defb8b59870d2b04baa844dd8f8 SHA512 ca325bcc5c89a6dfc5581a13f41ffcaa56085a04ee38197e6d8b4befbf2cb4e8514765f1f7c54b024c76bd6b9ad0be77f91c2e44d444a126515e7d76c3113c40
+EBUILD apipkg-1.5.ebuild 640 BLAKE2B 233ba393d3ca63100d915aeac24d28f96386096d6b5adcc1b36b8a88af7cfcc24cfca9ef33d7a52c2b5294b0d900cd3a0c83c851fb8c3e9cbf95b5690885e0f1 SHA512 f4ff6f66835d909d2950f5e9023381946410b9072b5effab7b7dd40d68de259372c212e76febea76801230a9946cf32be6c950a714d312bccbf96e2b9bfc8458
 MISC metadata.xml 309 BLAKE2B 693a9a5373548cbc3c78db6df12bd9dc7aad3bfd3665f702f65a18a1799dc089869d5577ff6d6dba67573393970d8b85c356387a53786376503d33f979bf6e52 SHA512 0f74900faac286382377f2233aaafc9a6e8d7b49c017f60c7c451728d67cb9b9505f57903901a56f67327364951e2e7ab7dae7c852ad70b16070ce48ff3f93cb
diff --git a/dev-python/apipkg/apipkg-1.4.ebuild b/dev-python/apipkg/apipkg-1.4.ebuild
index 291807feddca..e50d756e34d9 100644
--- a/dev-python/apipkg/apipkg-1.4.ebuild
+++ b/dev-python/apipkg/apipkg-1.4.ebuild
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/hgdistver[${PYTHON_USEDEP}]
diff --git a/dev-python/apipkg/apipkg-1.5.ebuild b/dev-python/apipkg/apipkg-1.5.ebuild
new file mode 100644
index 000000000000..63525d9df7f6
--- /dev/null
+++ b/dev-python/apipkg/apipkg-1.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Namespace control and lazy-import mechanism"
+HOMEPAGE="https://pypi.org/project/apipkg/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pytest-4.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/apipkg/files/apipkg-1.5-pytest-4.patch b/dev-python/apipkg/files/apipkg-1.5-pytest-4.patch
new file mode 100644
index 000000000000..0053e7078e2b
--- /dev/null
+++ b/dev-python/apipkg/files/apipkg-1.5-pytest-4.patch
@@ -0,0 +1,25 @@
+From 81dc0f46754afd44358b8c97ea832030436ac7cb Mon Sep 17 00:00:00 2001
+From: Andy Postnikov <apostnikov@gmail.com>
+Date: Sun, 27 Jan 2019 03:27:18 +0200
+Subject: [PATCH] testing/py-apipkg: fix tests
+
+https://github.com/pytest-dev/apipkg/issues/14
+---
+ testing/py-apipkg/14.patch | 11 +++++++++++
+ testing/py-apipkg/APKBUILD |  7 ++++---
+ 2 files changed, 15 insertions(+), 3 deletions(-)
+ create mode 100644 testing/py-apipkg/14.patch
+
+[inner patch extracted for Gentoo use]
+
+--- a/test_apipkg.py
++++ b/test_apipkg.py
+@@ -13,7 +13,7 @@
+ class TestRealModule:
+ 
+     def setup_class(cls):
+-        cls.tmpdir = py.test.ensuretemp('test_apipkg')
++        cls.tmpdir = py.path.local('test_apipkg')
+         sys.path = [str(cls.tmpdir)] + sys.path
+         pkgdir = cls.tmpdir.ensure('realtest', dir=1)
+ 
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index cdca43b5664d..00c7655791c4 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,7 +1,7 @@
 DIST argcomplete-1.10.0.tar.gz 47271 BLAKE2B 78a67b56d4871120d7384459c8ee591f42dee195143712c5c70d144d4116041d36ba687d4425beba6258b58d5a0a3ef847d10d6267f372282f37e953c6f92d80 SHA512 59e9cb721ddffd85d9f6461a70d50f9ba0795e36044cd46fa5fe707fb1be28c12f4ef531d2844020efc156300861b2ca8b73f56a116dd54bda0e52cf68c0a411
 DIST argcomplete-1.4.1.tar.gz 37219 BLAKE2B eff9c8b8a2996d2d57ca99516071a1c831f9e64be4efd72bf930dfe7fb2404db2aa03546e761ae73b5d22f8ebe683728c433ab837eee5c073616e7d32fa32010 SHA512 3e9fa64fca93baf14fddd653947ff0269004e8783de0567931dafb9e4d0dfff2e2450ef6df331a4d648f5ce1d817a422f52d8d30b94315cd54fd82102467ded5
 DIST argcomplete-1.9.4.tar.gz 47471 BLAKE2B ba64acc1fb2ae336166504db3dd991227c4e2a04abc6909ecf6723c1d2ce82ea65453ca2dde97316da9eaaa5b60026a6c8e4f3d658f1ed8122ca4fd00723fca1 SHA512 831958dffc75c65e2a63918d1e6f5e1fa47ec753b913c978e8d1d30d430ab8fedf66c99d8df23b2abc547b42c27335ccf47811224322994316ca2225c85ce346
-EBUILD argcomplete-1.10.0.ebuild 645 BLAKE2B f78fd478264055f0500bf5ae6fba0772ddad2ada6a70c7fdb68b6781e48c21bf23b356233ff49c40b7538e59f273b3845afcf671d86ceb75e4963aa4ce4bb5e1 SHA512 d74dc0158ec3b96ef8e4547ce349df386dc2fca9fa6660cfe7e1385c1b3d02b71e804005caae724f710c455d19dc067ef3c69f3798bd54614e8359e1e5bb29d3
+EBUILD argcomplete-1.10.0.ebuild 676 BLAKE2B 6275bf40b609222d486d1573d7c3fb24e4c4d857af66c29819d8382f1a5c36ab8d298297de1ebcbbf679de3e2d02a152957dd74741cd161148e2d3dee931f279 SHA512 9d031bf58b76a54c4ada8fc1e6189c5eaf6ef0c53d23d129320bb955c0850bacfdac6dff4656fccdcaaec454cea80d466ec56f413aa4a91e0f7c92dfe82812e8
 EBUILD argcomplete-1.4.1.ebuild 959 BLAKE2B 7028b6136fee5572def13a0bbef23a4e9acf805a2088c2c11289b2a94cd7ec48ade2fd521c2db5b4bef6cc6ba9e4ee2d53bd7b8ea7614bd2e974554533645375 SHA512 8a114e18f7d238bf0e8a078977f066f6fefb50ee3e63f995bff9f2afd61dfec9caa70e05373c55be7ca11f54c558f9584064927a1951d548173802f8b2cb5ef7
-EBUILD argcomplete-1.9.4.ebuild 777 BLAKE2B 99c7f1c776ac0546926c408a0fdd7654cf33cdb9cec6252daa1b015e0458a426dcd6278e8cb33fc1c96b21bcc45221df1715ed94f9606c1218dbab8c2f8ff2e9 SHA512 4db430d1c46ea9831404e36d0094136303549038ac3172c6c77db9d45cba8e6b5b52091c0cc49d1ae942367b85efdf2569856c8c6a36d35fe89f4fa8ead6a442
+EBUILD argcomplete-1.9.4.ebuild 804 BLAKE2B bcc010bf6173d0a81750dbcac4ba0ca8a69432609dcb997ffdb1df226500a7e0b22f9c7f03f6ba4f3a7ee1c01edadf40f457f01c0f0c2cf1c7f20db46752d767 SHA512 056cbead37a9f84a86c0ccfd66a7c34cd72a382cd7abbf3e93cf31efe186399c90280f056a5c84e64113aa099cc4fa3b5b240da0b6fc31c0f5b935d1c48ef8df
 MISC metadata.xml 385 BLAKE2B d552f29df1805f58bef2bbaf91166ef43daebf78d36a079c9b93bee54a8165d33576e1f9c238e7070f64253e0ff71c9b6a18c63b3321b5a400f8d287b10e4a82 SHA512 125cccb9f83bacb68944c893b76905ca6db26c41f0e843bc3b2ed4fd8b18df4247696c0fb34acff77c41bd57fce517669878e071db6dcdcedde42f85cc012e5d
diff --git a/dev-python/argcomplete/argcomplete-1.10.0.ebuild b/dev-python/argcomplete/argcomplete-1.10.0.ebuild
index 7df8a1c38a08..bcf6b4e47484 100644
--- a/dev-python/argcomplete/argcomplete-1.10.0.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -15,6 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/argcomplete/argcomplete-1.9.4.ebuild b/dev-python/argcomplete/argcomplete-1.9.4.ebuild
index a9a18ba14b01..dadb76efe1e6 100644
--- a/dev-python/argcomplete/argcomplete-1.9.4.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.9.4.ebuild
@@ -15,6 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/asn1crypto/Manifest b/dev-python/asn1crypto/Manifest
index 931990b1fef8..b5697c8f4170 100644
--- a/dev-python/asn1crypto/Manifest
+++ b/dev-python/asn1crypto/Manifest
@@ -1,5 +1,5 @@
 DIST asn1crypto-0.22.0.tar.gz 84508 BLAKE2B 5f21e13e6af0f5edf6f79454654e677182e2ae06a36d3f86a641e76e5043f8818fd17dbce40a8b0c4070a254fdd169a3eada99434f3b9e4097d4c106a774c30c SHA512 fdc98f71ec3b744e69a75909b5b0a8381fb82d448941a6e1059823af47ca107218e1dbe6ff192e2173f11fc2454be1afcd387d801dc8e716451179857d71f8b8
 DIST asn1crypto-0.24.0.gh.tar.gz 641322 BLAKE2B eb30afd0d2579f44ee4f556139357dc7622691bdc2067df913a4412cd3dca8372b85d84e3a3cbef6ba83648bf4ef55d7e8614992e2abb019301c92d24b15a926 SHA512 426cc380903b4dd7aadd7b831e3a11ee3442c961a33b856d4aa8d9060e829f2e0ad905a60c4d6504569718fe2cee01d9be31628c89ef030bc34281e381c898e8
-EBUILD asn1crypto-0.22.0.ebuild 601 BLAKE2B 4f69cb1abea2577bcd872d7ec5f4b899951414d69ad6eb9d9a69ad2ffb53c035210fc1b10d468017cbab3d643768ba399b28d2e0e6d08895e7e4b42491433cc6 SHA512 16dff5f5416c0b112b36782f8c9b321f9e9966b944d3d97d17a775d8fea58380199793b2b869cb2d9042b89e85dc770297c0b0bce6a39df98fbfea9b430d57f0
-EBUILD asn1crypto-0.24.0.ebuild 830 BLAKE2B 6d562487dbf3a72698c10659f35f27fa635bd517dcd0af5926b0d995135148d73d7f8811a7ef73e9e62a1aac3b1bb7da042da1bea314a3ff64cc99830c90db67 SHA512 31d857711b86491214aebdde1a454cd93849a8a08ac95a22be929efae5fcbacc99c761b0186e91fb0ad0fcb3b53d04d3e84935c853768bec1ddd5200df18d7ee
+EBUILD asn1crypto-0.22.0.ebuild 628 BLAKE2B 1c756a659b40938c7706aeda357f6f7d4119308e8d608785fbb4e1a9f92fa14cfe2736883b3c67fa7a8b17cfee69f4913d66ca004a7179e97109591f31dd8fe2 SHA512 9c220d9bb2a40f0c0ddd904a75a0b7fcad4b5c94286acd4cc307cc0df442470f4b8c826e649d03ef580409218d6635dccfbe6f38e97c499dd556c1051af034fe
+EBUILD asn1crypto-0.24.0.ebuild 859 BLAKE2B 366a193d884dfacc0329e2a0ff95156ecccc95e13ee12082e9988aa1b0d5109fca2db49c83b97def7e98ccdba733dd9c51a217c0b044c5e5b77239657ccda6ee SHA512 0eddd65cd2cc4a19a2d164a7d9b7a990b132864ca9ed1829927d05aff5a9f7aa98e83117f51c33ccf831cc8cd1a1183037fc70257a73481c43d63b67c412a5d1
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
index 117f25396401..b57285fbdbbb 100644
--- a/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
@@ -16,6 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86 ~x64-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
index 9c2ae09e474b..37fff4cd00fe 100644
--- a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -17,6 +17,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/atomicwrites/Manifest b/dev-python/atomicwrites/Manifest
index fedb2ddf43fe..25f6321dd74d 100644
--- a/dev-python/atomicwrites/Manifest
+++ b/dev-python/atomicwrites/Manifest
@@ -1,6 +1,6 @@
 DIST atomicwrites-1.1.5.tar.gz 18951 BLAKE2B b0932995aae3ca23c11aace182429f4888819ea542a12b59d5b7ed4621c4759285d0cba306437bd1ce35b1ba32eac8ae6afc6548f2bae61870dbf03927c4fe75 SHA512 4de8ab93dcb226c55e8ae1b0ef883c2e1eeae50ac6596afe036ca51dbf6b094c13dbf2d792972312d4c53551886aaa2713aac54bfab42b85abef4d1146e039ac
 DIST atomicwrites-1.2.1.tar.gz 11660 BLAKE2B 06b4ca25f39be0e7e8d8e8b46749d7dce052f912e82b1ccd39e308c8ed51ab0d4891f00c11d0e52ef50901c01566f20fcf1318cb472c9a1f3a08617fd1b56235 SHA512 4df7ee97e0817a80378b273ced310b8ad88eb6ced93a594a6e3dc38ad1e7208226fde01b6d282f85583c57a50859e82c85bacaae8a7c64fce55e6965f74b12c5
-EBUILD atomicwrites-1.1.5-r2.ebuild 573 BLAKE2B 01814a1e9f3c4d4c899416714eff73de3d599881422441be8cb061f7101812c4d4a99a0e0ef34ab25a039918008ff6345cde3b5f8eac6f319294849b51fe9ca0 SHA512 06c6f9885ba0b487d38705f4cc220747ac1499a7efb23dd5d6bd2b4f47833462ee8fa25f6031b0370342716470d01ce046c9cc997fa63cf5897f67659adc9d58
-EBUILD atomicwrites-1.1.5-r3.ebuild 951 BLAKE2B 81ed4c414e91f38db89a66a112b60a3baa025e2c9e01b0be91027fff1ccb9e0a75a58ca3860fbf21f04ed173ea06f4607ec6500024859fe5444283051dd1eb14 SHA512 8ed6fb7939a731a66f4ee58bda5d7c8de345a220f40edd7f9ae2ee617b1c3d9f571c1e4019040ea5da5ddb15e0d1abca798892ac5ead1e4d2fb3afc588428f5e
-EBUILD atomicwrites-1.2.1.ebuild 1000 BLAKE2B 4e772494f3c83a9c75172b69f78108c1fcf6cddc1d4bb3393eacb4feef2ff65349101ce328edb8c1021d8ca7af31bf2bf015d462e2f0dd2a9a3744d0578102a5 SHA512 bfb4301b376b7b0a37034df7bf51a646597e541cd7991deb097e06b7404eefd76576def98177636f18b547d8114e24c109cb54c26b73a88dafe149141026b7e6
+EBUILD atomicwrites-1.1.5-r2.ebuild 600 BLAKE2B 92abb65ee53d5c64bac87e7c4049e1a40ac46027d1b447ea194a1da61a8ae6f06e072e66cde5aba247b971467031329413c7473be6cf7a8f26b2885bc9c2e0b7 SHA512 cda65d0bb3d988f87805856e9b709eb2f280e87a0f67a8405ceddbfd03a6fe637f42356c4011e8cb5367f6cece54f6e08a8a71cfc5c74dd724fe2b6816449c8b
+EBUILD atomicwrites-1.1.5-r3.ebuild 978 BLAKE2B 1af1ac447b0f4a48f812f3e4dd79f99ea8300c5f907be6feae0c4a34e359c8b6f6639e15b2685e7e4ed6da6cca9cd2d0c6c1a21f67c2214f5e58ee68c40842f9 SHA512 86f87683c024771921c59d396cae1e16c65167dbe5689a5a0dc6a1bac1796d466fdeed77a5c7d314b773957e14da5138c438e809862b0c0e7532f7cffa59cf21
+EBUILD atomicwrites-1.2.1.ebuild 1158 BLAKE2B 48f3189e2551847430ab24889f8c784d55984d019cf5aac31f6a75070c1579aa2cd332bf6d6412a016c76507b8cf2cc2f12124c70f03a026e91f948991fb0240 SHA512 6233b2ef4585d2871fb99fde41be01be4eb12237bdcc8add3c0de0b810a0ade3c98ed10125dce121be466b6d7ccc944cf3ea00b3d4ee88c77ace14ea5be43319
 MISC metadata.xml 438 BLAKE2B c2a138ede668039b703fdc3e2ca8e1a7a07546e01540fdc502d79a48a8ddfae8dc7a79ed371373d95054731fcb25af67daf75ef5a1c08fafe9976f7a2c30525d SHA512 f38332e752b8bb660d8d8291b897fc96865a134108198e01df2dc4365c0c6e87c6039a907da38080a4d07d7c57750f8a32c6d6c3653b57f5aa193ca5b5b53449
diff --git a/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild b/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild
index cf4f6bdb77d3..85b1e5aa6843 100644
--- a/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
index fa0256dcacf6..12017592573b 100644
--- a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild b/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild
index 9c11548028a0..6a247bcf6e23 100644
--- a/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
 
 inherit distutils-r1
 
@@ -13,17 +13,27 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
+IUSE="doc"
 
-DEPEND="
+# TODO: remove impl limiters when sphinx is py38
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		$(python_gen_any_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		')
 	)
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
+distutils_enable_tests pytest
+
+python_check_deps() {
+	use doc || return 0
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
+}
+
 python_prepare_all() {
 	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
 	distutils-r1_python_prepare_all
@@ -35,7 +45,3 @@ python_compile_all() {
 		HTML_DOCS=( docs/_build/html/. )
 	fi
 }
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 39cedab4ea8a..ba3418b9f88e 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,5 +1,7 @@
 DIST attrs-18.2.0.tar.gz 116817 BLAKE2B 79d50c9b49956bbc1e04084eed36a5f65f2dda8e954b23f15650cb881d6f77a8325e042c6d1a77dcad43661d4524a4d253d96bd0053464ef03091779636e6d0b SHA512 58c26579d6dfcacbe9e3f770a125861e0625d435f1293eebe0d62efc9b8aa9572be2b312d73037a647163bffb0a13b240fb157aff7ed35196f637ae945d61d22
 DIST attrs-19.1.0.tar.gz 124220 BLAKE2B a7a8321857c2723398db3b7943f221cc141f2d365b84d3f77ccd16c9180fb1d73402c7a1018d70b666bf76b6021bd90df14d792886c1345752b8fc810ac54a35 SHA512 22ee45e8b10a7abe10e720788c5cfab424d0bfe70e595dfb116928b8ebea497a747e8234d96549da00f0967de750fb943db0cd3669354253a27be2ca30fe413a
-EBUILD attrs-18.2.0.ebuild 918 BLAKE2B 839fb10c623c203321a76797c24aa976f636b7f117c6ff184471a2b7325ec01e4af357fdf6cc89157f4d0cd08680ec27873419104ed9893d1b20c09267db728b SHA512 3c704274529a4b4adb1b6dd172cb5e7a8e224c80c9603e5979eab5ab24c88ae6f91fd927130abcc9ae873908d4112fd1cef50f93a2b2e20c25319bd560b262a5
-EBUILD attrs-19.1.0.ebuild 929 BLAKE2B baafaaa512d924eb7309fb150f505891acb53362a59ed955156dc386086967851ceea0605e5e7fbf3ffc9854cfb9e3aebdebfc3e2c631c7f3a96d941b4fee45a SHA512 16f35e2b4fbde2ae18757b2b5e065c36899af7f3ccbaf591b6eccda5e2717382215d723995e3d1afbecbcd7bedce69a9fd84383abe14f66367e1aadc709e8035
+DIST attrs-19.3.0.tar.gz 132477 BLAKE2B 6577f39fc15c9e70f0f76ba358099e83c57e226574cb11dbe83747f12e285a284e9d1a218fc1670e0d08be550d42c67cde132604b2cf385d1ee25bda7e57e79a SHA512 b5b641e6732156d1454ed6c49e3a6b29200a8d3f1515fb59aeb85fcb5e9ab6a1d760904de45083cae5250e7bf1a7aa2c1f3ede217240a63f989ae4bb484f2511
+EBUILD attrs-18.2.0.ebuild 945 BLAKE2B 12a864763c3484dd442c32955441ad7f259d43cc93c63dd6d840804f614fa4550f5d1888bfb7b46a578ec14af32705862f5a28417b68e8b73d81e5173f4243d3 SHA512 6101641d5ff23dc53dcfd81129e010a1c3cb77ceca4e954f8e1af3eb16057916ba9cea67888e039e5e1d83721fdbafc16205dc75ad8907979362196f597bc261
+EBUILD attrs-19.1.0.ebuild 956 BLAKE2B 16741aaace7e23b520a43a4ba2d47c2e7b6a6c38590193bd6c81398f34067ee60a22d80706bae0ffff6084df54ee646a1ebfd4bfab3f990bfd72ef3f42017524 SHA512 4906f9b36d175cced1815b96c5c365f8269a76822128c5447ccc2b10c99652dbd94b5ffe7cc6ba0aa38ce2f387eb9fe0ce254d2eb1fae21642b80f34633f9b00
+EBUILD attrs-19.3.0.ebuild 877 BLAKE2B 9d71b2bdf0eecd492be9a4eaac5525f0cb6d3c0cc3581e5efb8c6e0bf1c3fffacf786025d9b0f84eb83465591b07741425b9d7ea19844c11538b786955549ec8 SHA512 dd11b6625fe06254da1caa110cdcea80c6101e1a92684aedf564958e7aca449002330dec2750784ce82796d88cb89223d8d7dc6f88210ecad0fcf5ec2cf901db
 MISC metadata.xml 488 BLAKE2B 808447388863096af88f90f97c58025508d5b4cd1ecd760c59dd8af1fa664e16756029e3d5d6b233578b9c0d7be9c8469761c9a89f222ae9f47556b6ee983fc0 SHA512 d8336a60cb0b2b8d51a9833c0ba3d47acb29ec4942b2f03b750d407bcbb65461d867470226bee962a8e585cfd4ff11bfff67b66ed2270f9efbf35d3c46bbdda1
diff --git a/dev-python/attrs/attrs-18.2.0.ebuild b/dev-python/attrs/attrs-18.2.0.ebuild
index 8a0a42576624..cba1fc875e8e 100644
--- a/dev-python/attrs/attrs-18.2.0.ebuild
+++ b/dev-python/attrs/attrs-18.2.0.ebuild
@@ -18,6 +18,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/dev-python/attrs/attrs-19.1.0.ebuild b/dev-python/attrs/attrs-19.1.0.ebuild
index 19c2ffe78884..faa7c448ec5e 100644
--- a/dev-python/attrs/attrs-19.1.0.ebuild
+++ b/dev-python/attrs/attrs-19.1.0.ebuild
@@ -18,6 +18,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/dev-python/attrs/attrs-19.3.0.ebuild b/dev-python/attrs/attrs-19.3.0.ebuild
new file mode 100644
index 000000000000..c21800f30138
--- /dev/null
+++ b/dev-python/attrs/attrs-19.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Attributes without boilerplate"
+HOMEPAGE="
+	https://github.com/hynek/attrs
+	https://attrs.readthedocs.org/
+	https://pypi.org/project/attrs/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.3.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index 53c259f91cff..8b8182817a9f 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -6,6 +6,8 @@ DIST awscli-1.16.215.tar.gz 1344712 BLAKE2B 408c30ec166d1614a6b877b0d88ce3c41668
 DIST awscli-1.16.220.tar.gz 1363235 BLAKE2B 9db063972092dee9d03cbd6567544df2c8c0fdcc57f447667b402903bd39c46ca61c3ee06e7c00bd37a99bdbc14847a86415ed2eb7621a5f57606c03ac602ee3 SHA512 b1c2d1e8ac41e92735b6b48f112b59ea869c210991511a51725b38223865c57bb64687ad6f1ef03ab620a133bc6afd1e530ea5f2912824097638c46926b7e3cd
 DIST awscli-1.16.233.tar.gz 1395357 BLAKE2B 4ebd3e51439891464864a2c8a089da96d3f33a77fe78810b073f746fa6015608f8650eb51c1b148c2cae6030f736ea2e6c01f3f21b2fe73bdc0878fd0215fea5 SHA512 356433221e352437d4f4997dd3a66a8cb866388ca480ef9ef405d8eb1d5d034d6a018c6b303446c07ff5b52778035e6b0df5922ca2fbfbb19628de3f04c9a34e
 DIST awscli-1.16.261.tar.gz 1503153 BLAKE2B c507c37905e06d976b246f4636462d79184c62a8ee55cbda82d835cdc7294419e7cadd6c2209a9f0b6768cedb6ee6dd201d3baa7edc0a0a545bd7d5ca7913d45 SHA512 3245d4bdab98d8385a370385b4f0f3038007740c3c6c3a2e30d64e7e4e83230b0d016bc55072fbff10c6e4e533633bf02dc3fcd9b7ed45c248b1136ea62b9c3b
+DIST awscli-1.16.278.tar.gz 1509613 BLAKE2B 71799c760f9396d18c86c1fd7da79a115ad8618cc7c0a7e7a57627d026f109c15023d35c743be38da816f30937ed8f43328f31cc61d1644200156aeb55799d2a SHA512 f84ba50ba7707007fc6c8af0eed2b152d20806632cb2b32d59e1a69812051a03aa4fd60c5a982439995d9f1ef746e50350d0129045e9305365ff957e74808e36
+DIST awscli-1.16.283.tar.gz 1545412 BLAKE2B 98d72a103718def5d2678c36f7654bcb378a5e4df05d17bd545f8d981c571ae9c09412644e233848035041d3fc3fa7fff9dd5b2f98e92b1d1d0fe6897fb17c7e SHA512 5539a665c8997c1fa637bb9cc133888483becc9cd5fe424e8947a83d4448de376b0d7ee3a7a63d07f90c649c956a12f544646795cf4a8a12a09880a05da0d3d1
 EBUILD awscli-1.16.104.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
 EBUILD awscli-1.16.125.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
 EBUILD awscli-1.16.148.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
@@ -14,4 +16,6 @@ EBUILD awscli-1.16.215.ebuild 1304 BLAKE2B 6636b1a295156b3dd5887c6eb734368f516c1
 EBUILD awscli-1.16.220.ebuild 1304 BLAKE2B a4687c4aa3cef1ce9c24d3c84353080684fc5547e3322b161b8216d1255625c137ed3f787a7fc24e12519c0e88b9b5d4a2a5aad450a1e8a40fb10cb2f8a37cb8 SHA512 61d3a69714931f89ac2710365ce13f847bcadf115b89bf30ed951e1347324b4a1316f814cf86f87184c2a0cfc10a353788b13b7db76173b7b2fea8cd1ce8902f
 EBUILD awscli-1.16.233-r1.ebuild 1306 BLAKE2B 2396bd7b7b0fd463f0a0faa560986dfef3735feefa34bae1e9e959c3cb190f4b27d52f02825267f46192a2a9072bb9e0cc52f94f618f455ba24eabc70d822dc3 SHA512 55fc153a697a5cc0afa048c042323cd938063e733516becfedd9080c3082a0bb390fdcd14dfbd3d851eb3c4f44c51a012e5f58f9be4911bc4c799560d305acf9
 EBUILD awscli-1.16.261.ebuild 1304 BLAKE2B 195d93407b8d5bd159558133fd9675066238e26e9486ef74d6c498f37e3e2e73af03c04247f2da98b97612cb1a98e93d3723bbd6b02328a2049b8344fc0b9745 SHA512 c5810d0b1964edf697372cf06a9bdaaf5c560c75b8dc32150ac261429295f5dfb7d52c79d70ac534566a3b53e14f714155e7406e9344fc4f641e2dab8453ad7a
+EBUILD awscli-1.16.278.ebuild 1303 BLAKE2B ca0c1e3d7cd60c954e91cc757ef941b31eb2c275d09f129b04664529df5955ce4f953e095fefbdb6715bf11fe9d39769524b85df2ee17ee370c1a96a285bfd18 SHA512 96a4925796c1f42e3c399990bd1f55bdcf40505d9ad99d130e789b6f3cfeb4c65543938857a3af6da036a47eaddbd2418a406f362ca5582c5d64b602e22d0dcf
+EBUILD awscli-1.16.283.ebuild 1303 BLAKE2B 4e828d6f3c599222c77b8c2c43231423fa317f2a3727206f6b6815a701bff84ac3fecaa3bf830edcb69e05bec84339576739767f81b8f73403a38a6c72b0e70e SHA512 edecb7669df636c8f66a04a5ac7921fcd150add578f812bcb259b984e86e817fa0a9fb5d1d70716c94bcaff57d0ef5afdfd972e10e18ec04ec3c6e3da9d158b7
 MISC metadata.xml 316 BLAKE2B 29c8ad67f4e7c5db4439aeae00deda8b57bb36bea7bd6490ae60efaa30cd2db1f7b2cff5b21558cdadea05f9caa8a9f4ee580fe2ea80959fe6ef7ef6f740c550 SHA512 86b3359e64e41ac4f2216e5bbcee6468100df3cd6e9c25595527d6819a2c27ce327797163a3a43bab11516a4826cff47825449cb797d7fe845794700a3a2bed0
diff --git a/dev-python/awscli/awscli-1.16.278.ebuild b/dev-python/awscli/awscli-1.16.278.ebuild
new file mode 100644
index 000000000000..2ebf30a1141d
--- /dev/null
+++ b/dev-python/awscli/awscli-1.16.278.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# requires network access
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/botocore-1.13.14[${PYTHON_USEDEP}]
+	<dev-python/colorama-0.3.9.0[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-5.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/aws-cli-${PV}"
+
+python_test() {
+	nosetests -vv || die
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/dev-python/awscli/awscli-1.16.283.ebuild b/dev-python/awscli/awscli-1.16.283.ebuild
new file mode 100644
index 000000000000..c60519f93156
--- /dev/null
+++ b/dev-python/awscli/awscli-1.16.283.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# requires network access
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/botocore-1.13.19[${PYTHON_USEDEP}]
+	<dev-python/colorama-0.3.9.0[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-5.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/aws-cli-${PV}"
+
+python_test() {
+	nosetests -vv || die
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 7cba26fcc719..6203352dac41 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -6,6 +6,8 @@ DIST botocore-1.12.223.tar.gz 5892788 BLAKE2B 32a25636c7e3882e567daefeb0945863dd
 DIST botocore-1.12.251.tar.gz 5936418 BLAKE2B a665d8a4c22bde4e5968b845e6df072a3ed2ce53561e007f2eaae144a91a77a32566c3c7f7a0158136b3e6d67aacffd5b77eed5fab51fe60fdfa29eb93e918ce SHA512 b29930367c602d40a7ce2386070dbaf83f34ea9321c7da40bf76ad7dae0587258fa2b3a058d17932d3e5fa22248c3ea5c838716fec5dce8da49e851b5c4f88d9
 DIST botocore-1.12.4.tar.gz 4800384 BLAKE2B 121019d3c33872fdd874ddba36ecc8612a6354068ce7b759cbe7f35a9787e84c34d3a71ef3fdd2d721d3c3973a7600e4398cb7cd2a3ba698464c15137845bdf3 SHA512 8d196984f5623df403a8a23a9b7e7061e59c0ca56103f89d749d6ad7d92168ccae267f85312f2949cee322776d7948f1ecfda3d9d2783e8ba92fde7a178e8cac
 DIST botocore-1.12.81.tar.gz 5383717 BLAKE2B 0bafd6038cf4a5d1fa4f0597024b09eca48ab95d071cccd09b1910ccf839719114166fab7d78bd2b30dec4b4993a0751d9504260636174df5f76f02495e79960 SHA512 d3be22af53a8c6dd55be3fa0b84a55cdce22d30d6e6f04b0bb69539b8107c86de6b5494079e3af40f9b5285ef10c21e69c85295e5cd7c6dc5ab5be91718a2ea9
+DIST botocore-1.13.14.tar.gz 5598238 BLAKE2B dda5dc707adc0b7b6239431f6230482650845d3e9049c963a873926ab1ef0e5e12cee2172cee79de886b726fd6cc8aa77ebbfb34757c64f9e644d9197a52e84c SHA512 a82724041d9e7ae5f2197ddfb922a1c0df99e1e8cbb47be4c18ab2a97b811fb8071dd512eb41e552563a3d97a640fbc7ec421d75dc51bd718339b061546f933e
+DIST botocore-1.13.19.tar.gz 5653940 BLAKE2B b7fa4678cb62bdc1c0db517e537c3c6a038dd3621261208f7f0cbc93644bcb68b0ed6ef13fee11a029897a1212feeb24b2cf44bf99d385af0af299afae1789d6 SHA512 86a1f6e5cd5a5f13b9ae2ceb1f113a136604b97888dd71775d7f6627081fa3704acb8f64143c274839658431f1196f2f35f13b3e2bc6d6ddb916cb5693881c5b
 DIST botocore-1.13.2.tar.gz 5560942 BLAKE2B a46c72fc62bb776e4d462fea49d7010f45502c201d956ce5878fe9b8673cadf186b5c61e60bda5d666eb47454799fa53f40cf59d7f10246c79374132fc3d03e8 SHA512 ef48ae18c61c83b43ac435c9b9e3e7c69963c19cc79bb34c7541d5d823f952c022b1b7e4eb1dfa33dd9fe5c14c87f7cf72d0e9d17012984c9f10c06abe27d279
 EBUILD botocore-1.12.122.ebuild 1489 BLAKE2B ae51526223136a8809a7c834cae3db2b95f940870ccc96b64d7c79dbdad83ca85e235cf169357fd25b4632aa0a87b0d8c7d7ebb739487435518a8a595b9139be SHA512 9c8e8400fad4fc0adef47bfa77767a0e59bef09c98a54492c0f0a56739b65b0689df8cf3702eab42e545a9dd257a5b820e39c31b9f23860f7792940dad4521b2
 EBUILD botocore-1.12.205.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
@@ -14,6 +16,8 @@ EBUILD botocore-1.12.223.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921
 EBUILD botocore-1.12.251.ebuild 1488 BLAKE2B 0e0b08cd23b6a311db992753ee65d6375771241a1b588f02de98d4dcf27d0bc534a9f3c3851322f7ff60c37a7c4afc5a28400756feb948a6ca7c71c08f41fcb2 SHA512 8d7bb8c5821453fcfbe6077666d7010ba1253f60afc34e23f8936e680e9fc84b3251b4e9f4ddccadf34b34aa4b828316351412b2c63f11845fe25dba7ee4eff0
 EBUILD botocore-1.12.4-r1.ebuild 1489 BLAKE2B ae51526223136a8809a7c834cae3db2b95f940870ccc96b64d7c79dbdad83ca85e235cf169357fd25b4632aa0a87b0d8c7d7ebb739487435518a8a595b9139be SHA512 9c8e8400fad4fc0adef47bfa77767a0e59bef09c98a54492c0f0a56739b65b0689df8cf3702eab42e545a9dd257a5b820e39c31b9f23860f7792940dad4521b2
 EBUILD botocore-1.12.81.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
+EBUILD botocore-1.13.14.ebuild 1518 BLAKE2B 665d08c47bd9b65eefc8d25d082f9393a84da7c5ec824516792f0631b5b13a8047a2c5c51f95b22609cd7afdec46aa25f6d05e57ab8338c231a961c1c27f87a1 SHA512 32714609013f3f44d6e1b1b7fadf5107df7879b7b368d3411f1b3e895803cd1c5b5b9746e43a7e8fdff010070ccdfdc9062df63c0e1c28fbc0dc541b458b6222
+EBUILD botocore-1.13.19.ebuild 1518 BLAKE2B 665d08c47bd9b65eefc8d25d082f9393a84da7c5ec824516792f0631b5b13a8047a2c5c51f95b22609cd7afdec46aa25f6d05e57ab8338c231a961c1c27f87a1 SHA512 32714609013f3f44d6e1b1b7fadf5107df7879b7b368d3411f1b3e895803cd1c5b5b9746e43a7e8fdff010070ccdfdc9062df63c0e1c28fbc0dc541b458b6222
 EBUILD botocore-1.13.2.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
-EBUILD botocore-9999.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
+EBUILD botocore-9999.ebuild 1518 BLAKE2B 665d08c47bd9b65eefc8d25d082f9393a84da7c5ec824516792f0631b5b13a8047a2c5c51f95b22609cd7afdec46aa25f6d05e57ab8338c231a961c1c27f87a1 SHA512 32714609013f3f44d6e1b1b7fadf5107df7879b7b368d3411f1b3e895803cd1c5b5b9746e43a7e8fdff010070ccdfdc9062df63c0e1c28fbc0dc541b458b6222
 MISC metadata.xml 487 BLAKE2B 4da33579cf14e968e507d4115e361aca7f13f618853758ae8cabd3ae7cc3adffdf374c091fe8086382728be8a59a8ee289408e53865807e0e0f93546d3eeadf8 SHA512 9df7187812d396f69b5a3499c20fa062a703c6a0385e63c812a2e1b7dd10a2c16343ff49d2585b17256623fe1b465f0e73d0fa39b07827338ed7fcfa38e45e90
diff --git a/dev-python/botocore/botocore-1.13.14.ebuild b/dev-python/botocore/botocore-1.13.14.ebuild
new file mode 100644
index 000000000000..1b2106971f31
--- /dev/null
+++ b/dev-python/botocore/botocore-1.13.14.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/botocore/botocore-1.13.19.ebuild b/dev-python/botocore/botocore-1.13.19.ebuild
new file mode 100644
index 000000000000..1b2106971f31
--- /dev/null
+++ b/dev-python/botocore/botocore-1.13.19.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/botocore/botocore-9999.ebuild b/dev-python/botocore/botocore-9999.ebuild
index f81c7d0b849a..1b2106971f31 100644
--- a/dev-python/botocore/botocore-9999.ebuild
+++ b/dev-python/botocore/botocore-9999.ebuild
@@ -11,6 +11,7 @@ HOMEPAGE="https://github.com/boto/botocore"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/boto/botocore"
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index e61ce7e21d98..589536283919 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -4,5 +4,5 @@ DIST certifi-2019.6.16.tar.gz 156721 BLAKE2B 3990a9c122dbaf554f4482ad97192efa66f
 DIST certifi-2019.9.11.tar.gz 154855 BLAKE2B 1a2e39b44e2285bcf2dfc0104873fc2c5004c54b346a27beebffa28894c22ba77b7ba0b17131e686846be14c2200ea0fba89f8b465f4c61139122d88d6d1ebf6 SHA512 aab5734bf65cbad12772bb120153b0325a5c3226339e0a03fdf4c3413303feb930b6d53d1d9dab93bd4f3cf00d2bfbe86419c4c462570340f1a4aa143a31373c
 EBUILD certifi-2018.4.16.ebuild 1394 BLAKE2B 631b8ac0be4695a24f478114a02e6bb39b6c0dd7bdcc43c030017d7130f8ccd88c93e269dba52597238984ea8ce171be56b366ac549f54e321569ebb71363d4d SHA512 520854ce5851c12139c5fd05d0bfb2abe3a61429d34dfacdbaa8d74cad8027d9f2a34d450b618f2ebe46ab8c586f12318dd5d6166edf7166f701d8f923ec0f20
 EBUILD certifi-2019.6.16.ebuild 1380 BLAKE2B 7180aa27e17db38fd7cdd36cfc20da801f6d87f2db041e8f5c1a0da23a4bcd6b9ae249e975a2e5df80134f2bbb34a10db7e07400ffdcdbfbd293caa9dd0ab07f SHA512 9b6a32ae29ec76ca6e7dc355634b2dc67e5fa8d414d5c6fdbb3f06fda4fa156fe74bd8a97e4650380777ccec20d0882802c200dfc28e25c16c98c63de749f5e9
-EBUILD certifi-2019.9.11.ebuild 1400 BLAKE2B 022ea73f054ea135c5f026166b650f0860e3ac3ee991b0c77ec05ee7d17c5384ad01b75d4b7591891b70aade4840b1f08e7cd6caae4580eb7e8d33a2ed5ae922 SHA512 c4d7db6ce1cb2e7ad9b8cfb3faf2f9396506ba9cd04b034337466db58ace2a7ce07ed122e27fee8a9e58ac45f3bf7151df267121f0c9530635fc38aa25c9f5fa
+EBUILD certifi-2019.9.11.ebuild 1402 BLAKE2B 08bdd49c696001a2817ebfd2d59978dbedbf8eda2eb10b32bdbe1c33183f835c8656cb36e5fa01c938754961bfd1cbf498e0ece792b5901055e2a9007877fd09 SHA512 70ebad533cad1e523fa5ebdfc6cb3854d25817a41f5495862de2dcec15f9e819ea2dc65cbb263d50dbce1c1445dcc362caaf7ce5f4d08c268fb63b8d8d767339
 MISC metadata.xml 320 BLAKE2B ba5c3c1018c5cba293969a523ab6c388f5bc0d0cfdfc69a4b143f1c966aad036df449bb091eacdeae2335a6bdc722da85882caad2a447bf87b600da2ed7c5309 SHA512 0e99564887f0a0b314056b2e1f4b6e3afcaf908de6824a2cc87deab9d1832566e97b8ba88cc7d2bdc5d11e7f1c8532830fc59602efd8c2f1a6061c0ad4853fdd
diff --git a/dev-python/certifi/certifi-2019.9.11.ebuild b/dev-python/certifi/certifi-2019.9.11.ebuild
index 699a4c5dbe06..ba409ef85575 100644
--- a/dev-python/certifi/certifi-2019.9.11.ebuild
+++ b/dev-python/certifi/certifi-2019.9.11.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,8} pypy{,3} )
 
 inherit distutils-r1 prefix readme.gentoo-r1
 
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index 754b203c690e..fe46d1147b0c 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -4,10 +4,10 @@ DIST cffi-1.11.5.tar.gz 438498 BLAKE2B 2e22cf3c2d50d76f8f25b7ac31a77fac8a49e2b2f
 DIST cffi-1.12.1.tar.gz 453584 BLAKE2B fb0fee63f5cc4dacd1055036ed6e7882452e848dfece99adadad7ebb1f0cc4171d1be5370fda5552da45127e374382b29cdc8e1f5122081d2551604630774cac SHA512 1863ad26d730d629e1397ba155bebd3f9edc881d661fda5301a5acb080c8e006925317c1b092f054c46834d693c437d6e91a687f379c9ab029223a9a159eaf48
 DIST cffi-1.12.3.tar.gz 456340 BLAKE2B bac7265ed9b0858d791443572f39316fdf809c8e40b5a2557ccd667858d994cb44368b4b74655813833d3c5cd5c266fbb5227d777db8fcedc599917f31dab7ad SHA512 9070f5cfe543c9261a79f995548899c3e7539ee20f562ba91a4a909887745bd28448b0e38241031d6b2ab87286fd0ec91768b8bf6577716427612d41b0ed3b93
 DIST cffi-1.9.1.tar.gz 407108 BLAKE2B f95e99cbb7a10aacb714d6ddbe85755e24d4fbdebb9ada0ab87c95b58aa56b364df612fbdfbf6fcc3a9dfff6e96fe5e979ee37b1c6c9b62b6ba8d3a9565def2f SHA512 6e76f181b6b7b760a14ad70338edd104a8b8e2eac5680e336d3868e0bd031a1665608e29a65dc0c56806afb8a8c03811586f151f3acef11e54e60c1bfcf902e3
-EBUILD cffi-1.11.2.ebuild 1464 BLAKE2B 0e23306eabdd787a80ffef8c93f90078830d1442f0f4e4a1e9607754271547bcb3b9be2b41aca8e93ad27b2d4b090e565fcb9ca4acc43536a480716664758052 SHA512 db8f7497b34ac66335a84502105e3ed7fcc11f31c9db0d57b35b9a02f0c205c86a64042e9dc3c56eecbc75789df94d54823a5393877b4f2083902f17f6029769
-EBUILD cffi-1.11.4.ebuild 1453 BLAKE2B 4b6c930030d3d2650356bea0b29f2af8cc5f221f8065a343e5b2f6971754e7f3be294362b4b065c4f8b3202e416c44698fe60db45941dfa6ae347b076635bcb7 SHA512 8def6ec3831e9657e8875ea592e2f505764d39c85c1c8e31f126006c3357848134704b575d9e81e7d0dd1096cc25e47f747e2bbc8e606a1ea115888b7c58e85e
-EBUILD cffi-1.11.5.ebuild 1555 BLAKE2B 4bc1e78766ca49780cfaa19e6b9adc4b53fa0af57f571f01c6444bb09e3ccc259eb83206e9ac96190189dea55318369935ed53e1a818e2f4605d22aca0718ba0 SHA512 6986bf39fa5f392caece758beff6c64e69425097f419be3052aaff6acc98bd6dbedfe56f620a21c9f6d9c2f33653700ba2d54dde0e79a80fe38675c2f7e16b2d
-EBUILD cffi-1.12.1.ebuild 1555 BLAKE2B 4bc1e78766ca49780cfaa19e6b9adc4b53fa0af57f571f01c6444bb09e3ccc259eb83206e9ac96190189dea55318369935ed53e1a818e2f4605d22aca0718ba0 SHA512 6986bf39fa5f392caece758beff6c64e69425097f419be3052aaff6acc98bd6dbedfe56f620a21c9f6d9c2f33653700ba2d54dde0e79a80fe38675c2f7e16b2d
-EBUILD cffi-1.12.3.ebuild 1555 BLAKE2B 9a01a7e9191ad6d60edb9f978ed0eb43956a54acab79e2b614fabd02eca873f65ca48c680f510f87747dae74840128e2841a53339ff70f5047f0780a5099a4ed SHA512 02e203fe30934273ed21050bf90e3717fbb0ccb8d4f6e5df5318e261532faa9e02878e92e1dcfd6ebaa22d0bcd2d945401422726c02773def15f72be02ec219d
-EBUILD cffi-1.9.1.ebuild 1454 BLAKE2B 749a35306df4754649006a793c9f3e73fb2e7217bded7da21f26363425df306d570c5d296dc004179c2439577eca77d3acb9085316a30624bb41dbbfdd6fc1b9 SHA512 35ea57c33d896632c972f5e7514da7ef3375c923b31d82ef6c379edd8226c13182a452c853de435c855349b8e3b6a3011e6fbf764500b6ba34009107f2a5cc5c
+EBUILD cffi-1.11.2.ebuild 1491 BLAKE2B 6e5bb4cbaf19f43227d3ddd1cacbf97adb573daac72865a7e209631b92549757694f320c8bc315410d98e69d9deaa984b1e4f3e4ce4b851d093bbf3f9ac8c424 SHA512 99e575a5e9d85b7deb11ab1f32dae93b8d9c7ccd5d46b666890dfb1d98efe38128e93619479127aa50458769c8342ae3da8b15c10e51948c4b165b654ada2bb9
+EBUILD cffi-1.11.4.ebuild 1480 BLAKE2B 354d245b6d37c73aa98f567fda2c0081fdd4b268d0087164218ea4742718e95205f0dfd41c18714f5f257201512176df5a50b4190ef6d9f2b892293972d0f94b SHA512 d2361253ea42d6bc50ace5394eee3058b10b2182f6db8edeaad9ea9636ebbc8460442c5cdb3b1e50c2be649714f4cd9e7edc3a6b911704613517e5d91d27275b
+EBUILD cffi-1.11.5.ebuild 1582 BLAKE2B 3c8c1002ca7b3ad277ae2222a0168285700e9f0a445a81445f32e4419d8d325ccd0e303d9c1fffc3e6b6f107043ff2f8e9bf10324198f9c32495c69aa9ad4e6b SHA512 1a87a24cbe82d17aa4676296567d5c660764053065f297cd9f048def18fa85716db9f861d8307af7f4b1d63a82cc32870fc4a6a1d646f7a30c3f536d3727e462
+EBUILD cffi-1.12.1.ebuild 1582 BLAKE2B 3c8c1002ca7b3ad277ae2222a0168285700e9f0a445a81445f32e4419d8d325ccd0e303d9c1fffc3e6b6f107043ff2f8e9bf10324198f9c32495c69aa9ad4e6b SHA512 1a87a24cbe82d17aa4676296567d5c660764053065f297cd9f048def18fa85716db9f861d8307af7f4b1d63a82cc32870fc4a6a1d646f7a30c3f536d3727e462
+EBUILD cffi-1.12.3.ebuild 1519 BLAKE2B d51e6d9d0d8b5762b359fcf63e4ffbf93df75de6bbe5e300ca18507979b21f7ea774e4b1db59b481f19ad7ee2f24fba266c575f0c6a201f8345349d9903e1e69 SHA512 23c72b4a6ccfdf666159e8bfd9efe88a1dccb58874754a4cb5ab35040b447b91b534a3c4c84d51829c28817bb197fbbea0d47060cf7adfdcf7e242d7906f3529
+EBUILD cffi-1.9.1.ebuild 1481 BLAKE2B a1f6ea34fb65784e00f04e22bb1df51a1944af481c3e573911448137f32d7be40b264916158a9e835d17f9a80d9ff23e3048e98275fa9b3426d9081b33557eb9 SHA512 e4e57197c669ec81d7d98e7b447fed58395857ee6b61f21754dada6dcb17fe942e855b3b26095c039c6830d1af67d5e3962950cbeb77adf5c6d6633ca08c8f2e
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.11.2.ebuild b/dev-python/cffi/cffi-1.11.2.ebuild
index 709d7aa78325..7997903d406d 100644
--- a/dev-python/cffi/cffi-1.11.2.ebuild
+++ b/dev-python/cffi/cffi-1.11.2.ebuild
@@ -17,6 +17,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/libffi:=
diff --git a/dev-python/cffi/cffi-1.11.4.ebuild b/dev-python/cffi/cffi-1.11.4.ebuild
index 904d3fe1a3e7..4fa309be531e 100644
--- a/dev-python/cffi/cffi-1.11.4.ebuild
+++ b/dev-python/cffi/cffi-1.11.4.ebuild
@@ -17,6 +17,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/libffi:=
diff --git a/dev-python/cffi/cffi-1.11.5.ebuild b/dev-python/cffi/cffi-1.11.5.ebuild
index 841c6f44825b..338c67e6375a 100644
--- a/dev-python/cffi/cffi-1.11.5.ebuild
+++ b/dev-python/cffi/cffi-1.11.5.ebuild
@@ -17,6 +17,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/libffi:=
diff --git a/dev-python/cffi/cffi-1.12.1.ebuild b/dev-python/cffi/cffi-1.12.1.ebuild
index 841c6f44825b..338c67e6375a 100644
--- a/dev-python/cffi/cffi-1.12.1.ebuild
+++ b/dev-python/cffi/cffi-1.12.1.ebuild
@@ -17,6 +17,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/libffi:=
diff --git a/dev-python/cffi/cffi-1.12.3.ebuild b/dev-python/cffi/cffi-1.12.3.ebuild
index 840d0fec402c..227b58619cf0 100644
--- a/dev-python/cffi/cffi-1.12.3.ebuild
+++ b/dev-python/cffi/cffi-1.12.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # DO NOT ADD pypy to PYTHON_COMPAT
 # pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
 
 inherit distutils-r1 toolchain-funcs
 
@@ -17,13 +17,14 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/libffi:=
 	dev-python/pycparser[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 # Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
@@ -38,10 +39,8 @@ python_compile_all() {
 }
 
 python_test() {
-	einfo "$PYTHONPATH"
-	$PYTHON -c "import _cffi_backend as backend" || die
-	PYTHONPATH="${PYTHONPATH}" \
-	py.test -x -v \
+	"${PYTHON}" -c "import _cffi_backend as backend" || die
+	pytest -x -vv \
 		--ignore testing/test_zintegration.py \
 		--ignore testing/embedding \
 		c/ testing/ \
diff --git a/dev-python/cffi/cffi-1.9.1.ebuild b/dev-python/cffi/cffi-1.9.1.ebuild
index f104bf7a9c46..3b260e715e71 100644
--- a/dev-python/cffi/cffi-1.9.1.ebuild
+++ b/dev-python/cffi/cffi-1.9.1.ebuild
@@ -17,6 +17,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/libffi:=
diff --git a/dev-python/cgkit/Manifest b/dev-python/cgkit/Manifest
deleted file mode 100644
index 2afb91c0e0d9..000000000000
--- a/dev-python/cgkit/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX cgkit-2.0.0-fix-build-system.patch 1202 BLAKE2B ed474cc7fdd46c365d4064ba952afba2c9959589ae25514e113bd28f0043cf6861db053ff5f773932b29a796f364c880117cf6a031facf2710f27582fd55b096 SHA512 1bb685b9a26e81005ebcb21381cbe855a26bc6a4ac5ddb2ef42a054b5b7753a9f3aaf4bfc669ca2ab944e332f8aa01025473c8eed2118d1b48e047622d4c2b5c
-AUX cgkit-2.0.0-fix-c++14.patch 1200 BLAKE2B 9b55b90b9a4fa2bee77a44035296274387d35fd18584f27e61709a77bbca18d8ec279849a25d6603f609ab73011d9919343985195ef5915109c23c3363f77ffa SHA512 0ff1f9e613e44f9b4ab97bce7b83360c22652e1b0374a2b772e8971fcddb4386d49b1df23d7617a2a0c8e824f24eaad5c8c26e82380da50fba8a5f834f6257a2
-AUX cgkit-py2k-pillow.patch 2021 BLAKE2B cdf751cf4b8d88780a139074ef14fb9440be9d0b8378c7ada0a55f53edabf9d38504075b13c90fa2dbc53ee52634dc84519acc6d4f1358807eabb12d21d702ea SHA512 32d03359acb6d890d28f1e8fee8f62d136c52624313c65381fdde1f835f5d96c0337d310a22b7449508cc41be9af9c2215287b641a99f4f4c231593d948dc9bf
-AUX cgkit-py3k-pillow.patch 2025 BLAKE2B aa036db10e22b6c92c56a4e0e356d9fa8d14acc32121682d32b3f9221119f863a39ced8fcec2b23f40baf4b75c95df427757471ad435bb00c7ac889e3541f897 SHA512 163f0e13d9aa960a64beaaac2211b8e854f70bb18fdd1529a4d368ccd60d3c432ec33489c9de3438502409a7a530ee1131c0360992cac30fee5d549e7c88fc4e
-DIST cgkit-2.0.0-py2k.tar.gz 885682 BLAKE2B f32eb8f05197ae44b3a1d5bf734d779c6e7f53af526f1686348e977f55bc584f565eea9e3831f562dae6aa6715d732465e0d37b07746065e965f945ee1152d18 SHA512 44e57cafc3ba3aa824c44fe4ad04f350dfe053cafa09523acab220e8a5db45dde042b4fcc3e444dc3c248a43ddd94faac6875f579c2063e6c8feba7841472f7c
-DIST cgkit-2.0.0-py3k.tar.gz 885012 BLAKE2B fe48d57ec01ee286c0974b53e088f74db73a19d6cdf9ebde43f3190a46994c803f870f2546583cf6d4bce984895469f61a82e99e6bf98da77443b3857b70b60e SHA512 0c721d728e2cacb3a5518bfdf49810793a7e4a7efdec54a95d9b8b64099996452a08193c90e1b76f57852c3593bf07e4361ba20c17ea3565413d4997e9cf6c2e
-EBUILD cgkit-2.0.0-r1.ebuild 2117 BLAKE2B 2d43f18890634b8c1e1f49c266e7313dc0741427a4226c73b1929a001c5e1162eb385337ec5a57c95f402e78c3309e2570ca6df682446f9b52d2ea3df48d38b5 SHA512 66db9f2bf26b235812f7672fe47b453c48d2d3840f292c56109c9e1bb6a679ef100241a3cfd82ad3bb52804f22fed18e402646d64eaa0713ce8550ea180be9bf
-EBUILD cgkit-2.0.0-r2.ebuild 2279 BLAKE2B fe0db791431bf4159cc4efc4565d22d765537402d060381cce4fa2f66f0cf8cac6ff63da792a817bd44e328eff559d8566ee31738ae6261ecb2ec78eafa62a69 SHA512 7292e085697d53552a8e25dec3e3fecbd062284baa2e40ddbd4a29290b191ae8487e588a05e0c9491e56bf3e10001cdb10279e706db832846eb8be1c167932d7
-MISC metadata.xml 613 BLAKE2B 1ab7e4e1a5527090988592c49fdabfa5cb34527ac802efe6f4b144980a88346f6f2bfba8dabd94b63675e811852e3aa6c4dfe12d1ff65562a9c1ef74f8a96fc8 SHA512 276fc1ce3f5ef82f91499436866d31a2807c1d753eabc5bf5494af756086327320f671cd30e4628b4fd4740774a3d7bc83e14175157375abcf01b496589fc85b
diff --git a/dev-python/cgkit/cgkit-2.0.0-r1.ebuild b/dev-python/cgkit/cgkit-2.0.0-r1.ebuild
deleted file mode 100644
index da0ba8bbd4f0..000000000000
--- a/dev-python/cgkit/cgkit-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1 scons-utils toolchain-funcs
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Python library for creating 3D images"
-HOMEPAGE="http://cgkit.sourceforge.net"
-SRC_URI="
-	$(python_gen_cond_dep mirror://sourceforge/${PN}/${PN}/${P}/${P}-py2k.tar.gz 'python2*')
-	$(python_gen_cond_dep mirror://sourceforge/${PN}/${PN}/${P}/${P}-py3k.tar.gz 'python3*')"
-
-LICENSE="LGPL-2.1 MPL-1.1 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="3ds"
-
-RDEPEND="
-	>=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/pyprotocols[${PYTHON_USEDEP}]' 'python2*')
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	dev-python/pygame[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	3ds? ( ~media-libs/lib3ds-1.3.0 )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	cgkit_unpack() {
-		local tarball
-		if python_is_python3; then
-			tarball=${P}-py3k.tar.gz
-		else
-			tarball=${P}-py2k.tar.gz
-		fi
-		mkdir "${BUILD_DIR}" || die
-		tar -C "${BUILD_DIR}" -x --strip-components 1 -f "${DISTDIR}/${tarball}" || die
-	}
-	python_foreach_impl cgkit_unpack
-	mkdir "${S}" || die
-}
-
-python_prepare() {
-	eapply \
-		"${FILESDIR}"/${PN}-2.0.0-fix-build-system.patch \
-		"${FILESDIR}"/${PN}-2.0.0-fix-c++14.patch
-	if python_is_python3; then
-		eapply "${FILESDIR}"/${PN}-py3k-pillow.patch
-	else
-		eapply "${FILESDIR}"/${PN}-py2k-pillow.patch
-	fi
-
-	cp config_template.cfg config.cfg || die
-	cat >> config.cfg <<- _EOF_ || die
-		BOOST_LIB = 'boost_python-${EPYTHON#python}'
-		LIBS += ['GL', 'GLU', 'glut']
-		LIB3DS_AVAILABLE = $(usex 3ds True False)
-	_EOF_
-
-	# Remove invalid test
-	rm -f unittests/test_pointcloud.py || die
-}
-
-python_configure_all() {
-	tc-export AR CXX
-}
-
-python_compile() {
-	pushd supportlib >/dev/null || die
-	CXXFLAGS="${CXXFLAGS} -fPIC" escons
-	popd >/dev/null || die
-	distutils-r1_python_compile
-}
-
-python_test() {
-	pushd unittests >/dev/null || die
-	mkdir tmp || die
-	"${EPYTHON}" all.py || die "Testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
diff --git a/dev-python/cgkit/cgkit-2.0.0-r2.ebuild b/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
deleted file mode 100644
index 0edbc19a9c5f..000000000000
--- a/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1 scons-utils toolchain-funcs
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Python library for creating 3D images"
-HOMEPAGE="http://cgkit.sourceforge.net"
-SRC_URI="
-	$(python_gen_cond_dep mirror://sourceforge/${PN}/${PN}/${P}/${P}-py2k.tar.gz 'python2*')
-	$(python_gen_cond_dep mirror://sourceforge/${PN}/${PN}/${P}/${P}-py3k.tar.gz 'python3*')"
-
-LICENSE="LGPL-2.1 MPL-1.1 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="3ds"
-
-RDEPEND="
-	>=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/pyprotocols[${PYTHON_USEDEP}]' 'python2*')
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	dev-python/pygame[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	3ds? ( ~media-libs/lib3ds-1.3.0 )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	cgkit_unpack() {
-		local tarball
-		if python_is_python3; then
-			tarball=${P}-py3k.tar.gz
-		else
-			tarball=${P}-py2k.tar.gz
-		fi
-		mkdir "${BUILD_DIR}" || die
-		tar -C "${BUILD_DIR}" -x --strip-components 1 -f "${DISTDIR}/${tarball}" || die
-	}
-	python_foreach_impl cgkit_unpack
-	mkdir "${S}" || die
-}
-
-python_prepare() {
-	eapply \
-		"${FILESDIR}"/${PN}-2.0.0-fix-build-system.patch \
-		"${FILESDIR}"/${PN}-2.0.0-fix-c++14.patch
-	if python_is_python3; then
-		eapply "${FILESDIR}"/${PN}-py3k-pillow.patch
-	else
-		eapply "${FILESDIR}"/${PN}-py2k-pillow.patch
-	fi
-
-	local boostpy_ver="${EPYTHON#python}"
-	if has_version ">=dev-libs/boost-1.70"; then
-		boostpy_ver="${boostpy_ver/\.}"
-	else
-		boostpy_ver="-${boostpy_ver}"
-	fi
-
-	cp config_template.cfg config.cfg || die
-	cat >> config.cfg <<- _EOF_ || die
-		BOOST_LIB = 'boost_python${boostpy_ver}'
-		LIBS += ['GL', 'GLU', 'glut']
-		LIB3DS_AVAILABLE = $(usex 3ds True False)
-	_EOF_
-
-	# Remove invalid test
-	rm -f unittests/test_pointcloud.py || die
-}
-
-python_configure_all() {
-	tc-export AR CXX
-}
-
-python_compile() {
-	pushd supportlib >/dev/null || die
-	CXXFLAGS="${CXXFLAGS} -fPIC" escons
-	popd >/dev/null || die
-	distutils-r1_python_compile
-}
-
-python_test() {
-	pushd unittests >/dev/null || die
-	mkdir tmp || die
-	"${EPYTHON}" all.py || die "Testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
diff --git a/dev-python/cgkit/files/cgkit-2.0.0-fix-build-system.patch b/dev-python/cgkit/files/cgkit-2.0.0-fix-build-system.patch
deleted file mode 100644
index 2b62071380c1..000000000000
--- a/dev-python/cgkit/files/cgkit-2.0.0-fix-build-system.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Make scons respect user variables
-
---- a/setup.py
-+++ b/setup.py
-@@ -214,7 +214,7 @@
- 
- # The following variables are used to customize the compile process
- 
--INC_DIRS = []
-+INC_DIRS = ['/usr/include']
- LIB_DIRS = []
- LIBS     = []
- CC_ARGS  = []
---- a/supportlib/SConstruct
-+++ b/supportlib/SConstruct
-@@ -30,19 +30,11 @@
- # Add the local 'include' directory...
- env.Append(CPPPATH = ["include"])
- 
--# Do platform specific stuff...
--if sys.platform=="win32":
--    env.Append(CCFLAGS = ["/GX", "/GR", "/MD", "/W3"])
--    env.Append(CPPDEFINES = ["WIN32", "_LIB"])
--elif sys.platform=="darwin":
--    env.Append(CCFLAGS = ["-arch", "x86_64"])
--    env.Append(CCFLAGS = ["-arch", "i386"])
--#    env.Append(CCFLAGS = ["-arch", "ppc"])
--    env.Append(CPPPATH = ["/opt/local/include"])
--    env.Append(CCFLAGS = ["-fPIC"])
--else:
--    env.Append(CPPPATH = ["/opt/local/include"])
--    env.Append(CCFLAGS = ["-fPIC"])
-+env.Append(CPPPATH = ['/usr/include'])
-+env['AR'] = os.environ.get('AR', 'ar')
-+env['CXX'] = os.environ.get('CXX', 'g++')
-+env['CXXFLAGS'] = os.environ.get('CXXFLAGS', '-fPIC')
-+env['CPPFLAGS'] = os.environ.get('CPPFLAGS', '')
- 
- # Setup the help message
- Help(vars.GenerateHelpText(env))
diff --git a/dev-python/cgkit/files/cgkit-2.0.0-fix-c++14.patch b/dev-python/cgkit/files/cgkit-2.0.0-fix-c++14.patch
deleted file mode 100644
index 70f794664e81..000000000000
--- a/dev-python/cgkit/files/cgkit-2.0.0-fix-c++14.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Fix building in C++14 mode
-
---- a/wrappers/py_geoms1.cpp
-+++ b/wrappers/py_geoms1.cpp
-@@ -142,7 +142,7 @@
-       string name = it->first;
-       const PrimVarInfo& info = it->second;
-       it++;
--      return make_tuple(name, info.storage, info.type, info.multiplicity);
-+      return boost::python::make_tuple(name, info.storage, info.type, info.multiplicity);
-     }
-   }
-   
-@@ -163,7 +163,7 @@
-   }
-   else
-   {
--    return make_tuple(name, info->storage, info->type, info->multiplicity);
-+    return boost::python::make_tuple(name, info->storage, info->type, info->multiplicity);
-   }    
- }
- 
---- a/wrappers/py_slot.h
-+++ b/wrappers/py_slot.h
-@@ -40,7 +40,7 @@
- //    .def("onValueChanged", &Slot<double>::onValueChanged, &SlotWrapper<double>::base_onValueChanged) 
- 
- // This macro can be used to create a new Python array slot type
--#define ARRAYSLOT(sname,stype) class_<_ArraySlotIterator<stype> >("_"sname"_Iterator", init<ArraySlot<stype>&>()) \
-+#define ARRAYSLOT(sname,stype) class_<_ArraySlotIterator<stype> >("_" sname "_Iterator", init<ArraySlot<stype>&>()) \
-     .def("__iter__", &_ArraySlotIterator<stype>::__iter__) \
-     .def("next", &_ArraySlotIterator<stype>::next) \
-   ; \
diff --git a/dev-python/cgkit/files/cgkit-py2k-pillow.patch b/dev-python/cgkit/files/cgkit-py2k-pillow.patch
deleted file mode 100644
index 0cddbd60b868..000000000000
--- a/dev-python/cgkit/files/cgkit-py2k-pillow.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 83cb693954f6f56e50a1aa90d935e94e9e8bac8e Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 5 Jun 2013 20:39:05 -0400
-Subject: [PATCH] Update PIL imports for compatibility with Pillow
-
----
- cgkit/_Image.py       | 2 +-
- cgkit/_ImageDraw.py   | 2 +-
- cgkit/riutil.py       | 2 +-
- utilities/checkenv.py | 2 +-
- utilities/postbake.py | 3 ++-
- 5 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/cgkit/_Image.py b/cgkit/_Image.py
-index 7266d4b..0122cd2 100644
---- a/cgkit/_Image.py
-+++ b/cgkit/_Image.py
-@@ -38,7 +38,7 @@
- try:
- 
-     # Try to import the original module...
--    from Image import *
-+    from PIL.Image import *
-     
- except ImportError:
- 
-diff --git a/cgkit/_ImageDraw.py b/cgkit/_ImageDraw.py
-index dfd6cf8..d1d3cff 100644
---- a/cgkit/_ImageDraw.py
-+++ b/cgkit/_ImageDraw.py
-@@ -38,7 +38,7 @@
- try:
- 
-     # Try to import the original module...
--    from ImageDraw import *
-+    from PIL.ImageDraw import *
-     
- except ImportError:
- 
-diff --git a/cgkit/riutil.py b/cgkit/riutil.py
-index 301e0f6..ae373c3 100644
---- a/cgkit/riutil.py
-+++ b/cgkit/riutil.py
-@@ -38,7 +38,7 @@ import types, sys, getpass
- from cgtypes import vec3
- from ri import *
- try:
--    import Image
-+    from PIL import Image
-     _PIL_installed = 1
- except ImportError:
-     _PIL_installed = 0
-diff --git a/utilities/checkenv.py b/utilities/checkenv.py
-index b95dbf7..c93235e 100644
---- a/utilities/checkenv.py
-+++ b/utilities/checkenv.py
-@@ -96,7 +96,7 @@ visualize them. You can obtain PyOpenGL at http://pyopengl.sourceforge.net/
- # Check PIL
- chkmsg("PIL")
- try:
--    import Image
-+    from PIL import Image
-     print "is installed"
- except:
-     print "missing"
-diff --git a/utilities/postbake.py b/utilities/postbake.py
-index cadd11d..74f894a 100644
---- a/utilities/postbake.py
-+++ b/utilities/postbake.py
-@@ -34,7 +34,8 @@
- #
- # ***** END LICENSE BLOCK *****
- 
--import sys, optparse, Image
-+import sys, optparse
-+from PIL import Image
- 
- # shift
- def shift(img, dx, dy):
--- 
-1.8.2.1
-
diff --git a/dev-python/cgkit/files/cgkit-py3k-pillow.patch b/dev-python/cgkit/files/cgkit-py3k-pillow.patch
deleted file mode 100644
index 734ff6eb356a..000000000000
--- a/dev-python/cgkit/files/cgkit-py3k-pillow.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 1953081269ce1cfdf29023a8590db40312c43194 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 5 Jun 2013 20:39:05 -0400
-Subject: [PATCH] Update PIL imports for compatibility with Pillow
-
----
- cgkit/_Image.py       | 2 +-
- cgkit/_ImageDraw.py   | 2 +-
- cgkit/riutil.py       | 2 +-
- utilities/checkenv.py | 2 +-
- utilities/postbake.py | 3 ++-
- 5 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/cgkit/_Image.py b/cgkit/_Image.py
-index 7266d4b..0122cd2 100644
---- a/cgkit/_Image.py
-+++ b/cgkit/_Image.py
-@@ -38,7 +38,7 @@
- try:
- 
-     # Try to import the original module...
--    from Image import *
-+    from PIL.Image import *
-     
- except ImportError:
- 
-diff --git a/cgkit/_ImageDraw.py b/cgkit/_ImageDraw.py
-index dfd6cf8..d1d3cff 100644
---- a/cgkit/_ImageDraw.py
-+++ b/cgkit/_ImageDraw.py
-@@ -38,7 +38,7 @@
- try:
- 
-     # Try to import the original module...
--    from ImageDraw import *
-+    from PIL.ImageDraw import *
-     
- except ImportError:
- 
-diff --git a/cgkit/riutil.py b/cgkit/riutil.py
-index b51f192..ae0fba2 100644
---- a/cgkit/riutil.py
-+++ b/cgkit/riutil.py
-@@ -38,7 +38,7 @@ import types, sys, getpass
- from .cgtypes import vec3
- from .ri import *
- try:
--    import Image
-+    from PIL import Image
-     _PIL_installed = 1
- except ImportError:
-     _PIL_installed = 0
-diff --git a/utilities/checkenv.py b/utilities/checkenv.py
-index dda600f..8b6f74e 100644
---- a/utilities/checkenv.py
-+++ b/utilities/checkenv.py
-@@ -96,7 +96,7 @@ visualize them. You can obtain PyOpenGL at http://pyopengl.sourceforge.net/
- # Check PIL
- chkmsg("PIL")
- try:
--    import Image
-+    from PIL import Image
-     print("is installed")
- except:
-     print("missing")
-diff --git a/utilities/postbake.py b/utilities/postbake.py
-index 90e3140..27728c2 100644
---- a/utilities/postbake.py
-+++ b/utilities/postbake.py
-@@ -34,7 +34,8 @@
- #
- # ***** END LICENSE BLOCK *****
- 
--import sys, optparse, Image
-+import sys, optparse
-+from PIL import Image
- 
- # shift
- def shift(img, dx, dy):
--- 
-1.8.2.1
-
diff --git a/dev-python/cgkit/metadata.xml b/dev-python/cgkit/metadata.xml
deleted file mode 100644
index b5c29ce8fc23..000000000000
--- a/dev-python/cgkit/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <use>
-    <flag name="3ds">Enable support for importing 3D Studio models</flag>
-  </use>
-  <longdescription>Python library for creating 3D images</longdescription>
-  <longdescription lang="ja">
-  3D画像を作成するためのPython言語ライブラリです。
-  </longdescription>
-  <upstream>
-    <remote-id type="sourceforge">cgkit</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/chardet/Manifest b/dev-python/chardet/Manifest
index 351f83a45083..735be534e879 100644
--- a/dev-python/chardet/Manifest
+++ b/dev-python/chardet/Manifest
@@ -1,3 +1,4 @@
+AUX chardet-3.0.4-pytest-4.patch 802 BLAKE2B 64992866c2f101b41f525a0f8cf642774850211f434b471dcfa5aaadcabd5ceb573d5b902f6cdecc2f651a71dc8955204f13beb8a5261d4d0ff3aa6703a4266d SHA512 ca99abb30e8e221b43b7467cfa385c0abb16addd4befd149e35208278a25faf07dd99edd20595be4d0d0d0afdf81602b47e0110f4e9335ef90f5b4c41b54b0ab
 DIST chardet-3.0.4.tar.gz 1872214 BLAKE2B b93e2d3e0b5a5c35affa5e3ee661323029f79837a1222d8f69db72911301d9490c9788d2effc577eeeb2a50334cc855afc4bdf4b8dbafb143fcc411d93b824a9 SHA512 b433ea0e15e200df968e6d61c671c42fbd77e519eb033035c4a5c241e1f98e1dfaea6747af632788507583b3ef85b00d510b3f6ef5cf58589ceca1b3a088b357
-EBUILD chardet-3.0.4.ebuild 985 BLAKE2B 8e8f40d39aa77ab7e711dfd8b86a789389dc483be2dfa71ae017c0b24d1ca9a8eafab9e0bbca394a9eef93b45607e3d1bd0adacd14fb7578c3b73f734b554507 SHA512 c8d759f7aaf51a75b9515351929b906d2ca65367213fa4392af8d9b27708fb9271112de3280a1d065f5027e0d579369b514cd53fc0d792d99e27ee5a56647d5c
+EBUILD chardet-3.0.4.ebuild 915 BLAKE2B bd5afda062113bf0cfbeb8e030134ef792039e00525894befeab09dee5aec822de2e8d602e622afc4bc08b4ced52ab1cdfe88830c2f0c1c98c45ea9d409453ff SHA512 a22cc9171b12e26e09d072777bc299151ab3d462b6dd58b6ee7cd3129329d835a60f6c11d69c3d1ae38c39f8ff4687f75ff25817744af572cffd74ad768d47c9
 MISC metadata.xml 377 BLAKE2B 8aa19a889e96303024d469c969a9e47613cabd1456b0e21888a02a091049e09a53c6faa3d0e128b5ea21b68f521cede9cf09b570f2fba7a4299187a44e40b018 SHA512 c48c3874a248049fc2845d0a64ee5b94c705ef58158f882f30bbdc561f311a7203cd8979e067a5b0f3f034c95cc4b6da373cea6efc9616f3dabc574772874650
diff --git a/dev-python/chardet/chardet-3.0.4.ebuild b/dev-python/chardet/chardet-3.0.4.ebuild
index c929783b3e22..6dce19acd095 100644
--- a/dev-python/chardet/chardet-3.0.4.ebuild
+++ b/dev-python/chardet/chardet-3.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -17,20 +17,14 @@ SRC_URI="https://github.com/chardet/chardet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
 
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
+	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )
 "
 
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-pytest-4.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/chardet/files/chardet-3.0.4-pytest-4.patch b/dev-python/chardet/files/chardet-3.0.4-pytest-4.patch
new file mode 100644
index 000000000000..eef88e9e9960
--- /dev/null
+++ b/dev-python/chardet/files/chardet-3.0.4-pytest-4.patch
@@ -0,0 +1,23 @@
+From 0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Tue, 12 Mar 2019 18:44:36 +0100
+Subject: [PATCH] Support pytest 4, don't apply marks directly to parameters
+
+Fixes https://github.com/chardet/chardet/issues/173
+---
+ test.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test.py b/test.py
+index 9833307..ad2b753 100644
+--- a/test.py
++++ b/test.py
+@@ -59,7 +59,7 @@ def gen_test_params():
+             full_path = join(path, file_name)
+             test_case = full_path, encoding
+             if full_path in EXPECTED_FAILURES:
+-                test_case = pytest.mark.xfail(test_case)
++                test_case = pytest.param(*test_case, marks=pytest.mark.xfail)
+             yield test_case
+ 
+ 
diff --git a/dev-python/citeproc-py/Manifest b/dev-python/citeproc-py/Manifest
index efc1991084d0..8e70de37e814 100644
--- a/dev-python/citeproc-py/Manifest
+++ b/dev-python/citeproc-py/Manifest
@@ -1,4 +1,4 @@
 AUX b1a5f925527093b0b5c11507f379a908e3354820.patch 1339 BLAKE2B 0dc159ac56179f13c528a13ad617d1ac52e65b4cc9be59bf6374adcb1ce787ffdc960bc70cc5dcd6287bd9bde4157f0ed1bb1511d2021a476ac61ce9428c2dd1 SHA512 477fc02354cacc75bfc341257caaac23501381c1e233a84a1e0973c98eba350c7cfa1a15503130f3059c0a239c20d5bb5fbde40b754785581c287fadc0183701
 DIST citeproc-py-0.4.0.tar.gz 109786 BLAKE2B 8d8520ad10a9db7b7da1a2febcc594750572a562ada3944e41dd42321a3b9384828ad17e671307b5c4affeca2ec4a3f8e97eec650dad7005323ccb2913ef43d5 SHA512 bdc09a6f632a13cdfa757710c0d137ec73fe590bd01e049847fe013569231426bc72b318133fa34c96c5608b7a30058c27f4cd3d5fa2ba4b0760527b877992d5
-EBUILD citeproc-py-0.4.0.ebuild 543 BLAKE2B d06182d1b8e94efd37deb58a58ad2a86f9e0c078533d62eedb504d97f8277756e022139f9f37f26beb62b20f430ee8e973b86792d3574a5926fbe86716ae0e29 SHA512 87f8cbeff21aec25f55b9f0251e8a4153f09a6228827f5634ff40eaa04a74a9bbe8523ba13dd59d2c0aa7c6274f2e92137a2b886182271c44d3c5b62f4cb31dd
+EBUILD citeproc-py-0.4.0-r1.ebuild 569 BLAKE2B d2c29afa11e8c9fcd893233dae45dd6e68a1fc5a41677efb1452b2f9d5a6ae421193c42243e30315c71d2b868ed89a13c2a4594d72baf4bf8b218f51426a55a3 SHA512 f7d96323b61b2208ec1bfff868a6134814a0b3049912f90c06ed34d929d19901da86f0e7a60d4c2fd4d10a18345ffb4856ef16beb561ae2085c06062444b7705
 MISC metadata.xml 433 BLAKE2B f512298eb65cda00ae88968b103a176640dd993d5e1815a1b414167f90014a74957b2043f7177d3f9ffb7b58cabbfae42cf06894e3247ab65d6ce11ec362477b SHA512 375292332cd82155673005e0a0d189120fadacf98e81f181b9540f40915147e895b7ce5fa3bcf1e924c08619944b65b28745f9b76ee520877abf3c6d94a690fd
diff --git a/dev-python/citeproc-py/citeproc-py-0.4.0.ebuild b/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
index 2e0420e00d44..b81b9c57d500 100644
--- a/dev-python/citeproc-py/citeproc-py-0.4.0.ebuild
+++ b/dev-python/citeproc-py/citeproc-py-0.4.0-r1.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=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Yet another Python CSL Processor"
@@ -17,6 +17,8 @@ IUSE=""
 
 PATCHES=( "${FILESDIR}/b1a5f925527093b0b5c11507f379a908e3354820.patch" )
 
-DEPEND="
+RDEPEND="
 	dev-python/rnc2rng[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}"
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 59851be66837..aa008e7d2072 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,9 +1,9 @@
 DIST cmd2-0.7.9.tar.gz 71298 BLAKE2B d1623e2d6a7ac66058b5a43a9688ba850962fa7b5659c3287a9aef9a7deb16338d71a2c07ef15ec72ee5e62aae0ce3cdf2f202d0d423040b734dee059f1d4876 SHA512 39086794ea57cdfdc7388aaa485770f1a76457bf2b2f58cd4703dc0c082f58a8343aa777304e833133040fdab8ef8451d85bc3c19721432514bb380330823abd
 DIST cmd2-0.8.9.tar.gz 112543 BLAKE2B b55edd450abcff863a34252b724919ace9f65b62b8175f28a1bb4fb64692a67723339a887dac45e87f37db71773689cfa213038740a4b3d165bf95f9cdad1d0e SHA512 80c80b67f8a1709156450fa476215a5466cca2853102f6012f1d83867a311d86a68d441dcea9895b62add731b3d00a7c3ecefde939b4f2ccd61d058ef9386a84
-DIST cmd2-0.9.18.tar.gz 555054 BLAKE2B e0fb893a71a4acd2ded1ce83c3033c667351d1cc64834e587df883231ca2023409dbb58df305e029e2567868ab93254b570b7120ac1f09771f4c7748e3802567 SHA512 bb855893721dc5dc517276ab1af25c90e599cc5186f519b5b6a39b8ca64ca6d2c1b27d3a51cbef5568dad2f60a9636607a9a8bd289dd0de23f48376254157c3e
 DIST cmd2-0.9.19.tar.gz 555158 BLAKE2B f47a6de66ecf38a48b8784a6a7f549b2f1b80bcb6c0a928bdee7ab2828ff768b4e9d267a61a56face889251718fd04cc1b5035136fa6f80c24e862bcc120295c SHA512 3bac4ee23773dd9b721d179aa7085fdff2937a59b39409ba9acc53e4e8cc9726dbaf8e8d7a933a591bd97a6c35512afdc18c4d3228bfb9ba188bb672a56c045c
+DIST cmd2-0.9.20.tar.gz 560696 BLAKE2B bb4a836b01715a8153e3f06b10721a8c8b7bcd1fb3ad36fc62ac6bd0a708d3ec26f32d2ea91f88b629ffe0b1f7dc9535dcd2901587f949660d79caf3d90c0413 SHA512 5d4eb607d5263166ff86bab7b60e6f008c44e1e61eae237eeee81cba22c5a474d6d8018f46648ab423fdf5841c6a65ed7dd6ee4eaae2049c2ad5cbb6a7959abe
 EBUILD cmd2-0.7.9.ebuild 899 BLAKE2B a475b51f4ecc87d0df39bb21550aab47331d2355310a05d051fd089e5a8262e7e34c301fcadb9559fc850e8f7fef452f4d187c51dcaa0d1a3e09dfb8d55edd3c SHA512 937f70ff38800622db1c2b50e159d53f5ac1628a6f0e16a3ab205f5d1aa4b6f74702b206b4be2bae9d1d0afb5a88db481749a52ef5f777f12dd414cb3304fc3a
 EBUILD cmd2-0.8.9.ebuild 979 BLAKE2B 92cfdb67bd7c9619239b8d3b742ec9e004b5c628caa8790859a19ba707d6a2263b63dc84f7e0c5afbf7ebc1a336673507c3de76113e54332c87da1d3661c87a7 SHA512 5c48cf31cc0bf761822c8b78e99a605753023b4b82b8fa634e322c1dae0973c969866ca3f00312b5236aaff59082969165e397ac584d2079118dd57dab2f05ef
-EBUILD cmd2-0.9.18.ebuild 1057 BLAKE2B 58d5ab45d1a8ac6f05195c19c9db1c91c5d2bf75784f6ccba5af9014b889e71417e3695abe63c9dd881a4c842b7248ecdfbfc649f55b150bac2e6a87f2f42d6d SHA512 0d3489368f84e25fec9b63cce78502aaf9d6c35bcc6d864613e730267d1710bd4d4d74251947fdca45e7fd63baf9cb69762f7f607d12aa94e670f2a44f865cb9
 EBUILD cmd2-0.9.19.ebuild 1057 BLAKE2B 58d5ab45d1a8ac6f05195c19c9db1c91c5d2bf75784f6ccba5af9014b889e71417e3695abe63c9dd881a4c842b7248ecdfbfc649f55b150bac2e6a87f2f42d6d SHA512 0d3489368f84e25fec9b63cce78502aaf9d6c35bcc6d864613e730267d1710bd4d4d74251947fdca45e7fd63baf9cb69762f7f607d12aa94e670f2a44f865cb9
+EBUILD cmd2-0.9.20.ebuild 1057 BLAKE2B 58d5ab45d1a8ac6f05195c19c9db1c91c5d2bf75784f6ccba5af9014b889e71417e3695abe63c9dd881a4c842b7248ecdfbfc649f55b150bac2e6a87f2f42d6d SHA512 0d3489368f84e25fec9b63cce78502aaf9d6c35bcc6d864613e730267d1710bd4d4d74251947fdca45e7fd63baf9cb69762f7f607d12aa94e670f2a44f865cb9
 MISC metadata.xml 665 BLAKE2B 796824fde35499ef70bd730f7e6c6ae4b239ea278f77188215ae0fc6e062598d943b0ae42ab5b378e8777c7c6a2162b330971bc00572e6dd43c663a3da677aab SHA512 64183ffbb33f229d4295e6fb34d98603d38da0241c6d1593704da866c17e04c9fe7f9500a1256b6e83c919eae019f71da93fdec7f09db99e073dbd809144b735
diff --git a/dev-python/cmd2/cmd2-0.9.18.ebuild b/dev-python/cmd2/cmd2-0.9.20.ebuild
index 715f6032dc28..715f6032dc28 100644
--- a/dev-python/cmd2/cmd2-0.9.18.ebuild
+++ b/dev-python/cmd2/cmd2-0.9.20.ebuild
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index cd1a3b3ac53d..d68eadd7ab51 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,5 +1,8 @@
+AUX coverage-4.5.4-tests.patch 4122 BLAKE2B d720f526a171da06b54f6433235875148cf9c5b9f7660afa61eb48811c1c1c61cf57de49a37612f01277d03ed7a4d5473ac9bcda4a326e5be9c02d6062499abd SHA512 14b07e98c59600c2a6a8ef6bea61a80a5129fa034b5ecb87fca67a1ee784bc2d7a62256c2776e9600b3e1a076ffbd0d002187379f773715e9c536ec02e07b0fa
 DIST coverage-4.2.tar.gz 359873 BLAKE2B 4bca9c44922ad99203d65387267c62bee02b0368dfd70c758dbed959ebaa1352366603359865662cde863ca1518de21a4d33d22b86b78ff75c2c23aecf4d726c SHA512 17c508e65e8494bda51dc301eb99e24f39392cc3efe54eee5d94bf45021f91cb5e1acc192981974eb1725e01cd4590c80308bf9bb237a129c2de067bd4556e23
 DIST coverage-4.5.2.tar.gz 384845 BLAKE2B a7b4f249a68e025449d26ef8ee2194b9ce355c979d1f5192a7863a0ab0089f9deb3a8e63a39bef528ed7c58fbcc7cd4bc193fea3a135f5996a6655268a6b7a93 SHA512 0d98c8118648a319ac6f3b4c4c6f1ff8a92085bbe8276dd5504c8df4638933f920d7382d8e6de8e16bff43b62091310e0eab7b7722c6d28c976baedbfae3d03e
-EBUILD coverage-4.2.ebuild 1218 BLAKE2B 0c6479e91f64eb1dba20c9fcce71861c89c9a536be0dfe246f60f34110380b609c0965dab2f954f1e3290bd8c11ec54ffcc2ea6f8665d31047ee6e18485e6edd SHA512 5416ce0fb15bb1934f92806bcdf1aff542a9600fd14da7f78034a9586f8639bb493fb9131499941f10328c6c64e7a6b8463b2e435f532dd67c5f2e70f409547d
-EBUILD coverage-4.5.2.ebuild 1217 BLAKE2B b4e223e1d379d855146fb39511e5775c8f20c5de188beb7f6262f5458788ca2d540ebca650c309b616796ebfb62cb4348f8c193fe1e4aea74aff5f15c8a07e4c SHA512 46f3025551bcb85a5ecc914ac9559f16952b3d2eed502905728ad384adb93c752fb086d5fd310ecdf2f6c4cf04245963927c3a7030cf552b4d06980ffd831a52
+DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
+EBUILD coverage-4.2.ebuild 1245 BLAKE2B ccd13bc4859a329781600fc33c74d6d40c12df18b1552eaeed4d6ef7eb1571f3ae51252cdcfb87de051647bfc4c3831a4e81fe6d09e5954b3d044d57be7576c7 SHA512 75a189500516f4f677410a9df61588ae256a246b3239b1c78f1ec04be5750238710871a39cd928a7f3bcd352025a72a2c3defcaa181ea6f65e82da92fd24a133
+EBUILD coverage-4.5.2.ebuild 1244 BLAKE2B 39420d4e3a6ec6f67391f9ee9f7824b28873c7ccdc4ab9515eef1b98d46a21e04d41536bf307326caea6d5d122344c5a16b8731cfee23d3246d34ef40228f8e1 SHA512 20e59c9a860d4d7d8eb914f2278f46186a4fc9f87824fbceda4869779eb82814dba2f6c98157da116df32cc871d9cbc15e459f190527544c9b58149be9b39fb2
+EBUILD coverage-4.5.4.ebuild 1697 BLAKE2B 7aa8c05eb0153992812c30adb4773f92815ac1164c51240c7bb4bb3573f9268d79b06583df634923ccfc117421cad004195990d2cead4cf9038d01d5a245524f SHA512 5b8b6bfe8935ee95735c2a3e5c59d03605bd443ccdb6c098c28583d6c568b9f8ba847fd5bc4902369a93515974f1dd5a7c537f2a1ff84504ef9a098748b2df29
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-4.2.ebuild b/dev-python/coverage/coverage-4.2.ebuild
index 64e0292d1d45..0db0400c8bc5 100644
--- a/dev-python/coverage/coverage-4.2.ebuild
+++ b/dev-python/coverage/coverage-4.2.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="
diff --git a/dev-python/coverage/coverage-4.5.2.ebuild b/dev-python/coverage/coverage-4.5.2.ebuild
index 285a75e51f23..755bd7f16b78 100644
--- a/dev-python/coverage/coverage-4.5.2.ebuild
+++ b/dev-python/coverage/coverage-4.5.2.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="
diff --git a/dev-python/coverage/coverage-4.5.4.ebuild b/dev-python/coverage/coverage-4.5.4.ebuild
new file mode 100644
index 000000000000..e0198d5dd4ea
--- /dev/null
+++ b/dev-python/coverage/coverage-4.5.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+BDEPEND="
+	>=dev-python/setuptools-18.4[${PYTHON_USEDEP}]
+	test? (
+		dev-python/PyContracts[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+	)
+"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}/coverage-4.5.4-tests.patch"
+)
+
+src_prepare() {
+	# avoid the dep on xdist, run tests verbosely
+	sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	if [[ ${EPYTHON} == python2.7 ]]; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	distutils_install_for_testing
+	local bindir=${TEST_DIR}/scripts
+
+	pushd tests/eggsrc >/dev/null || die
+	distutils_install_for_testing
+	popd >/dev/null || die
+
+	"${EPYTHON}" igor.py zip_mods || die
+	PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer py || die
+
+	# No C extensions under pypy
+	if [[ ${EPYTHON} != pypy* ]]; then
+		cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
+		PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer c || die
+	fi
+
+	# clean up leftover "egg1" directory
+	rm -rf build/lib/egg1 || die
+}
diff --git a/dev-python/coverage/files/coverage-4.5.4-tests.patch b/dev-python/coverage/files/coverage-4.5.4-tests.patch
new file mode 100644
index 000000000000..193c4e88ef91
--- /dev/null
+++ b/dev-python/coverage/files/coverage-4.5.4-tests.patch
@@ -0,0 +1,104 @@
+diff --git a/tests/farm/run/run_timid.py b/tests/farm/run/run_timid.py
+index 0370cf84..4e3cf1ca 100644
+--- a/tests/farm/run/run_timid.py
++++ b/tests/farm/run/run_timid.py
+@@ -38,6 +38,10 @@ if os.environ.get('COVERAGE_TEST_TRACER', 'c') == 'c':
+ else:
+     # If the Python trace function is being tested, then regular running will
+     # also show the Python function.
+-    contains("out_timid/showtraceout.txt", "regular PyTracer")
++    #
++    # tox.ini deletes compiled c modules to make this test work, not feasible
++    # to do this from the ebuild environment
++    #contains("out_timid/showtraceout.txt", "regular PyTracer")
++    pass
+ 
+ clean("out_timid")
+diff --git a/tests/test_concurrency.py b/tests/test_concurrency.py
+index 578cc679..ae340099 100644
+--- a/tests/test_concurrency.py
++++ b/tests/test_concurrency.py
+@@ -11,6 +11,7 @@ import time
+ 
+ from flaky import flaky
+ 
++import unittest
+ import coverage
+ from coverage import env
+ from coverage.backward import import_local_file
+@@ -271,6 +272,7 @@ class ConcurrencyTest(CoverageTest):
+         code = SIMPLE.format(QLIMIT=self.QLIMIT)
+         self.try_some_code(code, "gevent", gevent)
+ 
++    @unittest.skip("greenlet tests don't work with python tracer")
+     def test_greenlet(self):
+         GREENLET = """\
+             from greenlet import greenlet
+@@ -289,6 +291,7 @@ class ConcurrencyTest(CoverageTest):
+             """
+         self.try_some_code(GREENLET, "greenlet", greenlet, "hello world\n42\n")
+ 
++    @unittest.skip("greenlet tests don't work with python tracer")
+     def test_greenlet_simple_code(self):
+         code = SIMPLE.format(QLIMIT=self.QLIMIT)
+         self.try_some_code(code, "greenlet", greenlet)
+diff --git a/tests/test_filereporter.py b/tests/test_filereporter.py
+index 91e47762..121c3260 100644
+--- a/tests/test_filereporter.py
++++ b/tests/test_filereporter.py
+@@ -4,6 +4,7 @@
+ """Tests for FileReporters"""
+ 
+ import os
++import unittest
+ 
+ from coverage.plugin import FileReporter
+ from coverage.python import PythonFileReporter
+@@ -87,6 +88,7 @@ class FileReporterTest(UsingModulesMixin, CoverageTest):
+         assert acu < bcu and acu <= bcu and acu != bcu
+         assert bcu > acu and bcu >= acu and bcu != acu
+ 
++    @unittest.skip("we don't install zip eggs on gentoo")
+     def test_egg(self):
+         # Test that we can get files out of eggs, and read their source files.
+         # The egg1 module is installed by an action in igor.py.
+diff --git a/tests/test_oddball.py b/tests/test_oddball.py
+index aa2f333c..bc63395a 100644
+--- a/tests/test_oddball.py
++++ b/tests/test_oddball.py
+@@ -405,7 +405,9 @@ class DoctestTest(CoverageTest):
+         # well with coverage. Nose fixes the problem by monkeypatching doctest.
+         # I want to be sure there's no monkeypatch and that I'm getting the
+         # doctest module that users of coverage will get.
+-        assert 'doctest' not in sys.modules
++
++        # gentoo is not running these tests via nose, so there is no monkeypatching
++        #assert 'doctest' not in sys.modules
+ 
+     def test_doctest(self):
+         self.check_coverage('''\
+diff --git a/tests/test_process.py b/tests/test_process.py
+index 62dc80a5..7fa9b2ba 100644
+--- a/tests/test_process.py
++++ b/tests/test_process.py
+@@ -620,11 +620,16 @@ class ProcessTest(CoverageTest):
+             print("FOOEY == %s" % os.getenv("FOOEY"))
+             """)
+ 
+-        fullcov = os.path.join(
+-            os.path.dirname(coverage.__file__), "fullcoverage"
+-            )
++        # we want to use the coverage module we are testing, not the system installation
++        paths = [
++            os.path.join(
++                os.path.dirname(coverage.__file__), "fullcoverage"
++            ),
++            os.path.dirname(os.path.dirname(coverage.__file__))
++        ]
+         self.set_environ("FOOEY", "BOO")
+-        self.set_environ("PYTHONPATH", fullcov)
++        self.set_environ("PYTHONPATH", ':'.join(paths))
++        print(paths)
+         out = self.run_command("python -m coverage run -L getenv.py")
+         self.assertEqual(out, "FOOEY == BOO\n")
+         data = coverage.CoverageData()
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index 836de550594a..039b980d3e02 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -1,15 +1,3 @@
-DIST cryptography_vectors-2.2.2.tar.gz 27270814 BLAKE2B b57cfd402e85e34a1e52d034ef51699ba9ab7381e5baa28f0f062ecc8d6b7b5849ac4d5426c41768e1a4fb9462f84d7e22476ec64dc0bd0142a799caaf95eafb SHA512 bdaf53c8087d6c44fcd3ab54069d1d45b60ee80d98fd813fe180b9e88272203b5dd2abd5fa6dcd3b4ce9ec3215997fd8e99e63309e2f0ac619a6f72d552afff9
-DIST cryptography_vectors-2.3.1.tar.gz 35308320 BLAKE2B 47ec40722ed571f980030a4a8dcd35230a4c2b2c63320537a9b965ae39f4d85eb5528ac3ae017e40c099a1cb083feeaea201a8e2cb2fb5b30ce781f716bbfcb4 SHA512 d607571c6471a1a7aa391c0ae441937b88caec0497daaa539ddc71ba76da7c534f0cf6460fce1124035f9fe10e55c621d799586dedb7f3b5f3589ca6be5cb555
-DIST cryptography_vectors-2.3.tar.gz 35303908 BLAKE2B 694f5a741ddedce2101632dcf165961d4706feaa5c8482235f5afb69f4257bfb4f8a9b8423213661de0da2d56ebf43cc7ba138a4bbf9462f367ebd5adf2620f7 SHA512 7c51b0c29c182c4da3265824a1b6e44c943bd41dfa89199cded963d0182a8ade678a560ec9ea13f6e8918119fcacf1c90d804cc90368e51cc5d430228448231c
-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 671 BLAKE2B cf2f30c327afd3354f70b56208609f6982f11b10bccc35abd1b0829161df3feab30ca4ea460f3b5cbf5f129214ada81011daf020942a16f5c66fb6cf4176e476 SHA512 979228ef1a7a90b8c111d4caa45fe5853ad7bae78077e0827f0a3be6333493a16e244c7d08e3eeb848dadf3b6899227e09ac6a73c754b3442faf550766336d53
-EBUILD cryptography-vectors-2.3.1.ebuild 686 BLAKE2B 0dff3b073a76e9c1bab70829980388de6361bdc2faa934815b439f76639cd2e18300b65883eec76b94b9b137028a2b816cc365f6d182f6f5bdf39a111bdd949a SHA512 21f1e0f2c70e4ede76d59eff6fd45065a3e0bf0c93b12681978f9d9cfc9f385cf7cdb8f7519512fe008c0a1e40c481d13d0be5c22d20168ef3cdf7ca887bd864
-EBUILD cryptography-vectors-2.3.ebuild 684 BLAKE2B 9f3b38ad8924b66c937cc12b41cd7f4c691f69d341e8a714338b2c79ddc13bfd3157d6e8d6b4d4e8684ae6f47ae889ede38edd6743fcbb01428e5488dc80eee7 SHA512 eb791569070a4d27cef012c67a357b525612258d318d41be15bea05a59d28e1fd29d5507fdfe57b004b93fc746d5be94802a95983d5a0665aa440242b9e3db80
-EBUILD cryptography-vectors-2.4.2.ebuild 684 BLAKE2B 9f3b38ad8924b66c937cc12b41cd7f4c691f69d341e8a714338b2c79ddc13bfd3157d6e8d6b4d4e8684ae6f47ae889ede38edd6743fcbb01428e5488dc80eee7 SHA512 eb791569070a4d27cef012c67a357b525612258d318d41be15bea05a59d28e1fd29d5507fdfe57b004b93fc746d5be94802a95983d5a0665aa440242b9e3db80
-EBUILD cryptography-vectors-2.5.ebuild 684 BLAKE2B 9f3b38ad8924b66c937cc12b41cd7f4c691f69d341e8a714338b2c79ddc13bfd3157d6e8d6b4d4e8684ae6f47ae889ede38edd6743fcbb01428e5488dc80eee7 SHA512 eb791569070a4d27cef012c67a357b525612258d318d41be15bea05a59d28e1fd29d5507fdfe57b004b93fc746d5be94802a95983d5a0665aa440242b9e3db80
 EBUILD cryptography-vectors-2.6.1.ebuild 671 BLAKE2B cf2f30c327afd3354f70b56208609f6982f11b10bccc35abd1b0829161df3feab30ca4ea460f3b5cbf5f129214ada81011daf020942a16f5c66fb6cf4176e476 SHA512 979228ef1a7a90b8c111d4caa45fe5853ad7bae78077e0827f0a3be6333493a16e244c7d08e3eeb848dadf3b6899227e09ac6a73c754b3442faf550766336d53
-EBUILD cryptography-vectors-2.7.ebuild 684 BLAKE2B 9f3b38ad8924b66c937cc12b41cd7f4c691f69d341e8a714338b2c79ddc13bfd3157d6e8d6b4d4e8684ae6f47ae889ede38edd6743fcbb01428e5488dc80eee7 SHA512 eb791569070a4d27cef012c67a357b525612258d318d41be15bea05a59d28e1fd29d5507fdfe57b004b93fc746d5be94802a95983d5a0665aa440242b9e3db80
 MISC metadata.xml 333 BLAKE2B 31fb9fd463281fce83ac94d33dc69e54eee748ab3a230fa26ef36f29026ce8bcaf821e69994d2d94ed3b69c24b30cc80fa0a67f100cd45327ff1bb36a91c6014 SHA512 d65176e5ea86d82a13687d70fb2f29ca046bd71526752fb3583be9b0507b124363f271d697cfe6724245d6863c5aac36e67b1e50808041c52066d66e1f8b586a
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.2.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.2.2.ebuild
deleted file mode 100644
index c5dce029e10f..000000000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.2.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( 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-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-vectors/cryptography-vectors-2.3.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.3.1.ebuild
deleted file mode 100644
index 9cfc6cfecacf..000000000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( 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-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-vectors/cryptography-vectors-2.3.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.3.ebuild
deleted file mode 100644
index eb65da6882ca..000000000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,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-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-vectors/cryptography-vectors-2.4.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.4.2.ebuild
deleted file mode 100644
index eb65da6882ca..000000000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.4.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( 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-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-vectors/cryptography-vectors-2.5.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.5.ebuild
deleted file mode 100644
index eb65da6882ca..000000000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,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-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-vectors/cryptography-vectors-2.7.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.7.ebuild
deleted file mode 100644
index eb65da6882ca..000000000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,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-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 47a7e7d0e01c..76a6bbb3b699 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,19 +1,7 @@
-AUX CVE-2018-10903.patch 3641 BLAKE2B a426705cfcbc9ba4e3ffd662610b7a27c7afe52dff71d1c7248c03524369faa763196eb018b7ea94b8ac87cc5cb5dd5bf172f5cdedadb54be62dbe4e0819ed82 SHA512 94c56586ae1649b29959d855235af8e84bc9dd927b412e0e0a62cb47bb52580a919bacefe4be6d0b75318be05afccb950dbff3d7f6ec1cb44c111a4bbc2e6a99
-AUX cryptography-2.1.4-libressl-2.7-x509.patch 1005 BLAKE2B 9c01fe0f9c3c8c598388db68f68470b953b4a8e79dba8c1d3c6ce56486a93f340101a58db8771fa1adeaabe430d78acbb6723da597b8b114416d676022b989d4 SHA512 fc58993b3dc86990194e03c7cc4554d83260b243913d77b3743fe1f9fd0d21985ee849c6b7f7fc158c48b75505e8e8a9adf090b9c7ba40e12b09b3c020e50afe
-AUX cryptography-2.1.4-libressl-2.7-x509_vfy.patch 3419 BLAKE2B 89642459484d42958aec818c4196eff35991ba415c76ee1f43c0765b1a9687c6b405f31322227eb132309439aa8d7ee5ed6df7ed07f640e4eea21c6e97fde858 SHA512 e941b89924d68b1d1dfe8e64a4f7ae363ccb53fd232a3853d9ddba0a7aed1dc27fb8d699e9197bdd7ff0b1780c1f12edd2edd4133f08e2f7f13348b170985a4c
 AUX cryptography-2.6.1-libressl.patch 2527 BLAKE2B 090e0fcd78a6661f8a87c27f572b0beeb27a6e410e7b6cbcfb4b2a952857cfb2facaf98cc4b9d8da6b4de250dc9199a28e5fd334ed2b6f4b84040471cb8132df SHA512 dfa0dcf912a5a103015abc2e9aee39a8440105d08ddfe217a9d283c57b0111610663cca90494903ee2e48be9bdd27ba1b8f752661d278fbd115ac11ff9a00fc9
-DIST cryptography-2.2.2.tar.gz 443822 BLAKE2B d0fbaad78d172f1ba1bfa6edd64d2d5a0eac0853a564fdbb9830dfedc5c53fe1b28d8c1878be85ce38b8cd90a0c2e40e6a209158693a88a7053a80f0481e6302 SHA512 6c1b19cdb870d65abad42523697e9a0bebc7a0025b34f10c4bdd30c313333efd7c41bcb4237a29b3a1b270e3fbade75ccb35df172b055b7c075d619f4d9424c9
-DIST cryptography-2.3.1.tar.gz 449577 BLAKE2B 66a94f68a6f5c14ff1e3316ea740bda8c34135bc4614a6a36880d4970d54cb72d69374555a6a89dd9a6794e35feed8fc4598ad071cce33b9515da1ada4c38d53 SHA512 384581238b5669dbf31fd1b1385ec2ff9c6d76e2b7612efb15f255e17a11a38474f84668e62ceaa39a146260f46cac743575c0a8ffedc1e40c7b2f90d7cb00b1
-DIST cryptography-2.3.tar.gz 449464 BLAKE2B 7485c745f9c6512a5efce42181970deff19bd4420e91230d84b070cd77450a6805c56a2e37cda73b45c90ed969c8fdbb866a7cc9e53a6828a1ca6e45befd9de8 SHA512 75e14020da500fdbbd578f004b22ef3237844185329adf59288b29f1b3ee9dd2005a2c4a933fe8609a59d168012a9f687bab0f31ab39ed6ca325198aa9295e52
-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 2155 BLAKE2B c3e05bb5a12c0f9dd7af40c24c37b1966e4240ca79ced123d82f34203fb79fb48fe490bb493d598705f1dd925ed7d560d2a5696833fef215d8d09e613ae9ba26 SHA512 fc063559654880e549f6e6014dd11a09f0ecfd5efede6360af26fbb157208270aa0d3c6716a40e7c8b4d6ffaa2f018bbf61a868a8a8048e5ca53f7595cf5564b
-EBUILD cryptography-2.3.1.ebuild 2150 BLAKE2B 603053e0dcb75db7703faa615beb00664b0c172512485192c1f481a66c1c4acf20d400581421cbe348531d501387f0ecc0361b7a9304ef757be15c154352b662 SHA512 99ef2c38dab016f1f6a1c71e4b4c5a38c2e2bcf3d6a02b1834556258ed6f208795baebab362d42e75a2a29403d38f01e11ad428273cb9f52c4fd4e73a784fa83
-EBUILD cryptography-2.3.ebuild 2105 BLAKE2B 870cf266558e70d1842be6fd714db8b25c7a505d6abccf323102ec84601a861115068d7c83edc1ee9e46f70c3af4c2393b95699e711ebe93c4bc3ef6d5fe1f22 SHA512 2a73fa12713ad94b68064a27cc54735baaa76f69fc73c468dfe29f68a930772474bc32f731491507cd9dce3343f9e1f3235cc59723e37aefa2e541537c6caad4
-EBUILD cryptography-2.4.2.ebuild 2105 BLAKE2B 870cf266558e70d1842be6fd714db8b25c7a505d6abccf323102ec84601a861115068d7c83edc1ee9e46f70c3af4c2393b95699e711ebe93c4bc3ef6d5fe1f22 SHA512 2a73fa12713ad94b68064a27cc54735baaa76f69fc73c468dfe29f68a930772474bc32f731491507cd9dce3343f9e1f3235cc59723e37aefa2e541537c6caad4
-EBUILD cryptography-2.5.ebuild 2120 BLAKE2B 8c8b4d41c9282dfe33179141232bf4dece7aaecc76d7ae12a381bc0e6ad7bef01a77d2d897cbe31d21fe61a1c617973368ca67849583ac564c3ab39af600aa46 SHA512 6e7df176573306fedd704421afa97879c60a42691be161ed96bf8703923eeacb423cdfc732c840b4b5dfac582484ec732c90245c390651aaa7a87d6158639597
-EBUILD cryptography-2.6.1.ebuild 2214 BLAKE2B b4ab669cb03f223de934e4a684bc1d1ec7f8dbe1212084a7df4c6d0c11d9dd63f01c1209e1e9b7ee5ebe11f82ae318dc728034b67624f8e5bbfe92d47a4fbc0a SHA512 1089368bb0ef923e8faaa5235cccacfe2022be1875785aecbc6974bbbdddb4c36b3c2556628861bd8ab2d3ecdcf50079f8e5cd3b67a9f529387e9e1c23ccfbdd
-EBUILD cryptography-2.7.ebuild 2179 BLAKE2B 44effc1d084dfe4e57ae59ca03dc4475455546354e56ea741cba14d74a0d2aa5f8cd9e0e2adf69bba54049d8d83e2b7a9f4375c0bccd9ab46da2c92125d7f6e9 SHA512 5d1cd87a145bee7c08a442f4b87665048f0299eea5dc639c2d9f7231a97fedaef33af0471ac3407934f675c7363b40a49d78eac817dfc4913a232eebd2a275f5
+DIST cryptography-2.8.tar.gz 504516 BLAKE2B 3a853bf59a752acee9e9607f3f35f3815701c6068a1ffa5b6604ec648a31a5d4e31f13a1b19f3156c703313800242d8b06dd71a54a4eb0cc68481dea894002f3 SHA512 bf3ca44123c693b0602be19445925f9efebd46c469909e47b7907d57141fb6bd99268c33e1fe3f42a08ab8b4edd4f98f21b6a682f530352313334dfd31ba91e7
+DIST cryptography_vectors-2.8.tar.gz 35102030 BLAKE2B 8e98e12bab31a2097a72c849f52ee93b9b684a8923c140722419154471bd695c6287ff4498c9fe326662c7d9a9f5d9ebaa55dc4d5a0d8180a6827ae244464006 SHA512 d328082d3a65b8036d396172d7e42c753c842e9310850a77c6ccd99c9905d48bbc3e3319d216013c1370b8439f0f8056749ae94b1abf9a5b7088435acdeed7fb
+EBUILD cryptography-2.6.1.ebuild 2241 BLAKE2B 23fde60e4629f87b17a8a0575051b9e9371cd43c6f8fc4cb4ea3cbe6228c197010cdc3ff591326c100fc3128190c3e60960e225faefd388c03fc44aadacca97e SHA512 93b740d2cf9b0739328febe821a31c14b6f7b015b267baceb2c486cfd7b93b61a6b436ffca9294835ec0d3dc06e9f0f12a7640532cb9f455f2c9f1451bb4c063
+EBUILD cryptography-2.8.ebuild 2237 BLAKE2B 016b7b2be5653d64cc6c1270ebea547d207321edf790c7b681485be4f3673ce0a6a5dc6b4aa698bf376b2e06a6bcd1d20920845fb6d85781f4023ee11dd0d85f SHA512 a4d6a38ee7fa32fdd6f3f65ffa6c627a9348c6f36eabf38a434fe64a2e0bc70bc7c8aa36ed4078eea0d6025d8721d1e0e94243a54600566efba1fd6018f1cffa
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-2.2.2-r1.ebuild b/dev-python/cryptography/cryptography-2.2.2-r1.ebuild
deleted file mode 100644
index dfd4ffee34df..000000000000
--- a/dev-python/cryptography/cryptography-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="libressl 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= )
-	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
-	>=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}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.4-libressl-2.7-x509.patch
-	"${FILESDIR}"/${PN}-2.1.4-libressl-2.7-x509_vfy.patch
-	"${FILESDIR}"/CVE-2018-10903.patch
-)
-
-python_configure_all() {
-	append-cflags $(test-flags-CC -pthread)
-}
-
-python_test() {
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-2.3.1.ebuild b/dev-python/cryptography/cryptography-2.3.1.ebuild
deleted file mode 100644
index a439e334e1d2..000000000000
--- a/dev-python/cryptography/cryptography-2.3.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="libressl 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= )
-	>=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.7:=[${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/hypothesis[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-PATCHES=(
-)
-
-python_configure_all() {
-	append-cflags $(test-flags-CC -pthread)
-}
-
-python_test() {
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-2.3.ebuild b/dev-python/cryptography/cryptography-2.3.ebuild
deleted file mode 100644
index c614fbc3c922..000000000000
--- a/dev-python/cryptography/cryptography-2.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="libressl 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= )
-	>=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.7:=[${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/hypothesis[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-PATCHES=(
-)
-
-python_configure_all() {
-	append-cflags $(test-flags-CC -pthread)
-}
-
-python_test() {
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-2.4.2.ebuild b/dev-python/cryptography/cryptography-2.4.2.ebuild
deleted file mode 100644
index c614fbc3c922..000000000000
--- a/dev-python/cryptography/cryptography-2.4.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="libressl 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= )
-	>=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.7:=[${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/hypothesis[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-PATCHES=(
-)
-
-python_configure_all() {
-	append-cflags $(test-flags-CC -pthread)
-}
-
-python_test() {
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-2.5.ebuild b/dev-python/cryptography/cryptography-2.5.ebuild
deleted file mode 100644
index defeba4778b9..000000000000
--- a/dev-python/cryptography/cryptography-2.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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/hypothesis[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-PATCHES=(
-)
-
-python_configure_all() {
-	append-cflags $(test-flags-CC -pthread)
-}
-
-python_test() {
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-2.6.1.ebuild b/dev-python/cryptography/cryptography-2.6.1.ebuild
index 41f0e5866601..52a71757df07 100644
--- a/dev-python/cryptography/cryptography-2.6.1.ebuild
+++ b/dev-python/cryptography/cryptography-2.6.1.ebuild
@@ -16,6 +16,7 @@ LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libressl idna test"
+RESTRICT="!test? ( test )"
 
 # the openssl 1.0.2l-r1 needs to be updated again :(
 # It'd theb be able to go into the || section again
diff --git a/dev-python/cryptography/cryptography-2.7.ebuild b/dev-python/cryptography/cryptography-2.8.ebuild
index adb8ae7c50fa..777545258fb7 100644
--- a/dev-python/cryptography/cryptography-2.7.ebuild
+++ b/dev-python/cryptography/cryptography-2.8.ebuild
@@ -1,21 +1,24 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
 
+VEC_P=cryptography_vectors-${PV}
 DESCRIPTION="Library providing cryptographic recipes and primitives"
 HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? ( mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz )"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libressl idna test"
+RESTRICT="!test? ( test )"
 
 # the openssl 1.0.2l-r1 needs to be updated again :(
 # It'd theb be able to go into the || section again
@@ -33,7 +36,6 @@ RDEPEND="
 	)
 	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}]
@@ -44,14 +46,13 @@ DEPEND="${RDEPEND}
 	$(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}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
 
 DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
@@ -61,5 +62,6 @@ python_configure_all() {
 }
 
 python_test() {
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+	local -x PYTHONPATH=${PYTHONPATH}:${WORKDIR}/${VEC_P}
+	pytest -vv || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/cryptography/files/CVE-2018-10903.patch b/dev-python/cryptography/files/CVE-2018-10903.patch
deleted file mode 100644
index 1133405fb93d..000000000000
--- a/dev-python/cryptography/files/CVE-2018-10903.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 688e0f673bfbf43fa898994326c6877f00ab19ef Mon Sep 17 00:00:00 2001
-From: Paul Kehrer <paul.l.kehrer@gmail.com>
-Date: Tue, 17 Jul 2018 10:47:57 +0800
-Subject: [PATCH] disallow implicit tag truncation with finalize_with_tag
-
----
- docs/hazmat/primitives/symmetric-encryption.rst     |  1 +
- src/cryptography/hazmat/backends/openssl/ciphers.py |  5 +++++
- src/cryptography/hazmat/primitives/ciphers/modes.py |  1 +
- tests/hazmat/primitives/test_aes.py                 | 16 ++++++++++++++++
- 5 files changed, 28 insertions(+)
-
-diff --git a/docs/hazmat/primitives/symmetric-encryption.rst b/docs/hazmat/primitives/symmetric-encryption.rst
-index 5ebcca754..5b6000902 100644
---- a/docs/hazmat/primitives/symmetric-encryption.rst
-+++ b/docs/hazmat/primitives/symmetric-encryption.rst
-@@ -670,6 +670,7 @@ Interfaces
-         :raises ValueError: This is raised when the data provided isn't
-             a multiple of the algorithm's block size, if ``min_tag_length`` is
-             less than 4, or if ``len(tag) < min_tag_length``.
-+            ``min_tag_length`` is an argument to the ``GCM`` constructor.
-         :raises NotImplementedError: This is raised if the version of the
-             OpenSSL backend used is 1.0.1 or earlier.
- 
-diff --git a/src/cryptography/hazmat/backends/openssl/ciphers.py b/src/cryptography/hazmat/backends/openssl/ciphers.py
-index 462ffea25..e0ee06ee2 100644
---- a/src/cryptography/hazmat/backends/openssl/ciphers.py
-+++ b/src/cryptography/hazmat/backends/openssl/ciphers.py
-@@ -199,6 +199,11 @@ def finalize_with_tag(self, tag):
-                 "finalize_with_tag requires OpenSSL >= 1.0.2. To use this "
-                 "method please update OpenSSL"
-             )
-+        if len(tag) < self._mode._min_tag_length:
-+            raise ValueError(
-+                "Authentication tag must be {0} bytes or longer.".format(
-+                    self._mode._min_tag_length)
-+            )
-         res = self._backend._lib.EVP_CIPHER_CTX_ctrl(
-             self._ctx, self._backend._lib.EVP_CTRL_AEAD_SET_TAG,
-             len(tag), tag
-diff --git a/src/cryptography/hazmat/primitives/ciphers/modes.py b/src/cryptography/hazmat/primitives/ciphers/modes.py
-index 598dfaa4a..543015fef 100644
---- a/src/cryptography/hazmat/primitives/ciphers/modes.py
-+++ b/src/cryptography/hazmat/primitives/ciphers/modes.py
-@@ -220,6 +220,7 @@ def __init__(self, initialization_vector, tag=None, min_tag_length=16):
-                         min_tag_length)
-                 )
-         self._tag = tag
-+        self._min_tag_length = min_tag_length
- 
-     tag = utils.read_only_property("_tag")
-     initialization_vector = utils.read_only_property("_initialization_vector")
-diff --git a/tests/hazmat/primitives/test_aes.py b/tests/hazmat/primitives/test_aes.py
-index d6f83ebc2..4ceccf155 100644
---- a/tests/hazmat/primitives/test_aes.py
-+++ b/tests/hazmat/primitives/test_aes.py
-@@ -439,3 +439,19 @@ def test_gcm_tag_decrypt_finalize(self, backend):
-             decryptor.finalize()
-         else:
-             decryptor.finalize_with_tag(tag)
-+
-+    @pytest.mark.supported(
-+        only_if=lambda backend: (
-+            not backend._lib.CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 or
-+            backend._lib.CRYPTOGRAPHY_IS_LIBRESSL
-+        ),
-+        skip_message="Not supported on OpenSSL 1.0.1",
-+    )
-+    def test_gcm_tag_decrypt_finalize_tag_length(self, backend):
-+        decryptor = base.Cipher(
-+            algorithms.AES(b"0" * 16),
-+            modes.GCM(b"0" * 12),
-+            backend=backend
-+        ).decryptor()
-+        with pytest.raises(ValueError):
-+            decryptor.finalize_with_tag(b"tagtooshort")
diff --git a/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509.patch b/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509.patch
deleted file mode 100644
index 9a14d4606019..000000000000
--- a/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur a/src/_cffi_src/openssl/x509.py b/src/_cffi_src/openssl/x509.py
---- a/src/_cffi_src/openssl/x509.py	2017-07-27 05:11:29.000000000 +0200
-+++ b/src/_cffi_src/openssl/x509.py	2018-03-23 10:28:00.387774214 +0100
-@@ -254,8 +254,7 @@
- 
- const X509_ALGOR *X509_get0_tbs_sigalg(const X509 *);
- 
--/* in 1.1.0 becomes const ASN1_BIT_STRING, const X509_ALGOR */
--void X509_get0_signature(ASN1_BIT_STRING **, X509_ALGOR **, X509 *);
-+void X509_get0_signature(const ASN1_BIT_STRING **, const X509_ALGOR **, const X509 *);
- 
- long X509_get_version(X509 *);
- 
-@@ -338,7 +337,8 @@
- CUSTOMIZATIONS = """
- /* Added in 1.0.2 beta but we need it in all versions now due to the great
-    opaquing. */
--#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
-+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 && \
-+    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- /* from x509/x_x509.c version 1.0.2 */
- void X509_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg,
-                          const X509 *x)
diff --git a/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509_vfy.patch b/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509_vfy.patch
deleted file mode 100644
index a1c93cf0c66e..000000000000
--- a/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509_vfy.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-$OpenBSD: patch-src__cffi_src_openssl_x509_vfy_py,v 1.7 2018/02/22 18:49:16 sthen Exp $
-
---- a/src/_cffi_src/openssl/x509_vfy.py
-+++ b/src/_cffi_src/openssl/x509_vfy.py
-@@ -204,7 +204,7 @@ int sk_X509_OBJECT_num(Cryptography_STACK_OF_X509_OBJE
- X509_OBJECT *sk_X509_OBJECT_value(Cryptography_STACK_OF_X509_OBJECT *, int);
- X509_VERIFY_PARAM *X509_STORE_get0_param(X509_STORE *);
- Cryptography_STACK_OF_X509_OBJECT *X509_STORE_get0_objects(X509_STORE *);
--X509 *X509_OBJECT_get0_X509(X509_OBJECT *);
-+X509 *X509_OBJECT_get0_X509(const X509_OBJECT *);
- int X509_OBJECT_get_type(const X509_OBJECT *);
- 
- /* added in 1.1.0 */
-@@ -220,14 +220,11 @@ static const long Cryptography_HAS_102_VERIFICATION_ER
- static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 1;
- #else
- static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 0;
-+#if LIBRESSL_VERSION_NUMBER >= 0x2070000fL
-+static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 1;
-+#else
- static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 0;
- 
--static const long X509_V_ERR_SUITE_B_INVALID_VERSION = 0;
--static const long X509_V_ERR_SUITE_B_INVALID_ALGORITHM = 0;
--static const long X509_V_ERR_SUITE_B_INVALID_CURVE = 0;
--static const long X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM = 0;
--static const long X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED = 0;
--static const long X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 = 0;
- /* These 3 defines are unavailable in LibreSSL 2.5.x, but may be added
-    in the future... */
- #ifndef X509_V_ERR_HOSTNAME_MISMATCH
-@@ -240,12 +237,6 @@ static const long X509_V_ERR_EMAIL_MISMATCH = 0;
- static const long X509_V_ERR_IP_ADDRESS_MISMATCH = 0;
- #endif
- 
--/* X509_V_FLAG_TRUSTED_FIRST is also new in 1.0.2+, but it is added separately
--   below because it shows up in some earlier 3rd party OpenSSL packages. */
--static const long X509_V_FLAG_SUITEB_128_LOS_ONLY = 0;
--static const long X509_V_FLAG_SUITEB_192_LOS = 0;
--static const long X509_V_FLAG_SUITEB_128_LOS = 0;
--
- int (*X509_VERIFY_PARAM_set1_host)(X509_VERIFY_PARAM *, const char *,
-                                    size_t) = NULL;
- int (*X509_VERIFY_PARAM_set1_email)(X509_VERIFY_PARAM *, const char *,
-@@ -257,6 +248,19 @@ void (*X509_VERIFY_PARAM_set_hostflags)(X509_VERIFY_PA
-                                         unsigned int) = NULL;
- #endif
- 
-+static const long X509_V_ERR_SUITE_B_INVALID_VERSION = 0;
-+static const long X509_V_ERR_SUITE_B_INVALID_ALGORITHM = 0;
-+static const long X509_V_ERR_SUITE_B_INVALID_CURVE = 0;
-+static const long X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM = 0;
-+static const long X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED = 0;
-+static const long X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 = 0;
-+/* X509_V_FLAG_TRUSTED_FIRST is also new in 1.0.2+, but it is added separately
-+   below because it shows up in some earlier 3rd party OpenSSL packages. */
-+static const long X509_V_FLAG_SUITEB_128_LOS_ONLY = 0;
-+static const long X509_V_FLAG_SUITEB_192_LOS = 0;
-+static const long X509_V_FLAG_SUITEB_128_LOS = 0;
-+#endif
-+
- /* OpenSSL 1.0.2+ or Solaris's backport */
- #ifdef X509_V_FLAG_PARTIAL_CHAIN
- static const long Cryptography_HAS_X509_V_FLAG_PARTIAL_CHAIN = 1;
-@@ -292,7 +296,7 @@ X509 *X509_STORE_CTX_get0_cert(X509_STORE_CTX *ctx)
-     return ctx->cert;
- }
- 
--X509 *X509_OBJECT_get0_X509(X509_OBJECT *x) {
-+X509 *X509_OBJECT_get0_X509(const X509_OBJECT *x) {
-     return x->data.x509;
- }
- #endif
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index 115be271f495..e544991ac0a9 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,5 +1,5 @@
 DIST decorator-4.3.2.tar.gz 34892 BLAKE2B 49485ec0ae25947b27dbc23c8f17194bf5b03778e7e43524e561c320487e1b6830a1ab39e9fba2a154e1cd00155af779965e497724f01d81d301a0ca979ba058 SHA512 87102e1b314086d008c48bf53f1061b28fdbd3ccd3d301773102fd43e3a4ce8b5ffeb9107fb5d5f47b7bd45c26e5b3b2913ea20745ffc9b274e2c0b24a69ef70
 DIST decorator-4.4.0.tar.gz 34559 BLAKE2B ed8cad0081ca47cef15f30d10afda1d19dd496f482a4621a1a349d0b5fa63d41ea4daee389d21b8b176be09949f8519c117a448003b2e8ee5f5c2d50d3015cac SHA512 32c35c80581cb7fd0b2461d21c7eb14190294b2ccc9f92749b6bc74449f7d02a26281e9a2817f6f16871a6cddb7b02b8fae8119c22256fe43a6aaa31a7599dd5
 EBUILD decorator-4.3.2.ebuild 701 BLAKE2B 8ce6978d9fc2d69bff93f2effcb0f44cfe0839ab7d31e9b130d93bda0ea63a736e036d0f6afff6ff3fce7ba2b4f37c8a311a4296a14e0b93f9413342cb6f1979 SHA512 0afc60a353077ae003be791145a43e15f494c45eab0004d1c0d55068ea9a4f082f9e5fdca6c276872f2f88e346c6d7a1995cedaca0e9efb8e1da8565d85a8952
-EBUILD decorator-4.4.0.ebuild 662 BLAKE2B a13c31ce6f7999c199c22e53739f2ccd8f64fde209e687da7d4bd0d9984f5821e0ee8e83411780aa5c6893ad33ab3a0b6d8e234be1eb4e1845b3ee2bc3155e89 SHA512 fda96f2e13bdfce55eb979b4488fd903a62fbbdbc1146a6516a4a2930b709d5b1da1a2f06d75e3785e7bef9c11a515a7a3146bd107978392b21a580c821efb60
+EBUILD decorator-4.4.0.ebuild 664 BLAKE2B 9fcd2f34a9d4aa78c7a9de85dc3a9efd19e853fb98693fea00d6076f13f790e9b493ab4778a9696b2f846fc9022e868488bff893227495162e967ffd1c0f756a SHA512 6eec12d7018f3f2bd8ae23f2c5fffae04c74bc7ba96be81836acb677504d477981e80aa8d6298c98dd48016995ac3ae9186a237dbd64e99b52ff1239e309d166
 MISC metadata.xml 731 BLAKE2B 9dcc846096fd68b11b1af0259b9707ca288b962a871c50b1701dba0e00011db27d3bc17970310b57b70301a51f083d41a3f6659ced9a7c34e48caaa60333af25 SHA512 6df81157bc757c8a8218fd75a28165cb8349d5a17a320db78582311d614a4fd586cf928e4d1c2158d8fa96cbc6537e26d85524839b688e82b29e5d7997819219
diff --git a/dev-python/decorator/decorator-4.4.0.ebuild b/dev-python/decorator/decorator-4.4.0.ebuild
index 44d680e49d0c..aab9db8591c6 100644
--- a/dev-python/decorator/decorator-4.4.0.ebuild
+++ b/dev-python/decorator/decorator-4.4.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/deprecated/Manifest b/dev-python/deprecated/Manifest
index 1e633c4f8e08..7184818113e7 100644
--- a/dev-python/deprecated/Manifest
+++ b/dev-python/deprecated/Manifest
@@ -1,3 +1,5 @@
 DIST deprecated-1.2.6.gh.tar.gz 5043633 BLAKE2B cc72838dc772db62ca75637268d09cbab4c9acb84b42bd1d2d76397d43b81781cfcef075a9a6e6ca2ab55eda19acae95cdfbdd820c1363e7ea4841fb1cb61b7b SHA512 fcef322c6d9c317081dae365d469d4b26b0d23d8290e7aa0ca18592fb098ae7f535cb5e898cc81e5c734e7e211c847cdd9d5430c1999a4b9612f30934243ee9e
+DIST deprecated-1.2.7.gh.tar.gz 5044697 BLAKE2B 5e295ce21a3e536e08b6e57d78d3682b31e9041f4c53d97c06af03f8272a5b729c892449210471b80500ce499fe9e6af22df8ac0aeec5ac774fd74590ebdfc3b SHA512 da99a22410fdcc2a96cb5b15c489971078ce34e251406ae3dce6b3f97e284a4f09aaf1c5702407abe85a94cb6c8d9237f373a3096d6182e4a9cd1990be2817f1
 EBUILD deprecated-1.2.6.ebuild 654 BLAKE2B 3b20ffa39a7d589623603d4d227ba668af39d08a4b655bf56da18f44eac032cb323250eb23bb935389e68d63cbca1a7e880e1f7875652e5c72ef24d74eb96020 SHA512 d916d0a769494fb6744a0d8fa300445550819ccf367fc38ce8989034843060adb23008d78b190afa614462c5aeb532ce6b7f5e709f8f05b9184d1dc3e99ff0ca
+EBUILD deprecated-1.2.7.ebuild 545 BLAKE2B 014398f08ed8e20520de6f13149719dd0feccf5dad97c14a764f261e8773721eafe506070ccd5a73d6cefb3daa720a1b8aa52bf53567551e17e33cafc280477c SHA512 7fb1908a5986fb4c18ae901664d498ef7358cdb27e87ae4bd739eddf512ba307386c16ce072f017c6ccd322a2975c4b30c915e423b4619f7ef133e3d077184fd
 MISC metadata.xml 326 BLAKE2B 465cb8f46170cfced4ed1ba3af61210b58fba1c1fe0af7f5f9b5d498f1a32993ff19f860231ac84b5f6661a67cc7837aa8a19b81afc108cd44e5d836f3fb93e3 SHA512 19656915996f8905a7c2ea398da098d5ae704445273471730c82c3bc391d4662a6e7fe8bf9b416ce23d3c171008d93bd6b462fe278c7bef64b304b2e467d894a
diff --git a/dev-python/deprecated/deprecated-1.2.7.ebuild b/dev-python/deprecated/deprecated-1.2.7.ebuild
new file mode 100644
index 000000000000..b42bdd730040
--- /dev/null
+++ b/dev-python/deprecated/deprecated-1.2.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit distutils-r1
+
+DESCRIPTION="Python @deprecated decorator to deprecate old API"
+HOMEPAGE="https://github.com/tantale/deprecated"
+SRC_URI="https://github.com/tantale/deprecated/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 2ff193313f2d..48115af2d8c1 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,5 +1,5 @@
 DIST dnspython-1.15.0.zip 252157 BLAKE2B 6766c1e69bc4225b08f3b1b3871fac2aba7ae707de5f16718798ce4d6846308500c5341f9ace1b48d3858ffc965a7295ee42cc2c35ff23ac38d71927dcaecfe9 SHA512 942f7cf083d1b0a9f03f040ceca194c38777f2e40862c388051986112b3f2a4a8426733ff46ec5a155319776e4a856412c3430b052b2f92f251f0e3260eb9bc1
 DIST dnspython-1.16.0.tar.gz 167172 BLAKE2B a246684aae8651d94b4312a4b4cce2236a0c4f2289a8fe8a2bb8e81c6beddf6e81a7d54928bc50f950fde862b27e589e83fa9f7aaff7d263a6442f47fe9bb3bb SHA512 825a1815855e036ea1dfece6ec0d42242f83163960439ecba3da58d9adb85b65dda7e628cf38c386807a6c0c36aa026d5e95f7a1bdc2927aa2f6f042f873c14c
 EBUILD dnspython-1.15.0-r1.ebuild 1020 BLAKE2B acdbda13aa13601d3b114ca03c6717265871ac4473a9496aaf6f4f76a8844ec7250117c37f805f1e8efa7a8ca346c70c1e4c1642090b2ce53e33dd5c84e8734f SHA512 991318d5e3a995fbf26f54a50ab9f8b3ff749a707151d57ca7f4c1f4187220de741642a40df7fdbcf0de28244b5dfa3d48c7eb2306cb23bbfb67cb84165bfea9
-EBUILD dnspython-1.16.0.ebuild 1115 BLAKE2B 56d503be4de1eab4f32fd2a48ffa5c44a978508365668cf5de616e697d9fede37a9d4091615b3d30100b6f56a185bdcc383e90ac46aa8e7341b696cb533011be SHA512 904bc076af0dd0c3e6e1a8974668fcc6e22eb783d548ee5b0114a73c3e755721afb930f071909876b996a55f266ef27727ea57bbeff19691ba4aeae293fc0d05
+EBUILD dnspython-1.16.0.ebuild 1114 BLAKE2B ae215867b69fcf5f3031efd6b09e35ea21b9534cb41397c4583dc87c8ce83d377aa44ed64e9ab57e4cd9d14d2935c0e3b7609ed8f9f11ca9324807445cbd0139 SHA512 62aab93509e3451042c7b7652a693ef2caaf375ea7e5df1dcc6b2c29093e84ba3807c664f31b62746468659cb9293a05aa5c9efac778444cde9d83a69d0c32ff
 MISC metadata.xml 1458 BLAKE2B 9a04546a3cb62f7ed6a72a8416e7f38aca15733a444970e84fe0134d0097eca4ae8fab9433f66196539de66a4b6b92103a4531f9248cf508a2e0f4d16c85c172 SHA512 40c86234936ba4f0c01a98266e74d49a80a8a48d4761b887ec84fe3ff9b534e7b6daf3c317d299b1333132a6025e49abf63884e7d6d0634c876dc74b470e0a7d
diff --git a/dev-python/dnspython/dnspython-1.16.0.ebuild b/dev-python/dnspython/dnspython-1.16.0.ebuild
index 65edfe0789a9..08b85398024b 100644
--- a/dev-python/dnspython/dnspython-1.16.0.ebuild
+++ b/dev-python/dnspython/dnspython-1.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/duecredit/Manifest b/dev-python/duecredit/Manifest
index 6b85519691e9..1062f9ef2479 100644
--- a/dev-python/duecredit/Manifest
+++ b/dev-python/duecredit/Manifest
@@ -1,3 +1,3 @@
 DIST duecredit-0.6.4.tar.gz 65763 BLAKE2B 590e5736a2a65153078a515fcba64dc3a34aa058311276a4144a40788140be563bf689956067a60179dcecd4b58b371c811dc9b50a0c7e21f6cf5d3193f2d17e SHA512 4a11c743be40c1ef14e73d06ba4434964f9a62f6c19c8aa18b337b1f37526e770e020e672bcef5fc920a64c2a0f2a0eccec6917ec172078c4d3ea24ec0e1683d
-EBUILD duecredit-0.6.4.ebuild 523 BLAKE2B f52bc69cf36ae3c956de8b70358e32dc4e5e027835488d4e16fb8071ad2cb688331f24c45aae95f9d088001e9ab894c6afc3051154dcb8de449797b3e96ff6c9 SHA512 7ddf20f9da797412060951b6c66c82885668f390f838d0dbf95a44aeee30eae16bb223815d2179e910f68f52975b509e51ea8c95be90eccb3d50daa04707ea87
+EBUILD duecredit-0.6.4-r1.ebuild 549 BLAKE2B aa2d20aca3bceb04e54fb70ce81b8d65b817ac601cb857312d3cff38cbc242e2d928cca22b1bcc7e34e9a7744f3bc542a269e4d620edb7a62ffa4070272a2625 SHA512 9e6aa206253936c97273564d30c2af3d0f1bf5a9572568ac95c9b4285d348e4aba13918e498bd7b6946d1de61206a1b1d2f66f8e61052f6398544323c69ca920
 MISC metadata.xml 433 BLAKE2B a1c9500ec6e84b027e6d0f2ec09d5a3b1a51818858401099e047a68b37fae0be7ba2d0b91b0ebe6509d992aa4617cd1a61b5b07a72e0935286e669853a7ed578 SHA512 7138c51966df35d8cf946b13e66b45eeea22e9d89aa899b14523bdd1b6871b3d78e1d2c8d76c989fa27adf0d1b8b5245c7b5ff3c735ad5b0d8466deb12ee26ec
diff --git a/dev-python/duecredit/duecredit-0.6.4.ebuild b/dev-python/duecredit/duecredit-0.6.4-r1.ebuild
index 315503695adc..fc106d66d2d1 100644
--- a/dev-python/duecredit/duecredit-0.6.4.ebuild
+++ b/dev-python/duecredit/duecredit-0.6.4-r1.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=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Publications (and donations) tracer"
@@ -15,7 +15,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="
+RDEPEND="
 	>=dev-python/citeproc-py-0.4[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}"
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index a72e2f3e090d..542206c65fc8 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -5,5 +5,5 @@ DIST ecdsa-0.14.1.tar.gz 100303 BLAKE2B f7f02bcd99752a7e0c7ac7d22625f5a42638fefb
 EBUILD ecdsa-0.13.2.ebuild 616 BLAKE2B 0ff8a541ea8c5e3fe1e2ba23fcae0f2afcd4849c976d78ad84a1f98eb103e194879ce90522b913422d0bda54e9abd7ead53e68f78fced764a63f16003884fb46 SHA512 1466057033557acd1000abcb5aa25021b012799027c0505dbd675552922890b1469b2c7d35a13980371648434fe8ad2393ab4f06e317e447db63cfcc07a913b9
 EBUILD ecdsa-0.13.3.ebuild 616 BLAKE2B 52893c5430fe5197078754423c817c425da0f1738e5dd451b6ba7e401ef9d3caef51e6458650af957f2eb095c5ab6b31f9861a80e0cb1086717ab7b2f6070a86 SHA512 f8437c0b95ef6d301c6c2f8ebe53f086a07cbaf3167362fde816acb764fb86b0eb5b159fd55e8d9d99233fdd0488ecedb5d57436a06b1d474a51d84c30444aab
 EBUILD ecdsa-0.13.ebuild 607 BLAKE2B ae318da321cfedd7f5b61d836a8892002a43d917885770690bf64b199337b5b026aeb550f474121de0ffd31204a8ea81d6368b7d188a7d57dfca91568a38fb01 SHA512 3b0af9c22ddbb13bf703fa1a6a28769c09898a555c4346539b16aaafb7b7bd0b77dbaf46ce594add453c20eb7efc0e3243cf7c26036bfcca2ff9d41f229663ce
-EBUILD ecdsa-0.14.1.ebuild 616 BLAKE2B 52893c5430fe5197078754423c817c425da0f1738e5dd451b6ba7e401ef9d3caef51e6458650af957f2eb095c5ab6b31f9861a80e0cb1086717ab7b2f6070a86 SHA512 f8437c0b95ef6d301c6c2f8ebe53f086a07cbaf3167362fde816acb764fb86b0eb5b159fd55e8d9d99233fdd0488ecedb5d57436a06b1d474a51d84c30444aab
+EBUILD ecdsa-0.14.1.ebuild 609 BLAKE2B 895bc79872e10adce1b677d4d48469850fb8cc74d346668f1988f590c12135eee84d31cd7cfde3217edc66b1ef1d19e85dc6ee866eda58e6960d3779027896c6 SHA512 8ca2e05e466baa3ad6dfebd80be2f531af4c9b04c4d2aafc7d80b5d74974fe9328e7ad8cea0d03e864adab671c0c4a2ea4e7b9c40952d00f702583ff339bcf32
 MISC metadata.xml 638 BLAKE2B 70c66edf039ec739f21145846f74e2306ce879551a2ae39a9321b53a6f5a636235006146c2049dae41ecf3b77dad887f88f45cbf67ead493288570b4b79c6d2b SHA512 b08361b7b3fca4f1623aa71fe1090e3a8890f7b475ae2edfb5f0d7d2075be226e9826ad54b90756060be1d58aaa03a942d39834bf29c09338359b402db5ea7b8
diff --git a/dev-python/ecdsa/ecdsa-0.14.1.ebuild b/dev-python/ecdsa/ecdsa-0.14.1.ebuild
index 43d6450ce1ca..002cdfc9dfe7 100644
--- a/dev-python/ecdsa/ecdsa-0.14.1.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.14.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/flaky/Manifest b/dev-python/flaky/Manifest
index 9a39cae82768..e92ee3bfcd3c 100644
--- a/dev-python/flaky/Manifest
+++ b/dev-python/flaky/Manifest
@@ -1,7 +1,9 @@
 DIST flaky-3.1.1.tar.gz 29136 BLAKE2B fe2f47356e0279885cc294f22bc4588b502c7ada1d3f7a3728b1e3127f011f5900187669bb4e0755e706a1bd77e1804c42986a07c6d3dc58fe085967adb6957c SHA512 039ad115a52b8b3a31bba045874e1860f1e04ea9cf878316226fb22af3c715b3893570c2f7380cf8467107f1a83a4ff69d0e9135daeb2dbea4b8f873a192815c
 DIST flaky-3.4.0.tar.gz 29197 BLAKE2B 8f551a414cb06f5259d37785eb769a77105b1039398462288eeaeeb6acea8456c30cc7da6cf515cd99be2adb19a77282d2d0d3abe795761985f45ffd062de508 SHA512 14fda6312e4eb8260a8190204622a7dd274d0c946dda07ec8aa65e8c341f7f4a701c704c807f50eacf77589231b37c3bb06eec18d60a718f24e9b0182f7e8cb5
 DIST flaky-3.5.3.tar.gz 29320 BLAKE2B 6bd2095cd481fdd8311e08c3e8aaff78fe22bfefd8463ea3b8190a469d8f909039267256afa876a22a57eae9e390af8235b10211509fe8549d000ed7e9331baa SHA512 9ecb80ab1ec2e0db96b7a7a5856a147434c22d29a603e76d3db3f8d94ddea06ecab799943179910bc1d9d8d5dc1c7bcc94156628352479d67e2dcaaf5cbabf27
-EBUILD flaky-3.1.1.ebuild 1383 BLAKE2B 215b12b41caebea5367d7adbd3798ba1c181b73cf23f254ea56ad1d97049128ffea26336066dc49a2c9034cdbeead118a87326875d43806b0956f609c73b6d3a SHA512 8a8a4d034289ef44d46164bacc5bd2235cf0473b84656ade249b3961902dbd391eedf2b30582ab9387831bec0c0f91e63b963ccd79bfdd438dc97d73fd728932
-EBUILD flaky-3.4.0.ebuild 1453 BLAKE2B a127eeb9a2418add17b2694436c7e07b6f5fee10bb48f8c05a0c8758a6188fdf4d4339c8c831f77f2c5e16e803c4ebfc003feffd35e2e4033c9f599b8f2d8373 SHA512 073cc28a7684363ceaab617f58433c86dceb8f36c05715f356780aba19d7a7cb0c561d68d4ee6efebac9991064099e92a0cec73caa72e703f3c9d9a9c14d617c
-EBUILD flaky-3.5.3.ebuild 1452 BLAKE2B ca229bf30ccfafbca6a8c8400decf73c21127fbcefc815091ff12bfee23069f8dc67db2cff47c9d9b3dac9b0bfea9f5655dfd715e253a9663dc6cc5ec2aea994 SHA512 21aa84e827356c5e1f8e65e7681bf21c8cb37682cd92017fb68babe2cce3af971fc1e6a5afb1e60584e999b720a759fa0caedfbd10d0ceda02afeac6028ef3ef
+DIST flaky-3.6.1.tar.gz 29501 BLAKE2B 57d8c1ed9f271688f8a6f2acf25456058b3a67c86ea7aac8c32fd52221d294b5226461b9260677e3ed94af84ff9993a02e79f0d6b01f05daee2992efd8ad03b8 SHA512 f14fbd9259759f3b6f18a7dc16e00717ce54392a10cd9b3225636e33c904e69c6b01398bfce96d7273a40b6c2cca897a05ad386a4d8a83bffee12fab322f9b32
+EBUILD flaky-3.1.1.ebuild 1410 BLAKE2B 2b6d0c15e0f0d369e8f30824abae3077c61d98c5d09e1f5ccd8baac48583fb7fc973ac1b34ccf7127022e64f54928fe4832188e7fa907431c6a00785b3faf5a8 SHA512 e81c626aa1b464fb41f1be32474b8709c78849ee40f59f3285bd81e0b3d6ee3a412baa84f5ef0fa00ffa1e7e5bed0402ca585194245c4c21c799684540b458e9
+EBUILD flaky-3.4.0.ebuild 1480 BLAKE2B 1ecfd81eb506d787eda53030f4ba3f0fa9e849b2eca65bb5853e696616b06db20e517a40f6bd4719dd8c2025139793edcc10393639c66f21a23c0893364038af SHA512 33271d56bdd819fcb5de0c00f9819ed9c418ff7fa79b8c9b40f507091e8bae9b36f6025641de19a20bc18198e84c91477326a85a11ab149994b477cccdc8e028
+EBUILD flaky-3.5.3.ebuild 1479 BLAKE2B 984a1d7197eb115e0691ccd96307f4d1a05ba43f2f56eb17d6c3571b5e1c3e129d1814abc4dca7d6cb33e5d99c89ecb2992b29e2da0b69e0bc1b2079968db8c6 SHA512 3d2f38e4c5ff112ba156551823645bbc84dbecf150254b7fbd2d4c2587c9aae30884423882c0e487c591c193b8d8e28858edcb23409c767901e319e3597fe889
+EBUILD flaky-3.6.1.ebuild 1322 BLAKE2B ac4f7261a690ad297a78a90df182bd54b84a2b7230a46b671fa79da4f3e0fa918143c780635000ad6e10afc5797eb3cd874d180e13b8c3b3913b0e3bed3a19f1 SHA512 6f56677504c5e13dedb2554433a6e96f724685ccad3f67fdf285f8d562d5bfeaed534af4ac9b36adce5148a355d213d787c520fde1204e76c4b0982b8d4a153b
 MISC metadata.xml 369 BLAKE2B ffa607acfbc98fc2e539492f87b55cedb039b39b3cdb7ce07cf9dcebe1a1559296284b27d06fc6262f362c0ea8577e23f4bef07ffd01a94c4d981fa060384d5a SHA512 da1597d14b2e3f9bc56e48064718a2a52bc1615d982d679d8c971f1fb1b9c25169d5412f99542f808fa42f958e1bb589e7615a13077a7d1b0574acbec1d4b1dd
diff --git a/dev-python/flaky/flaky-3.1.1.ebuild b/dev-python/flaky/flaky-3.1.1.ebuild
index b2685e9adba2..c03a15deba00 100644
--- a/dev-python/flaky/flaky-3.1.1.ebuild
+++ b/dev-python/flaky/flaky-3.1.1.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="Apache-2.0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-python/flaky/flaky-3.4.0.ebuild b/dev-python/flaky/flaky-3.4.0.ebuild
index a52de0d7eb36..2c19f1f374c0 100644
--- a/dev-python/flaky/flaky-3.4.0.ebuild
+++ b/dev-python/flaky/flaky-3.4.0.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="Apache-2.0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-python/flaky/flaky-3.5.3.ebuild b/dev-python/flaky/flaky-3.5.3.ebuild
index 18a872e5c809..63e1e860882d 100644
--- a/dev-python/flaky/flaky-3.5.3.ebuild
+++ b/dev-python/flaky/flaky-3.5.3.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="Apache-2.0"
 KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-python/flaky/flaky-3.6.1.ebuild b/dev-python/flaky/flaky-3.6.1.ebuild
new file mode 100644
index 000000000000..9c2bdf409ef2
--- /dev/null
+++ b/dev-python/flaky/flaky-3.6.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Plugin for nose or py.test that automatically reruns flaky tests"
+HOMEPAGE="https://pypi.org/project/flaky/ https://github.com/box/flaky"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/genty[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+python_test() {
+	nosetests --with-flaky --exclude="test_nose_options_example" test/test_nose/ || die
+	pytest -k 'example and not options' --doctest-modules test/test_pytest/ || die
+	pytest -p no:flaky test/test_pytest/test_flaky_pytest_plugin.py || die
+	nosetests --with-flaky --force-flaky --max-runs 2 test/test_nose/test_nose_options_example.py || die
+	pytest --force-flaky --max-runs 2  test/test_pytest/test_pytest_options_example.py || die
+}
diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest
index 2a0e1fc69be1..6625adf1abd8 100644
--- a/dev-python/flask-htmlmin/Manifest
+++ b/dev-python/flask-htmlmin/Manifest
@@ -1,7 +1,9 @@
 DIST Flask-HTMLmin-1.2.1.tar.gz 2921 BLAKE2B 61601aceb58545972469ca3482e7e44464d3e3f1fd0b4a40d8f1c5e1c340c5b5292d59effc3a7a4881f1a012e90d961dcc0ec3b069f1c83d4b4cc76c99d3a301 SHA512 255dac2da4db1cdacb3cccf8dcd06507c249d97c6e92e7c413d3598fbfa247f657c294eb5f1ff1f50ed73ed656ca2a1015ab712f4ea880a209f13c1d8950d83e
 DIST Flask-HTMLmin-1.3.2.tar.gz 2991 BLAKE2B 2f7dd1bff1c67e7b69c3d0eb5517ddd1fa0a2c9f5b87e9017eed207c4536743cb73cd6962f7f6d82cf1e061ca5a4401154464bb59f834071aa33853f0be27a3f SHA512 cb8730506a445fd1709ecfb03b7bec37df2d610f4c0f42aeeea0fff2ba1e76b9d16a341afb8684792a4ee6e3852d5eabdf7b81b229533b35c28a5362f58a7f52
 DIST Flask-HTMLmin-1.5.0.tar.gz 3609 BLAKE2B 0e3eca5978d98be413d9e52caaa25ee7949fc3476e9d046417f1a2328e4460c60728c1b9e3e892b3549effb64e6a5b472832e9fddbb1a7e9780ac2a49f75a12c SHA512 73c551237c67d5a0162f0ac07b5b9a79ef06f082d6df985155dda283f2276b7272ee6f2b4c47fa755af30ae69c7aadc9f3cf595c7f8be4fe41aa06bebc15a66e
+DIST Flask-HTMLmin-1.5.2.tar.gz 3807 BLAKE2B 226d0ba30ce3c0f0d8077f67d3a56aabf6606ac31858fd051f46203123fdbb2e3707575a91f545b7ec57a1e6f4cf62f87c3d387cc7ec321d7f1f9e4b3c6038fd SHA512 b468b95329054f996ad275b00f58dd2cddf52a029eeb08ff83acc5ef37ff0557af4e98181c445a980da2eeb21dd913ec1da08e0953fb97765d4790731353dcc2
 EBUILD flask-htmlmin-1.2.1.ebuild 572 BLAKE2B fc3a70cb82909012ce0064e571bdc28fc6a4abd1765a3ce6fcd0bc58ed53887a85b890ff7f0dcfa42ab94af5b81a77263863ff0a9270ff5ab1e3a91f5a500cd4 SHA512 3274b536a8d6b123b0a5bf4ef8b0e8722fe3acd3062cf73f03d4733da56e7d959fda02dde4bd8d96953dec67464ab2507b9830ce2bcc18e3f4921efe5adf84c3
 EBUILD flask-htmlmin-1.3.2.ebuild 572 BLAKE2B fc3a70cb82909012ce0064e571bdc28fc6a4abd1765a3ce6fcd0bc58ed53887a85b890ff7f0dcfa42ab94af5b81a77263863ff0a9270ff5ab1e3a91f5a500cd4 SHA512 3274b536a8d6b123b0a5bf4ef8b0e8722fe3acd3062cf73f03d4733da56e7d959fda02dde4bd8d96953dec67464ab2507b9830ce2bcc18e3f4921efe5adf84c3
-EBUILD flask-htmlmin-1.5.0.ebuild 639 BLAKE2B ddfa60aa436d38a56dfb01912a7ab6b2af48c31e1513c827b782e5bef143ea20a46186db0863ae264308a65264254039721ddebcee7460cc1905a314ff098dea SHA512 8ceda9fc0e9f3710aeabb9692839966754e9266e003a748bfdb1f32ce73c547df6daa6c92db59213f2201e2423fc3604322f4250ede83c165d465f1836ee2a19
+EBUILD flask-htmlmin-1.5.0.ebuild 683 BLAKE2B c601ff1f5eeeba57d6595015343d0f2a09baeb2033fa8ecc5e3285e9faf17383fdbff71a788458a98ffe1fa5364c62a71b64f9a5696902d6e6d715c9d7aa93ba SHA512 e39a966a8df41a4e28a8aa2fad00eec403d4b7f474b3a6f6213f6d4a2b3d9d68f7f4fe209ee521147206b1a91a3c2bd3817cca7fe0b4092993c5ecf87e65454a
+EBUILD flask-htmlmin-1.5.2.ebuild 683 BLAKE2B c601ff1f5eeeba57d6595015343d0f2a09baeb2033fa8ecc5e3285e9faf17383fdbff71a788458a98ffe1fa5364c62a71b64f9a5696902d6e6d715c9d7aa93ba SHA512 e39a966a8df41a4e28a8aa2fad00eec403d4b7f474b3a6f6213f6d4a2b3d9d68f7f4fe209ee521147206b1a91a3c2bd3817cca7fe0b4092993c5ecf87e65454a
 MISC metadata.xml 430 BLAKE2B 5e46d9cb5b03bc29264074d3abad076a3699e6753679cacf19134355f35265cc70dbc8fbad591eed798a36cde80a44d78244e88dd7deadc830440ac7724132b6 SHA512 78c978ecd3f4ef205b0ddef1cec9e60b95988ce92bafefb5134e8a1f1f8fec8ef47f50af05ce3f71047b7f72ecae76a9f4d83add103ebedbc374fc4e49a24180
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.5.0.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.5.0.ebuild
index 5a6912a24692..7d47d05704ac 100644
--- a/dev-python/flask-htmlmin/flask-htmlmin-1.5.0.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-1.5.0.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}
+	dev-python/pytest-runner[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
new file mode 100644
index 000000000000..7d47d05704ac
--- /dev/null
+++ b/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+MY_PN="Flask-HTMLmin"
+MY_P=${MY_PN}-${PV}
+
+inherit distutils-r1
+
+DESCRIPTION="Minimize your flask rendered html"
+HOMEPAGE="https://github.com/hamidfzm/Flask-HTMLmin"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-text/htmlmin
+	dev-python/flask
+"
+
+DEPEND="${RDEPEND}
+	dev-python/pytest-runner[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# Needs some kind of magic to actually test.
+RESTRICT="test"
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index f01d28210a6d..b9e028821a26 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -1,5 +1,8 @@
+AUX future-0.18.2-tests.patch 11773 BLAKE2B e2b9321ab2a04e4567c312beaccd23886c87f8b78c1de5d480205181a68b77d8c8b1582a57f43e510d5cd3ecc54252bb85130fe6d7e82756c9f1db11263fdf7b SHA512 d884d6b4e320a6e2aeca2c0c46576d9b0fd0d31aaa6f8f9a79f2007ecbc949f1393aa0b9254f0c51616ca4e8d3fb3f11d828879e4e8c01549acd4ecf04e2cf68
 DIST future-0.17.0.tar.gz 827812 BLAKE2B 14bfce4927386b157da91e6bbad547e21bb622f7e81997bc4ac400842cec5f7a50d7a0f5a743c4c76a7b80be0dcb6f54c06901311fd27781d89a8d2df1cce7e9 SHA512 f2396379e8e36753aeafdf27225c2551a31b10036f21201f1c24d63c1bb318dbd491ec977af514a19a4d477b397df9eed9711be797a64e86fc00c4692729d876
 DIST future-0.17.1.tar.gz 829119 BLAKE2B 95210b5128d25d6c189cd38bced873f096802690e8fab5f4591c08fa913c41dc255e24af1931cad91d872a286f690f47bf6e0aa365e2f6508b03b0d305779c26 SHA512 50094c44db81afbfd37ee25e1710ed11ecb2c2d64ad076fb62a2688dd36a9696ab26b0d7989bf1ecb10da251961a0ee6bb37c4dbd115f70384cd8c9a675d0b2d
-EBUILD future-0.17.0.ebuild 1036 BLAKE2B 2bfde942c288fee10045ce4ef39aac59dcb9b7b9adf18ab23c69fa62795fdd8f873b5574a74248a92d43be72474555ed453ac7ec1889687bf7cd79ad915e2f01 SHA512 291a5bc6c0ee18de908362a7bc950f4733abf143988fcfabc26377f61273385b2141ad97cb14c13e8d09870a5968c17ed63b658202a4b353782977b2b007c31b
-EBUILD future-0.17.1.ebuild 1047 BLAKE2B 0fb61f843a805b2a727b49bdc83aad3f256b22bffe3961f160118eb4eda225d1c069fd8d34f32d1e912075e0ab359dee5a1e94701e36e898a482110212dd8dae SHA512 03ab276ca715db83513cd0ff8b39f7b04b13eb990d1b8a07997092f1b1d40967ef6e56e7ed31b681941ffed0a27982e33355ece6a5ae92aa7ab0f6c11d9a542a
+DIST future-0.18.2.tar.gz 829220 BLAKE2B 68574b589bf54aa8dacbd162a54885589faa32829ccf212f50de5bf036ebd8b9aba0c13e63e80d34e507cc0dae4d8d3d47fea33433b17d2c2e6dbf6c37f66d8f SHA512 91c025f7d94bcdf93df838fab67053165a414fc84e8496f92ecbb910dd55f6b6af5e360bbd051444066880c5a6877e75157bd95e150ead46e5c605930dfc50f2
+EBUILD future-0.17.0.ebuild 1063 BLAKE2B e2cd787f349b76f6b7fe1da85d520976dc2c63a11fad671358469c573579e0eba2be4b5b3b41b6095378b43a7391715ff199578a53cc54a4fe27b389228ada1e SHA512 3848c27fb924ab7bf1ed3c99a2f7ce73999c22a0a368476b7bb6398f47876eb59003f99e136ff1a60b21dee4d2459c5e71b084b546fcdfd91daf03eb179d3554
+EBUILD future-0.17.1.ebuild 1455 BLAKE2B 7d6696d9e0ea2d2d8abc8b226130905d5235c5486fb78fef9188f19b5fe653dc4236bd639a4811b20818bfe49fc887bce93553e789fb6b5f8f127de553815dd4 SHA512 19ff053bdf7d03650be438134a158947fceabc9246d6eb86d294271953c4a37dcf3d93d80260eaadecca6abce0b020ca140b20501955093971baf585362c5068
+EBUILD future-0.18.2.ebuild 1489 BLAKE2B 5d424652e540f7360dac9932c46e340e1288138a48954cd87ed9078fcc822e3db8560fe403521fafa1beccffc61e0c35f0ec9a47f018028fdfc49829b1f7f9eb SHA512 f58432e12a0d539ab889170b158cd1aa55db55e3e302f249da4c97dcbe2579f0450e8621e65c317c71cba24329dfd7e79ae0ef7553455d518af07c1a368e81e8
 MISC metadata.xml 309 BLAKE2B ac0715185226cea8e3c38698ed3e494b6464d86dad0211e4d0583e3ceb6634c2b1ec230d9dff659d5ef47208b6f3358c701a0c42e49848816ae99703cab82f46 SHA512 e01e3b2733211e1eb6aaef4da19265c7165411a46fde4c2156118700c315bc2ad52cd87de1b90355741de77d91aa22eed5f9e5847d45186bf7138d246cd775e4
diff --git a/dev-python/future/files/future-0.18.2-tests.patch b/dev-python/future/files/future-0.18.2-tests.patch
new file mode 100644
index 000000000000..3742adb72821
--- /dev/null
+++ b/dev-python/future/files/future-0.18.2-tests.patch
@@ -0,0 +1,269 @@
+diff --git a/tests/test_future/test_backports.py b/tests/test_future/test_backports.py
+index 9eeb741..63b1afe 100644
+--- a/tests/test_future/test_backports.py
++++ b/tests/test_future/test_backports.py
+@@ -87,7 +87,8 @@ class TestChainMap(unittest.TestCase):
+         d['b'] = 20
+         d['c'] = 30
+         self.assertEqual(d.maps, [{'b':20, 'c':30}, {'a':1, 'b':2}])  # check internal state
+-        self.assertEqual(d.items(), dict(a=1, b=20, c=30).items())    # check items/iter/getitem
++        self.assertEqual(sorted(d.items()),
++                         sorted(dict(a=1, b=20, c=30).items()))       # check items/iter/getitem
+         self.assertEqual(len(d), 3)                                   # check len
+         for key in 'abc':                                             # check contains
+             self.assertIn(key, d)
+@@ -96,7 +97,8 @@ class TestChainMap(unittest.TestCase):
+ 
+         del d['b']                                                    # unmask a value
+         self.assertEqual(d.maps, [{'c':30}, {'a':1, 'b':2}])          # check internal state
+-        self.assertEqual(d.items(), dict(a=1, b=2, c=30).items())     # check items/iter/getitem
++        self.assertEqual(sorted(d.items()),
++                         sorted(dict(a=1, b=2, c=30).items()))        # check items/iter/getitem
+         self.assertEqual(len(d), 3)                                   # check len
+         for key in 'abc':                                             # check contains
+             self.assertIn(key, d)
+diff --git a/tests/test_future/test_builtins.py b/tests/test_future/test_builtins.py
+index ca07b9e..944d97b 100644
+--- a/tests/test_future/test_builtins.py
++++ b/tests/test_future/test_builtins.py
+@@ -8,7 +8,7 @@ from future.builtins import (bytes, dict, int, range, round, str, super,
+                              ascii, chr, hex, input, next, oct, open, pow,
+                              filter, map, zip, min, max)
+ 
+-from future.utils import PY3, exec_, native_str, implements_iterator
++from future.utils import PYPY, PY2, PY3, exec_, native_str, implements_iterator
+ from future.tests.base import (unittest, skip26, expectedFailurePY2,
+                                expectedFailurePY26)
+ 
+@@ -699,12 +699,13 @@ class BuiltinTest(unittest.TestCase):
+         self.assertEqual(eval('dir()', g, m), list('xyz'))
+         self.assertEqual(eval('globals()', g, m), g)
+         self.assertEqual(eval('locals()', g, m), m)
+-        self.assertRaises(TypeError, eval, 'a', m)
++        if not (PYPY and PY2):
++            self.assertRaises(TypeError, eval, 'a', m)
+         class A:
+             "Non-mapping"
+             pass
+         m = A()
+-        self.assertRaises(TypeError, eval, 'a', g, m)
++        self.assertRaises((AttributeError, TypeError), eval, 'a', g, m)
+ 
+         # Verify that dict subclasses work as well
+         class D(dict):
+@@ -784,8 +785,9 @@ class BuiltinTest(unittest.TestCase):
+         # self.assertRaisesRegex(NameError, "name 'print' is not defined",
+         #                        exec_, code, {'__builtins__': {}})
+         # Now:
+-        self.assertRaises(NameError,
+-                          exec_, code, {'__builtins__': {}})
++        if not PYPY:
++            self.assertRaises(NameError,
++                              exec_, code, {'__builtins__': {}})
+         # __builtins__ must be a mapping type
+         # Was:
+         # self.assertRaises(TypeError,
+@@ -797,8 +799,9 @@ class BuiltinTest(unittest.TestCase):
+         # Was:
+         # self.assertRaisesRegex(NameError, "__build_class__ not found",
+         #                        exec_, code, {'__builtins__': {}})
+-        self.assertRaises(NameError,
+-                          exec_, code, {'__builtins__': {}})
++        if not PYPY:
++            self.assertRaises(NameError,
++                              exec_, code, {'__builtins__': {}})
+ 
+         class frozendict_error(Exception):
+             pass
+@@ -1304,8 +1307,9 @@ class BuiltinTest(unittest.TestCase):
+         self.assertAlmostEqual(pow(-1, 0.5), 1j)
+         self.assertAlmostEqual(pow(-1, 1/3), 0.5 + 0.8660254037844386j)
+ 
+-        # Raises TypeError in Python < v3.5, ValueError in v3.5:
+-        self.assertRaises((TypeError, ValueError), pow, -1, -2, 3)
++        if sys.hexversion < 0x03080000:
++            # Raises TypeError in Python < v3.5, ValueError in v3.5:
++            self.assertRaises((TypeError, ValueError), pow, -1, -2, 3)
+         self.assertRaises(ValueError, pow, 1, 2, 0)
+ 
+         self.assertRaises(TypeError, pow)
+diff --git a/tests/test_future/test_futurize.py b/tests/test_future/test_futurize.py
+index 0d7c42d..4590185 100644
+--- a/tests/test_future/test_futurize.py
++++ b/tests/test_future/test_futurize.py
+@@ -13,7 +13,7 @@ from lib2to3.pygram import token
+ 
+ from future.tests.base import (CodeHandler, unittest, skip26, reformat_code,
+                                order_future_lines, expectedFailurePY26)
+-from future.utils import PY2
++from future.utils import PY2, PY3, PYPY
+ 
+ 
+ class TestLibFuturize(unittest.TestCase):
+@@ -565,6 +565,7 @@ class TestFuturizeSimple(CodeHandler):
+         #     tarball.write(r2.content)
+ 
+     @expectedFailurePY26
++    @unittest.skipIf(PYPY and PY3, '')
+     def test_raw_input(self):
+         """
+         Passes in a string to the waiting input() after futurize
+diff --git a/tests/test_future/test_int.py b/tests/test_future/test_int.py
+index 573a0d5..6172e48 100644
+--- a/tests/test_future/test_int.py
++++ b/tests/test_future/test_int.py
+@@ -6,7 +6,7 @@ from __future__ import (absolute_import, division,
+                         print_function, unicode_literals)
+ from future.builtins import *
+ from future.tests.base import unittest, expectedFailurePY2
+-from future.utils import PY26, PY2, raise_from
++from future.utils import PY26, PY2, PY3, PYPY, raise_from
+ 
+ import sys
+ import random
+@@ -357,7 +357,8 @@ class IntTestCases(unittest.TestCase):
+         self.assertEqual(int(Foo0()), 42)
+         self.assertEqual(int(Foo1()), 42)
+         self.assertEqual(int(Foo2()), 42)
+-        self.assertEqual(int(Foo3()), 0)
++        if not (PYPY and PY3):
++            self.assertEqual(int(Foo3()), 0)
+         self.assertEqual(int(Foo4()), 42)
+         self.assertRaises(TypeError, int, Foo5())
+ 
+diff --git a/tests/test_future/test_isinstance.py b/tests/test_future/test_isinstance.py
+index 33c0a58..ccda709 100644
+--- a/tests/test_future/test_isinstance.py
++++ b/tests/test_future/test_isinstance.py
+@@ -4,6 +4,7 @@ From the Python 3.3 test suite
+ 
+ from __future__ import (absolute_import, division, unicode_literals)
+ from future.builtins import *
++from future.utils import PYPY
+ 
+ # Tests some corner cases with isinstance() and issubclass().  While these
+ # tests use new style classes and properties, they actually do whitebox
+@@ -264,11 +265,13 @@ class TestIsInstanceIsSubclass(unittest.TestCase):
+         self.assertEqual(True, issubclass(int, (int, (float, int))))
+         self.assertEqual(True, issubclass(str, (str, (Child, NewChild, str))))
+ 
++    @unittest.skipIf(PYPY, '')
+     def test_subclass_recursion_limit(self):
+         # make sure that issubclass raises RuntimeError before the C stack is
+         # blown
+         self.assertRaises(RuntimeError, blowstack, issubclass, str, str)
+ 
++    @unittest.skipIf(PYPY, '')
+     def test_isinstance_recursion_limit(self):
+         # make sure that issubclass raises RuntimeError before the C stack is
+         # blown
+diff --git a/tests/test_future/test_str.py b/tests/test_future/test_str.py
+index 5108548..eac602f 100644
+--- a/tests/test_future/test_str.py
++++ b/tests/test_future/test_str.py
+@@ -201,6 +201,7 @@ class TestStr(unittest.TestCase):
+         with self.assertRaises(TypeError):
+             s.join(byte_strings2)
+ 
++    @unittest.skipIf(utils.PYPY and utils.PY2, '')
+     def test_str_join_staticmethod(self):
+         """
+         Issue #33
+@@ -430,10 +431,11 @@ class TestStr(unittest.TestCase):
+             e = s * long(4)
+             self.assertTrue(isinstance(e, str))
+             self.assertEqual(e, u'ABCABCABCABC')
+-        with self.assertRaises(TypeError):
+-            s * 3.3
+-        with self.assertRaises(TypeError):
+-            s * (3.3 + 3j)
++        if not (utils.PYPY and utils.PY2):
++            with self.assertRaises(TypeError):
++                s * 3.3
++            with self.assertRaises(TypeError):
++                s * (3.3 + 3j)
+ 
+     def test_rmul(self):
+         s = str(u'XYZ')
+@@ -447,10 +449,11 @@ class TestStr(unittest.TestCase):
+             e = long(3) * s
+             self.assertTrue(isinstance(e, str))
+             self.assertEqual(e, u'XYZXYZXYZ')
+-        with self.assertRaises(TypeError):
+-            3.3 * s
+-        with self.assertRaises(TypeError):
+-            (3.3 + 3j) * s
++        if not (utils.PYPY and utils.PY2):
++            with self.assertRaises(TypeError):
++                3.3 * s
++            with self.assertRaises(TypeError):
++                (3.3 + 3j) * s
+ 
+     @unittest.skip('Fails on Python <= 2.7.6 due to string subclass slicing bug')
+     def test_slice(self):
+diff --git a/tests/test_future/test_urllib2.py b/tests/test_future/test_urllib2.py
+index 2d69dad..3750737 100644
+--- a/tests/test_future/test_urllib2.py
++++ b/tests/test_future/test_urllib2.py
+@@ -691,10 +691,7 @@ class HandlerTests(unittest.TestCase):
+         h = NullFTPHandler(data)
+         h.parent = MockOpener()
+ 
+-        # MIME guessing works in Python 3.8!
+         guessed_mime = None
+-        if sys.hexversion >= 0x03080000:
+-            guessed_mime = "image/gif"
+         for url, host, port, user, passwd, type_, dirs, filename, mimetype in [
+             ("ftp://localhost/foo/bar/baz.html",
+              "localhost", ftplib.FTP_PORT, "", "", "I",
+diff --git a/tests/test_past/test_builtins.py b/tests/test_past/test_builtins.py
+index d16978e..f37b26c 100644
+--- a/tests/test_past/test_builtins.py
++++ b/tests/test_past/test_builtins.py
+@@ -21,6 +21,7 @@ import random
+ from os import unlink
+ from operator import neg
+ from future.tests.base import unittest, expectedFailurePY3, skip26
++from future.utils import PYPY, PY2
+ 
+ # count the number of test runs.
+ # used to skip running test_execfile() multiple times
+@@ -423,6 +424,7 @@ class BuiltinTest(unittest.TestCase):
+         self.assertRaises(TypeError, eval, ())
+ 
+     @expectedFailurePY3
++    @unittest.skipIf(PYPY and PY2, '')
+     def test_general_eval(self):
+         # Tests that general mappings can be used for the locals argument
+ 
+@@ -1174,7 +1176,8 @@ class BuiltinTest(unittest.TestCase):
+             def __cmp__(self, other):
+                 raise RuntimeError
+             __hash__ = None # Invalid cmp makes this unhashable
+-        self.assertRaises(RuntimeError, range, a, a + 1, badzero(1))
++        if not (PYPY and PY2):
++            self.assertRaises(RuntimeError, range, a, a + 1, badzero(1))
+ 
+         # Reject floats.
+         self.assertRaises(TypeError, range, 1., 1., 1.)
+diff --git a/tests/test_past/test_olddict.py b/tests/test_past/test_olddict.py
+index 9f21060..539c277 100644
+--- a/tests/test_past/test_olddict.py
++++ b/tests/test_past/test_olddict.py
+@@ -7,7 +7,7 @@ from __future__ import absolute_import, unicode_literals, print_function
+ import os
+ import sys
+ 
+-from future.utils import implements_iterator, PY3
++from future.utils import implements_iterator, PYPY, PY2, PY3
+ from future.tests.base import unittest, skip26
+ from past.builtins import dict
+ 
+@@ -415,6 +415,7 @@ class Py2DictTest(unittest.TestCase):
+         self.assertRaises(Exc, d.setdefault, x, [])
+ 
+     @skip26
++    @unittest.skipIf(PYPY, '')
+     def test_setdefault_atomic(self):
+         # Issue #13521: setdefault() calls __hash__ and __eq__ only once.
+         class Hashed(object):
diff --git a/dev-python/future/future-0.17.0.ebuild b/dev-python/future/future-0.17.0.ebuild
index c8748ca26019..f314fd9d3021 100644
--- a/dev-python/future/future-0.17.0.ebuild
+++ b/dev-python/future/future-0.17.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/future/future-0.17.1.ebuild b/dev-python/future/future-0.17.1.ebuild
index e99e2709bfab..0aee1d1a9313 100644
--- a/dev-python/future/future-0.17.1.ebuild
+++ b/dev-python/future/future-0.17.1.ebuild
@@ -14,25 +14,38 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
+IUSE="doc"
 
+distutils_enable_tests pytest
+
+# TODO: make numpy unconditional when it supports py3.8
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
+		$(python_gen_any_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
+		' python{2_7,3_{5,6,7}})
 	)
 	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
+			python{2_7,3_{5,6,7}})
 	)
 "
 
-PATCHES=(
-)
+python_check_deps() {
+	use doc || return 0
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]"
+}
 
 python_prepare_all() {
 	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
+	# tests requiring network access
+	rm tests/test_future/test_requests.py || die
+	sed -i -e 's:test.*request_http:_&:' \
+		tests/test_future/test_standard_library.py || die
+
 	distutils-r1_python_prepare_all
 }
 
@@ -42,7 +55,3 @@ python_compile_all() {
 		HTML_DOCS=( docs/_build/html/. )
 	fi
 }
-
-python_test() {
-	pytest -vv || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/future/future-0.18.2.ebuild b/dev-python/future/future-0.18.2.ebuild
new file mode 100644
index 000000000000..d5b55ddea8d2
--- /dev/null
+++ b/dev-python/future/future-0.18.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy, clean, reliable Python 2/3 compatibility"
+HOMEPAGE="http://python-future.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+distutils_enable_tests pytest
+
+# TODO: make numpy unconditional when it supports py3.8
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
+			python{2_7,3_{5,6,7}})
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tests.patch
+)
+
+python_check_deps() {
+	use doc || return 0
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]"
+}
+
+python_prepare_all() {
+	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
+	# tests requiring network access
+	rm tests/test_future/test_requests.py || die
+	sed -i -e 's:test.*request_http:_&:' \
+		tests/test_future/test_standard_library.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs/ docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
diff --git a/dev-python/genty/Manifest b/dev-python/genty/Manifest
index 63b171ee34a4..4dd46682861e 100644
--- a/dev-python/genty/Manifest
+++ b/dev-python/genty/Manifest
@@ -1,3 +1,3 @@
 DIST genty-1.3.2.tar.gz 20818 BLAKE2B a3344869e63f4f6e564836fdcf5e36b3184f5df2a20994ded3a20ee0ff1360ea5e9db574bf6097f5b47673fc7db70bb9bfd3238075fb0a3b7b722a6461f09632 SHA512 cfe984dfe5af48ba9f4f959a1d0ab1d331d3c2fdb64c680572e5652b845e5c290097ec3ed2b4e472a563cd6ab79489124f6eb212902a05a2f1ce5ff254a82e13
-EBUILD genty-1.3.2.ebuild 726 BLAKE2B 1f6bdeab6a1158d07b20369bba504a99c94ed63b407516a8ba067d06ebb4e999843c67219d8dc415a3e9f9a12d1df8e1c886b07e2d3a430f8d652734591ddae7 SHA512 08c8f7b894e6a596661a8bf203c87f370fc4e99bd091fa4551850708d919c548e09fa59fd0d40d42ff605835ec90f70ae1dbd2ba32ee0af459327e602c71e525
+EBUILD genty-1.3.2.ebuild 755 BLAKE2B 1e64cfa1bef9777446d3a5c31f61bd220c3ce26cb0f92df96cb1a6191b853751e591821ff8b9c6e1f62aaad2c97a6d4c7db478aa0cc60e2ea8492654d263e4e6 SHA512 8a32740d5e9530c003ed1824e474ae59345208f03851ceb2a6387a7700d4a6d3e91c59c69e8f77fb3654177e40e321389174f2741656f12fbad2d0d603a8c864
 MISC metadata.xml 357 BLAKE2B c4b7d3382dabce66ab01fecd442eb82e979d27434b0888c06d75d138ced20b984c67367f632a9fe00602d8d385f2222af1e195b8cb5e8b8b7e50494b9b018627 SHA512 ba3b3f11913ffc8848a7d2b1637b028812badef52306565f5d0462314d97ddb5795219cc6f674f3dfdc47c3d9b0bce602425b25df99c7227dcc166f1b1f536a0
diff --git a/dev-python/genty/genty-1.3.2.ebuild b/dev-python/genty/genty-1.3.2.ebuild
index b81a3fa545cb..f4eb0a58b1bb 100644
--- a/dev-python/genty/genty-1.3.2.ebuild
+++ b/dev-python/genty/genty-1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
 
 inherit distutils-r1
 
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="Apache-2.0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index 56100a819b2a..98045cd220b3 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -7,6 +7,7 @@ DIST grpcio-testing-1.21.1.tar.gz 16879 BLAKE2B 4595b99b174db549a2637c9e203e7de0
 DIST grpcio-testing-1.22.1.tar.gz 16718 BLAKE2B c90717c5910be42a161fd08746b898a691cdc80f631991f718c061bf56e3e8851b49ab2219a59ebe80f4d878c713230ef6355095e78aa1d0c164aad570dd27d9 SHA512 90f366bbf352e7f7165f91ac4605ed74a7f7b08f1981838f0d218396c54983cc0752121fa890abbfcdba719461093ab3e5ce47e95d3e68047fcba1b7f5820d73
 DIST grpcio-testing-1.23.0.tar.gz 17042 BLAKE2B 42eeaf657355c569dd62e0acdad99449b2d70d725f493a727168314ca8f4a8016b3a39521b8796cc6160472e455385004079857ed88e796c964304d99b5361e4 SHA512 3eb370f5a6568a22a87c72c8bad1c4ae537d36b19fa45039620dc3ae645561bd4836cd430fdf6f64a7687178412c4a2e51fb6474d470039e310f639f86c351f3
 DIST grpcio-testing-1.24.3.tar.gz 17066 BLAKE2B 9f968ce096b70d7b3a01d9991d2dbd70aa73cb39dce4ea1aeb36e65f6e33180b0e7d126c18029da6cb1c91bb4371206cd3481ddaf0014c24e463014d6e990a08 SHA512 265369f696ecc5e3fff35027d951c405e62e7c8ac61145813d7eca66db6e91d0ebfc39ef151cedd9c67437688898bde02656fdbd547718443f2701ab18e68a1b
+DIST grpcio-testing-1.25.0.tar.gz 16469 BLAKE2B 00bf64f79c073b2bce8bac519555ffecf4701f5d99d58bf15fb5a12acc71639b014986e4699f8ce8e0c68606ee6582c7d214474e88120a51495b61a7e03f2612 SHA512 11531ff2dc58f3ed7eba4ef3160dca475a5dbe76ff6570337005e7c3e276a6e7efe33556151fb263c209eac2bba1efb7ab611744405ab97eafb78edb07476240
 EBUILD grpcio-testing-1.16.1.ebuild 520 BLAKE2B faadbd2e92ec9eb144a3a5dae19e22dd2dc05b2dbb6d5e6de47017c2d8f7ce259ffab586a73dd7263fb939c8749f33789eb3d8292f2a1e75e6c68a5ca190fadd SHA512 d8e2fae154f4e69212278ac6a5a360ecb41b39311188afdf2e025e4f95a76feb8c6ec8d9391168bc68346b2d990094116eb871eee51a78eb046985156736bd9e
 EBUILD grpcio-testing-1.17.1.ebuild 520 BLAKE2B faadbd2e92ec9eb144a3a5dae19e22dd2dc05b2dbb6d5e6de47017c2d8f7ce259ffab586a73dd7263fb939c8749f33789eb3d8292f2a1e75e6c68a5ca190fadd SHA512 d8e2fae154f4e69212278ac6a5a360ecb41b39311188afdf2e025e4f95a76feb8c6ec8d9391168bc68346b2d990094116eb871eee51a78eb046985156736bd9e
 EBUILD grpcio-testing-1.18.0.ebuild 520 BLAKE2B faadbd2e92ec9eb144a3a5dae19e22dd2dc05b2dbb6d5e6de47017c2d8f7ce259ffab586a73dd7263fb939c8749f33789eb3d8292f2a1e75e6c68a5ca190fadd SHA512 d8e2fae154f4e69212278ac6a5a360ecb41b39311188afdf2e025e4f95a76feb8c6ec8d9391168bc68346b2d990094116eb871eee51a78eb046985156736bd9e
@@ -16,4 +17,5 @@ EBUILD grpcio-testing-1.21.1.ebuild 529 BLAKE2B e979c297fd2d73d9f94f28f4b6a6e569
 EBUILD grpcio-testing-1.22.1.ebuild 529 BLAKE2B e979c297fd2d73d9f94f28f4b6a6e569ee4d999368ad2c038f0cb6072192b27eacee5d711f0465435c251672efb88ee9671899bf71020d087576b11642abe3f8 SHA512 df1fce2b675a777f4fad8899efb9d0413b334c5fddc4f1cb6ed747ce3945c856f3c3ab6b453009aff586612ebbd58a943f43dd98fd0d151c4facac2f700e1731
 EBUILD grpcio-testing-1.23.0.ebuild 529 BLAKE2B e979c297fd2d73d9f94f28f4b6a6e569ee4d999368ad2c038f0cb6072192b27eacee5d711f0465435c251672efb88ee9671899bf71020d087576b11642abe3f8 SHA512 df1fce2b675a777f4fad8899efb9d0413b334c5fddc4f1cb6ed747ce3945c856f3c3ab6b453009aff586612ebbd58a943f43dd98fd0d151c4facac2f700e1731
 EBUILD grpcio-testing-1.24.3.ebuild 529 BLAKE2B e979c297fd2d73d9f94f28f4b6a6e569ee4d999368ad2c038f0cb6072192b27eacee5d711f0465435c251672efb88ee9671899bf71020d087576b11642abe3f8 SHA512 df1fce2b675a777f4fad8899efb9d0413b334c5fddc4f1cb6ed747ce3945c856f3c3ab6b453009aff586612ebbd58a943f43dd98fd0d151c4facac2f700e1731
+EBUILD grpcio-testing-1.25.0.ebuild 536 BLAKE2B 1334c659d73dbce494144f30b9acfc7b8d1aa3d1acd07573e93d11be9d41cf1c0e1982b0047f6856fa29f7e8ce0d6fc7f1cd6f44a936326ccf58c8031d9d4f9c SHA512 2ba3e35b88065743ee28e78aec2fb4e18757ed386b6e86744733209832c14c76362588e65cb974a0d8696fa82a5dede46a18e252b65fe56002b0ad84f0b21df8
 MISC metadata.xml 462 BLAKE2B 159e29c960dba2f197de7e1b8eda84162039ecdb35777aeb00314f8af9a7bc0771071e63a1528c922519568594f06971b228036914500d2ce3d33b411ddf0685 SHA512 8326b0e1b98c2921b461ad44663711318f2c48e4e411380de4b4bb26fca11d726d627fe47ccd0d1149348b55aa9391d97d144f654d016a1fccb34791f5850487
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.25.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.25.0.ebuild
new file mode 100644
index 000000000000..74459df67806
--- /dev/null
+++ b/dev-python/grpcio-testing/grpcio-testing-1.25.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="Testing utilities for gRPC Python"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index dda5478ee7e8..b79a6b57d1e6 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -7,6 +7,7 @@ DIST grpcio-tools-1.21.1.tar.gz 2032788 BLAKE2B f26e94c92ebe076496a8738dcbdf9b67
 DIST grpcio-tools-1.22.1.tar.gz 2022553 BLAKE2B bd94ece55c5e9e41c923c1beb5a2deb2b49d6ac479401b9de622d8a3fb0deb7e852d7da3a0239442d7560135565af1fda80ab43f7def870488dd17cf52c1dce5 SHA512 92d65c40ccda268154dbc21a9b7607f4ccee8feb0c5eeb0d88ae0d34ca80b3e1e7a6a2f8b7059aa904a7cb3654b0e23ceeebe44f58c08b713bf78ab7e4faed4d
 DIST grpcio-tools-1.23.0.tar.gz 2025916 BLAKE2B 7dc3854e29731f7736ef08526142e31e9b14df2b08367cddc9dd69a0b5ebb53938a9a24284e5228fd603402960507d7903eb7a6c90a1243ed311cd595eda0f26 SHA512 306e1de073bffd036643dee6fdaf8c2f48cf810fc4403b02a5b2aa44ba77d8c985181b23ec20d787261786b1c6e4930f8e5a253752da95beeb257ff0555175cb
 DIST grpcio-tools-1.24.3.tar.gz 1984292 BLAKE2B f9ec935f0ea8af31ac5f60909551efc403241917879fb456ea88ac3fc58cd068f0263726819f0e6500d6ca11ae38cd1799db6af4d4f822002d92fe7a16d01060 SHA512 89d12beadead3c68532a769795446a9edca96be495ea2af42bf1934e86cc06d06fc345f7847b17a088d66a2c4390461533be075a93e3d5c255c625da097812ab
+DIST grpcio-tools-1.25.0.tar.gz 1987671 BLAKE2B 3f5d0a7927e8d10a3951d494884fcfbbc9bf531ca3e63324a1c4923eea47065f3db665f26f968e778bcea418cc6b801bd1c863ed2ead1aaa123205a4ac6a97f7 SHA512 9f17e1641766537002e595e660e384dab54c5c36f17b2f085348392171bcbcaacbb0a55f77ba6eba50603faef59c5436c784b6c1a0de96597d7701e1bf82710f
 EBUILD grpcio-tools-1.16.1.ebuild 678 BLAKE2B 08cf87936b8367382223332522d1ef2f36d4bccfeb63ab9b57dcf45072aa0c8cb62fb3fcdadd8c57d0f84426e9c66988e5a25524222d40b553f5a1fd614e485d SHA512 3c6602867b69f2a6a99a467c5472076fa8bc1ec7ab6bd56418756fccf9f059559b130aaae82183456a6741a5d43f11c46f01634f2215ef8b4e3b9c379f903acc
 EBUILD grpcio-tools-1.17.1.ebuild 757 BLAKE2B be33fe87e9af5532a5ec7855157d0ec91e9245575f54ee4f3bc691e097a2efed968fb741345b97e7fb05f68e0cae5e1d23894ef810b7adbbb03c19906c3e2625 SHA512 516051181a7ced9f6444a6dc68840ff4ec787711a21574d74ac00c84bdfd0cdd78830c6312ca6ca516dba20771a2ad86c916b692a71a7c7d5576a7df14acbda4
 EBUILD grpcio-tools-1.18.0.ebuild 757 BLAKE2B be33fe87e9af5532a5ec7855157d0ec91e9245575f54ee4f3bc691e097a2efed968fb741345b97e7fb05f68e0cae5e1d23894ef810b7adbbb03c19906c3e2625 SHA512 516051181a7ced9f6444a6dc68840ff4ec787711a21574d74ac00c84bdfd0cdd78830c6312ca6ca516dba20771a2ad86c916b692a71a7c7d5576a7df14acbda4
@@ -16,4 +17,5 @@ EBUILD grpcio-tools-1.21.1.ebuild 743 BLAKE2B 4f83bd6cf1287fd769fdd0e11501bdbb5b
 EBUILD grpcio-tools-1.22.1.ebuild 750 BLAKE2B 4547a8a98b268186bd0b0c0f33dae4cab8fe8cb166a7b91fa1890337688f4993763387ec2347c8ea5dffe8e4047f2f0fd893265c634e83854f2de68bcf8e5049 SHA512 1030458099fc0f1a1c0de8433aa1350ea465e9060d8cf94b34f2043418313a57499ba99974113c970ed265a71ae8f09007664ca2a3232c476636dd75cfc27c9c
 EBUILD grpcio-tools-1.23.0.ebuild 750 BLAKE2B 4547a8a98b268186bd0b0c0f33dae4cab8fe8cb166a7b91fa1890337688f4993763387ec2347c8ea5dffe8e4047f2f0fd893265c634e83854f2de68bcf8e5049 SHA512 1030458099fc0f1a1c0de8433aa1350ea465e9060d8cf94b34f2043418313a57499ba99974113c970ed265a71ae8f09007664ca2a3232c476636dd75cfc27c9c
 EBUILD grpcio-tools-1.24.3.ebuild 750 BLAKE2B 4547a8a98b268186bd0b0c0f33dae4cab8fe8cb166a7b91fa1890337688f4993763387ec2347c8ea5dffe8e4047f2f0fd893265c634e83854f2de68bcf8e5049 SHA512 1030458099fc0f1a1c0de8433aa1350ea465e9060d8cf94b34f2043418313a57499ba99974113c970ed265a71ae8f09007664ca2a3232c476636dd75cfc27c9c
+EBUILD grpcio-tools-1.25.0.ebuild 750 BLAKE2B 4547a8a98b268186bd0b0c0f33dae4cab8fe8cb166a7b91fa1890337688f4993763387ec2347c8ea5dffe8e4047f2f0fd893265c634e83854f2de68bcf8e5049 SHA512 1030458099fc0f1a1c0de8433aa1350ea465e9060d8cf94b34f2043418313a57499ba99974113c970ed265a71ae8f09007664ca2a3232c476636dd75cfc27c9c
 MISC metadata.xml 476 BLAKE2B 62016e9a321f9c5b06d8a473d75b5efca8246df90ef9a67a33c02c416c58a8ee1be875cd54567d55bc9f10ef32082e11c01a9f1550293137aab8942e05dcf744 SHA512 cedbae8a8d9d7c6689c676c433aa6fea3c16d41911e0ee4a30929dbf2adb8ff72a2f0d81f996196a3b4090f8a5103a54eab4c651b359f9487d59955a6861152d
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.25.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.25.0.ebuild
new file mode 100644
index 000000000000..36d23bc9bf4a
--- /dev/null
+++ b/dev-python/grpcio-tools/grpcio-tools-1.25.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Protobuf code generator for gRPC"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="dev-python/cython[${PYTHON_USEDEP}]
+	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	!<net-libs/grpc-1.16.0[tools]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_configure_all() {
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index a53d2f8e1806..59e49449d970 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -8,6 +8,7 @@ DIST grpcio-1.21.1.tar.gz 13919484 BLAKE2B dcad98da8db4aa588facc30d1b010ec1e4d5f
 DIST grpcio-1.22.1.tar.gz 13923342 BLAKE2B 6d211b93a7597f568d106e0d6e3d30b90d7b4bf6fae42b163f2ae04e01c4b323c4d7c2a5380ccdbab14f9a6986c86fae4948bc827a97c189f915bc24738fc426 SHA512 5392041a021b0523fc7a615070ea0f907fc960cb69ffba1e7fcdf0aa8e498cb33f567d9eec795dc06662f558884dcabcc17a1ae4a26fcaa479b0a43c08e8b913
 DIST grpcio-1.23.0.tar.gz 13977223 BLAKE2B b9f95aaf397eae9610280937980e4b2694af98e6cd5f80015dd83c67ec6bf9c41e76474f873627d6c6cc35fe9af3b45f14aabb6ea809b51cf5f0bb0f3b702794 SHA512 ff3cd9d2380a158ea7a49ba2c9cd5bd1ec98194aa48cf2d45596ab93f0e8a6d6ed0291e5dfc52bca79c62950e6a0ce387819d19f036c0dd1e6dc7b737c1ee97f
 DIST grpcio-1.24.3.tar.gz 14030592 BLAKE2B aa9e61c692937d7fc06d0fb601f7632a6ac5fb165aabec9e7993cf1fa41254b004fff89f650f390544e5fb1972dca542169ce0fdae79a71d775fe3cbb44a2d95 SHA512 0dc90de5a06b9af7fa91d3e96117f69813e5fee31499e8e48daac7d164856594f164a434d3dd28d6e0220e417926aadceabb9b7597e86a6bb87d8943e6661dce
+DIST grpcio-1.25.0.tar.gz 15358518 BLAKE2B 84ae22faa25dcd961c5cd0e6db68c48df4b64a529673d729436710e0fa08dd6119304dc7905f46ce4f92e6bccbbb05068d7fa04da4c579a1d59c4717623807bc SHA512 bb0241905bad15d6bd019323f1699b95f7cd047aec227197aed9f0bfbca923788fbf59052ab604718542ad69767877560853ef563613ea0490cee2e9f9e9206d
 EBUILD grpcio-1.16.1.ebuild 921 BLAKE2B b6299a97f90c14a8fd60c148cbe6449a8025b391c69a7f3a9fa1201e06317a687982c873437b270ddceaa5470d5077cc840cc931c65a6e7cb442ad7342f75c8d SHA512 70b3fd83bc2bbbbd2e1cfd93624a5f6a18e2a126165ec5d2d1d946e5f77a672ecf2a2ddcc3f21e29d14e0d3e65e97edb89f98034b0b81644adf516ff3ae48259
 EBUILD grpcio-1.17.1.ebuild 1049 BLAKE2B deb945f6d1486f3df5baccc9339655f4173d499a1786e5424a221fa9c10d99da4a59140c2a8e04e43269c2150ec946f9c980051cd271d399cee9e46f7c309576 SHA512 cbf9bd692af1b73af88515d8b4ea590f99dbd8249988ac8454029435468e02895e1eaf78eb831745911cadf292423c167a2d272fb7641c550b1c4fadf6b5bdd1
 EBUILD grpcio-1.18.0.ebuild 1049 BLAKE2B deb945f6d1486f3df5baccc9339655f4173d499a1786e5424a221fa9c10d99da4a59140c2a8e04e43269c2150ec946f9c980051cd271d399cee9e46f7c309576 SHA512 cbf9bd692af1b73af88515d8b4ea590f99dbd8249988ac8454029435468e02895e1eaf78eb831745911cadf292423c167a2d272fb7641c550b1c4fadf6b5bdd1
@@ -17,4 +18,5 @@ EBUILD grpcio-1.21.1.ebuild 1090 BLAKE2B 990ee36dfe1faae8fa5319c13785922e5890113
 EBUILD grpcio-1.22.1.ebuild 1160 BLAKE2B 0b6a41225f2177c211b218a9f21120369adca0f373384069ec08ab60c6c9e338121309ba6ec813b4fdc67a81da3f6242546f556491bc37ef67a67674b245b1e7 SHA512 8372b6fefaf920796dcdf1888f70ade08f15e823166ab197e77db2e09c9596597d6fc7f35404edef51e5c67360014d4467e6ddba32434c431fa93ae41c24e9e4
 EBUILD grpcio-1.23.0.ebuild 1160 BLAKE2B 0b6a41225f2177c211b218a9f21120369adca0f373384069ec08ab60c6c9e338121309ba6ec813b4fdc67a81da3f6242546f556491bc37ef67a67674b245b1e7 SHA512 8372b6fefaf920796dcdf1888f70ade08f15e823166ab197e77db2e09c9596597d6fc7f35404edef51e5c67360014d4467e6ddba32434c431fa93ae41c24e9e4
 EBUILD grpcio-1.24.3.ebuild 1097 BLAKE2B 2e1b29cd0aa175cb628e5287fd919f8b350c6f97c9f0bd2e39660784e592109fe6d450d1ecc9c3908798dc4924609d9a28a882b92aa8a38a681beafc80925570 SHA512 bd4edf772ac2693f09a1f12480de5d1d4ad993199f4cb6fe1737602763c1815211f49340c8ac053cbfb61c5d160b3175c103021849854985220ceeeaae74eee3
+EBUILD grpcio-1.25.0.ebuild 1097 BLAKE2B 2e1b29cd0aa175cb628e5287fd919f8b350c6f97c9f0bd2e39660784e592109fe6d450d1ecc9c3908798dc4924609d9a28a882b92aa8a38a681beafc80925570 SHA512 bd4edf772ac2693f09a1f12480de5d1d4ad993199f4cb6fe1737602763c1815211f49340c8ac053cbfb61c5d160b3175c103021849854985220ceeeaae74eee3
 MISC metadata.xml 470 BLAKE2B ad01d702b7a0ffe570bd30f50d47bb4fed725fbdff6f838acc54ac767d0cee88bb28bb0642f804fb04858d36a63f8ff7e110e4ae1dd26b8eb539b0a5c77cf5d0 SHA512 bf26387089977138bcf6be78b469bb412988e96c6bf5b4a9897f452378ce71fab1012a7d9268fb55f2883bc9636b712b59abe5498ffdcf199417d97fb09cd90b
diff --git a/dev-python/grpcio/grpcio-1.25.0.ebuild b/dev-python/grpcio/grpcio-1.25.0.ebuild
new file mode 100644
index 000000000000..bcf535535b98
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.25.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="High-performance RPC framework (python libraries)"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	net-dns/c-ares:=
+	!<net-libs/grpc-1.16.0[python]
+	sys-libs/zlib:=
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_configure_all() {
+	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
+	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
+	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/gsd/Manifest b/dev-python/gsd/Manifest
index ebb8155b245c..949ebec98e5b 100644
--- a/dev-python/gsd/Manifest
+++ b/dev-python/gsd/Manifest
@@ -1,3 +1,3 @@
 DIST gsd-v1.5.3.tar.gz 240114 BLAKE2B 076d888f03350fba2388c907787354e878a1536c7d85c759eb3513102ee2abffe2c9313a6e9e208726d66d6324dac02ae70d8872342f9bcb162ad13d9a23dbc3 SHA512 893db74dc481da47d6c51ea0d0d9faefbe164edfaeb5a2ed73e25acbd9dc42c3cf28cbc0d9257c6bf0cc0e9911ab85cfa72997886350c0e7c125d30636ec432a
-EBUILD gsd-1.5.3.ebuild 522 BLAKE2B 79d114bd0b713b8b6cac84cf98eca97f053ca01764d4ac8cf03f50adb46b1dac1ea46e77cd879828e7b7e22621cd357a1b126f01a5c2a1d905e7c7e4cd28928f SHA512 e1e6e758f7db9802e9bb0f02965edf146a0fc305b402e4a9858f3ef2f5a57832f52aa1c5247215f3488aa4cffa0d9dd5813e1e5fc60863e92d85a1f1d62b4663
+EBUILD gsd-1.5.3-r1.ebuild 548 BLAKE2B 91ccaf113d6267a7120645aa0160051abf8002d358e79becce1ccb992543e17d6b055f46645688b48e3a798d63984eb1b149eda632dfbf723084c35aeea3e9d9 SHA512 6541bd51207bcd3533180998931f910d9ad23a52f74aae27e86b48dd789fa66bb96bb3257deb49fca5468b0c9a1294ab382a07f7b74ee2b6e95bca45a1c2560a
 MISC metadata.xml 349 BLAKE2B 92fd987b0f0f73a6f07f9a3002cdca45698f61d9129cebdf2f1756bbe4ac926494bfcae209d18f6283665a95090be82ac6b34c0189da6372368833b62b67b626 SHA512 851f80555da7cbd3b2c2e696eecfe8f2cf19b61359c71d67c917c44a18f55c13aa5047afcf95afe0468ddb84b741cb183244889cd44e80810a0a82756fc033a4
diff --git a/dev-python/gsd/gsd-1.5.3.ebuild b/dev-python/gsd/gsd-1.5.3-r1.ebuild
index 3296d63c7ea5..caac808feb22 100644
--- a/dev-python/gsd/gsd-1.5.3.ebuild
+++ b/dev-python/gsd/gsd-1.5.3-r1.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=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="GSD - file format specification and a library to read and write it"
@@ -15,7 +15,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="
+RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}"
 
 S="${WORKDIR}/${PN}-v${PV}"
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index 26f55bbb2b12..179d0807c4ef 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,5 +1,5 @@
 DIST hcloud-python-1.2.1.tar.gz 63592 BLAKE2B 9a6d2dae97ff405ebd9b92bc833c9d953c13840e68be4eb43fed375a60e55cf4bf9b4b742b26fb03401f631b7f7127815961861cb673adf4839c829141c8ed00 SHA512 cb70d190350457fc3c6e474bc6c943070102762595dac2f386041956f64255f390a928a2f2411be861645cd65b015ab9e0c931b36aeed0076b06d9f67ac72d1c
 DIST hcloud-python-1.6.1.tar.gz 71866 BLAKE2B 0a1d37d4dc8be4e28595385ec7622ec65367c40f9cdd455e03827a5ee2983f43026b1dbb7e9bd20d241ed9a4748015d33bdcb53b15ce148c401984960e158716 SHA512 0b2ecaa311b4dac44b3122a45a38f76f8377bc189b1550f21327ea3f56fefad624ea6809c4abd6bbaf5c8fc23dfa5e6edd352dcbbcfae6c87af897ff376ce2cf
 EBUILD hcloud-python-1.2.1.ebuild 1056 BLAKE2B 94a8aeb9cf22f4263222ab52e186c8604912c1a0931d96e3a47698019245d318753fc5d5686255fa0ef6f9460fe55a94b2125804407da5f94ca92f4577189a37 SHA512 ac4b6bb887fb0b1ff076c4ba02dd1a33256f238eab49f250db3b8a1908c68784dfe5c51b5dfa2b7db7f5dc57496e472c8be8d50d152392984c2f2c6674722e18
-EBUILD hcloud-python-1.6.1.ebuild 928 BLAKE2B 05dd717554d8b02c3317c54e38b4028847c3ccaa41491b6da7867310893f59f9eae2cf423135ae4188ba2c82a86f16529f3191474d6335182ed3c8ea85fa03f2 SHA512 e4ee57fef367129a1c364000439020935b5b5b3286db30f761c99388299d5b19c8c5ccd4966b6ceef9836c70f41a63026da6a4ed3fb711eb5162e7ce8e8afa63
+EBUILD hcloud-python-1.6.1.ebuild 927 BLAKE2B 951c1adde98b5ab1e6528427b686052e624315d9796ec0893ee37bece4e252a622c6c1e89e138e7f09674d6eb2a6499ca6bcac4009c749a5adeed132fa762bb2 SHA512 d9c6f88f6e5595a8a906b98246fb8b77a6097b06bb80a87aa852b1b9b27182a2bf4d90c8c11e863248e0a0c333ac1375e009fa83a7fb21c0374fc3fecf72717b
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/dev-python/hcloud-python/hcloud-python-1.6.1.ebuild b/dev-python/hcloud-python/hcloud-python-1.6.1.ebuild
index 12cb839f08d9..65c3b456a996 100644
--- a/dev-python/hcloud-python/hcloud-python-1.6.1.ebuild
+++ b/dev-python/hcloud-python/hcloud-python-1.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc examples"
 
 COMMON_DEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/html2text/Manifest b/dev-python/html2text/Manifest
index b9350d882ac0..9461cb363993 100644
--- a/dev-python/html2text/Manifest
+++ b/dev-python/html2text/Manifest
@@ -1,5 +1,7 @@
 DIST html2text-2018.1.9-1.tar.gz 51173 BLAKE2B a21cd3e579d47081e669fda3f3147fc28d816478885942565a1b93b86292e2729e93bfea6b5326703e575f209f5bd7dd905d72011b8153b8c40d31c83acf9057 SHA512 773b508864a2fa31e961e132118702429f5b7836e90bd521db2ed6b4215de49d63991a99b7ad7d5aac3074a3c14e4d384557a4eb5b43c7e2aada46d5434ed229
+DIST html2text-2019.8.11.tar.gz 48721 BLAKE2B 6a63a9608c29374a510d7026717de4b94eb63d366513990623b9bfbf679680c85f5cf06ec7076143397d160a5c484bf5dfef3e24b1862be09e0cc0d7cd86051a SHA512 f405bccea18b2898fc8816483e8fa8912b2d508f139d7a65c54218acc87006d8b89e00a12018dc7b911f729036fe4e8a5069242dc00edb40171d4bc149e39ba6
 DIST html2text-2019.9.26.tar.gz 48634 BLAKE2B efece48c7b05171f9bae833663292d7804838b5a791f1f734b3a258843a71616ada2ebee7cee406e0bfa1a3dce67040d41621bd87be100a2c0d4ca6d75829aa9 SHA512 4c6a52e96d3997a6ebe41c2955e2f6bd5189f49aadd7d7afbe67b85a2f61a0aafd0fc09fef184cb9407b9ab26f120ef235294e4e9d8f41e3b6b8f6fc29aa386d
 EBUILD html2text-2018.1.9.ebuild 931 BLAKE2B 57fb5d8bd7d7123eb81fff832f043229c1cc52cc061e422978af1d16a4970677d44fe5baca51e64d365930ae9019e9fa7c362e338db2420b54ced463a21d2157 SHA512 76caf8cacb1f38867d375561dde5b24fdd76607b624c972b584789fd7f3835475e621ce22aa4b0ada86427aa1a0e8963f1003cf153ee3e50ffbda7717017260c
+EBUILD html2text-2019.8.11.ebuild 975 BLAKE2B 0596cf86fcfc3fc6a9fdf76f1d5f8a3364e58d2b80f6e03d24ca60b72f84d7447c63ddf5c84cbdaa614812d8929180c81bd65980d87b6f9527ea46b776ed725b SHA512 42a50ee24ff715c156d4c28cf6f24c5d1e3a1f3b0958f63953edb55dd9b46c03837edd2794de3d9e48f2757dd09c927d4436041c586b97a1d84b649dbdbc28ca
 EBUILD html2text-2019.9.26.ebuild 961 BLAKE2B 5e77053b1534d403e58eaf4c8d1f703e6c4738c527476e2d3a1370ef413151e96ecefefb2e1fc6efbf9e8ec3eaaf598fc71ebcfb6d434ffd0811a03573ccda1b SHA512 e3b27394ff8e9dac8832e8fd30cb68748d343c5c3bf012ff8b55830e3c51aaf0861a331ec00fb6547ae771af6055a9adf982cc70d781a5719211b8c001ae0f8b
 MISC metadata.xml 369 BLAKE2B d4f2c4f645c20a9e803e76df75ca78b79d8ccebe56ee8430d38abdcc096be85397b6541ddc2f25cb2c79d955b9ee913437edda69956cb78c1f0c38256b311be5 SHA512 dfa2834eca444d2c56f36b11a193c4e6b012b3a3afab08034c87d9ebb442010f2454788416380a4caf78ebaf47feb2212643977aab3100971fa99f29fe29955e
diff --git a/dev-python/html2text/html2text-2019.8.11.ebuild b/dev-python/html2text/html2text-2019.8.11.ebuild
new file mode 100644
index 000000000000..e44c8fcbf968
--- /dev/null
+++ b/dev-python/html2text/html2text-2019.8.11.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
+HOMEPAGE="https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# pkg_resources is used for entry points
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+DOCS=( AUTHORS.rst ChangeLog.rst README.md )
+
+python_prepare_all() {
+	# naming conflict with app-text/html2text, bug 421647
+	sed -i 's/html2text = html2text.cli:main/py\0/' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pytest -vv || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index bc1e4d53f16e..9c5dd47b7082 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,14 +1,10 @@
 AUX hypothesis-3.74.3-no-werror.patch 646 BLAKE2B d398319202a662d87018d99919ba0745d628c08afae85fda67113555f61babd83cae5dee7a79b224d7aa5ead73f29a91441f0de27086b9a4f74a3b53dda05be1 SHA512 d25646d35b94dc19b8c9c7a97601a7666ca6140b6a22a4f6b0bf232a7bd3a75c533f53feb9758cc8d5c9189163a0d90149f57c08dd945b763c0920aa361f2bbc
-DIST hypothesis-3.6.0.tar.gz 73586 BLAKE2B b0ec133e8c71f752114211061155c15a7d536e771ba85eab6489440b2063d3083018bf8502d9e9dbc73105ee5f03060e3189e64574a3dfa052b091040e7e7915 SHA512 cb885628e5c38ab9312cfb177ebc3c014617d21031737f5fba343ba485c1b8ff82b1302e7bc1d3e79192bfd8324fd0501498c968f3ac8343829f8965f6354389
 DIST hypothesis-python-3.59.1.tar.gz 500529 BLAKE2B 5c171045e363f2337d7ca30797b9fc7f96430c805dd4b3ec78fe927247d2c2ba4a216789a82f1e956b89d66c5ecdb2050a5f93467f2d557a05d1d48507fc06db SHA512 c3aad4cc54152963806e09af5f351e60e30cd64ad48ba3d922451b10dbb1747ea3e5d432ebc611dcb0646687d7e8755051b967304e74798d091be0b2901c832f
 DIST hypothesis-python-3.74.3.tar.gz 552616 BLAKE2B e19a0991e7ae2fa6208c81d336cc66e3392bb78663f567fe28b570a1463a5359ccf713776f1f9cbd19a27a53b9a71a5be6eedfa05599fa12c047c373aa339592 SHA512 f4927d6e908a9222fa06f82ad6e4cf90c62a0a3d0c7632c17ee57a3705239901fcb5dbbcfca402c153bf2bea9dde0e51c852d2024ed5a236888327963fe13a3e
-DIST hypothesis-python-3.83.1.tar.gz 564466 BLAKE2B 7b4c00a46b5a547bfc98711b795525c09d91ed41ac2c1dcf9c3c571e32819c77c6f6a4311ff32020a6d8e837dfcd03f7e2d842613148201d476615831483a737 SHA512 d828dbfe8637b6388b8c77af08970c2b45cd8f6960f26b1c54f3fbeba012e225d116802cae70ee28321de9d961397e60a5ff8cbefc02d085b6f6978f6bddf56e
-DIST hypothesis-python-3.85.1.tar.gz 568995 BLAKE2B 65297e73ec833beee05f7ad4f137cdbfe1b28cc478df31fedf8fc2c5183e70c10d5254fdba906842551fcfb7280ac59b3a7dc5cf752700c770c90d158cb81324 SHA512 cf6951d8cb70539b57147f422e43296518edf416200eec220f0c3f258ee6215f858e496f66b340ea68d1754cd936fc26a4ce4d1ee7a38cf338398d316c06cc24
 DIST hypothesis-python-4.15.0.tar.gz 1175925 BLAKE2B f3e3888b3f4e542d567bdaad2582eb23bd8ab2e218f1bde82ba1639123f32e8c147313c22b15781d8986574813b5f6eb7c23ce28367e86bb304d33a23f179fa0 SHA512 7d9788b351196fc20e66e210b7d60b4ddb1507b85cf5a29de228600e07f676ccd1352f5d2ab0820b3c8c1a1e8ff145225f00a25aec5f325cc7405ffd0dfcd9f7
+DIST hypothesis-python-4.44.2.tar.gz 3240386 BLAKE2B 3fe3295ba1f7401e1fb74af894d91eda525f8ef51eb893f1f8e5224cead8572f3c06f6a4bb345c123e56ed06d0676c85dc4477a80e54480baa6bd9f5f2bc069e SHA512 bebc5da337fa74a75d08cb57531c2f6b8ba1ab16d1a3d9be8348cd56ada1ab25a34e3b812a4aa71bf172bc97ebc8df0accdad37466f9162c3f8f2a8edbea9da9
 EBUILD hypothesis-3.59.1.ebuild 1145 BLAKE2B f42287ae99cacb4ef4b117a48587b18965b6d84bd2c15901897876e1cf8db6755d0c032863d7aae0e8d56a5e8205bd941dde5e4058bd543bbeb6efce7e64c3bd SHA512 08331c50fc7e3169b94cb3ed32c95dba578915bb293afba510207a03733c2170a69f6d61b900d6a85d9b88a1a5566896bba4ed3950139d341cdd746e6fa503f4
-EBUILD hypothesis-3.6.0-r1.ebuild 906 BLAKE2B 7e2716fef80debfdb2526a31eb2f8be695cc8cb125acf71b180d53599d05a87c5f0fe69aa53fb1736ee40596da43508bb89c379e8f3dd21fe465b0d4518359ee SHA512 5ba0b7a52ad54fcacbcbea6497389e870da0c830f7b3cedcc9c5ae02ea5bc315abd5018c6c35c39b8b8ebc6baaab8afa9826ac693d0319f77116d832350db8a4
-EBUILD hypothesis-3.74.3.ebuild 1572 BLAKE2B 79ea26bf971fcca8188ca0912d6f22edca0e24bad1d8a278a97542d6daf4ae273075c5953f5202a841da59432063e4946e6842646e06b9acb404e9c993bbd12a SHA512 7461b3a2f39f9417a1dfda7218f90d9b7363f4709c0b7661a3e7007efe9b230512c633fc490af8fea0042cc4f1adf58eba7784dfda7f0ac0785d59dfa98e2c55
-EBUILD hypothesis-3.83.1.ebuild 1461 BLAKE2B 8b98c817616fe3cc7c656451b2b3bf22547c9e902bf95c4b3cd418b2fe365a7050f4108eaa99a9f6aaf0500806f2b6d0fcfef08ce5c62c73e97d8549adfa02b0 SHA512 65a77901d31bd4146607bf8d7437280504467e0651839fcacddecc83c3b55517579ec2681e4de380becc1001fd9142e7f8df0f039efd9b86f99de7e11ba7204f
-EBUILD hypothesis-3.85.1.ebuild 1461 BLAKE2B 8b98c817616fe3cc7c656451b2b3bf22547c9e902bf95c4b3cd418b2fe365a7050f4108eaa99a9f6aaf0500806f2b6d0fcfef08ce5c62c73e97d8549adfa02b0 SHA512 65a77901d31bd4146607bf8d7437280504467e0651839fcacddecc83c3b55517579ec2681e4de380becc1001fd9142e7f8df0f039efd9b86f99de7e11ba7204f
-EBUILD hypothesis-4.15.0.ebuild 1465 BLAKE2B a613af93928ed213fbe4367793fd8f8ebb19d7040f5f4ed5df72ed83176dc8224e1637f8f4d0f0442ba81b2cd5212376ca0ce59a1ce02431a32ce116a2cbeafb SHA512 5d4c23e5b09e3ecf80a16021a5574073b25e0c220c1564ad867f61c287bf6ebf910e7f3a123da1a4a257dfea8a7d6580ee044da77846a49c1e6fcca67ac092fa
+EBUILD hypothesis-3.74.3.ebuild 1599 BLAKE2B 595579389557f85fa0902229be998b9ca0a366b54b33ad6162d120552eafa3420eb614fb73d232bf9c56d26b0f6eb91043ceb4a636da600e8903dc4539011604 SHA512 7b39b0dcbe2e3a263fddf52641b5e9e497830170d4f6e0f190fb8c1e895127dea2a1aa022b05606e89f5b07289dd981dd82c5b6b8ca912296530c83d67bf264f
+EBUILD hypothesis-4.15.0.ebuild 1492 BLAKE2B 9c1a5420d3eac3ac755f2de90af30afc5a121f19482d32cfae903606a36693985b2528e7ef75cc69cf3b50f37579dbc91b01bc2e4be79418281348f6ca91fff0 SHA512 9d5d3c7e99f76b9da9d75d7773b33593d20bd00be7b08d5994fda5eff300c9b9e3ddb41d9234fc0fde06fb03e63cf95545b92733742a75a7833c101ba623da91
+EBUILD hypothesis-4.44.2.ebuild 1698 BLAKE2B a8371d3017c0f419e1481ee3a4ab8389cece64bcb93151b986303426e9976d6a684ba32d27f64fcf3a3e5953a85edbee1ca7df1e227daf24c4d700064e70e989 SHA512 413f1ef75237aa1581e433aea1adb38a9de65a1922b88b77ec634cf312924452b50998e3fc31c124e1ac1ce9dc98581edf75b4458a98b1999b89e4df0f01d4a2
 MISC metadata.xml 379 BLAKE2B 3623a13a813bf71f9474fa018b2f83392ec168193b9853cabcf112267d38e7278e97a415bb8b7e52f9ebb28864b8709a64996dcb0d97e1f03b3ecb31a944d74d SHA512 40bb5c1916d9027ff81cd32073de34753a30d8430f36d0fd16667a111af8fd222379dcd817edd723d362f5ff5578ad7b212f98388c00de6dff1a64bd2c3978b0
diff --git a/dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild b/dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild
deleted file mode 100644
index bb6f1bc67345..000000000000
--- a/dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/DRMacIver/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE=""
-
-RDEPEND="$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*')"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-3.74.3.ebuild b/dev-python/hypothesis/hypothesis-3.74.3.ebuild
index 46b85f42c786..26a6aa58bddf 100644
--- a/dev-python/hypothesis/hypothesis-3.74.3.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.74.3.ebuild
@@ -16,6 +16,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	>=dev-python/attrs-16.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/hypothesis-3.85.1.ebuild b/dev-python/hypothesis/hypothesis-3.85.1.ebuild
deleted file mode 100644
index cd2a062ba950..000000000000
--- a/dev-python/hypothesis/hypothesis-3.85.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/attrs-16.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)
-"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-python_test() {
-	pytest tests/cover/test_testdecorators.py || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-4.15.0.ebuild b/dev-python/hypothesis/hypothesis-4.15.0.ebuild
index fea3d05494ba..3b10a7ba271c 100644
--- a/dev-python/hypothesis/hypothesis-4.15.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-4.15.0.ebuild
@@ -16,6 +16,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	>=dev-python/attrs-16.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/hypothesis-3.83.1.ebuild b/dev-python/hypothesis/hypothesis-4.44.2.ebuild
index cd2a062ba950..f4686aaabd7a 100644
--- a/dev-python/hypothesis/hypothesis-3.83.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-4.44.2.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,8} pypy{,3} )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1 eutils
@@ -16,26 +16,35 @@ LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
-CDEPEND="
-	>=dev-python/attrs-16.0.0[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)
 "
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
+		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.3[${PYTHON_USEDEP}]
 	)
 "
 
 S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
+src_prepare() {
+	# avoid pytest-xdist dep for one test
+	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
+		tests/pytest/test_statistics.py || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
-	pytest tests/cover/test_testdecorators.py || die "Tests fail with ${EPYTHON}"
+	local pyver=$(python_is_python3 && echo 3 || echo 2)
+	pytest -vv tests/cover tests/pytest tests/py${pyver} ||
+		die "Tests fail with ${EPYTHON}"
 }
 
 pkg_postinst() {
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index bcafa609018e..ce57f030420b 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -5,5 +5,5 @@ DIST idna-2.8.tar.gz 174481 BLAKE2B 68e5dddaae30097522e4e661438d7f89a391c5a0e2f7
 EBUILD idna-2.5.ebuild 598 BLAKE2B 8c0e326ebdf4a8150713aa03bdcb1b8a9df2a72b240107cfe7d34ba40ea0525b08b87aa21a6355117987d9db1c1ce91b2632579b4d5148ce76828d11b5e8b2f9 SHA512 0e754c62ba11d5f21fd61d1d0866b5e41c1187bd12098beeb46a214e43aebb3fdcb2c4039786df12f72b910493f6dfeb7f6d5f6385a46208022958ad76e7fc43
 EBUILD idna-2.6.ebuild 651 BLAKE2B 4477503c9d418d93a2c34d9c9aafa7b0ed5dabf697ce3143c8eee4dea2a93b6a9e1a8eea9198928d9a75f71d5199712ec3327ab981a557e53a70dcb45b13b212 SHA512 cf8e431cd774d3dbd90a3b5a0282c48018d8f5fbae67fdf908d608c43095b6dc41cbc132ab88982cc0eb05c8aceeaf193bf0e27c2914909d0cbec9e39b600f70
 EBUILD idna-2.7.ebuild 709 BLAKE2B b9266405a6177adbf45c322f54825dc750d7f0e5ec665b1c63340e0c3a5eb3594957aaba076053f3053a696ea767910fa3c49b1a2559981b34576572e3891581 SHA512 fde116ecdb1669efbb6ae55c9cbb5aa84970b48bac88efaaa514eb8f6bfe9850fce36180f3cc3449be9e8e825bd949227857902e1c7dfa960632a7460eabe80a
-EBUILD idna-2.8.ebuild 709 BLAKE2B b9266405a6177adbf45c322f54825dc750d7f0e5ec665b1c63340e0c3a5eb3594957aaba076053f3053a696ea767910fa3c49b1a2559981b34576572e3891581 SHA512 fde116ecdb1669efbb6ae55c9cbb5aa84970b48bac88efaaa514eb8f6bfe9850fce36180f3cc3449be9e8e825bd949227857902e1c7dfa960632a7460eabe80a
+EBUILD idna-2.8.ebuild 711 BLAKE2B 5eeda10984cd49d4aafc459114f2e2927a0e65d8fe7fc593a1a87d94359a3e4c9ba044e2baf4054303da8d6748cdd7d5e68657ac44f289c9ce5020b90aa312cd SHA512 60b1ff01a229dd449b67f5ea21408b69d749f1256d4c3bd6820c5684863de634f8fbe7aaff421c5433eb052875f58489206b300329b075b3678f934b214e0818
 MISC metadata.xml 367 BLAKE2B 363038f61cdb96780faecfb8c92d97d0cea8146d37374a731daa9618150b3f41c0bad724619d7bb353141834df9fcb88f075ece91a742ccca2da1621e5b8e2fc SHA512 50f13044fec18651463e6199826a39c7f28c783e7da389017e2dc2fd6f17b6c93e4e437a1019e0e31605a06a428c31a2fbc12744daa957cefbba2d76b511331e
diff --git a/dev-python/idna/idna-2.8.ebuild b/dev-python/idna/idna-2.8.ebuild
index a5c492e68fea..15dd2b84b9af 100644
--- a/dev-python/idna/idna-2.8.ebuild
+++ b/dev-python/idna/idna-2.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/iso8601/Manifest b/dev-python/iso8601/Manifest
index 4edd06a7d2ab..5853eae5c12d 100644
--- a/dev-python/iso8601/Manifest
+++ b/dev-python/iso8601/Manifest
@@ -1,7 +1,7 @@
 DIST iso8601-0.1.10.tar.gz 8405 BLAKE2B e9831b9a4cd8a6fd8bb1717c182f46250017a84efc3000484a395ea2b9353a279d0087b7ad8b5ae5153b767a69992650d62efd25c71a0967c217e09cc6cdfa77 SHA512 5a3635b3daf6c5ccfd0dfdf47bcd60a0841c06137b3ee334ec024909fa24c8fe4a1da1fa253e0a5dfaca173d4b10dfd994b83a031b2a0385406ca92987098168
 DIST iso8601-0.1.11.tar.gz 8725 BLAKE2B 7eed190b8876ae86f8b551676ce69e8bd3a09156ac44567bbbf48d77229f9b52f9fec62ca3c1fa620bea8c7afe2b62d2d6c5ac22a3e5d88adc6bdcf2b6bf0b89 SHA512 19f5443aae4e3f93b0521a7215318c2833bcca5740ea05f9a6d5771bff2aaeb5626ba26e5ba64efae135bf9420a1810854969dad845aaf67089d5e6898a254a0
 DIST iso8601-0.1.12.tar.gz 8868 BLAKE2B 5463af17cfaf2c1f256790ec11dc50f808857abdf0a341f2c88033e9e94f09069ed570223c3743007e0fff8fdd9a714bce0ef3e88a961c2bb131b79e88a1424f SHA512 d64f3a83fd3a678446e17fb35265c0487491a53a2ec306fe2332c59e9e471bfe8580b3280da7ae13664f07f7f29edb0347196351ab698849ccaefb52d6ce6613
-EBUILD iso8601-0.1.10.ebuild 740 BLAKE2B 9253f6056da82d48c94109467c303890cd4dbb1ce8a2f706720ca336d734e49b49e9eea522c49eccc3325b5bd14f0b61678f86103e2a669c5d3cc16974e65c0c SHA512 a483fd51fa0f7175253358f383d1c6f075f8897bcb1b19e017d4e2bce6fa8d86b85d515216f82fa07140481203a2274a9328e30729f2d4341408e0da2078f141
-EBUILD iso8601-0.1.11.ebuild 750 BLAKE2B 5f4a89e0aac870f936bb49d21ae01a7a145fe5e79a6a0b97cd27cd3f1667d700a2c2833204fd622a8f9c709a8c8e77372552ca94a26c0c41610afa7944f45a86 SHA512 82d6ea744b8cad58bf6c890810f661be3cd22899032f4f46e737d70a3e0c357117db6a5a94b95875f78f6ff1231acf96a3c9473639945a0cceeb7098f7bec60d
-EBUILD iso8601-0.1.12.ebuild 742 BLAKE2B 3895845a1d420746626bf620071214e64b8a3efd6fdc642b5e3b10b773e23ea23fa4436af4a32baeea95dde651f56920e3212b9f3b551c2bfdf849e90fc58f98 SHA512 129ec0e403bd8fca6bbb124f7dbcd95124162398f3f2cfb494edae34c44908ec21b2d237c23fe4f6b5e17e68ad90a6d8dcec60e3ac71d92226c37c8f3df1d146
+EBUILD iso8601-0.1.10.ebuild 767 BLAKE2B 6720c3fa4fd6e1f22d9cad9d281f3b3253c30d4fab6d35139dcabb2dde138e31d5b69179d1369efc4c675aa485fa28df7ee077d147aa7972c43591cd2717346f SHA512 279e2bc043658086dd8e4e1081e129f301d777390ee100ee3a2e260a78dd55674aaafe068fbb5a5bcd135d4235fcbe62283bdd210d94f5328261a93b60d9c50e
+EBUILD iso8601-0.1.11.ebuild 777 BLAKE2B bdad3c2b9b4868def6ff1802555305b910ba7f22d72860d0dda83e448b9636edfbf7bc24b3da8154065a55cc912d5ed8e4c14358fa11a9ebad1f81995ae7eaa0 SHA512 ef521d2fe4b57691b87722680176af92cf56491549413192abdc3113033f13f2ab6bc517b4835b859351c9d3d5a2c0fedf78961a16264d327dd94173b3431c62
+EBUILD iso8601-0.1.12.ebuild 614 BLAKE2B 4848eb6e58ea093a427078d083da3d71dc162bb26a0a553d40f9ca0c12e485c144f882b372cb50c321f8e4c5f002c897254b0cb3790ab57cbfdf9049a47272fe SHA512 f67d0e66c0c5f3abc7f61515943b4ee40e202669c8e9af782c142f37be3e8ca701f2a57ddfeb30092e6175efc8d573ad5839a688a7105646907f5e2cdc75671f
 MISC metadata.xml 334 BLAKE2B 5e73aa36a751a0547b8c8d39ef2a9cd3c9b4b5a41cda2e4ab47850fb4ef86fc4a9fa0f819329409b6fa34dcb031b38cf2532bdd33b59db85e61953e08b5f03de SHA512 70d83069bca1f66a6229800c51a0f8a5081a23072eb9d432e07c9945500899f769217ca989de90886896371d5f7d9a95cc976048035d1d6d615fe602ee471589
diff --git a/dev-python/iso8601/iso8601-0.1.10.ebuild b/dev-python/iso8601/iso8601-0.1.10.ebuild
index f5586bb4de32..b54a20197bcf 100644
--- a/dev-python/iso8601/iso8601-0.1.10.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.10.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )"
diff --git a/dev-python/iso8601/iso8601-0.1.11.ebuild b/dev-python/iso8601/iso8601-0.1.11.ebuild
index 125436e3d3aa..a69b72ef9608 100644
--- a/dev-python/iso8601/iso8601-0.1.11.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.11.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )"
diff --git a/dev-python/iso8601/iso8601-0.1.12.ebuild b/dev-python/iso8601/iso8601-0.1.12.ebuild
index 6020fca39c84..e54fa1b15919 100644
--- a/dev-python/iso8601/iso8601-0.1.12.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.12.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,11 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
-python_test() {
-	"${PYTHON}" -m pytest --verbose ${PN} || die "Tests fail with ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index d1bd4c76f259..b4817cd403e0 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,3 +1,6 @@
 DIST jinja-2.10.1.tar.gz 267828 BLAKE2B 0cd7e2880f1d41f3a6aafa0878343c2ff017099de6b2ad607baa3c9cba9d58c9241e1ba65cc23ea16244a1b3ea8720933f45f1061811e5f1abdcd881c4017bce SHA512 71c90be0b2aeefaa80279cba55f7827b5a42455f9dc55de9ca7e9e3e363678caa357426955267542f3c8a9b775e61aca55e439af192ed0a67f592be4ef91aff6
+DIST jinja-2.10.3.tar.gz 266316 BLAKE2B 0d8c10bb866eb887fd1c88ca5c5304f46d27930d8426587185ea72c0b79b512919bd5fa75987c26e433be049fd5764fb4ec08d42a4ec5ed00510fe8051e10f5e SHA512 566b781218b533c16b107b57e0252da5947fad262fd8d3fbb134b5916939c5e5d31c95e34bd6b14eec333d2ba3b4a6faa4168497a1ac774e7044f8220ac1b06e
 EBUILD jinja-2.10.1.ebuild 1622 BLAKE2B 7c00ca9bd1b7a9d711d34a0a2d6323fef753d9ccba27a1c998e89b5a99ee99c43c776b5a5601b52790eacb2065b1bd80220c3d9142221b00ebd4833e3dc4a01f SHA512 7cd433f46d8270e5736c980c53563f4322cd254d17537120e617bfe414c3419615e59dcac6728f764a528253c05b8af76fe97f7f3bc041bc0f73b532ed7cf836
+EBUILD jinja-2.10.3-r1.ebuild 2047 BLAKE2B a3c146537ceafbb3fcad1f7bc6ae6b8de380f6af3f0715e771eff65333344bb3ea0e6984327884a7ac5d2a3c291199a80b54b23f1f45d856c0f993df0fcf3c3a SHA512 aec0265eb6a97457d66859c2ea3fba523d818ad828da7146a9a4143faeca0e2f0777f5584cceb78e99d095edf5624423212d05e3971ceaa1c81f60f0003ee4a2
+EBUILD jinja-2.10.3.ebuild 1758 BLAKE2B 1e1ac9dcf56902b1c030961bde39d4219a71726274ee65555f8f338eadf20682042ee3195a729cb198d42a6911cba7ce10651b4d3fa551ff44860c2fd6c2d5d9 SHA512 f7f4a756472300c1bc8482fa190bbd3b2449bd429f327b54a187ec84a480c8d1f46154148a9b45f28964c29c5055a1584550e94df7cfd5ba3a3585322759b1ae
 MISC metadata.xml 374 BLAKE2B 7d6caffa81473cac206ff3ad29cc5be6ebc22d82bd3a7eb0befec7cd65a859aa9208851237c629d0c019307986eafda5a93d2977d62f847d68dfe5d415139daf SHA512 5c3b1f608d45786b27c3bf31f04816f6a85e2cfaa44eec5a9aa21029a2e8ab26264e87f9a6faa4c44a44d718aa8186110fb4d0878655dd76d880a7173b6e5d59
diff --git a/dev-python/jinja/jinja-2.10.3-r1.ebuild b/dev-python/jinja/jinja-2.10.3-r1.ebuild
new file mode 100644
index 000000000000..39131f10d5a9
--- /dev/null
+++ b/dev-python/jinja/jinja-2.10.3-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A full-featured template engine for Python"
+HOMEPAGE="http://jinja.pocoo.org/ https://pypi.org/project/Jinja2/"
+
+# pypi tarball is missing tests
+SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	!dev-python/jinja:compat"
+RDEPEND="${CDEPEND}
+	dev-python/markupsafe[${PYTHON_USEDEP}]"
+BDEPEND="${CDEPEND}
+	doc? (
+		dev-python/sphinx
+		dev-python/sphinx-issues
+		dev-python/pallets-sphinx-themes
+	)"
+
+distutils_enable_tests pytest
+
+# XXX: handle Babel better?
+
+wrap_opts() {
+	local mydistutilsargs=()
+
+	if [[ ${EPYTHON} == python* ]]; then
+		mydistutilargs+=( --with-debugsupport )
+	fi
+
+	"${@}"
+}
+
+src_prepare() {
+	# avoid unnecessary dep on extra sphinxcontrib modules
+	sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
+	printf "############################# SED ###############################\n"
+
+	distutils-r1_src_prepare
+}
+
+python_prepare() {
+	# async is not supported on python2
+	if ! python_is_python3; then
+		rm -f jinja2/async*.py || die "Failed to remove async from python2"
+	fi
+}
+
+python_compile() {
+	wrap_opts distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins ext/Vim/*
+}
+
+pkg_postinst() {
+	if ! has_version dev-python/Babel; then
+		elog "For i18n support, please emerge dev-python/Babel."
+	fi
+}
diff --git a/dev-python/jinja/jinja-2.10.3.ebuild b/dev-python/jinja/jinja-2.10.3.ebuild
new file mode 100644
index 000000000000..def83f0e623c
--- /dev/null
+++ b/dev-python/jinja/jinja-2.10.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A full-featured template engine for Python"
+HOMEPAGE="http://jinja.pocoo.org/ https://pypi.org/project/Jinja2/"
+
+# pypi tarball is missing tests
+SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	!dev-python/jinja:compat"
+RDEPEND="${CDEPEND}
+	dev-python/markupsafe[${PYTHON_USEDEP}]"
+BDEPEND="${CDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+# XXX: handle Babel better?
+
+wrap_opts() {
+	local mydistutilsargs=()
+
+	if [[ ${EPYTHON} == python* ]]; then
+		mydistutilargs+=( --with-debugsupport )
+	fi
+
+	"${@}"
+}
+
+python_prepare() {
+	# async is not supported on python2
+	if ! python_is_python3; then
+		rm -f jinja2/async*.py || die "Failed to remove async from python2"
+	fi
+}
+
+python_compile() {
+	wrap_opts distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins ext/Vim/*
+}
+
+pkg_postinst() {
+	if ! has_version dev-python/Babel; then
+		elog "For i18n support, please emerge dev-python/Babel."
+	fi
+}
diff --git a/dev-python/kconfiglib/Manifest b/dev-python/kconfiglib/Manifest
index f57046fc3b8a..633de1eba9cf 100644
--- a/dev-python/kconfiglib/Manifest
+++ b/dev-python/kconfiglib/Manifest
@@ -1,4 +1,6 @@
 AUX kconfiglib-12.12.1-setup.patch 463 BLAKE2B f2e781ea3f2e28b308424b1688b9ccb575450bede07c4f00fb24a8196c3f8c514e3d4af222d86203f369e5dd9f2b97f778cddac757d1591d1c4af34a59e7e631 SHA512 c3d0c56bf3a84af57f0ef0fbdd987b3cfa8acdf1828efbb4e66d928256d47a64ad116cd7d9c66d19b5a8b1dc167603e0f8db1aeec2ddbcc0cec98235771e50f1
 DIST kconfiglib-12.12.1.tar.gz 181307 BLAKE2B d256148bd6bf01f7951c78751604eae1be4c2fc156b815bdb570e6fcf185c2f5c97259f6ce0ed275104234ff7180afa2000a81feb281e745a8a0c4db162f57b9 SHA512 49e8746e6c83a93b7500130b21b864346ab8106c0c161de0ec62b3efff794080e734d34d88cd9c816c0d6514465729fbc3a4334fcc9c0a68f17c1688bb210325
+DIST kconfiglib-13.2.0.tar.gz 181115 BLAKE2B 81aeab65c4d7008dad33d508eb2be5ed53187943c1ec5112a87a47a5f9bb661c521b0d61a3da63da3233f168d62ab6bb5cdf6e3702e53f960159b7ca13c8a0cf SHA512 9d8c76014aa7faa93af216849859eca9bfdc0d4cd3e030e47b72acfdd4981ac1581747adf91bca58a4e8d86b151988309f36c3f94a1ebb216a1412fd004fafd2
 EBUILD kconfiglib-12.12.1.ebuild 1049 BLAKE2B 34797f558424ea5b8a91ded661b7f180042c78d65dbae66ed37686ca4438066b9e53ff2795af642d96ca1e819d41f10668e47ee7b08e7a657b1227829d87c452 SHA512 ec2a600938d4a8296952aba0d88dbc03ce499824db71ab775ed923b4aa62af04de7928ce8919f262924d3ed10189254a3f860c1e8635e38456f1e7a199d34243
+EBUILD kconfiglib-13.2.0.ebuild 1007 BLAKE2B 14612230b04104b61d32aeeb17ba3984ef043ec9fca26dc766eae9cc85ba6a078bb2e1ed687bdcd2650484c06a0a74b3b2b25211fedbf0d83ebea65ce68b3e06 SHA512 de14015813ef853ab1cdb9773dee243e2075945621e8948ddd63af87afe8663ba6f764b1a7f9fd8372442d49b44f7f8c28a69865ed62676b6d2b14655bc28902
 MISC metadata.xml 331 BLAKE2B cf19e7c3a4a2511e58382941904de06eb12e21c0a1f27c89fd3f61ff1e2f96d9e8509aba80f52080ce4a53da8f99e8a15685803b143fbc9071d33ae6e815a1e1 SHA512 453f9a6063705a3f9db24e5c0658e31c73d234dead14ccecd8d46fe56f26b16729f4f46c0ff7471689c60eef5d9c006b455a14f349f1249ae2e9f0b677ef80f8
diff --git a/dev-python/kconfiglib/kconfiglib-13.2.0.ebuild b/dev-python/kconfiglib/kconfiglib-13.2.0.ebuild
new file mode 100644
index 000000000000..e519c27c57a6
--- /dev/null
+++ b/dev-python/kconfiglib/kconfiglib-13.2.0.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,6,7}} pypy{,3} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="A flexible Python Kconfig implementation"
+HOMEPAGE="https://github.com/ulfalizer/Kconfiglib https://pypi.org/project/kconfiglib/"
+SRC_URI="https://github.com/ulfalizer/Kconfiglib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+# pypi tarballs don't include tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${BDEPEND}"
+
+S=${WORKDIR}/${P/k/K}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# hacks to run tests
+	mkdir Kconfiglib || die
+	ln -s ../tests Kconfiglib || die
+	# don't run kernel Kconfig compat tests
+	sed -i 's/run_compatibility_tests()$/#\0/' testsuite.py || die
+}
+
+python_test() {
+	"${PYTHON}" testsuite.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/markupsafe/Manifest b/dev-python/markupsafe/Manifest
index bd8d09e2042e..a900d8e8d4da 100644
--- a/dev-python/markupsafe/Manifest
+++ b/dev-python/markupsafe/Manifest
@@ -1,5 +1,7 @@
 DIST MarkupSafe-0.23.tar.gz 13416 BLAKE2B f8ce67bab421447b201592bafce6a7ce58a827199ae45c585489165641c82dd3684810381654d3ac1325adaef3499665461d814cabf795eed9ed1dbb04632a52 SHA512 4f1fd91ced5e7119584b56cf7b69cfe6fdd9613bd77412368a38e9ef5d1011ba5c76d1d3a0da3d60f9f474627e6c8c8b613a80a668b32d212f09072f8b1f5b28
 DIST MarkupSafe-1.0.tar.gz 14356 BLAKE2B d1ceeef939f4d4c31b871d8d1bbd78c72d72ff2e8c7109c9ab2b202e4b8272db25bc13210cfe2f442dbe2073963ec41f5924e4df9dc93a45ebe85fe9f0d9f12b SHA512 7437a02cb1b9c1d6d6c20b13d394f24a1cd1cb8c743f832d8b1cbb6ab8846f70f54d924dd693423b33c4d592e772983ae38fd4a35961e233457c48bd3584ecb8
+DIST MarkupSafe-1.1.1.tar.gz 19151 BLAKE2B 184ab0bc42f8d254ef4239f700f019c0a380bdf2117dfe1abe2eb4dfa0f037158d181a120d8654a6971e9c8badb078f997e3a8bf231898e0f4bb3e8496d9abd3 SHA512 f3014e6131a3ab866914c5635b5397ef71906bffb1b6f8c5f2ed2acf167429ff7914236d38943e872683a57a9be9669f4c5aace6274f3307ab21ef25373db0b6
 EBUILD markupsafe-0.23.ebuild 901 BLAKE2B dd936d1e006f04bcab3810ff6520e65a167e86cffa0ed4ce2f2699a4c111bc2412cb0b05fdce8963928fa4afe44466f6b67301641aed54f3953d0cf2b007e6d8 SHA512 1f3c3c51c12c63ac13250c90c0fa1dff36c234277af143427d6ddd98b381be3a4c07330d5fd54bccd19127e51eb94515e375eebac7bf74edcabd7bc1cc131eb6
 EBUILD markupsafe-1.0.ebuild 765 BLAKE2B 034eae4deb0fc69a88772c8425ed444b2b0684e6955daf547f659aff4d703b4f44d5a3d2c3555a47bcac99615f22824bd9793f919bcde6f1c408888d25cb1083 SHA512 451a9fc1551da4867d1f32b2099db24f55a5773e70a54fb68fd8bbfbfdfbc177cacb290bf9c691b0ac0fa6bb92c871581a20c45c084954d19b1c38ceb877e42d
+EBUILD markupsafe-1.1.1.ebuild 717 BLAKE2B 9ae94c2844665285bc02d5e287b0eb855c5b02cd185b085164425cfef15b9fcb090448f630c1f7b455106b72bd2fa29da81b9b6192ac52b19f620a9436596c2e SHA512 438260e8c6f9fcd19d563d3826b6ad0249fed83c34dfc7dec0420212ce7d0e6447cfc63a39c77d1b8721334cc57e2fec4fba54562620f4eaa2f33a7167ad7697
 MISC metadata.xml 313 BLAKE2B d83629ec355bdf3a33ec1987d8826509f6485ef34a873a6db1122c72beff76de648c5f80da70f2102e60532d852462e13826f714b6ae263d65d5c81bb9aa63e9 SHA512 91b859646ec529ca9b646ac0a6526554de887d6aca353069dd00a6b01dcd2b5765a7b1a1e02c8b52bd50ea67f1476cc2dce086651ee46f7c575c56d1ab7f4c8d
diff --git a/dev-python/markupsafe/markupsafe-1.1.1.ebuild b/dev-python/markupsafe/markupsafe-1.1.1.ebuild
new file mode 100644
index 000000000000..b38ac4d994ef
--- /dev/null
+++ b/dev-python/markupsafe/markupsafe-1.1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="MarkupSafe"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
+HOMEPAGE="https://pypi.org/project/MarkupSafe"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+distutils_enable_tests pytest
diff --git a/dev-python/mmtf-python/Manifest b/dev-python/mmtf-python/Manifest
index 1fb47fa0d9a1..c3bceb88ed13 100644
--- a/dev-python/mmtf-python/Manifest
+++ b/dev-python/mmtf-python/Manifest
@@ -1,3 +1,3 @@
 DIST mmtf-python-1.1.2.tar.gz 46309 BLAKE2B b21d53f7cfbdf6f6bd4f0f3ac31a846e83ce0ee98faf77fa8d06de7520c4aa64a259e8b43a744a440a6cf1a10ad461697334683364698a68222b690301bc5554 SHA512 92afcce48c2de186cbf9c2cb39c94c5df14ae0eb613862d41b674b7d2f338855ed81be23fb14d16d2dfc8d33415d3904537ef4a422e3a52b78d461b609e968ca
-EBUILD mmtf-python-1.1.2.ebuild 450 BLAKE2B f91c7f217d14ef1280c928e86a3295613bee88a79635d8f484b4dbe3a1f72d3408581b6c66117fe4d47bfa4935a8ce6759caeba892bb39a747fe28e3fd246ba8 SHA512 a2de588f92b73849eb74a9facf5f2a1009db66a9ea267888bfd802837d838db5378c75c6272f114c5662345424bd7994de57b8d0b4fd45393c111e85cdb9b869
+EBUILD mmtf-python-1.1.2-r1.ebuild 476 BLAKE2B 546f0bc1a60433852d63ff045fcebc7bd8cd93149070ad61acb9ad3b75d9fd0b566657d69a2c6bea9a93ee8cb1f6769ff205b7d3de7b3f088885d917d4a0eee1 SHA512 16a15b2adc7f52ddb0231d3d2999f3c5fdd4af8d78ad7e023036042affef222a330f257e4282a93ededaa68471e619a3d4a903b23bf4dd7566a568ce314e4da1
 MISC metadata.xml 430 BLAKE2B a69050101da1e1dccf6b335506250cfaac02f1b87c87946d72aa1c3649c2f5ca107c4772b9dc410088397be824c59b2c9e6e611ba548b7b007aa22e7d9a12a46 SHA512 1245d1c1479afc4dde1a787d65342997754715a530a81d73fac1512a5d20e54fb36c80c1be1fe017b1ff9c14ee786f3b0da6b1a7bf689619285c7a86d5d376b5
diff --git a/dev-python/mmtf-python/mmtf-python-1.1.2.ebuild b/dev-python/mmtf-python/mmtf-python-1.1.2-r1.ebuild
index 7394649afe48..189d6e2c00d9 100644
--- a/dev-python/mmtf-python/mmtf-python-1.1.2.ebuild
+++ b/dev-python/mmtf-python/mmtf-python-1.1.2-r1.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=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="The python implementation of the MMTF API, decoder and encoder"
@@ -15,5 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="
+BDEPEND="
 	dev-python/msgpack[${PYTHON_USEDEP}]"
+RDEPEND="
+	${BDEPEND}"
diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index e67557ee045f..fcf161e3425e 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -2,7 +2,9 @@ AUX mock-1.0.1-fix-python3.4.patch 895 BLAKE2B 0a767889c488559f5cdc8a472a3a58d65
 DIST mock-1.0.1.tar.gz 818644 BLAKE2B 7bfe02c413c2f98a2d98ca9cc40ca8831d65b3a5095d95625e0844e764c3510b771dc9e36086dd44f518659cdf7f1d105c02bdb51c5ffe00953c5eb3b0e05106 SHA512 4f6f4ebc34843e16b15d866e415ad9992e79bd266a63a22fee31b773ba77615e3406bc8890ceed92c0ee296380d68c46299c4c4448a3526f9cb96b258d32cf58
 DIST mock-1.3.0.tar.gz 70908 BLAKE2B 4df669c5d54fc835c70d6190362d4dea9cc0d2e7ca47f6ef5a394bc80cac10898b611146f28da93e84c4b26c23f25708be3c8fc6b61062dae099396e351861d8 SHA512 10cbb78b89f2e82abfcadc035a526182f83b59df4775cd85acfdbeb4505791c63b7a3761e6126a08d9aedbd07ead8632ac2a728dc07a362f4aaeea694bdecaf9
 DIST mock-2.0.0.tar.gz 73684 BLAKE2B 970bebe72b6969b58acdc2856b53054f992d01f9f3ca5f91b73073d0a1c9ec89a5c94fd66eab85b258f23f33326825ff6598bb2ba8e07eded1e6540a26ac5fa3 SHA512 a08007651b749d2843b94f5045d74c122958888290aea21930455538a854e6b04c07115e21d82edde996154bf597d7a8784a2f4213cbabc49a98dec22dd92238
-EBUILD mock-1.0.1-r2.ebuild 1095 BLAKE2B ab19c5c4ab4e5d66d966db8059dfd22c8f7b596e6899399833a22122ca5aa1e6496a4d925c0259a45edb36f28966795b6b00f7818bfc0ebba7ecf3a97ce12486 SHA512 313aa222f9d76b2916da9fb842959b7095f979ff2903734941b3fa6cfe304fee65e93bda500729edf708b09cbdb7414e7862d8d41d1b45ad157be9b9d70ef3e1
-EBUILD mock-1.3.0-r2.ebuild 1046 BLAKE2B 43550687982c524e5c08bf933e63209e8a10db517a1a4b2372dc2db022d2111ee8e8c7baa81228912a78507d97913f72af1c98c1e2ed9ef2c76f2982ddfed4f5 SHA512 386c4310beef129e0edbaccbab84e76ea1ef40469624c62b16a6c5fde6f28e1376a48ad77feb6bb8ff5b1777de8e9aa41ec41f22c1d8504d4036d0091f03b3cd
-EBUILD mock-2.0.0.ebuild 1054 BLAKE2B 799c012df3cc400541aac4182f56335ac0f4218f8bec47f96c96c77debcea2cd54779dfcf844fc181a45cd74ffb8b91e3084b6cadd45f5576df6d813a6660d8e SHA512 3b2119b5d61ba930a3f2f8b8a4fcf03757cdbdfaeb2bbb1bf7bf0f2074e7efd7f28953c75815e750e7875807828dc19e53512e309908c88766b7070034a5c034
+DIST mock-3.0.5.gh.tar.gz 67887 BLAKE2B b9c49b3627275889d73aff9ea9c7925093f9cafb304448b2f06eda2fff26152a031aafb4844537e4d58bc112709e59a44e08d32602776386a30d039743def29c SHA512 9ab4f0c794f5701ba1367d982cf79a5662d4233753d12ed9c88ae20282db1f44be73f84c4d9f6d03ff64926b8c1b6d0c9a79b2a4724a3eb36c247ffd4ab03e2d
+EBUILD mock-1.0.1-r2.ebuild 1122 BLAKE2B 4d00d5a77738a33e64cd7298efad068206f44141e7818f1197023da2a08a5549be2fc20c378aff5f3defea1ecd3f48e0e246bde71ddd5271b77a5f4a099b6a27 SHA512 9a849307f5990b5bb85fc7231cce8622bb17fa7a2de24b6f7e0a082c3a415891ffd3c80f034d795d3d346e6ced972e7ba230d61662b1697e32f1562441a8962a
+EBUILD mock-1.3.0-r2.ebuild 1073 BLAKE2B 1e0c6261ebc7b0bc7bc7392c68fbea6b1fdf10d4e58f591e3d35c3f2523ad6bdd0aefb98680bb1da8c70a318808eb557fc86f770218b7d622b493565d73496a0 SHA512 ddaf8c0b2fe99ed6fb2874a2fa212e1fe7df1bc92739aa7b8f134551ea9707e674afc8de16030c03d1c2e35e2f1fcf38c76187d66590ec1ee30baa5e845f0866
+EBUILD mock-2.0.0.ebuild 1081 BLAKE2B 0c43038172d0b22af9759a1abe473d94808ed47c2678304d93c02394cea4fb5992fab6e58a8cca4809277469d71596203d8dd77737056b2c821cfe455e4be5c1 SHA512 d270885452492921423d0f330cfa1a23bc3ba03e3639b29a438cda1f2b224a65dcf6bb1f9c5e2ab7b384d7d4f0452f78c0bef9dfe272ba0038de5a3fffa979d2
+EBUILD mock-3.0.5-r1.ebuild 1476 BLAKE2B 06d3c10e3a6b02675ae5c89e22c69d9f9edb4ebc0477f72dc1e4fc61e980340cc751ae97858a472f8a7982f88fe93a644dea2665b537828121c51cd76e05052e SHA512 55ffd98626870a2ad08b2b191f74a8cd2469fe8574936187073f03f108511ffd6ea316af5936860f7cf117600ea2fcf0fcb2a1c535cb05556cd11aedf865d575
 MISC metadata.xml 365 BLAKE2B 80ce989b7585192744838e804490286b598d6a4e082a2e88fce1efdc34c3ef3185478fa6ce3f08c81dd680c62b4de0c7eff3fe7c926d96479ab856aa46c69250 SHA512 89eda97d1f0ece91d573a9fc4fb5d357733b757b1214a56c7bb14a10f84e1c275d2cc49ed773597c4e320df03f751fb093fef7f3805deb450380df4dd83d875f
diff --git a/dev-python/mock/mock-1.0.1-r2.ebuild b/dev-python/mock/mock-1.0.1-r2.ebuild
index 31706242291f..bb4bab3138bd 100644
--- a/dev-python/mock/mock-1.0.1-r2.ebuild
+++ b/dev-python/mock/mock-1.0.1-r2.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 # dev-python/unittest2 is not required with Python >=3.2.
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/mock/mock-1.3.0-r2.ebuild b/dev-python/mock/mock-1.3.0-r2.ebuild
index 67c8c68ec048..ba7cdb49f668 100644
--- a/dev-python/mock/mock-1.3.0-r2.ebuild
+++ b/dev-python/mock/mock-1.3.0-r2.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/mock/mock-2.0.0.ebuild b/dev-python/mock/mock-2.0.0.ebuild
index 4fa375fb9ee8..5981e50dd65d 100644
--- a/dev-python/mock/mock-2.0.0.ebuild
+++ b/dev-python/mock/mock-2.0.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/mock/mock-3.0.5-r1.ebuild b/dev-python/mock/mock-3.0.5-r1.ebuild
new file mode 100644
index 000000000000..3482aae0719a
--- /dev/null
+++ b/dev-python/mock/mock-3.0.5-r1.ebuild
@@ -0,0 +1,48 @@
+# 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,8} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Rolling backport of unittest.mock for all Pythons"
+HOMEPAGE="https://github.com/testing-cabal/mock"
+SRC_URI="https://github.com/testing-cabal/mock/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	>=virtual/python-funcsigs-1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]"
+
+python_test() {
+	# Upstream supports running tests only in their dream pristine
+	# environment.  pytest doesn't work at all if mock is already
+	# installed.  We can use plain unittest but we have to reinvent
+	# test filtering.
+	cp -r mock/tests "${BUILD_DIR}"/lib/mock/ || die
+	cd "${BUILD_DIR}"/lib || die
+	if ! python_is_python3; then
+		rm mock/tests/*py3* || die
+	fi
+
+	# https://github.com/testing-cabal/mock/commit/d6b42149bb87cf38729eef8a100c473f602ef7fa
+	if [[ ${EPYTHON} == pypy* ]]; then
+		sed -i -e 's:def test_copy:def _test_copy:' \
+			mock/tests/testmock.py || die
+	fi
+
+	"${EPYTHON}" -m unittest discover -v || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGELOG.rst README.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 182a4a5d5fdb..49a07ec4aa9d 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,9 +1,7 @@
 DIST more-itertools-4.2.0.tar.gz 56871 BLAKE2B 48cdba3eebea94483c5cfd9530d4bd2cacd02e893b87482a01ff1fdf10336f3c2a40d32fbb935d38320c9c47a1fd1942a48ea12ff07ae56793ecc5870fef2452 SHA512 7e205a575fb1d17ed3be9225c5c60139db41cc4b866f6d6732c955536b1d606bb7ccd92ad77e41159965abbddec3a85761d3649c28f06d52afa8476160d70e77
 DIST more-itertools-5.0.0.tar.gz 67359 BLAKE2B a2448b218eea4442cc4739a4df414ba69e0530cd6206a13c5c017a13daa297d00c08a94cec8aec0639d8b03663f4b698702f5e700ae118ae9fb5854a6d105b36 SHA512 f72c8d6c75799c39708443ba75862801ddd3fc0382c9eee7ed24ecf04cbc7d9ff6a8e35b6fff1eaccf45ddd470c2cc8959532eca32c2ff50b0a12588727c68b4
-DIST more-itertools-6.0.0.tar.gz 68178 BLAKE2B 64a389cfd3449c4711228fcd3092f6d7f62968aeaf0574fcce4bc3223da8b7633d0cbdd727cf4d56f536aa925dbcf78b6b8c3a2a3ba3ef8a0b677811367d087a SHA512 68ac1829a1a27d3f1de1f95c33a9c3f236fe80f597b9183707de0d9cd193ca5a662080e64c54c376ae59fd0a3a224ac62a9d39be4d0ba425103c4fd6e93e61ac
 DIST more-itertools-7.0.0.tar.gz 70103 BLAKE2B fa7556019ad4c2e8905698c1295840176b763bf1b7356679eb3988112b962adfbdefa82e7ca7419d350b40186a3ec5015314cdd7229dee867bd03fba716165f5 SHA512 730add0e26d62abd2d5e49cb662d58db244a241e272e16d05c25c7bf2ebe8a2e28b2b2b5038082d5773358b50e05d5f9a93f88957dc1b13daf30686047f41bc5
-EBUILD more-itertools-4.2.0-r1.ebuild 1045 BLAKE2B 6abaf4600ffb759a084538dfc43b277267928720e1d1aea16e75e7cf5eb2afa470807c7e109c99b2ede4469dd4203f495319d446d068b0d7318dc59618c5b392 SHA512 d5c490f62081e5cf967cb666a8897adf812ba817927b450d74be56bec78e67499b3d1f8e0186eb316e69d984d8745cdbce910f4c5622b818b7c25d069f0fe67a
-EBUILD more-itertools-5.0.0.ebuild 984 BLAKE2B b94d6a7bd24fe0660b2301314b3f155c1b742df634c0e2ee01bc22e05ddf899889dcbd9b1934fcd474ced3e8172c73f368960956f902e6150f397673094580cf SHA512 0997f4a873e4bd484c7b05da84716803e6cb2534fac151215515b94b23d2fd66d1e12a329363ad4a7752fb183c3edc7740ad49bac7ddce1c951a8f7e12a94af9
-EBUILD more-itertools-6.0.0.ebuild 915 BLAKE2B 26e532b178e8ac960884ad953bc2356bd835628992a34d128cfadcaf9f991bdf219009adb96ab42245e754eed148937d247f3becb85dcbc1df5e10f6885bd6e9 SHA512 44653d035325810a5c17396068574dfba0c5085946bd2cc5d8ff1dc71143391ba131d0115d424061dd62aa322796b3afe577ebe95487fc1ff83f6d44cb6a5d26
-EBUILD more-itertools-7.0.0.ebuild 915 BLAKE2B 26e532b178e8ac960884ad953bc2356bd835628992a34d128cfadcaf9f991bdf219009adb96ab42245e754eed148937d247f3becb85dcbc1df5e10f6885bd6e9 SHA512 44653d035325810a5c17396068574dfba0c5085946bd2cc5d8ff1dc71143391ba131d0115d424061dd62aa322796b3afe577ebe95487fc1ff83f6d44cb6a5d26
+EBUILD more-itertools-4.2.0-r1.ebuild 1072 BLAKE2B a5218e0093e93931a31b21416ebff2d10ddb6498cb39d7d041e72ebeeff446b70e584fd562b97678884c8735b0dea70e3f093e1f1b40931b070c74bad0abe22b SHA512 86996a57bc65c9c8c938530bbe9ccd926093ac5988b9331bf08732e06c30e9194196a456f91feca343ea2f4a33abfb76599473f66818c26db739d09b7da13114
+EBUILD more-itertools-5.0.0.ebuild 1094 BLAKE2B 40f52ac476fd15f06b6df34e16dd08f4ec667182acc78babd7d40dff918cbc6952a7d627e9e3f0ad4c34bcda43105d2a14d7e2e2cbda5a3dca0e160e29e9d8ce SHA512 976f9dc5520f0bf6513737a703e71f5260302833aa56f2c71094346865a13c684ec9f61ed8d55233fe523a786c9c1deaebc20b51960d7f65a69c81c6f4c2668c
+EBUILD more-itertools-7.0.0.ebuild 1041 BLAKE2B 2eb5291388215237c3117ff75377b423ad70e844908ba1d63431ed0646874f5832ffb4869c412d6443248891135ac1f4505ca59652d5114a12deb6e29be18fda SHA512 282e89926d611dbe341a4a40c91287b2e011b4553c3e86a08bdddeb9942a1b40674e6b370c2fa27334a1830a53748f5ac6972bd54c9be6125ac177045547b59d
 MISC metadata.xml 451 BLAKE2B 22dc3c0fcc0e1061f4060b8456e7f8686f40d100af79b6bef394eb1e9111aaa9b7b5762c94bb3b27464739328388dd56f02cb9813860acf23067148f03ef2f66 SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf
diff --git a/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild b/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
index f2c65585ae0f..646a8e254bba 100644
--- a/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
+++ b/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
 DEPEND="
diff --git a/dev-python/more-itertools/more-itertools-5.0.0.ebuild b/dev-python/more-itertools/more-itertools-5.0.0.ebuild
index 39d4fe240498..09e0597e6387 100644
--- a/dev-python/more-itertools/more-itertools-5.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-5.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
 
 inherit distutils-r1
 
@@ -14,25 +14,30 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
+IUSE="doc"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
-DEPEND="
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		$(python_gen_any_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		')
 	)
-	test? (	${RDEPEND} )
 "
 
+distutils_enable_tests unittest
+
+python_check_deps() {
+	use doc || return 0
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
+}
+
 python_compile_all() {
 	if use doc; then
 		sphinx-build docs docs/_build/html || die
 		HTML_DOCS=( docs/_build/html/. )
 	fi
 }
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/more-itertools/more-itertools-6.0.0.ebuild b/dev-python/more-itertools/more-itertools-6.0.0.ebuild
deleted file mode 100644
index 9671e3461b2e..000000000000
--- a/dev-python/more-itertools/more-itertools-6.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.org/project/more-itertools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/more-itertools/more-itertools-7.0.0.ebuild b/dev-python/more-itertools/more-itertools-7.0.0.ebuild
index 9671e3461b2e..dee2705781ee 100644
--- a/dev-python/more-itertools/more-itertools-7.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-7.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python3_{5,6,7,8} pypy{,3} )
 
 inherit distutils-r1
 
@@ -16,22 +16,27 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
-RDEPEND=""
-DEPEND="
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		$(python_gen_any_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		')
 	)
 "
 
+distutils_enable_tests unittest
+
+python_check_deps() {
+	use doc || return 0
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
+}
+
 python_compile_all() {
 	if use doc; then
 		sphinx-build docs docs/_build/html || die
 		HTML_DOCS=( docs/_build/html/. )
 	fi
 }
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index 28810d0c4c4c..4727b690c17e 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -4,5 +4,5 @@ DIST mysqlclient-1.4.5.tar.gz 86278 BLAKE2B 5ad1c6662c699dfa35e47734e211aa67bca2
 EBUILD mysqlclient-1.3.14-r1.ebuild 846 BLAKE2B 3f8d0d6144cc07229f5f958ee4d0202dc2a94854c8dac3b4aac87c7827ab971c953692b12150299a5bdab63f147b7ff2a1b96b8e9430ffbdde5111c521d31e69 SHA512 fea2c38e6a0de96b7d155c857172990412ebaae131315e5d4bf1b08df80f640d427f1c5cf68f57963c4b2455357be4e55a312a2d7a2099623a604060724d4c39
 EBUILD mysqlclient-1.3.14.ebuild 830 BLAKE2B 4709fe700a0acc12b2766d173d8b18250bb1df1f6a4a9d23ad3fdddb85f9de4cd8f220b31f5b97a12a94d0124f792cc4cbf62033b738ae6b08883ece0ae7c8a5 SHA512 67b9953057b054cadf0e9085e60714a732e1ba7a2397be684a6ec7c29f704bfdaac8d5c2bdd0a1728dd04e3e990ab2af3a63ffc517a96c120272fb6f38c65064
 EBUILD mysqlclient-1.4.2-r2.ebuild 892 BLAKE2B 0e2e8eff2cefe75275d16d2931417bc57e5b3f75c72122a2c37237f11d2de418abeb301114eb035db5f4bd7719bbc6eaeb15417dc9f71c56926211261043e558 SHA512 3a67aef4af0646787caf5c1133aab4e06453c47b581f3eb8b74bf49f3c9ce15150fa2e4122a248ca4e34f5bb865a266a034a90820d00c6bed93bd5c4947c7486
-EBUILD mysqlclient-1.4.5.ebuild 862 BLAKE2B 47a80cb3830703d4f5f1498df921420e7f52e5b6103a85670eed17e93052aa61e18f3868f14315e8374b30b88836fbb9f3185a8b1bfe1eefe9ccc9c3d7fbfdd3 SHA512 94944e1615e711cdedb7bceb9997d6f4cf0b35c1d481e1fdb466ba79114eb70f6514643dede1bad3ce00a631302b37b95ed6d02fc73a2497c06d4b7d932c612f
+EBUILD mysqlclient-1.4.5.ebuild 868 BLAKE2B c50f8b8af4af8ecbf5f71f5412d87cc6f1b4ede2f12c7eb7f27f71e1f224ea473b4b3be83050adbf7ed27203ff430979dbe0bdaaa408de94a013afc5b3f39929 SHA512 7db32c1da5801dbf2165bfd0ae893dc7c9d0713db93ce75376112ddd3cbde91ae1c31d22acf118af2bcf6375d9a2f5b6520a0665d96f57ef1449b71fdd6482a9
 MISC metadata.xml 513 BLAKE2B a65aef9c59557dd33af579ee376553bd46fbd53158d0a02585b2403d6ee45acb281599ec593d5d75d69cc8bafd509a0851ab25764b5a79f3501a7cdad91faa40 SHA512 4a2756c3bde70c4fc73ba347e9648b356983662146cce5c1161f5d0c8333f795bc27d0aebe6019dcfe6402a51611dddfd87609c329a3c2fa6aa20808cee46b38
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.5.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.5.ebuild
index aea2ab9f288f..9e86450ea650 100644
--- a/dev-python/mysqlclient/mysqlclient-1.4.5.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.4.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${PF}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/namespace-zope/Manifest b/dev-python/namespace-zope/Manifest
index 0c5c90f8936d..8d21b7aa9748 100644
--- a/dev-python/namespace-zope/Manifest
+++ b/dev-python/namespace-zope/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-zope-1.ebuild 906 BLAKE2B 50a78099ee1f9ffa450e3e97095f2daf276255148dc0b6132bcbd0dc3f68ea088d4e3d7e33ab3cfd0cecf474d81f1d724dce0f60726606c7a617825e38bea971 SHA512 a046ac732bcc271f24b99053dc4ad18d5ca28d300bd7832f6aef3b3daf18f6d5e315cab8e15add9bcda85d36298586cd2b51a50f5c5915f04c4b8c6ddb82e101
+EBUILD namespace-zope-1.ebuild 908 BLAKE2B ae42255580faf2531137f0b1fc571b4d416f978cb7b8377d330dc73e9e83d29ebeeac808b690476d1b66c905fc5e0bc301baffb43f1c4a10400d7bdc8a99cfff SHA512 5a4bf2e0cb3f92076350ac788cc279bfbffd5963df75849031229c75f741411e7d224bc44c10a1c480153d435a334a80088440d5146fe41328e89beace262590
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-zope/namespace-zope-1.ebuild b/dev-python/namespace-zope/namespace-zope-1.ebuild
index 3ba7ce60278e..f4e609ebbe4a 100644
--- a/dev-python/namespace-zope/namespace-zope-1.ebuild
+++ b/dev-python/namespace-zope/namespace-zope-1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for zope"
diff --git a/dev-python/netcdf4-python/Manifest b/dev-python/netcdf4-python/Manifest
index 959059cdf8fc..b09ab18addb9 100644
--- a/dev-python/netcdf4-python/Manifest
+++ b/dev-python/netcdf4-python/Manifest
@@ -1,3 +1,3 @@
 DIST netCDF4-1.2.2.tar.gz 679107 BLAKE2B c15ed9332bd8e4bb18c312cd4418add169716ef29b6f5c4b935c880259a6a16c8388ed7c790919bfbbee631e9e96ce4b9a9afaeabb305e4dd32028353e62207d SHA512 e09465d125077e71b8aad4332be844099c7fa29d0ea8f1dd0887f7a5e849ab778361026323466b1d4897bc3d8f8be1818cfa5f426773c765ee9c5f3728ff3da3
-EBUILD netcdf4-python-1.2.2.ebuild 657 BLAKE2B 099c022d6d576d8bdf2029bc84541d44c53c0b18ae2fa6278bb41a0c9e86c5e5d9ee2c1a096185dec06d7ea043c9c38d70a1028ceea04887b6a8948784599bc9 SHA512 975b62d50907b22ae0c7f0f4406db65494c951a13b99d9d418142d101527c1a4933a93a338229a637d74a54af8c6f2544c615879ac978598519b3a4cb771ab0c
+EBUILD netcdf4-python-1.2.2-r1.ebuild 688 BLAKE2B defdc124152c143b79bd431d1d6a5beff5b6ff57c549e638d4d0d541cf8b31c46094fab3cc82f428c6e099fc63869bc56d379bd2162e3448b50d60ae4c2984b6 SHA512 35dfec10a118cec5957d3fef5564fe15c723128b815d4c5b3e89cbee3a8245159c545535e90c4b32f888e4d0b12463b75c2d1e1d0af0749712d6f3631400543a
 MISC metadata.xml 702 BLAKE2B a7c9b2dd81a36206430022513af169fc3819eab8923bb9fe50d94fa165ad6605bd4bbabe700e1c11612d522ad39d02bee56db03b31888969e4f871606ecb5018 SHA512 ecb1a82976d540d6a8472901456bcc634077214703ca30e52cd9cf6fe47d7ac69abbf754dcaef977ece693e5c7d8f97dd250bbe1e1dccc4c03964eba576e29d5
diff --git a/dev-python/netcdf4-python/netcdf4-python-1.2.2.ebuild b/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild
index 402a7bc65f0e..4494e2f43bc5 100644
--- a/dev-python/netcdf4-python/netcdf4-python-1.2.2.ebuild
+++ b/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.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=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
@@ -23,7 +23,9 @@ RDEPEND="
 	dev-python/numpy
 	sci-libs/hdf5
 	sci-libs/netcdf:=[hdf,hdf5]"
-DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+RESTRICT="!test? ( test )"
 
 S="${WORKDIR}"/${MY_P}
 
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index 4b2d2ed51b70..6d16ea59c6a1 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -2,7 +2,7 @@ AUX nose-1.3.7-coverage-4.1-support.patch 950 BLAKE2B 451402abfaf917b42584fb2530
 AUX nose-1.3.7-python-3.5-backport.patch 1802 BLAKE2B 8513cd506f7031ec4af1a4acd619b1bc01da05a1a81e95d3d9dfa097b131727229a05228315252a67c57ab15aaf2dc90df59c7ff3c726ae62f4a5ef86776bb87 SHA512 032c4c291edd76bb594329578e57483942ced2a46c3f6cd4e914d905f3894e420cc4da0ba2a63c266c81dd4d8f40b8df180f56ac75cb3c5e83e0309bbac573b2
 AUX nose-1.3.7-python-3.6-test.patch 3289 BLAKE2B 4f19c4f6e4f376cb09896f9e7b054753c339ad371e151f01cc8c54e83ecffee72e4959d827a88d03b4944192b43085b50017ef8b8785222125ce32fac5831717 SHA512 0be6e49f08a4098b4c5dd1d9678e757c8f1f317fb13bd355a035c44bcdd9cd043be1755bb97c4ca78397985f07f6fc486ddd10cb56dd8d8774d631eebcc81127
 DIST nose-1.3.7.tar.gz 280488 BLAKE2B 4bb479b2786f813f9e9a5fd401e30023a473a053ae013d7887be15af415422c09fb399af6058ae99ed65c5fa4da84eb274eb805e895ca74db159d952905f5be4 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62
-EBUILD nose-1.3.7-r1.ebuild 2440 BLAKE2B 4d5fc12ddc35fa19a253e0ab6b9f04ecbaecbf1fdbf593d6a6859761b33d44221eb8ab0eae5d64309d7f5d21b3c83251278cc9ef610fc91467da90208f29a20d SHA512 a7ae054366a797c244e43e5a1464d1a86996d8744b16d6fea471f9fa803926480780a00801296336ab08ac71faeb5937c4f3f011144659f1381606a2a220e080
-EBUILD nose-1.3.7-r3.ebuild 2743 BLAKE2B 06912c6aea3c333cd0115348ebfaac5779e929e90fc5421d45b5c13f8212107435333de516659f00820e44ee41e9677c75c0fe3ef9ec0ab97330de434b8709eb SHA512 70cb35ad1d699595e46f62aab571539b8bb103ccce53d7b53975860a0a382788c22005c9985c3153e02c90913f28102e7022e0f031f9f0d5643b46645a3700e6
-EBUILD nose-9999.ebuild 2229 BLAKE2B 49b85be43d903924108b0a03ff1d5b8557c1902654b286c34fb90b5d56dcbf56e40180073f7d82f20bfb1235d1eb109d23822f7cae438d285fef553c12d3bf59 SHA512 7195a0528141d360c0ae9390b309afc0074c3b8f8ddbc964f3f46c557c3bd80904be7a49b5de92f487285f77af51490716428ea2b060b8496cd89c3b6468f1fe
-MISC metadata.xml 373 BLAKE2B 43ba4a1d3072a67aa7ada67e06fb1fe53cb9f2305143f23553705c3b8a0a12f10d295f458a7f9a08bc7273fc4ef8f87460ce53919f7f26d58da186f5bba02a52 SHA512 88a78ed0996cc2252a6cc707fbaa081b8ae3d03620dafcce844d6e760437dfc916d3a0244d3bf4fd9005d6cfd731858a9aa5b7fe99a89dc47a7ef75b2f8663dd
+EBUILD nose-1.3.7-r1.ebuild 2467 BLAKE2B 307d6f07969c4c8cca3801fbfe41e951d21bb4ab116a61f5a827268926d3e71937c8c91984bd31d3c1c33e185c9ed11b311e6fa90c75905fd0192df79ade6aee SHA512 d5856fc5e678e1bfbb5d1c7ccc1e60ce6be8956399264679fa39494215479e5d5498641746d1b8c171a5d1ad3d7b785695bcc20b25c25a3b90d36627f991e9d7
+EBUILD nose-1.3.7-r3.ebuild 2770 BLAKE2B d4815e041836a554970c90d31e4780649c32c369fad7d1e2ab0ed4eb3e275ca19e2b278e1074300dbba99cdb23b28bec2378e6630e383651528bde2dd087c44a SHA512 a3e7199ec2ea81f4d00bc336d0ad7e7890da3128d2200d7590651555f1a555b20362ed0b7dcd43497f23190a34354d0e50f329703bec48c640f4376ebcf6e191
+EBUILD nose-1.3.7-r4.ebuild 2996 BLAKE2B 551a6253133fa2c08ffea29b73287462fd6a8d58eda516fcaa3c192b5423034ff791528b821c26eb7687e9599df131fc1501d827a8be95457beb8013796846f1 SHA512 965cd7b81597c987dd676ca92ee9504a16c52d0a3892c447fd188dd853d6351054bc10866cc518bd3dbbde7c31e62c063f3dfa4ef12edc63a1a9f6990bc0a4e4
+MISC metadata.xml 499 BLAKE2B 9d6ffb5484f11c5f4c46e0013d4e93d01afef48339e83f4e4fb7d86776267256b30da1aba61c2609e5163abd012a57bc820ab77ad79577e748b56f7e8c327cee SHA512 c037d0a22b7bc9f61c10d8223932f2ebdaab4d9ac538dff56ab7e6fa263734992e8834cf739b7d787cd1243af5a9ccfccb81c2c0e4d2e8889498a707c96bd44e
diff --git a/dev-python/nose/metadata.xml b/dev-python/nose/metadata.xml
index 13648a4f19f0..a92a97fc50db 100644
--- a/dev-python/nose/metadata.xml
+++ b/dev-python/nose/metadata.xml
@@ -9,4 +9,8 @@
     <remote-id type="pypi">nose</remote-id>
     <remote-id type="github">nose-devs/nose</remote-id>
   </upstream>
+  <use>
+    <flag name="coverage">Pull in <pkg>dev-python/coverage</pkg> needed
+      for nose-xcover plugin.</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-python/nose/nose-1.3.7-r1.ebuild b/dev-python/nose/nose-1.3.7-r1.ebuild
index 91a73b8eabe7..d58786445780 100644
--- a/dev-python/nose/nose-1.3.7-r1.ebuild
+++ b/dev-python/nose/nose-1.3.7-r1.ebuild
@@ -19,6 +19,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
diff --git a/dev-python/nose/nose-1.3.7-r3.ebuild b/dev-python/nose/nose-1.3.7-r3.ebuild
index faea7532c457..69746257a397 100644
--- a/dev-python/nose/nose-1.3.7-r3.ebuild
+++ b/dev-python/nose/nose-1.3.7-r3.ebuild
@@ -19,6 +19,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
diff --git a/dev-python/nose/nose-9999.ebuild b/dev-python/nose/nose-1.3.7-r4.ebuild
index 03c347f62ba1..333bd6d07d11 100644
--- a/dev-python/nose/nose-9999.ebuild
+++ b/dev-python/nose/nose-1.3.7-r4.ebuild
@@ -1,35 +1,54 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
-inherit distutils-r1 git-r3
+inherit distutils-r1
 
 DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
 HOMEPAGE="
 	https://pypi.org/project/nose/
 	https://nose.readthedocs.io/en/latest/
 	https://github.com/nose-devs/nose"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/nose-devs/${PN}.git"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
-IUSE="doc examples test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="coverage doc examples test"
+RESTRICT="!test? ( test )"
 
+COVERAGE_IMPLS=( -2 python3_{5,6,7} pypy3 )
 REQUIRED_USE="
+	coverage? ( || ( $(python_gen_useflags "${COVERAGE_IMPLS[@]}") ) )
 	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
 
 RDEPEND="
-	dev-python/coverage[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	coverage? (
+		$(python_gen_cond_dep 'dev-python/coverage[${PYTHON_USEDEP}]' \
+			"${COVERAGE_IMPLS[@]}")
+	)"
 DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
-	test? ( $(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7 python3_{5,6}) )"
+	doc? ( >=dev-python/sphinx-0.6[$(python_gen_usedep 'python2*')] )
+	test? (
+		$(python_gen_cond_dep 'dev-python/coverage[${PYTHON_USEDEP}]' \
+			"${COVERAGE_IMPLS[@]}")
+		$(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7 python3_{5,6})
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-python-3.5-backport.patch
+
+	# Patch against master found in an upstream PR, backported:
+	# https://github.com/nose-devs/nose/pull/1004
+	"${FILESDIR}"/${P}-coverage-4.1-support.patch
+
+	"${FILESDIR}"/${P}-python-3.6-test.patch
+)
 
 pkg_setup() {
 	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
@@ -72,7 +91,7 @@ python_compile_all() {
 }
 
 python_test() {
-	"${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
+	"${EPYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
 }
 
 python_install() {
diff --git a/dev-python/onkyo-eiscp/Manifest b/dev-python/onkyo-eiscp/Manifest
index 498cf91b3cb1..2571dc37f2ed 100644
--- a/dev-python/onkyo-eiscp/Manifest
+++ b/dev-python/onkyo-eiscp/Manifest
@@ -1,6 +1,4 @@
 AUX onkyo-eiscp-1.2.4-exclude-tests.patch 453 BLAKE2B 966418a94703f5af908a19d7ad7aeca907f5d4aa91eb5955e632b8abd23f16b58e57a7a223545ff418c58e3a2a3c71ac0db579da4cb8321f0623586767deac28 SHA512 ee529c6d8a096014a4b2acb2a5fe9f3f7b9086f11dd3f43f280b0f95a2b56edd2fdade60118f6d043303cba76ddd62f775f8969854b02eb9fd3a0a7f4f4f4877
-DIST onkyo-eiscp-1.2.4.tar.gz 41394 BLAKE2B 09bd0d91290fae8452b5ad8db36f85aaedc2286335b766a24dc1da6287f0f28eceb112e09709fc0a2b8d3d0e8c1d6e3f46633e263c7037d853786b1cec1990aa SHA512 77aba800bb7472ccf4a32f116d13d04ab5339f77bee9a86c16522e77a11d991d7fc10d0fdb16f75afcdd5b84b4d063de7962e72cf4583dfbdbde69cd15b65a73
-DIST onkyo-eiscp-1.2.5.tar.gz 44551 BLAKE2B b7f039ba85fc3dbbac22f353bef27bdbba6ccb621a45d89cf23ac4ff1586a9eac72bc3808ec4787737e668e9c425b685a724b801e1898a9a0f35668d27112673 SHA512 1a0be02cf8a1c2843e34a918339600769a1477f44c0874d667b12dc93ec2d171073c4a82e068d84cf4fea8351be877f00ec839af608f007ab796f0041a305e3b
-EBUILD onkyo-eiscp-1.2.4.ebuild 637 BLAKE2B 2711ab9d6f286f5ec868d533945808307309eed2aa3439289cec769355c35c435208bb2985512a395fa2f3aa40eee2776ecc0dcff4a42c86159aa0c490aef466 SHA512 0a35dad7511515a1d0f1ffe1263e55649db74e30e3db4cbb6907e52fd0edb7d959c19086c2331bb5a1dd71a8beba715205c561d5aeb1328361c24ba531749310
-EBUILD onkyo-eiscp-1.2.5.ebuild 644 BLAKE2B 300b7eb1129cdd785e53998d8ad4a954baf0ed994611c014afa82825fb06c70f2b3c3a4110f10be4e398d948f7eb5dd82c911e579dd59f6ab37b3f405499a039 SHA512 a554309ca9b208a337208df8f05c4b40da9e0ef2534bbaa36c327637bdaa6fbad8a70b45a5ebb1964cc47e45c9d5af0db00cfe563606aed85e34b0b3c3a7c34b
+DIST onkyo-eiscp-1.2.7.tar.gz 48290 BLAKE2B c583b2af2619b6dc070c431a91d77ce507d3bf91f87a5ee181b82333ef597fd45d122c85f3fa4dfe5454b5059c89888744beb0a44a916f8e8cba64fd94b6cda1 SHA512 0fe8f23762d49b3b2c45ef24b94345d9a342cf04b2fa55538abf4ea21a6039011c0ade945f7432555ec948811ab521bb6a611909e19163e0e0c806bf87604635
+EBUILD onkyo-eiscp-1.2.7.ebuild 648 BLAKE2B e37f367f6a169a3ac297fe4572ebafd0f432beb1f0d70df4a37b37134e112c9aa31aec6b894e0cd549108ef58c2a14f8a3e0db907d363c3d95422ce743ce4cee SHA512 97105b2992bd2cc9da7713473b2bafd5ec74ead95f9d00135ae9bda8e9936bcdbd5e86fbf18b3eccf41f890d24363602850d9d50b543ca3902f18c07da391fee
 MISC metadata.xml 381 BLAKE2B 66cc4f148b9ded0452971c614536bdd681d8e0279ad9b7dab1795eeaf503ee383056ff3bd574fd53291f7a6ced9d95aa9636381a4211a3f478e42aa9b21873a8 SHA512 974fd1d80260721251f781d060526f7b545ab67cf93d1ac3fbac176c48d496c72be817b053278f7e8ba6e28ea4ff7519fb23c181cf51def1980b028080d576b1
diff --git a/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.4.ebuild b/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.4.ebuild
deleted file mode 100644
index 94f1da2f9101..000000000000
--- a/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Control Onkyo A/V receivers over the network"
-HOMEPAGE="https://github.com/miracle2k/onkyo-eiscp https://pypi.org/project/onkyo-eiscp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	>=dev-python/docopt-0.4.1[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}"/${P}-exclude-tests.patch )
diff --git a/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.5.ebuild b/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.7.ebuild
index d2604b363e23..e04f8d02c963 100644
--- a/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.5.ebuild
+++ b/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 19d508225c07..a30b7dbda52f 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,7 +1,5 @@
-DIST oslo-utils-3.36.4.tar.gz 87872 BLAKE2B 15f4fe90e5335cdf146ec582a506f2ab2bcae9989feca24caec7c12a4136767e93acb117345ce62013cde64938994eeb0c0809665cd155d5e0aaae7dc6aad879 SHA512 d5a81b68cc00c25eeb2e6d39b8fd4a47cb958c32e50471845b14a06cb5f420ac58986106893a27364adba968adc19f864624d69bae316202bdaf2c156458eac1
-DIST oslo-utils-3.40.3.tar.gz 90561 BLAKE2B 72c3361a291819e8d08f0c2087ad87a50848c73e9e349b330ad81225612446523a13bbe726fcbd27151baace0316f704878db9438930ee212a77757d67ca551e SHA512 893164fcb10d7912053666beb9caaad11c37c187b9d5182a3ffaf3282b9c97d9a9eeeb0cc9a4fdb68d3d3a82b14c7c9cef3c7a27d1395f20fc16de486ecaa49b
 DIST oslo-utils-3.40.4.tar.gz 90174 BLAKE2B 63c419c7925d58bdf73e3a1aaa683141f5e91d2b70a7e27db44a49ef5c662e7e1ff45016edc51eb73892ddebb45f6bcf4d8c1066d2eb6c6ebafa7f6a1be662b0 SHA512 d5df70052f0c4931fb5e9e89b6edf98ec2435a319157e04f53bf486f54e855ab178825772d405c2121cd2a2cfb894abfa35afe11edbe6b5b8030cbb915f841ab
-EBUILD oslo-utils-3.36.4.ebuild 2729 BLAKE2B 2ef6e4e00c7047f8f3848b44e875b352d9e65b8916f0eba647f8207192ab62c2375066e5f0114b796ad05e8f7ae9d8ea4f4d30c8b674b8a22090ed185101b4d4 SHA512 e4cd655c9d906cdd0abc783038f7494e234acbf0a717a602e2e6dfc01b3497014ce8933b2a173168e21538c846c660e6e78a0716b5fd082e727178628222ae8f
-EBUILD oslo-utils-3.40.3.ebuild 2990 BLAKE2B 25f443c10fec153bd7b5172e62e9a8b915108439df81c150ab49dbfbfeec90791b51fdd8408ca0557a8a1e8acbf7fa1b77462b90e877e2f3e0279b939e838280 SHA512 d29183b0574ee769b61426f23f3fe6322580d88ab616309db443c10eefa10647e671bdf180dbf4d06ef0e7e94450c7f01114daa8932287215f21d4d94c2e85e5
-EBUILD oslo-utils-3.40.4.ebuild 2992 BLAKE2B c652258ebfa7acca495f9c088adbcfdabbbb216641c7b6aa6649418d4e599b8bb232f18dea5fa7f7c7cbab5d493625e728397c36aee9f01666640b6bb601dda9 SHA512 4c32c2183d67ebab1a461f2aa74b39f25bb6ede5b19383a16e690920b5d6ea1d28d5ced906fb094b0604820b9a57e20d22b0079fbd6614d56fce64b4a2588f91
+DIST oslo-utils-3.41.3.tar.gz 91174 BLAKE2B 9783360e5328083b5cfb2813f388ea29ca8876ce01cbcba5a25e0706766aab87d28f7683c4a9ef43ad9a0a4756403d2f35dc61ad170ada33e0dab67e5d5a6af4 SHA512 b8efc1ee5e22a0f224a48406208424d75ae1b9eb2b740bd2ac57e172f23f2d7e3f2ae712a006f89b4a64e0b6a619858908540b729705285d0aa99a8d5081495f
+EBUILD oslo-utils-3.40.4.ebuild 2990 BLAKE2B 25f443c10fec153bd7b5172e62e9a8b915108439df81c150ab49dbfbfeec90791b51fdd8408ca0557a8a1e8acbf7fa1b77462b90e877e2f3e0279b939e838280 SHA512 d29183b0574ee769b61426f23f3fe6322580d88ab616309db443c10eefa10647e671bdf180dbf4d06ef0e7e94450c7f01114daa8932287215f21d4d94c2e85e5
+EBUILD oslo-utils-3.41.3.ebuild 3117 BLAKE2B 1f4a98b93d90fb9c82c75f9748ac5d96175ae246da3715e6f4c5d6047021088e22a68bb5e0e8186cd80c84049a783f26979bb50320ca8bf4c558628a56242141 SHA512 c1cb9250829d99c0ec1843e7b60da186bb9fa10c14e579270c7015dd50ccafda596bd2db6209f944e36de565c1a6c8aa705bf41368ec3f9b61d2740fb6e2c5f1
 MISC metadata.xml 366 BLAKE2B 010fcdab42d0fe2eccb1f10ae80b99f55bbd6aee2f8d8760512a92d4d23a81899c75496fa84e098447072ca005eb5a2d309628d6e3351370913d3e1aa2dc8e34 SHA512 58767ee794b3ff97f10711ffc71318ad02a6674731364b592f30fa95d84471fcf48fd2bacf8032c4ad28c2ec0144dd35fcbc4533d2181c7aa3b94bb2ca03d8fe
diff --git a/dev-python/oslo-utils/oslo-utils-3.36.4.ebuild b/dev-python/oslo-utils/oslo-utils-3.36.4.ebuild
deleted file mode 100644
index 00fea7b5b1f4..000000000000
--- a/dev-python/oslo-utils/oslo-utils-3.36.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.7[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-#RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	cd "${TEST_DIR}"/lib || die
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-utils/oslo-utils-3.40.4.ebuild b/dev-python/oslo-utils/oslo-utils-3.40.4.ebuild
index 69297aee86f3..c9aa019a6c73 100644
--- a/dev-python/oslo-utils/oslo-utils-3.40.4.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-3.40.4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-utils/oslo-utils-3.40.3.ebuild b/dev-python/oslo-utils/oslo-utils-3.41.3.ebuild
index c9aa019a6c73..3079473e8c1c 100644
--- a/dev-python/oslo-utils/oslo-utils-3.40.3.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-3.41.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
@@ -40,12 +40,14 @@ DEPEND="
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
 		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		<dev-python/bandit-1.6.0[${PYTHON_USEDEP}]
 	)
 	doc? (
 		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
 		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
 		!~dev-python/sphinx-1.6.7[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-2.0.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]' python2_7)
 		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index e2f39dc93561..d30385672259 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,8 +1,8 @@
 AUX packaging-16.8-distutils.patch 447 BLAKE2B ee667f6aed01fc273092b896acafc676e399a2bf8e68324e1f08d20738863e272a8ab13bac2e40d1216f44296711281a177c1382337d27d439873230aa323ea8 SHA512 080a1af701c81f694beb336e6239661d04932db904cc6c0ea7e9fd2c2d0e9a42ac3690dfd64eee745c12368f222d20d4b2cdd9d578d7a3b7142924f41b1887d3
 DIST packaging-16.8.tar.gz 44706 BLAKE2B 6443f05d3745eb6c4cc3d51fccfb1afcfa207ac12498be4d15cd0f5c52c80435f8ea513589e8aec671cf88b10cc8c98555e7cac7fe9a1e0c67f4625fce83f80f SHA512 d1a7b65472c7c02dd758f0c469d6c6aeea34de7b798613f7fcdf45fcccbeba1e9085cab113fa89b392a60f758f8747d13b1c265c809566990c22e61ca8db49bb
-DIST packaging-17.1.tar.gz 49849 BLAKE2B ceea74025c55c832cdd36b8464bb15862d8ee60387de973d7453d5cb8ec0b430d1e49a1b13c9dccb8b9c4c898cb07829f6fd04ca700d8cb2c5ba2b7abc0d160e SHA512 52d2f482ae5cd0f8e7b3ac35c4b270ca736bc4f7ebaa569631d1dcb8ea024ee6f75127ca2aa3c95e686ebbd427de2ef4bc01bcd839591f7b4c1e26f9b8d9acb0
 DIST packaging-18.0.tar.gz 48018 BLAKE2B 3c7082a6cd6ba697f8b2c036062c7020b3b6417ba5492abee3b57b6a14bd8895168f6d6ab385458d08561fdf37230eb9d79ce82a8eae7dd16dc4951d679f917f SHA512 9f7cab9bdd756cc49192379b8381f81d218d3201e071498f2f6fd0307b1c46ad1a8c8b9d4f27e62d5f469eb05603a57be54deb8a5e0dbc2cf542e436a7127b34
-EBUILD packaging-16.8.ebuild 1408 BLAKE2B 568268563507a0a8926ce55b4d761ed842cca639deb7f85b4c751118ae94bbe0da5003e7e774bd9754b066a62fee502aea65b66dbc523a0b3de20c431596036e SHA512 27f34192bed1ebe948a588e214c735d3cc9ddd9a2ec0582535b96a2a514003c2f252ebbf210db09a97ea88225269e2c480d4e783ed126fb5e64353b2e5ca8586
-EBUILD packaging-17.1.ebuild 1423 BLAKE2B 0ec2484a2f6c120b9de45f30cccb8fbc1a6b90c9a4a70856a351382887ec10668a13a39f7cd4efae1ef0a0abce5e56c76dfae04ea551314fd34170be8531fd46 SHA512 3ca9feb9c58a34b340c5dfe58c64e59171950fee02b2105673de1c69b6d8690e550af9557ac995591b41c738fe2ed9961fbcb20d2858c7278c4cc7ffc50e14db
-EBUILD packaging-18.0.ebuild 1423 BLAKE2B 690abf2528eb4e623b530ca0195ea414521c4f9f0d1e45653ffaab71e0d74c048b095807635011e50f7fdd3d751e476dcb1969e4adf0c77676ddc261bbc0d710 SHA512 26c7b5170a15f31b222c7f5bcf5dba7a25bf7f72b4c345c2ca64e0da47bf33571de0dfd9788ef35dfe23823c01bada8278f14b2c84af98f8428236d965807b73
+DIST packaging-19.2.tar.gz 59110 BLAKE2B 8098538b8f48f4ff478eb13f3f4384d08c246b8a99711a48b2f412deaecd85faf13e24fd910a7a262c3407c5eb54939cd926e31e6f802deed0e28e0a92dfdb86 SHA512 af7312a85292f577d3e6e57154f10fb380bbdee749344ba4b226a09f22bf5ca664ed63c62cd5b4dea0be5eb5cff5c17ad04415aab8c925fa90dcae2e1c6dee5a
+EBUILD packaging-16.8.ebuild 1435 BLAKE2B 61f84076339e88b08b95241d9e6eacce5565640cb97f125b96ec08341aca855c180e795f42fe9c4711503e7f71b05ea2ccdcd5ffbc6334299ca72836a87cb3c5 SHA512 c42fae42b7d8710702b81c51621ca9eca811bb886396be93a65bc4f4c6f24a99a105946cae1d49e3b5adfc4f2e0e19b496959e0635a54f218da9d448173e6417
+EBUILD packaging-18.0.ebuild 1448 BLAKE2B 3a91497a8f4410accaa5d97c344bec224ba4a2ce1ad97f68300aa58e34e141b9d9039957b7c495f46a7ad50ef823439e0adc0044d40aa901ec0f05d5a47630e9 SHA512 b4fbeca1287b2167040e16f6c3816442ac661ac4d1fc1afe877889c04442b15be1244970fa3c3b0bd9f4b39bc4994d15a8ddbe51b684d4bb305b8ab3781aa735
+EBUILD packaging-19.2.ebuild 1424 BLAKE2B b37f5d02c4ffaac5f02fe69336f534ccdca8aff843ed89aed0f7ff20d26db8829dd1adccf53afc600729afc5b7fafc95d119f3176e200f0ad31ab536bd3406e4 SHA512 e911d83754fa8b894a98c3c6003a15ce9446ae8480e3d86fe31324f3772eb5bbe86859b876c09e84ac11a06f093185a6ccb64f281d7625876b7e46a58499a713
 MISC metadata.xml 366 BLAKE2B 62088f9e06b99999bcb0082f1ff6d6e243c8502a7e3f399699cded85fa65395f558e019b08342c73e4f078183cd0732d88058fab8fba984ba0b531c19ff6560c SHA512 f326b75f4603bc9e4455665dd526e381eb1973c8edc319e1d69b824f93ee885931fa29e74f9da8582f5af78a1ddba2fcc2d983fb98cbdc4cfd87b82c7a0f3ba4
diff --git a/dev-python/packaging/packaging-16.8.ebuild b/dev-python/packaging/packaging-16.8.ebuild
index 51ab5134dd58..49fbf109beab 100644
--- a/dev-python/packaging/packaging-16.8.ebuild
+++ b/dev-python/packaging/packaging-16.8.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
diff --git a/dev-python/packaging/packaging-18.0.ebuild b/dev-python/packaging/packaging-18.0.ebuild
index 6e30f354ed10..af75bdacd0d7 100644
--- a/dev-python/packaging/packaging-18.0.ebuild
+++ b/dev-python/packaging/packaging-18.0.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
@@ -41,7 +42,7 @@ pkg_preinst() {
 
 	_cleanup() {
 		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
-		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
+		local egginfo="${ROOT}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
 		if [[ -d ${egginfo} ]]; then
 			echo rm -r "${egginfo}"
 			rm -r "${egginfo}" || die "Failed to remove egg-info directory"
diff --git a/dev-python/packaging/packaging-17.1.ebuild b/dev-python/packaging/packaging-19.2.ebuild
index c33fd8aaf8ff..f41f99d3fa6e 100644
--- a/dev-python/packaging/packaging-17.1.ebuild
+++ b/dev-python/packaging/packaging-19.2.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=( python2_7 python3_{5,6,7} pypy pypy3  )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3  )
 
 inherit distutils-r1
 
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
@@ -32,7 +33,7 @@ PATCHES=(
 )
 
 python_test() {
-	py.test --capture=no --strict -v || die
+	pytest --capture=no --strict -vv || die
 }
 
 pkg_preinst() {
@@ -41,10 +42,9 @@ pkg_preinst() {
 
 	_cleanup() {
 		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
-		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
+		local egginfo="${ROOT}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
 		if [[ -d ${egginfo} ]]; then
-			echo rm -r "${egginfo}"
-			rm -r "${egginfo}" || die "Failed to remove egg-info directory"
+			rm -rv "${egginfo}" || die "Failed to remove egg-info directory"
 		fi
 	}
 	python_foreach_impl _cleanup
diff --git a/dev-python/pathspec/Manifest b/dev-python/pathspec/Manifest
new file mode 100644
index 000000000000..6c183cd41823
--- /dev/null
+++ b/dev-python/pathspec/Manifest
@@ -0,0 +1,3 @@
+DIST pathspec-0.6.0.tar.gz 24159 BLAKE2B ac3f75d7f4b3f6d092d216176823f061fe91f3bead10947b01315267655133a0f99a29288283cbeeff7c2c9305c499b4ade1efcdccc554d756ecaaae2f84896c SHA512 e08baa05a3fe58ec6ecd651577834115cdeef26b75eef274d843c3c6444cf771e86f99a2a2b2980a6d1ece946997f1ebe714f79ddd5c296071c2e18b73955a84
+EBUILD pathspec-0.6.0.ebuild 599 BLAKE2B 600dd9f5122544166ec343b94c48f619be9aacf22358f2c8cfbf9f34a6ecfb985d68e2b44eb692653e5c449e7103828d921a27d7cca51daca4da4aeb1ad1bc7a SHA512 f2573d272c14d37231a4b0b071dfb15c9d592f4d55f493b51e8f3a478348e3b08672f59a18011fbcf081b694060a869117a483c367c4a0b178abf49ac1b427a5
+MISC metadata.xml 396 BLAKE2B e76022dc2c60ab84694cf449d56709db941649742c430370395c8389ab302c64eb5074db3d16c48195e9e36ff40d1f873919582cead9c39ee584667fbcff1b3f SHA512 db15dc438facff639ab3c1b32cebaced718c3a0eb7edcee5477e0688589d56f48d55347a9679b043d551acd9638b601738c947c2072043d0aaaea34a3f4d2eed
diff --git a/dev-python/pathspec/metadata.xml b/dev-python/pathspec/metadata.xml
new file mode 100644
index 000000000000..a3135fd46ef2
--- /dev/null
+++ b/dev-python/pathspec/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pathspec</remote-id>
+    <remote-id type="github">cpburnz/python-path-specification</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pathspec/pathspec-0.6.0.ebuild b/dev-python/pathspec/pathspec-0.6.0.ebuild
new file mode 100644
index 000000000000..291d7aea3550
--- /dev/null
+++ b/dev-python/pathspec/pathspec-0.6.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,8} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Utility library for gitignore style pattern matching of file paths."
+HOMEPAGE="https://github.com/cpburnz/python-path-specification https://pypi.org/project/pathspec/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index 5934ad8c3040..845ab724d537 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -1,5 +1,5 @@
 DIST pexpect-4.2.1.tar.gz 143980 BLAKE2B b5cb9c7847eabdf8778bddc6b208520edb9b3611d7a981fae6e371fa6deafebe142ba8361e3a1d21187cd692576c91d732f3def75e19989296f50b2a9fb4d4c6 SHA512 796474c87559cb9f4e2dfe72564d70c75e1aac4f57c4f3e4033a56c8842a48380ae0d5fafdad7f1ea6718b25c272fe4a611a59db44e69afb1f2bbf7e00256261
 DIST pexpect-4.6.0.tar.gz 148966 BLAKE2B 0ed1a3c31133bf618e4c75ea099efaa9bda9e2b7f92f46c54ad553ecc56487e5415b750334376a95599ada53e17e91efe7d4b65ad80bb4f6a1cf9d655a3c9685 SHA512 9a2b1ef19d885e69cfd17ba0519581f782574019010043e66d8b68f98ac86b359f4a1ca42f8bb0059a5dfdd43275ad93531c076cc0ac2049e109408961b46bbd
-EBUILD pexpect-4.2.1.ebuild 1149 BLAKE2B 8b6296d58f431abd70a1f53494d0553e8145b8f4082f4becb02b486ef6853cace7e222960e5227ce3753111a1503fe9369aa9eb30748a1d26747a82c116e1b3a SHA512 d07ceb0fde4e4aa8f669bbc201585f2520dadde966a2f92c1c5c264b20116b280b69b5dc9b029b701e441ee043f42e97a4e3fcc07be1cf379d00f1fdde3d9882
-EBUILD pexpect-4.6.0.ebuild 1164 BLAKE2B 6dfb7eabe320e7f32b0298d8d2d488201f14f3538086f7d5fda6838427ab328346d0a2c2d99dee4f235f74c6ccc03aa51a04f1efe8408f30e5f42c232d302401 SHA512 d0db5239cde3dc6aada5f2676018809df0f4fdb47c19fe3eef7afc50d5e021e3bd95e642c8a0ca332f7227466b0c988e7787c4c64c71d6e4f7ee54f4662431b7
+EBUILD pexpect-4.2.1.ebuild 1176 BLAKE2B a83d75d8734c9c67f7fee30a6f64ddcd484718eb690ce9e3b3ff46f4d12a28bfc4af05f33ac989ddb2030460c56b663260524af03f878793c34ccb8e42a147b2 SHA512 a720b69fd35b5eea7aa9355f66a44c93137ca7b9897f2ee4c0f41608493b0632207fce6e37fe93a489ac6a4400d8c5dba2ef032bf187aaafc60764f39a878026
+EBUILD pexpect-4.6.0.ebuild 1054 BLAKE2B 5e59dd76c2ff10d4726fe7f44cab178447149b5d3ca7be6879a2d3c68165d59162ce8293c3cfaa31317f2eaffccbaf7638aeb8538515b3eab9b4fd289af0aa4a SHA512 844be7de3ceefe68f62105ca5150eff86956dda6acffb6a2746e6169077a8cdfe1db0910078e10b876b400dd813375b70f9ea4e5e806c37c9fb3089855514fc8
 MISC metadata.xml 377 BLAKE2B 72c4b35c12a770df9344987af8c7a392c3aed05296a4876902987ef946239f8318ee833cc81a7f004719e954670a83e84a3813bcdaac48912efad885515de1ea SHA512 31e65b2ce9ec12e9d3e95ed651841b8aad6a24330fe20b4bfd6351267423ff5005ac3cb2e89dbb8f024cf60705d3f06a8a1309169a029eb5246ddc45a8d76464
diff --git a/dev-python/pexpect/pexpect-4.2.1.ebuild b/dev-python/pexpect/pexpect-4.2.1.ebuild
index 5349ee03bf6a..8be1a9dfe689 100644
--- a/dev-python/pexpect/pexpect-4.2.1.ebuild
+++ b/dev-python/pexpect/pexpect-4.2.1.ebuild
@@ -16,6 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
 DEPEND="
diff --git a/dev-python/pexpect/pexpect-4.6.0.ebuild b/dev-python/pexpect/pexpect-4.6.0.ebuild
index d5596edcb12c..9a8c5e55861b 100644
--- a/dev-python/pexpect/pexpect-4.6.0.ebuild
+++ b/dev-python/pexpect/pexpect-4.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -15,21 +15,18 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test"
+IUSE="doc examples"
 
 RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
 DEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+	doc? ( dev-python/sphinx )"
+
+distutils_enable_tests pytest
 
 python_compile_all() {
 	use doc && emake -C doc html
 }
 
-python_test() {
-	pytest -vv tests || die "Tests fail with ${EPYTHON}"
-}
-
 python_install_all() {
 	use doc && local HTML_DOCS=( doc/_build/html/. )
 	if use examples; then
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index 231c98e3a49b..f2ee453c59bb 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -2,12 +2,12 @@ AUX pluggy-0.12.0-strip-setuptools_scm.patch 1186 BLAKE2B 443f5af807826baaca7e95
 AUX pluggy-0.7.1-disable-broken-tests.patch 506 BLAKE2B 9f01f31d9b78254c662e15e2580ca78636ebfb7d902828054ada96857863917938f78f8af292549bdfa0ff1bd71cea9ff6e5309bcbb99a00c65ad52290fc23a8 SHA512 bb959e084e388599b468727afd0ed94e445ba65a5e6dd8840470ab7f0c56aed57bde3ab389a48c49dbc5f4bdeb6a60a77cd70c28c778a952bdb1910c362d456a
 DIST pluggy-0.11.0.tar.gz 56897 BLAKE2B 2d40ca953fa0ead7516dd81007ef6f1f88b0ebe45512b031fda9ed69c953bca08109f157676ba2ed545ffb1f8f7bb18fa1b8532635d6fc929c62bf0b5de45128 SHA512 8808f5015fa6f33fcb07047c644706bf3acceed1e107dd617395e61aa9765a45e3a641e49c610ab817ebaa2c4f3b32a15bf347579206e979fe6b844ba2f684b5
 DIST pluggy-0.12.0.tar.gz 57658 BLAKE2B 53c35f16fa73ffd115c7988032593e925e538f1a49a36a0db4db406b013f6f68f293ebbe3673243748d5707e72520192775e59cb8e1bbe4f9a448a5f3ba64651 SHA512 a3a64caefc797334b73b0614e467613b99909037a62dcbfbb0cf917788ee8d12af4f43d7c371634ac6eb6f32a5aa08e51aa8179e70b5998d4d055cd7f535129f
+DIST pluggy-0.13.0.tar.gz 57726 BLAKE2B bbf473271c1ea6520d71a6dbbf145a2c3b1a2f2a58e4427b0584f5cb9e3cafc7dba9fcc3c8480211ca0c9ddc721288e49bfbf57bcae1320c667b7c7324cdddea SHA512 82cf7d8aa4a0e09f8ba5048cd7ce038f34ca1453fe0c5a7926a2113e64528d0861955f8544035b4ffd61f0227e3d30d8d4180a05bf80e0de4809546e990bd4c7
 DIST pluggy-0.5.2.tar.gz 18935 BLAKE2B 8e5bbab9ed0c78a0c6da076ad03618e66780f9ff209f4d08223e7a381eb4d7573727793f4543799e0e557991d4edcdbfd22c0565b69814379806912a4631abf3 SHA512 850b1a7b9e55d46d5deb16b8bc71e3f9d6c26b78fe34379b295a9780f3da8abb3c44f524f175d0392b61fc2d36d66d156db3f499a3c1666e2ff3e3c6344153cb
-DIST pluggy-0.6.0.tar.gz 19678 BLAKE2B 79db59c5f0ce0dd157630d039ec50643f615789b6b993d84e9ab1bdc9ce04b32df336d88df13f13a16a1f0bd4acb7b900208e98c84f007bdc3654f9a1d5f19a2 SHA512 dd58dabe2e65eee64d62c8748c2bbd99457288e99b819eb12312f2acdb0740ac46fd08f83522bc992297b9f14eec14c216c2c9688580f68393bf6fc609e65812
 DIST pluggy-0.7.1.tar.gz 47784 BLAKE2B 49eb28779717ead8963e14101cdfb830feeecff756a59f080e79e70465d48dbbc6e6100305e8b32031cefb0ba06bb10494f29bc8ddd38d4296016ecebaafccc1 SHA512 e19f6c1b3f2e711df1c8b075a2b802751afd218f1b692f08b2434c01d71c402331ff8c937550fbdfece2098f6d6856422d485f193e188916b365ded2e4087697
-EBUILD pluggy-0.11.0.ebuild 838 BLAKE2B d008f636e6705259586609f9a73222d3d4d4fa867a6337f2bc91c711423597c0fa3b595321fecb0bc3983f35c0b0c0f8c6401d7b38ecaa9087161f90cf711f12 SHA512 a5d8dcf74d46a2c145db23155833134b3e034a48875eaa7637f0b8699265dd4258133125e4711ffab98552b99657baaaf9e44afc20de46152e1a54bf0fb60a4a
-EBUILD pluggy-0.12.0.ebuild 763 BLAKE2B e7b32eedcb2a092730a01e24253c4f249640dbe65bc90727a711afae7a802f1f1b94815158c29c717463c89a9df3cca8722d339ee58cf42b84a29e9c9f3e7f2d SHA512 e98823b2be4b8300dcb68571598aa22b3027eeee1334c5339c3c0c8d29fe81282c2d038ae6c6f4ec4a96b43a97d4ab001b8045731ea8fb921599605cdf931eab
-EBUILD pluggy-0.5.2.ebuild 728 BLAKE2B 7f818f66b4c4254a8401a4b7fc3fa95f2fd81c513ef0739ce9f3621a64c1305d788a8823108df85451d1047f7a1150e637ac37b53cc786c5bc9e512e99d7e419 SHA512 4baa9757b32121e6ac4afd80c94f96f608d4151abfeb4a925f7c04a77513190efffdb519740d655d6f83c730406eb200bdaff26997a88d597ea279dca9fcbb30
-EBUILD pluggy-0.6.0.ebuild 747 BLAKE2B f1b9f9c08f7f3daf5e6cf747f34a0da8324eca08f486d3203bf9fd774d1531519ac711ac7efee26bf8b2c20ecdfb7d14d91a4e58aa894861b2e1f9ce2c89f159 SHA512 94a5216ac4a6e09c766e8fc8b55a475e289300a22e1fff00d6d4de30efd98c3822e86a0605e9143d0209420e9f01d7e7f81204c68a8164010892fbc44d7ab0c1
-EBUILD pluggy-0.7.1.ebuild 894 BLAKE2B 074ed504e9f566da7637ba82d0fcf6755890481f76e239e188b126bc8f4b5e2106959b7a4cb8f70f4c85e841c0a14fd5d5a517bfd7e63b0d5fd643d7cc28d289 SHA512 9eb104585bd1fe08cbb0a8bd0c1b46bc06215a89ee05b14b2f277b3836bbfd51d1b9e41095913176af33714f7e07b4c2172ad56951a716528114eca56de5042f
+EBUILD pluggy-0.11.0.ebuild 865 BLAKE2B 9b4288dbdc6a582db4e143a9ba5499dd1a68db5620def7a82d3aec8c59c0f6a2fd0d9e79f5f81febd33c0523ffd531769ae7de0f4873bcbf63410709ca6ea3df SHA512 ff2a2aae62d21f3940ce888339165e76c39be655cb59378df93b15efe9d6eaeb72f360b6d90723943f599deb2585bc311c095c8a20b34358c275614782b0414a
+EBUILD pluggy-0.12.0.ebuild 790 BLAKE2B fa8b4f5139df04a88e9cd623a99743308a6dd7624f1ab4cd05f50f9e5c0b822830b0a2e808469e7b6b38ad47ae09635ee0548a9bc6df737033a6410a6fcbf2fb SHA512 2abf0f8501ad802fe15e0c56e0b01e44b3bb6b3503f3526e4da207895d618dc6d77e1b8e8a9720c3f979b7c1ab732c235d604235803bf8e4c28775956a356dbc
+EBUILD pluggy-0.13.0.ebuild 689 BLAKE2B a5379c80edfde04a228a56865f816703627293d5bc71fd4f1dc0b1835a12cd4871a03d20e18497e8c7f9699b094690180a1277d7aee4bf05f1d3bf07d6242708 SHA512 9d5ca7c794bc98b709c891ebb22ab669816879ad117bebfc99a2085e120f1465dbbc707b999052b9d246ee6f0503c44f272147c1bc472f29f0ba786e79196e69
+EBUILD pluggy-0.5.2.ebuild 755 BLAKE2B 157077803394e3f1d4d2b050c75a5220ea7a3ec8a1fc48fc60c338a20cd5495c917e87d62c496cb29f2884b7bfab06e380ed8755f5503ef920942dcdd2b922f4 SHA512 26b629a0f49e26ff802e9b7ec1dfaf9e7401a75e37bd277a111d7d83bbc01254dcc59cd3508e008bffa30b3ab40ce4e0a5fe370c90410614342e09c8151ddf63
+EBUILD pluggy-0.7.1.ebuild 921 BLAKE2B 2008e1c6be1628a52af26b05d446bb289d3d932983ba04602170ba5ab2565feb9666362518c8f728bf01d9645fae82b8fe11ac7799f245b738e0b5379b201fe1 SHA512 59f82bb2baed2c244afdd2188764c71112522db91a4782c75f6e534f984d709941c00de1416bc0b385bb9b797b98827e75879ee3826184b7fda85da9ab84b0b9
 MISC metadata.xml 444 BLAKE2B 9b0b62a0670449bdfade395d9766e192088182f724deebd2a2ace8800ac5c0ff6f37da7174186434f727aa3bee08b9416e6dafae443cd01e01baaae741c899cb SHA512 2ecb5fb612627c44f3499080fcde9241daf2f25a974a8e24fe8190b7d5f8baa6a457b7a902e788f98fe9ed1fdb2cd0f46770337e8f836e430b0aa6f0d323ad50
diff --git a/dev-python/pluggy/pluggy-0.11.0.ebuild b/dev-python/pluggy/pluggy-0.11.0.ebuild
index d1d68d4ca7fb..b02d326e0895 100644
--- a/dev-python/pluggy/pluggy-0.11.0.ebuild
+++ b/dev-python/pluggy/pluggy-0.11.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-python/pluggy/pluggy-0.12.0.ebuild b/dev-python/pluggy/pluggy-0.12.0.ebuild
index 9f802dd8e770..d8ce296fc171 100644
--- a/dev-python/pluggy/pluggy-0.12.0.ebuild
+++ b/dev-python/pluggy/pluggy-0.12.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/importlib_metadata[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/pluggy/pluggy-0.6.0.ebuild b/dev-python/pluggy/pluggy-0.13.0.ebuild
index 63f1dd813ea2..d2d28b6fca6d 100644
--- a/dev-python/pluggy/pluggy-0.6.0.ebuild
+++ b/dev-python/pluggy/pluggy-0.13.0.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,6,7}} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -13,16 +13,12 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -v || die "tests failed with ${EPYTHON}"
-}
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="$(python_gen_cond_dep \
+	'dev-python/importlib_metadata[${PYTHON_USEDEP}]' -2 python3_{5,6,7} pypy3)"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}"-0.12.0-strip-setuptools_scm.patch )
+
+distutils_enable_tests pytest
diff --git a/dev-python/pluggy/pluggy-0.5.2.ebuild b/dev-python/pluggy/pluggy-0.5.2.ebuild
index ebe067fe4766..9c077692884c 100644
--- a/dev-python/pluggy/pluggy-0.5.2.ebuild
+++ b/dev-python/pluggy/pluggy-0.5.2.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-python/pluggy/pluggy-0.7.1.ebuild b/dev-python/pluggy/pluggy-0.7.1.ebuild
index 1e3dc2e42fb9..f2d0a1584808 100644
--- a/dev-python/pluggy/pluggy-0.7.1.ebuild
+++ b/dev-python/pluggy/pluggy-0.7.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-python/ply/Manifest b/dev-python/ply/Manifest
index 696fc72d8e12..d63f520250bb 100644
--- a/dev-python/ply/Manifest
+++ b/dev-python/ply/Manifest
@@ -5,7 +5,7 @@ DIST ply-3.11.tar.gz 159130 BLAKE2B 58c50b9dad445ad83a64aaa8174ed4602b36f5c8df33
 DIST ply-3.6.tar.gz 281690 BLAKE2B 1a8e9e925c1a70832e3312208470a3bc4831b7ba18a0c2eb3a8b31fc9a850ae192809b9dec098f8479f2060e63ae781063b362227db2c6080aad85a2fb8648a2 SHA512 1a408d7cd4cdc9d747154623672e6baaf37ad2190cb9d6d6a7c1e1cc3cb40f15547734441b8fc99ecd67d7804d767576bdf0ed219cc669bf3d0df37498c55c55
 DIST ply-3.9.tar.gz 150750 BLAKE2B cb32c3837f2b4bd33ef2074dcb3f1421a54e820faf0e65def16f4c354643dc3e467f7c482dfc5b7f62cfb367945632e346b6e02e16cc79a91bb6f9241e315eb1 SHA512 c3beca6f70e9fdfd11f9fc7beb18efb03f0b32be3cdc949e96c4df3d060e7e9da3ee42d1f58f7a9225d333cb7864a4253fd3a9b75c496364276fe9969ebd7641
 EBUILD ply-3.10.ebuild 1116 BLAKE2B f20d17bb8bb4ffd3c07572367e054223a4ab03415881bbf170f843b7fbb3a05a59134827409571c1c4fa468be353c3ff845148ff77d354041515809296f0d840 SHA512 575a45df119c1023ea953d06ee61de05814f55f2bb8b6c2234f8ab3b44a3daec3b04ca56b819b3474920bb89f6178009aee63a8d46bb6adefdef5806f8ebea2d
-EBUILD ply-3.11.ebuild 1148 BLAKE2B 5629316832b42301c69563a974e9627cf065aa731a9bebef2262b0dabc068ae3a8b07acccbfbc8b793acabc498d4eeef961f87a918b4583a1febfc2eb8986d24 SHA512 3510b8139812650ea349a2ee7c5dc30910fef458a86161651c23426e6d0c98424d93fd6ecae9ebf8473f3add716d333d6a8496c6e0c73d2f9db3fcc02871feba
+EBUILD ply-3.11.ebuild 1154 BLAKE2B d2693b80a8224fc03f0fac1841b4086e45b3ae6136e871260bf200c4c2ac18374043af810127772a87cd77297134d2fba37d7f308936f708181447d93fe01ec5 SHA512 a0402d4bfd1860d11f401cc786a4207398e8e9af92bd8ad6c0340efd9272aca52d4ab47db5d2130c3701db0a1ad8bdd716cef2fa4bde9c974e6175aada05dbef
 EBUILD ply-3.6-r1.ebuild 1129 BLAKE2B 47c949ab2df77f63e8ac5ff0bcfb7f6324883b61b35909068fd5cacc89ed357088173e73956c50df8c7c14630b7812bdb2e2f2044514acfa4dfa2e7d2e6c6507 SHA512 1dafb0cd20f665f9e9f37b9bfabb81da74fa715f6a13e39909dc28f3bdf1dfc26b9203dfcf8cf8e58fc34961aa8b0450e42099b26804e09212ee4813909db007
 EBUILD ply-3.9.ebuild 1094 BLAKE2B 40eb336ab3c6741985ece8e45b5783290930e8a9d87f43816aa9d3c23cb8e86d4b70ec3c45a07811570b1061bd1937abfb3b183e8a8345260de4fa5530ac28bd SHA512 a255e357121208bca3d9205a9f9a3a229a9da3f4fbb3967bc3000ae3e67e8e1b1f9219b7e4c47feaa897a60a981d3a3e5d3753f9e1954a708f2eee23ad505919
 MISC metadata.xml 1418 BLAKE2B df2c9fa5b1d9a0b7779fd72b390d4509f83e1ca4c49f3d64dd2c0b440d2f583c0b936535eb2c15bf323e649cacb4f1bd72bea797bd51afaf611fd8fa6490ae78 SHA512 92a5a470227858726239f537b3d8559e29d589a8aca0f1d43b8a1ee3ec00470117efb45275b5bfc0ab6d0678863db50aadd36aec326978e7a3e858c0b0be41dc
diff --git a/dev-python/ply/ply-3.11.ebuild b/dev-python/ply/ply-3.11.ebuild
index 868edd09b274..bc0e51ed0a02 100644
--- a/dev-python/ply/ply-3.11.ebuild
+++ b/dev-python/ply/ply-3.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -32,7 +32,7 @@ python_test() {
 
 	local t
 	for t in testlex.py testyacc.py; do
-		"${PYTHON}" "${t}" || die "${t} fails with ${EPYTHON}"
+		"${EPYTHON}" "${t}" -v || die "${t} fails with ${EPYTHON}"
 	done
 }
 
diff --git a/dev-python/pretend/Manifest b/dev-python/pretend/Manifest
index 8daa763426cf..d76ac53441f0 100644
--- a/dev-python/pretend/Manifest
+++ b/dev-python/pretend/Manifest
@@ -1,7 +1,7 @@
 DIST pretend-1.0.8.gh.tar.gz 5509 BLAKE2B 574c83f05c9b45876891df97a23a25cefb0f27f9ba76aa6d01fe8d2246f7b4457fb99522540d85108056dd83e79ed7179c4661d30fbc786ce2adf0c477a23560 SHA512 f0a3263f55afc43bfd63a6ba0ae876f2607ed9cc26352a3ec69933ebb79418a128c5c29c3e77a924b158da658d8ff2043a7f8e6d4ee3e499df22e4083329cf62
 DIST pretend-1.0.8.tar.gz 4848 BLAKE2B 396fae55208e39eadceaff92890b48d63b79a24e0d313a3b87d69b8a61655cb8a1a2f8823f06779e0730fb3505cb269ca907dd28a79fdd283ebd6913bd9c0ab3 SHA512 25011216947289d340fb979ebc9e2c7f000571f006cf5ce15f10ff0e013164e4329a3a66933d202acf8ced498929cf9e5a2a3666aafa00f78348400615c5cec8
 DIST pretend-1.0.9.tar.gz 5656 BLAKE2B 1a8e280fbbf147f502f1148b9e3685630e0f5cd270dc8b6fa8fbbd8177aaa08efe401a6684b669a976d828e7fcdd48d686170bfa3cd3d8a857b78af473a5b6f8 SHA512 976e3272557aecfb11e4147a868ea96e23546e277d57d726f41b945103bef3451039716e6bbc5082d691fa1fd331c06b3d0f8b254deb0510948153571326eaf0
-EBUILD pretend-1.0.8-r1.ebuild 746 BLAKE2B 43dc39c15d5655e33b74256601119ca3356fe98f0ecee16192399731179c578ca3a321571eb4739eb268ee300f7125bc13044c1793fd9ddd5453f6f61eac8208 SHA512 f9b276131b04308d3f735e372154d934dcb51cac52c32f201d8109726a48c8f689b40b0479e993de469f9579a7b78546531121eeb31a0f2dcbe25684d94018dc
+EBUILD pretend-1.0.8-r1.ebuild 773 BLAKE2B 910416abaeeb9ee07bd17811ff807e3ac46c69e4a06ce2e75e502414383d3e6fbfba9c3b303bb2eec2471797a4edf71848b7cfdfffdd5e9263e1f515a3e2535b SHA512 313e538e6367749042be248542c06514d3dfdfde775fd728ae991e43edca32c4b82da3dd951eb99498010f02ff9ad0526ccc8f2a4a0c0f9441585c7b44c207dd
 EBUILD pretend-1.0.8.ebuild 615 BLAKE2B a9a9a467db013205946ee55a66e57d7b6bec4b1bafa32472ab3e986884771d99273c4d24420dae92f52ff9594a7063e45d6b62e2cdea830ecfbc8aa75148835d SHA512 b0f6e848c13473d3f708da5a4afcfc7c4cb836c97f101a55538ca72cb692de5e2bf357499f25688c127d6f2a34d15f205c77cf55af09a899c87a80b25754c8c2
-EBUILD pretend-1.0.9.ebuild 779 BLAKE2B c746c75f580ca926ee9f0d23a9ad671040f21cfd902472f8be343f05c0f0067beb9a5adca944845529ec6102d0981b07db0a525ae5b86cb14069472da5babef4 SHA512 c0859196ce737f8701a0f19079ed955109a998c5d662160581b0c7ec3a6c40897d62b8f3125169ab7fe774bed3627ae8488f7b3da584040b55abbb0047d202ad
+EBUILD pretend-1.0.9.ebuild 715 BLAKE2B cf49d56fd3290f8f27099cebc2d6d143dee95d8110eee1e4d24768d98f115986e61376c993af9e652b55de0a062d37bfcb71cf0cc8a250b33bf588b7593f9fd0 SHA512 008361a42af1de52fb85cf76b253299dd2f9fb98f37cb6d1bd7e52bf8c224a99527ad65e570349399061f920f9786dfe04c5b12f9767a11b20f0930628b7b969
 MISC metadata.xml 374 BLAKE2B 4f62dba0b0933a47aec8c86fffefdb9a50d31fd76424e268adbb0f7f6902556366e9b71fbf2ec2b652e8114f310f15060de015f753aedea9ac727ce9a884e1ab SHA512 8241b20ba14badb91e36edb5070339dfcea6902e0f192dd1bc066698cc9c87370fbe0f16f61173e207766b84a65193f12ca3d9e1a16f467411762fbe52cc906d
diff --git a/dev-python/pretend/pretend-1.0.8-r1.ebuild b/dev-python/pretend/pretend-1.0.8-r1.ebuild
index 2b9ca91dc1eb..f7800f84636b 100644
--- a/dev-python/pretend/pretend-1.0.8-r1.ebuild
+++ b/dev-python/pretend/pretend-1.0.8-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/dev-python/pretend/pretend-1.0.9.ebuild b/dev-python/pretend/pretend-1.0.9.ebuild
index ed23e9aabdee..e35d0aa8cbbc 100644
--- a/dev-python/pretend/pretend-1.0.9.ebuild
+++ b/dev-python/pretend/pretend-1.0.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,13 +14,9 @@ SRC_URI="https://github.com/alex/pretend/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
-python_test() {
-	py.test -v || die
-}
+distutils_enable_tests pytest
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 65559b392eb1..10b94ded4823 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -7,5 +7,5 @@ DIST psycopg2-2.8.3.tar.gz 377333 BLAKE2B a4f22fb4dfc5492147bee198c587c5c5e43e19
 EBUILD psycopg-2.7.4.ebuild 1545 BLAKE2B 461a37074a888e4364091281ed7db0011c557b5f284ac0966751e24ebbaa8f6c3d0607fc779f1724435f8e0ba7793b7b61f60175fd8b3f0d00b0ea4d05135dad SHA512 a00dc8997321bfda597c46cc2e5374dbd17ccaecb6723ea1104b7295d0b8c5f7e2f59fd946b0cefe3c01ac9ee7bde6ce59657cf206fba446a58291680ded0389
 EBUILD psycopg-2.7.5.ebuild 1556 BLAKE2B 9a2702a647bddc9d957eda0b37c36c3409fbc427bf1599c39a7fdaceaae384e7602167c34184bdc57ade567f074189f687c0c8236f8d4fe0ebd81f1d67005157 SHA512 b669d9e3588773c2073d7a1f43316743a79ed7d63442fd44cd2c8c5689e4884d378b759d5db2f13db17fcd2e505b9b0b00818f8d8082afc8d7c74916c6a18ef9
 EBUILD psycopg-2.7.7.ebuild 1547 BLAKE2B ec86f180fd5f4e5603fa4e021f9a8bc9c85c11c59e95cae2ea47bc573266f51a3cadaefb141b2face451cfbd3d00c1ac65f37627e8d6c533dddd0aa3cc6d902d SHA512 62c8c136fd0d2f44b0b3dbefa038f3f30f0456fce6c1dbf4a3407a83a8ea2fad2a33ac8cdaa5a939bbfa4c128dac7149f6aedbb7d2c578f93fa744a05bdfede2
-EBUILD psycopg-2.8.3.ebuild 1557 BLAKE2B b0938a6049dd1e2bbe7520b6aab56e85d05b0a3c979a84f3ca3fed26d49baa0abdf778aee00a2bdd416c06226e9305a790fc58ae2b761e57c3bb85da6812e608 SHA512 c16759f662e0aec7da159169e89bff6d6ea65b79bd6c6b91f32a37c3a5797ed64f2a704c22b7de9b84920c478ed70414988bf0b3ad39880a48f635aff5c20674
+EBUILD psycopg-2.8.3.ebuild 1449 BLAKE2B 89bbb4af035edfb00ca49e4dcd89af487609cc15b7f66b8783ca852e77d8e02b867b2c620fba2c6ec37dc92daa386ad6d152c16d8e4160d2957a7d36da9b238d SHA512 2b6d98e137289860b36796095aaedf05c01eaf801e900641fdd32a9f5f39f8c12fd3408d8dbdd1fbc87f554ad8b1a48b96ad8023498de80471077bdceb2a44b4
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.8.3.ebuild b/dev-python/psycopg/psycopg-2.8.3.ebuild
index 1e0db88b4cae..ba4a92de80d1 100644
--- a/dev-python/psycopg/psycopg-2.8.3.ebuild
+++ b/dev-python/psycopg/psycopg-2.8.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-3+"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="debug doc examples"
+IUSE="debug doc"
 
 RDEPEND=">=dev-db/postgresql-8.1:*"
 DEPEND="${RDEPEND}
@@ -61,10 +61,5 @@ python_install_all() {
 		dodoc doc/src/_build/text/*
 	fi
 
-	if use examples ; then
-	   dodoc -r examples
-	   docompress -x /usr/share/doc/${PF}/examples
-	fi
-
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/ptyprocess/Manifest b/dev-python/ptyprocess/Manifest
index 97f5db94f761..bf7788e80342 100644
--- a/dev-python/ptyprocess/Manifest
+++ b/dev-python/ptyprocess/Manifest
@@ -1,5 +1,5 @@
 DIST ptyprocess-0.5.1.tar.gz 68474 BLAKE2B 70dc7b33fecbbce753dad3363b99b0f6e3433a8e0c9c6bd97c6c9537b071266e5a24fd80e64b5dff804706449a40b810fa5e058e159862b112b89755a3577c1d SHA512 9e7481e8e3facde73086ef0728a57516a15b6bc2a5fb6bf6d6f892c396c9376d9d6334ee37737f3469929c4086d5678a2c5deaf44d70589d41644a98f2239dad
 DIST ptyprocess-0.5.2.tar.gz 69297 BLAKE2B 5b473d0549d18d17f27ba6ff89543b66b2a6781a73c849ab1e2225b73bc3485ae36ecbf50a660bfc0abcad472062502a484de55a9ea206dcf63724c2dd765ce9 SHA512 cb4e70855d388a6ff691e2a244c072a5a50cf39cdf727e3a4218817bf5ac722c4b49f0dbfd80204259998eba137492690759b8908bfea925842b9f7fc83ee553
-EBUILD ptyprocess-0.5.1.ebuild 598 BLAKE2B 8307bd6950d3a2cd20ce7858b7094189d5ceebd55240d99c5725a612843805a59fc1e95d9184b2a70d84d620097b9b926defda5654ba10ab1039ea53821163b0 SHA512 db94fbcfa8255d3ecfdc49310e816fb3a0f960ed5333fbf6bfcfe851f1efb9812c23f6b632a9ac6cd36dc5b95ea2a2f83d8a5235fefebbcd1a3ebae72dce824f
-EBUILD ptyprocess-0.5.2.ebuild 625 BLAKE2B 62a0cc5652533d35f18ac481369240f23e15d78fb7c343bb05060bbd2a3a3c2913531b1df25e157ab3f305d578939efba8ade71b023b8387e410639f7154815b SHA512 a99055bc8be366dc109c8056c39d79e4785ef27476f908960d047873cd24dfa350fbcacaf7d9de97de3eb6c983ab888aa9fc9a8c3a716fcf30fe7deaa60e7b4e
+EBUILD ptyprocess-0.5.1.ebuild 625 BLAKE2B 78e12ef37595a03f3b4625a9b3d284a6b632e0137701f2c53cbd3343ad84b1b0103a60f12b6b07ee61235e2aa16250f66991529d38d2d427e31c431d8a722770 SHA512 1d5073717a5084ba50d21275cc50a5780c92db0fb5fda6cc20dcf85b26dc6673c48fd43d77864b4838c28aa497ef9fa5aeffc5b2ce2feccca2822d2b186b7cf0
+EBUILD ptyprocess-0.5.2.ebuild 520 BLAKE2B b1fe7ee7ffcb97a2e7d3d2764cb892e8a95c9078d413e3f5a315af024c874e4ef6aa3ba1957060f13beaaff2fe1fa27cd23563b889a1b7e9bdcd6921c153f660 SHA512 9ebfcb318fecc9379e181faf3a9fff4e70f71d167b7518c323378c9f35c715220c4d6368b0e66c9841b096fd400c68405c9c1141afb4de1b0698cc476a048b00
 MISC metadata.xml 383 BLAKE2B 03c99bb4daff695f738e75605fe765379ada90b822ded3015bd82e3e34fff7ff61699978e00dd615d2ca6684567b3d072316debbf66abb0c6f9413ff2e3ad724 SHA512 4355f5b56f756ee65c09bcc3647050e727abdd9abbee62a3f2fedf18fb97bbd523182c55ac8eb8456b0d8b7c0904372ee92cbfeed50765d6f2d608280655b05a
diff --git a/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
index 9b1893814cce..388cb5121346 100644
--- a/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="ISC"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild
index 2b61ee8cf770..3e4e1f63b237 100644
--- a/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,10 +14,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
 
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v || die "tests failed under ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index 018f24d0599b..ef8ecfbcb037 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -1,13 +1,16 @@
 AUX py-1.4.34-skip-broken-pytest3.patch 3991 BLAKE2B 4bb850c5e89d3ddc88a70c055b0e909ef26d692f721138a756b9bac6c2714c26546a89b58615d419cce72f6e205d38679724cc2ca651eeca3d759d585ba96aa2 SHA512 c2070aef37a410a0a8f9cd273396a1820170578f19fe1a8aeaf355171a7c83717aa91fd7b4121d429169a3cb496de498763cdc347f7553b799040ebce6ac76f0
 AUX py-1.5.2-skip-apiwarn-pytest31.patch 517 BLAKE2B a086d8130c1ead322461e7d89249f07e2dd9a6eee4f7e878bd8c01cf19df695a6a5698ec0cc50770f0514cbedbd2aa88e3fc356a72c78eab4b6bc378b5d1f590 SHA512 01da1bb928fe3b22a69a439481a1ebdac790811da781b7ee497ffa1b7362270628527b33f2d5dc0e83ebc2e57cdaf9fbd2974735f580931222f33e543fd69762
+AUX py-1.8.0-pytest-4.patch 21458 BLAKE2B bfc44034bc01a7ada894bbddf8989705ea96d5b455f0eb45f14f63999e73ac94dfa1eb42698e13b5867d0fadfb58c75fbe1c9cc7e40f290145552c625b938b38 SHA512 cabfdb8cd2e229bfbd5e770a145dde60f9e649f683f8e3d57d2cf393a4d246fcb0eae4596cbbee010de97bfca26470a5dd4280d0f9e34d7f30df19b09f5ea8b6
 DIST py-1.4.30.tar.gz 191796 BLAKE2B 1d908f5f29788868cb7c4da49bc8a9343176030df4549a992e06245d1d56d74ddf0477048992d282aa59e6ace1ff695a7e2c2c6f00b55f185bc91d0df8b6a6dd SHA512 dd9d92f8eaf8e5fc61bfb7feb4b07df5ae1745ebf88bcbe9d62589caa9e1f7d8beae5b2d20b407520919e47391cd50cf2d5323556fa5bd90a37e120b1d394d7a
 DIST py-1.4.34.tar.gz 194450 BLAKE2B 3e5733bb53d4f7eb8e6d43a5140f2ddf692d4272b564a9dd4fe8ede2cb4d0296e7c8764957bf4615f5cc4272d07997d126133dfce8ac8837f01d91bf557023d2 SHA512 2e19c82c8315274bffe0ba2c7e20ae3af95f942c40c16121ec953af186f8ff33e8f427c070e137bb04b7cc6dcc6779e35df3911c08595fd3294b5ec9897706e1
 DIST py-1.5.2.tar.gz 189542 BLAKE2B f0c5995121492ebca7bab9e73b7db61edf014be8e7d76822c72ded9ea19dd647dc0a83cbbcbf732c4ddae9070126cecb00958b623ca43d2219b7be8519b5b58e SHA512 ad92110d56caba2be44c6759350b05ceb882165ad0f58e6cce8361273be874b20b01856d685b142a83edff77b41bcce2911cf5797db5253b4f3e9b36e703c07d
 DIST py-1.5.3.tar.gz 202335 BLAKE2B 6a7ef206bddd641cb5e2fe04966ae93db96a7ff757fcde604f8fd2d36c4a03ce5955c2f445a866dd5cd83026ab2a9fa17feeb0da0df3d40d9746c19d865f6325 SHA512 243c0da94c439163257c525ef00b30fd6d8add5897121ee0b1f19476b50f18823ce2b99a5ab27a9cf47598b538758d0534060123dce0820d2a65d98046548c96
 DIST py-1.5.4.tar.gz 201448 BLAKE2B 3d9f71ba53c8004d4745be984e0a3b81c98f38fdcd7703c39286c53bb167a803aa92b3b0897e407f6ee98d2b870838a27b507ad8e6cceab7b22c8e7229bb6581 SHA512 45424b133be3e78ccab48e74daa6ca6a76fca283bd3a51d50c91e911c509a2c45de4fcc7c8c15f33620d61ee16dfc3969fdd78d8839e96f52897e97b1ad624c4
-EBUILD py-1.4.30.ebuild 1247 BLAKE2B 76d9514fd6e23471a8231983c8bb5b7f634179345763067999426e8f24ba25bcf5eb3d0a84a18a322c44aeb3da3ddc9982e3b29c5cdda8376faeec1a7b6e9cbb SHA512 84cc2a3c9b76fd19be0cf03f333fbee31b14bcb0ac69367e634e873276dc4ebc9fe12c071bf90c9a711d71da0dfd3dae6fd008a661abd710d31900409e7eb71d
-EBUILD py-1.4.34.ebuild 1315 BLAKE2B ecfd6a79bca44f8910d0ad75bcc9525d903437963c828bf44746843896527941e4c00d5e0a13a1aeae847340075b387733549878607b560509e0c4237bf4a7a2 SHA512 6f08f7408c9f7c76b11ba7faf382fc1265f7e26cf226d2ce9afa7312f04d8201a9946505dd486e89ebd0da36071dbdef3c87c7379a60c754ffb747feb3c1c558
-EBUILD py-1.5.2.ebuild 1320 BLAKE2B e25f535c7bb53371a3690be26908562a26517f648af32382fd6e71d295ffa4b6ee7c79f5824363a8f11df6643759c66515708d7da483e4be45659b4525666e93 SHA512 82bf96cb7a9ae2748714adf523fde21ec5e847f0b02a0b90b5862e98ea6100af6cf0e30b6403f144042dab418097a4b849ce1c813d50d26b85c6c1cbbf6af4cd
-EBUILD py-1.5.3.ebuild 1329 BLAKE2B ed56cebaa28619c202b1fbc38bb08252982b0cac731da02f01496c2eb9aa403f7cc02df15b28fe8cb0e1d80147b8b5a93f53f573b885814397eb731baaac2736 SHA512 20ed16aa009735f9c543aa3ea12183906774bf292bbcbbc99187e0260ddba41612f8032cb4f82100e884c840628ebf649b29a1affa01f5bfd1b08b560871d550
-EBUILD py-1.5.4.ebuild 1419 BLAKE2B 254ddbf014a4e4ceaaf0c0b8ea5fdb6b5b01dd6bcbec304804998c7578978754f501cc322d51a8e2a4f34c4fa74901c9e1aa659ce1a343848ac72c6412dcd342 SHA512 ba35f68eb64c0b53cbb2573b4d424fb2498a202895a284a044d08c9334d2c0dfe24b3df1c7471fad241495f9869ae15497eb4887cef9490ecdf878b9ecfd31c3
+DIST py-1.8.0.tar.gz 205096 BLAKE2B e08554fc3e0bae2e2d4515f075991707af29aa5c39e1387e8f8a7dab25e78c7340d389c79936ddea27b1fb0438ebdee8b5e218bbb48c62089d7fb656b1b6dbe8 SHA512 37b9a66229b834a034d9ba6769a46addf098380b494c1eb863607a52d00b7ec5b9157dd7ac6ffc52535a05006648c775c78716d7f85cf44966065b225be6e95b
+EBUILD py-1.4.30.ebuild 1274 BLAKE2B c7341c3f4d7cfded91f44af7d0fd3fc500b57f80b030e68d3babec8fdcb2d53f9ba79937dd4ea65b63efa0786cbaf15911819a4927e31ce1959ea04c38e5c986 SHA512 71f53b56b4774a70c41ee64f60082db143163ee345a4e44384da085baa411e23a242342ba88bfd23938b61fc1d7ca784bace2420da43134449869bda1d853caf
+EBUILD py-1.4.34.ebuild 1342 BLAKE2B 19982fe33c68c6045c70453f63e38364ba705bcd9137aa4fc5633dde43ddd97ecbc859d1957b466e499f656c8f35e5cea1a7c62d4ccb39865ead7c49c53f5832 SHA512 9adb3eaf529960d588de30b30f6cbf3b2512ababba3f4824169465c9ea7ec6a49841b9892a4252355f9693f1ac4864aa9e23226a3c8642bd8fe535f77bf6548a
+EBUILD py-1.5.2.ebuild 1347 BLAKE2B c928c85c5a4d959faf05dd48eff670d464794582fd463ab8eeefa5b2fe854e71f50729822711e8163891c7b167ff775aab5076b500ce516c5c5bb4cfdfc2689c SHA512 cf264f905453cc1e06dda9203d2b233a386cdd1909aa665a0ec1948d4111badc29f5f835a755f0dd38c2b3f984764abe79d421d29556a9aafb80cd9c97bc28f1
+EBUILD py-1.5.3.ebuild 1356 BLAKE2B d74458f2c0d1723566b536c41c47bacaed293b2089a1f738e6dcb022f0aa96518f62e2ba1aeb00b6d38b8ef337b0fb06ed04998b3518953f2f0fa7068772ae93 SHA512 7d6b28bb3b9ff871e18b9e1dd230077309479daddd79602dc63a442ef61caaad0701c34681a8cb36b0ac92eaf31ca5954f758d16e29db291843f53efb0b00286
+EBUILD py-1.5.4.ebuild 1446 BLAKE2B 17ef105867edca750d188a3e6c61ee2c00bf3212702abce41ffde6c3375b0fd1fc813a445555529eda4388b87aff5ebf469f395bea598e5ef9376e0f180b3fcd SHA512 5c5ed11dfcdf9ab023253975b8f622f4123fffbad9d54566bf2d8062d14ad8879eebf1080009f93dc1cd71fed8fc687ba6dbe82d80c258c4a3fdda3a934582f6
+EBUILD py-1.8.0.ebuild 1450 BLAKE2B ca2956a47c4b9e125e9d6f844085ca48a2ea179e6b29a2b70be56ff519e439a9ca6d0bd8c593f5be87ed61e998b211ef73ec15fed66036894670451ac4cde95c SHA512 e117a4c6e36b6cc8baea7fb06685069495b35c7cab341eab1fefd22ecbf61d0c059bd3b1fff815d6564bcaacab45266c61a855355c98aab33c94c10931d050ac
 MISC metadata.xml 315 BLAKE2B 3154c92be7826e4b562d5172b792f652ede8fff96b3fd3abebea5d6107eca432718bd0c8be7934a9f90a34891ce6e9b74d02c82881976cc86ed9635a0457b2da SHA512 e2ede56189d791c18b64d1db6615249e6ae5a3afd31f17b9ae6d23e9123d4c68a22bc61b7935deb284d2fa7e6732679e2286a271854dc818e7f651e9daa54fbe
diff --git a/dev-python/py/files/py-1.8.0-pytest-4.patch b/dev-python/py/files/py-1.8.0-pytest-4.patch
new file mode 100644
index 000000000000..d9d5cfa5b650
--- /dev/null
+++ b/dev-python/py/files/py-1.8.0-pytest-4.patch
@@ -0,0 +1,580 @@
+From f4ed62ad39f289d09b3efdfed7305f935ce60bfc Mon Sep 17 00:00:00 2001
+From: Stanislav Levin <slev@altlinux.org>
+Date: Tue, 4 Jun 2019 14:33:36 +0300
+Subject: [PATCH] Fix Pytest4.x compatibility errors
+
+This patch should fix such errors/warnings as:
+
+- raises / warns with a string as the second argument
+Deprecated since version 4.1.
+
+- pytest_funcarg__ prefix
+Removed in version 4.0.
+
+- getfuncargvalue
+
+- Metafunc.addcall
+Removed in version 4.0.
+
+Fixes: https://github.com/pytest-dev/py/issues/209
+Signed-off-by: Stanislav Levin <slev@altlinux.org>
+---
+ doc/faq.txt                                  | 14 -------------
+ testing/code/test_assertion.py               |  9 +++------
+ testing/code/test_code.py                    |  3 ++-
+ testing/code/test_excinfo.py                 | 12 ++++++-----
+ testing/code/test_source.py                  | 18 ++++++++---------
+ testing/io_/test_capture.py                  | 15 +++++++++-----
+ testing/io_/test_terminalwriter.py           | 17 ++++++++--------
+ testing/io_/test_terminalwriter_linewidth.py |  6 ++++++
+ testing/log/test_log.py                      |  6 ++++--
+ testing/path/common.py                       |  7 ++++---
+ testing/path/conftest.py                     | 16 +++++++--------
+ testing/path/test_cacheutil.py               |  6 ++++--
+ testing/path/test_svnauth.py                 |  6 ++++--
+ testing/path/test_svnurl.py                  | 21 +++++++++++++-------
+ testing/path/test_svnwc.py                   | 17 ++++++++++------
+ testing/root/test_builtin.py                 |  6 ++++--
+ testing/root/test_std.py                     |  3 ++-
+ 17 files changed, 100 insertions(+), 82 deletions(-)
+
+diff --git a/doc/faq.txt b/doc/faq.txt
+index 52cb4b3f..cac83b2c 100644
+--- a/doc/faq.txt
++++ b/doc/faq.txt
+@@ -98,20 +98,6 @@ in a managed class/module/function scope.
+ .. _`xUnit style setup`: test/xunit_setup.html
+ .. _`pytest_nose`: test/plugin/nose.html
+ 
+-.. _`why pytest_pyfuncarg__ methods?`:
+-
+-Why the ``pytest_funcarg__*`` name for funcarg factories?
+----------------------------------------------------------------
+-
+-When experimenting with funcargs an explicit registration mechanism
+-was considered.  But lacking a good use case for this indirection and
+-flexibility we decided to go for `Convention over Configuration`_ and
+-allow to directly specify the factory.  Besides removing the need
+-for an indirection it allows to "grep" for ``pytest_funcarg__MYARG``
+-and will safely find all factory functions for the ``MYARG`` function
+-argument.  It helps to alleviate the de-coupling of function
+-argument usage and creation.
+-
+ .. _`Convention over Configuration`: http://en.wikipedia.org/wiki/Convention_over_Configuration
+ 
+ Can I yield multiple values from a factory function?
+diff --git a/testing/code/test_assertion.py b/testing/code/test_assertion.py
+index e2a7f903..4cb39fe2 100644
+--- a/testing/code/test_assertion.py
++++ b/testing/code/test_assertion.py
+@@ -18,15 +18,12 @@ def test_assert():
+ 
+ 
+ def test_assert_within_finally():
+-    excinfo = py.test.raises(ZeroDivisionError, """
++    with py.test.raises(ZeroDivisionError,
++                        match=".*division.* by zero"):
+         try:
+-            1/0
++            1 / 0
+         finally:
+             i = 42
+-    """)
+-    s = excinfo.exconly()
+-    assert re.search("ZeroDivisionError:.*division", s) is not None
+-
+ 
+ def test_assert_multiline_1():
+     try:
+diff --git a/testing/code/test_code.py b/testing/code/test_code.py
+index 28ec628b..65328bb7 100644
+--- a/testing/code/test_code.py
++++ b/testing/code/test_code.py
+@@ -18,7 +18,8 @@ def test_code_gives_back_name_for_not_existing_file():
+ def test_code_with_class():
+     class A:
+         pass
+-    py.test.raises(TypeError, "py.code.Code(A)")
++    with py.test.raises(TypeError):
++        py.code.Code(A)
+ 
+ if True:
+     def x():
+diff --git a/testing/code/test_excinfo.py b/testing/code/test_excinfo.py
+index c148ab8c..05ec3d9c 100644
+--- a/testing/code/test_excinfo.py
++++ b/testing/code/test_excinfo.py
+@@ -145,7 +145,8 @@ def test_traceback_cut(self):
+ 
+     def test_traceback_cut_excludepath(self, testdir):
+         p = testdir.makepyfile("def f(): raise ValueError")
+-        excinfo = py.test.raises(ValueError, "p.pyimport().f()")
++        with py.test.raises(ValueError) as excinfo:
++            p.pyimport().f()
+         basedir = py.path.local(py.test.__file__).dirpath()
+         newtraceback = excinfo.traceback.cut(excludepath=basedir)
+         for x in newtraceback:
+@@ -273,8 +274,8 @@ def test_tbentry_reinterpret():
+ def test_excinfo_exconly():
+     excinfo = py.test.raises(ValueError, h)
+     assert excinfo.exconly().startswith('ValueError')
+-    excinfo = py.test.raises(ValueError,
+-        "raise ValueError('hello\\nworld')")
++    with py.test.raises(ValueError) as excinfo:
++        raise ValueError('hello\\nworld')
+     msg = excinfo.exconly(tryshort=True)
+     assert msg.startswith('ValueError')
+     assert msg.endswith("world")
+@@ -350,10 +351,11 @@ def test_codepath_Queue_example():
+ 
+ 
+ class TestFormattedExcinfo:
+-    def pytest_funcarg__importasmod(self, request):
++    @pytest.fixture
++    def importasmod(self, request):
+         def importasmod(source):
+             source = py.code.Source(source)
+-            tmpdir = request.getfuncargvalue("tmpdir")
++            tmpdir = request.getfixturevalue("tmpdir")
+             modpath = tmpdir.join("mod.py")
+             tmpdir.ensure("__init__.py")
+             modpath.write(source)
+diff --git a/testing/code/test_source.py b/testing/code/test_source.py
+index 3492761a..676dcb0a 100644
+--- a/testing/code/test_source.py
++++ b/testing/code/test_source.py
+@@ -272,7 +272,8 @@ def test_compile_and_getsource(self):
+         co = self.source.compile()
+         py.builtin.exec_(co, globals())
+         f(7)
+-        excinfo = py.test.raises(AssertionError, "f(6)")
++        with py.test.raises(AssertionError) as excinfo:
++            f(6)
+         frame = excinfo.traceback[-1].frame
+         stmt = frame.code.fullsource.getstatement(frame.lineno)
+         #print "block", str(block)
+@@ -326,14 +327,13 @@ def __init__(self, *args):
+ 
+ def test_getline_finally():
+     def c(): pass
+-    excinfo = py.test.raises(TypeError, """
+-           teardown = None
+-           try:
+-                c(1)
+-           finally:
+-                if teardown:
+-                    teardown()
+-    """)
++    with py.test.raises(TypeError) as excinfo:
++       teardown = None
++       try:
++            c(1)
++       finally:
++            if teardown:
++                teardown()
+     source = excinfo.traceback[-1].statement
+     assert str(source).strip() == 'c(1)'
+ 
+diff --git a/testing/io_/test_capture.py b/testing/io_/test_capture.py
+index b5fedd0a..652c8b7f 100644
+--- a/testing/io_/test_capture.py
++++ b/testing/io_/test_capture.py
+@@ -1,6 +1,7 @@
+ from __future__ import with_statement
+ 
+ import os, sys
++import pytest
+ import py
+ 
+ needsdup = py.test.mark.skipif("not hasattr(os, 'dup')")
+@@ -45,7 +46,8 @@ def test_unicode_and_str_mixture(self):
+         f = py.io.TextIO()
+         if sys.version_info >= (3,0):
+             f.write("\u00f6")
+-            py.test.raises(TypeError, "f.write(bytes('hello', 'UTF-8'))")
++            with py.test.raises(TypeError):
++                f.write(bytes('hello', 'UTF-8'))
+         else:
+             f.write(unicode("\u00f6", 'UTF-8'))
+             f.write("hello") # bytes
+@@ -56,7 +58,8 @@ def test_unicode_and_str_mixture(self):
+ def test_bytes_io():
+     f = py.io.BytesIO()
+     f.write(tobytes("hello"))
+-    py.test.raises(TypeError, "f.write(totext('hello'))")
++    with py.test.raises(TypeError):
++        f.write(totext('hello'))
+     s = f.getvalue()
+     assert s == tobytes("hello")
+ 
+@@ -70,8 +73,9 @@ def test_dontreadfrominput():
+     py.test.raises(ValueError, f.fileno)
+     f.close() # just for completeness
+ 
+-def pytest_funcarg__tmpfile(request):
+-    testdir = request.getfuncargvalue("testdir")
++@pytest.fixture
++def tmpfile(request):
++    testdir = request.getfixturevalue("testdir")
+     f = testdir.makepyfile("").open('wb+')
+     request.addfinalizer(f.close)
+     return f
+@@ -315,7 +319,8 @@ def test_stdin_nulled_by_default(self):
+         print ("XXX which indicates an error in the underlying capturing")
+         print ("XXX mechanisms")
+         cap = self.getcapture()
+-        py.test.raises(IOError, "sys.stdin.read()")
++        with py.test.raises(IOError):
++            sys.stdin.read()
+         out, err = cap.reset()
+ 
+     def test_suspend_resume(self):
+diff --git a/testing/io_/test_terminalwriter.py b/testing/io_/test_terminalwriter.py
+index 1eef7f7d..2953dfff 100644
+--- a/testing/io_/test_terminalwriter.py
++++ b/testing/io_/test_terminalwriter.py
+@@ -107,14 +107,11 @@ def test_unicode_on_file_with_ascii_encoding(tmpdir, monkeypatch, encoding):
+ 
+ win32 = int(sys.platform == "win32")
+ class TestTerminalWriter:
+-    def pytest_generate_tests(self, metafunc):
+-        if "tw" in metafunc.funcargnames:
+-            metafunc.addcall(id="path", param="path")
+-            metafunc.addcall(id="stringio", param="stringio")
+-            metafunc.addcall(id="callable", param="callable")
+-    def pytest_funcarg__tw(self, request):
++
++    @pytest.fixture(params=["path", "stringio", "callable"])
++    def tw(self, request):
+         if request.param == "path":
+-            tmpdir = request.getfuncargvalue("tmpdir")
++            tmpdir = request.getfixturevalue("tmpdir")
+             p = tmpdir.join("tmpfile")
+             f = codecs.open(str(p), 'w+', encoding='utf8')
+             tw = py.io.TerminalWriter(f)
+@@ -182,8 +179,10 @@ def test_markup(self, tw):
+             for color in ("red", "green"):
+                 text2 = tw.markup("hello", **{color: True, 'bold': bold})
+                 assert text2.find("hello") != -1
+-        py.test.raises(ValueError, "tw.markup('x', wronkw=3)")
+-        py.test.raises(ValueError, "tw.markup('x', wronkw=0)")
++        with py.test.raises(ValueError):
++            tw.markup('x', wronkw=3)
++        with py.test.raises(ValueError):
++            tw.markup('x', wronkw=0)
+ 
+     def test_line_write_markup(self, tw):
+         tw.hasmarkup = True
+diff --git a/testing/io_/test_terminalwriter_linewidth.py b/testing/io_/test_terminalwriter_linewidth.py
+index e6d84fbf..1fe2810e 100644
+--- a/testing/io_/test_terminalwriter_linewidth.py
++++ b/testing/io_/test_terminalwriter_linewidth.py
+@@ -1,6 +1,8 @@
+ # coding: utf-8
+ from __future__ import unicode_literals
+ 
++import pytest
++
+ from py._io.terminalwriter import TerminalWriter
+ 
+ 
+@@ -31,6 +33,10 @@ def test_terminal_writer_line_width_update_with_wide_text():
+     assert tw.width_of_current_line == 21  # 5*2 + 1 + 5*2
+ 
+ 
++@pytest.mark.skipif(
++    'sys.version_info > (3,)',
++    reason='Bytes are not accepted'
++           ' https://github.com/pytest-dev/pytest/issues/4861')
+ def test_terminal_writer_line_width_update_with_wide_bytes():
+     tw = TerminalWriter()
+     tw.write('乇乂ㄒ尺卂 ㄒ卄丨匚匚'.encode('utf-8'))
+diff --git a/testing/log/test_log.py b/testing/log/test_log.py
+index 5c706d9b..ebf12705 100644
+--- a/testing/log/test_log.py
++++ b/testing/log/test_log.py
+@@ -89,8 +89,10 @@ def test_simple_consumer_match_2(self):
+ 
+     def test_no_auto_producer(self):
+         p = py.log.Producer('x')
+-        py.test.raises(AttributeError, "p._x")
+-        py.test.raises(AttributeError, "p.x_y")
++        with py.test.raises(AttributeError):
++            p._x
++        with py.test.raises(AttributeError):
++            p.x_y
+ 
+     def test_setconsumer_with_producer(self):
+         l = []
+diff --git a/testing/path/common.py b/testing/path/common.py
+index d69a1c39..14558222 100644
+--- a/testing/path/common.py
++++ b/testing/path/common.py
+@@ -155,8 +155,8 @@ def test_listdir(self, path1):
+         l = path1.listdir()
+         assert path1.join('sampledir') in l
+         assert path1.join('samplefile') in l
+-        py.test.raises(py.error.ENOTDIR,
+-                       "path1.join('samplefile').listdir()")
++        with py.test.raises(py.error.ENOTDIR):
++            path1.join('samplefile').listdir()
+ 
+     def test_listdir_fnmatchstring(self, path1):
+         l = path1.listdir('s*dir')
+@@ -300,7 +300,8 @@ def test_mtime(self, path1):
+         assert url.mtime() > 0
+ 
+     def test_relto_wrong_type(self, path1):
+-        py.test.raises(TypeError, "path1.relto(42)")
++        with py.test.raises(TypeError):
++            path1.relto(42)
+ 
+     def test_load(self, path1):
+         p = path1.join('samplepickle')
+diff --git a/testing/path/conftest.py b/testing/path/conftest.py
+index 84fb5c82..015bd039 100644
+--- a/testing/path/conftest.py
++++ b/testing/path/conftest.py
+@@ -1,20 +1,19 @@
+ import py
+ import sys
++import pytest
+ from py._path import svnwc as svncommon
+ 
+ svnbin = py.path.local.sysfind('svn')
+ repodump = py.path.local(__file__).dirpath('repotest.dump')
+ from py.builtin import print_
+ 
+-def pytest_funcarg__repowc1(request):
++@pytest.fixture
++def repowc1(request):
+     if svnbin is None:
+         py.test.skip("svn binary not found")
+ 
+-    tmpdir = request.getfuncargvalue("tmpdir")
+-    repo, repourl, wc = request.cached_setup(
+-        setup=lambda: getrepowc(tmpdir, "path1repo", "path1wc"),
+-        scope="module",
+-    )
++    tmpdir = request.getfixturevalue("tmpdir")
++    repo, repourl, wc = getrepowc(tmpdir, "path1repo", "path1wc")
+     for x in ('test_remove', 'test_move', 'test_status_deleted'):
+         if request.function.__name__.startswith(x):
+             #print >>sys.stderr, ("saving repo", repo, "for", request.function)
+@@ -22,8 +21,9 @@ def pytest_funcarg__repowc1(request):
+             request.addfinalizer(lambda: restore_repowc(_savedrepowc))
+     return repo, repourl, wc
+ 
+-def pytest_funcarg__repowc2(request):
+-    tmpdir = request.getfuncargvalue("tmpdir")
++@pytest.fixture
++def repowc2(request):
++    tmpdir = request.getfixturevalue("tmpdir")
+     name = request.function.__name__
+     repo, url, wc = getrepowc(tmpdir, "%s-repo-2" % name, "%s-wc-2" % name)
+     return repo, url, wc
+diff --git a/testing/path/test_cacheutil.py b/testing/path/test_cacheutil.py
+index c9fc0746..76023a04 100644
+--- a/testing/path/test_cacheutil.py
++++ b/testing/path/test_cacheutil.py
+@@ -12,12 +12,14 @@ def test_getorbuild(self):
+         assert val == 42
+ 
+     def test_cache_get_key_error(self):
+-        pytest.raises(KeyError, "self.cache._getentry(-23)")
++        with pytest.raises(KeyError):
++            self.cache._getentry(-23)
+ 
+     def test_delentry_non_raising(self):
+         self.cache.getorbuild(100, lambda: 100)
+         self.cache.delentry(100)
+-        pytest.raises(KeyError, "self.cache._getentry(100)")
++        with pytest.raises(KeyError):
++            self.cache._getentry(100)
+ 
+     def test_delentry_raising(self):
+         self.cache.getorbuild(100, lambda: 100)
+diff --git a/testing/path/test_svnauth.py b/testing/path/test_svnauth.py
+index 654f0332..d24028dd 100644
+--- a/testing/path/test_svnauth.py
++++ b/testing/path/test_svnauth.py
+@@ -2,6 +2,7 @@
+ from py.path import SvnAuth
+ import time
+ import sys
++import pytest
+ 
+ svnbin = py.path.local.sysfind('svn')
+ 
+@@ -261,7 +262,8 @@ def test_propget(self):
+         u.propget('foo')
+         assert '--username="foo" --password="bar"' in u.commands[0]
+ 
+-def pytest_funcarg__setup(request):
++@pytest.fixture
++def setup(request):
+     return Setup(request)
+ 
+ class Setup:
+@@ -271,7 +273,7 @@ def __init__(self, request):
+         if not request.config.option.runslowtests:
+             py.test.skip('use --runslowtests to run these tests')
+ 
+-        tmpdir = request.getfuncargvalue("tmpdir")
++        tmpdir = request.getfixturevalue("tmpdir")
+         repodir = tmpdir.join("repo")
+         py.process.cmdexec('svnadmin create %s' % repodir)
+         if sys.platform == 'win32':
+diff --git a/testing/path/test_svnurl.py b/testing/path/test_svnurl.py
+index 15fbea50..7cea4f2b 100644
+--- a/testing/path/test_svnurl.py
++++ b/testing/path/test_svnurl.py
+@@ -2,10 +2,12 @@
+ from py._path.svnurl import InfoSvnCommand
+ import datetime
+ import time
++import pytest
+ from svntestbase import CommonSvnTests
+ 
+-def pytest_funcarg__path1(request):
+-    repo, repourl, wc = request.getfuncargvalue("repowc1")
++@pytest.fixture
++def path1(request):
++    repo, repourl, wc = request.getfixturevalue("repowc1")
+     return py.path.svnurl(repourl)
+ 
+ class TestSvnURLCommandPath(CommonSvnTests):
+@@ -20,10 +22,12 @@ def test_visit_ignore(self, path1):
+         super(TestSvnURLCommandPath, self).test_visit_ignore(path1)
+ 
+     def test_svnurl_needs_arg(self, path1):
+-        py.test.raises(TypeError, "py.path.svnurl()")
++        with py.test.raises(TypeError):
++            py.path.svnurl()
+ 
+     def test_svnurl_does_not_accept_None_either(self, path1):
+-        py.test.raises(Exception, "py.path.svnurl(None)")
++        with py.test.raises(Exception):
++            py.path.svnurl(None)
+ 
+     def test_svnurl_characters_simple(self, path1):
+         py.path.svnurl("svn+ssh://hello/world")
+@@ -32,7 +36,8 @@ def test_svnurl_characters_at_user(self, path1):
+         py.path.svnurl("http://user@host.com/some/dir")
+ 
+     def test_svnurl_characters_at_path(self, path1):
+-        py.test.raises(ValueError, 'py.path.svnurl("http://host.com/foo@bar")')
++        with py.test.raises(ValueError):
++            py.path.svnurl("http://host.com/foo@bar")
+ 
+     def test_svnurl_characters_colon_port(self, path1):
+         py.path.svnurl("http://host.com:8080/some/dir")
+@@ -45,7 +50,8 @@ def test_svnurl_characters_colon_path(self, path1):
+         # colons are allowed on win32, because they're part of the drive
+         # part of an absolute path... however, they shouldn't be allowed in
+         # other parts, I think
+-        py.test.raises(ValueError, 'py.path.svnurl("http://host.com/foo:bar")')
++        with py.test.raises(ValueError):
++            py.path.svnurl("http://host.com/foo:bar")
+ 
+     def test_export(self, path1, tmpdir):
+         tmpdir = tmpdir.join("empty")
+@@ -92,4 +98,5 @@ def test_svn_1_3_b(self):
+         assert info.kind == 'dir'
+ 
+ def test_badchars():
+-    py.test.raises(ValueError, "py.path.svnurl('http://host/tmp/@@@:')")
++    with py.test.raises(ValueError):
++        py.path.svnurl('http://host/tmp/@@@:')
+diff --git a/testing/path/test_svnwc.py b/testing/path/test_svnwc.py
+index c643d998..25a3650c 100644
+--- a/testing/path/test_svnwc.py
++++ b/testing/path/test_svnwc.py
+@@ -30,8 +30,9 @@ def test_make_repo(path1, tmpdir):
+     rev = wc.commit()
+     assert rev is None
+ 
+-def pytest_funcarg__path1(request):
+-    repo, repourl, wc = request.getfuncargvalue("repowc1")
++@pytest.fixture
++def path1(request):
++    repo, repourl, wc = request.getfixturevalue("repowc1")
+     return wc
+ 
+ class TestWCSvnCommandPath(CommonSvnTests):
+@@ -346,7 +347,8 @@ def test_lock_unlock(self, path1):
+         somefile = root.join('somefile')
+         somefile.ensure(file=True)
+         # not yet added to repo
+-        py.test.raises(Exception, 'somefile.lock()')
++        with py.test.raises(Exception):
++            somefile.lock()
+         somefile.write('foo')
+         somefile.commit('test')
+         assert somefile.check(versioned=True)
+@@ -357,13 +359,15 @@ def test_lock_unlock(self, path1):
+             assert locked[0].basename == somefile.basename
+             assert locked[0].dirpath().basename == somefile.dirpath().basename
+             #assert somefile.locked()
+-            py.test.raises(Exception, 'somefile.lock()')
++            with py.test.raises(Exception):
++                somefile.lock()
+         finally:
+             somefile.unlock()
+         #assert not somefile.locked()
+         locked = root.status().locked
+         assert locked == []
+-        py.test.raises(Exception, 'somefile,unlock()')
++        with py.test.raises(Exception):
++            somefile,unlock()
+         somefile.remove()
+ 
+     def test_commit_nonrecursive(self, path1):
+@@ -481,7 +485,8 @@ def test_svn_1_3(self, path1):
+ 
+ 
+ def test_characters_at():
+-    py.test.raises(ValueError, "py.path.svnwc('/tmp/@@@:')")
++    with py.test.raises(ValueError):
++        py.path.svnwc('/tmp/@@@:')
+ 
+ def test_characters_tilde():
+     py.path.svnwc('/tmp/test~')
+diff --git a/testing/root/test_builtin.py b/testing/root/test_builtin.py
+index 287c60d5..b2881de4 100644
+--- a/testing/root/test_builtin.py
++++ b/testing/root/test_builtin.py
+@@ -56,7 +56,8 @@ def test_frozenset():
+ 
+ def test_print_simple():
+     from py.builtin import print_
+-    py.test.raises(TypeError, "print_(hello=3)")
++    with py.test.raises(TypeError):
++        print_(hello=3)
+     f = py.io.TextIO()
+     print_("hello", "world", file=f)
+     s = f.getvalue()
+@@ -133,7 +134,8 @@ def test_reraise():
+         raise Exception()
+     except Exception:
+         cls, val, tb = sys.exc_info()
+-    excinfo = py.test.raises(Exception, "_reraise(cls, val, tb)")
++    with py.test.raises(Exception):
++        _reraise(cls, val, tb)
+ 
+ def test_exec():
+     l = []
+diff --git a/testing/root/test_std.py b/testing/root/test_std.py
+index 143556a0..dca0c671 100644
+--- a/testing/root/test_std.py
++++ b/testing/root/test_std.py
+@@ -6,7 +6,8 @@ def test_os():
+     assert py.std.os is os
+ 
+ def test_import_error_converts_to_attributeerror():
+-    py.test.raises(AttributeError, "py.std.xyzalskdj")
++    with py.test.raises(AttributeError):
++        py.std.xyzalskdj
+ 
+ def test_std_gets_it():
+     for x in py.std.sys.modules:
diff --git a/dev-python/py/py-1.4.30.ebuild b/dev-python/py/py-1.4.30.ebuild
index 88d58a1a2784..fdd19dd3a783 100644
--- a/dev-python/py/py-1.4.30.ebuild
+++ b/dev-python/py/py-1.4.30.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="
diff --git a/dev-python/py/py-1.4.34.ebuild b/dev-python/py/py-1.4.34.ebuild
index 9125d9d3656f..38d4468a7379 100644
--- a/dev-python/py/py-1.4.34.ebuild
+++ b/dev-python/py/py-1.4.34.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="
diff --git a/dev-python/py/py-1.5.2.ebuild b/dev-python/py/py-1.5.2.ebuild
index 8dde250f65a2..fd462b5070b3 100644
--- a/dev-python/py/py-1.5.2.ebuild
+++ b/dev-python/py/py-1.5.2.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="
diff --git a/dev-python/py/py-1.5.3.ebuild b/dev-python/py/py-1.5.3.ebuild
index 7ba6e0b70e2c..ed2578eea296 100644
--- a/dev-python/py/py-1.5.3.ebuild
+++ b/dev-python/py/py-1.5.3.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="
diff --git a/dev-python/py/py-1.5.4.ebuild b/dev-python/py/py-1.5.4.ebuild
index cff4ffad8de1..3348c423dac4 100644
--- a/dev-python/py/py-1.5.4.ebuild
+++ b/dev-python/py/py-1.5.4.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="
diff --git a/dev-python/py/py-1.8.0.ebuild b/dev-python/py/py-1.8.0.ebuild
new file mode 100644
index 000000000000..4e22b868c12a
--- /dev/null
+++ b/dev-python/py/py-1.8.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
+HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.2-skip-apiwarn-pytest31.patch
+	"${FILESDIR}"/${P}-pytest-4.patch
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+
+	# broken, and relying on exact assertion strings
+	rm testing/code/test_assertion.py || die
+	# broken on py3.8, don't seem important
+	sed -i -e 's:test_syntaxerror_rerepresentation:_&:' \
+		-e 's:test_comments:_&:' \
+		testing/code/test_source.py || die
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index 009780ecb572..fd15459e237d 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -8,6 +8,6 @@ EBUILD pyasn1-modules-0.0.10.ebuild 887 BLAKE2B 1d7edc96024f2ae83e5637b5f260226d
 EBUILD pyasn1-modules-0.0.5-r1.ebuild 903 BLAKE2B 7efd0f1c7e8b079b0a3537fa76dc85eb11558274daf50251ffa931a8f2c346243048419e5f42cfbe7f8e129e9f60b33344f6428c7e1a32e0d40c37d5becaac99 SHA512 5ba719dc26acf82a43e7ab7f409c15384c455eaf9b01386b076b49a3f9a6bd68fef3c8ba5dbc3c7843817c1c900f4d077ed9dc67bca1c232a1ca000e46e34e21
 EBUILD pyasn1-modules-0.0.8.ebuild 877 BLAKE2B 25aa50598172a743b2edd804b5843ccb1e61c78099162c7deb7720af6d03d739ec27152f2eaa61d35f3dadeabe6de46324538c62eff9a101b05eb43da9064886 SHA512 3407c38060705dc9c0f6d34d7857ca9aa91203a09f43f93212dc05c1d2b81c8a9e705f948f99b9b6ec6cb9bb182a879df46a04abb94b93416375e895fcfbb074
 EBUILD pyasn1-modules-0.1.4.ebuild 887 BLAKE2B 1d7edc96024f2ae83e5637b5f260226d38f2d0e657a583853bfcf621d6ddb2f70040eccdbd98c5d299874aa7b462562dc8f01527af090ddfdfede4c727a31bed SHA512 96243cf112b6752aa3eae0384b6d75ca33f90280f9aae4617d0c3bcc9a801225d87f98aa0dc6c596c9233b8a662488fc6bc84c7640bc19cc6f486f089380f5e2
-EBUILD pyasn1-modules-0.1.5.ebuild 795 BLAKE2B 5110f9d8a67a155070bcefc5d406721fea3c257fb02c2bf674ce3aaf5062b198a6ce294cc8bcdf0ba63ffc07c4f0477e6ee4f2308951e8bd3e2a27a2a52ff0dd SHA512 bc88c6581c3237bd8d35ebf4a981af1bd0dda7c01c1b990f27359da47a6bc3b76e81c8a1a1cbdd5c76a490e1c8ee8d4631cbb554567fd4c5a5e49baa41df506c
-EBUILD pyasn1-modules-0.2.1.ebuild 799 BLAKE2B f33d741165a39dec04d6e503944473b5286feee5a0ce87ab74affb6bf026f3f2f9926f5fc4f7c57a1d4a056bca768710dbb6dad9e947284e1953e0e07f0a8e6a SHA512 dfec2cd65e29134abea790e47ed2ca556d2401cc575e473f00822fe498ff339b62dbc7d5c560a45087a5ddeb8d53fdb788a3e47d7d135e375cac181399691dfc
+EBUILD pyasn1-modules-0.1.5.ebuild 822 BLAKE2B b0cb474f06d9ae93fd8a5879f44d7c55154b9fff61e33b1c84ba50b9729ddbed7787c8caf7a8512f9c98a0978bb149c7482979f058f644b0832586aec07e4302 SHA512 c19487d9882235cde9b7a849d1cd8a4aa2f1bf461321136c52ed25d0c466b0490612d59c25c154a1a57e3cd28d729eeccd34f9b37057e02ee6dd45d7bb38365e
+EBUILD pyasn1-modules-0.2.1.ebuild 828 BLAKE2B 5d198b3491985a27554f876b624657df5e0bc48a339ce4dd6ad5c4583891a8d48ed21fd978e8bb3c4180667d7c1300d8ef339b5b196915431aa6acf9fe79a6f7 SHA512 4844f7703cbf059756c733eb492bc644c219ebc39f34a936ee9931fa809eebcfa40e765a302d92c7f90a9d83698e31cb51cdfdd5b792ba7ca2909cb897b19c8c
 MISC metadata.xml 380 BLAKE2B 0f3336d6484687fbe0a61cc0c88110e51ae40a8905bb0d5d5b166ed6f8c49964f9abedeb7539cea85118a3d2ab548444680bb89ea57d5e44ff52298e95f557e3 SHA512 0122261838e5789fc995c1e07fd2f8d59fb470d2f525126adb971d7e991e7b7cd76c3fe37ce21949d6ec3fb79af8ccc2d5ce02aab4afda842809916a5c609f15
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild
index f818736a40d1..20e392452a0d 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/pyasn1-0.3.4[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild
index 0efd23701b0c..ce76ff6cf0c6 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/pyasn1-0.4.1[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/pyasn1/Manifest b/dev-python/pyasn1/Manifest
index 7b12cec9b0e6..d5f83c7e2288 100644
--- a/dev-python/pyasn1/Manifest
+++ b/dev-python/pyasn1/Manifest
@@ -5,5 +5,5 @@ DIST pyasn1-0.4.3.tar.gz 118494 BLAKE2B 39c223e09d3996674e7e89306fadec9e47eb3928
 EBUILD pyasn1-0.2.3.ebuild 1118 BLAKE2B 55bda0571d79d63402f6944ae549b365422e2ccaa958e08482f62c3a1effeffcc91705173c19d0c5bc5ae5c1e8aeae812a5eb8337e490a7b09f0b6b71ef9ed4b SHA512 9f42658c574838cd5c8a06f66ef01c1cd566413fb71abb2259cf8be8139f2a089a1480887bc64fc4923ddd021efee25fd60a5e8e7e8e9ebf08df3420e1470372
 EBUILD pyasn1-0.3.7.ebuild 1132 BLAKE2B eaf0572407114d69ec65412283db55c73fa56d49b8d9088d734cf29a4fbb55ccd716ad38d6f03f67e69ee1273cc40454539136a538a200e6296ebd0bbe33bc2a SHA512 6edc6300e6c7d0ab79e771ce055acb216abd465fc0ce5c6fabe732a4b689e4273ddcd3bbc8c7d3fa48bc6a6eaeeb136cc959c0cd54eb3543ac30783385878a77
 EBUILD pyasn1-0.4.2.ebuild 894 BLAKE2B b081c7e46a916912f0a5a2375c95aaf8b27e5aacd39fb7601b8a0a4e4601ef218c34ebd1159b4d867aaa121fe91f2828b3210d902f4d08fd7a1e09f1e50a8e77 SHA512 8ac213603dde3f5664597fca2f83303639c7c8a02460553f0311081fd2607717bf398dbd9330e214a800a0f0b995562d9dcd759040019415f40557b794ce738d
-EBUILD pyasn1-0.4.3.ebuild 871 BLAKE2B c9142ebc873284d76d7e1bbe1b18353283250f4525fc4aaf08fca85908861eb3e56c488ae98d88f7526ae54e90f7cb7e46708ebd8e1461618d5f6bad98759bc6 SHA512 87309df9249eb8e01c6e5331907e1a07a1813672859a612d9d63832f7db3e2540d42879d2091bb5348dd8bd82bfb44e41149655f67967b36ea49f8cf8d9b0d49
+EBUILD pyasn1-0.4.3.ebuild 856 BLAKE2B c2cdab06dbc871d99778237b76c43f566ae5a443c31f609146828eb49e71ef865e27d81260316ecef39c124c679f75d488f51b9267ac1e69e1711ff7e75f4392 SHA512 65800513ac9963c1109d9a70775c552060b1738910fc017fb2ad719a49d4a82ff6b9b1c13e71dcea73761e0ac84c14202681514bf590c9aaf30e7b415e9c3501
 MISC metadata.xml 428 BLAKE2B d98ed2c4f984efff51e45c7b57c7decacbde65d59311776fa432b1e771f1bfb97abc6b588b75fd4faca7a3a0bd93aac3504532ef0b4569f8cf9099fa1f69b548 SHA512 b2d4bf181128f2724c450387fd51d971f85fc25ca293b8ebe4029e0559f660a5f5d207db40d683b8d80a6233986a885069ae4e7d82507901151a71f19c6a75ee
diff --git a/dev-python/pyasn1/pyasn1-0.4.3.ebuild b/dev-python/pyasn1/pyasn1-0.4.3.ebuild
index 219a203b7fd9..8b9592f73995 100644
--- a/dev-python/pyasn1/pyasn1-0.4.3.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -17,8 +17,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE="doc"
 
 RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx )"
 
 python_test() {
 	esetup.py test
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index 30c1147a991b..4fab591cd65c 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1,6 +1,8 @@
 AUX pyatspi-2.6.0-examples-python3.patch 791 BLAKE2B ad8130ef64605915b3124dd268bb002e8e4a32c7c3e3e7f4445a5ee7e6a899b1caae25e1ecaff417d2d121063361d3dd983df08bafa666ab03aa6746fa21151c SHA512 7171f77080fed4ef235d1d3380821939d5a41e919b8509db8dcbe211d63b7b390e66389152c7275128cc8372c2a7fd1bdfaf179fc93b8fa62ed76a6edffd11ed
 DIST pyatspi-2.30.0.tar.xz 310672 BLAKE2B 76d51e6ce2f39305bcda8f706b5207738d3a2c0fd7480efb77c4dab8baf8ed6eb71263375ff0c16be0087e47f7f6b5eab99c6fc8992b83bdea6e64c92c381043 SHA512 a7af81bb55dff45d1bceced645f6aeb1adc1fa2a2b61fc39d9e97b6659e474636e5ac1af9923588311e651fee57b5e31a62ea5b2977b341eda43a5a736bf27ed
 DIST pyatspi-2.32.1.tar.xz 310896 BLAKE2B acf4a0211015daf5a19a796de9e267637ae77b2f79f0c6af20bfa5eb5a0fa0d4a62cf23524348299daebd515cccb7a4a1c18226e8c04356ea6439840613242a7 SHA512 6cdddc4275770a4f89e66355e18518f5cbf1ceeee1f27298be1fb5bb8b67676eeeb81ce7f4fbb5ad617573f574e5fd5858d363c77a0e5727d637ae7275429b03
+DIST pyatspi-2.34.0.tar.xz 314060 BLAKE2B 1d2c390c6f110a37e9553b1f1aeba75fa0585beabddb2d6db54aa8fddc671b844e7c670c7fdf9696e3833c8f9619dc8a2ecc364019f14703647e7996033c7dd7 SHA512 61b157f067e23b7a964cf8268f556ad059982f448e436ecb25c96915ecb53918c6ab7b29bfb4e7b85e25e6038e27678fbd3d0bfb61d14a038ab5eaeee1f682b4
 EBUILD pyatspi-2.30.0.ebuild 1297 BLAKE2B 958e2b72ab234d040d3c945a5b535fb7cba118517ae6636fe10facc73d5cd0939c390dd10e6cd90ecc5b73e28489b3ac7097b68e4751cf9c6ec89e9ef7100c4f SHA512 7140f8455184dcdde5d7899fe0716ca9f444807cb74a1d359c9a39da758f3e415ba31a93560e7852b58761e4811a4787599b1832289b117aee27eba99b4331d4
 EBUILD pyatspi-2.32.1.ebuild 1298 BLAKE2B fa43c5572a4a3b72297e7b13fbbfa0f3d6934b5435d8e2fe1a58685bc0cb860771224e7b17fcfca34ba144896739014bea17b6bc837c9cbdf5fe8a6657e7d820 SHA512 225aea4f249227cc04933f68fc1940cdef1945be5a34bd2b1ef070609eaeed4d369d42bc9caec2d8c9641d68345e01de1b75c04a9a13440472370ab16aeb1cf0
+EBUILD pyatspi-2.34.0.ebuild 1243 BLAKE2B b557d8986823fc05d41523704231cb79022509c5ee045f8f9d378e58b6a41e75075e62b0617a9264067f10e058322c9ef8ae229485c61cba1b4552e409d57c1e SHA512 abbbad705420dd01cbb376df42eb25ac2ff871464cb6d86c1e3578019e03b49916886f937214ace7013c6409424966dd3836ef83c2a12dc206a3b47a70255df2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/pyatspi/pyatspi-2.34.0.ebuild b/dev-python/pyatspi/pyatspi-2.34.0.ebuild
new file mode 100644
index 000000000000..11642c0a868e
--- /dev/null
+++ b/dev-python/pyatspi/pyatspi-2.34.0.ebuild
@@ -0,0 +1,56 @@
+# 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 gnome2 python-r1
+
+DESCRIPTION="Python client bindings for D-Bus AT-SPI"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+# Note: only some of the tests are GPL-licensed, everything else is LGPL
+LICENSE="LGPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="" # test
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/atk-2.11.2
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/dbus-1
+	>=app-accessibility/at-spi2-core-2.34[introspection]
+	!<gnome-extra/at-spi-1.32.0-r1
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure --disable-tests
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_install() {
+	installing() {
+		gnome2_src_install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installing
+
+	docinto examples
+	dodoc examples/*.py
+}
diff --git a/dev-python/pycparser/Manifest b/dev-python/pycparser/Manifest
index 67d3f2818e1b..cf8ab9fc7a08 100644
--- a/dev-python/pycparser/Manifest
+++ b/dev-python/pycparser/Manifest
@@ -2,7 +2,7 @@ AUX pycparser-2.18-OO.patch 2224 BLAKE2B 38955919380a0ec7dbaacde434a327b9842be02
 DIST pycparser-2.14.tar.gz 223295 BLAKE2B 13dd4e36d7239db4fd6dfb77f08088bdbffa897ab75d748da5bd7297fe0a7dd751ba7153f8bf15f93494e347c653d1ebc7250907d2ccc555e785830e731e93dc SHA512 d5b9ab434a8944898ac23a4f51189db77b02b993bf3e3ca018852b117fc0eb43e460b156beaa5c1d631ad71c81e1649113e9fff7e33506b1e7d4de24d8b464c6
 DIST pycparser-2.18.tar.gz 245897 BLAKE2B 2f47263c73763f9d76edcb0d90aacd2e6cf0a68ed2e8c5825a0788a5ccb6574167220a5bb7605b2c11dda8956ce8fb1ad28eeb8e91fed7aa0282191b11478b63 SHA512 4754e4e7556d21da328bf7dbabf72f940c9b18f1457260d48208033b05e576919f45ab399e86ea49e82120116980d7d6f53e8b959d21b7b03a3b5bbea3672f13
 DIST pycparser-2.19.tar.gz 158295 BLAKE2B 8836914e7549517f0c23a1c75457beefd013161f19c51a9f2a236ebd69466edd11235bf0a3f59c5cbece9e9e287eeb24b707bfa5afc30fcb079d134dcd4d9a80 SHA512 7f830e1c9066ee2d297a55e2bf6db4bf6447b6d9da0145d11a88c3bb98505755fb7986eafa6e06ae0b7680838f5e5d6a6d188245ca5ad45c2a727587bac93ab5
-EBUILD pycparser-2.14.ebuild 918 BLAKE2B da7ca289cab033f31a07589e380d1e164ff7a4c875eea4843aa657c57dc0539b1066ed87aff3151f4891f8f36400317ae22ff9f7fe153f87f511b4beac5ef024 SHA512 e24cafa3b0886a3c02dcf0e8ce6fd15d0317c54295843092a9efcc2fa697debbb4717ac4b5033a7632bb1a20f935e5efbefc7f96c47cf7acc1bef4a7e87e564e
-EBUILD pycparser-2.18-r1.ebuild 1526 BLAKE2B 19cf18b188e0dc277f8d14f4345c56fe16aa77b09d185b46a9ca84d4d4f99a75fdf32e086ff150afabfe580349451efeee4f9088e6f83acee04a98c502e5f885 SHA512 89813b8b6d3469e11bf8b12ce52be558e07f9aa6de53a84ed10e1049d0a3fc6ccb1c93f41c8ed83bb93c47ca48feeed9925c0bdf012d15fd5d76922fb526141b
-EBUILD pycparser-2.19.ebuild 1474 BLAKE2B ad2bc248d34387270443c764cd2f4b6c1cc2fdcd5996f82ddaeb5c03e320a48e6dbcc23f85361e8674d1e3f17746f5c36eb213d4946794946c56623eab14fd33 SHA512 bd6dfde171e3bfef1cc5a666e60fd4b986fbb3c95996c40afb8a37b0f550f18e2276109051cbedc89b0a5bcfd7b063860a847609220a40657c9b87f7fe87248f
+EBUILD pycparser-2.14.ebuild 945 BLAKE2B ef895369eff300105a13c9d08312ca1b8554513cd6b08f16b82e049ad71f5eb2b4c4fecd164aa740b44d02e391039d0f87bf545bc93545acacb29848f72c1855 SHA512 cd8aa1fcd9a2c05765792779d22b32501c0425e4d3c8c72e42368a92f61b08cff5e5c6bcf738661d7bedeaff0d90d4037ebeff4ed686042300762537cabd3066
+EBUILD pycparser-2.18-r1.ebuild 1553 BLAKE2B 464b805e100ee40ecef759dd7042e82e6bb18813205b1570bb34a589266b3176fd8a1a7bb09257b17dfa756b73729575184921db08afb8af2f2e318627187c4f SHA512 1bd76d00ffbdb933925c35b813c7c7f83d2869ada6d7d6d654040207b836002e7678b26703ebd9e44eb04c370bbce8dc354148b1d80c3db438b09989b8779979
+EBUILD pycparser-2.19-r1.ebuild 1291 BLAKE2B 090a20f83d34ba22df15c0e6b2baca86c6be1e7ff1b88c2409cfea4b0a789d41137a3ed9e209320f63c77c5168370e3c14f3980b034f3bb0880405823f36df73 SHA512 b1aa7d7e23986c5b4d4c25fcc530b10c22c9e7b51bfa1b3827725b23a7dfa99be99833958942ee2571a329debb6dc809de1cdab1024de46df3d18c0693a7422c
 MISC metadata.xml 380 BLAKE2B b013fa2cb5c61b39b122c1c051ce40a8c002d4d4c6995ab78e0f3a35cec07d2f81cb5b05326ddac9c2526eb3ebcf90bc2660f588c4ebe5bacbd1a861fcf91985 SHA512 98ca8c63733123ae6a1d1c8b338d5f98a679b8f84b1e0abed8dc7fefa5549735a7f4de9a5851a26507a6169336fa46689616e46a49df0e9a52f6efb669eac865
diff --git a/dev-python/pycparser/pycparser-2.14.ebuild b/dev-python/pycparser/pycparser-2.14.ebuild
index 9f24a5f8d7fa..15ff90da3761 100644
--- a/dev-python/pycparser/pycparser-2.14.ebuild
+++ b/dev-python/pycparser/pycparser-2.14.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/pycparser/pycparser-2.18-r1.ebuild b/dev-python/pycparser/pycparser-2.18-r1.ebuild
index db28bf774359..508a13602ef4 100644
--- a/dev-python/pycparser/pycparser-2.18-r1.ebuild
+++ b/dev-python/pycparser/pycparser-2.18-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/pycparser/pycparser-2.19.ebuild b/dev-python/pycparser/pycparser-2.19-r1.ebuild
index 3fee4c55f691..3b8d5a5df7df 100644
--- a/dev-python/pycparser/pycparser-2.19.ebuild
+++ b/dev-python/pycparser/pycparser-2.19-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
@@ -31,18 +32,14 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_compile() {
-	distutils-r1_python_compile
-
-	# note: tables built by py3.5+ are incompatible with older versions
-	# because of 100 group limit of 're' module -- just generate them
-	# separately optimized for each target instead
-	pushd "${BUILD_DIR}"/lib/pycparser > /dev/null || die
-	"${PYTHON}" _build_tables.py || die
-	popd > /dev/null || die
-}
-
 python_test() {
 	# change workdir to avoid '.' import
 	nosetests -v -w tests || die
 }
+
+python_install() {
+	distutils-r1_python_install
+
+	# setup.py generates {c_ast,lextab,yacctab}.py with bytecode disabled.
+	python_optimize
+}
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index 6cd3fc72cf21..33ba702db1ec 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -6,5 +6,5 @@ DIST pyparsing_2.4.0.tar.gz 625419 BLAKE2B 5555a255cbfcbb076fe4d385b2da967bc44a7
 EBUILD pyparsing-2.2.0.ebuild 1300 BLAKE2B 678c343985b4667f24664a56ad793932b213fa46bb0dfee554ecf511f2846b13491174bd1ef7bb67a2aa2a9844d3c5ca52a0b4cb5fecef2ef3f21214fa0e30a0 SHA512 2356f29f4effbbe97654c919c5aec73d82b0c15c15ff16c5aeb1d0fb58265489f04a14b847320bf47b0384557b7347e3c36c87966cd270d03a6dc34e0e0390d9
 EBUILD pyparsing-2.3.0.ebuild 1227 BLAKE2B 0254776352e08f944c3fcc80d0b2a4cd3e007cf14d400db90d942e9eef32426987d4a3601e1f47bcdc3c9cb51c14fd8fe0257259da3970a8e0d19eaf4f7a61b8 SHA512 e3f0cd167cde45e46ad3c25bf7338825c07384c4c89a151fc10de4b8272adf549a811cddb97191c4d03e8643e6a2bf7f388cab79179f00c232349122f162844d
 EBUILD pyparsing-2.3.1.ebuild 1215 BLAKE2B 3d7d8db955407d1323ba4692fb5408b1f73a61def95ff3e07a2b092ce4a87ee950f54b14b7a007990356b6ac17bf68ae467d961b7641f71a597c3030cfed92eb SHA512 2b3e574c0f9c2ab4209e8be6a80fcd477af82f8724b9553e03bf93dbe45567bcdf9dfa8aaa8175a2aeb0520114f1284171298fce3947f0c74147041537891985
-EBUILD pyparsing-2.4.0.ebuild 1179 BLAKE2B dd11aeda93ba9b9a913c6dc18611c709a6202157df1b40e4b54b6f329dfa740a2ad7e1ca06becbe3e17f5768fd320c3fc6827d07e73dadbc8cbac1bcfc2bb500 SHA512 dd7a1c5415038cf0dbde3ddea2c609bb2e0ee1de19103ec6843017f9a94a22d740772d761a97f0b50b3ed77c815b197d33ed6a0ff9b0131a4acd7b136e8eb6a2
+EBUILD pyparsing-2.4.0.ebuild 1181 BLAKE2B 5249bf166407966558407812f597cb52112709a9454d75dcdde606d9f445539124613c903ebfa639b576e954104ce5ac999d981750f4b021494f7cdbd671aefd SHA512 92a85c2cbd18fbe9abe24f7fbe0fc8d14e5bc754f38d51566436a7a154507ab48e8a6f03278ba1ab9484117b0bf86be02ec440367dba816d20601f374e47fd81
 MISC metadata.xml 737 BLAKE2B 4b4199e79bc2e92c175ce249cc395d2324cdc3a3df25bb36db5884b79057ec04c63b2cef7ef27e9f656a58e0fd5aa162b8eebe076f6e673b227659a3e013df08 SHA512 2cab4251c3444c6479b4d5ff92221399e01ea5e4a6af96631ccf81cdce5f3f9cc2ab06993c9636f36469acb5b28660c41e594d0d7315c6cd9b5dbaec0deda7cf
diff --git a/dev-python/pyparsing/pyparsing-2.4.0.ebuild b/dev-python/pyparsing/pyparsing-2.4.0.ebuild
index d5e6f6a13682..bed60583a293 100644
--- a/dev-python/pyparsing/pyparsing-2.4.0.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.4.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyparted/Manifest b/dev-python/pyparted/Manifest
index 5451bc0a1987..1f68d8c726e1 100644
--- a/dev-python/pyparted/Manifest
+++ b/dev-python/pyparted/Manifest
@@ -1,8 +1,9 @@
 AUX pyparted-3.10.3-greater.patch 342 BLAKE2B 857734d2466e5d1e9a9b7575dd419778361e5ad65c7cb8e6eb220aba2b3bd0b6aaa06367767c2708ef6986ee11d44f3bdd8bd89194e5d2f85ed2e89fc06a2f42 SHA512 c7a22b6fc2d72c0eb15f0144ea023cbc56257d26afa144039d528add2002af663fb2bc54420216992e32cc77bd699c60b2040291749729468749a09f890c7e2c
 DIST pyparted-3.10.7.tar.gz 99879 BLAKE2B f2d03415ec7623fbe25aeab70e53646aa5e576e9f20ac41ffe6c859be9572874579f5720b8d05191107f4143e2c6dd14d83a05798a345fa0ed8a81ce2634f599 SHA512 c57fed2a8d04511b12891fd59b6dd6840439aada7e5ebeab14a56e6e4f201c249046ee87d9d25af1b3f02960994efb0a2973f25928a9df85d48bbd1bc196ab07
-DIST pyparted-3.11.1.tar.gz 100585 BLAKE2B ee41f0c47e9432b68a2dbb8232bff63ded548d3b2867e3a1fdd891ce1f5ea1815b0c6b47416ae66e0b545c4b44065d158f2ec8ce2ff4784238e2b09bd12edc04 SHA512 4fe627693db803a82cacb37be8f2bee3527ee8d0d564229d7328a4e5c8dfa7cdd7a06c328ac7fa6b07c8f0c74d5db304410eaf312a60a0d494525d32c873fefd
 DIST pyparted-3.11.2.tar.gz 101318 BLAKE2B 0c79535d6f3a269d5dfdd6c31ec80569d8c7432cd058f90999ebfd61ef727762a395d902539c49744108e92ba1a351c1ec939c02188869bed6c808551a843f92 SHA512 de6e7387e3eb9c9cb11e01f475d2749d2ce22ec2f11386df20cafcf83f7e431828f2db936f29c717e42694ff390a592598893633156a21aa7c8d5700a3c9ece9
+DIST pyparted-3.11.3.tar.gz 105305 BLAKE2B 271d0ed91c187c66219f06e91def5e868d81494241a2e9137676162ffa388523f5cccb3ec6dfed655cb59da1ca56e7fde3bb9fafa227b86d8f7b279759fe237b SHA512 b10a89d076a27a074d606101dccb62176299dd8f9da75a5a4bf9c8a6683d2873b649d948736e991e4cfa21d43a54e7d2934da8e539ce8626ae5fd47e892ae286
 EBUILD pyparted-3.10.7.ebuild 684 BLAKE2B 757db877877ce8c1fbaeb75a2aac2ebc84e13f947f35fdd0118e35a4eba9f54f65c14e14b5f7e9b35745edd9562521a00401bd43732977a30d9b84e6a0b2b5e3 SHA512 916995670db72e69763dc17b3f28855c74679dc489ac89422865f5fa448520f21f44eb264d81bbfe7c7600c252ae31f37636977437c0002cb0b09863ccb26014
-EBUILD pyparted-3.11.1.ebuild 692 BLAKE2B b2a887b5176664059eef9416a338051d582c1e9142100b97939533c23c5435c81512bdb98faa92f3658af23259f099b0a517e1650ca478de63e34666ba7ab4df SHA512 bf24d4fb1d3454cacf9a4e269fc9afa130220b104e0996c974553639f076f8b4414ee1da226ce934460d001a3a39366d9a3e7c504ecb94737fdf4a4b1616becf
 EBUILD pyparted-3.11.2.ebuild 691 BLAKE2B 7b496525d33ce29f596ae8da78f793128e83a1db13a656bbf95e60ef8aa4e88c9c010478d0bf707afc3a7b02714ce863e7da0f550d3162fe28660f65c42a26b7 SHA512 d135f3b2d241c3abba5de80a2e90d08746039280589d86a5cc588912b74dffc4626e109527f5b0789b6ed45a2c1654ed89416e774fcfb4b6e41a48dea22a1e5d
+EBUILD pyparted-3.11.3.ebuild 585 BLAKE2B 1de8ef6873750577444b42fc585d16c1612b6b9aa7880bc3e467ba9d39f894de3d388bf3dbf225fdda9567d25498343990e98c4c7be2bd1ad86ea38eaeae81c4 SHA512 14a111c031e6c703321f79b008ea2721736ece401add97275fe89235fe752e76794ce2d4f7a62bd347897335e991b454991c85aa6f3981d4de271741ab49f878
+EBUILD pyparted-999999.ebuild 513 BLAKE2B 15443103c86a2d9777a304c911e5c1495b2f663e0e16bca6153f36589da83aa015a3c867536d83a28c8537cbdf5546be385c27f61c118b22ec958612ee36fe77 SHA512 428e2e96f8470b3531767e1013d5962fa2776dc4e07aabb19dc87fc0d68a2eb0baf139c1bb88f22a34a09cbe81bd296aa1fd5ce7540e3b360ce1a43488eb6ed8
 MISC metadata.xml 340 BLAKE2B 580176d023e57197a2b4ce868c4ad2403748932547b9a6337fe63dcbabc43db523ce8ae7a5691abf3811995dddc047b64a7e00aca2f09c65e1544d0a172a9d54 SHA512 dc34de6235dd150a24b2cea6fd14028328a44fbfff6a75819c51fdd623f54b2f4bfa55f13cd827ddacbf11b0f9206c56025234948ec116e9df47ead634d8766e
diff --git a/dev-python/pyparted/pyparted-3.11.1.ebuild b/dev-python/pyparted/pyparted-3.11.3.ebuild
index 93981ecbb4d7..97c6d6e4d2b7 100644
--- a/dev-python/pyparted/pyparted-3.11.1.ebuild
+++ b/dev-python/pyparted/pyparted-3.11.3.ebuild
@@ -1,22 +1,17 @@
 # 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,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for sys-block/parted"
 HOMEPAGE="https://github.com/rhinstaller/pyparted/"
-SRC_URI="${HOMEPAGE}archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/rhinstaller/pyparted/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-REQUIRED_USE="
-	test? ( python_targets_python2_7 )
-"
 
 RDEPEND="
 	>=sys-block/parted-3.1
@@ -26,11 +21,4 @@ DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
 "
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.10.3-greater.patch
-)
-
-python_test() {
-	emake test
-}
+RESTRICT="test"
diff --git a/dev-python/pyparted/pyparted-999999.ebuild b/dev-python/pyparted/pyparted-999999.ebuild
new file mode 100644
index 000000000000..f05348d00058
--- /dev/null
+++ b/dev-python/pyparted/pyparted-999999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Python bindings for sys-block/parted"
+HOMEPAGE="https://github.com/rhinstaller/pyparted/"
+EGIT_REPO_URI="https://github.com/rhinstaller/pyparted/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS=""
+
+RDEPEND="
+	>=sys-block/parted-3.1
+	dev-python/decorator[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+RESTRICT="test"
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index ef8d04ba5be4..4abadde7ad0a 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -2,8 +2,10 @@ AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a
 AUX pytest-5.0.1-test_xfail_rmdir.patch 1589 BLAKE2B 8c4ed570175fa3b2461fd5dde31e6618a0a2af7cef19529995a8f537b0bda1acbabf949761cf36db5f8d1fbf04cf7ec3bc6c40f249d8f158540d85ad2388c768 SHA512 fdf17a7c2d4bde5b1cfa01224cb464c3cae469dd1ab7fcd4158a57525127bc51ea19b777b01b4726a6190ecbde74e47d38cdcdd0fbfba31b4e6c76bac13009ce
 DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f
 DIST pytest-4.5.0.tar.gz 943607 BLAKE2B 49a0e91fda7f4231fdd39f90eb2daa344d3034c10faff221330ea0ae7482a2a7d0fb9443a0a264db00f1d92568d5a6005cb73e07d8643b46906f7ecff831adcb SHA512 cbffc6216f83491b1de241058315c116697bfaa5206b5f558192a7f861d43dd036d30d0d689bedae7bdee4f0258dd19ef5827c356e11863dd596a5fabe8249fc
+DIST pytest-4.6.6.tar.gz 954899 BLAKE2B d3d76ec1fff18d343cc799f1acd0889489f303cdba72747881dfab8656599bc1865f01b5ad2754f0d05bda04aca4d7edf8c2071f2257fdf41506308d1bc0f623 SHA512 c5b6c21c352787eadce06be7529ecb6f6fd5f5eb193ec29e5a4cfff3d7e305f50c6f07aeac15bddce007d88077a35a8f59633111815321792ed3d9fa1011b684
 DIST pytest-5.0.1.tar.gz 949744 BLAKE2B c949f0fb6bc0d1430ec7c780537f8aee8ca1ebea5f89035d882434236c6af7d431a610774dbafa93552406e38852627a9f949a6f9198a792de9371efadb4f6ff SHA512 92f5feb263a8708ef6cb8f4565688620b6bfeaef23536cfd24b9bc09515e37fdecd7fa8bcaeeb0775c0be1d8e9dcbd9a56e52f97fb13dc98116efc0056f870db
-EBUILD pytest-3.10.1.ebuild 2430 BLAKE2B 09a0bed17f8118487513408af620c233bdd3b7bc5f8ffb4b5b66becadcc4666393c9bb8783dab942ceeb5de4920a6f22aa2eb91d64f9e5fafa41422df298f75f SHA512 9c11e625e4526cf42bcc55a3ebd9ec1f9066d531ed4fff515733c983e379f32df7854d891a55fd5578276ca102b964ac1647e4f5f9c913a46cb2f21d677d5362
-EBUILD pytest-4.5.0.ebuild 2073 BLAKE2B 22c26d78b8e79da4bf2c63e76278257013a8d99a08d8cdeb7df0ec3af8c38a91451eb2052b736d2ed38eaff3e366839963e74989f8ca559bcb846d6e09bffaec SHA512 cf77ec627ad993bf2cb2cc4f1ffd3a6e1f80cb0e7376071793b1682746bb01dd1aa4a7c2106826cfbabb42702c36c39acca6fa2389bce4cde880004f407acd03
-EBUILD pytest-5.0.1.ebuild 1923 BLAKE2B ad6e07b32be669d7225fcb1c9d396c01a601130cb8e2b6a5f06485ee0a1778ee4580ef3d03f864561b99fd2eb91c9421acb3dae426f32a12f9c7acc8af36c4f0 SHA512 5bfb419b68015969f62ccce3c4579d4175ae1937228741dbf1c2a97f3e1828870333446623ec6e3c42cd57a049b5386539ab7479584e2e9030276309098477f2
+EBUILD pytest-3.10.1.ebuild 2457 BLAKE2B 7da16cfafd27b53e17aba28a0d5126b1dd9881f2d645edd4142934bd5b6c41b1e478d5fd0fea875321c9663e066973f41838abff744dc1765146c327b68cf821 SHA512 5614e616273ba510196fb6e1c2bd64ff4bb2e4d201469aea34502edb643aec98fc0e8e355a9cfd3c8a1922c8763ae775758c77bf15ad1fa9634dec25aa65f298
+EBUILD pytest-4.5.0.ebuild 2100 BLAKE2B b8f50b6ac86f018ee28113caeb0c31ac4e37ee3b47c5664de71dde01cd21749ef58bddee5ee83e10627e8da72668e963766670be5965c013f03abafdeb2e76f7 SHA512 b12faac5af65e60c291e592a42e1674d8a0864f31bca65a5c91ed5b6b7d922eac8d90d32c70f2098ca7406725218ea7d6c4261ed70a21d3867168cb787abc6be
+EBUILD pytest-4.6.6.ebuild 2822 BLAKE2B fe122484da8a47115f6e19878e9b609c1d45b0378101bc3ba2741ceca1167282ba7e828e597e8ce6d352ed43c7f43fec512ecae17cc5fcb525ae5337cf8ff180 SHA512 de6ea2ffb70a944382f9b29dadb6270a6b038ac1f1f9a1c1c5d7f82c9bedfcf2de9930d65312bd8eaaf9c69a6938d5c0141bfe4bc89bdcbdc7cf7ca60b5011e5
+EBUILD pytest-5.0.1.ebuild 1950 BLAKE2B 53ee335933f9127559b3d04bb738670235adc78fb5cdda0e64aa43e27ea15def07d72f5fec072606724333efb73613650c15d020ff11e2ce8d0235cb4194cfbb SHA512 b5b4c6ff13ae8c5991be28819002be5a12ba12c1c20bec26c737a64170bf726b06e1ce0e3da33a7b706c4c78a6539dbe32ee90f4015bec91d85b33ce63246b08
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-3.10.1.ebuild b/dev-python/pytest/pytest-3.10.1.ebuild
index 81d0bec926ba..551cebba719d 100644
--- a/dev-python/pytest/pytest-3.10.1.ebuild
+++ b/dev-python/pytest/pytest-3.10.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 # When bumping, please check setup.py for the proper py version
 PY_VER="1.5.0"
diff --git a/dev-python/pytest/pytest-4.5.0.ebuild b/dev-python/pytest/pytest-4.5.0.ebuild
index fbee5f5f5373..16bcc98a7257 100644
--- a/dev-python/pytest/pytest-4.5.0.ebuild
+++ b/dev-python/pytest/pytest-4.5.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 # When bumping, please check setup.py for the proper py version
 PY_VER="1.5.0"
diff --git a/dev-python/pytest/pytest-4.6.6.ebuild b/dev-python/pytest/pytest-4.6.6.ebuild
new file mode 100644
index 000000000000..9467c349be60
--- /dev/null
+++ b/dev-python/pytest/pytest-4.6.6.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.5.0"
+
+# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
+# support, which only came in py3.6.
+RDEPEND="
+	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' \
+		-2 python3_{5,6,7} pypy3)
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2 python3_5)
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+
+# Temporary hack to avoid py38 keywording hell.  Please remove when
+# the test deps all have py38.  Also pytest's test pass with py38,
+# so you need to hack them all in locally before bumping and test.
+TEST_USEDEP=$(python_gen_usedep python2_7 python3_{5,6,7} pypy{,3})
+# flake cause a number of tests to fail
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/argcomplete[${TEST_USEDEP}]
+		>=dev-python/hypothesis-3.56[${TEST_USEDEP}]
+		dev-python/nose[${TEST_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
+		dev-python/pexpect[${TEST_USEDEP}]
+		dev-python/pytest-xdist[${TEST_USEDEP}]
+		dev-python/requests[${TEST_USEDEP}]
+		!!dev-python/flaky
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.0-strip-setuptools_scm.patch"
+)
+
+python_prepare_all() {
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# Something in the ebuild environment causes this to hang/error.
+	# https://bugs.gentoo.org/598442
+	rm testing/test_pdb.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	if [[ ${EPYTHON} == python3.8 ]]; then
+		if [[ ${PV} != 4.6.6 ]]; then
+			eerror "Please disable py38 hacks and test locally, then update this."
+			die "Python 3.8 support untested for ${PV}"
+		fi
+		einfo "Skipping testing on ${EPYTHON} due to unkeyworded deps"
+		return
+	fi
+
+	# In v4.1.1, pytest started being picky about its own verbosity options.
+	# running pytest on itself with -vv made 3 tests fail. This is why we don't
+	# have it below.
+	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pytest/pytest-5.0.1.ebuild b/dev-python/pytest/pytest-5.0.1.ebuild
index b124d68a3a41..15641dad00a6 100644
--- a/dev-python/pytest/pytest-5.0.1.ebuild
+++ b/dev-python/pytest/pytest-5.0.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 # When bumping, please check setup.py for the proper py version
 PY_VER="1.5.0"
diff --git a/dev-python/python-distutils-extra/Manifest b/dev-python/python-distutils-extra/Manifest
index fbd1c7e3c0ff..a9dd9f91187e 100644
--- a/dev-python/python-distutils-extra/Manifest
+++ b/dev-python/python-distutils-extra/Manifest
@@ -3,5 +3,5 @@ DIST python-distutils-extra-2.39.tar.gz 27389 BLAKE2B 06deca885aa283e0a52e38c89f
 DIST python-distutils-extra_2.42.tar.xz 37996 BLAKE2B dee4cc950bb34027b60dcf58e173bae502a7090062e3c2218fd2ec562d6350f5872ed5c0865b89f1463bd35be0f365f23e05bb0220f70a944181af40df42ee60 SHA512 ff0df0a25a29504bec89970dbbf24d0b618e9f2d5d07a037f67778b86c92e880eafee86dd102b4ada4f280abd3102de9f4a4e47dbc68c1eaaa05fb492cbbae29
 EBUILD python-distutils-extra-2.38.ebuild 1063 BLAKE2B ed1ba60ec0d9a2a4193550c54597a76e7e9d428670c0018e38bc0dd0ebb24ee5918f5d98d210851c74c7021cb01a3ba6b85390c1504faa2b568e154e5c37c206 SHA512 89eaea3dfadb3e385f17dc05eacf7d36f2766114be278e82a43851a1b313bda100b10dcfb03aeab42c59e8dda546ca45f40f47db4b5f1c24fc1838131416d320
 EBUILD python-distutils-extra-2.39.ebuild 1407 BLAKE2B 4e7bca8828cf129a31ea16e0720528ecf4032e16871a7580d72914fcba0512fd5575ba11cfc1680ef9f8b580d10ddff5f28dc7f3b3dadf3bd584a909d238e876 SHA512 f75cb32a2df779dac30d8de71509323933f011cb3e113eb9b5768f32ce085ef1d96d177a1bd641a0001291406586e31ebe993bb5a150578b481277d442ee869c
-EBUILD python-distutils-extra-2.42.ebuild 1396 BLAKE2B d8b586a1da01d95893cc61f9bfa27547b4ace4597bf24dcf9eec71e86d94530156846763dbd34ca1905d47b0eaab24ca1ac22877969174cf1832fba76f3ddf86 SHA512 97362cc87b30f523fa52cf3f1760b96f23a9b4d51ccab9bc4b8edfaa79d61eaab74b9ac305d3bd40e619c990168e6bd627cfa515fb2f5a2d97d66d23039357b6
+EBUILD python-distutils-extra-2.42.ebuild 1408 BLAKE2B b84de65ba0ab70185e7949b4d78d6904b6e053e206f199e187c279d900952771a28e6954592dd5b324f77e8815814de301a9a8a8c6c8857d1d4437def6475dd7 SHA512 ee26e13ec82892af52eecd514c6d3912d3731736e54dd9634989213aaba27382d42759fc4a9fed65779ee94534d26fb14cc769fe4e5a23f7374748a40c8f6619
 MISC metadata.xml 401 BLAKE2B 6ba770986ed5364c9311bbf2a48957c0ec46f3c16e7718b564865b9ca7459f3c64cbcf6ee04c4b66564429e7f6714b0a128f83f2bd0d33f062b3670210d11858 SHA512 0dfe7658fe14d75a542a901de11983e7e0d8663b158032f5b8a71814c4caa93c14b4bc32e422c49a19550544c1b1fd4075be8a6644f0ea780bb23e1adc65b402
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.42.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.42.ebuild
index 3b3e02753ac1..f870cfc550a7 100644
--- a/dev-python/python-distutils-extra/python-distutils-extra-2.42.ebuild
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.42.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://ubuntu/pool/universe/p/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="test"
 
 DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index bff287ec3376..840052840b1c 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-novaclient-13.0.1.tar.gz 312975 BLAKE2B 8f512a6b9e84e352d77f82b81777f1f9d9c8c6b40e86639c9400dede461c7f61d222ea304b8f407cf1775558aa3efe2519e03ee7ee83b17d80d5a7fa0e965284 SHA512 cca8eab5a11a784d5b701a128125e5de25c802081defa61df99449cbd711b0d6913dafeceb28e452fd9a33f901e04b5875b9cd641622af5ac6f06c00c30f7bba
-EBUILD python-novaclient-13.0.1.ebuild 2359 BLAKE2B 309dadfe3778a0e64155ca7120f818eb480f315946c660fb1d9f74c5e6b6aaf07a2adf3d69dadbff2960661eb076e169e19e6dbc7e342710ed32fe78e1813efe SHA512 0b07d9959ed84c5987e713d36aa9e9ea89f00e209fcc632fc4a671ed06561c69c6310106701ff1440d2e48c96c7c547d5637e2f76f922486e83dbfa57bbcbbe5
+DIST python-novaclient-13.0.2.tar.gz 312390 BLAKE2B 2a436a2f843afe466bbf3d376d16a994f25e2232dfcb67271837159c5f21d7970027ad6d946c331dd6bff5c248d6b526303205a96a18ef4872cc8b1b526ff366 SHA512 988264cb6b6034dd0c4cb3a79840f591bda9c1c0134ddf0124beea6d9992192dbaeb9ec20bbe73f5a831bf561d175fd3d312880093f58de51d326922502cd1e5
+EBUILD python-novaclient-13.0.1.ebuild 2387 BLAKE2B b0c089993dfa515dd9e3555cf558464b819c805b9a7e7d4dec21d8534456e7e817ce5badc668f8f38f063da579f786e2ec6b1236b51f90edfc6cf86f303fc5d6 SHA512 a79e45b0bd2399f4c9fdbd0e97e702a4a18ca413c0d8bc3f4bcd18e45667a14a932779b0909fe8e92ae7a3e635410a2d668eb8d3622ea636be392534213597c4
+EBUILD python-novaclient-13.0.2.ebuild 2389 BLAKE2B d9cc0c53508e78e392d0d587b8fc4646a93264bdc54faf6ca9f2ce36deb930585da47185cfb7eed6eac8bf985b504d56e8dca5aa39c3a1bc159ccdc5a2295a8a SHA512 21f71686c7c630c75d76604dee509f21e18709fbceca641eb84f396666578e83738b23a87c443c6f97d481838bdde36f300188cd4b69791795679f60e3dc37f9
 MISC metadata.xml 760 BLAKE2B da041e2d4a5118a32574fd39fb38e5a4b417562e90f345f731b5bb9d1109c760044eb3d18b6c82c440f5a121791f1315213e58ac657be61518aab440e6a359df SHA512 51fd4adfa2bfeaa4f5a6507d31ad45a5d42df8fb702d629a516766bd25c6f5cc0d1eceeb1d4efe3ff21d51ef0507847f6b24828c017e9200759565be09cf66c1
diff --git a/dev-python/python-novaclient/python-novaclient-13.0.1.ebuild b/dev-python/python-novaclient/python-novaclient-13.0.1.ebuild
index bfd223c9f5d4..341dc56ffff7 100644
--- a/dev-python/python-novaclient/python-novaclient-13.0.1.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-13.0.1.ebuild
@@ -15,6 +15,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
+RESTRICT="!test? ( test )"
+
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/python-novaclient/python-novaclient-13.0.2.ebuild b/dev-python/python-novaclient/python-novaclient-13.0.2.ebuild
new file mode 100644
index 000000000000..7839043d06c1
--- /dev/null
+++ b/dev-python/python-novaclient/python-novaclient-13.0.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack/python-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1[${PYTHON_USEDEP}]
+		>=dev-python/openstacksdk-0.11.2[${PYTHON_USEDEP}]
+		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/keystoneauth-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.4.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "testsuite failed under python2.7"
+}
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index e2369a41eeb0..a4bdd9eed10a 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -7,8 +7,10 @@ DIST pytz-2016.3.tar.bz2 170906 BLAKE2B ae1c5336919cd60d643afcaec8889793092da1b1
 DIST pytz-2017.2.zip 502168 BLAKE2B a1e02967700d0624d2c48bcedde52b772471aefcb1dc173fc067045a69d808dc8208ef300d67c683b0d49a0b19b6c22f9d5512a6a10559457e19a508e4b40ace SHA512 d67d64a64b4c21e0bd41da56020fc7b016aec9da7f3243f79b65704119f70b8a9cd4f5f905631b6761e06ecef93830e5e479e16c7b1611ac70e0cd2b39d5b916
 DIST pytz-2018.4.tar.gz 308066 BLAKE2B 665cebc5b535aafc92a1858b718d22818810534d8680a82ef3a0b66e6092f24226c36eb74feb690e25578b4d6ab8288cc4825eb5fb793345e11b0e71c6041868 SHA512 8a15e64d0d1a4b75c1e92360b22c06a41a692fe54fc8bfcff8cfa671095232d87f7929240441cd4d46826cd13f21d348125509c899be5a0b19bc7a77fdcb43c1
 DIST pytz-2018.9.tar.gz 310705 BLAKE2B 38e4f403e299ca3c24e5cde66bc02ebb861abfb7be06bcb0556fa75f426a2d3e1ac42466ea2296ddf52d3ed0e0f6f2478733d9877d2b891b5f4787cd1e792d91 SHA512 c3dabe61d04539245761a5c4e3bfb614df1c3b8ccc2ffa1cf320c5ad642242c29b3321fe7855d32a2ae55c739acbbe8c0e1813df5b3c757b8f56fff910fee159
+DIST pytz-2019.3.tar.gz 312286 BLAKE2B 8a81caf3ead284a66404fadeca4f17a603a4f0ab2404f9b73b2b06a209d0094a25549065aa14d254239d6d842804c6924bc7658a876517b170f535be71868ead SHA512 b925b59d197e7007dae8098d35518a470e4b7588d9114f51e4d8816813243a9f816f662055f690bedf56b86cc9ece06428ed8c55e5b3ed676ba0f504f7cb43af
 EBUILD pytz-2016.3.ebuild 978 BLAKE2B 68bf86ef19a95b0df3e8cae327c767a6c41562f201674c1df531d330e10b2374fd5278eb5137cce30d439c5829fedfbc238c78e671d572c7a05cfa699e8ed059 SHA512 239103025629a34cd702200d65d32d780f83c77f67549142422ca25414ef346480c56a0fae864de042552c94520d2b267ef34419b16fb55607534db4f09472c1
 EBUILD pytz-2017.2.ebuild 998 BLAKE2B 2f150f14f0850b17dd6cd7eb69ecafd9afc46c1c7eba91095612aa79111445ca36820b2f61c6fb9f521a79fbde0e237aa1a9b63743a253b12e69de0de8125394 SHA512 6d6b6e35d3554ae1046a3bcadb47b4e42ab1ddacf4238391d649d77e3bdfb50ad02d9ae8a39860fa5608b22aba0bc229dbf072b68af1579db92fe6cc8dd303f5
 EBUILD pytz-2018.4.ebuild 1002 BLAKE2B 5f85af0250267a9faaee6d332325592e8278cdd13aa54e0996ab226b6fcbeb2c66e38dfc1eea320ee5c769b5ff739d0fb78bf34355d04282e9564d4780a7b1a3 SHA512 4bbcd7b02b612bc5602689ee83ba315023927516e4d4d54456fe13d7982f3cca488e9e1aa7e5a8ec88a904ebe280a87a1849ab1d2a5f393cbf9f5d11090b5bb7
 EBUILD pytz-2018.9.ebuild 1002 BLAKE2B 5f85af0250267a9faaee6d332325592e8278cdd13aa54e0996ab226b6fcbeb2c66e38dfc1eea320ee5c769b5ff739d0fb78bf34355d04282e9564d4780a7b1a3 SHA512 4bbcd7b02b612bc5602689ee83ba315023927516e4d4d54456fe13d7982f3cca488e9e1aa7e5a8ec88a904ebe280a87a1849ab1d2a5f393cbf9f5d11090b5bb7
+EBUILD pytz-2019.3.ebuild 1018 BLAKE2B 924c4afb2805d29305cffb4577bdb2d31c87f53a9530514d314ec747e77e43daf28d7dd4908374530c248181db498a464468a61dba004198399f8b7e81ab3a49 SHA512 7f539d5525b46e91f9c08f7f849ce02dc2f6d624227edbc93c48424e33f4a42817677f495c30f26465cb4a7a30ce32d6b895c4d7b731b295bf8e92a07ebe678d
 MISC metadata.xml 739 BLAKE2B d96611c8cdfc1d45fa86eabcbcc60ed1d3f7e7d2a358a2fc5cf54a64ac3427140299651263e0be1cc4d2f87750df81c4adac9512be75ab334d38f44a375238ea SHA512 b7c9e6ea1b5bd128f1c5ce0a77171d0b7cdbb6f8ffb186d92aa4167d2d84c60c28c647cae66ffc7532350bca13ab65aaab5eb441f68321fc786a14b90f8813e8
diff --git a/dev-python/pytz/pytz-2019.3.ebuild b/dev-python/pytz/pytz-2019.3.ebuild
new file mode 100644
index 000000000000..2b38219a923d
--- /dev/null
+++ b/dev-python/pytz/pytz-2019.3.ebuild
@@ -0,0 +1,35 @@
+# 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,8} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="World timezone definitions for Python"
+HOMEPAGE="https://pythonhosted.org/pytz/ https://pypi.org/project/pytz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+PATCHES=(
+	# Use timezone-data zoneinfo.
+	"${FILESDIR}"/2018.4-zoneinfo.patch
+	# ...and do not install a copy of it.
+	"${FILESDIR}"/${PN}-2018.4-zoneinfo-noinstall.patch
+)
+
+python_test() {
+	"${EPYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 45d6291f70a3..6fb4fd99571a 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -2,4 +2,4 @@ DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35
 DIST QScintilla_gpl-2.11.1.tar.gz 2932060 BLAKE2B 9f2f9fd89667cc04c95d0a36e4a615dcf3c1c11a5446e19a43104513894b76bc7478f2aed7e8c94ce413f940327deb09e51507bee1fa35c79c176e01e6b74767 SHA512 40b600aa8eec17bc99491a08aeaee72bf498a66f0257d310a8df2667de82805715b9c859885c092acfb03ba8f69433a6517d0d4bb324bf99bd9db461172c08d5
 EBUILD qscintilla-python-2.10.8.ebuild 1551 BLAKE2B bff3a35fec9120904fa4b3e9c5c731334a0d9bd61de51cfa582a0cf41a26d64602a682fe5fdc0f27d4c916b50418c71c1344cf3fe88d47ea05613886d3180c51 SHA512 b559358ecbb09e10250d64145b1629795bd0b57e228cbada6239199a8436a951e5dd298916be6d1904f1c99bc70ee04592b1b9cd300ca7f4adb1f42ffe340965
 EBUILD qscintilla-python-2.11.1-r1.ebuild 1744 BLAKE2B 82be7cd42fbd8c1348fc14e08fb1981e8baad99361c79b076340a634d629dcc218df7ae952c5a865dacf34fe4312ab3da3280fa4d34e6115cc91eb45b5d7da7f SHA512 618eaa127ea65050ab2b0028622433a58d8a358e11995253e5602df1dd52e7d67a947dbef4bb4affe45543ba9143a004fcc53a969c75d15fa26b71ef6f573734
-MISC metadata.xml 776 BLAKE2B 63270d838d1a2bc0deddcf6ec6ff08a9cf0233720ba826a1b457b7369492ec4e292c16ef76b55ce37bf35e7d2497f2beb0c5d03bd23a84558829bd3e84c558e4 SHA512 08ee336155dd291545fc1579ffe8d9894ade3eb0f1d671d5df59933651ec3262239c3a15f32378fc5cedd3a40459e79c3c64a38b53fa95a6619572290bdd0367
+MISC metadata.xml 678 BLAKE2B e849d949281fe5162977ac3cba9c3559258f0534ced3e4e160554e2ee166cd20f979545bebae2effb0690231c987abb0ad11ed2090dbcb1c6724fc3389edc195 SHA512 58afaba4b14bf09297c024e29d51bc6b22c9a8290a6ca7f2c8c5fd63dea01037a637eeddb2ad5dfc09f2fd09d92229f74f1ee9cfb200c835110236407296e530
diff --git a/dev-python/qscintilla-python/metadata.xml b/dev-python/qscintilla-python/metadata.xml
index 3e46f747a5e4..8ae907533895 100644
--- a/dev-python/qscintilla-python/metadata.xml
+++ b/dev-python/qscintilla-python/metadata.xml
@@ -14,7 +14,6 @@
 			<email>phil@riverbankcomputing.com</email>
 			<name>Phil Thompson</name>
 		</maintainer>
-		<changelog>https://www.riverbankcomputing.com/static/Downloads/QScintilla/ChangeLog</changelog>
 		<doc>https://www.riverbankcomputing.com/static/Docs/QScintilla/</doc>
 		<bugs-to>mailto:qscintilla@riverbankcomputing.com</bugs-to>
 		<remote-id type="pypi">QScintilla</remote-id>
diff --git a/dev-python/rnc2rng/Manifest b/dev-python/rnc2rng/Manifest
index 8d1c6f3435be..32294960bedf 100644
--- a/dev-python/rnc2rng/Manifest
+++ b/dev-python/rnc2rng/Manifest
@@ -5,5 +5,5 @@ DIST rnc2rng-2.6.1.tar.gz 14330 BLAKE2B 04d316f03da1e936603ca69cf5c8e087dd3a45f4
 EBUILD rnc2rng-2.4.1.ebuild 505 BLAKE2B f0809e7d8db41926a7a9e68d73fc4307d4e54cb2e9513fa04cf49efc2df4e64afcea258410f7a199b74eff7191b665e43d043479a347682595eee7f184a72888 SHA512 4b90b212805172a7e4002e8e3aff9578bd23c67b4ea7d19df9368165853890532a9070ccba038a962eedd9cf74c5dbd42342885717b305e8e2f69ba07456575a
 EBUILD rnc2rng-2.4.ebuild 505 BLAKE2B f0809e7d8db41926a7a9e68d73fc4307d4e54cb2e9513fa04cf49efc2df4e64afcea258410f7a199b74eff7191b665e43d043479a347682595eee7f184a72888 SHA512 4b90b212805172a7e4002e8e3aff9578bd23c67b4ea7d19df9368165853890532a9070ccba038a962eedd9cf74c5dbd42342885717b305e8e2f69ba07456575a
 EBUILD rnc2rng-2.5.ebuild 508 BLAKE2B 50f2101839a0a6fac7df91a9767dee496fd0ce0de5ac101588066edc1c55b6aeeaa0958642c2f70178b4f02da3a9c8f7cf6da9c777bfd8f2c8bb4faed66ea905 SHA512 820826d06bb6781705006b63002c4f6cafe48e195c57cd998bfab820259a26b34d858f21a82499c20c537298c0580739410bfad520ed957c9cd52bdbe9194251
-EBUILD rnc2rng-2.6.1.ebuild 508 BLAKE2B 50f2101839a0a6fac7df91a9767dee496fd0ce0de5ac101588066edc1c55b6aeeaa0958642c2f70178b4f02da3a9c8f7cf6da9c777bfd8f2c8bb4faed66ea905 SHA512 820826d06bb6781705006b63002c4f6cafe48e195c57cd998bfab820259a26b34d858f21a82499c20c537298c0580739410bfad520ed957c9cd52bdbe9194251
+EBUILD rnc2rng-2.6.1.ebuild 542 BLAKE2B efefd163d4befc804cf743eca7b96c83d21c75b374be7b15726d931a4f88ebb0ab8985537f7590b95b153c069ea2e2155e1fcc1ec2d3823a000c7a9a6e017f8b SHA512 25ce5d01bc2c870c92b8ce5d030059800c1a4f855a735eac100298fbbca6c9b4c23e369c7dc971bd5d6182fa369ca4e5edb62ce3dd8274d2194465478c8559fc
 MISC metadata.xml 366 BLAKE2B eb80555c7d3d419c9a0a0dca27330a2c4db11e2c0fd6d3edbc681733f12b33926842ccfebb2e818087876c92cd8ff17fd0e0a0ce8709e01237b70afa30a40ce5 SHA512 2c981a0862251c7fdb89078f62ed3eded580c221b3f1bbab7e2941b6e247f03cc7d86efb5174c5649b456bb9c6c5890b0664b32228c2c7ea1d6d18f2e6240198
diff --git a/dev-python/rnc2rng/rnc2rng-2.6.1.ebuild b/dev-python/rnc2rng/rnc2rng-2.6.1.ebuild
index 2dc7788f0234..e6b44ff88ee9 100644
--- a/dev-python/rnc2rng/rnc2rng-2.6.1.ebuild
+++ b/dev-python/rnc2rng/rnc2rng-2.6.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
@@ -18,6 +18,8 @@ IUSE="test"
 DEPEND="dev-python/rply[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 
+RESTRICT="!test? ( test )"
+
 python_test() {
 	"${PYTHON}" test.py
 }
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 34fb8a8bae10..784b7e2b6d04 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,16 +1,6 @@
-DIST setuptools-36.7.2.zip 726758 BLAKE2B 8821d3142f2149fbdea4d231052c3990fa7a14c57c421309683c6a65102ce4911850acd5d492087aa0f14a0026da732e47eb9bf971030443fc1b57f9f909aaaa SHA512 746dce135dbacb65565787a20a2611388605e2371c94f0f8803e7712e515e69c270751d16a21f381bf6e8ddc0a1b39494db7d0c67bb32e6230a90c5d517e78f9
 DIST setuptools-40.6.3.zip 839328 BLAKE2B ddc87213439ce2ad96ba54218bd5b3e41a7c31d670bddb9e4ea058b8ee7dffbe6fcb0e5fd24baf3fb38f5e824fde36aa8dc1e09d7ac37f9375ee351406389cd6 SHA512 6c628b8fc67645bca96ddcd016ec9a685e91690bf98dff077e842cfbd0d8d24de76ac51b3ff238d31551a48819d8f694fee6e9bb422ca954e54c22b4bda0038c
-DIST setuptools-41.1.0.zip 851100 BLAKE2B 1a2dcb1d3f1a34d9a5dab5156b76cddb03da0f3745e57ebdd363cdd23512df0de8f0d3131c930e2b67ae34fc15f75a9c06802826f97508bfb937a9e45ff287f4 SHA512 07e3381fffc7b75051640c07e334794cb008682e05ab8bbd5bb1e9757fd36305997a2974c424fd474411941f5ff014a53ec1edc276543593b238fe1e97d7d106
-DIST setuptools-41.2.0.zip 851251 BLAKE2B 1c4896c429c670832a46f951dc4c4958f808f1a7c0ad88670705fe265bee23c1d2b6a348b13298b0a60b6c821d504567d4d35b33f388949028391219cd45191e SHA512 6ac0da9f2e452b2b2334c03eb1667d88ebffeb68da18a69fe14f9f0763ac391986dcc663f123015b63eb0c3f905e5a8be7408499ddb1ac20367109275cb66ac9
-DIST setuptools-41.4.0.zip 855608 BLAKE2B 8047a5915d37168c04eded6e0b0b2273557bba7558a173d3f904985471124703797e2b5d00ce8c28096213a181e268a9bae5566f112683b3bee21df26795f5d3 SHA512 3b8406dd6ea23623112b8ba418e70fa97317449838a5dfc54d46738dbde3f2fc15657466e296e2f9bf72cbbaa0aa28ba42d8392afe29f9583cca258645e189b7
-DIST setuptools-41.5.0.zip 851068 BLAKE2B 1a45674719fb661eccb43789f0851a1bb1800d13e5a0f99916762c9391bf49acd580b6500e0f5e8f0b23f6a671891b82c48d6300c9d9b7605cb0dfdca7a15075 SHA512 d02c5db7649281fcdc010837a600611af260bb7563440da4ad84cdbaa35b19c7cc1890ae7bdc58b49dfed20041b0ac52a8dbe0dfb340a804668cbecaea6b2bb7
 DIST setuptools-41.5.1.zip 851097 BLAKE2B 2411db77cffb24190c1510c7fab623ae0fb2a248994eae01e1a79427d35d8bf6a2f065de0d95dc11105df0bb42962a57c914486b48dc91115ec32e4dbcbc059d SHA512 eb6e944c80448873f8970477aaf474e75879e2b81b91fdc7a308670fed231d52880c3be3452e7ed3f094f20d4afe54b1db24ec4d98845ed47ee5e71dbf66261d
-EBUILD setuptools-36.7.2.ebuild 1921 BLAKE2B a1cd7bcb5fc4ae19d069e63f56081948d2fde3161354edb7429d43907f33effb8ed04fd91ebc55e443ff44feca82051754ccaeec86fda6a36d05ff9c580dd6c7 SHA512 cd34166c627d64ac0c8f4200ded764737471884e139f7cc48ef05bb35c4af2ac9d0893ae4e9c5b2431f8e5644e253a7ef9bcd185319c1e3941c173ae6295be3f
-EBUILD setuptools-40.6.3.ebuild 2035 BLAKE2B 6c93bb41ce77fc6593fe2d8ec78387dc77076f54feda974de13426e20f3ba7691f425323b7d918c4c27664f376ae96ff202ecff5439330019fb4f0e9f74f5db7 SHA512 402524d29595c3d4c76b0fbeb3f049dfe004fba93372e21f3f86ec9c31cb74bd148b0eb23ddcfa720cca2bd2ddb102c9317839791e2370cc2abbc28f1321a6bc
-EBUILD setuptools-41.1.0.ebuild 2073 BLAKE2B f52c67f7f42c9d8dc9a66b58d8ef3b5339e1c21c04083d94b0e5ebce3c76451f4609adf34945218e5845ca52f6f1fd4b019799a0528a97149f506d753eb24f98 SHA512 92da410f706e73e6597c4de56c0e0e2a1c35000ced3e75e7707b1ee23aeb4dc39e1d3cbac305227ada07bb55936733b8786794f7bab16fb9890697883fabbe2a
-EBUILD setuptools-41.2.0.ebuild 2073 BLAKE2B f52c67f7f42c9d8dc9a66b58d8ef3b5339e1c21c04083d94b0e5ebce3c76451f4609adf34945218e5845ca52f6f1fd4b019799a0528a97149f506d753eb24f98 SHA512 92da410f706e73e6597c4de56c0e0e2a1c35000ced3e75e7707b1ee23aeb4dc39e1d3cbac305227ada07bb55936733b8786794f7bab16fb9890697883fabbe2a
-EBUILD setuptools-41.4.0.ebuild 2073 BLAKE2B f52c67f7f42c9d8dc9a66b58d8ef3b5339e1c21c04083d94b0e5ebce3c76451f4609adf34945218e5845ca52f6f1fd4b019799a0528a97149f506d753eb24f98 SHA512 92da410f706e73e6597c4de56c0e0e2a1c35000ced3e75e7707b1ee23aeb4dc39e1d3cbac305227ada07bb55936733b8786794f7bab16fb9890697883fabbe2a
-EBUILD setuptools-41.5.0.ebuild 2073 BLAKE2B f52c67f7f42c9d8dc9a66b58d8ef3b5339e1c21c04083d94b0e5ebce3c76451f4609adf34945218e5845ca52f6f1fd4b019799a0528a97149f506d753eb24f98 SHA512 92da410f706e73e6597c4de56c0e0e2a1c35000ced3e75e7707b1ee23aeb4dc39e1d3cbac305227ada07bb55936733b8786794f7bab16fb9890697883fabbe2a
-EBUILD setuptools-41.5.1.ebuild 2050 BLAKE2B 17bfa3cb371bd5d3fc288bc9aa0ec68c0592f0c6b8db3277fa53b871e539161d404dbf9addd70ccfb61bf3b588429c5e940f83eeff1057004decfee02f54156d SHA512 b351105eb31a777f03ad5b69adea64f1c900a93f1b0f1562d210f61c252b0a801044cedcc7905f86c28ae510d8734b1f5c0f41eeb03bff0afdb1e1c297d8181d
-EBUILD setuptools-9999.ebuild 2013 BLAKE2B 7bc1db57ae83e5e8ca5b5733d8b2b708dbf9bef02d67c56addd4e9a7a8de41fa32b58e2bba5bcd22ae275c2a1576b7dbcecbc030e9bca54eaf46122b838a06a1 SHA512 62e5a684052e0f667d54e01906ed7f17a92f29bf5038503b2d86edc5b2555020f1e874a3ed567a10ba68033c81b86d133a8129a73f264a803616ff6b6c68e25b
+EBUILD setuptools-40.6.3.ebuild 2062 BLAKE2B 2a438f56c0ba34c5434b464721d93b2e19358f32d4e11b02184b32cc3888ccb372825e5a85de32317654b7fe1e011d70ce9601091b01a6a843ee078eba832992 SHA512 086fd3a1bf75826de20f0feb448f9d42c960ceb3ebc6abc9aed73d09c235547b671fc69eecfc2dedebed257f8c4d10ea90f57a52483ce23c3270931614e39343
+EBUILD setuptools-41.5.1.ebuild 2591 BLAKE2B e48a3837c1e1a12004e8a49f3c0d9de92d6264c07e0ceaeb0a8e6d5cc9f0e38252759191fa168d86149ca997b6c814cbdafea4fcc6cb8564ca114224ad29ca3d SHA512 5dd491de4214be46f1fe9da214a158618c3582dbf117e3bbf88cb46a6ae09a674073929709beec92a88556397c6e05147461445c529b88fa2db447653a54aa9c
+EBUILD setuptools-9999.ebuild 2052 BLAKE2B b04dd89a6902692fa11323e0fcb4223f2aaf1adeec9b8c6254d7e559bfb61e1ff0d5d3014b03d538233799a01911210a86fd0c3379ed7f2a4b53b76ab16b9d86 SHA512 05b79921883851b4536505409bc9389c2ad6bdcf17d5e840c8b49fe625aaf3b662be8c108211f8ad478cf76679b130641869f812a89914a1d2a32aaeb3861e05
 MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94
diff --git a/dev-python/setuptools/setuptools-36.7.2.ebuild b/dev-python/setuptools/setuptools-36.7.2.ebuild
deleted file mode 100644
index 4700480c42a2..000000000000
--- a/dev-python/setuptools/setuptools-36.7.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} 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 ~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/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.1.0[${PYTHON_USEDEP}]
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
-	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}" py.test --verbose ${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.6.3.ebuild b/dev-python/setuptools/setuptools-40.6.3.ebuild
index e7098fd84b42..d5d482efd58e 100644
--- a/dev-python/setuptools/setuptools-40.6.3.ebuild
+++ b/dev-python/setuptools/setuptools-40.6.3.ebuild
@@ -21,6 +21,7 @@ HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools
 LICENSE="MIT"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 "
diff --git a/dev-python/setuptools/setuptools-41.1.0.ebuild b/dev-python/setuptools/setuptools-41.1.0.ebuild
deleted file mode 100644
index f3990f7b4a64..000000000000
--- a/dev-python/setuptools/setuptools-41.1.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 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
-		<dev-python/pytest-4
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
-	if [[ ${PV} == "9999" ]]; then
-		python_setup
-		${EPYTHON} bootstrap.py || die
-	fi
-
-	# disable tests requiring a network connection
-	rm setuptools/tests/test_packageindex.py || die
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-41.2.0.ebuild b/dev-python/setuptools/setuptools-41.2.0.ebuild
deleted file mode 100644
index f3990f7b4a64..000000000000
--- a/dev-python/setuptools/setuptools-41.2.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 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
-		<dev-python/pytest-4
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
-	if [[ ${PV} == "9999" ]]; then
-		python_setup
-		${EPYTHON} bootstrap.py || die
-	fi
-
-	# disable tests requiring a network connection
-	rm setuptools/tests/test_packageindex.py || die
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-41.4.0.ebuild b/dev-python/setuptools/setuptools-41.4.0.ebuild
deleted file mode 100644
index f3990f7b4a64..000000000000
--- a/dev-python/setuptools/setuptools-41.4.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 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
-		<dev-python/pytest-4
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
-	if [[ ${PV} == "9999" ]]; then
-		python_setup
-		${EPYTHON} bootstrap.py || die
-	fi
-
-	# disable tests requiring a network connection
-	rm setuptools/tests/test_packageindex.py || die
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-41.5.0.ebuild b/dev-python/setuptools/setuptools-41.5.0.ebuild
deleted file mode 100644
index f3990f7b4a64..000000000000
--- a/dev-python/setuptools/setuptools-41.5.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 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
-		<dev-python/pytest-4
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
-	if [[ ${PV} == "9999" ]]; then
-		python_setup
-		${EPYTHON} bootstrap.py || die
-	fi
-
-	# disable tests requiring a network connection
-	rm setuptools/tests/test_packageindex.py || die
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-41.5.1.ebuild b/dev-python/setuptools/setuptools-41.5.1.ebuild
index 69da3de1a382..ff4a7aa54630 100644
--- a/dev-python/setuptools/setuptools-41.5.1.ebuild
+++ b/dev-python/setuptools/setuptools-41.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -25,15 +25,19 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 "
+# Temporary hack to avoid py38 keywording hell.  Please remove when
+# the test deps all have py38.  Also setuptools' test pass with py38,
+# so you need to hack them all in locally before bumping and test.
+TEST_USEDEP=$(python_gen_usedep python2_7 python3_{5,6,7} pypy{,3})
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
+		dev-python/mock[${TEST_USEDEP}]
+		dev-python/pip[${TEST_USEDEP}]
+		>=dev-python/pytest-3.7.0[${TEST_USEDEP}]
+		dev-python/pytest-fixture-config[${TEST_USEDEP}]
+		dev-python/pytest-virtualenv[${TEST_USEDEP}]
+		dev-python/wheel[${TEST_USEDEP}]
 		virtual/python-futures[${PYTHON_USEDEP}]
 	)
 "
@@ -61,6 +65,15 @@ python_prepare_all() {
 }
 
 python_test() {
+	if [[ ${EPYTHON} == python3.8 ]]; then
+		if [[ ${PV} != 41.5.1 ]]; then
+			eerror "Please disable py38 hacks and test locally, then update this."
+			die "Python 3.8 support untested for ${PV}"
+		fi
+		einfo "Skipping testing on ${EPYTHON} due to unkeyworded deps"
+		return
+	fi
+
 	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
 	# It tries to sandbox the test in a tempdir
 	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
diff --git a/dev-python/setuptools/setuptools-9999.ebuild b/dev-python/setuptools/setuptools-9999.ebuild
index ca0b6f907d0c..8d522c4213f5 100644
--- a/dev-python/setuptools/setuptools-9999.ebuild
+++ b/dev-python/setuptools/setuptools-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 		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}]
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index ebe394aafee0..bbfe6759136d 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -2,8 +2,8 @@ DIST setuptools_scm-1.15.6.tar.gz 25779 BLAKE2B 01d6771c24015f072a46ff1429b96413
 DIST setuptools_scm-1.15.7.tar.gz 15426 BLAKE2B 6c23f2bd74f51ec8633a814ce22e63e5afb9953244659833a61e810c9029227e1cc25a067a59cec5666add76863070ae5b7dc2600953a45def886e52378a3399 SHA512 0aa6056c03fe100cdaa7b11c9d2073431bb5c3904a80a994a8263c0ccac81f7a2c0b6c7e6dfd09ad605c5ff0e86981b894b42920cb69d1ef1d43ea08b2ddd4a0
 DIST setuptools_scm-3.2.0.tar.gz 39646 BLAKE2B 922e2e09a9826e8573900e8d279daf937289f91f8fead5230ea7082d85275d5d988d655854a36afd48d6b621eaa261ac9a0cd486acc115f0e389fb6828645e8b SHA512 1995754654f8bf509ec7f2186857ba0005dbaea0b1c734f521becb9d022c127e7b36f21da8defd5ec9883de5d0d4afe006f9d152c4cefe6beadf8b878e949eb2
 DIST setuptools_scm-3.3.1.tar.gz 40183 BLAKE2B 417cb000c3edba7da8e92b8fb5b1d906d2ef0170eecc4c0b9d2ea490ef6bad4cbf5ca172bee0fc536c83605d361604c728bf4097f520ef8e62ee2d4f004e3db1 SHA512 cd8f3d1e97743097791001197c18a2c8336b9e499a543ec5d1ab6e9b613ef1417b59e34c329507a73c2626506ee892ccaee74dddc5c0950ff71c0bdfba954dc3
-EBUILD setuptools_scm-1.15.6-r1.ebuild 1342 BLAKE2B dfe6b15a2afb8e12c9045349f790094a80089884a7571777038c259e7755bdabc49bacaa268578ab3ca2290de0222004fe747f21c4ff31e8f301b0861d78f442 SHA512 4635b724e86bbd6b962f3f0534cf860dc4cd6051df6752f9fe8625f12ce97b55e3d831f882e4dd3d81ed29199455c223ff42ba1acbef9ff3af7ad15c1d4e4db4
-EBUILD setuptools_scm-1.15.7.ebuild 1466 BLAKE2B 31af4e13002e4e8243066b329bee2ec6dd4e97b7e6d973187ce876baaa75cadff7dff443beda91a9afca6e0f6ca60ae825db3be44ed3990b40e18593a27d06c4 SHA512 a9db37368495c37dc4d48c450bc7f221717c476f0c4ea2504fed51080681d5a6d496dba0f355206c7aa81ce1a970890f0d196e6263533cd5cf947ee401cca0ac
+EBUILD setuptools_scm-1.15.6-r1.ebuild 1369 BLAKE2B 99673d974473af093429b261e0ff50ecd6a80db77b290f90fd9d44a5c7f5598bf5ad029773a2ae9d8f005be57dbf116bf182d2d1e0ea8897d4f22b45a99656ea SHA512 eb1eca65372621b2436af79345a0fae61c5f411fc71dbbdf4be0e6c7c1deb2ca3eaa3a425aa9906459dfcadc3520bd20b7c2fffbdfa0c7811ab1ccaed7951107
+EBUILD setuptools_scm-1.15.7.ebuild 1493 BLAKE2B c4f12f5dc9cf52b1823be2d139ebd6384a1f8a440b6b97f599eff1e03287b9c22905a0f0967dfd22265a2a29b058cfa42c50e8954f3dc8e83dd18cc8beb5bca8 SHA512 e1f32c53488134321f7d9e05dd62bae08ebc667aeea1959f2d0c1934257ce815ee4e904a69d43b39df9147ed32eadb082499094026c83a2925002eb19946416a
 EBUILD setuptools_scm-3.2.0.ebuild 1294 BLAKE2B d384327842fb368efd7eb63a8e1b55aa92da5f19f5301f11f113337e849316b8ea57392526d8ef4ff8770024fb532cdcf03e1e7460ca90a40b310962f77dad0a SHA512 9fdf138a968c9e46e265fe7203606f9c111e67e5221011ae63a9af51eec629ddbfaea28c9bc0c569cfe540c6ec179661f92a0d65e84e9651bf701f1e961e2e21
-EBUILD setuptools_scm-3.3.1.ebuild 1306 BLAKE2B 806f65e0ddb38a8cfdc8a5ff40c875e1e0945e0614cc185d6c62f6cbaa2cd11318069e5d3347ec70f2e3ad14e6891fc448c6c07168ca0a28c78ac52b9883d4c3 SHA512 9b6a0d91db614c80233cb0dcb38fb797aa3480a34b07d68ea190699900b2005be477dedb0e849596d09828e8df605bbbec91ea3babbf26fb1feeaef02d5b8391
+EBUILD setuptools_scm-3.3.1.ebuild 1445 BLAKE2B 8c65b85340452d78fa35c2f2b2613e674ffc0050956beb1e9ad8ea70fb670c58bad2ecf91c4ebb00c38fa1fc850b009b83f00c79bdc22e10c5040fd32ec96021 SHA512 3503fd1c9ea738340030af82e335fed4bcaf56d07090829d99a9b273e6170338058d7773fa7cad7905d11ce84d2b89453e48ba453a1cae513f8286530608fcf0
 MISC metadata.xml 511 BLAKE2B 7ee7b4fe4bb93bca13880e9f6f2e0ae90a27fa79f1bb99395d234322a61de1b2f13906069bde898ad6a3f83e8dc03302cae1fe24eed92e1b7fe6e349b98ed957 SHA512 cf1e97d13c127fa92e8bc5e5d41bb308761c6b75f267969662162f50a4a1a9d9f80bd2cb037711d2f5c7204204ddb9873f21cae5d6831a3127f3cddee3878a31
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
index ca1408a0c098..7d2537afc106 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="git mercurial test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild
index 8cbd32011330..693c850fe6b2 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="git mercurial test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild
index a800175d3837..042257c239ef 100644
--- a/dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -32,13 +32,17 @@ python_prepare_all() {
 	# remove self-dependency
 	sed -i -e "/arguments\.update/s@scm_config()@{'version': '${PV}'}@" \
 		-e "/__main__/i del sys.path[0]" setup.py || die
+	# incompatible pytest version?
+	sed -i -e '/@pytest.mark.issue/d' \
+		-e 's/, marks=pytest.mark.issue([0-9]*)//' \
+		testing/*.py || die
 
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
 	PYTHONPATH= distutils_install_for_testing
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+	pytest -v -v -x || die "Tests fail with ${EPYTHON}"
 }
 
 python_install() {
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index d2b49f453ee5..08e8d7c4d8b0 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,10 +1,6 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
-DIST sip-4.19.13.tar.gz 1038815 BLAKE2B 0b6f2941140a535cfdfb51db71cf9a55e5f65be85961e304496fded7781da42b0ab7d01045b8802468a3ce3b57e7f571851fc7713fd47a03c8344017982d6632 SHA512 eb456e1f7efa463f859047acc5301e19279e1627629d0bad3ac7a0a52b77575126bc3f2c64bb4278ae11d415c13d2731dfc8c816bba71307173d393a414aae98
 DIST sip-4.19.17.tar.gz 1056156 BLAKE2B b5a7b4cd3f2152e9b7ee7b715c3ad72c2092598e0405cefc24d6283e9da07e54fd65da89e137618d3b84f3138fff719cf226600135d646e7bd7c538c2a02cdfd SHA512 d393cfc1643663926bd315a8df92abd82bec071bf0488b047625bdac43e9074bc8a510ac23244a7a2d2d181f70af9691db9d0b759e79643981d6afd71a49d3cb
-DIST sip-4.19.18.tar.gz 1056840 BLAKE2B 6c674405e28a64c9db635deca8a00ed78bf52d2551ed578a57d31ae96071ca77ba49e3fc92329942ca61de78bc98049694cc48ef54ea645819fc48f2fae56060 SHA512 e3c58cc6c38b277b3b9fd7adf33df91b47e0385e59d52c543e630a194d73d04d91e0a3845cb3973d1955f77049e75246fa7e6f544e02e1efe0086a297cf1d887
 DIST sip-4.19.19.tar.gz 1058422 BLAKE2B 9c27e636a55699e8bf9c9caba9227e3ff9c8476dfd86d4bb8b0b53c9db95d28441d1ac03a0d20a71468d39e5f21066475018cff93b96281b3904f6a619304f92 SHA512 396c625f59ccef67c2e94221b26dd4ed5d536652a9b63a9f23b340ddf16adf34c6bdb0fbd7c0c1cc403e1d59e8ebf716b478a24bade66a2703fcc5f00b62533d
-EBUILD sip-4.19.13.ebuild 2880 BLAKE2B 8ccfabd39014bfcf131f0d39b5060978159e2d542b6e86887fc73b4a361b66fa70766ae656dd9267c7037b5fe53b7080a0045b00f3f43df221a1eca1e4938b2a SHA512 ea3d01489f163506f212b59cb2f9fc0f083925fcc4804e8aa35f5734a3f22130010971cec66f6e00c7cb11c52539e1ffda66404bb2c005e565b8faf88e90539b
-EBUILD sip-4.19.17.ebuild 2434 BLAKE2B 4e25ad5740c17ba03ad00696b7e048df36427a2dc5597374e45b02642ec06edefe497ee4f89388a2230f5dcd35bc2a06278cdca69b3d23f8e8a55325623db470 SHA512 ea398c59a259be62d9db5fb6df6809a18cd740a096113c9a21c74740b29ec7b10486a38bf920ee7de29647f2906f102d3e42c105f47fa9986f28b1837480a61c
-EBUILD sip-4.19.18.ebuild 2442 BLAKE2B 5d2baf71d2c282ab2d659cec9e0e93cdf7c90a5e42e995f34716d9397deb7605993d597a08115517d43db9042cee3343a727ced3076bb5f75a9e46acb2c48ea7 SHA512 73425f344c41d0ea37d86345b066989d6c1a54bd58f62904c13965b23ec89adc80043ceec202992d4900921c83bee3318a909879b6ed47a0be559be072ed8307
-EBUILD sip-4.19.19.ebuild 2442 BLAKE2B 5d2baf71d2c282ab2d659cec9e0e93cdf7c90a5e42e995f34716d9397deb7605993d597a08115517d43db9042cee3343a727ced3076bb5f75a9e46acb2c48ea7 SHA512 73425f344c41d0ea37d86345b066989d6c1a54bd58f62904c13965b23ec89adc80043ceec202992d4900921c83bee3318a909879b6ed47a0be559be072ed8307
-MISC metadata.xml 648 BLAKE2B f49eaeae5e37d91c569b93fdadc4401e478c54a754290ce37dd51d1d03340ead54f4d0f52389d87b91801a2c1ad0040347e629068a6c0ffe79a9e3442498e4f6 SHA512 1a2a4fb4e7fb35fb6177d62d5c866a5c65c1915ff38de5815823864fb6d9a90beaa8897e28a65f79770a621ccdd83755c682df29a25bf00a76ffd51b215dcdf9
+EBUILD sip-4.19.17.ebuild 2377 BLAKE2B 4cc5fff41fa36333881196b7fe668c3add3246076264f1c8b57c0139775db7c169f7e81006c7ff82521248d59a17a3cda2a16107dba57571bc1c112cafc18d44 SHA512 8f587125a62da80198e81f00be82888320a86288ebec2e111f67951a098a4e16fc9c3af18f199fbe85e501c3474bdbf2662304e6e3f67c0b5de5f22211117ef4
+EBUILD sip-4.19.19.ebuild 2387 BLAKE2B caf8a873579ba9b764c839d3dc6a8a4633a6d047630ff3af22b4f613e67e8f7f7d2d4ad7291ab419b13ddb93a12d3e4c25789c41e4036d3778ba978ef4300229 SHA512 f0131e25de07b46ba5a65f40269b3c2fc557dc6508ffa6dcb9e1396af054da8ee69d2a66a75f599e2c805d9f0b70a65a037cfd2d6779145ca284d6df02b31059
+MISC metadata.xml 642 BLAKE2B 774d24a62fcf22158044669fd9981456a0b7512cc838cf15425239e9163c946adc5b01169d773167e98e4cc09a3c965b9a87b374048e3533b2140d35202e24ce SHA512 f6f3d30b416dfa71a5f3c245695ce958fc43a701a71f80968f06a0d21ec2c6387dcf505d8b3db1049b74ec8fb560e4a25547dad11365b23d78ed4e6f5769042b
diff --git a/dev-python/sip/metadata.xml b/dev-python/sip/metadata.xml
index bac1beb353f3..921d0b0925e6 100644
--- a/dev-python/sip/metadata.xml
+++ b/dev-python/sip/metadata.xml
@@ -10,7 +10,7 @@
 			<email>phil@riverbankcomputing.com</email>
 			<name>Phil Thompson</name>
 		</maintainer>
-		<changelog>https://www.riverbankcomputing.com/static/Downloads/sip/ChangeLog</changelog>
+		<changelog>https://www.riverbankcomputing.com/hg/sip/raw-file/tip/NEWS</changelog>
 		<doc>https://www.riverbankcomputing.com/static/Docs/sip/</doc>
 		<bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to>
 		<remote-id type="pypi">SIP</remote-id>
diff --git a/dev-python/sip/sip-4.19.13.ebuild b/dev-python/sip/sip-4.19.13.ebuild
deleted file mode 100644
index 6a061b393ff3..000000000000
--- a/dev-python/sip/sip-4.19.13.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://www.riverbankcomputing.com/hg/sip"
-elif [[ ${PV} == *_pre* ]]; then
-	MY_P=${P/_pre/.dev}
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${PN}/${PV}/${P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-if [[ ${PV} == *9999 ]]; then
-	DEPEND+="
-		sys-devel/bison
-		sys-devel/flex
-		doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )"
-fi
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-if [[ ${PV} == *9999 ]]; then
-	REQUIRED_USE+=" || ( $(python_gen_useflags 'python2*') )"
-fi
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
-	if [[ ${PV} == *9999 ]]; then
-		python_setup 'python2*'
-		"${PYTHON}" build.py prepare || die
-		if use doc; then
-			"${PYTHON}" build.py doc || die
-		fi
-	fi
-
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		if ! python_is_python3; then
-			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		fi
-
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--incdir="$(python_get_includedir)"
-			$(usex debug --debug '')
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-python/sip/sip-4.19.17.ebuild b/dev-python/sip/sip-4.19.17.ebuild
index 8149dcfb60d5..caf91ebc164d 100644
--- a/dev-python/sip/sip-4.19.17.ebuild
+++ b/dev-python/sip/sip-4.19.17.ebuild
@@ -20,7 +20,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/sip/sip-4.19.18.ebuild b/dev-python/sip/sip-4.19.18.ebuild
deleted file mode 100644
index dc7d5ca70d85..000000000000
--- a/dev-python/sip/sip-4.19.18.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-MY_PN=sip
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		if ! python_is_python3; then
-			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		fi
-
-		local incdir=$(python_get_includedir)
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--sysroot="${ESYSROOT}/usr"
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--incdir="${incdir#${SYSROOT}}"
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-python/sip/sip-4.19.19.ebuild b/dev-python/sip/sip-4.19.19.ebuild
index dc7d5ca70d85..b8b2a0668235 100644
--- a/dev-python/sip/sip-4.19.19.ebuild
+++ b/dev-python/sip/sip-4.19.19.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Python extension module generator for C and C++ libraries"
@@ -20,7 +20,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index 874767d99de8..32fa0b50f6d7 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -4,8 +4,8 @@ DIST six-1.10.0.tar.gz 29630 BLAKE2B 1f380dbc7a9e746b4a7909de54a58a008a73d7b6c58
 DIST six-1.11.0.tar.gz 29860 BLAKE2B de4886ad9af7aa906f9eac213544c99323d74c1988d9abff96ce6fc3eea4464e577511f7c52328cbd9e6989db2128fa8d1ee57f9ce7bfc36b83ff655691b46c9 SHA512 33f246a2e987141e17e5edad9d3537cf3aba0cbdd0bc2a907ea52ce0d674b1474f29c3dd5cc26605fd960396054b189ca5f501708333cad234c223131483fe24
 DIST six-1.12.0.tar.gz 32725 BLAKE2B f40621076a7bb2b3b86d9f6ee49056a598e4853c6150952902053b8cfde86e562a7656b6ca3c3108f407d392cf7c1164a61b36142efd565eda909b8733c0bedb SHA512 937728372edf1e0ac13bbd706723d0de35e015c30d0ae41f789c5ed2e3669bb0db70cdc6e036ec2d437a6c4aa0d5d1e727b6d09ac34cca7e4e92e5d3b4775151
 DIST six-1.13.0.tar.gz 33726 BLAKE2B 9910a72eea4adc030710b67252d01fd74ce4205bd4e0ccf662bb2bce8837853cf341c765e4f9ba2db3aaeca050dd2b1ccabefacf5c71383dad1d275326313ef6 SHA512 55eb8e23e529cb0d2ab9e7c85868e695f36c8235e914b1548eb4b9fd561e4237266bf1839457f15a9513d57a343cbf8ab809d6187499300791fd9356854fcb00
-EBUILD six-1.10.0.ebuild 1790 BLAKE2B 6a65aca8d3ebf72591fa2195d986d9a3a88c46b6d08d2700cc80fbc8c2f1d28004f56a1ac715c6415b085a6a70ad55295bed6b1ed1b50e0dd9f62f0bff5c1be0 SHA512 925fda6e0e1da4566e89c4a8b78962a1d043b5639a36e6433cd4f2c55aa90750139bab8ef376fa85b9277b2eae85aab0dcd007d09a3296d8ff45a940d86b1b73
-EBUILD six-1.11.0.ebuild 1054 BLAKE2B b9132fa3c45dda3702e13d39de4a17415c634eb4ce5b8530b38c9eb4a656d94f4a0f900996178160dab532f2c2e2a12814ba530d751dbc496a0953f4a89a15fa SHA512 2002bd4217389a2f5b13fb90afbceecba7a1152cd8604739a1d62f927dfa3f1c5229b3a8d584fdcf72ab210201e5551be08554250bac6240f71f8160f8886ace
-EBUILD six-1.12.0.ebuild 1054 BLAKE2B 6a299eb827241e210d8bfe13d19f71d10d4eb39b02d38a68202dbc99704e8ed6f5cc72ad9572a5a528d4585e8accf881ebe16764b1aa4f70a715869320ea1586 SHA512 648e5fb86fe1e6eb6c7a35211f1099a88623f566fc9c0280e4c3dd814adb7c8e978cfa45c4cd417d5597cd41910c8d7c4b5fbdd3007558e12bdb7a99695ea5d1
-EBUILD six-1.13.0.ebuild 1094 BLAKE2B 9ada3798d2b0b42ccb325de407ebd3798a4ad5952fd271b7b9f511ec645e639cca2a4d5e14632228e16d3ca69c0ce24994915a93fe767531e7f92b6ea25a1075 SHA512 9044271a3aaa1676d85748e5ce4b27ef2f1ac34a17ce48d046f2053460336096499a600e5816069b9f187cae0f75c9af06c59eec0d49a522f67871c6f38c470a
+EBUILD six-1.10.0.ebuild 1817 BLAKE2B 7443de4831c75bfd5ce1a856d9f0d198ed1f9d31a920cdefd269169cd4d77b0be751fb399838a6955476a1b111a01c28a9d0565c99f7ab87cd226514c18a4a64 SHA512 b6445d44d055372cb8ef80c388a264d69dea07d35ceef38c59a0209b341dc7909b418c3e9031c699cb85bfadd0ecf7b19b5a0a2269852198fd6e761728a7c1aa
+EBUILD six-1.11.0.ebuild 1081 BLAKE2B 021bf40e06a696a942d17cb55ae695f91b5d2c2fb77cba644cc4718ad48dc0a3b159489fc0d57fad278965d7875bd739d53309de433b6ff53e2f3c64181a4a49 SHA512 6ea68f2540f037b31877d4b24fba3f75f6c67088943599e5b8bedfb7f62c48240ed3ac56005541b9c8931a82206a74d5face3fa173d5393735b596fcca9b3de0
+EBUILD six-1.12.0.ebuild 1081 BLAKE2B f7f65cb2f3f2a60b0f28f6d3e26cbcfee37b025860f43d8d8536f710e4a63997c10c176c4215b21236bc461a038c8b27fc5fe0b84c69183c74f9059d357ac1a0 SHA512 70451b867e4c5be35f22d3a10b0b34d87fc64769a5af332802b03335a3e58f0a8be9209f814ef83c30620cd2c6ce48f10aab5e8cb55f41a3b4b3a084e93b1d5a
+EBUILD six-1.13.0.ebuild 970 BLAKE2B 39047611afb72a627d1211f07db4c15725cd693806d0082eaa0394521c632b279281e7d87d97aa848d1a066f9cb0ed7d973c71850cc34265b66b030041039010 SHA512 7cb3e1d3325b1006b0b0bd1bf688dc09e7f951bb41c9fa471c81dc3ec5a8cc2a11f05c4eead2871ed14797f756c295dfe7efd6f9f496e7de47f8efbd6f8b1bc2
 MISC metadata.xml 371 BLAKE2B 475b717d4c4bced0454ee0244b5d30f178098ff45b2fc7d168b41f446c4e8f3f2dc022ccadb953d6f4e905f95e38769657d42fb4d80157c816d6e7b5eddb33c2 SHA512 8171125815ab60f7c9a2756367ee6532fd862c5f411ff828b6555e4e21e6d43672f2c764f92134f6625abb161380bdbb739af259ba88c974cf3583f35af76a91
diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
index 2663ac4765e5..7090da247874 100644
--- a/dev-python/six/six-1.10.0.ebuild
+++ b/dev-python/six/six-1.10.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	doc? ( dev-python/sphinx )
diff --git a/dev-python/six/six-1.11.0.ebuild b/dev-python/six/six-1.11.0.ebuild
index 0167375db63b..1ee693a812e8 100644
--- a/dev-python/six/six-1.11.0.ebuild
+++ b/dev-python/six/six-1.11.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/six/six-1.12.0.ebuild b/dev-python/six/six-1.12.0.ebuild
index ffc74485eb06..a1e28891ddc5 100644
--- a/dev-python/six/six-1.12.0.ebuild
+++ b/dev-python/six/six-1.12.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/six/six-1.13.0.ebuild b/dev-python/six/six-1.13.0.ebuild
index 9a10d29473c0..68e1c52e8f8d 100644
--- a/dev-python/six/six-1.13.0.ebuild
+++ b/dev-python/six/six-1.13.0.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,8} pypy{,3} )
 
 inherit distutils-r1
 
@@ -14,26 +14,22 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+IUSE="doc"
 
-DEPEND="
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-	test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )"
+	doc? ( dev-python/sphinx )"
 
 PATCHES=(
 	"${FILESDIR}"/1.9.0-mapping.patch
 )
 
+distutils_enable_tests pytest
+
 python_compile_all() {
 	use doc && emake -C documentation html
 }
 
-python_test() {
-	pytest -vv || die "Testing failed with ${EPYTHON}"
-}
-
 python_install_all() {
 	use doc && local HTML_DOCS=( documentation/_build/html/. )
 	distutils-r1_python_install_all
diff --git a/dev-python/sphinx-issues/Manifest b/dev-python/sphinx-issues/Manifest
new file mode 100644
index 000000000000..df064d595d23
--- /dev/null
+++ b/dev-python/sphinx-issues/Manifest
@@ -0,0 +1,3 @@
+DIST sphinx-issues-1.2.0.tar.gz 8051 BLAKE2B 2f17738719f92be1e4ef2d7e2e0b7c123f6f924e4bfea82e2151ed96b9fdbe2cf676bddc5c009a947e1172a84131a1a58a3bf0758f045a636bd4cb7ec496fa68 SHA512 8814e910b111f0b241bc40a93de8b6ff1acd24437f1b014b24691b3bbaaadaadaded82175067d8992bb482f4bfcdec570cdd26b4c6858d7af60d5dd3f0638b64
+EBUILD sphinx-issues-1.2.0.ebuild 711 BLAKE2B cb37777e2d5caf682db8bd0d61c01552048b75bd85f7fe045c70bf0f6cbbea1ff0d0da3a89f96fc3fcb5007c7fc5b0c23f847abffa4c27807bc53d28f333acfd SHA512 f253db19cdc88670fa2e7ac168befa58b26a9d452aa7c0a08d81f3614814cb3504a53e6048b804fea62f5dfb1439fe8e17a715ff826d3d4fcb11efaf98d4b04c
+MISC metadata.xml 388 BLAKE2B 192707563103236482cf5de03630e3b39f6827f446ba6e058e29c384d6e989e3b96b3f54b5e353426022328f81596ba3c70c61f3f84f69b3c20f34163836b74c SHA512 3b29ce4fbde49727c8dfd8f7f28f3baea1ca5feb60a1ab21b8ac0b597326e702941cb0190903aa930d55358c092bb5ba6b31d27f9acf8940380557c562ea659c
diff --git a/dev-python/sphinx-issues/metadata.xml b/dev-python/sphinx-issues/metadata.xml
new file mode 100644
index 000000000000..17cccf68901e
--- /dev/null
+++ b/dev-python/sphinx-issues/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">sphinx-issues</remote-id>
+    <remote-id type="github">sloria/sphinx-issues</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
new file mode 100644
index 000000000000..16ec95d7500b
--- /dev/null
+++ b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="A Sphinx extension for linking to your project's issue tracker "
+HOMEPAGE="https://github.com/sloria/sphinx-issues"
+SRC_URI="https://github.com/sloria/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index e82eb7184898..710f3daf1492 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -8,10 +8,10 @@ DIST spyder-3.2.8.tar.gz 3414627 BLAKE2B 95f85f719eba20eb9fed5183cfac582b040abc9
 DIST spyder-3.3.0.tar.gz 2782654 BLAKE2B e85ef52109c723d6b1b011f0e81ab3a46d3e0e6ba72fd34a1eda9ed650c9e03532e8fd72e05365367f62035a6f03d6ec32d35314c54438bf639070c7bebfb4d6 SHA512 53a2b438afe245092eda4d202d2453b5b93d6682aafcdb00bf251ddcdb30cee2d81d8adadbe23fa36f64fa5f917b327690cb8f9e2cf5c0da2841b5eda648a26f
 DIST spyder-3.3.1.tar.gz 2786730 BLAKE2B d906b5750cb620db41aec514a64d132b9ee5a992047828faffe11af5abd22d0cec7b876dfe79c6d378804373e8db5c661214f5730833e7599bf13b80d4dc16d6 SHA512 91d648a2717b5d5386115ba800fdd98884e609b213007dbaa09c7d16335f1b9ec3d0bc6b32d1677db8c2704e990e70eaa04d6d1efc800008cddfa511105e9c68
 DIST spyder-4.0.0b1.tar.gz 2986758 BLAKE2B 7fa918a569ed26d1d71ea7bce725f1b7d5db54badf3fb7bad1265d93f2ebdf25b1246acefb4f8517a6f34968bf8f12331958afcf72fc3c162e0d06d9dc4d4c72 SHA512 5751434b7ffac4d1e0c535f8a842656c3a306ed3d8a275a06a0eb57d3cd9bb36d01341723159292cba8616fcadc7157387fdb334b2ab0efbc1bb6b920102015a
-EBUILD spyder-3.2.4.ebuild 1715 BLAKE2B 95fdd7a0afa73ec9967b695e92800409df2b484fdd828bcab5c861e7cb1b33762cf235c91470c3e1dc08325f67df65ed91ab723240f2f6e2b62796d2fbde8f6f SHA512 42880adb1665ebe449a2f10902529759b04aff93e355ec7fa8d1bfeefb3ce493164773afb40e62924e4b6deea8fbe18e3f59a1d6d1654f85e532bd4d9dd39a71
-EBUILD spyder-3.2.8.ebuild 2585 BLAKE2B 9413de4f3ab9660100819266fb04b90925fbe3bdd3d322927b2379bfbde1c5bc6dbf1e69923e3775852a364020547cce51137094bce06c06d770df419ae4778d SHA512 1116f82c9ab62e714361e8ad931edbecb413f2ef6487593233309604911707bc00ad6f848d68f0f308df2d507332d448c5eeb30adfa12fb62d9166347808a6df
-EBUILD spyder-3.3.0.ebuild 2470 BLAKE2B 12646b7007c16e2d925362d3b4a99c9f7a0db09cc107d7b293231f22471228a95b8cd9715fb83bf953c029c9d8b68a76d325cda12274783c163da4e623ec1a8b SHA512 d6cffb9a0c34c75b8cd8555838293719eedb2c9cbed2e23817417a3f27139c4e3fab8aff0d579d5e66f4afb9265726e8a54ffced4fd6ca1c238556377468ce04
-EBUILD spyder-3.3.1.ebuild 2470 BLAKE2B 12646b7007c16e2d925362d3b4a99c9f7a0db09cc107d7b293231f22471228a95b8cd9715fb83bf953c029c9d8b68a76d325cda12274783c163da4e623ec1a8b SHA512 d6cffb9a0c34c75b8cd8555838293719eedb2c9cbed2e23817417a3f27139c4e3fab8aff0d579d5e66f4afb9265726e8a54ffced4fd6ca1c238556377468ce04
-EBUILD spyder-4.0.0_beta1-r1.ebuild 2518 BLAKE2B beaf0317f122dded42e5ec72153baea5e1f37b1cdf2eb2143181716e52de7d803781d98f156ba857b2632f3a7ba059ee29f60621ae20d084d1dcfef541b7afc1 SHA512 06edd987be3634b30161d04371c7fefd9b4da5b780fd6730bcda3083c9b60c1d83b12403c3a9264b5640a6ce30dad0ac10583d94c0e4f4d06e0065f9f4e29bd9
-EBUILD spyder-4.0.0_beta1.ebuild 2525 BLAKE2B f61f578ac0238ba4a022505c0ff6ce7f19d8b5ac49327f4fff766983e418faba537855b5be236e4ba955e3dc46c8bdc8a7900d471ec54ed77a55668dc3864268 SHA512 db04046da1a43a39240d32fab56a35c06cb0d5e4b5efbbd5fde37e4b526086433c3f03f7b2c69e99b0b50ace88b0323aed582dc2bba58b3e47943f5760dac33a
+EBUILD spyder-3.2.4.ebuild 1668 BLAKE2B bc96bc82b306d6f8eca3f90b8f29bc61006ea40ef75b36133e1c84608046a2552e07e2992af5aaebbabe398e4bfaa121e8e83265586f27b58265220648fafb0a SHA512 54d24033fac44f74b5da1577d755f2765ff1a5979074cffffe0635288eca17dd86dc6178c9f83225f49fb491d6618a37f9394095052186e90cfa2acbea9b256b
+EBUILD spyder-3.2.8.ebuild 2526 BLAKE2B cd6ebd71f6a43bc174730abd2a9b00427da0af7f9eaa516dd4019cce87ed248eeb3a75c9bf621450b72164267aa39b62d67b3ee4c31cff242fbb264a1a3925c6 SHA512 3b6503f31cb342b6888dcca05820a74295ee8276a28d265c1f4cc2e8171fbd9a5f9a41fcd0b52692ff4ec7a46ecbadfde57113551a2dfc8d13c27deded03a2bd
+EBUILD spyder-3.3.0.ebuild 2408 BLAKE2B f0d5b811b02322a2dba1bf59b5da98ad486478f2723f53859b4137770f14b9a48e0e3ecf85efe36a4ffd8878dfac9d359753c387e3a523e03082f3cebeb6c490 SHA512 2c9a687a12e5e55ebbca820d9b5ee8f9659368984d93856939e6891b842e717b929be2c74543ba33c2c966f73aa675595d0e3440ddb56c9eb52a0bbbd2b33f97
+EBUILD spyder-3.3.1.ebuild 2408 BLAKE2B f0d5b811b02322a2dba1bf59b5da98ad486478f2723f53859b4137770f14b9a48e0e3ecf85efe36a4ffd8878dfac9d359753c387e3a523e03082f3cebeb6c490 SHA512 2c9a687a12e5e55ebbca820d9b5ee8f9659368984d93856939e6891b842e717b929be2c74543ba33c2c966f73aa675595d0e3440ddb56c9eb52a0bbbd2b33f97
+EBUILD spyder-4.0.0_beta1-r1.ebuild 2459 BLAKE2B 8d689c946b5b7c8cee043d1c1452fd2b0c17247bf6ea959fd5a62304f7cf59f1c2dc47ec68fed87ce35152a9bd52551d3acbeeced6a7bd30b27e7e98c5103fcd SHA512 a7dd13b033a8eb7e7464a7253f3f78933349c43e28041aa0bb4ab0cd07aeb851d247c3849474423beb88d172ba4dea5791b7fe22056ea73378fcba31fee2e4ee
+EBUILD spyder-4.0.0_beta1.ebuild 2463 BLAKE2B 90d4752908243a616fe51cad1b7983406db6e0998a8a83d5886889f8f3af8aa81ca161fc631142ec8a526453ac939192a582326481f60a823425b95f770e72f6 SHA512 d7a7ac2b91a1e2dcb4deda1f6203170f9aa8f31dfffac5bd94ecd3b60e7a48dc7129a50b5ad11372002d7ed57c544fcd44120d2b61f36c0ae12dae819258d151
 MISC metadata.xml 1371 BLAKE2B 1b79aa84224554c57dc9ba4cfb888a9d18ed1b5fc99b6912de2603ac9c7866a4abb0a43a8a86df516b2b5ef3c4a0cdb18c20ea648e59002635affbdc813e2589 SHA512 8af58f099e6a7d97bd266c2d09b44ef51ec71a3ae51d61caf49968d6ecb8d830e4003171080011d390e9a27fd3010f95f22e9555a702f26e6635a4e1e02db537
diff --git a/dev-python/spyder/spyder-3.2.4.ebuild b/dev-python/spyder/spyder-3.2.4.ebuild
index 9d632399f7d0..bab2400434ba 100644
--- a/dev-python/spyder/spyder-3.2.4.ebuild
+++ b/dev-python/spyder/spyder-3.2.4.ebuild
@@ -20,7 +20,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc hdf5"
 
 RDEPEND="
-	dev-python/PyQt5[${PYTHON_USEDEP},svg,webkit]
 	dev-python/QtPy[${PYTHON_USEDEP},svg,webkit]
 	dev-python/qtconsole[${PYTHON_USEDEP}]
 	>=dev-python/rope-0.10.7[${PYTHON_USEDEP}]
diff --git a/dev-python/spyder/spyder-3.2.8.ebuild b/dev-python/spyder/spyder-3.2.8.ebuild
index d1a5a7734f01..0f835a2b4214 100644
--- a/dev-python/spyder/spyder-3.2.8.ebuild
+++ b/dev-python/spyder/spyder-3.2.8.ebuild
@@ -33,7 +33,6 @@ RDEPEND="
 	dev-python/pyflakes[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},svg,webengine?,webkit?]
 	dev-python/pyzmq[${PYTHON_USEDEP}]
 	>=dev-python/qtawesome-0.4.1[${PYTHON_USEDEP}]
 	dev-python/qtconsole[${PYTHON_USEDEP}]
diff --git a/dev-python/spyder/spyder-3.3.0.ebuild b/dev-python/spyder/spyder-3.3.0.ebuild
index a6d1a67a4d36..6a60b9aa82cf 100644
--- a/dev-python/spyder/spyder-3.3.0.ebuild
+++ b/dev-python/spyder/spyder-3.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,7 +32,6 @@ RDEPEND="
 	dev-python/pyflakes[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},svg,webengine?,webkit?]
 	dev-python/pyzmq[${PYTHON_USEDEP}]
 	>=dev-python/qtawesome-0.4.1[${PYTHON_USEDEP}]
 	dev-python/qtconsole[${PYTHON_USEDEP}]
diff --git a/dev-python/spyder/spyder-3.3.1.ebuild b/dev-python/spyder/spyder-3.3.1.ebuild
index a6d1a67a4d36..6a60b9aa82cf 100644
--- a/dev-python/spyder/spyder-3.3.1.ebuild
+++ b/dev-python/spyder/spyder-3.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,7 +32,6 @@ RDEPEND="
 	dev-python/pyflakes[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},svg,webengine?,webkit?]
 	dev-python/pyzmq[${PYTHON_USEDEP}]
 	>=dev-python/qtawesome-0.4.1[${PYTHON_USEDEP}]
 	dev-python/qtconsole[${PYTHON_USEDEP}]
diff --git a/dev-python/spyder/spyder-4.0.0_beta1-r1.ebuild b/dev-python/spyder/spyder-4.0.0_beta1-r1.ebuild
index e202cf128688..31503c82555b 100644
--- a/dev-python/spyder/spyder-4.0.0_beta1-r1.ebuild
+++ b/dev-python/spyder/spyder-4.0.0_beta1-r1.ebuild
@@ -33,7 +33,6 @@ RDEPEND="
 	dev-python/pyflakes[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},svg,webengine?,webkit?]
 	dev-python/pyzmq[${PYTHON_USEDEP}]
 	>=dev-python/qtawesome-0.4.1[${PYTHON_USEDEP}]
 	dev-python/qtconsole[${PYTHON_USEDEP}]
diff --git a/dev-python/spyder/spyder-4.0.0_beta1.ebuild b/dev-python/spyder/spyder-4.0.0_beta1.ebuild
index 9cf3189c6b13..48047980c9aa 100644
--- a/dev-python/spyder/spyder-4.0.0_beta1.ebuild
+++ b/dev-python/spyder/spyder-4.0.0_beta1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,6 @@ RDEPEND="
 	dev-python/pyflakes[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},svg,webengine?,webkit?]
 	dev-python/pyzmq[${PYTHON_USEDEP}]
 	>=dev-python/qtawesome-0.4.1[${PYTHON_USEDEP}]
 	dev-python/qtconsole[${PYTHON_USEDEP}]
diff --git a/dev-python/tld/Manifest b/dev-python/tld/Manifest
index f5c0f22f609e..1854e7f90970 100644
--- a/dev-python/tld/Manifest
+++ b/dev-python/tld/Manifest
@@ -1,7 +1,9 @@
 DIST tld-0.9.2.tar.gz 562143 BLAKE2B 6b7f3c15127d2a97240054b3ee53c628ebf3f381399f7b4460879cd0034dae4f944e33950cafeaf36ab222b9578146564369c0401dc8066d8092bc00ebeb40c4 SHA512 72e829efa48fccb7f8f771f7b84e98d7f38de8f214c26d25741448981de432bbe09f3dac646779135a74c8f3fd0669e3c371d2136e5edc3c2e3750fd5d5631dd
 DIST tld-0.9.3.tar.gz 563527 BLAKE2B 60a6c33e1a3ce1b7336e1f7eb731510a9675bb3e2a8bd05662c6a9c869d54a97ba71c6f3af2ba4bdd20e6f1af7123dcd383c9fc5e0d34776b75fb7ff4e84ca23 SHA512 2884dcce2c08da4e8af5773f9e593c779baaa10930d26f3161314b4ec871d7c788dd583cdd30e9db304d8bd13abf2f8f5eea8c42e8834015c27e5ac8e249d4ab
 DIST tld-0.9.6.tar.gz 826845 BLAKE2B 5084bd326f12628be81b6f702b5672f46c753d970fa249e2116c1f0932cb1567092698dfd358130756f2535cf020125af4c585d76c11c210b2566be9019d8738 SHA512 329bb3e0e2c2682fbc3d3bf16244858cd9202cd4df34c61dcd9e3a62f0566bf365207d0099b63b2da280fa78d541ff68c1d75236d2d5da0f0c575896d347c6be
+DIST tld-0.9.7.tar.gz 912360 BLAKE2B be5373040a689fc4d8831c85fb9da29070978c6ea6a7c279caf9dace80c3171ad414861f2558bcdd3ae0f15cba33e577f40869c536611a14eeafc4c1265fdcc4 SHA512 45a42f0c9ffe18912c33c26f30eda33117efd37688cfadbdb05514e22249d0c371629cb29a1d2eb4bce49efdb5d45bab3438f1b6e0dddef905b7ec6ad4fd99e5
 EBUILD tld-0.9.2.ebuild 503 BLAKE2B fd6cfbb26baf0f87a2e8619664a95bab772e81670e4c0b484570cfc2bce7d593a3f0b948aeabdf28462580f02ce2fcadfe3d9d1eed972b9f69e87a3ba713c9f7 SHA512 b9ea3588726a643f4211f264f9a277e34458812a56ceac03cd398d6d4f6116d1864d7a8ba8fe5be602e135c30651675000fa2e9cd1c356fc64d4ce28b9d97426
 EBUILD tld-0.9.3.ebuild 503 BLAKE2B fd6cfbb26baf0f87a2e8619664a95bab772e81670e4c0b484570cfc2bce7d593a3f0b948aeabdf28462580f02ce2fcadfe3d9d1eed972b9f69e87a3ba713c9f7 SHA512 b9ea3588726a643f4211f264f9a277e34458812a56ceac03cd398d6d4f6116d1864d7a8ba8fe5be602e135c30651675000fa2e9cd1c356fc64d4ce28b9d97426
 EBUILD tld-0.9.6.ebuild 503 BLAKE2B fd6cfbb26baf0f87a2e8619664a95bab772e81670e4c0b484570cfc2bce7d593a3f0b948aeabdf28462580f02ce2fcadfe3d9d1eed972b9f69e87a3ba713c9f7 SHA512 b9ea3588726a643f4211f264f9a277e34458812a56ceac03cd398d6d4f6116d1864d7a8ba8fe5be602e135c30651675000fa2e9cd1c356fc64d4ce28b9d97426
+EBUILD tld-0.9.7.ebuild 503 BLAKE2B fd6cfbb26baf0f87a2e8619664a95bab772e81670e4c0b484570cfc2bce7d593a3f0b948aeabdf28462580f02ce2fcadfe3d9d1eed972b9f69e87a3ba713c9f7 SHA512 b9ea3588726a643f4211f264f9a277e34458812a56ceac03cd398d6d4f6116d1864d7a8ba8fe5be602e135c30651675000fa2e9cd1c356fc64d4ce28b9d97426
 MISC metadata.xml 419 BLAKE2B 48f0e2b96669406551c66e56225022f649ede7feb5e435e73b229f2fba514fd90cc1c542b34c0f31ce5f3bf7197c16188d83cd63542b7017caf114b2a1f0feaa SHA512 fd4fa0a5a30087e046f21cd68d7f5772b20a12f24ebc16641c45e28c1e033a4cf8ac99419f4a70f8d6e7997e6c612681c34e9e576632691ec443360effc75d40
diff --git a/dev-python/tld/tld-0.9.7.ebuild b/dev-python/tld/tld-0.9.7.ebuild
new file mode 100644
index 000000000000..4d524f15e246
--- /dev/null
+++ b/dev-python/tld/tld-0.9.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extract the top level domain (TLD) from the URL given"
+HOMEPAGE="https://github.com/barseghyanartur/tld"
+SRC_URI="https://github.com/barseghyanartur/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 70847afab979..eb9d6e767147 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -14,9 +14,9 @@ DIST Twisted-17.9.0.tar.bz2 3019243 BLAKE2B a79fade6c84a99303df803ad80f02c63562e
 DIST Twisted-18.4.0.tar.bz2 3037019 BLAKE2B 6fc32f7591493ccc4fe03233307b566899b82cd035ba3329b3faaf950339a6653de697ba3873b37b22f9d7f8a66109694b80496917bf61e79c56eeb7e351ac87 SHA512 3733a6df0196ea580187da3576f5fd08f287437528a4e19813056d019cca213c61b62d879d80a12eef38661d3505ba33aac9a4fc956b19afa6da7d37a6465c83
 DIST Twisted-18.7.0.tar.bz2 3063847 BLAKE2B a71e7f0f2888eab2849b90405350194091731730e8507172744212b9af73ba440a0c21d5c5a45ae987752c813c07c4dbb06e0e27a8c8e436d7ea6f7c3026137e SHA512 feefa578bc1787648df07e4a53bd6fe29b43c4357472e4fba37526f075be9263e8c671b6781ce6ad3569c1b1666cb702efbee903f597714a749971695018f826
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
-EBUILD twisted-16.6.0-r3.ebuild 5757 BLAKE2B 0efb4092f562dfa7b29fa084a984e42be9e0641e2f69c33b1424d3bb1734d09a745c49e2d9ad85b1d99b211bdcc5c82b8bb0ab57ede767929c0fd6b752cd8af6 SHA512 4b0b284a4462f2455fd5a42f178c2d3a31b3b957bb3c9f925abec49fa1fab706dbcb2a83952188446384da669b73fcfa49d29a793872541f2ca3a4f726c19b57
-EBUILD twisted-17.1.0-r2.ebuild 5783 BLAKE2B 254f54cffd545b9cfc6488b215da959061cb91530d09df0b58d945dc6fd07bb16edd05249cdb924518b32f93ec3eb7ede9b7ea543621f9d049035d37c72e8d1a SHA512 3fc7603d8c41ea3ce4ce36796da3f35a8d739c40c86316a04c9838c7a743e6c7ddcebe244ef3176db7566cf88c61fbdc5c5ac7b59569bca47324eb413ccdaab6
-EBUILD twisted-17.9.0.ebuild 6060 BLAKE2B 468d7b8f3e1d3b3ec4707aff6c2af55770b862d13da102c5fc09291b2cff9c38abafb0f9f697d88c8958e18d09fa6db22caf9f9037443f07b9d0803182f0e584 SHA512 a0c494eca49bfbf272b3be66fcd3f26829e2e66c51429c0eef8d59e43960c97c74f1a5ec850d8c5789f30426205d0cf038ef95d69fd8a4e2b5bdd04f69fea1ca
-EBUILD twisted-18.4.0.ebuild 5928 BLAKE2B 2e58b7701f303f8c143d379010522f4266c1fbf5df8470fdb6ca7d21b33bdda787844d9af7af8c6112bad9b1af0d817cbf9491fa642333f4cb9bae7d377fad11 SHA512 1fb8b3e35cd734da22519f4fe62fbbce24f847e3014c4331a8b2030b08d71425d2e1ab52cdd42ac3a3cfe271cd90633f6f4c4508bcb98d8f05f8d49d733ac40e
-EBUILD twisted-18.7.0.ebuild 6016 BLAKE2B 1e9927195c8d835cd35db8446c753f0ce1be97b97710fe256a3687984e0f3a8191e52667f6197a688fa3f545a6b9142b05a115e660862a217ac73563b8726297 SHA512 45b7fcb878683fbe2cdeed707763b6b275f8cfd6ef78e2b663daeb45d4820749e03a183bfc35684f3a4bfebcb12839be3d5bf57b046c5c063b012cc3a12757a5
+EBUILD twisted-16.6.0-r3.ebuild 5784 BLAKE2B d3f1f2ee5622a18d75829f5b9d520a0b70b9e3f3b5c174766c4323feb1b56f9cf7c4198291ee8dc9b520b3b30757f7151089a12f544a46a8567bd5e227842ff6 SHA512 f7695142c52494d170cee705a831ca0b662ae37769de1221b265bcb9c91148dd6917b59dd132f4fceeb64a3077b5dee226ac90e1ee081e69c17a9ccb9b1fb9e7
+EBUILD twisted-17.1.0-r2.ebuild 5810 BLAKE2B 5b43ac83f60619fed176c1b24015c93d469c426b3c211c644a8551c9881ade4a0458ee0e4c0eb710a4b81ae994c9c16069638f4c6962cfdca958b0b0422ecdea SHA512 d45638d9feebad85e9cfd8e99fe5f7684a436bb400799f2cb554aeb9cef5e68a7eb20b94689e608aa5cca9c8b093be0bc8a82b18f394f43a6bd0ca0d4c513627
+EBUILD twisted-17.9.0.ebuild 6087 BLAKE2B bb007603512b4fefaf37bcde8b1d8556c4d5526cbaabd7e0acb50c60394f2b710641591295f9ad7d060f6b2e98f98facca6f949305c3fc997a6c54e3572d4de8 SHA512 dac6071d6fd1f7cb51720ea6a2993d95d364016e30f52a8c5dd1e60d95ec41e04881b742d61996a5a0c64e25d31597822b8abcabf3f2d3f6d8557ee741d66240
+EBUILD twisted-18.4.0.ebuild 5955 BLAKE2B 21119b158c09984358f3826c85ffcbe2a699f6660a13e544dc9f9eba81a9874c9fffa186937b7e50b7561c9d0848df295f7e2d7096310c1a65c8d8fc9800476a SHA512 c4aca8e6bfd49a9fde9ce074e936025dde439b5357351a6f55cd11f9baf7e447bdd37a899101dc1f8d6669e68b8b115b26bd5c346266965e3ef43fea180179e6
+EBUILD twisted-18.7.0.ebuild 6043 BLAKE2B a8dbab598b6c87d07e9f4e7ff882b39fe5d778d200a3afd933a92d1557bff167b31949ccef881eab904fa0b9c9255e8d87ca226cd625def2d1f31aa89ca0ddc2 SHA512 70888fddb19a79cc77bae3e1db3dda4439a36e10a5b1216630205085b1930bda46d05cb7ace649f35c814f3e9c0280be0b46ff84c6a4ac09ee523b4d492d17b0
 MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/twisted-16.6.0-r3.ebuild b/dev-python/twisted/twisted-16.6.0-r3.ebuild
index 96ff7aa3d280..315263b8afbf 100644
--- a/dev-python/twisted/twisted-16.6.0-r3.ebuild
+++ b/dev-python/twisted/twisted-16.6.0-r3.ebuild
@@ -24,6 +24,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="conch crypt http2 serial +soap test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
diff --git a/dev-python/twisted/twisted-17.1.0-r2.ebuild b/dev-python/twisted/twisted-17.1.0-r2.ebuild
index 4e48daba3c62..44a1434f4557 100644
--- a/dev-python/twisted/twisted-17.1.0-r2.ebuild
+++ b/dev-python/twisted/twisted-17.1.0-r2.ebuild
@@ -24,6 +24,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~s390 ~x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="conch crypt http2 serial +soap test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
diff --git a/dev-python/twisted/twisted-17.9.0.ebuild b/dev-python/twisted/twisted-17.9.0.ebuild
index fff6db06022e..d53fe68b371b 100644
--- a/dev-python/twisted/twisted-17.9.0.ebuild
+++ b/dev-python/twisted/twisted-17.9.0.ebuild
@@ -24,6 +24,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="conch crypt http2 serial +soap test"
+RESTRICT="!test? ( test )"
 
 # openssh-7.6_p1 test failures: bug https://twistedmatrix.com/trac/ticket/9311
 RDEPEND="
diff --git a/dev-python/twisted/twisted-18.4.0.ebuild b/dev-python/twisted/twisted-18.4.0.ebuild
index 7658c85103b9..02a73d8f6220 100644
--- a/dev-python/twisted/twisted-18.4.0.ebuild
+++ b/dev-python/twisted/twisted-18.4.0.ebuild
@@ -24,6 +24,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="conch crypt http2 serial +soap test"
+RESTRICT="!test? ( test )"
 
 # openssh-7.6_p1 test failures: bug https://twistedmatrix.com/trac/ticket/9311
 RDEPEND="
diff --git a/dev-python/twisted/twisted-18.7.0.ebuild b/dev-python/twisted/twisted-18.7.0.ebuild
index 524eec980d18..fcd1a76f41a3 100644
--- a/dev-python/twisted/twisted-18.7.0.ebuild
+++ b/dev-python/twisted/twisted-18.7.0.ebuild
@@ -24,6 +24,7 @@ KEYWORDS="~amd64 ~arm ~mips ~s390 ~sh ~amd64-linux ~x86-linux"
 LICENSE="MIT"
 SLOT="0"
 IUSE="conch crypt http2 serial +soap test"
+RESTRICT="!test? ( test )"
 
 # openssh-7.6_p1 test failures: bug https://twistedmatrix.com/trac/ticket/9311
 RDEPEND="
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index 3b72c08c5042..aaeb7e32104a 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -4,5 +4,5 @@ AUX util.py 977 BLAKE2B ced53147ac1b8153d0b891b07514cee5692372bb630797d172c5b7da
 DIST txaio-2.7.1.tar.gz 43591 BLAKE2B 4efdcfb8ce3e8860af1efe56ae4c23efc9887a8f3a53c322444a95651f4dbb502443bdcc1d0da0ba5db8f9a832ad90b3c6dea06ca688d7120857854d3eb7c17e SHA512 d77a8b5e8fc21be0bef43f2a6795229456a351abc1a5eb6d2b7de0da0a58e67a228cb06d1a7962efcc760099ef5df94e9421875ea5628985260911efc7deb85e
 DIST txaio-2.9.0.tar.gz 44195 BLAKE2B 6c62fc6f17ee860aead90cf5f5d02c7c0d9709adf7bcecbb6a7c1723abf0d8672dbc0b869dfe4683bc26c9608e94c41364add18c22e8e98678de8e10018d991c SHA512 ee07d776fa5894b716fdced36aaa6436336a1f1db97dedb0fd0575d61a7b48b12dfc90ed6078602d7a2c2a00bfa7f815ca76cd75e472a27ff7bfdb56291efa46
 EBUILD txaio-2.7.1.ebuild 1810 BLAKE2B 09527c0ca4e9379f8a2f8719121d9365d08d39146d6515723d896fcf13e84c58328427555f64c973485a1df497b042de1d27e14c49f2a24027547be468f364b9 SHA512 074f40c0ff1522b67766e8bdc727e21039351cb41e08368f468f342fab8a791d812e8b1808cd0bfbfc608fabdeccc0753d84844d259751f50c15af8ad5c2f79c
-EBUILD txaio-2.9.0.ebuild 1440 BLAKE2B ad2bdb7813f58f8af9a52d248e2cdf3238299e4e6e210f6c7e2e554841f7de875c088326629787c8ed1fc6c49f77dfe25a21d5a44252abb459e2b7946e9fb1cd SHA512 4b869d7ee69b57fb122a62d3ed314359c4a66cd09edf3e4e821501f6b1efffac11020f5e2f52c3bd2f5932480f05b970dacb846fa023fc536cafad7e499b64c9
+EBUILD txaio-2.9.0.ebuild 1438 BLAKE2B 85508d27bc9a9aac40cc5c5087d8cbe1b67ad6bebb8efb62443c95b86eb2574f9cc00fc211baa1ce2316e09f250ca3132b3f016eb8844231789c97dbf343a49e SHA512 62e74e605d5268a80f2f19bc8be33838544c9da466e7229ebae6a57154a6fe3d5f1b71347d4b382ffcbdbe6f5a111abdc7e57b5c290e5d5b35d220a318faee52
 MISC metadata.xml 487 BLAKE2B e04a40627282564f381f0070344ba6e2a08e572121e150b5775239dacf22212fb273253dae6ad19ba2cea7f15e84c7f92c6d0671353b2d159b9e7f40d3415914 SHA512 d7eb59861e36e29555d46c3a65814428e64473abff01b6d5489b7f4419f535c991a443345058a8f618574019d5581d3df94fc0339c3a53d4c3147f5e11ca3a11
diff --git a/dev-python/txaio/txaio-2.9.0.ebuild b/dev-python/txaio/txaio-2.9.0.ebuild
index 947a153fb9e8..7ec81d384fbe 100644
--- a/dev-python/txaio/txaio-2.9.0.ebuild
+++ b/dev-python/txaio/txaio-2.9.0.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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/unittest-mixins/Manifest b/dev-python/unittest-mixins/Manifest
index fc991f8620ef..3fd4139f04fc 100644
--- a/dev-python/unittest-mixins/Manifest
+++ b/dev-python/unittest-mixins/Manifest
@@ -1,3 +1,5 @@
 DIST unittest-mixins-1.3.tar.gz 12942 BLAKE2B 24183d35b6d269c45947f9fdfb89f668e7dddfd25a2e634e92b0318b7a90e535c4ca33ed497cd4af54416c2d4909b4fd4d6d13bf94d830ac8b13939411d36ea6 SHA512 8cdc7adf387d3576d1690c2ab62eff93c085a36b82b756d237cc177aa52718e7ce6c5ec103841f1581cd28576bb17fbbe034c21d1c1347da643dfde3b8033d3a
-EBUILD unittest-mixins-1.3.ebuild 668 BLAKE2B ad373a625d58f1399957ccf7f27cdbf3bcddd6f6f00de81bfd063a35ef1bce3ebc34c2d2e84c7ada02d8911ebcd23113086b12b1684a24d1da86719f3a7eb031 SHA512 13065bf58f06c3c30d2c514ecc1047a84a57d88fa210b3d5a5efd4029338f47fd0589a63d75102ed717b55d6e29db6df9ea8398b7848318aab87aa28c089124f
+DIST unittest-mixins-1.6.tar.gz 14156 BLAKE2B f47831355cb3f6606b36124af7d6634b8c012d8f85ce843fbb2882360006eaf3b964d6d2ed718137e0c37d330cfbabbafbfa75e4b1217f2a5546027f7379ba53 SHA512 0d4a0bbf80264f34a03aebbb2668733cd3753f99b24b006ea6704a2b97df9fb51755e8c4efd0094219e65d25756ea31ff27d3892b32ab6829050236a6bcbc986
+EBUILD unittest-mixins-1.3.ebuild 695 BLAKE2B 53c5b5820da3710263e84e3d43e2e7d6d4d4fea2be85168c2a10c99a032436024575791c41d609dd5831f7b286c5b51978784d59521edd5f018b08a87ccea62c SHA512 649518c88e87d06d5a6d9a72b9b6b105f7f4b090ec8ffa634fff5f5065a84dcb6abc978db872794e1cde9aff28e476599961292447e4840390d17a060006dab0
+EBUILD unittest-mixins-1.6.ebuild 593 BLAKE2B 920541bbfc835964ba322b85d8622176051bc9c67e44a258881921e31a2ebadf68419a50b344030c8d5fe0ae75727e841fd3d59c076feb47ec72cc6f7c4e72db SHA512 0ec782c7bab89c42cdaff0442c686ffc6a55da1f9afc3b4d0b25a2b85781aefabcc6d225903e0cfb2735b0766923024849ff4ee0e24a629344bd8a22265585cf
 MISC metadata.xml 380 BLAKE2B e11d1ea8ab352e953fb5de15031c23c8ad94b21420abdbd1e4b843aa7498be70e6c773bf5dafacc9da805c7d201027c91691067954e8907662f0a4aea7057b88 SHA512 3cd32540c94dc1a2b2f72f5cfd85192a94fa716cc37d70eed9b028fd1ce120d3f821b2d059465e7f26f4b7d75b8f3cb4848a65dde921d23bcb9b4e56ae321934
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild
index 449b4e06c86a..33de2e61d2f3 100644
--- a/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild
+++ b/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
new file mode 100644
index 000000000000..934fec827b8a
--- /dev/null
+++ b/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A set of mixin classes and other helpers for unittest test case classes"
+HOMEPAGE="https://github.com/nedbat/unittest-mixins https://pypi.org/project/unittest-mixins/"
+SRC_URI="https://github.com/nedbat/unittest-mixins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index 36b341cb2a4b..34a3bd5fd3df 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -1,4 +1,4 @@
 DIST wcwidth-0.1.7.tar.gz 22884 BLAKE2B 6d51be31c6cf11a23de48bfecd00d8b95e15c80b83559f67689611ac0d8406c18e3a761dc57a868e8c991ee07e286aed66fe77d905483f63ee998ca431fd35f2 SHA512 5bc9625fbd10721a50a3ac7d7f91012cca8e4f83533f265cf56890498bc52a53b155c82e67d6bc5523a5593c8d7992a1dec2a0f590318170eddf987c56f9c368
-EBUILD wcwidth-0.1.7-r1.ebuild 680 BLAKE2B dd84d57b1d6facb4f00628adae6f299386a26022985b41445e9ceead3fcd1ae9638788f92f8b717cc8978e111dfefc633036c7ee941ce3e083633c1a508606ab SHA512 9827e9fc4ecca0fc8c688ca3fa400bf624199ed42cebcf29c9a775842b6036c9b9748b84ef9c82ea559a6dc557dc107e59cb49eb3d0bb79399405af9ec63d8d2
-EBUILD wcwidth-0.1.7-r2.ebuild 717 BLAKE2B 19361c49f527fbc2334afdd09c43f360d571a2cabe5ddd75435e23cb48b03d78e916662c0fb9dc895ccaed60851152815950d3428f281909f3ef6a074f2a6852 SHA512 c0af1145cbe11731cd9642677fd13836d46bc4d75fc036395b1a5d5cd864edbf97814aeed815e54ad37d396b622cb9ddf270f118228499d761741ff330bf274a
+EBUILD wcwidth-0.1.7-r1.ebuild 707 BLAKE2B 1135363585747ecdd49844a84a33d7f94952ad55c7c558df9febbc7ba98b9f3a216fb2bb86733ae6fd8b2d1079eee0c0e92576d15fcd80b278edee3905035615 SHA512 314fc9a1ebaed91f8754e315cf6a716db550e5e24f1fea92dead3bb4cf858c0f4ea96f516411fe4539638716b7f072ad7afc35c3239ba29e1884ec12473742a4
+EBUILD wcwidth-0.1.7-r2.ebuild 746 BLAKE2B f57ef963f49eee2edde6f8b7d96a0466744b938cd655df4c23712101a0e963962cdd4dd6ce01c5e042d4d1206422ce3f7fdc92a0afe5cc964ed7c3af12618a5d SHA512 703e95532633b503dae42e9af4aa9b8416d67ca3fc727e17f2c26a2fe607c8a291906fd9fb234c2a88200cee64159ba873230b103cb56bb80080ebe069a7eacc
 MISC metadata.xml 376 BLAKE2B 94917ec41c518ca9b328d9be7afbcba198376b1c28c3f24e24e3e994aecd877db745b07377bbba0a1c7d7b00e21cd53de31ca9ee4a0f08696d11b922cdc98771 SHA512 9f797fb27ebf7f1fd99d2c9a8c61ccffe1cc40f46991d9437dae121366da1edb31ee6ada3c202ced30fde0a90766453e72bcbb43a48919519f3de0b31681e213
diff --git a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild b/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
index 0f3ae9dd48bd..37faf7fe6b32 100644
--- a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="MIT"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild b/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild
index 0cfa10b56e13..da619a29255d 100644
--- a/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.1.7-r2.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,8} pypy{,3} )
 
 inherit distutils-r1
 
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="MIT"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-python/zope-event/Manifest b/dev-python/zope-event/Manifest
index d10dbdc9f42a..a8d26de58b83 100644
--- a/dev-python/zope-event/Manifest
+++ b/dev-python/zope-event/Manifest
@@ -1,5 +1,5 @@
 DIST zope.event-4.2.0.tar.gz 488532 BLAKE2B 89c2c2e9e75a57afd43f7ee984cbe8f7add3cb4eaf1271695b2a5c31e77e5fccb0c884d3f8c44c54fbd06be209e4556bc2438cda9bc987124d46e795822bd841 SHA512 e39cbbccf679328db190f0641e3cb0d267fc606afc9cdbd4fb4100bde482f12f594319d885db101dfd98741225604bb49ef77094011bbe7edaa16877038f9989
 DIST zope.event-4.3.0.tar.gz 17829 BLAKE2B 5d508c834321c70399eb9888bc2b000f5b18de625c68dc089f3ab8571a7948c1e43e76c62811c955777fc2caa65585347c124e24f2afc46b23e9d30b6c4a4599 SHA512 dad303d1b76c75dcc98f1164c6dec8f8458f1adc4109146942cf9ff40ed3f92579b2da742b10798bc720ab17cbdebc86e54008cfa5155616e2ac68b332e62571
-EBUILD zope-event-4.2.0.ebuild 841 BLAKE2B 27c4f458f346e3087841b931783f2af3344e09f2ce421674f14c32be98c529d13491ad794dd2f95b5d557a520811a85c1e33a55dc11b455804fbc067b6a5c234 SHA512 8c605e40c34870421aa2e7b945ed30671bca702fd63cdecec7b6b8f5ec702fb875da8e1ff1f45770650d8d3705bd249a416760cf01c393876ef7e1157cc871d2
-EBUILD zope-event-4.3.0.ebuild 1078 BLAKE2B f9673b8e6c23b7ebb3046696a305dc33ee10138c4a3620a9901ec7905de0f195676d98bb3918d92ea2e938d6ebdb7beef8d013c7332ca9aa87c000cd2024e648 SHA512 bffd01bd35e3b0bbc055e9dee7c3724def36eabd80ae74076216759e50844a36436730730094b0ab09c708d99359852d88ea16ca8f117345bc2b2f7a5b0dff94
+EBUILD zope-event-4.2.0.ebuild 868 BLAKE2B 9265e60a2e1613ec55321cdb5ee35c2b75cf817bc5bf442a53032bc94f48fb75c66a5a017e0c4cf1f6a51942adeb4f50cb016947d4429b16f62b615cb52082fd SHA512 716e97dfdd9965a9dbee5690c3f61ab4d6354833d10020927f18c9594c0229224c77e6b4d21de2a7d9b6da9e17b8080cd6807cfa887e9eb80fffaeae4c28a444
+EBUILD zope-event-4.3.0.ebuild 1015 BLAKE2B 66bb348ed9f1c8e902372aa28f6919e16ae7a8f2ad57d2083fc44c66b5b3f24307d74d24247a354233b2ee2292c76f23ef24d877fcde2201c07dc8669870aac0 SHA512 da8cfb64e92aacf11839628e73b57d3b3e26f9a56438f59b6fe7fb35e5cf120445db82cc3e47e792d963ac905fc489751b9af35220d656bf626b70cc2135116e
 MISC metadata.xml 378 BLAKE2B 53e40f9f0e2a3c17be6503b23c943f72c4221f8d131e56378bc7aa56ed8d889706a4e09f177e137fd1cdece259a2b13a2c6aabf4709b57e20d7e3964fdc580d7 SHA512 b04f8e3a6a16e89458912a27c16154f89067883f11c35552a00cd273095b30ae085b19eb0bebe860055db4876d23085b062b57f937eca21bbc98098a8a06a831
diff --git a/dev-python/zope-event/zope-event-4.2.0.ebuild b/dev-python/zope-event/zope-event-4.2.0.ebuild
index 943b2d8d4495..689b855e405c 100644
--- a/dev-python/zope-event/zope-event-4.2.0.ebuild
+++ b/dev-python/zope-event/zope-event-4.2.0.ebuild
@@ -16,6 +16,7 @@ LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-event/zope-event-4.3.0.ebuild b/dev-python/zope-event/zope-event-4.3.0.ebuild
index 69deae1141c6..9304525d1aa7 100644
--- a/dev-python/zope-event/zope-event-4.3.0.ebuild
+++ b/dev-python/zope-event/zope-event-4.3.0.ebuild
@@ -2,30 +2,26 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
 
 inherit distutils-r1
-MY_PN=zope.event
 
+MY_PN=zope.event
 MY_P=${MY_PN}-${PV}
+
 DESCRIPTION="Event publishing / dispatch, used by Zope Component Architecture"
 HOMEPAGE="https://github.com/zopefoundation/zope.event http://docs.zope.org/zope.event/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	nosetests || die
-}
+distutils_enable_tests nose
 
 python_install_all() {
 	distutils-r1_python_install_all
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index a7385bd8cac0..19882ea890b0 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -4,8 +4,8 @@ DIST zope.interface-4.4.3.tar.gz 147052 BLAKE2B dea636ebed2f66035510d467615a9532
 DIST zope.interface-4.5.0.tar.gz 151261 BLAKE2B 45d84249c4c64e8c5a7406ca50f3fe960130727cf36dce4d6469b84da2747c1dc2eddbc29c779024c40bb7f2457559875ffd39e64c5e0ea7aaa911d7d19e2ca3 SHA512 d3a256723901bf505e4caa0f9988814cd583aefa1adced7ea9ce0a9130e67909f8d6b5dd20d986182a34ea216d63aec1aa4513fc76110e6d96a43a49f1719ee1
 DIST zope.interface-4.6.0.tar.gz 150884 BLAKE2B d31c006553b31f7a5096f69d33341c868723aa0eeee375265c61896fc2dc16109e3f5135a0007604f9e6049fc0cc905e0f8c7ad23e1156a636094d0b334febc7 SHA512 cb82144f0b228dd4d2f7cbfba130ee190265bf809d4e928262935c3b5551a3a298df4eba2dfe7ecde96fed27f39f59ab95e9c11f3eadf0fdc13f61b5c046f78f
 EBUILD zope-interface-4.1.1.ebuild 959 BLAKE2B 3bdff323c4ada4e4a0af502d5df72237e80a7e3b677a5ce692502f0b15fb3455db01e53d9b4014c436fdc0380da5462b833a75b2fa1d54269973edaf615d7453 SHA512 d30cd0d549255dc69789699e59a080b4241a24773071e79e432c2fa9745f24b2200d6ddec80e6cd7285449162f9cdeb6a29827eeeb7b826541d350a8a389b1cf
-EBUILD zope-interface-4.3.2.ebuild 1007 BLAKE2B f8504e4b3f34c630801df81e349d09e4b25890aa5ac2bdecd700ef33b9d66e33d60edadcfa432e716452efdc34d8a76a822a1ae4b1d3ca844daa3fc673c566eb SHA512 a4ef67ffd90a9802a9be4210e0b572155f284ee642dcfddea062ec372347ec298ca9f7e13baa260116deb4d9e019ad9280c4ea7bb2591b9cc8832f4292833d16
-EBUILD zope-interface-4.4.3.ebuild 1252 BLAKE2B 1b44afcf2237c912b6f4705b43b12316ddfd0a67a5473925adbb3cb55c1cacabf48b2e465be5c6b4f0c9be9c7e9bff825cd53fdaf302c8fde11e1ae46233a1a6 SHA512 814db488a21505ee0e22c4e30e4b8d4cb53c61bbf8d2d944613857d742123b810d992bae8bba92dd7aeb70c875c3db3dba6bae60729bebcca67c8e58aad2a6c3
-EBUILD zope-interface-4.5.0.ebuild 1265 BLAKE2B 01d688f49c86d9aa68e9f7afeb900efce5d66ecc70436918a20b25e095dcb1415b4fe4873d5357d79cb1ce78e314d767fdacf7013829e7f9a861eb41cbc3898f SHA512 78bee21b9d9db8f91fccae6ce8e059ec03db0ca432838d0201f3fac712df3fef400291928a66c3e499a23578a8e7e6074be6719f6544133dfcad5c6947336d96
-EBUILD zope-interface-4.6.0.ebuild 1265 BLAKE2B 01d688f49c86d9aa68e9f7afeb900efce5d66ecc70436918a20b25e095dcb1415b4fe4873d5357d79cb1ce78e314d767fdacf7013829e7f9a861eb41cbc3898f SHA512 78bee21b9d9db8f91fccae6ce8e059ec03db0ca432838d0201f3fac712df3fef400291928a66c3e499a23578a8e7e6074be6719f6544133dfcad5c6947336d96
+EBUILD zope-interface-4.3.2.ebuild 1034 BLAKE2B 06d2bb6048c00f51e8752db4497327ecb41623253be7314f07f39dffa30c3dea46aa64c357075a3ce254eba76f87d9051a3ce50233f40b3af7652a6d99991f95 SHA512 f4d930bb4d8e1c67d40d2c3cbb3489c6200c3da35d2299e9355bff8204af7622b7fc4bdf6a45d9af0c5327204d8cc9b7a4c8dd2f0320c88b4f72c5a77c258e56
+EBUILD zope-interface-4.4.3.ebuild 1279 BLAKE2B d2ccda8bcabd4941745586b890f28e431316a36029677f1d8061dae28c3538254d664dddd320256265ee1194d9a28e4cdb37e49f68fa3fc7d18aef33dfc57d15 SHA512 d1358deef807f7c4b64098605769d68946c8f4f1b98756e147d9c9ea2032659f80e1bd09e789b8751275c2d7dd243b8c73cdb9a620f6397d5cef6aa3eaa2cc82
+EBUILD zope-interface-4.5.0.ebuild 1292 BLAKE2B c57f2dfbeb75582ced4d29958561689c2379085491843b538c05b7d3e03fcd8184320f1bc0d30712f0f7204e8ffd183b5877eab31a8a365fa412df9d4c886923 SHA512 fca7734568d812fb6a4ac92f4cd54ed11e5b1768f3236ac95da6a9bd75e24633425906eba391aafb5a1deefe2fafeef03e8e4a1e66057c564bcaa73ab16a3aac
+EBUILD zope-interface-4.6.0.ebuild 1294 BLAKE2B 4178df09a23bf477e8358c370701836ae58974cc771ab2d78969ffecc063fa8552acc6be4779f400ed3a3c192f02c3663954ab71d0c5c97e30ce0439b9032560 SHA512 3d5915b93cbe9d876c0fb34f6c7eddf1f2061b34d50698c8d9fe56611fada5eca3b5cb1ea778f24d785eec8663dfc762da8f0bcac72c11f4871f81e4ac011da7
 MISC metadata.xml 386 BLAKE2B f8454bc6cb7c55f203d75f44428b0fe404d050e4938f80e5ca1e0504811a3ea73980ab474d12b47f31a87ed508a2f23143d6393eaf2f66eaface7b35a2058a61 SHA512 fc31e083f990006f9a4bdf1cdef5b8efee3e69e8444f614dd5fdcc0d7ddb8291cc1e45c21ab1418668c2e247068a39467e837aa8b869cc050a856635b8789fdd
diff --git a/dev-python/zope-interface/zope-interface-4.3.2.ebuild b/dev-python/zope-interface/zope-interface-4.3.2.ebuild
index 04b6fe303af9..b1ae2a35ed3f 100644
--- a/dev-python/zope-interface/zope-interface-4.3.2.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.3.2.ebuild
@@ -18,6 +18,7 @@ LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-interface/zope-interface-4.4.3.ebuild b/dev-python/zope-interface/zope-interface-4.4.3.ebuild
index cbf625a4b5e4..66276ef1a0ae 100644
--- a/dev-python/zope-interface/zope-interface-4.4.3.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.4.3.ebuild
@@ -18,6 +18,7 @@ LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/namespace-zope[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-interface/zope-interface-4.5.0.ebuild b/dev-python/zope-interface/zope-interface-4.5.0.ebuild
index 0523f199d57d..667f3a5ef0b0 100644
--- a/dev-python/zope-interface/zope-interface-4.5.0.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.5.0.ebuild
@@ -18,6 +18,7 @@ LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/namespace-zope[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-interface/zope-interface-4.6.0.ebuild b/dev-python/zope-interface/zope-interface-4.6.0.ebuild
index 0523f199d57d..233810630807 100644
--- a/dev-python/zope-interface/zope-interface-4.6.0.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
 
 inherit distutils-r1 flag-o-matic
 
@@ -18,6 +18,7 @@ LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/namespace-zope[${PYTHON_USEDEP}]"