gentoo resync : 11.07.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-07-10 23:40:16 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-07-10 23:40:16 +0100
commit: 51af5f0eb4cddbe6aa7953717873691d77aae9ff (patch)
tree: 1541525274162b033ebbc3ed38abaf335fbbd49a /dev-python
parent: 7014a5a3ea0feffab9701fdd6b64cc7667a985af (diff)
190 files changed, 2149 insertions, 1366 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index b6af99136728..a96559b20cc9 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index 41ce55afe457..b91b39cc4fca 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,3 +1,5 @@
 DIST sip-4.19.17.tar.gz 1056156 BLAKE2B b5a7b4cd3f2152e9b7ee7b715c3ad72c2092598e0405cefc24d6283e9da07e54fd65da89e137618d3b84f3138fff719cf226600135d646e7bd7c538c2a02cdfd SHA512 d393cfc1643663926bd315a8df92abd82bec071bf0488b047625bdac43e9074bc8a510ac23244a7a2d2d181f70af9691db9d0b759e79643981d6afd71a49d3cb
-EBUILD PyQt5-sip-4.19.17.ebuild 2123 BLAKE2B 2f67b9d51eaacc89582a6ea84f94140f79652804a9c0480e26acb72362cc552d3eafde1a8fa4528ef92aae74bbd89518b17b0186732e373b28ed4bda6059422e SHA512 6ddfef96ce24694c2035a6dcd232e6f3a23f32357f35c1126310432d828db82a94638e3ecbd3dd4bb4ca624d50956859f1fa50fdb72a54f63b3cdf6fb2853123
+DIST sip-4.19.18.tar.gz 1056840 BLAKE2B 6c674405e28a64c9db635deca8a00ed78bf52d2551ed578a57d31ae96071ca77ba49e3fc92329942ca61de78bc98049694cc48ef54ea645819fc48f2fae56060 SHA512 e3c58cc6c38b277b3b9fd7adf33df91b47e0385e59d52c543e630a194d73d04d91e0a3845cb3973d1955f77049e75246fa7e6f544e02e1efe0086a297cf1d887
+EBUILD PyQt5-sip-4.19.17.ebuild 2121 BLAKE2B 13ddf9636275d6ba045f2d1b5e5e94cfd4da5546ab3a2e59cf6beeb51b17963a56602e2d575272cb7efb24d6f70aa92af35e1eb8568facd1da334b63c6f3ec58 SHA512 729a20290e2b8f7f1de6b76f246a2af92bc9e2d59a0b1bbf2fb80f6c4e5c05e5e92eb3819d2c7154fae513c399d37f30f1bbc106336b04687f6cc0473c6600e4
+EBUILD PyQt5-sip-4.19.18.ebuild 2123 BLAKE2B 2f67b9d51eaacc89582a6ea84f94140f79652804a9c0480e26acb72362cc552d3eafde1a8fa4528ef92aae74bbd89518b17b0186732e373b28ed4bda6059422e SHA512 6ddfef96ce24694c2035a6dcd232e6f3a23f32357f35c1126310432d828db82a94638e3ecbd3dd4bb4ca624d50956859f1fa50fdb72a54f63b3cdf6fb2853123
 MISC metadata.xml 654 BLAKE2B f52693b58abff10e80d2fe004ccca0b97aa157e07c27005c72fe79bc9ba3894c33042c9be2d10f8fc15aa8f0451041b60255eaad96ec78dedc422e7ca2f58564 SHA512 4ad600dc1af2a9f6494350a028909e51deea7b18bf6a50a6f1860163310bc0534cd530ac5d6dea043e7b7e532fd2219069e12b33271cedc00c7a9dda9161711f
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.17.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.17.ebuild
index 7a8d6adad884..b3a21709e306 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.17.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-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="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.18.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.18.ebuild
new file mode 100644
index 000000000000..7a8d6adad884
--- /dev/null
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.18.ebuild
@@ -0,0 +1,92 @@
+# 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}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Sub-slot sanity check
+	local sub_slot=${SLOT#*/}
+	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
+	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	default
+}
+
+src_configure() {
+	configuration() {
+		if ! python_is_python3; then
+			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		fi
+
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--sip-module PyQt5.sip
+			--sysroot="${ESYSROOT}/usr"
+			--no-tools
+			AR="$(tc-getAR) cqs"
+			CC="$(tc-getCC)"
+			CFLAGS="${CFLAGS}"
+			CFLAGS_RELEASE=
+			CXX="$(tc-getCXX)"
+			CXXFLAGS="${CXXFLAGS}"
+			CXXFLAGS_RELEASE=
+			LINK="$(tc-getCXX)"
+			LINK_SHLIB="$(tc-getCXX)"
+			LFLAGS="${LDFLAGS}"
+			LFLAGS_RELEASE=
+			RANLIB=
+			STRIP=
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake DESTDIR="${D}" install
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+}
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 6d1d6d70f914..1301228fef28 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,9 +1,9 @@
 AUX PyQt5-5.10.1-fix-testlib.patch 1293 BLAKE2B 8ea2a9de5913578c951b4acc05508662fd63590e097fbb8b681ac02cb3d96c9670ab1a1bbe873c1c1320dd78cc4c738f9f714c8ffd5be732bc15f084ad7ca721 SHA512 bfe80fa6018174a6981777031ffa97bc834e17848580d02c994c61507aa4ea16091e582b6bbc3754d469de1901fa8cf2e3e12240cced44fd0dbe928bdd360925
 AUX PyQt5-5.10.1-timeline.patch 1063 BLAKE2B bcf04d91798b0dc2136ff9c85802abd14d35fb6daa952784ebce23a7b3c930421260f0f1dd80e47f2bbfc49ca9e26159f05c23ff136af4b68e69468d117dcc52 SHA512 8e09feca5f42ff61c479d098f7ab0299cba51a9234eb03146568166e50d6b2fc7d424bc4297905bd0d733508c891ac5b2287c05c6039f9f60bcec12978ac5821
 DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
-DIST PyQt5_gpl-5.12.1.tar.gz 3147086 BLAKE2B d5a018f1fca401b9f70dd16e2a28ea380c8a83f5e18dc8577e317dae5904a7b95f8fe979bf7f574f95e71222c514565fbf051b1de87f97cd2ab70c09d04e86ac SHA512 f8c440bd5e804b9f5fcabbdf1290cee3176f3d676d150c705b64136d2116ccd7b09233672674fe97a4aa521974c9355d44daf7a244b6cda7fa55757332c08e67
 DIST PyQt5_gpl-5.12.2.tar.gz 3147205 BLAKE2B ad0b09548521ceff869bb44cfceb0c2cf31338f46c76da23582f7949fdcc0e8feee3cc0dc0610e8152dfbc701c3ac765eea7898f5061775a92e2601c5b7ea8ca SHA512 dc23bb7dacb305d4f9a630f2b5c3809d5d6734ba234c9941a3c44c770af8534dd737160dbe007a1f15d5c90e2e52419dd749b3ef942b4e71917c1cea2220a666
+DIST PyQt5_gpl-5.13.0.tar.gz 3152704 BLAKE2B caa9b11f70b656a23d28f4b7b490df544e82f669e38e51e87316917f015f9cf137a0902333323cfc5c6a13bf446067d5714fb33c091efdce03a0f7cfa8771a15 SHA512 72cdd700956f8a5791fd38cac6a348f189eec9e69f3fd79a0c711ff49c770d4982fe62ec9057830d26abc4c12133922df915be0844449212f0bdf338fe1e4cb0
 EBUILD PyQt5-5.10.1-r1.ebuild 5789 BLAKE2B 0c5209887d90e42e69acf97227950d3b6048d7f3f0c0198a5a15fae632232fb626431e019809dc9d6c03cecd404f69df0fdeff22489b55e7acd2d81191ffea09 SHA512 981f6dcfbdb1f5a29eb32796013e6f8daf3e4a5d370d7f66d62198ad287538ed77cad62fc0aa9c8f8d9f6d1d8a23fd79d420108739fde990c5dd47d7046de738
-EBUILD PyQt5-5.12.1.ebuild 5851 BLAKE2B 4df140ee298f0b6978de8efbe0118ad8526fb9ca9c76da79392e1687430da18b04f6508d2f4a26790b5a14450b7baec9167a06c81c1c80a27a3775bcc24f046d SHA512 82f32da1d670326cd3b08ac7fdc0a44da2bb383f0e82407dd42dda527f0f486cd880e5a211743a260d73c7040ea712c53614df26ba5564d8b92d677bb800eceb
-EBUILD PyQt5-5.12.2.ebuild 5908 BLAKE2B bfc735c4c3606d2247a5486c8eded9121bacd4af52f8d73f87f054ab17054c30e8be576a935e3c618362e71225d6311c7e37b743717c7c08d32819742f266719 SHA512 9fcf1fcbbd30288f06b268a9819263482868a3f4bb100754d7db9fbf76f9d65bc4506b9d5c3c5db098e80973586b2c9e67fbaddb097155fa796e9ad599f3f8ee
+EBUILD PyQt5-5.12.2.ebuild 5906 BLAKE2B fb7773047d75058f2c7b8cf523b1a5938cca21b7d18098bdedee450fbaa8971ce0d19d7482bcd84f601ba7dffd7e3d2e73e6df802a82962a03e468d112ce9586 SHA512 f82048493a417e234d028e990312f6a8a28f14b259d97d1b92f9a8285859f9502803ef0e609c6c968b1088ba743f956651a8ca588181d3b723d6f80083f01a8d
+EBUILD PyQt5-5.13.0.ebuild 5908 BLAKE2B bfc735c4c3606d2247a5486c8eded9121bacd4af52f8d73f87f054ab17054c30e8be576a935e3c618362e71225d6311c7e37b743717c7c08d32819742f266719 SHA512 9fcf1fcbbd30288f06b268a9819263482868a3f4bb100754d7db9fbf76f9d65bc4506b9d5c3c5db098e80973586b2c9e67fbaddb097155fa796e9ad599f3f8ee
 MISC metadata.xml 2594 BLAKE2B 3c8c7159c42e050e4e4487ea8c24bd8d7213f9590656c3ae7152c0dcf151d4db99f07546636df0b7142107f506ae72e8d8c31a34aeafbdd325001030088a5493 SHA512 41e4d7e868a9b101d2bb41e8976b20d460544b1d103b3600b5b7cb5fbfc456538027d4b02283587aa747fd1789d7e675e5ce832df71f3dcd9b22eb095087328a
diff --git a/dev-python/PyQt5/PyQt5-5.12.2.ebuild b/dev-python/PyQt5/PyQt5-5.12.2.ebuild
index dc2c0203b8b7..e58ee9b526ec 100644
--- a/dev-python/PyQt5/PyQt5-5.12.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.12.2.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 # TODO: QtNfc, QtRemoteObjects (Qt >= 5.12)
 IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location multimedia
diff --git a/dev-python/PyQt5/PyQt5-5.12.1.ebuild b/dev-python/PyQt5/PyQt5-5.13.0.ebuild
index d6f960d41114..dc2c0203b8b7 100644
--- a/dev-python/PyQt5/PyQt5-5.12.1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.13.0.ebuild
@@ -22,10 +22,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 # TODO: QtNfc, QtRemoteObjects (Qt >= 5.12)
-IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location
-	multimedia network networkauth opengl positioning printsupport sensors
-	serialport sql svg testlib webchannel webkit websockets widgets x11extras
-	xmlpatterns"
+IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location multimedia
+	network networkauth opengl positioning printsupport sensors serialport sql +ssl svg
+	testlib webchannel webkit websockets widgets x11extras xmlpatterns"
 
 # The requirements below were extracted from configure.py
 # and from the output of 'grep -r "%Import " "${S}"/sip'
@@ -73,7 +72,7 @@ RDEPEND="
 	help? ( >=dev-qt/qthelp-${QT_PV} )
 	location? ( >=dev-qt/qtlocation-${QT_PV} )
 	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV} )
+	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
 	networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
 	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
 	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
@@ -128,7 +127,7 @@ src_configure() {
 			$(usex declarative '' --no-qml-plugin)
 			$(pyqt_use_enable designer)
 			$(usex designer '' --no-designer-plugin)
-			$(usex gles2 '--disable-feature PyQt_Desktop_OpenGL' '')
+			$(usex gles2 '--disable-feature=PyQt_Desktop_OpenGL' '')
 			$(pyqt_use_enable gui)
 			$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
 			$(pyqt_use_enable help)
@@ -142,6 +141,7 @@ src_configure() {
 			$(pyqt_use_enable sensors)
 			$(pyqt_use_enable serialport QtSerialPort)
 			$(pyqt_use_enable sql)
+			$(usex ssl '' '--disable-feature=PyQt_SSL')
 			$(pyqt_use_enable svg)
 			$(pyqt_use_enable testlib QtTest)
 			$(pyqt_use_enable webchannel QtWebChannel)
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index c23c6f089182..a3d152885a7a 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,3 +1,5 @@
 DIST PyQtWebEngine_gpl-5.12.1.tar.gz 42474 BLAKE2B 6cb333d8e429ae6b9f8c20a7486754767639693351605e85c0226ab3f1f065a549d40d69669d91f501fdf2c30346304a547e36b416d275a8bfe4ea621c0633b7 SHA512 2bcb0e4da51de9cfb5128e03c03ada77f2d4b99b0885da910584717681b96759ce4301c325cbbf43602d46746e2d37d81ed62f77dd63b33359fd5fae74d7f010
-EBUILD PyQtWebEngine-5.12.1.ebuild 1707 BLAKE2B adfb1b414e8501b0e384aa251f1e3e97d6ac709e8f68131a774cd5b2c1317633ae971d613b9ee545ba9a9c2a9c0a4a64ab4e32f67d4039db855a06e3fc531c4d SHA512 5f4007395a5878d7be14ec9b3e1afa5c0e21322f01911d79511b18a7f1a988fcea2df7ec35a9d68249849c054f6ee4ef06461875fdb8cb676c2429c86972af7c
+DIST PyQtWebEngine_gpl-5.13.0.tar.gz 43939 BLAKE2B 151bfb9b7a619fe581078ce9fd42f54377673fc8873719577cddc40a7254c37b794c31baef0086897f9ed3d7914add0ac5c930dadde916ddc11e37cee428a279 SHA512 2dedffb7bde073922b357118d4bbd0327b81baaba3c69c6cf85f57401b5998bac56e01f2f7b39268b4a1e13c0b34ed116564d7f4f5975d1075d4242b1b06c065
+EBUILD PyQtWebEngine-5.12.1.ebuild 1705 BLAKE2B b51701dfda0e9d66565a7af45b78ffa6533fd89ee5511682dd054518682f5d646998f78f3302e861572e3f5743ca023bf1c391cbe52bf1bf07e79ff6f84475f9 SHA512 8e544a85482823c00024f2f0675eb6f986e9cd3e5f34e1c2941e256ad4cad09d322011fab51b8674f2631aa49a2c0009e1ac3b4d974b75ce0a3fc5b1359a23f3
+EBUILD PyQtWebEngine-5.13.0.ebuild 1707 BLAKE2B 2eba1ecf7b3a889b29e7e38106f7b577f053e2afeb537ff3a2eb612746547c7252965d4f2e82f222010bb7b9152735bca46413300310a718f5d576824fc253f4 SHA512 33216824bd9ab45ce76a36d5b20b2e06b038bba5265b99b217a55883f070b99aaa69d7159bf5bdf307233d48d257242c6b14d5a2776a4067136f274b94ae2322
 MISC metadata.xml 1059 BLAKE2B faf1e1abebc25799040955794a28cdec2f24f1cbe358f15df5fbc400a55453b5281acd7ce0925d122661a3b290771d280d6a2cd7a2d536a5cbe0b0dde4aa9a5b SHA512 b5721a82b18f9c5b9bdac1937d68616c20b290fd609e2cb02dd837b6f435eafc436d68f3aff9593eb43efd30ee2e7201efafad8a38b41a198076305ab9de3862
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild
index 3ce48a7c942e..db3904aa506e 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="debug"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.0.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.0.ebuild
new file mode 100644
index 000000000000..7ca87eb7b53c
--- /dev/null
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+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[gui,network,printsupport,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/attrs/Manifest b/dev-python/attrs/Manifest
index d02f67482be6..d7709a8b9afd 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,12 +1,5 @@
-AUX test_funcs-too-slow.patch 735 BLAKE2B b0806002c957f951c6c08a9c2caa9331d4524bd0a19edb6d61c4677ce42b3961e901c37632ae941471821d328563e92961c67e3d38bc8e5395621e78d9049922 SHA512 b6fee394c95a9c46dd822c8f36261b909a3a3de905e5b057d5026b9d204c01edc01f566336f3c06ee4f5b85da32f2dcd30fc73849d454c6446c63a0b08413140
-DIST attrs-16.3.0.tar.gz 57512 BLAKE2B e00c825034b21cb4d5a9eb9ca3ffb92193b8d793ebaeb8cb5e69b07c326738da4efd98ebc6e79903017276b6b501c56a8e0b37f6b0d13d8461b8ea4e5cb72b08 SHA512 1a91e6f27ecaf20c409c3abf88ffed5c6cfdbba8cff44637399b713271ff838a054f5859dd29440b2780d81b40673033e3f8e43dd491bece72e0a4f08c4ef688
-DIST attrs-17.4.0.tar.gz 97071 BLAKE2B f755abe89cedbf1ced003087fb106fae7c38dbdf0614ec0c525629ae09b3b790a7e0912da887dad4c5686afe7fb0df8123fea42e08e4e6718cdaf477edafcb2a SHA512 b631cd5af1be7c78175230363a3cf9d37cb0237d87b24f994812b5734985d114708d5bf7ee5d92b8b13c6b8daa313efde4a9f60f0630df0b62bbcf4928a016ff
-DIST attrs-18.1.0.tar.gz 106346 BLAKE2B ae17d5e6cde83e5a652b40facffe3db2ad9d6940ef7e00a10c3d02b6015c23e9e17e125ec16100f1fd5e036c9f4e88cfe01b23b03bacdc36446ec0ef1dcc57a5 SHA512 9aa4421d1c16614cd26089c219f70602fd6baa5fbbf4aa96def189e9a41f8c761d7f522c5e167a63e366cf8b46e87477c345655f09738a14981bb40dbcd12b91
 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-16.3.0-r1.ebuild 865 BLAKE2B f7bc5c8780ca822e7c8183b8fbb6a13643fa68ba14c3f27509bcdc13fb4920b0c532a1afaae0131ae98730ffbc1b7ddb9b08a3028921e472233b728d66ea013c SHA512 d67a87f8571bc8170f4426f225e83aef781a3aa8696c53079946d59da4393029ca39d740ade7c6b211dd8bcfce9eb0887732e0b10ed519f7d33ce201dfd733e4
-EBUILD attrs-17.4.0.ebuild 880 BLAKE2B d1dc609419c3d5a15d36f3b6c6173d36b71acb8e9303e1436f0cf8e88643cd26ca5246d85e0d50fe93f2e4f8952be7431bfb1f0f3fe54e3c91f8074f7af2b451 SHA512 3b6c3d93a8e6c5370fbe121c901fe8fddd9d15701eea60a81153b627da0a738a1f3bd8f904806507be8168dffdb34b60de96dc2f7ef6c1941345bcb6b90ead6e
-EBUILD attrs-18.1.0.ebuild 941 BLAKE2B 8a793f0569f1831d1c05c89ecaf356860eeb6e5050b6a386a13e4bf00300b6e9bd67db429c4834fec080b1b1bab43a2aba11e5ae6119477a7754ea530de5e494 SHA512 9b1d97097669b25ba67d718c8b83e486750d291e63e8936b3c67169369f202f467a707e472d7d44d0b0c7fc6e94715f89340b80f27141803cdb665991e08cc75
-EBUILD attrs-18.2.0.ebuild 931 BLAKE2B 34d5970cd43cd9b82116f9c9ec63bd0e153c6a45f1c598a4dd97c105717fc2db57ed59c17365c3021a722ab6bf2f0dfbf020a8ca8e972d36de94ed40cf324b8d SHA512 db037d7dc0aa2720d690d7c1a49dcd11230d1c9cfdfbb7899d3da3f70e71342b8b82cd47ecd1b4792613c571547cbdb54bb59af3e044e25ee201ece740ab4069
+EBUILD attrs-18.2.0.ebuild 930 BLAKE2B 1f569b07d406977bf133646c15e8134160242b7b688e619d2b0b1d2b1622970da59772f2374959844dcb4ca3482c5f3025f28ac293b1704940d122ebc430917c SHA512 d893434714dc858b619da60064d3b32fd6329c334ea53069bc4c3bcd4d7422de03a8d053c80421830c6a028d49f18e396a6ceff2f1abccdec51778a29d72bbe4
 EBUILD attrs-19.1.0.ebuild 941 BLAKE2B d5a887a2261eebdd5f60f86128403efbf5b850d9534fe5f6d58aa43dbae97340480a9f8dd9c46dd8d3a81e6abad74d9e52286e96f199b1dc8a1fa3f08a072427 SHA512 2fbe62752f32dfd8d2bbc29d5f330ade076a4a67fee9b9ced0e0d95e6d7cbb1c57f670ecc4feed0879c519f65e2cc68cd9b6e086a42292527134134afb6f0a02
 MISC metadata.xml 488 BLAKE2B 808447388863096af88f90f97c58025508d5b4cd1ecd760c59dd8af1fa664e16756029e3d5d6b233578b9c0d7be9c8469761c9a89f222ae9f47556b6ee983fc0 SHA512 d8336a60cb0b2b8d51a9833c0ba3d47acb29ec4942b2f03b750d407bcbb65461d867470226bee962a8e585cfd4ff11bfff67b66ed2270f9efbf35d3c46bbdda1
diff --git a/dev-python/attrs/attrs-16.3.0-r1.ebuild b/dev-python/attrs/attrs-16.3.0-r1.ebuild
deleted file mode 100644
index 87dae1306b12..000000000000
--- a/dev-python/attrs/attrs-16.3.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-
-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 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-lang/python[sqlite]
-		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/test_funcs-too-slow.patch
-)
-
-python_test() {
-	py.test -v -v || die
-}
diff --git a/dev-python/attrs/attrs-17.4.0.ebuild b/dev-python/attrs/attrs-17.4.0.ebuild
deleted file mode 100644
index c033ac5b6348..000000000000
--- a/dev-python/attrs/attrs-17.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} 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-fbsd ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/attrs/attrs-18.1.0.ebuild b/dev-python/attrs/attrs-18.1.0.ebuild
deleted file mode 100644
index 188f51fb1a83..000000000000
--- a/dev-python/attrs/attrs-18.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} 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-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/attrs/attrs-18.2.0.ebuild b/dev-python/attrs/attrs-18.2.0.ebuild
index 9740de032758..a7bc43f4f82e 100644
--- a/dev-python/attrs/attrs-18.2.0.ebuild
+++ b/dev-python/attrs/attrs-18.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/attrs/files/test_funcs-too-slow.patch b/dev-python/attrs/files/test_funcs-too-slow.patch
deleted file mode 100644
index 4d0698ed7de5..000000000000
--- a/dev-python/attrs/files/test_funcs-too-slow.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/tests/test_funcs.py b/tests/test_funcs.py
-index 36969c7..00da655 100644
---- a/tests/test_funcs.py
-+++ b/tests/test_funcs.py
-@@ -8,7 +8,7 @@ from collections import OrderedDict, Sequence, Mapping
- 
- import pytest
- 
--from hypothesis import assume, given, strategies as st
-+from hypothesis import assume, given, strategies as st, settings, HealthCheck
- 
- from .utils import simple_classes, nested_classes
- 
-@@ -57,6 +57,7 @@ class TestAsDict(object):
-         ), dict_factory=dict_class)
- 
-     @given(nested_classes, st.sampled_from(MAPPING_TYPES))
-+    @settings(suppress_health_check=[HealthCheck.too_slow])
-     def test_recurse_property(self, cls, dict_class):
-         """
-         Property tests for recursive asdict.
diff --git a/dev-python/backports-csv/Manifest b/dev-python/backports-csv/Manifest
index 63dbc4fe4f98..48de51b8fa57 100644
--- a/dev-python/backports-csv/Manifest
+++ b/dev-python/backports-csv/Manifest
@@ -1,3 +1,5 @@
 DIST backports.csv-1.0.5.tar.gz 12050 BLAKE2B b6c5c4b846040167c081166fc4f0f0fb2df4f4d68e28a00e43762044f86e35c5e104a07028bcb7a7fa0f2d377b2da16d202308b4b905dad979118786c0ea0f7e SHA512 0b3885d818153bd50da2c7d931f64464cb344100622d9692925f9eaca056bf973f7d1d3546520e54e03472766c7d8b600c53e0674eb5958e768f713ec16a96a8
+DIST backports.csv-1.0.7.tar.gz 20836 BLAKE2B c9360890f4ace39564072afa6ee32d5ee5682f1703fbe87eea8b4a04c5575ab5bd63a813f0a86d3c5945429fb9e56693db38a80dec098e4ed7701684f1006570 SHA512 5b82b79ea865381a738f1d77a472d97118f853290fb4fd787537a8dcc7247b33cf8cf507519ad88d55419efa97f86ba9ef3f003b067b1f9cff87e08c2395969b
 EBUILD backports-csv-1.0.5.ebuild 706 BLAKE2B 2366b035e29963930683fa645bc1eecc1ddec161e354f75bc829265d28e4a905720a1cc004574f54ea98f1a898ee70dbcb8d641e5dbb7eeec911ca39b8ea525b SHA512 61815210c9888675624f06a0fa55f5f5dbfc17964d94491e98e910a7b222b615b82f9a0ae6f32f15a796f221a16608730c211ca3566f9656a1faa1d423a9c985
-MISC metadata.xml 399 BLAKE2B 7013785d5d06455f6e2062c5a4eec4ae0307112a322b5110f4a19a9b119009f228127c065f58b7e1e7f38454f25bd0ece430a335114c4f4d6ca32964841cf286 SHA512 bccd4c436f799645181113dbdb7b08c6013d4a60808259d6fe41fe5ed313df928b45342852299329e0a547600fa6d092e501fc06a64d020e777cbf52be42c6bd
+EBUILD backports-csv-1.0.7.ebuild 833 BLAKE2B b7942210ef8e51fa3c5392057f8f25ee9d7282bc470f968092296f3638e58306dcdd7de6252d57e94a746cac02c26c17af1d3c8494df715e8582651aa95c0bce SHA512 1478acf9333516980c643c0d27d4a8f71958131e1878bc608f8365564ff9dbb87311486c47ee09610b65c96b52ebf3be55fb940be8ee927eb4e001c7ab446542
+MISC metadata.xml 481 BLAKE2B 1d665b2355084e42cbc53d3738075a30c345cce5680d924a98b6895270b45c2c8ced51817065c551ceb260b038a8ab2184eb74d1aed820efa5a348c059a403fc SHA512 9d810ab9a87293ed1148cedb346d7fb94304fb7777cb6d8584bf5ec77f4e507188223ae6ecb4ea0cf007ddc171921b5499064aee1aef1f39e7be9f079c475628
diff --git a/dev-python/backports-csv/backports-csv-1.0.7.ebuild b/dev-python/backports-csv/backports-csv-1.0.7.ebuild
new file mode 100644
index 000000000000..aa307ff49dbd
--- /dev/null
+++ b/dev-python/backports-csv/backports-csv-1.0.7.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=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Backport of Python 3's 'csv' module"
+HOMEPAGE="https://github.com/ryanhiebert/backports.csv https://pypi.org/project/backports.csv/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	"${EPYTHON}" tests.py -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/backports-csv/metadata.xml b/dev-python/backports-csv/metadata.xml
index 8da7e8504f78..c8bd9d982ff2 100644
--- a/dev-python/backports-csv/metadata.xml
+++ b/dev-python/backports-csv/metadata.xml
@@ -5,6 +5,9 @@
     <email>grknight@gentoo.org</email>
     <name>Brian Evans</name>
   </maintainer>
+  <maintainer type="person">
+    <email>python@gentoo.org</email>
+  </maintainer>
   <upstream>
     <remote-id type="github">ryanhiebert/backports.csv</remote-id>
     <remote-id type="pypi">backports.csv</remote-id>
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index d5c2756322ec..f6ea3661bf54 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -1,8 +1,5 @@
-DIST bcrypt-3.1.3.tar.gz 40806 BLAKE2B 60b42bd4326ae1285911a79eff43f871366d6db8f1c2eb102f4f4cd3e91d29e58d30906b542d6f04ec0608dd5583550c0c9ddb795d8fd05cd1802396535ba59b SHA512 1fe80a156cd3707c27d4d3b6495caede3404acfdcd238d0461fdd83249601a0b0f2945e0f531dd4422f19e9cd47107245d8e40eb8b47b78e5c679e7e6b37a92c
-DIST bcrypt-3.1.4.tar.gz 42575 BLAKE2B c4521ecfa55e5b857e35c9d9e402b8e911b2546bdb349a4e87f31e6af0a2686ebc9df4fc6268534c65d3bca8facfa2e8ccd549174f8f91a25002e94ba7fb9be4 SHA512 885dadec10aa9c5944a68e73ebc3ba409d41517850fad1bcb61321a8ce4072b95422472b9f7ca76508e9b0d24a86e19f3e415a0713f0a1921b9d3f796089ae71
 DIST bcrypt-3.1.6.tar.gz 42216 BLAKE2B 280e2d01d3d5195fe7d32426b9e9bb7b4544dd1c0027a9d1b4be287e21759efcb274cb3f943a913891fd63183f0525f7f301b6d76055a37240a7594240bbff33 SHA512 fcd4f3ec27ee27b4523c9f9b796e9c279895ad66d124fdabaee61b3fb27351b2e8721deb97e7bfc4f07ac4cfad6c2948d467cf21faba2af656ab0030c842244e
-EBUILD bcrypt-3.1.3.ebuild 1000 BLAKE2B fa1787361473ef44fffdd0479092bf0b39d1edf03408330d4e6c14154ee0ae3a65f9a7bf708a8bd8cc4895e62bac200252b333901d1d7fd052336b6cd4ceeaf2 SHA512 5623104f2cb5fa264d62f0a9edb36b8ed14dff554d0c9f6cb3f764df6936a99f9d64b470d491e2a9ec5c25f9fe7329c9d65c671328ebd1a0ea0d7c8442c78842
-EBUILD bcrypt-3.1.4-r1.ebuild 1019 BLAKE2B 354ade145be1ce0cdd1f3f9903c31f14d7c6d18015aa65d4bad23dfdc5284c8d544b58988cb866bce94465210c7356f109256df0859624fbacb71e656dfac5ff SHA512 094c0848760d50b4bed62d886087e20d6e9e46f4505bc67f2140bddae3b4736a3648a21f9984b08988f2a1aeda5075bf325047bb323875584a89f42a20dac7e2
-EBUILD bcrypt-3.1.4.ebuild 1017 BLAKE2B ebfaa84c4a013461937c2e9cdd4a1f1f068928a2916b1e74a24afd32dc66d1aaad87319bccbce3710dbbed40dea9fed119eb7ca4fdca2b1ad4cb966af7d82e5b SHA512 6e9123c55a949d2ea8a5d59bdf1a78445e2343397b05213e281d7b8f3ca4439551eba678f2fda229a998d9bd26fa72b40b17f00144a0091ccde145e1610e313b
+DIST bcrypt-3.1.7.tar.gz 42512 BLAKE2B 5e762f153a5a69c1426748737956fd370e74fcd02e82b5a634e74dbb50fc9e894bdadb4e87eb9cdc580d0853f73ef348d9523ceaf4236df565e39b714bbd1c60 SHA512 bb9a431c8de97d5615d1a7fb67f868d08d839313fd5f3e17d8db40db1870f8b624594352c24c163c6a03485217de873cd92578040350678888728885c7b749de
 EBUILD bcrypt-3.1.6.ebuild 1010 BLAKE2B ad3b2f3468485d0f901d7c3f999c0a25875c172600850364e4697365b473d24ddcde440f75713a1d8b4386e59b7d8bcce25c47963433752db702ca7f9218f36c SHA512 6390e43e845c07658db33bf231ad089cc4f05cfff32d9baaa21b8c1901c0a02bbbad6f12e67f63802faf286154d74142ac8064b181fd2b6945014950f0d843e4
+EBUILD bcrypt-3.1.7.ebuild 1019 BLAKE2B 354ade145be1ce0cdd1f3f9903c31f14d7c6d18015aa65d4bad23dfdc5284c8d544b58988cb866bce94465210c7356f109256df0859624fbacb71e656dfac5ff SHA512 094c0848760d50b4bed62d886087e20d6e9e46f4505bc67f2140bddae3b4736a3648a21f9984b08988f2a1aeda5075bf325047bb323875584a89f42a20dac7e2
 MISC metadata.xml 485 BLAKE2B 789fde3cb8c29c27778293f22f9e3a4453b743d52f5fab1dd2db6d940e4e1bff843d6ccdb4f7374b456b2cd4f80877f453205bb9a5eeee9f6e32382297ab967b SHA512 3b4fb489f9d1ecdee3dedc58dda61aa86c6bc30f29aba50de6dc4faa499276d83fe15518088e4d0e76c98ca30188b2f1b921807821fc73b5dfc592490e6fdb46
diff --git a/dev-python/bcrypt/bcrypt-3.1.3.ebuild b/dev-python/bcrypt/bcrypt-3.1.3.ebuild
deleted file mode 100644
index 8317623158b4..000000000000
--- a/dev-python/bcrypt/bcrypt-3.1.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Modern password hashing for software and servers"
-HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.org/project/bcrypt/"
-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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="test"
-
-COMMON_DEPEND="
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-python/py-bcrypt"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/bcrypt/bcrypt-3.1.4.ebuild b/dev-python/bcrypt/bcrypt-3.1.4.ebuild
deleted file mode 100644
index f46f7cab0ede..000000000000
--- a/dev-python/bcrypt/bcrypt-3.1.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Modern password hashing for software and servers"
-HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.org/project/bcrypt/"
-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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="test"
-
-COMMON_DEPEND="
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-3.2.1[${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-python/py-bcrypt"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/bcrypt/bcrypt-3.1.4-r1.ebuild b/dev-python/bcrypt/bcrypt-3.1.7.ebuild
index c1403f50de9a..c1403f50de9a 100644
--- a/dev-python/bcrypt/bcrypt-3.1.4-r1.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.7.ebuild
diff --git a/dev-python/bibtexparser/Manifest b/dev-python/bibtexparser/Manifest
index 0475b99a509f..5cd8afa7dde6 100644
--- a/dev-python/bibtexparser/Manifest
+++ b/dev-python/bibtexparser/Manifest
@@ -1,3 +1,5 @@
 DIST bibtexparser-0.6.2.tar.gz 50876 BLAKE2B 660508717a224d1c1c28a52c8d7ccc8de7248e61b45ce73bb46729ee7feb8872bdaf92bd6b07cdfb7934fa57993b39749b9961185d4dc9cec2d55809761a783e SHA512 43a1c0475bc9e97c201a850e944f082e9eb316ac475cce4128b821008fc5b1597317f28c594f5462daee992b455fb4254fdf76a5baa02ff8e8a0e36f43c52491
-EBUILD bibtexparser-0.6.2.ebuild 686 BLAKE2B 1176efb899981df48f4e92da7e8187719d280528fc569f258514068c225c42d5319ed81e34c92c21ed6583af56684042c26300105d470706b8196addfe4e6b74 SHA512 1670710d08432d22cd6e3255b9c4f9cb9032c61cf0edab870f80ad97e9e04c85d40d6e09996fd62bc786089dca3a02095fd670b376e8ecf679535f4cca521985
+DIST bibtexparser-1.1.0.tar.gz 88656 BLAKE2B e5285953fbf79558643e19ea39f6421394f93afbfc6820be9bee0583c1efa010b9fe3478c9f3e36bea0c64e35c9d5bcb8341f1ee784c4150883e160723b94119 SHA512 f984cb307bfb8ee8143499469c0a83a28b3e9f061b17e5b43b7f9aa730c91427f2b2c441e501d37ab62f99ce2b7dd1cd7dee40b21c9f1a8e8b2dddf8eac2e74b
+EBUILD bibtexparser-0.6.2.ebuild 700 BLAKE2B 710cfa6ae313b4b0c1a4be1a0b53045da82e2c58cca41515f015e3ff8cc4a26b051bad98fb1fa7777d8f18f097797e86425b251236889be1bc3eafdb7f3fadd5 SHA512 06dc27f9f179af2aad1d4770acea630f1141016fb2dbc7f5ebcafcad5983696a9888e925d5cebfc9c603b4125fafc83a1f5d51c66592cec9a99fb97862463e5e
+EBUILD bibtexparser-1.1.0.ebuild 702 BLAKE2B 03d7c307424869536b282c39ded2aa5d5c3d840c89984f7dda9017cd1a0abc0b7f510bb6a3ccadb13a49fdb7e83ba617d945ad3424c0c691167c839c139654da SHA512 63fc2c4187106a926a1f66d9a122b5138519a5780e0b4314afced708ea11d8d840015e14c17fc93671c53570c0325e98bf326fee6815c77dc8d2162d68d93171
 MISC metadata.xml 345 BLAKE2B b62679a7f708f8ff2757c923e3ba7d8cfc73a7b3f1a293020660a20bec6cfd07e33b073f18f9543085834b7cfb07fb83f749ae30c2a0b18face008ace3b50da0 SHA512 d2ed1034bf79aeb9c8bb102618e5c5478a526a8567dd8e232126f35919b1e6ab6b27bc02f01d61a475c8ec3488450968fabe4548539d61a70b61459e0b1e1615
diff --git a/dev-python/bibtexparser/bibtexparser-0.6.2.ebuild b/dev-python/bibtexparser/bibtexparser-0.6.2.ebuild
index dd0c72185259..040473cf0601 100644
--- a/dev-python/bibtexparser/bibtexparser-0.6.2.ebuild
+++ b/dev-python/bibtexparser/bibtexparser-0.6.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A BibTeX parser written in python"
 HOMEPAGE="https://github.com/sciunto-org/python-bibtexparser"
 SRC_URI="https://github.com/sciunto-org/python-bibtexparser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="|| ( BSD LGPL-3 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
diff --git a/dev-python/bibtexparser/bibtexparser-1.1.0.ebuild b/dev-python/bibtexparser/bibtexparser-1.1.0.ebuild
new file mode 100644
index 000000000000..9d0a491d8df9
--- /dev/null
+++ b/dev-python/bibtexparser/bibtexparser-1.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 python-r1
+
+DESCRIPTION="A BibTeX parser written in python"
+HOMEPAGE="https://github.com/sciunto-org/python-bibtexparser"
+SRC_URI="https://github.com/sciunto-org/python-bibtexparser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( BSD LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/python-${P}"
+
+src_test() {
+	python_foreach_impl nosetests
+}
diff --git a/dev-python/billiard/Manifest b/dev-python/billiard/Manifest
index cad7cf8830dd..85476c07e9a8 100644
--- a/dev-python/billiard/Manifest
+++ b/dev-python/billiard/Manifest
@@ -1,7 +1,9 @@
 DIST billiard-3.3.0.23.tar.gz 151675 BLAKE2B 78cddee80df8a7d78f993ac33b40967c1f7f7b9c65fbb27d4038b48732a90e4dc016c83e009a5963e9cc208eaa6a5f74fd4a33f3faa0f49b2112f10c285be1f1 SHA512 2ab83512f5317230066f6f82615bda97c1fe6c0cf98281dc3ed486055584c6899695e6b9905d5825d657111c65c7f3552cf3fc7934ad2e4d4b3da09b538b09ca
 DIST billiard-3.5.0.0.tar.gz 155959 BLAKE2B dcfbcf7ca7d53cc1963d9753736e1001d2a4e1b19e4e67fb937619f327ec9c6af66ddf23a89ab4332499b16a6ede8bda86e82a8843a66d4d2b47d1c95885ee57 SHA512 c73adb0cd470e66cc6aaca848f24a991df3eda44e7adf0e83d2a7a1e87bba4381b165842e8cd297d43a4d01d4c006953107354b841cdad9fdde4e00e7a80c4f1
 DIST billiard-3.5.0.2.tar.gz 157299 BLAKE2B 1400d5a562dcab33c83a64cc7f7d14ad55b75677c3bb4c050cd4ba08a1f882e65d033653628fc3f2b52942081da3d5661fb0bcc5f2dd95f81a64749cd47d324f SHA512 581e1ac361324b36d79e280072952e490ef3470709b094f001c579feda54578c8e7b3e5afc93a5f878a6118c56afff7e59e13b3d3f2ccb2564b9b27cc810dae7
+DIST billiard-3.6.0.0.tar.gz 151342 BLAKE2B 46e29ae54144f3b4ebf3fbb4a5bdbba29662d3a6b292cbfef526618237103fd833d10eefe03211141264424590b33ddcd8722616d36ab4e2405198628cc29d5a SHA512 0a71de026d2a781b83fe2c549ecbfe9b6fbd574d8067fc46ba7eca6b76633a123620853d22696df3563d050043cfe75b14b4b69bf5217e0af964aaa0bcbe08ff
 EBUILD billiard-3.3.0.23.ebuild 1481 BLAKE2B dd95a5e30bdd086ce82680774e0a4274115f92d4d8903e7f383a945d94a4e4497bd31cd9e2bd1de4ac413093e0b90d7b2c3f1f1b36628d40567af0d3d7ae0c59 SHA512 3024041db569b19e552e91dfff301e742c02619ec526eb8b208cef4a6941e8510f38de47c20eea17babd790a169ac0b3a2bb41ba681bb9ac06c53d0f591b6c49
 EBUILD billiard-3.5.0.0.ebuild 1521 BLAKE2B d2b836208ffb7c916d2028c46b080c5eafb65870cfd72c42f2a63a408f1df46f5c3506360b6145833040e90aec65062e6de063ab68bed99a6b7184196f9be3f3 SHA512 eb6e4b361b35ead368354842ae8eadf8768d43523bcfa463134337c6bc05a9e1e5d19b1e1522375fd93b05546f449173ff685fe11bab15fa2d8633a2d1a2db28
 EBUILD billiard-3.5.0.2.ebuild 1047 BLAKE2B 1ae2978767dba8b44f91fc6a2bc72707116db1d7f99da7bbfe66de946f37265fbdceced8c31c6c7a6033ce6b0e06a4d97941d491f4975784d4e47cb5441729b4 SHA512 70da7468173dede4f1d71b9ab7fddbec384927e6daf2a8b28b41115c956824efbefc3e8a613d269773474a98d395dffe488835b6f162a5f9822b49499962d55e
+EBUILD billiard-3.6.0.0.ebuild 1154 BLAKE2B 21c4e670c7c8126b2a8eae1d61e1ef23d4a85c84f02bd39da5b4274480c0cc0b4c690013324183eb64fa7818eb4d0080d548e49408b977e10ed431ab024a8b98 SHA512 247ff4a8686c3d6db87a14087082fe76be22856e88c13a9f98e4a2650cf0551d4f0a8ce3d28b86001e85b6e75dd6399e66ece810997b0f4ae71e0cf814e5134f
 MISC metadata.xml 366 BLAKE2B 1ebf602d203fab55800c4b1c9df304a2eabab36beac69affe09a3429cf94daf9481436f4216f7e697cb4dc864962ed3a0d6ce3c476dcbc325292c7a38e331718 SHA512 f9784ef6cb7607efaced1b96745e9fcbfb13cff64d2be2cefe2e28e5475d8386daa675592f22d8f7fa23949cb015de73583dd8ab392aa9b6383e0befe30dc8d4
diff --git a/dev-python/billiard/billiard-3.6.0.0.ebuild b/dev-python/billiard/billiard-3.6.0.0.ebuild
new file mode 100644
index 000000000000..087879f89dc1
--- /dev/null
+++ b/dev-python/billiard/billiard-3.6.0.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} pypy pypy3 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Python multiprocessing fork"
+HOMEPAGE="https://pypi.org/project/billiard/ https://github.com/celery/billiard"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="
+	>=dev-python/setuptools-20.6.7[${PYTHON_USEDEP}]
+	test? (
+		!!<dev-python/celery-4.3.0
+		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)"
+# The usual req'd for tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile() {
+	if !  python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx --builder="html" --source-dir=Doc/
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( build/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cachelib/Manifest b/dev-python/cachelib/Manifest
new file mode 100644
index 000000000000..79f5b954157a
--- /dev/null
+++ b/dev-python/cachelib/Manifest
@@ -0,0 +1,3 @@
+DIST cachelib-0.1.tar.gz 9844 BLAKE2B 7281a3851281c2babd3d144db0e22270e5c196eaaf62f975844f9972538e571a36a855f8a0209e2f38d1a962dd52d0d7fcefa1f6d3b97c3f5dcd119585c7ade8 SHA512 8ed41a14f3bc36393ecdce7dcc0023ce954900f4541463cf08b823b6c11a28532812c9873d32991f023986ed2ded39a560ee556447bc6d4c3e45c3d4d749c2b9
+EBUILD cachelib-0.1.ebuild 508 BLAKE2B c14c923b4cc51fd30165e89f962210b4726c3b0dfceb7cabc7a70ebf0fc8a374d746c4a7ee2b76e5d8d317b9fac5e133f780de88ddeaeea5c45eb471fe2bb8ad SHA512 8ea25eaafdc76e7cc768f623e7c29849a986232e7bc457fce8082a0c945eba541481371a6f4959f252b73f0049d1d241cc37d98bf42415a8db58ef589712d8ea
+MISC metadata.xml 348 BLAKE2B 548d0e9474e9d2c42f0c4d0fb60d0cf53053fb7d4b2b62dcef25c0d1dac802b32af0af53189c8dea4b57309126840efd38a4fab3fc79000f782b82c9927b7a4f SHA512 b602b68d9c5d5fc239ddd37449d0edfb2909c8a8a5fd45c51c669a390149c107af0d5b198d65ef34e5f83aea1f225b8f136d693460abfa6ae27bc57232ca17cb
diff --git a/dev-python/cachelib/cachelib-0.1.ebuild b/dev-python/cachelib/cachelib-0.1.ebuild
new file mode 100644
index 000000000000..492ed3c8d99a
--- /dev/null
+++ b/dev-python/cachelib/cachelib-0.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
+HOMEPAGE="https://pypi.org/project/cachelib/ https://github.com/pallets/cachelib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cachelib/metadata.xml b/dev-python/cachelib/metadata.xml
new file mode 100644
index 000000000000..f82c49c0e818
--- /dev/null
+++ b/dev-python/cachelib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>kensington@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">cachelib</remote-id>
+		<remote-id type="github">pallets/cachelib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest
index 574e17955217..c1d508277dc8 100644
--- a/dev-python/celery/Manifest
+++ b/dev-python/celery/Manifest
@@ -1,5 +1,7 @@
 AUX celery.confd-r2 1442 BLAKE2B df6ab3585c12fef2272979ad3412f08827f59e9306b7b997642ee8bd0d4c84b168f32fd9b6427be3c889af411806d37673853588999d366b549908891491bd6e SHA512 ba3172e56a18df963b5886497c51b8aaf5298b5f3055214217561c8c691678b44c762d4f68f96e597807630af4d9185b7a9d557d13f7ffe25fc0092abcd09354
 AUX celery.initd-r2 4303 BLAKE2B 259821a93fc84c45580e06bcb4aa36b72a26290c917afea86b6e095489a1abde7b00f3ed91fa699452b4b7635d71bd72fd12ef9f46a3452f1f0d69c841c83b29 SHA512 722b5d526cad15589a4c26c4871c11255f8f1550b6d6a9d503962c07a6c60167d411f47135d55408acb6320636f885fff28e7691d74831ec1c2bb9d5dc48f3e2
 DIST celery-4.1.0.tar.gz 1331689 BLAKE2B ac134d26a21bfd1172ea7a2ccc5f9934b4fdf56dccb6f840726040adf5b81ab0c675c0c93754340c0429c4eb5777a344be74415a795a9dd6654578979609cecd SHA512 5232adc43ba55d01f2b030382075750033e0c5c2abdc8308903e0cef7a465513b7765e2ae495da6555b377452ae233500530ef9d57e584a5352a54c5f4731c64
+DIST celery-4.3.0.tar.gz 1434073 BLAKE2B 47d9d461a9bf3d3418a7cb37684f53cce58ef1d1bee928e74cc8b6ff8e9bfde19d99a59d7a8ef7b638efa24263d5b35f50c774fb5f81e9c693c9d3c6242015ac SHA512 6a4f99857c2b329eddb5200934b2c83bc2377b5b89ccbcfed548d8f52cff40800db7b94ea321f74e932ea4be42a546fb9b515569266435cecdbe204a0a891b2f
 EBUILD celery-4.1.0.ebuild 3461 BLAKE2B eb5cb021e14426fedcd0fae5650d56521d71f4322cffbb4182d0794eb303cdd0b576986926eabe1efda40336c9b99da1fffdbbc07a67c6ef1dfd0bd16cfaad0a SHA512 fb61afec782ed109d82a9b1567477d20d7e59a218f66d922d9de9ddecdc495c438d302506d647f4cb14229ac2290de41e0b8e45755369c0f3043951dc83c86fb
+EBUILD celery-4.3.0.ebuild 4112 BLAKE2B 4c0afd7bd0a5af4f8ee4cb348732633f3604ba54f9dfa8863687181b199e03099c52d1bfd410b7e2274f058e8dc37e1933ee2d2d2a2bca902acd767c523dec7c SHA512 c16981166a34959e5b79b223cf546073b50a1fd6c3f18d010b67feae93c76b3be74226f628434e03441e83f76955c23f2a833f1e73639d5a2cced36b0cc8a3a9
 MISC metadata.xml 528 BLAKE2B e7c57658c1e2d86d4f437649706c340148e6c713e7e1fa8fae06e60afb332562683bcef6f4946555664a1d1a916857addb1e3134c49edd20245fbee58468eab2 SHA512 73fe8a564452f48193e92c3c72368868fb0a6c4ea54e836ac91547f8acd190a4c653b6770f36fb645b4aaad86ed720a4cf4793a8cbfaf3188ac297708508d59d
diff --git a/dev-python/celery/celery-4.3.0.ebuild b/dev-python/celery/celery-4.3.0.ebuild
new file mode 100644
index 000000000000..3776ae77abe0
--- /dev/null
+++ b/dev-python/celery/celery-4.3.0.ebuild
@@ -0,0 +1,125 @@
+# 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 bash-completion-r1 distutils-r1 eutils
+
+DESCRIPTION="Asynchronous task queue/job queue based on distributed message passing"
+HOMEPAGE="http://celeryproject.org/ https://pypi.org/project/celery/"
+# The pypi tarball lacks CONTRIBUTING.rst required for documentation build.
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/celery/celery/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# There are a number of other optional 'extras' which overlap with those of kombu, however
+# there has been no apparent expression of interest or demand by users for them. See requires.txt
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/kombu-5.0[${PYTHON_USEDEP}]
+	>=dev-python/kombu-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/billiard-3.6.0[${PYTHON_USEDEP}]
+	<dev-python/billiard-4.0.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/greenlet[${PYTHON_USEDEP}]
+	>=dev-python/vine-1.3.0[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.24.1[${PYTHON_USEDEP}]
+		dev-python/gevent[$(python_gen_usedep python2_7)]
+		>=dev-python/pymongo-3.7[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.3.1[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		>=dev-python/redis-py-3.2.0[${PYTHON_USEDEP}]
+		>=dev-db/redis-2.8.0
+		>=dev-python/boto-2.13.3[${PYTHON_USEDEP}]
+		>=dev-python/boto3-1.4.6[${PYTHON_USEDEP}]
+		>=dev-python/moto-1.3.7[${PYTHON_USEDEP}]
+		>=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+		>=dev-python/unittest2-0.5.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		>=dev-python/sphinx_celery-2.0[$(python_gen_usedep 'python3*')]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python2_7)
+	)"
+
+# testsuite needs it own source
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Loosen requirements
+	sed -e 's|==|>=|' \
+		-e 's|pytest>=4.3.1,<4.4.0|pytest>=4.3.1|' \
+		-i requirements/*.txt || die
+
+	# Suppress KeyError: 'refdoc'
+	sed -e 's|^[[:space:]]*return domain.resolve_xref(env, node\['\''refdoc'\''\], app.builder,$|            if '\''refdoc'\'' not in node:\n                return None\n\0|' \
+		-i docs/_ext/celerydocs.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup -3
+		mkdir docs/.build || die
+		emake -C docs html
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	# Main celeryd init.d and conf.d
+	newinitd "${FILESDIR}/celery.initd-r2" celery
+	newconfd "${FILESDIR}/celery.confd-r2" celery
+
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	newbashcomp extra/bash-completion/celery.bash ${PN}
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "zookeeper support" dev-python/kazoo
+	optfeature "msgpack support" dev-python/msgpack
+	#optfeature "rabbitmq support" dev-python/librabbitmq
+	#optfeature "slmq support" dev-python/softlayer_messaging
+	optfeature "eventlet support" dev-python/eventlet
+	#optfeature "couchbase support" dev-python/couchbase
+	optfeature "redis support" dev-db/redis dev-python/redis-py
+	optfeature "gevent support" dev-python/gevent
+	optfeature "auth support" dev-python/pyopenssl
+	optfeature "pyro support" dev-python/pyro:4
+	optfeature "yaml support" dev-python/pyyaml
+	optfeature "memcache support" dev-python/pylibmc
+	optfeature "mongodb support" dev-python/pymongo
+	optfeature "sqlalchemy support" dev-python/sqlalchemy
+	optfeature "sqs support" dev-python/boto
+	#optfeature "cassandra support" dev-python/cassandra-driver
+}
diff --git a/dev-python/cli_helpers/Manifest b/dev-python/cli_helpers/Manifest
index 3648667dd667..afbdebc55619 100644
--- a/dev-python/cli_helpers/Manifest
+++ b/dev-python/cli_helpers/Manifest
@@ -1,8 +1,10 @@
 DIST cli_helpers-0.2.0.tar.gz 33855 BLAKE2B 8509fd6ea4ce1af77a522d36f98261a019d6b4b7250549af8014c4aba01bc4f4a63106c55b3d5ce40f058f0927db4044af51c7f948879d44a452b35369df8f2b SHA512 7dfa9791f472ccba3d49d0e87daf859257e74349cfbd8920a624f3e8d6905d8c8b7fa7be70eda97091963e548fa16dfbb1171e198cbbaa9d7810bff2321ebe54
 DIST cli_helpers-1.0.0.tar.gz 23269 BLAKE2B 2de1729b32a690d5832cc956c30bdf3ec35b3bfa94d1eed391dc18a1aadfd7229a1cbb4368a08406a3c6bf2bf59c835ac975bee797a58dbb3121c34586632d1f SHA512 8137b081cfe3d226c63cc7c17165f884a42147ea184d11a1e0ee5805f2d22bce37ded580a0c15566bcb057df4c39f2685595d74b2e21d46932e2e635f77eec68
 DIST cli_helpers-1.0.1.tar.gz 23382 BLAKE2B 544bf4165315a6459ba203efc7f55e3a48d4af8a12a4a3dcd4742c9e8f9d72c9163784e4adc42f5910d5ffd42d957aca47f4765e01cc9fc8c17649494b0396c4 SHA512 f4999f20d7f785a143d672ea9e62375dc6cb1abf093796dedcc01003970931a397096cded3515d060b47aa8e38b2a03fbe12f919f84451365d078126a5b35021
+DIST cli_helpers-1.2.1.tar.gz 31104 BLAKE2B ded2b9b7825ddaeb33acf64b65362251f773a4a0a74aec1c79bdd8ef77f8f6953dd8761fd926f7a2b210c69534bee220f88e816dd63277b27db15b400510c9f3 SHA512 299fa4984b7c76e6be0527f040582242a746938f8725b6193895f9bbb835c82078658bbb8d1ea0000c26f3c8d2dad93139fd600e7c8d7c2d89777de27a5b26cf
 EBUILD cli_helpers-0.2.0.ebuild 546 BLAKE2B 1d26923f1cb8db6ca7a42ad6ed3b73c2136e6a5e7fdbd3bc1b982ab71248f537fe89ed6f8c8db444ebeac6c116668e4055a7f5ec2dde90c8f3cda38b378ad71b SHA512 c0d1b017c574d936a1499eb9791f1216a444971dd9915b988c238f442fdefb62595d6b277bb70445cb025bae574e5c5833154b72a0f74dd1c6692a0c4ea8e222
 EBUILD cli_helpers-1.0.0.ebuild 601 BLAKE2B 91b79943d8404e1730cf5a56af2e4cd58a11ef863be685d4db5b5074a2ac39cf407439f53b0bcc48fd109115069ea23acce0d35a11198efca1d1d9da5447f7a0 SHA512 0cbba1ebff44bdcf8ceb7ec5ac10c7c2959455017beacb08a483588dc1dec9830bea185180c8ffec09ec68f667029a8b16eaf089cdfd1c9a496238805905f178
 EBUILD cli_helpers-1.0.1.ebuild 651 BLAKE2B f59049620bc9d66bc472fab7d5fbefa66eeeebcbf375cc9e42471c8005a06e9b1a49e68c1a5be1b053d1f0a640599c0595d67fbbbbdf6c2ec8b4ddb6d8ec98d7 SHA512 caea109dfa202f5eea3e8865d25bb908b99ead7821b4b746761e4f7245fb770859668fc92187a6ae92f2223f8fd8c55774e7c66c4273ded34e49b7a2eb60cc8c
-EBUILD cli_helpers-9999.ebuild 631 BLAKE2B f2d68dc31cba7df1686fcf13cb50d51a0b3f974f60579169b8cb9e9edb0bfa3160125feb586026c19a2720e4eba10a678262aac0f79faa10f887ac86467a5fdc SHA512 8141a6370b5aa2db6fd5a0868f0b18454391da20efd1b45e2bca1bd8c20d6f4f36543817f2e992e092598063b07b65bf2f2ed7c3874640ef4f358fced8ab9551
-MISC metadata.xml 322 BLAKE2B 16f308194537f996ff6a54d92c996267e2ea37d78d9377d3d3b5a6246ebf511c9dae536f03627a32885753a2d3943554a9748513a036ef6e10b952e5281ecfbe SHA512 ae5215f13b457aa43dc95d67bacc371292f0c8f6540dcb49633f0120232dbde7fe12479c3ff16c203b20ac96700be12c187444a768f50e319320684553509dd1
+EBUILD cli_helpers-1.2.1.ebuild 971 BLAKE2B d9093cfec13b41a6f2480406e002582f4e79ff6a3a98fe967f6ab73c5916c432b77cea547eed9c77a530f597c1dd02e659143bb1ab5842c6e1413835a8a41ad2 SHA512 5ae9610d22da8a05147e1f9e5db61d3f46361a3775e4e41f5116d619b39d354a0750d0e1609a6e79a398a1845200872a67af1c403f591b1ef30e3ef8338ab621
+EBUILD cli_helpers-9999.ebuild 959 BLAKE2B 04d3a02e0f236a690fdb8a2aa6b91c64d00fac4042acf3c09e88a1452eb9fe622800c3fae60427159bfc7e54f11baac79adfd3f4c8bd5d3a2be7466430898b97 SHA512 29adea347d6d6e14eb375aba42c307303baecfd5e6b71a9f28b2ec597462c6b31376a8e6d54ef28a3492ef03c8a0d14d36c5d1710d0fbbd800774fdee4122f44
+MISC metadata.xml 406 BLAKE2B c9dda1fafe8338ff28ec2bb3f4d3b886ea70558a54bf7a61147b4cd6feb2b1a02dec7757aa2d69dcdf5fefede321fdf8ff97548bd8065af9ff5362742adb73b0 SHA512 1f248941b8af03410a414ca6a487c431ba3ceada7b6898b5a63169109ca44acd122dc6dd42ebd3e6b8aafe57590e80aaaddd21824fc82c830674bbd1cf571a83
diff --git a/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild b/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild
new file mode 100644
index 000000000000..c87fb19bc66a
--- /dev/null
+++ b/dev-python/cli_helpers/cli_helpers-1.2.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=( python{2_7,3_{5,6,7}} )
+inherit distutils-r1
+
+DESCRIPTION="Python helpers for common CLI tasks"
+HOMEPAGE="http://cli-helpers.rtfd.io/"
+SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/backports-csv-1.0[${PYTHON_USEDEP}]' -2)
+	>=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/terminaltables-3.0.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/mock-2[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cli_helpers/cli_helpers-9999.ebuild b/dev-python/cli_helpers/cli_helpers-9999.ebuild
index a781b76eb170..edaf342667d6 100644
--- a/dev-python/cli_helpers/cli_helpers-9999.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-9999.ebuild
@@ -1,24 +1,38 @@
 # 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=( python{2_7,3_{5,6,7}} )
 EGIT_REPO_URI="https://github.com/dbcli/${PN}.git"
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Python helpers for common CLI tasks"
-
 HOMEPAGE="http://cli-helpers.rtfd.io/"
 SRC_URI=""
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
 IUSE=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
 RDEPEND="
-	>=dev-python/backports-csv-1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/backports-csv-1.0[${PYTHON_USEDEP}]' -2)
+	>=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
 	>=dev-python/terminaltables-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
 "
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/mock-2[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cli_helpers/metadata.xml b/dev-python/cli_helpers/metadata.xml
index c80f94490085..b4426629df10 100644
--- a/dev-python/cli_helpers/metadata.xml
+++ b/dev-python/cli_helpers/metadata.xml
@@ -5,7 +5,10 @@
 		<email>grknight@gentoo.org</email>
 		<name>Brian Evans</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>python@gentoo.org</email>
+	</maintainer>
 	<upstream>
-		<remote-id type="github">dbcli/mycli</remote-id>
+		<remote-id type="github">dbcli/cli_helpers</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index fe9badd90955..69000fe520e2 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,5 +1,5 @@
 DIST cloudpickle-0.3.1.tar.gz 18927 BLAKE2B fab03106f91d475c83c25d0259fcf4e70baa96422bad84e7393967ea480ebe36412b32792a4e334f6a495c795139accaed739a3e3f3d7058352dac2f0f55974d SHA512 81ea17181710f3428bc9c80e2e4b1fa57eadd6781528ed92ce5854ce86cded0b754d98afccd322408786ce4e3a77a1c758be73f197d809dad07c24e9dbb7c68d
 DIST cloudpickle-1.2.1.tar.gz 42138 BLAKE2B 37579a1dbe6c38697236273f67221d2cc497c1bb92a268e39339a9c55a348645cd6e0872ef720e19d0e891359ad6e0af3b6cba8416c431c79979c68c53f9aa7d SHA512 5ec7ddceff7c43e46011370ba00f693dc669a1b3e1cfc42b42483850879d6246073ed20d4ca92698984b4935f5b69e5ae0dd96dad82de3f296e38ce7b644a6d2
 EBUILD cloudpickle-0.3.1.ebuild 649 BLAKE2B b03f481cec5af1f73be2d7e6a64a524e6de9c11fbc80779c7b7bf4f77b1edc0e98a44906a8c3fea6f43ea8986ca38407a73b83c5a4b700f6ee82ef34353dbd20 SHA512 a0acb2a991270b87824512daf57c6f29b77b9c009e393951968d426d4e1bb63288c67baaf302096fa5e222f0e7ad0044ba4c0cf8d94e04586d40f2e1eeab9da0
-EBUILD cloudpickle-1.2.1.ebuild 737 BLAKE2B f6086c6877b7d0c3fe89821d6ffceb5eee9cd68d688f0f1e73d00f40e37f4accd43e9f69dc54be0df169ac5943795ac2deeba297b343c2e333acc44f0a4a1341 SHA512 56ab826330308e4e042496ab61ad333e716e7d68d769fad716e88fff18de2164888ed146c4d0451aa73bbed2fe1f0302099d91a61d16f98ed7b22a9575160d9e
+EBUILD cloudpickle-1.2.1.ebuild 744 BLAKE2B 3acb211c92a31840413386a1c22fcf9a62d3192e4a2f85bdf3a2c18a0b7b85b3468871019b621a57024e4d3808dba02781edcff99cc2b8cb206d2a4193b7caad SHA512 9e7b1efe103632872e07d0075715269eab7b486702f45aac0aa73ce6194997edd441890bdb68c5af8ed61ed19f391529f9282b02065745484437f31b4b71d8c4
 MISC metadata.xml 324 BLAKE2B 1c37428b4d95b58077885d0a53a7f016566b0c1f3b6f6f1304f5f70c4ff3e175e4d4e2f5d1c940c7f231cd143f8592af96136fb303c47cd6762108fb393289b1 SHA512 2f331643b833ea7d97a6e24c21c6583e590204a38cb9ce77361ed7833e35e8c23dfc2b1b430d0e0cf2e45c0781b624f31deb4df6df8044b8dd34a5be16c3b3be
diff --git a/dev-python/cloudpickle/cloudpickle-1.2.1.ebuild b/dev-python/cloudpickle/cloudpickle-1.2.1.ebuild
index c99bc7ac83d6..ac484042436d 100644
--- a/dev-python/cloudpickle/cloudpickle-1.2.1.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-1.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 05a7c5267054..d06840caa3ae 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,7 +1,9 @@
 DIST cmd2-0.7.5.tar.gz 64939 BLAKE2B 57c8d3f4c7c94e8e2627fb5d2cf8c164da72c531808a53118f950ee79fcc2e0f431621ffbd74d275bf508c8646ded761d2d38c2b99570fdadbbaddf095e422a1 SHA512 14376ee283ac1c153ab0194a5dfa168eca36174783322ff72e190ed96b8c315518fef4f3ef09d77633851cb53b32f71fe380042ee3c0ef8ef2cbdfa16dabf704
 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.14.tar.gz 530199 BLAKE2B a503e71959927e01986028da423c11f971972df0826f95cb06ca0594d9b90c19a5502ec19d741ea7a30b0ab9fb6f9d33fb5c20fc37c01695039b69979b862410 SHA512 4a606fc821f32dccb53b0558645850b383f814ae79f65e491376638960c5951ddff3ff860190d6ffe37b9fd616f44659793c1b1389eb76fbb369726cc1108c77
 EBUILD cmd2-0.7.5.ebuild 896 BLAKE2B 7099810ad7eddeeb703bd56d9292bbb99b299452527d18662f10e072285af7ca395f9b09c7403da38ca13cfba86d6f7356c6fe9e6038eec47121c69dcf34d2d3 SHA512 2ec25bce60270182d4f20d1f514492821b899f3be7c1e9c1e372509adc06057e666c60a153ef7befd8e5529d762e8d9892125610ed77f31dc55cf0090e7bea2b
 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.14.ebuild 1043 BLAKE2B 4318c067b0e725c9563e9b2955be15e538e999698810d2498406e8492c0470f20ad92c7309df5e704216a5b573c31a2bad0711d17dc9d724c595502923636ea5 SHA512 5d10d8ac67ca49f6fa7c55b4c71c88cfafcdc06b59618a08acfac497548d551717540d4819a7f08148f447d88cf7924a51436bbbf55ff677e2824fc84b34a74b
 MISC metadata.xml 665 BLAKE2B 796824fde35499ef70bd730f7e6c6ae4b239ea278f77188215ae0fc6e062598d943b0ae42ab5b378e8777c7c6a2162b330971bc00572e6dd43c663a3da677aab SHA512 64183ffbb33f229d4295e6fb34d98603d38da0241c6d1593704da866c17e04c9fe7f9500a1256b6e83c919eae019f71da93fdec7f09db99e073dbd809144b735
diff --git a/dev-python/cmd2/cmd2-0.9.14.ebuild b/dev-python/cmd2/cmd2-0.9.14.ebuild
new file mode 100644
index 000000000000..49165bc5b233
--- /dev/null
+++ b/dev-python/cmd2/cmd2-0.9.14.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/pyperclip[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python3_5)
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	# test rely on very specific text wrapping...
+	local -x COLUMNS=80
+	pytest -vv || die
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/colorclass/Manifest b/dev-python/colorclass/Manifest
new file mode 100644
index 000000000000..36628e7730db
--- /dev/null
+++ b/dev-python/colorclass/Manifest
@@ -0,0 +1,3 @@
+DIST colorclass-2.2.0.gh.tar.gz 486151 BLAKE2B d8f4c9e826cf284df47bf2aac4da71f448818858e2383b331b5bba791d9db3c5c11d5aff74b3eb740e657914137b2b74b217854ab589806a22a0ff6697cbde1c SHA512 c627cdf6abdb5a60e9ecc1fb3b669898edc027fdc3f8cde31be2e10402ee308c2067fcd50d1228759e93fc58c521b7fc12e6b259233a17cf99f55cda26279fed
+EBUILD colorclass-2.2.0.ebuild 674 BLAKE2B b858d9f2149e54099abfc32f5a7d52d92a9172c1e1b73d65b6c362ff64f7c4370d5c1d6ac99f52a2fde9a3aa2276f297baf3c46be99ff6fc651a1055e21fe0d6 SHA512 c4615fd717098cde340b8e1dbd595764ba1928e303cfdefe2e73506f1fc260417b63cffcdd64663c745fbdeb92873abdad30fa141107be2e93cc0f67252d83e4
+MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/colorclass/colorclass-2.2.0.ebuild b/dev-python/colorclass/colorclass-2.2.0.ebuild
new file mode 100644
index 000000000000..3a2e9a69f58a
--- /dev/null
+++ b/dev-python/colorclass/colorclass-2.2.0.ebuild
@@ -0,0 +1,24 @@
+# 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="Colorful worry-free console applications for multiple platforms"
+HOMEPAGE="https://pypi.org/project/colorclass/ https://github.com/Robpol86/colorclass"
+SRC_URI="https://github.com/Robpol86/colorclass/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/colorclass/metadata.xml b/dev-python/colorclass/metadata.xml
new file mode 100644
index 000000000000..266e3f19ca59
--- /dev/null
+++ b/dev-python/colorclass/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 20a236da67a0..588bc0d6de3d 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,17 +1,10 @@
-AUX 0.25.2-test-cpdef_enums-L-suffix.patch 586 BLAKE2B 625addf1285b64abe19329cd41cb86f07d7988cd344b6cf69bb7515ef400a9546737970e7151a21813f6f6658b62cc2b0402113982631f44f2b730e68ce44867 SHA512 95e4d94250720161da9a08441201e76aaaf5477325950ccc1cb9df209b8e5eb77572d81b75ddb9f5733973578fcf44c17f5b2d8f7338badb664cb2f5659be6b9
 AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca34f39bb2c897aa50cdebf960589181a9614a50829c380a892a9013e8ec5f538d51f52475cb8d92fdb5b SHA512 dd554d0d6cc220988552b06a20337af20b847e75bee76c90eb92ea979d9c2ae9d64ffa849266ff403d857b3737981de451bf40061bea0533600476bc57661c18
-DIST Cython-0.25.2.tar.gz 1703315 BLAKE2B e458604d0843afa128c6019244220bd6b3dd6653013698aa67ee2f71555f09813a8136ef92d6dc51ca38fe085e7bedc5e01d1a32bbd0885e62bd91c2e482bebd SHA512 1974b9374aeedb030307dc95aa6560ce9d5e1652783cd4552e96ef11663c73dd263e3521b68e7712abbb31628011e2e66320c5ee2577968684e2679eb80726e1
-DIST Cython-0.26.1.tar.gz 1725133 BLAKE2B b2c0433e8154ad76d921677608cae42a793326015ff320d8cd61818e5eb5fb4daf73ad4e72760d84f4cdaa2386b87d719cf9cd41584b781d4e2021e377a58422 SHA512 cdf31afaba78209c37a224345471c5c822b78c6d26c51583c46669b6b2b57b4952b33a839a51d06c3330fdff889345ac611fbaa2b2f17498cb02f3b5675f7948
-DIST Cython-0.28.4.tar.gz 1880943 BLAKE2B a97314147294c95fa0bd6d3fa1a1315d81f8abb46a1f2196009c1ef6f0dd7f47f81a7b31ab81d1fd00e8de37878a18a22d225055181ee74ffe4cc8105d84cd75 SHA512 67d2da2d776fc02193cfe98c8942e93905ec5e30bf4e0f9d5c965d930a034936d4c29c8248fccefff5db6d4dee054ec854994bea63fa3f64ff65df7550997c29
 DIST Cython-0.29.10.tar.gz 2049468 BLAKE2B 1cfae1c5e2d7277d3ac25ab0ff5a7b4346242e6c01d0b7945491f4fb64e0c9b98c593efa41b790aa0437ae72275a0ba3b6fe8614c7efaadc6139823f0e453d71 SHA512 df8430bb89816df84abfc6d59bee8e50f4117e8e82b9c82a889afca390a42a1569a9b5dcde76f40e7c29d728489af34c6fe0cf359912f7b74ac0d014af2171c3
+DIST Cython-0.29.11.tar.gz 2050170 BLAKE2B 47ce8b73371b8f4537e4ad7645dfaccdca207573eba68fa7e5da079db5b739b8cede57a55a19b2bfb28aaf30f8d5b5c9eb8492fdfcc07f533f4e9af036a315ad SHA512 d683cd006afb9778c9c2d755646623977d29d05675be8bc85f711d4a0cadcd5bd7ed623a2a2bc2067898b0d5b99819f2047b91345ecd5e4f0828eea6f62ec83c
+DIST Cython-0.29.12.tar.gz 2050537 BLAKE2B 86c5ffd07e97d549f2d98ae0aa66a03dc2f8e86b3fca304f3fba69f63c1e6d176c57d19f4877cdfd500ca2ebed2eaaebe1ed7cea0099fa23bc7a08c23f1b4f26 SHA512 502756331d8c3618a75a881fc1a20b7e871cd3412904070f3080d5bd0918440230fdae96f096c255fec6b32b81ffcf838f22953b8da23b8845527810f457be60
 DIST Cython-0.29.4.tar.gz 2044382 BLAKE2B b36d27706a3270805f66190a4cf2735eaf20b1b932365b324a433c0e58e63e860ce1500333233c3539ae697886ac0adc361a2c158d5d064a3ea05843debc3f26 SHA512 8f115e36975aaf64eda4df8b0a85378d0c80b3292dbd162be826b939def03bdc9f3eb937676e2367003c2944b570d97f50d7880becfdb2fdc5144077b4a722dc
-DIST Cython-0.29.7.tar.gz 2047944 BLAKE2B 79a2dbbbeef2c87e523d1222c1e3b62a63273644a0295a08fed3909ef01f2167baf15c0344a64ec168820e21c5c99b0accc083c8dfcaca7f1c0cb8c4b23677cc SHA512 1c2fd2185d65445318118d917ff6f8b4b958b0a036bc3ce1587dcb8fa94ccc750901cece27e4d0d39c53db68c3a620edf2dcf9424d7a6df58a0275097b90fa6e
-DIST Cython-0.29.9.tar.gz 2049206 BLAKE2B d81cc4be6d99e8be025167700517880c3250feaf929f84a9de76e2c9f1ac5eb8018a7cb4609d95c01112e35ab54070eb373157004621d45db3c347ea2b585bb5 SHA512 17ac97eaa01e3c6cd9c7d597822ad25ef5cec2354055304a2999a0a0d969fa0513640470260cf0d88c8d9a7c331f02d1ebf144245a6c45de47e26e7fa73b0ae1
-EBUILD cython-0.25.2.ebuild 2136 BLAKE2B 9e80d1abbe44ecf401f9fa6f2c013e02373c294ca654272b3d44d2b39c7e42fb0e890efdf047eae693d3df9ab960b9778266c1bed7295adabf1ea6c858f448ef SHA512 ed871f7d255fbf7e112fcc67247264005f8c38cd4a9c8be0183e7f2edb6817cec0a47ab858133aa32f5042003fcbcec424ef7c6ef930e1e0060b0f2d73c1a0b2
-EBUILD cython-0.26.1.ebuild 2080 BLAKE2B 0d61c28232f347c0646c5585b3d868f0cd490affaafe70b3e3cefe14ca64dd734d36c4e74745acfe49eeb3f28ad8cf215c3059229c5e7059bf0fa5ef63600abe SHA512 1c1a079f24d7245201a069b757e1b490c7ffc8108cf72ae00cae8b128953a5b910aee4be6c1e78750dfab809b0c3a76214a21dd81785655453aba68f9298af40
-EBUILD cython-0.28.4.ebuild 2196 BLAKE2B 05f6e26da211e42cb46b6a182bc017077bd1e632b4c963cb4a0c48a64dde5926866a47195f235ddbf0143fdd35a588d4651181c1ab9443c67975a4abc0bab5ac SHA512 979bfda159eb6dc89cd7a790166926201f0e74ce8ac3f887a5a40a6ee023e5cf4e2fc9d803cc5e563fb32ba3f7ba9d4447fe47e38c5b7ce6f3292653d9f0f9fe
 EBUILD cython-0.29.10.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
+EBUILD cython-0.29.11.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
+EBUILD cython-0.29.12.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
 EBUILD cython-0.29.4.ebuild 2160 BLAKE2B 4a854e80cde14979e6a35131b7002a68745978eeda2d370b46f1d816a424296e61b43894e7e488ed7cfe238f2c0a8078639172ecbd9534326965e658b2fd3672 SHA512 b1b9f03ea3addd10e61ae1b855c28a495055a13a859df06ff3869cf3c917101dbe7c0259525103fdc3123c23c5f5c2c5804f7cefd073cb80a0248ea90097e4a2
-EBUILD cython-0.29.7.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
-EBUILD cython-0.29.9.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.25.2.ebuild b/dev-python/cython/cython-0.25.2.ebuild
deleted file mode 100644
index c94da77b78ba..000000000000
--- a/dev-python/cython/cython-0.25.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic toolchain-funcs elisp-common
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="doc emacs test"
-
-RDEPEND="
-	emacs? ( virtual/emacs )
-"
-# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs
-# spanning several packages. This bug has been fixed in the recent release of version 9.1
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-9.1[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
-
-SITEFILE=50cython-gentoo.el
-S="${WORKDIR}/${MY_PN}-${PV%_*}"
-
-PATCHES=(
-	"${FILESDIR}"/0.25.2-test-cpdef_enums-L-suffix.patch
-)
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS}"
-		local CXXFLAGS="${CXXFLAGS}"
-		append-flags -fno-strict-aliasing
-	fi
-
-	# Python gets confused when it is in sys.path before build.
-	local PYTHONPATH=
-	export PYTHONPATH
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-
-	use doc && unset XDG_CONFIG_HOME && emake -C docs html
-}
-
-python_test() {
-	tc-export CC
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt )
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.26.1.ebuild b/dev-python/cython/cython-0.26.1.ebuild
deleted file mode 100644
index ea74ee77736c..000000000000
--- a/dev-python/cython/cython-0.26.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic toolchain-funcs elisp-common
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="doc emacs test"
-
-RDEPEND="
-	emacs? ( virtual/emacs )
-"
-# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs
-# spanning several packages. This bug has been fixed in the recent release of version 9.1
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-9.1[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
-
-SITEFILE=50cython-gentoo.el
-S="${WORKDIR}/${MY_PN}-${PV%_*}"
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS}"
-		local CXXFLAGS="${CXXFLAGS}"
-		append-flags -fno-strict-aliasing
-	fi
-
-	# Python gets confused when it is in sys.path before build.
-	local PYTHONPATH=
-	export PYTHONPATH
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-
-	use doc && unset XDG_CONFIG_HOME && emake -C docs html
-}
-
-python_test() {
-	tc-export CC
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt )
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.28.4.ebuild b/dev-python/cython/cython-0.28.4.ebuild
deleted file mode 100644
index 9deca0e2318c..000000000000
--- a/dev-python/cython/cython-0.28.4.ebuild
+++ /dev/null
@@ -1,86 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="doc emacs test"
-
-RDEPEND="
-	emacs? ( virtual/emacs )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
-
-SITEFILE=50cython-gentoo.el
-S="${WORKDIR}/${MY_PN}-${PV%_*}"
-
-python_prepare_all() {
-	# tests behavior that is illegal in Python 3.7+
-	# https://github.com/cython/cython/issues/2454
-	sed -i -e '/with_outer_raising/,/return/d' tests/run/generators_py.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-
-	use doc && unset XDG_CONFIG_HOME && emake -C docs html
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.7.ebuild b/dev-python/cython/cython-0.29.11.ebuild
index 3bd1896df64d..3bd1896df64d 100644
--- a/dev-python/cython/cython-0.29.7.ebuild
+++ b/dev-python/cython/cython-0.29.11.ebuild
diff --git a/dev-python/cython/cython-0.29.9.ebuild b/dev-python/cython/cython-0.29.12.ebuild
index 3bd1896df64d..3bd1896df64d 100644
--- a/dev-python/cython/cython-0.29.9.ebuild
+++ b/dev-python/cython/cython-0.29.12.ebuild
diff --git a/dev-python/cython/files/0.25.2-test-cpdef_enums-L-suffix.patch b/dev-python/cython/files/0.25.2-test-cpdef_enums-L-suffix.patch
deleted file mode 100644
index 3a8b9d9d1e71..000000000000
--- a/dev-python/cython/files/0.25.2-test-cpdef_enums-L-suffix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From d92a718a26c9354fbf35f31a17de5c069865a447 Mon Sep 17 00:00:00 2001
-From: Robert Bradshaw <robertwb@gmail.com>
-Date: Tue, 24 Jan 2017 16:57:00 -0800
-Subject: [PATCH] Normalize possible L suffix.
-
----
- tests/run/cpdef_enums.pyx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/run/cpdef_enums.pyx b/tests/run/cpdef_enums.pyx
-index 167c762..c264ec5 100644
---- a/tests/run/cpdef_enums.pyx
-+++ b/tests/run/cpdef_enums.pyx
-@@ -93,4 +93,4 @@ def verify_resolution_GH1533():
-     3
-     """
-     THREE = 100
--    return PyxEnum.THREE
-+    return int(PyxEnum.THREE)
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index 0db9bbc58ee0..f34fed493d3f 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,11 +1,5 @@
-DIST decorator-4.1.2.tar.gz 32325 BLAKE2B 19754506bf18f03748d61fe3cf85e13e91f5a7b4b3550cf087b1c9506fa2d10a4fb6c32914f7c2078a74ac34f5ffaf0edf8b15aa1f46d2eafa91926c40430dba SHA512 4a4b9dc39de9b3f00eae9b6829136f5d836355d3d719371440f69c33fdddf73636e9faaa8fc35829c64d5c5a61d968ea427267da944c524c22ad08b69fb6f0ff
-DIST decorator-4.2.1.tar.gz 33376 BLAKE2B 29a03fb4af1de8c60c5ba4a4b30f59f8b1aa8bbde107b9d5719cc0a084c45b58f7e14ff2046d7247c43d57717db57aea0db52dc068d73a73188a0e022c058cbb SHA512 8a6fc53f830470fe15d4bf9dfe8cea434019aa2e1734e55f873dc617138a6ba75d63ddf50a3fcd21a8f67d9d1b19c35c75149d8cee157e909aff4873093c4e0e
-DIST decorator-4.3.0.tar.gz 33758 BLAKE2B c967440ba18205233e5b032f22553cdc33dbec8a3c285407317d47910ce7dbc884c9802d1591f36a08b3f2adc5532145c92965946af81ad167735a5d0a65f047 SHA512 63894b12af62ad357638b99290c34c2207ba33813b6cd8ed554236ef45a091f337b6eeee829b2af82f2e71699902e49aff49acfa22d5449a7833ba382cda2751
 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.1.2.ebuild 782 BLAKE2B 477646acd03c6c5a6384704b589cb2ce6b669820b731017871108da4180cfaa56328c8caca203769c49a7a149082f8d205ed17647d9ad5d7fd8cc6b1c1e9f677 SHA512 3aba4077375414d56e1b18a900d840d5317b9389cb37cb301abcc62676ba52208fd5a4a6640189c6ffbfc6d99bb690da4ed001efd23ea14947031e2cc2a1f99c
-EBUILD decorator-4.2.1.ebuild 782 BLAKE2B 477646acd03c6c5a6384704b589cb2ce6b669820b731017871108da4180cfaa56328c8caca203769c49a7a149082f8d205ed17647d9ad5d7fd8cc6b1c1e9f677 SHA512 3aba4077375414d56e1b18a900d840d5317b9389cb37cb301abcc62676ba52208fd5a4a6640189c6ffbfc6d99bb690da4ed001efd23ea14947031e2cc2a1f99c
-EBUILD decorator-4.3.0.ebuild 731 BLAKE2B 6619ef97522672b13b33303fa055be62b4393dfe2776f9ce1fb065bcbe42d7cb27e6dacfff1d68600572bb0045929d8fa8d6f514e213ea129b91596a3f1005d8 SHA512 d30691e6374b2aec3027022d0ae8f5ea73935b9073323dcbea8215dbf3394abef89b8fa2c46e9b16d3fdf77d50c8eeecc10533db66301241b3234a4ca7913a51
 EBUILD decorator-4.3.2.ebuild 713 BLAKE2B 796d7f268e73e361193671759bbbea054782a61c121c40fb5f871a81a91b91db290f98954e2867b3a2c6cb1b614a838b7e6c764ea748c583c74414a88fac7ffc SHA512 6bc9158b9407de2d006bd19d7e6cf6b5850bb1c7982b3f803253cae01ecd23b47fd8df2c92df38367edcee618df56f1934427db3388946e87d5adc68093dd557
 EBUILD decorator-4.4.0.ebuild 674 BLAKE2B c42ad83422951c593ff1fcdf27e8c84340c74d1c26a09315db19712a52815dcf5d76d10fe8b62bda1cfe310c33005f5e11fc0ce2e7725d9c3d8629a0e84a8c48 SHA512 35158d280f742612e80df979607f83e49f43b3712a24a5e18a243669e7a33474a14587288ab3476546f7b790906693ab9989c3aba1baad1667820080dddd8c18
 MISC metadata.xml 731 BLAKE2B 9dcc846096fd68b11b1af0259b9707ca288b962a871c50b1701dba0e00011db27d3bc17970310b57b70301a51f083d41a3f6659ced9a7c34e48caaa60333af25 SHA512 6df81157bc757c8a8218fd75a28165cb8349d5a17a320db78582311d614a4fd586cf928e4d1c2158d8fa96cbc6537e26d85524839b688e82b29e5d7997819219
diff --git a/dev-python/decorator/decorator-4.1.2.ebuild b/dev-python/decorator/decorator-4.1.2.ebuild
deleted file mode 100644
index b82d5b28df2c..000000000000
--- a/dev-python/decorator/decorator-4.1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( docs/README.rst )
-
-python_test() {
-	"${PYTHON}" src/tests/test.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/decorator/decorator-4.2.1.ebuild b/dev-python/decorator/decorator-4.2.1.ebuild
deleted file mode 100644
index b82d5b28df2c..000000000000
--- a/dev-python/decorator/decorator-4.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( docs/README.rst )
-
-python_test() {
-	"${PYTHON}" src/tests/test.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/decorator/decorator-4.3.0.ebuild b/dev-python/decorator/decorator-4.3.0.ebuild
deleted file mode 100644
index b9c42239d4fe..000000000000
--- a/dev-python/decorator/decorator-4.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( docs/README.rst )
-
-python_test() {
-	"${PYTHON}" src/tests/test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 273404de9c51..d30b1bb7fb6e 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -12,4 +12,4 @@ EBUILD django-2.1.8.ebuild 2481 BLAKE2B 25ae3441ef0e80a1b9a16df1a315180cdb9cb475
 EBUILD django-2.1.9.ebuild 2483 BLAKE2B 22bb56f9fc8637973dbe0b59348df886100af5d9f6b99b36bbedd3e3a9b2f1ee35f777ac07e4cc53ad14ac60481416e65f910447d70f6b1c15a600f942798e43 SHA512 e6521060728d533a6548fd4a0747764340e71c01b8449707ae61a0721d310c92bd85a6e38809100687a7b303dd6518d7db86126f4172d5788b254b99e3226534
 EBUILD django-2.2.1.ebuild 2572 BLAKE2B e3f592efeb79b23a379cee946cd9f3c3a4ebad23ca3de3f8b7e4e7b92a607c922680cbe0b7d246e111258fd06cd82bb93f26c741e2619443ada3259099d041bf SHA512 ea6bc4f6a1176dcac2221a49ce66dbf36f91cfad927f06fc520f08f450f4ad98dc1563d22d4afe177ce7e112b9b491da395ee3a785b9e836760cbc3fc9ff4a77
 EBUILD django-2.2.2.ebuild 2574 BLAKE2B f0388c060f2bd381b0fcf5cd701abaee16e79e9baca4b75c8d2b0987df737a7cb5ab7559265bd2924575d97ea1ccb97b9697d7fe94eb41a72b01ef8b2be2ea55 SHA512 5b7aff2a04931d65740652cf967effd310b5be60be63d373cafd71621d2630d32cacbf979859f05ce9bfc6e320a73805cf7a4f60e8df0e80e9331a4e1f6394a3
-MISC metadata.xml 488 BLAKE2B b3ffa7cc6bced74a890b71be2bfb3805bb51a523f485079a7da0cb2698f3fa0ee1746922813859ac95df41b3ef3249c413f1692f3635427fa965874287b83d88 SHA512 9091a2e41a992542b38251b12623c0b1ac737cf01a4f46ce63096568bcde4e3d8546705bdb10c14c128b4cb6564e38dbb6d1803611c5197923b847304aa69cdb
+MISC metadata.xml 374 BLAKE2B 79d646d66b955dfbc419783bcfe7677f92472872292dbe726e55bf873d066be9365664e14ff1d190578b0294fe14dcee1c43e648bf2508cb2ceff4000b6002b8 SHA512 9aa0b388987c115e18e0aaa8747605e67fc8c8b5125d2a634dfae2ba8c6627963029fe913401a0647026adaa4d0037d91075a46d20f924f4d4f8d45bff195cff
diff --git a/dev-python/django/metadata.xml b/dev-python/django/metadata.xml
index db112676cb6e..ca9edb307f40 100644
--- a/dev-python/django/metadata.xml
+++ b/dev-python/django/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>vdupras@gentoo.org</email>
-    <name>Virgil Dupras</name>
-  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
diff --git a/dev-python/docopt/Manifest b/dev-python/docopt/Manifest
index 95417cfba33c..1293fc121a35 100644
--- a/dev-python/docopt/Manifest
+++ b/dev-python/docopt/Manifest
@@ -1,3 +1,5 @@
+DIST docopt-0.6.2.gh.tar.gz 26345 BLAKE2B e2a4b2030239387b6e7985c7e4ca15b001ec86f0d7a8c8f316c2321ccb18ed8cc94060a6c8eee4e84916d5f42e4a304551fae69b47abe2e173fa5e2409e9835d SHA512 228661924329682786b143f414c9df911016963cdc91ae6eba833285144e71744df507321a476b51f779e3ea270af6dc4e50edb8b0ee99674c19acccaab57a03
 DIST docopt-0.6.2.tar.gz 25901 BLAKE2B b44308bb4a6571ddd092de63401d16e31a9d9b93be9b132fb45503eb9d84273d7c1f20bc5b2e3e2d969506fcf760fff142c37197e0b92dc9e7f6f431fb0abcc0 SHA512 af138feccf8c37b374ee44fcda4938a88107d434df13c173214021b1a3348b152a595095a86982b66ac03a11db8e0f1e9e6a3a65c98deea92330311daeb831a3
-EBUILD docopt-0.6.2-r2.ebuild 804 BLAKE2B 342cd0185cd3fed889afb2fe4567b8b4bb14df5352514aa6dda60ae021cfc9a20286257b2594a5b942e2d5d02740e122e0c71a4bc611c4d533061711cea60e55 SHA512 e31b49f88feedcf12601d18c5491e80ac16b6cddd465b561cc47be85d65cde3a452cfcb0b27bba26e795d81cc2c9f2ac7ead8a3891d24de82a271196eca950a7
+EBUILD docopt-0.6.2-r2.ebuild 810 BLAKE2B 361e911194d5d0c344d7b0cd4e3bc2453e76ed320db691c129cde08bb50f7d9e7fd75cf61eb4feffbc07a56c8a37fd55cc80aa24878484cc0f665b233465fd77 SHA512 1c10a575765299cd32a0833f971b18d92707a7cde0b6462268209ed2cbcb11362dfbc6a16e5ad380e236f094b1e39641a250f80b6724a6bade8396b7ac22810c
+EBUILD docopt-0.6.2-r3.ebuild 756 BLAKE2B ab4268a0b061e562ebe8e5ff18563070eaa7220a8e7fb1c5e4a6c3d2c377a36a91cf68ae394fe4abb6a84e1f5d182c5924d35fa98e6c4b8ca14c534f98f90b5a SHA512 8ff67889bb72574a5039a046214fc5cc3d1bfbf744cbf2de4a4463d99a43143d4ab485ee5dae73648416665260d53bb99d76d97224d0d6b71e32f2b4569225a1
 MISC metadata.xml 374 BLAKE2B d1c77e8ce90431f3d8ddfa1adb0b016713e7f3d18feadb25126333973e0cd7341838a2082fbc99f0dfbb23a3d3416887211e3f7ead69eb3c7ec284b23e7a010d SHA512 a54f0d59a3cda28748bc2ec5546b29de60dc4dba144b57014636fef7b20c97d2b7b20f0ea8166cd8c9970b7434e43707359ceb76efb015a8a00d06a0786252b5
diff --git a/dev-python/docopt/docopt-0.6.2-r2.ebuild b/dev-python/docopt/docopt-0.6.2-r2.ebuild
index f4af2c7ace04..b3a46b93f8d1 100644
--- a/dev-python/docopt/docopt-0.6.2-r2.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/docopt/docopt-0.6.2-r3.ebuild b/dev-python/docopt/docopt-0.6.2-r3.ebuild
new file mode 100644
index 000000000000..b91713d41879
--- /dev/null
+++ b/dev-python/docopt/docopt-0.6.2-r3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pythonic argument parser, that will make you smile"
+HOMEPAGE="https://pypi.org/project/docopt/ https://github.com/docopt/docopt"
+SRC_URI="https://github.com/docopt/docopt/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 0914e4b5ea56..53dba43df497 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,3 +1,3 @@
 DIST py-filelock-3.0.10.tar.gz 587469 BLAKE2B 8a116f038f344f282540243a757524bd2e72ab8419a0cbdc35910245b8794cab0f96f93d7d8e3b267018054aa1459892506edc9cbfe1099d141a44be9eaa937a SHA512 1fa4594eaba6689ea61149a60a71e86007297614a1c22dc6c94b4774520d396ff8ad03076dfdbb2ce49d2b6e42c374af065a115c167d81cf6107918abfbe52ef
-EBUILD filelock-3.0.10.ebuild 981 BLAKE2B dcc19368b0ad5fa3aef9442c17957c28cb35ee40eb8690a7edae8d260ecf2447a16ef754682f8e592ecaa559631dcbdc4f4b94ba26bd24b217096648eaa64cca SHA512 a4ad70ebab7ba601828f6bb20b26e985dc95e91781f7edc0e9c4c51347fe8f5ce485e7a42e1366553dc0839ac81f71ea9343b7c0e6e483df2b9bd2e78f585108
+EBUILD filelock-3.0.10.ebuild 987 BLAKE2B 573a8cbad2738105268c6e077d3333a716fad616c0c33ff93c1ded4ea8e3e4c016d130da2a62ef033e61246107289de5ef07a85d202ce5a5676f9145a5ed4974 SHA512 5e34a124c1a2e6dfeaec4a4ec4d152385f43d8ce842c5f5e9cdeb8e850ae92a7aae7cabd8643fe2fed921ea7be2ac8a4f17ce076e5fab22b949ef968922b6950
 MISC metadata.xml 356 BLAKE2B 795142cf645edcb80e9a087e62fadbab50c5db359946ec290dc0c0b1c4ae12a666a0dbba4b2212a27310339c783f0c13e0a28a42df45a4cc9e781674d9514fc2 SHA512 3617ad60e67b84ce0d36bb1caef8a6b1dfac31d487ead4887b70f575726974b27d73208cc8ca0039a2334c6deb6609cf8ed85c8404c6b3a4efe0ad7bbc69507a
diff --git a/dev-python/filelock/filelock-3.0.10.ebuild b/dev-python/filelock/filelock-3.0.10.ebuild
index 2687ff9ad274..c5defc6f7946 100644
--- a/dev-python/filelock/filelock-3.0.10.ebuild
+++ b/dev-python/filelock/filelock-3.0.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/benediktschmitt/py-filelock/archive/v${PV}.tar.gz ->
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
index 1bf6e979f342..5fd11a57373a 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -1,7 +1,9 @@
 DIST fs-0.5.4.tar.gz 231333 BLAKE2B 2211aedf02a3eab809b7bfeabe346ed147465db52ef6a069ab3cea6f62e3b420d52b9a58868c3eaab55bd9a6c8c071c5c090e28e9dbfccd182385beee3e246c8 SHA512 d67c85f2816cf1a84c25664a6cf71dac551c3eec4eb34154bc92d52eb0efa9739adca6d0ec86b9978ff6af408cfa17b913ee8fd4c143cd2adf862ca0a1dd4c5d
 DIST fs-2.0.21.tar.gz 115844 BLAKE2B 0f7b3fa087c89a68c27d350233e3e73fa54b761bad7799a895fd79fb5a7df898df381e82bd160ccb782e7e814b00041d3cd309860c96b4ea5dc3078e6d33430b SHA512 d16e02a6ed78a26229b12e71f6286db0243774ae13f6f3d0a6c4fb9240fe65656e4f10cb2b385342fb48d12a163ca33a0b746854ab5ee240eae0ff8f6644ed13
 DIST fs-2.0.26.tar.gz 118831 BLAKE2B ce9be9d52882916cd73262556936d55c78fd245f20bea7e7cfbe314d6b1e7a43970ed3758bbd781736b344b65ca03c53ef7b3b5957e93c390b733b7e6ad5bc70 SHA512 2efd77ed968a6d711f6020c84a4418aee32f2273dc246fc4cdbf5daed9d4b5ff86b1c22d2726b637031c398bd1d3b03216c70a47248c793fa3b72c678c007d6f
+DIST fs-2.4.8.tar.gz 124808 BLAKE2B 30e139fe577f90632d04d471edd08ed8113e2e07e9273c58cfde5674b0dd178322ac388738b2220fbe44df4ac89e30df2b879f7566bfe1d8bac72ba18c41a67c SHA512 11e8589f6c078bbc0543276d511dd3fc0762725bd78b46a3fa1cdfb3c8712a2d82675c58a8404d9f12e9b6932ffeb971ce0127df2b9da3ceae68568194d9a385
 EBUILD fs-0.5.4.ebuild 987 BLAKE2B 777f766d38815ff454e1918107b71568a4ea2cf7ba5537158d637008bc3810a66b468489a081c5c7e1981b90ece402e0ded30e357a86139ded8d6739d38f181f SHA512 bc23d52fe682aa1df344a469d3be70b58f6691b58c28f2f722be78b5fe24f28c7d38ae5536793abc85c8598e441f1ffb6a6eba9ece4ceea6d08a26657b66fbad
 EBUILD fs-2.0.21.ebuild 987 BLAKE2B 777f766d38815ff454e1918107b71568a4ea2cf7ba5537158d637008bc3810a66b468489a081c5c7e1981b90ece402e0ded30e357a86139ded8d6739d38f181f SHA512 bc23d52fe682aa1df344a469d3be70b58f6691b58c28f2f722be78b5fe24f28c7d38ae5536793abc85c8598e441f1ffb6a6eba9ece4ceea6d08a26657b66fbad
 EBUILD fs-2.0.26.ebuild 986 BLAKE2B 7d86c01e0869da0a344e0de394c26c26ab490b19340901e426aa75607ed95d93b4f4d1802277dbd79d1b68dc999cfcbc7add921f84ca49598057ab51e2c78bd6 SHA512 e40b8465422c7dfeadfccb01b179277ec88a21e5e443d66ed219b78de37fe5be0aeac155cb3837e3d23d6f77456e73a9427b9a923988ca5c7edf6389e81a9442
+EBUILD fs-2.4.8.ebuild 1027 BLAKE2B 496eb35c4b3af36352244411574bdf7d6f289e95eb4746cdbc8dc4240908827a91b854023f8c87784f4f5fe8f34ab57a3b1e917cc3b3ee4dd279ad32f93004f4 SHA512 42f94e49b245138ce4221359585de3154ee275d056ed03dec7d3a2fbc9cbdd590b1de6beb2d5f457515870b901d7c58b9b2fd6285496c01285bb42b53b3b7d6a
 MISC metadata.xml 486 BLAKE2B 69d62d79b3d0e05fb12bbf8a4d4f703f82488cace87e8f42aaace9319c18f564c3c841b5b69a189530ffb760bceb1acb9fce38472af659a6c4ce24b1bddc16c0 SHA512 48e48fb5f3c868fb8e1b9dce7c483c13291659c99e0f19e096204451e1ada83fb0d2334d89a3beb45de11b7e710a3deb9e5777e5c8f905312efe899cbee02d07
diff --git a/dev-python/fs/fs-2.4.8.ebuild b/dev-python/fs/fs-2.4.8.ebuild
new file mode 100644
index 000000000000..24cbad85b702
--- /dev/null
+++ b/dev-python/fs/fs-2.4.8.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Filesystem abstraction layer"
+HOMEPAGE="
+	https://pypi.org/project/fs/
+	https://docs.pyfilesystem.org
+	https://www.willmcgugan.com/tag/fs/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pyftpdlib[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	optfeature "S3 support" dev-python/boto
+	optfeature "SFTP support" dev-python/paramiko
+	optfeature "Browser support" dev-python/wxpython
+}
diff --git a/dev-python/gcs-oauth2-boto-plugin/Manifest b/dev-python/gcs-oauth2-boto-plugin/Manifest
index ee3354d9e84c..5d44715f1e6c 100644
--- a/dev-python/gcs-oauth2-boto-plugin/Manifest
+++ b/dev-python/gcs-oauth2-boto-plugin/Manifest
@@ -5,9 +5,11 @@ DIST gcs-oauth2-boto-plugin-1.14.tar.gz 14980 BLAKE2B 1123633b419291433d7cfa9a28
 DIST gcs-oauth2-boto-plugin-1.8.tar.gz 13248 BLAKE2B 831a1b88035d6331ac2cb122fda5ffabd6319b7a030ae8c46dac32be571bdff034d6e60830e5e4403b65a414487c874cd4743f537a9c1d3674bcb1461e457945 SHA512 5504fc38d58ee68a78ee2b8e6c3757045494d000748382bc26888a65085cec08d2d137c63cb51afd1cef72d31b3f0cac5d40014548cca47c5322a67a7f1ef204
 DIST gcs-oauth2-boto-plugin-2.1.tar.gz 15789 BLAKE2B f98eb41d07aede9379bb256723c217be1c2fcf2cda18e555a5d7e85bb402215052ff4d7770cdb4066fd989f7e78d070ea19e1a469f5e6dec2b94a367a6dc3c19 SHA512 26b519fa2987e83a687907aa72e0c9eb8b2a2c48143bc1bf13bad79791379daaae190a23f9f35d1a570e21c6800d5860bbb94f3c3f3b2ff7bfcfec8a5a39af7c
 DIST gcs-oauth2-boto-plugin-2.4.tar.gz 16721 BLAKE2B 38816f6f3e5a857967fad6698aa9a35df8d31d42f083584c1e24c4dcb9379b5e8dd18fbbcf0533dccbc2db9f5e4f400d8cd1f8baddf582894af918a2d2d1b23c SHA512 e3e6b7ffca4405a4c41ca1408f05e3c61acc342d236dd2dd857854242694fdca68e155baadb8be64239583954297dac82a07a73d6391cfb93a53d29f9bf67c99
+DIST gcs-oauth2-boto-plugin-2.5.tar.gz 16739 BLAKE2B a8ef124670063eb19119f7ab6cfd3101f68815a61ec183b3c9ac79ac158e3e47f48349b4f3faa0cf83ce9a203ab2f350e61fdd8a87872962bc1b24a8182f741f SHA512 db6810351c8364c9b217e092aa83803cdc7831136b3fa1be4c54f978f919e2e33bdaf32b8d36db359c5a328eb57f7ad2cee219b94d7f60403f27aaa6a6fd53cc
 EBUILD gcs-oauth2-boto-plugin-1.14.ebuild 1432 BLAKE2B 9e1041feb96197c6ae9503cf2490b24323366dfb18c00a3429c0fd38f77784529730f89b4e6f6b76230e5b099831ccf4417c1e990a58258f596ee0c280af7cda SHA512 2c91bebc4c002fe06ebf114d427a70b0e0b9fb43b7b1f7f29fd5e4682a1d0622eabae9d6b3693a0799b6ca47eee0a7ca3c058b82847e5724ce4602204ba49c7e
 EBUILD gcs-oauth2-boto-plugin-1.8-r1.ebuild 1039 BLAKE2B 861b5581f1522c8e648b1c081843071f30bc066a53d26e6826494760258a3dbafb71500ba9bc45267ca026b1e5b519ee4b17105a96b2f48a81287aabd6abd3eb SHA512 4026ecf2f8380a7371cd87dded9837632a5711cd098d4d2bfc214308c2ad687e8c0e452f120029fddbf3fd47085b9d65aca011a22d79ed520d4f0ca52eebd6cf
 EBUILD gcs-oauth2-boto-plugin-2.1-r1.ebuild 1399 BLAKE2B cab46c50743fefd5269b0345bdf08d730f443748c158f8fe1d286fef95b40164f2e6a56192156316ad743904a8b0e5bd41b179d3961ea47804311a6bc88eef65 SHA512 3d57e238a406e01b4bf8ca063202932a06b1a0bde8d92e86e2fcdea5edb4e95fd46a802cce6f1a7a92daf04b843dacf17bb576200842ff83060265888ebfedd4
 EBUILD gcs-oauth2-boto-plugin-2.1.ebuild 1344 BLAKE2B be3aa59dfab3c30030e4c446e03814d75338d6bce93151bdd268fbe47ca455e96352c938f9257e6f9d11a91a35d9778a9a2f7124a10acd80e71e1fd28115c0bd SHA512 cadbe1d47e264ccc57e36ce88b63902d38978f5b2500f24b72d99cabd9bd3598ef39313d0eef4c84cfb24237d3ee1927cbf5a7b155441985098aa90b4c9336b0
 EBUILD gcs-oauth2-boto-plugin-2.4.ebuild 1404 BLAKE2B cdc14a6f094e3c2406c2ad1cf7ff6c4f459fdf6ad4533a1b849994ac0eb31ce86dc53cbddf0ab451d06bb3a6e8496379d70339371f01f868423a683ea3493ea3 SHA512 845d05f55386224ecf8bb3c2bebf480bf38c525ed91ac58410ac9cf4ecf6db46f3bb4bc97ed4101f89c0c4ad16c4fffde879300d864f11b0c017ffcdb42b7657
+EBUILD gcs-oauth2-boto-plugin-2.5.ebuild 1405 BLAKE2B 13dbc624289ee0734418811b6a63e73662c4ba6af42d67d025c7c59da24261bf69004b1c7a361f028cb8b73e8d4d58d025770d0036a837b20502607bb17ca4ab SHA512 8c50b0b23e5ff4efeb0dbf7385bafca0fafe43a09b99c324d2854ee8d2ee4383c5e85eca6c5b1bdf1f2870142925ab27419a5f5f80ceddc3983dd9ea9f2f2ff2
 MISC metadata.xml 335 BLAKE2B 11f766d7bfb5e7ddb78ea1d749d3d2d79496d69e07b1054bede831ba7824d8705e064e5842c71206a0c35cea37e40558a6cdafd8ebf8460ee99ff8dce3f26ac5 SHA512 cb494f35eba6442585175997cb16c7d4f6eea841e56f2828386f0894e68a7d917c010264bea46d7b6ae1957633763c66a5b669606fd8b0fcba3b4555fa926807
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.ebuild
new file mode 100644
index 000000000000..42ce0c7177b4
--- /dev/null
+++ b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.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=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
+HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.13-use-friendy-version-checks.patch"
+)
+
+# Keep versions in sync with setup.py.
+DEPEND="${PYTHON_DEPS}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
+	dev-python/google-reauth-python[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
+	!=dev-python/oauth2client-2.0*
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -i \
+		-e '/SocksiPy-branch/d' \
+		setup.py || die
+	# Make sure the unittests aren't installed.
+	mv gcs_oauth2_boto_plugin/test_oauth2_client.py ./ || die
+}
+
+python_test() {
+	${EPYTHON} "${S}"/test_oauth2_client.py -v || die
+}
diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest
index 7eeb445b2059..4e236c91b961 100644
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@@ -1,10 +1,4 @@
-DIST graph-tool-2.19.tar.bz2 15147961 BLAKE2B 93f4220d6f86ed5e18619a4300272185673d54418b6b73eb9cf2264d698b9f66589f22fe9906082c5b6360e037115c6df7c52871e33c1dcb8ec64c3596b76bda SHA512 dc0bd93ccf21bb6616035dbfe33b0d9406eb894791e615795d486dc8f9d9991a6b93cf835cf4e59197005c14faedf105f3384cccd42db544104840cf857b2a84
-DIST graph-tool-2.23.tar.bz2 14998733 BLAKE2B 5eef201f9751ba0ee64d3f3d0694631b23b8ee7799d0e0a1a52125b3b355ee30bb59400665404cd040df29ab2534dc0fdf940d2f3abdb1ddfff0894fb150ed3b SHA512 bd7e493806152d004ed8fcd5cd93f8a27200b0acacde07026ad6f83e8b9a0cdbdedfee79f5ff4c41de179ea3293a1d100571501e8791dad2ff608ecb424a9e36
-DIST graph-tool-2.26.tar.bz2 15000764 BLAKE2B eb4db3d6753b4af8e38cbd9a71e5e5a6368e30556b83f8b9b9a67d8ede2fea9789bb959eb405eb1896c69c487915f18849146bc5fbd95bea1b7910c7c871d577 SHA512 97f51f777f45383780f765277d1af6ae4879ec39243e9b5c11a5c8f58e952e34c301d51e4ce86a0de1bb7b86bf7150d85ef182693e99f319a19a36d2cc25742a
 DIST graph-tool-2.27.tar.bz2 14989318 BLAKE2B 1fc307f33fc3e4642e91c20cc4988915cae61306ac445be070f19c263e2d2a74a241d651dd9c4b6b78d5f28fc8cde00789cf90db53cbae6db0583cf216824301 SHA512 39ea5e76a91f03bc2475d80df6001c87fc47517d279e27fdab413aec8982146993d3c4a370f85cb28a53e5c974b0e90b0fb22538f3d66ef9cb635abf6188d434
-EBUILD graph-tool-2.19.ebuild 1847 BLAKE2B 586f2f7ea0af6a41ef67ed1717c914b6f54978b1e28dbb01fe272fbef49d73747f352ee73eb5ff3c6e7a3ba9d83afbb920ae433ee489a0ea0051128f596f317d SHA512 2fd9c982640b48cb13d198bf9b29bc14b9de9c4145d80c585903b4744a00a00a6f4d619938c0b40a2432516fae1fd1a1115599d63fbd22f5c28bab8658f33f54
-EBUILD graph-tool-2.23.ebuild 1832 BLAKE2B 39d685863139deba4614e2279f71b8ba74db7950fb4ebeed35dc334ca7d1b57fbb69d031fd1350625f4f29fc07eac7e7d723a102340871aa3be2202bff49d399 SHA512 2a5986c429a9aa2ed1c1470bc2dd71a5485e80b19063b0f9862a1cfffc265d3ead53eb76126202923782ef5c95a327fcf98dc60d8a21ff2f75a5f4efd9bee762
-EBUILD graph-tool-2.26.ebuild 1833 BLAKE2B 0a6bac1cf32f545ccaf626f00726e8053958aa026bf6f9ca7d12f62fc9e44b45af85e8c4071751f6b4473196b7fa0c8e8250b2535078b5fecadd938bc05c5458 SHA512 bebc147f099d820e1c5c3c4916e20915ad9612b442a82762c2a7c644258c096d37624c5b62d20bdf5dc79b1522b9cc8a6b5bd2a26b714de82da6d15e23d4c100
-EBUILD graph-tool-2.27.ebuild 1769 BLAKE2B 4b3e95b50104f32abc8290859a0d6e31b0911baebf87b9293a97dd9820315b2002583cccb6567ccc6315f274cdd8c9e418832726c3acab61b219f5119e5c6ac2 SHA512 8281f1260a758166f2496be1c744332acbb429b492d53d01e271f307870af49bb5c6bf5594658f025c178c1ceb31e0cf649c3a17de9c21a425233352e9c3e47b
-EBUILD graph-tool-9999.ebuild 1769 BLAKE2B 4b3e95b50104f32abc8290859a0d6e31b0911baebf87b9293a97dd9820315b2002583cccb6567ccc6315f274cdd8c9e418832726c3acab61b219f5119e5c6ac2 SHA512 8281f1260a758166f2496be1c744332acbb429b492d53d01e271f307870af49bb5c6bf5594658f025c178c1ceb31e0cf649c3a17de9c21a425233352e9c3e47b
+EBUILD graph-tool-2.27.ebuild 1764 BLAKE2B 11888407f3cb6ca16932307d548a9cfc54c057a8f089c6a8e5b4c5f29d92906d8a5cbd549f4911076df33b3afdff8ed83ace726172276a6dfeb1b18d58369853 SHA512 a96908c54e6c3e7a6b38ebc9fabcef91385ad9a63b192f4787775ea3842878de966e00390fd11cbfd66e1e3dc915d62d9baad2a8ddcba5d4c37f1ebb5898bec9
+EBUILD graph-tool-9999.ebuild 1764 BLAKE2B 11888407f3cb6ca16932307d548a9cfc54c057a8f089c6a8e5b4c5f29d92906d8a5cbd549f4911076df33b3afdff8ed83ace726172276a6dfeb1b18d58369853 SHA512 a96908c54e6c3e7a6b38ebc9fabcef91385ad9a63b192f4787775ea3842878de966e00390fd11cbfd66e1e3dc915d62d9baad2a8ddcba5d4c37f1ebb5898bec9
 MISC metadata.xml 354 BLAKE2B 7b0030598a6adc4b25abaef5beb3a7cbf24142a41f3272ded30dd4b9d8ac1e0ddfb0747affefead95b2ecf2a7540308a2e1e9c3dffdee610a2542054e9ad82b1 SHA512 4f8b73df8933d138d1d86ef9436bca38dc449b035701b51ea1d3ab666f3348a21fd3ab09817358d8e6e15a9189a7e61edc3d9af42755e4de472f1acc59852f51
diff --git a/dev-python/graph-tool/graph-tool-2.19.ebuild b/dev-python/graph-tool/graph-tool-2.19.ebuild
deleted file mode 100644
index 23f0806166cf..000000000000
--- a/dev-python/graph-tool/graph-tool-2.19.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit check-reqs python-r1 toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/count0/graph-tool.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
-HOMEPAGE="https://graph-tool.skewed.de/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+cairo openmp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	<dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
-	dev-libs/expat
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	>=sci-mathematics/cgal-4.9
-	cairo? (
-		dev-cpp/cairomm
-		dev-python/pycairo[${PYTHON_USEDEP}]
-	)
-	dev-python/matplotlib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-cpp/sparsehash
-	virtual/pkgconfig"
-
-# bug 453544
-CHECKREQS_DISK_BUILD="6G"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999 ]] && eautoreconf
-	python_copy_sources
-}
-
-src_configure() {
-	local threads
-	has_version 'dev-libs/boost[threads]' && threads="-mt"
-
-	configure() {
-		econf \
-			--disable-static \
-			--disable-optimization \
-			$(use_enable openmp) \
-			$(use_enable cairo) \
-			--with-boost-python="${EPYTHON: -3}${threads}"
-	}
-	python_foreach_impl run_in_build_dir configure
-}
-
-src_compile() {
-	# most machines don't have enough ram for parallel builds
-	python_foreach_impl run_in_build_dir emake -j1
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-python/graph-tool/graph-tool-2.23.ebuild b/dev-python/graph-tool/graph-tool-2.23.ebuild
deleted file mode 100644
index 68411e981641..000000000000
--- a/dev-python/graph-tool/graph-tool-2.23.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit check-reqs python-r1 toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/count0/graph-tool.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2"
-	KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
-HOMEPAGE="https://graph-tool.skewed.de/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+cairo openmp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	<dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
-	dev-libs/expat
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	>=sci-mathematics/cgal-4.9
-	cairo? (
-		dev-cpp/cairomm
-		dev-python/pycairo[${PYTHON_USEDEP}]
-	)
-	dev-python/matplotlib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-cpp/sparsehash
-	virtual/pkgconfig"
-
-# bug 453544
-CHECKREQS_DISK_BUILD="6G"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999 ]] && eautoreconf
-	python_copy_sources
-}
-
-src_configure() {
-	local threads
-	has_version 'dev-libs/boost[threads]' && threads="-mt"
-
-	configure() {
-		econf \
-			--disable-static \
-			$(use_enable openmp) \
-			$(use_enable cairo) \
-			--with-boost-python="${EPYTHON: -3}${threads}"
-	}
-	python_foreach_impl run_in_build_dir configure
-}
-
-src_compile() {
-	# most machines don't have enough ram for parallel builds
-	python_foreach_impl run_in_build_dir emake -j1
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-python/graph-tool/graph-tool-2.26.ebuild b/dev-python/graph-tool/graph-tool-2.26.ebuild
deleted file mode 100644
index 70694fddaf91..000000000000
--- a/dev-python/graph-tool/graph-tool-2.26.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit check-reqs python-r1 toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/count0/graph-tool.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
-HOMEPAGE="https://graph-tool.skewed.de/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+cairo openmp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	<dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
-	dev-libs/expat
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	>=sci-mathematics/cgal-4.9
-	cairo? (
-		dev-cpp/cairomm
-		dev-python/pycairo[${PYTHON_USEDEP}]
-	)
-	dev-python/matplotlib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-cpp/sparsehash
-	virtual/pkgconfig"
-
-# bug 453544
-CHECKREQS_DISK_BUILD="6G"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999 ]] && eautoreconf
-	python_copy_sources
-}
-
-src_configure() {
-	local threads
-	has_version 'dev-libs/boost[threads]' && threads="-mt"
-
-	configure() {
-		econf \
-			--disable-static \
-			$(use_enable openmp) \
-			$(use_enable cairo) \
-			--with-boost-python="${EPYTHON: -3}${threads}"
-	}
-	python_foreach_impl run_in_build_dir configure
-}
-
-src_compile() {
-	# most machines don't have enough ram for parallel builds
-	python_foreach_impl run_in_build_dir emake -j1
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-python/graph-tool/graph-tool-2.27.ebuild b/dev-python/graph-tool/graph-tool-2.27.ebuild
index 722d8632350d..f5e3120bdf0a 100644
--- a/dev-python/graph-tool/graph-tool-2.27.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.27.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild
index 722d8632350d..f5e3120bdf0a 100644
--- a/dev-python/graph-tool/graph-tool-9999.ebuild
+++ b/dev-python/graph-tool/graph-tool-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
diff --git a/dev-python/ijson/Manifest b/dev-python/ijson/Manifest
index db3937f5d6ef..838818ebf34a 100644
--- a/dev-python/ijson/Manifest
+++ b/dev-python/ijson/Manifest
@@ -1,3 +1,5 @@
 DIST ijson-2.3.tar.gz 11800 BLAKE2B 0cdd2a40c483341dd9dcd4e7cb52c38752886d02e5b0c5982bad975487391cac31e2b5993118fbb526f91866dc8441a711ec16e0e8f1d320d32eb026bb4c8b0d SHA512 4d6647cb72661b26a3b36addeabec79fbc047a6c3b86aa419c178dfb8ef09bcdefdf37ed729f26b4b6b176cec06230ef3dab53bdff4c4b401bbc835eb486d038
+DIST ijson-2.4.tar.gz 17570 BLAKE2B 98301c5572597ab9a52c33dd92e1a2bf1fa9956415f21a49b13de438a6f295221da43c110f94aa280834b85993f4c8a3cfdaa060f28598e5af50510e7657561f SHA512 c93548a0719a9de30d504dd6179dbffedfd91228ef57fe6600af30eaa2338a2b720e6c9c5b386868198945714a725d46dd2dee6a1ae6d6a0d61eb0230eb35608
 EBUILD ijson-2.3.ebuild 572 BLAKE2B 83129c0128d58ad72e59247802719fb411d87df199049b8da127fdce10420d44a64166a612ba57482608457fbd7bb9295353c7aeb2ba90bbacb136e927926968 SHA512 34ab27be8015a47e18d149cc874812b45b67721c1a70a62264836360516fb12aabf336cd70d79f6dce3ab2f2676a60012ad12dab8f35532ce1fe5cf8285df77b
+EBUILD ijson-2.4.ebuild 617 BLAKE2B 58c80d28c3a87add553363b1046ad4b32f7cbec378fa45beabe53c0a8ac13421db9dbec1ec04e43858bb49636051caa26034c7b64226a53154b4069f48d38bbc SHA512 183fd41f6d35bac0111ed3c14cf1e2d6c13f6f30f859840c7ddd933ea18c10bc4f5a6b1ffde094994ec9b5016b31ea7fac22f1c802f35a313e0140f4ad450665
 MISC metadata.xml 375 BLAKE2B b0b47eb0f90d6dcf828b9c06d77d6292119cfdf53c6c7c694a478c20e16c677fdaaa9a6e443fa985af91658d1e258eb09642fd259d58793e6ab7d20ed979ade2 SHA512 99d84d8cbffb0864a3473385642d96238a3ec4679b13d60361ce147536e58780978ac5ca947533fd25d97f05ec9b011ce3a831c05b90a24281b828b03fb80919
diff --git a/dev-python/ijson/ijson-2.4.ebuild b/dev-python/ijson/ijson-2.4.ebuild
new file mode 100644
index 000000000000..eceba6c8c743
--- /dev/null
+++ b/dev-python/ijson/ijson-2.4.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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Iterative JSON parser with a Pythonic interface"
+HOMEPAGE="https://github.com/isagalaev/ijson https://pypi.org/project/ijson/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/yajl"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# pypi release lacks tests and git release isn't tagged yet
+# python_test() {
+# 	${EPYTHON} tests.py || die
+# }
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 23abed736441..33a70367c38f 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,7 +1,7 @@
 DIST ipykernel-4.6.1.tar.gz 90591 BLAKE2B 9d66e569e416e30fa0af93e9442326a081638e55e004c751d38b3e995e2e1c6baeba5b61e125ae8484a31344ca541070035154e4453f9eda30f7a2ac436e7f1c SHA512 3124534a8a059056211ac573784c491ba18d6e936292523382a9604af10bc2c911b14f49f7625242e29189b46c673da25244f3c9dfa3148d460ba4e466eef001
 DIST ipykernel-4.8.2.tar.gz 94441 BLAKE2B cdcf08c114c6c53ce4ed9829f3c2e0d2184f5b89b54556f92df25ecefadcc38955f992572a6dfb9ee49477e9a2111304c9b4f636edc47c0c0a26209c5f616579 SHA512 6542b086ef14abe70f51393e585c1e02eac0967b863c2e3de2dfdcbcdc2f4c01597bd035990f09f07d76005628a3345be97d1b5e5ce7a772ce7074bb31b4d4df
 DIST ipykernel-5.1.0.tar.gz 101198 BLAKE2B cfe0593d7de3eebf9ad43dc80d13f53dab0bb599836ea43c8e1263b02e78f6689837bffcea3c275f2241e370d67afb50510980940aea5a2b29a6ce674509bdab SHA512 0792b7f86d81b178c46522c8d6cf5fd57b0e411dfff13832d4e3d38782bae743fac7390dd5f2e2e738db66ce1137ec26e74511896b47667c88e23a245606a698
-EBUILD ipykernel-4.6.1-r2.ebuild 1046 BLAKE2B be57b9cf34c6b1055aefe0805685d1e06ff9c7ac9da515eb239b6ce30dec5425ba79b8362d4f6163a09cccbe544cc7f49b811fba91b0d1cca36879da82456712 SHA512 d913595f03f797c7154ae2966432fc946f6e314b454a10be7f1aba5acccb7014c372fe71a3789493d4df419cf5be738cf9d6491d73a67f050b36729e3dbdc8e8
-EBUILD ipykernel-4.8.2.ebuild 1046 BLAKE2B a32fcefdbb7287a3f29a7c9012e3fe1246e4df9fe3c9aac9c2dbf22c8b124015c011a011039469d5c227dce57918a3a8bd00d56caa54d658b9d1a0cd79292de5 SHA512 6dd96df3ad661c318ea7176c46e7c0ab7a722b788036d3f44d9c1f310d3247e17a27a25566ca4b9da9aca08ad25086168c67684c6df8fe546c8872240990ccd5
-EBUILD ipykernel-5.1.0.ebuild 1039 BLAKE2B 6e4fab324812423ecf230b84a6bdef69c3fa63e5cd54e4a69c4afabcae9a69ad36401d1c4e20b41466126bd0facd5c9ac08209a1c4ad5cb3ef5e8c3f485403db SHA512 d101365700452e0f204c19fc62f8a04809be4c739e275e7a270339f36760a22144ecd9390a1aec579c07a49873f4866b7ca4bb81a4504012a08bce88e5ad20f4
+EBUILD ipykernel-4.6.1-r2.ebuild 1057 BLAKE2B 3e9df280119e609ffa1fc09e6548bd36726ef544b3f2854d338b45d038757aa0caeec605b640d0be3484758c086406e15f8239b20b18faf84f6e345d6914bc82 SHA512 a7fb826f140da32f2f266d2bf3fcd434b00ad525d4cda65054d9a5b33f1e4f59fc704f502382e071b78b75a0510f1ab4fecf82d52a98d8b0dcc8782e641a9738
+EBUILD ipykernel-4.8.2.ebuild 1057 BLAKE2B d932ad819ee2e871b862924adfcf80db0496c4e61030a9be02428473c8660aa48b67a55e06c1d6298fa9c118fdff234019f2971a162508a181816a5ee12de6d9 SHA512 ec28f9b4e359a63baa0dfaca9a629a79bdfc556735f3e817ce72a38cc29f362806783d559784ca19cd050caefd801237d8e9627a1eedbdb0b5701ebdf248ebac
+EBUILD ipykernel-5.1.0.ebuild 1050 BLAKE2B 2a7539df61fc0b2bd134329c6256d9ab839af6b393c2ca35714ac35104951831d949744907ef066bbd9e222b81c1d2a7e03ba6246fa0ac74a003b46c124bd5e9 SHA512 5d5bafa03889ae1068ffd9aebaf93932101029f66e350356198821fa1232ef51990051882fad25d243c9565da0de91a6d4adac877ae46a4bf57dc051af6c7971
 MISC metadata.xml 493 BLAKE2B 46ff719452b5145a401147fef18fd62fc55542b2edc27017f2f8729d04f304339ccf5ad63de07efbd9c5419d663a498c76f9ce312f06869b3621a17fb72b14dc SHA512 f4176cf4bf94b2a2859ed74298ad8d1b7beb310d9a00f499c32528beb46014aebe7705d47f01bfcc6273729271360a404aa7cd03e046918418d80b8b6bb4f269
diff --git a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
index e3f9e55a1ce3..9f289635340f 100644
--- a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
@@ -35,7 +35,7 @@ python_install() {
 	distutils-r1_python_install
 
 	# bug 628222, specify python 2 or 3.
-	sed -e "s:python:${EPYTHON%.*}:" \
+	sed -e "/language/!s:python:${EPYTHON%.*}:" \
 		-i "${ED}"usr/share/jupyter/kernels/${EPYTHON%.*}/kernel.json || die
 }
 
diff --git a/dev-python/ipykernel/ipykernel-4.8.2.ebuild b/dev-python/ipykernel/ipykernel-4.8.2.ebuild
index 200a48df5544..32532b13c76b 100644
--- a/dev-python/ipykernel/ipykernel-4.8.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.8.2.ebuild
@@ -35,7 +35,7 @@ python_install() {
 	distutils-r1_python_install
 
 	# bug 628222, specify python 2 or 3.
-	sed -e "s:python:${EPYTHON%.*}:" \
+	sed -e "/language/!s:python:${EPYTHON%.*}:" \
 		-i "${ED}"usr/share/jupyter/kernels/${EPYTHON%.*}/kernel.json || die
 }
 
diff --git a/dev-python/ipykernel/ipykernel-5.1.0.ebuild b/dev-python/ipykernel/ipykernel-5.1.0.ebuild
index cf43e216a89b..85f606682f6d 100644
--- a/dev-python/ipykernel/ipykernel-5.1.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.1.0.ebuild
@@ -35,7 +35,7 @@ python_install() {
 	distutils-r1_python_install
 
 	# bug 628222, specify python 2 or 3.
-	sed -e "s:python:${EPYTHON%.*}:" \
+	sed -e "/language/!s:python:${EPYTHON%.*}:" \
 		-i "${ED}"usr/share/jupyter/kernels/${EPYTHON%.*}/kernel.json || die
 }
 
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index 64afebe1e28c..159e20229627 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,5 +1,7 @@
 DIST jaraco.classes-1.4.tar.gz 5171 BLAKE2B 193333a9a543328b6f781888ba7a6ae3cf0b1ae7cab078c9da65a1ed26cc71164aa06a31f2495b62c7d7a388b6fc075e97c7af58f7d67bc0ecc1785f9c7056dd SHA512 d434b470424c104f91e9a4a5e3a1f2109b919a35edf45540ad1ef8600f0b10864f32aefb411d747e13b5d99ba06601ea7abe5032e24e5dc6b25254b4e68f8a89
 DIST jaraco.classes-1.5.tar.gz 6710 BLAKE2B 884e756c7bff272a0b35d9ef8cd30538eba793e6d838b7bd409a59fde9539776906aeb95a456f7095178ce0623e20634fe1a09a8f3515d4b661bf702480cd934 SHA512 8fe3d40863424547e5396fd6a2b4ef3f27a92185ca82206bb88de2716419a9c2dc917fc945c732d5dab1a1795727a12014e0bbaceee7834896351de05491f99c
+DIST jaraco.classes-2.0.tar.gz 9911 BLAKE2B aa5e5c90f16c9536239ed61e6dccbc426244c98a33a944de32239bd42a0a4944e5df3529cfd525e05cf276a4a4b028edcec734006b549053ac8817032f52b2ea SHA512 83c9a570f951ef6c3708243dce6397cfbfe963db5920550ac807878a69860b34831af5f277f956fd0b327d85462676fd6386a22d6d97c7616e01ca81d7ace694
 EBUILD jaraco-classes-1.4.ebuild 1066 BLAKE2B 93e3d5ea21ddeb38cf35d76870c4ee277fd09dc71ba6a92f1b2fd3ccb8abb45646d2523ea8f1ab37a2534c1e4666e04ef18fecdbba4ef964d02997ebb959e9b6 SHA512 d7587d6bc716abbfb1fc28d3f5555aeb63bd147a85e2b3adcd2fa40bcdf9b508de4866c50e2c16b1e3a676e794ee8095ae7ca36b275a49255e89de1d3847ddda
-EBUILD jaraco-classes-1.5.ebuild 1363 BLAKE2B 105a4f0d9a1a5b6b57d0bd1125b5e59ad0a85729d505a3ceda0c00d1f1a67e76ad6ab7780e7c154d719b327b0045ac317d1174c510f448b37cbd37bd7f6189b2 SHA512 21b1be757ff780d7c2418d5bb1d336339021e9300319ada8f75438e086d2b388499a96c9f22362bf5cecfcea1bccb80f56783a005c8a41876229a584aef8ad91
+EBUILD jaraco-classes-1.5-r1.ebuild 1366 BLAKE2B 7c4898a599dda459f356f8095b1708d9678f866a7e3d83b99d9ebdab43bc674f3cbba5eebe95d52c36dff47d1c3f5cf6840e10b301840fc32a748fe9e007cf5e SHA512 3c2286f9438cd6be509f4c9c17e745e518edea18a6548cfa708e99f1392564013be56f75ba714fd31d8318cb4c5018fb1b22c6647db489922e4e2f3a47d6504b
+EBUILD jaraco-classes-2.0.ebuild 1556 BLAKE2B c172a70894b7869a8ddeb42317cf2e20285920719ef2f4d600c7ebf22db02e9f94cf37a9c00bb00b249bafcd17c89e8fa6692703d6ceff13acd992a596829e7f SHA512 d838b9db15df7e92c9e4b7f8b7d11a865ccb27b4ab5c3fb6c3dfe547e1dbdfefc0f97d544325461e4811a6dd46d27e6bc7f2c973dda2e65a42443bd9687bdb79
 MISC metadata.xml 452 BLAKE2B 21134cdd1ed697f4c18617cf812678e3369ed58334419ce74ec5bc0956145cbd8080085d207d37d257d5ed480bd81670f98a38289c773ba7f8b905cbb49077d9 SHA512 0107c5f161fb935b84251fe078da9a6be29f4ab53fc16c8f9f4aecda8e8de3df00b396c54ae53461a76cf794f6bd0f96697ac1ecb2bc59d2cbdadc8a6fdfa2da
diff --git a/dev-python/jaraco-classes/jaraco-classes-1.5.ebuild b/dev-python/jaraco-classes/jaraco-classes-1.5-r1.ebuild
index 8eee44f2f2c4..53def5d54190 100644
--- a/dev-python/jaraco-classes/jaraco-classes-1.5.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-1.5-r1.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="
diff --git a/dev-python/jaraco-classes/jaraco-classes-2.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-2.0.ebuild
new file mode 100644
index 000000000000..dfe803bba472
--- /dev/null
+++ b/dev-python/jaraco-classes/jaraco-classes-2.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Tests fail with pypy
+PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Classes used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.classes"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+			cd docs || die
+			sphinx-build . _build/html || die
+			HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Avoid ImportMismatchError, override pytest options to skip flake8
+	pytest -vv "${BUILD_DIR}"/lib --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 60b5420a516d..de6b644849e6 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,5 +1,7 @@
 DIST jaraco.collections-1.5.3.tar.gz 11669 BLAKE2B 2dbcac99edf28f4544e354724f8d95c0cbcdd793b33bcf892b403e72410f3b5b72b6eae62a49f0e56991cfb19b4ad5da0e95a3327f11fe5ae885e9a0029a92be SHA512 6e1fa88b468b9d971a7a302ebfdf8b9762404c2fdc1b003eee6653704b9f385f0f2e0c84ac075bdc81f8693195781cc5532c4adb31bcabd87974624a14e287ed
 DIST jaraco.collections-1.6.0.tar.gz 11991 BLAKE2B 8f8b3da18641d6348a28ef3792afabd504771f31f1de17ebb621aff493cbb7357e11d49d8b3f4ab4fc7b9a662986d10a90d20734cd802c6d34be1d169390aa96 SHA512 9bd472b51668129f12fabb90b86ed929e135a17217bc850d67d945a786d1952cf1f11b0cd8f5d4ae16b3b19ac35cf87e0584df622877185362e93ba3915dbe6b
-EBUILD jaraco-collections-1.5.3.ebuild 1421 BLAKE2B 02b251a9d017823e5eba7278c1ca431fc685bf0ebe47216e4f1ce7ddfef0d5322488366337e3e79d37cb03fc8fe5d34de443627897764f19581b97f444c30293 SHA512 d6b8e77789101a43e8eeaf69e3ad069417a4005f21876a0fe0cfca4ea77f93f7ec9fe4d8be11c5dce67081b7e17e1f705adc95c772223a0607570ea300c80aac
-EBUILD jaraco-collections-1.6.0.ebuild 1423 BLAKE2B c25dd98b082297d35ee27ef47dbf8a081f6092f0ef1aac729f13ca40f2b38b22ce252dc2610b02e43d1be5aa1f50b273dbfc7e7da119d1568eadf02cd4bc2f6d SHA512 c948e38b5011ea0da8bc522b2434b5a1cfac56c8af79a8cda7f3f45936950ad25a636bd604451e85caef04d81a683525ddffc67e4fdd124b3e8bb8e19b957881
+DIST jaraco.collections-2.0.tar.gz 15102 BLAKE2B 61fa35070b2342f95b3e6e571417ab2cd62be439250d8f2077b379316488a4af62d943248bad80d0a72d9aab3010c6982fb4a51fa4ddc574ab72943e37ddeb6b SHA512 1cc3482bddf6647b7fd183f091db7fe89e9ad1ac416716a918626134835837c2ed29d533bc00052a514d64c94343a070b9b501984b3dcc5caac87066d9c335cf
+EBUILD jaraco-collections-1.5.3-r1.ebuild 1424 BLAKE2B 68756c48406db2d8eac445dcf29eb0b2697594d2868f5ce80864b0ee6542cc8cb80c705121e2460f8bde9db98be307d898edfec85840c42c976a217411161938 SHA512 c2be6e3d2ac5910ad1bda0da81403c31427e48383d6b32359525a2cd96ef61d766ca60d49ed80b10407964e49a56456bc2fb706ed934221471e1bb6be4cda8b6
+EBUILD jaraco-collections-1.6.0-r1.ebuild 1426 BLAKE2B 83ffd2b9c2a1638493655eace431cbc773701f73ff0863d489c6cee3fe66fb539d6de47441ed05979ff0ae2ce3665d56fc3bfb9be6e2b27781d99d13b8b4d8f3 SHA512 e26eeade216241cf611df10cb76ad8063f963e48c858e927577046dfb3d4d3ec053bd5c88c376a16db7f5e1522ad66e8d757472c72f7bbacd3d90bf5f9ae48e5
+EBUILD jaraco-collections-2.0.ebuild 1586 BLAKE2B e888ff4d24ff5541ed77a1cd480049a9ed9bd56fd4bea9e4ce5fa0e71811c41f6b00b04149bc37a3047ee4756bf749cb1488138e6cf7380fe9500acdb4d7741d SHA512 420cb499a3cdd767c025034aac18b1f4edff3d6c9b31a22cdbb2a78f4c7671947fb43bbb08cbc58658f1e29a0efc7b7229f7153c02695b578bf7fc0192eddcfd
 MISC metadata.xml 558 BLAKE2B 7952de571c053dd631177bfde7fa4904e4b37fc2a7ddeb3f17fb917d69d95b0103c9498f7f1e698bbfecba8c2df86616e0c7999b19e8c2af6ec83faf97fca8d1 SHA512 cf21f33decabe788873863bb42136123eb0dbf12527e75ebba2d06c4cb9a1b2b6d8e3def46829c1471e27a5e6b5d7e681272fae9fd58eed36294f90e21a92379
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.5.3.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.5.3-r1.ebuild
index c1d401f3dfde..d634de30137b 100644
--- a/dev-python/jaraco-collections/jaraco-collections-1.5.3.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-1.5.3-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="doc test"
 
 PDEPEND="dev-python/jaraco-text[${PYTHON_USEDEP}]"
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/jaraco-classes[${PYTHON_USEDEP}]
 	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.6.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.6.0-r1.ebuild
index 5bfd4a68210a..b9c0016ba406 100644
--- a/dev-python/jaraco-collections/jaraco-collections-1.6.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-1.6.0-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="doc test"
 
 PDEPEND="dev-python/jaraco-text[${PYTHON_USEDEP}]"
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/jaraco-classes[${PYTHON_USEDEP}]
 	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/jaraco-collections/jaraco-collections-2.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-2.0.ebuild
new file mode 100644
index 000000000000..d8aefffd0776
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-2.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Models and classes to supplement the stdlib collections module"
+HOMEPAGE="https://github.com/jaraco/jaraco.collections"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
+	dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index d0687c718956..2602639d997b 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,5 +1,8 @@
+AUX jaraco-functools-2.0-fix-py37-tests.patch 1120 BLAKE2B 8fe7c807d7582ffd2c3240e3ab74f58dd76f87ea6cbd6a8a5d2b0159579df71001993c36451f79547e674a4d19659646cd86c1181787de0fe5a3b963e646c07c SHA512 6c743bbce1f369e5369ee34a788b7966422e469986e7c5f3d7efbdc1ebafc7487a929fa0a1164aabd3da3a5f9f3c120093cfd978554e8506d05604dec2417bb9
 DIST jaraco.functools-1.19.tar.gz 10588 BLAKE2B c71eb4e0c611f6a0bd82e04cacb7933961ba5e50091439c274bd8ceeda68b69789423994fe43f44af6cdd643b7a04418bc32ce2f937d118520298a019c5c6638 SHA512 7fbf1956ff8a132021e1f7fae5e98f40199a5d0e705b08b44ad5b2588fdd7d1088db9d7457b985c1852b50285a8f03cc9795fff0c4f53f9155f7c8ec371ff307
 DIST jaraco.functools-1.20.tar.gz 11063 BLAKE2B c202c3cda86c0f32fb3299a083ebb8d584eec444d9d8f0eff536f5e663634dab03c5831aef18d683dddde7eafff311b66a724d9004ad46f5ef92e90df16a9c7d SHA512 ba17b567dfcadb0d8ff1cc7a6ed07f2a23abfd42e73f3d815a6fa19d9be97d6af0c90bff7fb5e7ef67012ea5d931e9babc963da8a7105ba6a92d5c43c7126e04
-EBUILD jaraco-functools-1.19.ebuild 1554 BLAKE2B 1a74244e073cd808188a79787629efed07f4963425e6a71b89ae9034c6395d847983ff7874d7699bff4cb85f2593d670ed4217c6ea5671954517b23d2c1f78f2 SHA512 3c025cc0d7ec81498c7aecb5726c1ed3db28be21a6f66b78dc07849d16d29dbca69b15eaaec13317d2f21ba7d980ac7bdbe14e48123d8874b363053b01fed4f3
-EBUILD jaraco-functools-1.20.ebuild 1568 BLAKE2B 1d500209af0e0c882fd2bd7b0de3eb3df065a9b67df2442d9170d78afcf49c400555c17e9c537f1f577352f0730102ded8bd06006a9a0bc4dea746e2ff77444b SHA512 f185fee1adce12b68146a4e8d5d4e7ccf86108694fa35f9604b5907ed75f1059d9cb04575210b9a8d752d04fe000fd8737b036f2c9164b1a9d652f059de7c944
+DIST jaraco.functools-2.0.tar.gz 14340 BLAKE2B 560490b1150c2385f9c4d468fe7ab4fa84475ad43e1ebed784343a71742976ed0c18df3f6240b1d5b69106a6835c0248838331a654f9d3fdc863622c3dda33be SHA512 dce30c08f0e9f3c7b682c78fc3a46a26d9972706f4c8449a12ba11aa5ed130c6d9ca405213fd93b6b4110ef9cea549e5fa925c96bfaf18681cd6957d8ba0889f
+EBUILD jaraco-functools-1.19-r1.ebuild 1557 BLAKE2B 0f4620b3574f1ccf8c3b3ea42818bd2b6bca79d35cd0d8de09b82a3b34b57e5431e8e7e5c70594e148c6e0d248fc8e984cf3b00b4ca7a93611f0b802a4307e46 SHA512 7663663c3020246578259f41c9db37796a1afe6bfaa78d8a2a65beeaf14b60af4ed3078c14370a05eb824a12a0c527d193dcba55057c71771bf2e5e18cdbaa50
+EBUILD jaraco-functools-1.20-r1.ebuild 1571 BLAKE2B 615b4ab5260a61f2eff891a47e1fbaf4d32c0fb10699c9d308a5c25517b71567a5755e87437bbff4cc657352da06c5ac43aca90428b0f613d48b7eada9839181 SHA512 ffc48c860f6a418e5b8408c0f2758d007bc79858c912587d77767775f668b64b8dcc7e4abfb1e1fa8b7493804410bf6306a611c120acf7c34095a673e1aab784
+EBUILD jaraco-functools-2.0.ebuild 1805 BLAKE2B e597f281e783bb5c2add665ffd93a87aeafbcdea15bb8db932eabc60a1c1a8ea5ca8d568232f50cd933055bc84967c240884a194210af6f84c29621aeca6974b SHA512 aab204c78228690d6d95c43123d0153fb1dcad2143842371923f053c50b4fcb02199f3566d3f2b6459bef4a4b762e2e34fafd708849d4352aad8378821e1ecea
 MISC metadata.xml 550 BLAKE2B d8c0bdc0a3d2c0c3d37638bbc8534233acb659d38e0ed9e9e757ff35b261f241e213b73a5c55aee059aa7e73e71e574e4e4e52c12f3bfd9e6c3ac0059f2ec0ee SHA512 2fccec87fe5c57aa922ea30710d802c438f86fa3a72492dd4d2fc8917cc1a1a92ecb12fa5e9160c6245cbd6ab557791ac6f575de8a7a001842618f8d00343476
diff --git a/dev-python/jaraco-functools/files/jaraco-functools-2.0-fix-py37-tests.patch b/dev-python/jaraco-functools/files/jaraco-functools-2.0-fix-py37-tests.patch
new file mode 100644
index 000000000000..dc296c4eb47c
--- /dev/null
+++ b/dev-python/jaraco-functools/files/jaraco-functools-2.0-fix-py37-tests.patch
@@ -0,0 +1,41 @@
+From cc972095e5aa2ae80d1d69d7ca84ee94178e869a Mon Sep 17 00:00:00 2001
+From: "Jason R. Coombs" <jaraco@jaraco.com>
+Date: Sat, 20 Apr 2019 07:08:41 -0400
+Subject: [PATCH] Rewrite docstring on Python 3.7.3 to allow the test to pass.
+ Fixes #12.
+
+---
+ conftest.py | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+ create mode 100644 conftest.py
+
+diff --git a/conftest.py b/conftest.py
+new file mode 100644
+index 0000000..b6fad41
+--- /dev/null
++++ b/conftest.py
+@@ -0,0 +1,24 @@
++import sys
++import re
++
++import jaraco.functools
++
++
++def pytest_configure():
++	patch_for_issue_12()
++
++
++def patch_for_issue_12():
++	"""
++	Issue #12 revealed that Python 3.7.3 had a subtle
++	change in the C implementation of functools that
++	broke the assumptions around the method_cache (or
++	any caller using possibly empty keyword arguments).
++	This patch adjusts the docstring for that test so it
++	can pass on that Python version.
++	"""
++	affected_ver = 3, 7, 3
++	if sys.version_info[:3] != affected_ver:
++		return
++	mc = jaraco.functools.method_cache
++	mc.__doc__ = re.sub(r'^(\s+)75', r'\g<1>76', mc.__doc__, flags=re.M)
diff --git a/dev-python/jaraco-functools/jaraco-functools-1.19.ebuild b/dev-python/jaraco-functools/jaraco-functools-1.19-r1.ebuild
index ae4fb433a042..ebe3f058128f 100644
--- a/dev-python/jaraco-functools/jaraco-functools-1.19.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-1.19-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/more-itertools[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)
 "
diff --git a/dev-python/jaraco-functools/jaraco-functools-1.20.ebuild b/dev-python/jaraco-functools/jaraco-functools-1.20-r1.ebuild
index 8f111d3f60ec..5dd7780fa576 100644
--- a/dev-python/jaraco-functools/jaraco-functools-1.20.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-1.20-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/more-itertools[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)
 "
diff --git a/dev-python/jaraco-functools/jaraco-functools-2.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-2.0.ebuild
new file mode 100644
index 000000000000..c6edbff3e677
--- /dev/null
+++ b/dev-python/jaraco-functools/jaraco-functools-2.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional functions used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.functools"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+		dev-python/jaraco-classes[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=( "${FILESDIR}/${P}-fix-py37-tests.patch" )
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		sphinx-build . _build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/jaraco-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
index 74d78b0fcc35..3ef84cd037f4 100644
--- a/dev-python/jaraco-itertools/Manifest
+++ b/dev-python/jaraco-itertools/Manifest
@@ -1,7 +1,7 @@
 DIST jaraco.itertools-2.3.tar.gz 12857 BLAKE2B 714b123965af3ff593205aab373f3097709729377cd867ca2a7ccbb7795b1818f47b0b316d4c927c9aec4eb66fe1da63b44c1d60db310dd97b5444b01f7db04d SHA512 070a442531fd079fefcb61bbbdb0cc98bc88cbc5f23f6cb40ee1fafbc9a259c69e0a373e949ab54d22836f54b0de41e1b09d10692f92d18030825ca09345be48
-DIST jaraco.itertools-2.5.2.tar.gz 13744 BLAKE2B 3f27144d580805380446b89972c785fa7d7a37a4841d07584efff31f4bdb1ffb9c5e00571172050e63fd65531d7f1db3d9272420c200e717bf9b6dad4b2e4dc4 SHA512 6e5085eb60451f7a5e46df7f69c73062680d980e46a0d41c4e6baaf47d48f413f7cf0ee26b0b24d90e2499174df41b37d7388cfe33e52bfcbc96f7378213d575
 DIST jaraco.itertools-3.0.0.tar.gz 13461 BLAKE2B b6b5146ea2fd9aabe72da85be84224d1c06b71278661183ea52e6ca7c9032c4ca33310d61eb93ceeb14edc4f5923dffc5af25cc8f3345c7453921d85f20ca22e SHA512 91ffcfd2e734fe6647115b54a0eec45b58176681208a48705600a7293484fabdb5190f6981a985f35048bbc2fcb66250fa8a0d862ef41422102cdec1acdbfa41
-EBUILD jaraco-itertools-2.3.ebuild 1374 BLAKE2B 9afc32f5c4d9e3ac0752b9859faf6d9d4b707946478bfc5c019151e34103d6e62e31e80c00d58e2d06415678ad57c0f1d02f4b1db0b1e764d53ceb0c1cc9f5d9 SHA512 b1ab781126236c25d7882846bbd040673bbe1d88c07a0b8dd773461a545328d24667abd0ae0f386f543ced0056d34826190234050450a34b111f8e1c834e5860
-EBUILD jaraco-itertools-2.5.2.ebuild 1441 BLAKE2B e04eabb94bf3f35d76c2b83cbf704e97a28b9c9d9399c238314b77c74875df8f6e8a8da544a54a78cfe0d2a8466f9aac296b632fe0c08f3ba66f1da84a9873a0 SHA512 e59ed7e928156f40d4b1ddd3464404b6f137df0aa9f43f0f0dc4b64b7e0c072ae09e08cb59d5d8c60810c19cad66f80b1daefe92dfde7481849a67f73cd864cf
-EBUILD jaraco-itertools-3.0.0.ebuild 1441 BLAKE2B e04eabb94bf3f35d76c2b83cbf704e97a28b9c9d9399c238314b77c74875df8f6e8a8da544a54a78cfe0d2a8466f9aac296b632fe0c08f3ba66f1da84a9873a0 SHA512 e59ed7e928156f40d4b1ddd3464404b6f137df0aa9f43f0f0dc4b64b7e0c072ae09e08cb59d5d8c60810c19cad66f80b1daefe92dfde7481849a67f73cd864cf
+DIST jaraco.itertools-4.4.2.tar.gz 19431 BLAKE2B d3493380f9522d436d4d8dbcdf484e7fd4fa223e96fabde0d7f3803c395e56d0bd28f49b9a6bfec0b680fdff7f5d145c85530036157f7976ffa82fc4851e3105 SHA512 74db7a3c7595c7deaf2a0c9ba68e9b02d02ccbc6c65142de34a5339aac679c2d71f05b27e27632d265de4f78997e11d7dc43178bd0d64f3010e1568a5085812c
+EBUILD jaraco-itertools-2.3-r1.ebuild 1377 BLAKE2B 46020809f4e125f183a664c2177f7a92f0bd6ae556d0b6be4a38fc660b591a11b3d7f18c7cf2e69ff0459d300202978a93f39508daab410e8aa4ae6fbfb9ef2a SHA512 3baa14dc829f5ff9369e82b1be99a04268d42858c47cb516ba7d8fbe9e7bca43f86667b7b6e0db1808aa80009e351e722a057855031d008403967d7132e4afa0
+EBUILD jaraco-itertools-3.0.0-r1.ebuild 1444 BLAKE2B 455dd38b02e64a0170f1ef650548471c679b5313bfcd7d2dcc10ed210303d69ed43268ffb6b249585a3196dd53646fb47c649cc596cec69f11caf2b9019c50d6 SHA512 e6f7fe3c37ade6e203708827e8d7556293eab43fcd7b108750fd73a16e3f6c8a0d4aad9e193cabd0367a6ec2eb51b05ce7f75703ad76434a3636d99d78932149
+EBUILD jaraco-itertools-4.4.2.ebuild 1626 BLAKE2B f9bf3bfb27e1c7845672f8149df63c25ad56451d847e662c7a10b8fee1fe1b7a0c0be795a88e6964c0d83a083c231517d42a865f1176e7aa5655863b00e1b268 SHA512 f6451b0cb86d739260a40d1361225c685760644801fae2112c7abfc6b72e60305464efb48f1ec75b2da6cdc79b247b4baf915c9bceda2985f94b25a1ce546cbd
 MISC metadata.xml 550 BLAKE2B 9a0db00bf8d20a8942cc362092d64aad0a91d47e54fc5a7c3a6d444defb32a1045f0993d3ad2c61f6edbf059c633388ff4109e71af3454824631e79388bcc5ed SHA512 f60f044460ba89008629bbde7c052af0159ad7044124606a7cddbba403c9a20bae9b91839ab76e48e1b0481f2a6cabdbc4ca0e00e636955e2149f5ebddfd964c
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-2.3.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-2.3-r1.ebuild
index a536517d0e14..c4c48eba45f8 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-2.3.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-2.3-r1.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/inflect[${PYTHON_USEDEP}]
 	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-3.0.0.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-3.0.0-r1.ebuild
index e8ac043da8b8..0d19fccfefd0 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-3.0.0.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-3.0.0-r1.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/inflect[${PYTHON_USEDEP}]
 	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-2.5.2.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-4.4.2.ebuild
index e8ac043da8b8..430831d4c3a1 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-2.5.2.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-4.4.2.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/inflect[${PYTHON_USEDEP}]
 	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
@@ -53,7 +53,9 @@ python_test() {
 		|| die "tests failed with ${EPYTHON}"
 }
 
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
 }
diff --git a/dev-python/jaraco-logging/Manifest b/dev-python/jaraco-logging/Manifest
index 654d8bf143f7..7e73b2a79c89 100644
--- a/dev-python/jaraco-logging/Manifest
+++ b/dev-python/jaraco-logging/Manifest
@@ -1,5 +1,7 @@
 DIST jaraco.logging-1.5.2.tar.gz 7135 BLAKE2B 5235566df80008270f2f28101ab5df1d7fbc1446f138eb4cb851c9bb464b741c0ebb8528d3502130b5c557f30214ec27ce1ea563e09e78776e22d37811da21b5 SHA512 3299adc9c9ca6113198cddbc34147afe1bf453edee16a2d6bfcce64e63deeaff7f87beb74ff44f092435f3433a921b19167fb45778dce444512807357bce1661
 DIST jaraco.logging-1.5.tar.gz 5707 BLAKE2B 853d2747ab92754de4480871355180a33a7a6cbf69fc3d32ba489ecac27dc55ad92d94bfb84e411ee13400d82d162ea400be1027c3002f317a97e00b849484ec SHA512 18f267bd0c764f38ff5223d4fd6e08d7d9fa568691db285155d7b955c71439474fd84edd61b20d57f6eac77394d4b3ddf9b35d8e6ba08a2db5dd4b2ada6e0d68
-EBUILD jaraco-logging-1.5.2.ebuild 1356 BLAKE2B babb784b85c448b0f7a2d03ec7c3a8ca88e2959a7dd2320c4ca1bbe514938b12b1d65aa21691b5aa9a224d6951fe21bfac0a12f3071d1b5649b46af20f30d61b SHA512 d61e4bd9ad3af901a43c793e695a6b332288a90c44cef2158cd830030e48667ec995e7efcdbb7c0d2487f6095d51502d31cf6aea98508803056dd8e4b4309487
+DIST jaraco.logging-2.0.tar.gz 10356 BLAKE2B a7522fa9895784a68c8c0af265ad5a82ba27f69e90a17ba18b4a579e1ca5785ad11b7718273adb33661e45e780876b885b581af1b4518ef5322c077ed76242ba SHA512 9262575c3071f78ded2284ebef3a1a80c8ffd60addecf9b215db04471672bd892f6c6bd06a84f9a82e872adf31d45d4eb3faa2884815fcce608840821f49954e
+EBUILD jaraco-logging-1.5.2-r1.ebuild 1359 BLAKE2B fad22b9122ba166c87de312af48ddd2de975ba269b1ad1b48b8445b235373d893e76b95eb82f4da52df82884a068349068185681a5f989090b2431c11dcee974 SHA512 e0caed22a91ebc7d15c410355738bd63433b44409ce57eddd653862f76912463d7060af306bfbff5fd7299b0e831b488eeaa21adf33a3e143dc6b79479abbba1
 EBUILD jaraco-logging-1.5.ebuild 851 BLAKE2B 7768b77cabd46afa77f617e019217e5e14f5ea51a4ed0d1fadddaf499661e3af469d25b661af19cfed36e883c1f3e59f5f28c7d338045177fbbf0e1849b77586 SHA512 e3abe23b3d4d2a567b92c102a6de65a2f6300ec2cd59feca8004c04b9e7db082f52923575936063c4b54622c861e71570b56f059986769e6c83fa874b95092d3
+EBUILD jaraco-logging-2.0.ebuild 1544 BLAKE2B a32f079bfa9d860c33a15f2351dca6a62c0de833c7f179ce9687b313fdf63a9a171632e9206f727817f65ec228b39633035989d1b0028d7f448c4b29184bf8ba SHA512 0c6654cb26dc8c8b1b8351cfe4d0ae65386b1acfc3685c1796679d3a4a95570f7f093ba3632895a82084d58184d8f4652ee7f351fe2bfeca0f3c4f88e1457b8d
 MISC metadata.xml 452 BLAKE2B 6beacf543b6c6ba9482609f0374283438dab3bff1ba25c53f1ec6c6441ddd0e185336766eaaae3ef89277874c6f12652a68b79a934919c8fe70f8bee88872b43 SHA512 447053b09d211ddbe1b2e98f7c1379395291f1331c75837ba1dc036a3b5d1e05e1f78717c419c4dfdc7d687001992f4c926cfc61bf267aa925024180646a3296
diff --git a/dev-python/jaraco-logging/jaraco-logging-1.5.2.ebuild b/dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild
index 34cdfb17674e..b2ba8ab3c09a 100644
--- a/dev-python/jaraco-logging/jaraco-logging-1.5.2.ebuild
+++ b/dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tempora[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/jaraco-logging/jaraco-logging-2.0.ebuild b/dev-python/jaraco-logging/jaraco-logging-2.0.ebuild
new file mode 100644
index 000000000000..391cef5963d8
--- /dev/null
+++ b/dev-python/jaraco-logging/jaraco-logging-2.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional facilities to supplement Python's stdlib logging module"
+HOMEPAGE="https://github.com/jaraco/jaraco.logging"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tempora[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		sphinx-build . _build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index 5982443ef2e5..727a12e0b916 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -1,9 +1,9 @@
 DIST jaraco.packaging-4.1.tar.gz 8820 BLAKE2B 43c14e12439d161f9a42005dcaed4d6945fa35ec3498bed81d2e6d10b08b056838dcf92fd6319951dddcfc908c8d33796bd9515aa5e77a04c02298cdcfd240ba SHA512 381ac1ba3a8eeea1235e719d98b61e38399d3fea1310732b0e2f921a3d46544efbb12c23c03bfa3ecfa07697458cb8930ca5156df7b411509c7b1da0b673d7cd
-DIST jaraco.packaging-5.1.1.tar.gz 11056 BLAKE2B 6dcca468be3d960674c7de73af48ef78d96c80896a5f09aa99dad35c7dacb90700ce3cd74f59f4a437e26190091e12fb82f3285f30f99a83550a52424cfdebe9 SHA512 96ab954c7fe23632284c0493f749c5fda1368df0a5b60f5dc852aa4c47dadd1743a26772c783f0ec46109f166c9e26811324e2beeadb3e0cfdf9808091107032
 DIST jaraco.packaging-5.1.tar.gz 10393 BLAKE2B ddef0ea4006b1a114d81238d5182c03cc50186452b326ef9a02f1a2e745bc731fc6969475a306b25a22d6daec5951e8d11cacd61d519e82cb461140e5003813d SHA512 d86cf6fce8037a9a5f2dfe29c7df810376127b3e02d270bfbc11e16bd43c10e0ab76f2739e5cdf904a9e54ca8d7fc3559e51d089ee39b4486c84902b23be530c
 DIST jaraco.packaging-5.2.tar.gz 11573 BLAKE2B a119fe4e4de636ef5483cc8d16ca0076533c1cb86c8ec7061c0800aed84532a8689613401530223c0048ccd31d1ead974cc8ba37161b1e5601eb659453962e17 SHA512 5199caccf11952ac68f42462652730afec1aaa907495d65dcf9eb7d5ebcde3ebc8d1f2bf7d51543a764222f09606247a28bfedd9fa987d39934724bf7001c459
+DIST jaraco.packaging-6.1.tar.gz 14736 BLAKE2B 278ab889f236b4a53e6f3978b876952e83777da2e1c096801712bb6833fc85b342fe1c18bb7b1bd78a801c6216dbae74a75a416ef29cd4ec0a7017b8d5bd73bb SHA512 a84c71bd880879f172e6527987e9ffa681da28803112a0195fb21153cb6cd1b3d5c00a6d21c562d7c5542349f335bea4a349fd22662f22dd7bf9bef7b6b0f7d8
 EBUILD jaraco-packaging-4.1.ebuild 1197 BLAKE2B be57cd0dbe0562cf25139ca1cb70c6b3b349c824840f98059e8b9fc65d1171d9b8642cce9729e4bc72a1594d89fb22a1c68f86287cfec78570857f3ae91b7dc6 SHA512 4561bb60e08a83b1046cc2a28010ee2d4f22f793ea3e85f0f29cf095edc52a1ddddc31319769970ba16ecd21af0d4170f73ccc88ae6166a84cb5ac6939eea2a9
-EBUILD jaraco-packaging-5.1.1.ebuild 1411 BLAKE2B 2276ad87d78182df0ef6ec0a55f52cf81aeba2586bd8cbed5f9ce58b87dbdd099432b04f68bad0f9557ce994c18233af3b37b601f55a4ea23b69211bfffc7795 SHA512 092def67b5f1849c8c68c6aaa986c8f06bbdac83bc8b2b33e12f913a433006d2b4344327e36be3344fb8ebd963b74bb92b8d0ae800ee19f9b617a7b846b3a73c
-EBUILD jaraco-packaging-5.1.ebuild 1319 BLAKE2B 2165d6c45b731308a87d066a3025864b8cee76709df86c057ed91ebfd1df12797eef3c570bb6981fcb58e7c1669f62f874db3a2acac221dffbe0f75a2280c3eb SHA512 9b52352b958c4192ea6f38812df3c99751f38f032a22e5c2a61755d400b86a03abdcae50c14fbe11d218c5839284b495e1484909f65f25ac593322992bda62da
-EBUILD jaraco-packaging-5.2.ebuild 1417 BLAKE2B fc376ffd482cb9c6a7c9b4b812c6ee96f784e55c0e5a2295034f7aef2aa91c79f6772ded7083b5aad278b75ce662d9f970d48315a4f49ba4933d129e3bd62ff8 SHA512 ad6cd1ad34cb49b665209261e3e573b881610bdaf2da4e85c7560f19359d539d3dd4fc896a8c2a7d5a048322d0fe43b22d3ae86826a7beabf813d9fd535b0bae
+EBUILD jaraco-packaging-5.1-r1.ebuild 1322 BLAKE2B dd30c72b863ae2f6c1fe2d23c24ad4764f5ecce7eda30c1b8211e6211624885e8b6fac8358baefc89c7bdc3b0b6736623374e5267331b06551f9864066f22240 SHA512 3e583e87a4a5067b81d119c38824dd794919a5fd72c5b9a13f81fe4ae620bca552692c62785199f321029c10d5dfc5c67a9b2a0356cdd099a8b47ee5618f9a9a
+EBUILD jaraco-packaging-5.2-r1.ebuild 1420 BLAKE2B 0a2e9e484d65447b92084bc64bf19c56ec4f0144cd19a728ec4f5b627b0c97bbacaf6d6203a1641cd5e2ea363599cd08f436fb022f58e2487a8571344747b16e SHA512 14c287a80b57e78bc5b156315263d03f9989e470431143f2eec57418051c288c0ba00682fb85c5c6797937c6523f626971aa14ea4973fc471c9658423ca4fa6b
+EBUILD jaraco-packaging-6.1.ebuild 1602 BLAKE2B 20a8a452aa9b20d14f9b8872d75660b0c8d3f0915a6de6d03f9ae26522ee578649123cf5d9f0e7dcc8e65d7a82b46bc6c83c7d2d8afacffef07b64807692da03 SHA512 01d228b64777567adf993c587dbb75f7e34668ab54b7bb7d916bdbcdd89e011772cf26e206598af7d175538622181552dc38240cce4c9a3fb584f87b0405dde8
 MISC metadata.xml 651 BLAKE2B 145a05709cfd4b85e623982b7defaf588eb0d68ed3fcbb52655a5a8cd10fcb2cfb269b9179e81e5409be0485f4c71565ecbdc4019d9f07f322d2cfbc3731c2d0 SHA512 d8f857056e0a73cb34903a7001cda6f543eeec0182a87ee2bd660631ab9e855d1214166546c179b9711ec8ed9a5063b14d9362001e67203a7132694112ebf086
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-5.1-r1.ebuild
index 0df91a50e77a..18bde9c8b29d 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-5.1-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="doc test"
 
 RDEPEND="
 	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 "
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-5.2.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-5.2-r1.ebuild
index 40b2b4cd34fc..0b92ee431110 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-5.2.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-5.2-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="doc test"
 
 RDEPEND="
 	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-5.1.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-6.1.ebuild
index ac2c79492cd4..a7e7b8e77797 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-5.1.1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-6.1.ebuild
@@ -14,12 +14,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="doc test"
 
 RDEPEND="
 	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -47,12 +47,14 @@ python_compile_all() {
 python_test() {
 	# Skip one test which requires network access
 	# Override pytest options to skip flake8
-	PYTHONPATH=. py.test -v -k "not test_revived_distribution" \
+	PYTHONPATH=. pytest -vv -k "not test_revived_distribution" \
 		--override-ini="addopts=--doctest-modules" \
 		|| die "tests failed with ${EPYTHON}"
 }
 
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
 }
diff --git a/dev-python/jaraco-stream/Manifest b/dev-python/jaraco-stream/Manifest
index ec5b4a3b9933..b69ec2788d5c 100644
--- a/dev-python/jaraco-stream/Manifest
+++ b/dev-python/jaraco-stream/Manifest
@@ -1,7 +1,7 @@
 DIST jaraco.stream-1.1.1.tar.gz 6115 BLAKE2B 0994abe3c9688722c76e656e87166fa60d4bf45fb22ccc826227629bffb60fe0be78bb7a5f9f00b8766b5ce26d641d4b347d6c0fc73c426b424c230cb7d625b6 SHA512 65c8d1652a0d63506cc3cadee590664e6a99e2f770d26f0cea1dce07c54ffe308e1df8619bc728ea81c5ac43c9c6731fe9f71e5d38d2674c4e0d63d635bb5112
-DIST jaraco.stream-1.1.tar.gz 4887 BLAKE2B 6942db399e3821b176e5c966647aa9337e31dbfe533cbd790b9531fb943b1e5fdb05fa350e9dabdff00817e59b434a0770de32f871176dea34042acf6e2f368a SHA512 5af385084623fbdfe86e9fb620f49b097dee164638bc99622ba557a26cda591e856f1fc4134bc7b73b8f7b61afaf2607686fe20c59c582324a65c22f39d74a13
 DIST jaraco.stream-1.2.tar.gz 7696 BLAKE2B fcc1aa8d26da17635b9ee7c68c278ae572cbe36a108cb30f5eb98c7ebfd2255aad499bed38ea044b28e820646b92e64602db0e2cdfc430169035882f7b6abe9b SHA512 47a96c1de12eb64e250c85d97429218606dc9bb212cf7b97e579763dd901ee063711c00307b7442be400856d3fd4e5994afbe1cb91a99e233541ffd7ff4024b9
+DIST jaraco.stream-2.0.tar.gz 11061 BLAKE2B 86cc9958e11421fe839551e029f839c16a12b80d329466b44224d145be6c2a15a63d03f426a9b8d1510249ea6c129e892dcfec41a32dd5c3c3a3b66acc21030f SHA512 d379d07772d739abb275cfc8ed7809583c728af695294b9d12ae1276add360b9559de64104cd20d05d82a3250237ae1f6eb23420970a95e9fdf6346ef9312331
 EBUILD jaraco-stream-1.1.1.ebuild 1192 BLAKE2B 71d085e24d805d97caf77849d62b10b0e7f4f2556cda473b634f641f090aaccc25f3d30a3e8c490203261ae4dc2fdc86063c838c0140222c5615b96db895fbe7 SHA512 88a64fa37c0746fc097baa1648ddafb6a3db67932d501bcb9589843da6ed45a9bd0a404241c87ba8de764bec54fc28bb414c8944208f606310abacc24f0a1a5e
-EBUILD jaraco-stream-1.1.ebuild 1133 BLAKE2B 4e1b92869d7f6c6428b814982d88f1036f11b524a4b3249c06f39f1e5e93c33bfce207692681f20b1377551097bb11b3ab5357e1dbfe657e8682f55098abc1eb SHA512 16105edc8afa22ce6247bb5273613e0a8bf7700a7a10517e9a32c2a441503df5665ac7405f86b38f60c1b347c07b6bfc13929426660119c39004a35fb44d9872
-EBUILD jaraco-stream-1.2.ebuild 1410 BLAKE2B 01f12b34b211840e4dc21053e580ec907b5280231f326d5863691d75913b913e0e59fc69ef84d922c794ddb06e113649f10d26b737cf11f48288bb033f28dd33 SHA512 4d2f6161ded7347d5de963030da1487ee8dbe0a577ccc9a73c33813e0c297568eda2eeea08fdef8a443857c7b61dc1b7aed218e7733c2952f52e1b8d11faa776
+EBUILD jaraco-stream-1.2-r1.ebuild 1413 BLAKE2B ef4acb8ab97076a43f45876a442a729f84ec3743fb65c7c33c563bdba823dda0201cccd0b727925f7f5f275ded18ead25c78afb2650f0c7e1b311c9382984dc4 SHA512 1fcce9e3739cceb36cae502562afec74460f45dcf15d669af22f6aa81ae298547c0b791a90177e64ede1d2d9fb8217727752ffaa493ae98d377fe8a3f201f14c
+EBUILD jaraco-stream-2.0-r1.ebuild 1602 BLAKE2B 1764bf7db45a5a5af609f680e9c8a9c7beadb516f19b988a319b63a14c87cb86e18e2af7d1845a151147a7e4d13cf3b427cd97ca58e09e652b5bec8d752dd131 SHA512 db96e6822783569dbbe3fa2d7af8c24abaa233097596e03b0dbb60f8d70472a657e7adca4a918a07aef822f48c7b60bef0102aa1e11d9ee8b2d6ca0287dcf290
 MISC metadata.xml 602 BLAKE2B 3875bfb93914028b263ef5b6f7af81ee9f3fc08f1217537363a02b12e69f273ad9344c5078ea284ed5edfee1389bace975f2745379c3b4b17db4fbeee4045494 SHA512 3a6635e6f38260c76979248878ff326451273bab021f3e85c23a0ae7e29d71daa53ccfa319c8d8457faa00c6fdf5ad3dc68e0693e951ecdd419182f1861a36c0
diff --git a/dev-python/jaraco-stream/jaraco-stream-1.1.ebuild b/dev-python/jaraco-stream/jaraco-stream-1.1.ebuild
deleted file mode 100644
index e4a73334710f..000000000000
--- a/dev-python/jaraco-stream/jaraco-stream-1.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Routines for handling streaming data"
-HOMEPAGE="https://github.com/jaraco/jaraco.stream"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/rst-linker[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	# Skip one test which requires network access
-	py.test --ignore=jaraco/stream/test_gzip.py \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jaraco-stream/jaraco-stream-1.2.ebuild b/dev-python/jaraco-stream/jaraco-stream-1.2-r1.ebuild
index e3f8538a0b9c..6e61e406dd65 100644
--- a/dev-python/jaraco-stream/jaraco-stream-1.2.ebuild
+++ b/dev-python/jaraco-stream/jaraco-stream-1.2-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-stream/jaraco-stream-2.0-r1.ebuild b/dev-python/jaraco-stream/jaraco-stream-2.0-r1.ebuild
new file mode 100644
index 000000000000..76b658301038
--- /dev/null
+++ b/dev-python/jaraco-stream/jaraco-stream-2.0-r1.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=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Routines for handling streaming data"
+HOMEPAGE="https://github.com/jaraco/jaraco.stream"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Skip one test which requires network access
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --ignore=jaraco/stream/test_gzip.py \
+		--override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index 1dde3b7409fd..dab444f543a8 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,5 +1,7 @@
 DIST jaraco.text-1.10.1.tar.gz 8790 BLAKE2B 268c13a9a84c4b29ac9141d8a43c716d8248b87c2b71f6bb8a34c2cf1568acdd012e84b1be0469f70ee8e102f723e218b6d551a9bd0cab5192a28d712ed39f03 SHA512 5c09b90f586d5ddf7419013f7e36814598337c257e6bd1c1eec993d7df021440798ec9300a6d45c960c5458c4197b458d1863f478b60a9a003241e98a644f28e
 DIST jaraco.text-1.8.tar.gz 7364 BLAKE2B 60e3ce561ca5c6dca3093a51f8397e925279882ee5b1c02e5359b518f2344481f3d86a927fbd1c7fc903e3207c46cd052a6efbcfac693debce721884188ab87a SHA512 7f13eee9553d7531bf2f51af1b1c7fbb9d778cf082e6eb49948fc0943b7eb5a0268ec51b363ae9e96df854e0af5e38fbc4a679c746160e422759c044d4a33654
-EBUILD jaraco-text-1.10.1.ebuild 1376 BLAKE2B db525073e0ef756a3f21b03b466733f1fbf50fdc1b195aae44a13acd2de8c2b9e755c5c862de43ee2c035d92f71bc3623e7b3338de1c8850f9e8db99bb94ae27 SHA512 05db41b4459a5cc20c89bb364cadcfa71f0d40b7c0b46c65e8b0724b59d8ae6d5621d1792627dc2ce778f9ac60304f5f2f90c1f114b55b2f7c32681bdd9e2d6b
+DIST jaraco.text-3.0.tar.gz 12082 BLAKE2B 474a3701460dc899015ef0331f2d4de996915e4b840dfcbb8963fd2eb98571bf7f398285dd4df0a0df36e5d1ba8ce04fa59d396dede5ac059c2b991f6a203a1d SHA512 449b917919f074e0b8a285083163fb5141fdee0db0e6d49c58c8e07ca6f284b5d53d01174e266bf8d21914870574672425abf9b094e815d0d9f0c94b1219de16
+EBUILD jaraco-text-1.10.1-r1.ebuild 1379 BLAKE2B f6721435bdb371f6f7061a4e575411a9a3812b0d4780fc5f87bd3866e295821e88d9df8891721e153a04415e678219942c92f3907dc8606736bae2ce03987985 SHA512 cce7096bd5dfe97bbc0c2fcb5ca04f2ed06016a8d4468b87286364e1ee7420663419caefbc9138d3dcc2a2f7bd9c11736192a4ee81d51618e4cac67c27b6fe53
 EBUILD jaraco-text-1.8.ebuild 1147 BLAKE2B a950e82e70ac58d8c1ba265f000948ba6e4c8b140c276274d3b4b079a8f81f1b1f5f54127b2f97f228b2c1e568d6b0e0f2a122ea54c3db4e147d02eb4ed456e1 SHA512 f10b20de7ca299ec7ae02444681e4529c7a448e3ec86875cd924d48ae16b9e3b5a0c53c924380589de21ac449f8e02ac290b944451e412f2b4a01f1938c8a1cb
+EBUILD jaraco-text-3.0.ebuild 1492 BLAKE2B 59108078857e6c8b893eca08cd23872ebe5862297514dcd7355ee16a01fa5987688c185f87cf0f3f97f44642ed805f0f926b5ffbc76218ca3ad176961d6e83b1 SHA512 9fb5f7bd11f48f24087d5a6ba9ec753f4d8b485775b2f5300bc11987bcbd84aad35bb6f458946813502839b765087f7bf6c7c3504abe072efebe39227380438f
 MISC metadata.xml 530 BLAKE2B 15328b15f81e40af54c52ceef75adc55cc83d04c2ca52c8bcfe85d5fce1e8b70efb38b4a15c8390d283e72a2496dc0b148da0b51b3213440a6ca8379d091c927 SHA512 00c56e02c156ed1b402475dc24dab7c1943bdf6e3067da3f02fe91af0789cf87041cd7191869ab9a785aef21d4e696fc9b134a48fa769ca1f0d0337d1cdc5969
diff --git a/dev-python/jaraco-text/jaraco-text-1.10.1.ebuild b/dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild
index 03f71fdc3edd..2f1f531343ed 100644
--- a/dev-python/jaraco-text/jaraco-text-1.10.1.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild
@@ -20,7 +20,7 @@ IUSE="doc test"
 PDEPEND="dev-python/jaraco-collections[${PYTHON_USEDEP}]"
 RDEPEND="
 	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-text/jaraco-text-3.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.0.ebuild
new file mode 100644
index 000000000000..cc95fcac5347
--- /dev/null
+++ b/dev-python/jaraco-text/jaraco-text-3.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Text utilities used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.text"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index 6dc62d67aa5d..9857eb813bbd 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -1,3 +1,5 @@
 DIST jellyfish-0.7.1.tar.gz 131122 BLAKE2B c494e38d3101b1a7bfd295b80957d834bc3e475dac72bd9d81669466eb395e293faa41a581953250133d455d20ca71959414cabd73d5c3dea444ee39e4e8f973 SHA512 c8464171cead812f6dab8c61c74d83afafbf6451e7143e5be74400dffcf895be925a3628ac4fff47467b6dbf70b6d068daaf1c141b1846e53d5d19bed1617ca0
+DIST jellyfish-0.7.2.tar.gz 133320 BLAKE2B 094610c79e8c7f1caa94ff6c8f6936c3ff26c8d8ab8a7605c145e8293d1ebc28f5d057a603f7d8392811aea5d31a87ecb3e3d9eb682e2fd8a3222f23fbc7c3f7 SHA512 5fa19826a3adb16dea26855d733bd3e8ccce0c68652249f7bcc06f9b5d5ac36919152301c9afafdfca9877cef6614dccbe8e46a51ab41c1fed493374929c3367
 EBUILD jellyfish-0.7.1.ebuild 982 BLAKE2B ea3d45e98b2cc9c132eb52b57b1087fd77d480cf7e073dbe34e13d6e551c5fcdc9a4872bd01fc22944bc22d1e7274558e483c489dd5108ecfcd1b6c6963a3975 SHA512 384a979f24a1e59bf6d06a8c473b49108297b0b194bfa41c8e00fc6186fedc896e34c5ba472bc3f1e13eeed7a3d0662259dbea5daadb3bef3f12aa1c76a90f16
+EBUILD jellyfish-0.7.2.ebuild 910 BLAKE2B b30dd878366fedaa1c4b0510ba7ca8de3c8ca4bfa59e4ef85b3076de7840eca33f94ea3bcb4881193bcbc9e8f289830218bdbcb8b33c66a78a74268cadbc8421 SHA512 39f5c236d46f3baf9317e6d51bbdd0d62d849444ba2b5344ff820aab704f6397e91f989b13787c8681fd4dd0203bf8da4cbabbb0661ed87fa9283cc18a10fc57
 MISC metadata.xml 503 BLAKE2B 5233c8c8b58779463d926f276a3fac04e25f70ed8992e75aaa4963a259de9d525b3dd4f040e0fd2aca83efc5bbbce73b7eb86d5b59cacb81f9aa1f82c7949850 SHA512 47e552f516be95767e3dfe9b5b43ea36b02369cc426cebc25d66ed6c3e449c1041d6c79351669d80ac13d19a45f699a719a80130073d02d14459c4630c87736a
diff --git a/dev-python/jellyfish/jellyfish-0.7.2.ebuild b/dev-python/jellyfish/jellyfish-0.7.2.ebuild
new file mode 100644
index 000000000000..8b4b1810513b
--- /dev/null
+++ b/dev-python/jellyfish/jellyfish-0.7.2.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=( python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
+HOMEPAGE="https://github.com/jamesturk/jellyfish https://pypi.org/project/jellyfish/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/unicodecsv[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( build/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	cp -r testdata "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	pytest -vv lib/jellyfish/test.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/kconfiglib/Manifest b/dev-python/kconfiglib/Manifest
new file mode 100644
index 000000000000..17b91ac31a59
--- /dev/null
+++ b/dev-python/kconfiglib/Manifest
@@ -0,0 +1,3 @@
+DIST kconfiglib-12.12.1.tar.gz 181307 BLAKE2B d256148bd6bf01f7951c78751604eae1be4c2fc156b815bdb570e6fcf185c2f5c97259f6ce0ed275104234ff7180afa2000a81feb281e745a8a0c4db162f57b9 SHA512 49e8746e6c83a93b7500130b21b864346ab8106c0c161de0ec62b3efff794080e734d34d88cd9c816c0d6514465729fbc3a4334fcc9c0a68f17c1688bb210325
+EBUILD kconfiglib-12.12.1.ebuild 1047 BLAKE2B 0c4bef5cbed70c1c39a602438a7fddf86f36059837d5595eba561c6f2b3706593c7fcbaf41595b070a75b3473019a5a95eb745c658c54f6458ebdef276c8c6d2 SHA512 c6f8f55aecdd22e37b85de9808a6b53bdb50cd4fa081e3ce7f65fcfcf5d561f1ed308087fa5fb721721fd9554d020c07cfd10791bec4ffc8346db4583ec5cedf
+MISC metadata.xml 331 BLAKE2B cf19e7c3a4a2511e58382941904de06eb12e21c0a1f27c89fd3f61ff1e2f96d9e8509aba80f52080ce4a53da8f99e8a15685803b143fbc9071d33ae6e815a1e1 SHA512 453f9a6063705a3f9db24e5c0658e31c73d234dead14ccecd8d46fe56f26b16729f4f46c0ff7471689c60eef5d9c006b455a14f349f1249ae2e9f0b677ef80f8
diff --git a/dev-python/kconfiglib/kconfiglib-12.12.1.ebuild b/dev-python/kconfiglib/kconfiglib-12.12.1.ebuild
new file mode 100644
index 000000000000..42e22c8f41fb
--- /dev/null
+++ b/dev-python/kconfiglib/kconfiglib-12.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+# menuconfig script doesn't work on py2 so skip it
+PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="A flexible Python Kconfig implementation"
+HOMEPAGE="https://github.com/ulfalizer/Kconfiglib https://pypi.org/project/kconfiglib/"
+SRC_URI="https://github.com/ulfalizer/Kconfiglib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+# pypi tarballs don't include tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+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/kconfiglib/metadata.xml b/dev-python/kconfiglib/metadata.xml
new file mode 100644
index 000000000000..6af6948586ac
--- /dev/null
+++ b/dev-python/kconfiglib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ulfalizer/Kconfiglib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 9f034aad4231..2fadc49ba3d1 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,7 +1,9 @@
 DIST kombu-4.1.0.tar.gz 421875 BLAKE2B 636dab025883bc9465b28e7a6ab4249ae7d079cc57d33b1af8ce8633e12b85027ace9601475f9e2db1782d197f888476ce6006a2d5429e040ee8de0d1c86266c SHA512 fc104a3f974fabf090cc257b1a7623af6048f4630c6c2a9bb693fe69d77b6cdab36135a290a41056c1f854f61cce8fc2aa6b7880e9273581bfdfa162b5724861
 DIST kombu-4.2.1.tar.gz 423926 BLAKE2B 8566e3d81bd77c93982f54300e837e2aaac1d1fbfc716c87607fb83b86bc80148afc37b11145ee33ff3a6cef9fadb6178c370dc5b47c0774a56e6b08b6bf951e SHA512 a480444199aeee4e0048803a49ee85f2b348734eccf0e746189ea7db3787cb27baa89765a71cf88288ec7171252d55e13bc787641a543d3f91d6eb3d30c6a90c
 DIST kombu-4.4.0.tar.gz 435287 BLAKE2B c87154f5f8862af9e0381f1f4eda6016e5ed69605a39b682c9e648003adf4aa4ed8ebbe7f6dc38b293ab013d8f5e31bb732cf47cc4aab7738be7edaaa25ca750 SHA512 2f7bd71f848c7bba0643e47c43af79ae09373597bed86786e3a90f2acd69414583021e7f5544e47bf01f760b1fd9788e89e88a32cd22a3d74a34845b7917e10b
+DIST kombu-4.6.3.tar.gz 427754 BLAKE2B 0db078eb8d6afd18a5e9b48c970791d2c55c46f5f705e8e0737c8685c2415e1ca974594377a54764f744cc73ff607668ece3c0999b1a7dad6a259567ac1fd319 SHA512 35113c4f19fe6bf94c374477c89a629f565975a23c16a3cedefa8e0c2a800cabbaa8917d48f732cf28e89cd5430fe8408a3514e055b1858c216b6ea31b4c014a
 EBUILD kombu-4.1.0-r1.ebuild 2329 BLAKE2B 8824ed84a6185b64eacaa6322eadedf4a899418db15cd1ac6f718e4c32ad6185ea31facc833572f0ff654639d645b48ae340a9145e0c16d51db118346686f30f SHA512 0f88f9c70e0a93a57d5992f4592cdef1e405770a1a39aefdcd9e449a07c8df53876121c79238b906785d34122df852293e796a903ff05d0b3e4e7b0c2eb9ac48
 EBUILD kombu-4.2.1.ebuild 2329 BLAKE2B 80aabc0220c5224e974997de09f7e07fd5f8831fadbdf54e7832900e10452bba101928a5b57dec0a5ad50aa60bff879d557a6159278f2ba0703085233515304a SHA512 e28a667406c2b3ac86862488967230d5379c73ddfac0c2e027596f93a78bedfcccb0092c5b1573fb31b992502427406100e7c7040d98f2258bf4da34d302a73b
 EBUILD kombu-4.4.0.ebuild 2329 BLAKE2B c7eeddcd6c514bebd232533e75dd01cc398ceb44a1d7f26cd527533c42132df84bea0c1476892b856de038c04c7a87b1f0495e9cebb865296b26abe304f79bb1 SHA512 3a07a480a0e14148b778bd2c0b44728e8f0e3531cda2cab7b8996ae404de9b0d9f996b803dc4fa04269688bef258333d29bfd3e13caf7156eb843f311fbecb39
+EBUILD kombu-4.6.3.ebuild 2328 BLAKE2B 38d991543a1bde3c513d0d0fdabc1ea8514675873fbc5b2252aac9add7ab60b907bbe9459fc4b93e586b96608eaba9d56ad8c85ce4902d611a1bbddd70c50631 SHA512 41f7ad2d20e1055ec731a4e3bddea05a856c05321300aac1a752b14dcd441b00c84533a694653e19dbd97fbb2ec05d256b8d2b82c11154aa5ad6d0c64cd6348d
 MISC metadata.xml 675 BLAKE2B 6bab5465ca22ad8ab27ff08418abb6c6616972605b2b9bec7ec559f887962c80df01e6c9aa8eed5b1ffcbc392a8476f86ea477fa3c4084ba37e1ba350786f8d5 SHA512 37288783570daecc3bd70a8f5e9b96e652cd2271f1a36f9ecd644b6fb98f4dadbb2f2cbe36457c46d4b99d67fc5cfa6fea78f37bfd96b3b639cd26de4e948541
diff --git a/dev-python/kombu/kombu-4.6.3.ebuild b/dev-python/kombu/kombu-4.6.3.ebuild
new file mode 100644
index 000000000000..24fd55a80594
--- /dev/null
+++ b/dev-python/kombu/kombu-4.6.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="AMQP Messaging Framework for Python"
+HOMEPAGE="https://pypi.org/project/kombu/ https://github.com/celery/kombu"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc examples mongodb msgpack redis sqs test yaml"
+
+# zookeeper backend support possible via dev-python/kazoo
+RDEPEND="
+	>=dev-python/py-amqp-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/py-amqp-3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyro-4.76:4[${PYTHON_USEDEP}]
+	sqs? ( >=dev-python/boto3-1.4.4[${PYTHON_USEDEP}] )
+	msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )
+	mongodb? ( >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}] )
+	redis? ( >=dev-python/redis-py-3.2.0[${PYTHON_USEDEP}] )
+	yaml? ( >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )"
+# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-20.6.7[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/case-1.5.2[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/sphinx_celery-1.1[${PYTHON_USEDEP}] )"
+
+# kazoo is optional for tests.
+# Refrain for now, no established demand for it from users
+
+# Req'd for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+)
+
+python_prepare_all() {
+	# AttributeError: test_Etcd instance has no attribute 'patch'
+	rm t/unit/transport/test_etcd.py || die
+	# allow use of new (renamed) msgpack
+	sed -i '/msgpack/d' requirements/extras/msgpack.txt || die
+	# pytest-sugar is not packaged
+	sed -i '/pytest-sugar/d' requirements/test.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# Doc build misses and skips only content re librabbitmq which is not in portage
+	if use doc; then
+		emake -C docs html || die "kombu docs failed installation"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 874f69d32142..1154da6979fc 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,6 +1,8 @@
-DIST libvirt-python-4.9.0.tar.gz 191922 BLAKE2B 272f0827faa7083e4896b34cea81554505e38733313df556d608fbf0e2ab935088ec5d57e9678c7679e172ff99a619939abe8cbd828b49655de70daf11d20efe SHA512 7d1345693c87f11be9dc751212820f4c4a519a467703f0ea2fcafd0e66d39941686cf7c84c2c68e8639889da1bfbc9176a72cf1059c87d76a49b2c74a7b05c0e
 DIST libvirt-python-5.2.0.tar.gz 193270 BLAKE2B fecd1a07091746779a91e0cfeb9c3068048ee7e51d2f79064b4ee529a19b78d04ba53a5abab68182a1fa9c4a82f459fa9e971c33fcd10b42fe7011be17f7c6e2 SHA512 afee2dcaf08d530e6298fdf2db674af217b9e4115941258b5815aba00087d96db6eb421c9854d7dca0f9dfe24069df72aadd969c924545e72be216f01bc173cc
-EBUILD libvirt-python-4.9.0.ebuild 979 BLAKE2B 845bea170e3514ecdda19b74a1e3ca627cc272cf6c39c5527f06f036c8eb67aafe67c4ac2432a060c158898a214e8f2ac32faea1dd70652b059f214f451e9f41 SHA512 ea87646612370412b96a6c276de497a2dfcdf2898c33b74b000f60769d505c8042306a5f8e2880b80354d4e8fd494f87c29d8a63a14fd4e9551a354cb56fd102
+DIST libvirt-python-5.4.0.tar.gz 193623 BLAKE2B b19ebde80c4e922139802d316a82a6d0b45d6087a4dbd5f801507c18fc5558bfd8983171df55b4efb6c2ad36235f6ddab402473b66450b4d031a5e4ce7705266 SHA512 589cd68189d7a8b611127f6dbae4853659ce98c02d22242b6c8ab646dd04e657f912ddc8f11595f656ac14a1fc4528a941b8a05d52cdb1951ce91c89af0599c6
+DIST libvirt-python-5.5.0.tar.gz 200364 BLAKE2B 198c9858573c383ab818deae6bd42c6ad7efd58b9a661a80f06f4f0fc0d72e9da98546b07443397609d4c9454ece4e02759b53016f078bdae84580474e2bb49d SHA512 3098c5a0315488aa515a9b00e69add8de3dc372d2f82a8b1cbc6d01287a133855095f7c34510ad900adbd1c56e6a53bdfe3d251c48411acd243c2300d659332b
 EBUILD libvirt-python-5.2.0.ebuild 979 BLAKE2B fb91ea46f10a7d83215fae5c8557626ca99e16d893f3c3ab27b2b528bf1e85e0473eb011d43597ff63105b8cffe5d9de28cd22688893715f8a13cb05c16b2268 SHA512 af012b0e554b13c1de26c9ebf67a384d553b03ef30e96f90253d441e8064a2b9cf586af9375f82339a2b16225fee326bbfaa9633f6173ad248d4f7f23673d6cd
-EBUILD libvirt-python-9999.ebuild 972 BLAKE2B bbeeecd0e48f373b22ec37ca905ae23cfcc4754dadbec45db91f76e5f1bd06c51979fc1e583169fb400f3218bfd8e3ae7cbb7424741e67f329e9f80f85c52991 SHA512 63357b3802f1989965ca7fa33d6bccf9a49f80ab42f83fbff365f86837e5bc4bc19c5add1183485a10040fdb55bfe32b4f5f76b653a453678419fa3e863fe8e7
+EBUILD libvirt-python-5.4.0.ebuild 972 BLAKE2B ff738ca6dc085799245e2b4abd6653cff131409c6ded81a5e647bb9b8f8879050d161dd415ece999e84bea6be572a4daeb832fc12354b2bdeef45654de5291f3 SHA512 fb4fd08b39be642fc824572f13eec89d505670641c1d4b0ac418584ace3f6c6ae2b545699a35e88111f97921a302e03a23be55d2f31a62e101514a5a033f73c1
+EBUILD libvirt-python-5.5.0.ebuild 972 BLAKE2B ff738ca6dc085799245e2b4abd6653cff131409c6ded81a5e647bb9b8f8879050d161dd415ece999e84bea6be572a4daeb832fc12354b2bdeef45654de5291f3 SHA512 fb4fd08b39be642fc824572f13eec89d505670641c1d4b0ac418584ace3f6c6ae2b545699a35e88111f97921a302e03a23be55d2f31a62e101514a5a033f73c1
+EBUILD libvirt-python-9999.ebuild 972 BLAKE2B ff738ca6dc085799245e2b4abd6653cff131409c6ded81a5e647bb9b8f8879050d161dd415ece999e84bea6be572a4daeb832fc12354b2bdeef45654de5291f3 SHA512 fb4fd08b39be642fc824572f13eec89d505670641c1d4b0ac418584ace3f6c6ae2b545699a35e88111f97921a302e03a23be55d2f31a62e101514a5a033f73c1
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-4.9.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.4.0.ebuild
index 7508f20cc56e..a020f3273876 100644
--- a/dev-python/libvirt-python/libvirt-python-4.9.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-5.4.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
@@ -13,11 +13,11 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
 	SRC_URI=""
-	KEYWORDS="amd64 x86"
+	KEYWORDS=""
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/libvirt-python/libvirt-python-5.5.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.5.0.ebuild
new file mode 100644
index 000000000000..a020f3273876
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-5.5.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+MY_P="${P/_rc/-rc}"
+
+inherit distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
+	SRC_URI=""
+	KEYWORDS=""
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/libvirt-python/libvirt-python-9999.ebuild b/dev-python/libvirt-python/libvirt-python-9999.ebuild
index 7af6e434ebe4..a020f3273876 100644
--- a/dev-python/libvirt-python/libvirt-python-9999.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
diff --git a/dev-python/namespace-jaraco/Manifest b/dev-python/namespace-jaraco/Manifest
index 8772b2e2571d..37f0c5a7f681 100644
--- a/dev-python/namespace-jaraco/Manifest
+++ b/dev-python/namespace-jaraco/Manifest
@@ -1,2 +1,3 @@
 EBUILD namespace-jaraco-1.ebuild 893 BLAKE2B 7b020f622a7cb8abb865103b0b6f0e06595d37d4718a6b854f1a629eb4444e8a206c097de8bf95142f07df042321aec443365e48581e42064601b137952baee1 SHA512 9b731df38fda9cec294e88fd577dd4bd07b7f6349d4974af4a6e558faa3e175f85d35664224333f36cea9eda8a474959281d88a5ce5d3c201708dd3955e83680
+EBUILD namespace-jaraco-2.ebuild 828 BLAKE2B 1776470a9e83fffbce48ed99e824fc6d3a38c2e518373be2e32dcda0c5bfa6c2cc9b73dffdd639b0508cf6422d62b102af3b1cd3345529d3f42c0c49088bb238 SHA512 ec63a8f408785b7546e63e80aee31613d3791b6e61d7ba895837d86b9b4c8edd41b0ffb8f8677f4e4afe3f5634a61dca5f4aaacb4fe6f091137583983ddb7cd2
 MISC metadata.xml 346 BLAKE2B bf549c97be0470c6694566c73fb27eda911bd1c7e38641ccfc90e0cbf33717499177dcd4d6b6ce475d430a04ba395500d41aa5cf7d7938ae8bdd1c0840e0a6e0 SHA512 747d2fe0daa0213a7f9d737cc8c5037438ef9262ba049a7a687e944cb1251b9b3dc39ea03a810b5ca61c7b95c7f1360bc397c4d75fc26746cab5029f7736efdf
diff --git a/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild b/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild
new file mode 100644
index 000000000000..eae5d12efb45
--- /dev/null
+++ b/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+inherit python-r1
+
+DESCRIPTION="Namespace package declaration for jaraco"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND="
+	!<dev-python/jaraco-packaging-5.1
+	${PYTHON_DEPS}
+"
+DEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_unpack() {
+	mkdir -p "${S}"/jaraco || die
+	cat > "${S}"/jaraco/__init__.py <<-EOF || die
+		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
+	EOF
+}
+
+src_install() {
+	python_foreach_impl python_domodule jaraco
+}
diff --git a/dev-python/neovim-python-client/Manifest b/dev-python/neovim-python-client/Manifest
index fbaa6891a73b..cf331d2c490c 100644
--- a/dev-python/neovim-python-client/Manifest
+++ b/dev-python/neovim-python-client/Manifest
@@ -2,4 +2,4 @@ DIST neovim-python-client-0.3.1.tar.gz 51626 BLAKE2B 80e68d02d41c7891fb88e938686
 DIST neovim-python-client-0.3.2.tar.gz 51954 BLAKE2B 8e0a5eb510797db260ab501b751921f5c98551a06cf874eecff270f5f92da5d24539b857b4cc08494be9dfed139fd3bcab1cdea75ee87d99cece8e1f48f7a1c5 SHA512 c6d7c1a2955c63ac2f59bc57e190886fe0ee0238951ac26205b537d394b2ce2fee3611e8651ae1da5e6e7b3a1bd3bea36912b918b26e01bbb3354ddc2fbd77fc
 EBUILD neovim-python-client-0.3.1-r1.ebuild 767 BLAKE2B feb97ea376aaee037c2babbdec0439d9d9c5e4479e182176bcc1249a0fd08689dcbad43f79804001ace9652396cfc469d299383486c7b7aa7328e1fbb567049a SHA512 1c4c98acb0e4c816383999151426a955e03e6781c8169262456c356349febe0a0ebaf932a91dc22610aa8110b0d7467543177e643b078cf66d5ea9530ec27013
 EBUILD neovim-python-client-0.3.2-r1.ebuild 766 BLAKE2B f5d94e1552c50b3d663c90ddb95c26f675532ca56cdd4e352a5165e3069f4b70a7e197437198fdd15236820b864cdfca3c23cf128d65391a86ef70a33b2f1f5e SHA512 fddbf8a18e862cc202cc57bd00a1a63fdde2335eb708d94ecec1222a75acf6166e19df3b63a25b9bcb64f328f24c7839a5f488c71cb5267a229e676eb9911419
-MISC metadata.xml 451 BLAKE2B c2317fb2bf039a77c223c958dd1238ed934621c556c9c8f565bca643a73e79bd036b71bf104146e810300bcfc755328365982d44fc4b4c46676e64d8720ae64c SHA512 cf9f4169ee1ea2adc6f88b17461202cfe120c20a5367ccc0da4099b8792841d13057d8c133c85179b1c5b00ad4bc9954a0e9202b3810a6342f8e052ffa3dc2f1
+MISC metadata.xml 344 BLAKE2B 0d15c0c8d8736a7622e98357e02c92eabecb22c853cba110c893b8cb681f0d7a16534329ffba68639e0a2455cd1321601dd56dabfd17b10ade3e23545aab6579 SHA512 32963ee9f09db1c9edef5a1179cdf0974b62c05d714636faf8f677db5f3205333d64eaa228ec2d35475a7efcb744759a857c6888dd055766118a19a288415e52
diff --git a/dev-python/neovim-python-client/metadata.xml b/dev-python/neovim-python-client/metadata.xml
index 7e584044cde7..2cfdf28024db 100644
--- a/dev-python/neovim-python-client/metadata.xml
+++ b/dev-python/neovim-python-client/metadata.xml
@@ -5,10 +5,6 @@
     <email>vim@gentoo.org</email>
     <name>Gentoo Vim Project</name>
   </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
   <upstream>
     <remote-id type="github">neovim/python-client</remote-id>
   </upstream>
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index 8bdfa2eda45d..eef8ebc48352 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,7 +1,9 @@
 DIST Nuitka-0.6.0.4.tar.gz 2010373 BLAKE2B 96d31fde6d087bea81051bfcc208d52466b9c45785c2167c61721440fe930906958ee840bb98258c7c1b98c067302049afd63bbf5cfd422a69c1994675c29c70 SHA512 f9a30ad578b80679c0313be84150adff83a90b35c758487fc9f5240d527cf0a905b6257a0dfdf2a2c8c7322688108a6673c56238480344adce123d67416eb197
 DIST Nuitka-0.6.0.6.tar.gz 2011509 BLAKE2B 1a5d37acd50bbb7d1a380306aa18d68ab6559fe3d90b988032cd36458e5ec663c2ba1597f50da89c6b2360f35cd576a2219860b0d74bb3d835db9525d10f22bf SHA512 d893e49a2f91d310b4a86ddd1566990b66ae202bde642af8b7e45554ed6b2abf4b6b694bb03d020b15d9b748c0dd31ac1a79c77fcc9d15468ce37faf475e8beb
 DIST Nuitka-0.6.2.tar.gz 2064701 BLAKE2B 9144bbae98584c64a642ede1155f26f88afa1ffe6d1e75f88039fe99f191e0939efc5ce7e71b2b9c661004213990e4896a392e2fce995a0649d45ed5b3a18168 SHA512 94547cdabaf6c591ff5d49179dc4538fa624b40a6d63e318aeabe371b7cfdbd9b1c9c41918a4ea1dfa816a7222c5587ed17c1980d89be6d9151ecc8cdaa8c5a5
+DIST Nuitka-0.6.4.tar.gz 2211662 BLAKE2B 4831782516503f128911321bb9755db9ea7d48fe0438dbff1fbc9ded3c690dc0d2f4dd14f0f5a5b8c66cb2b8e8d380e9658b590a48316497b42f78e68a8ae5ea SHA512 89e882b5fa37fd5a1357f69e13db7c340bc6d5471e18b7796cc1b7bd9970c480f8fecb9a7b11e19e41e936c5f90ef204b7409146a362beb6946f3d8f88cdf93e
 EBUILD nuitka-0.6.0.4.ebuild 630 BLAKE2B 5526f072dba96751c9fa057829fedbe82dcf2a032ae2f6df815e54783a216d6d2a363b49f0e4b0f0b1627299e4f94ca79198b46e69830b3a0ef2a90afc2ec9ca SHA512 764095edacfea35fe8eed86c5588821895f49d3e2d7c7ca244661c7910e9e7796e1ebcef6ca31d1759c0ccdf433fece6944a5d003b644b1e0c88a55272ed9837
 EBUILD nuitka-0.6.0.6.ebuild 630 BLAKE2B d3bb6daa3a87b32053a2d1714e987444eb9affaf3aabaecd04ec86252917442c7fe0030c410d1aa382ed1ddf62fb1845c078dcf300b7cdf481e9c8b06a84ae1b SHA512 93869f9df917064bf0fc50cab19fbb092bb7cc5b8eb163b321ae9733a534a08375871c4a0b664a59042302c8a869ca2fbb036d8b3e64f898ad1029ad4ca7b909
 EBUILD nuitka-0.6.2.ebuild 624 BLAKE2B 6f48d803688d8cd8f218de5745cffa2eab45f87b2d37a2c692eff4d40423792400c358afa1c9d290320138f4251ac661f07421a562164d95b5c37a0f5de61bf1 SHA512 5876f5dd0989ce5a33111ffa6ddeb3276c1f86e84f1f4618571dd39fd7be47e19eb5cb45fb1c03069e5899190e2499861ea4828a5d3b58988e2cd43cefbc044f
+EBUILD nuitka-0.6.4.ebuild 633 BLAKE2B 00a59a13fb3fcc70b125cd2e2accd66bfdbcbdf32f6b0b514776e82f3b8a0b0a897675bc661cd4a0b6ad1fbb4e55bfec1de99d4db085a6e10b449f83dbf4400c SHA512 38adeab05597ce90376e886d6de6a2da9167b3362684e16bd81da6d1c258841c74aa0725e180dab7f7f4f70ac5ac03326d5ea8370eb3119181e2d02cc23eb545
 MISC metadata.xml 750 BLAKE2B 56bff65b936301e2d0347e553a1ea85b89c4c991697f665b47b01dfd7e40b94726fca15c67e4387fb79ec19f77851e275bb80c48ded3f76e6cf4cb81d10ba90f SHA512 01ed4ef871d9d43ccb30b60e5051f513b56d7ab3eb46ad64b76e6ee8f53f0088c4a3d75227a0870e82664476954d6603f70614232735f107bb24a06702c014ab
diff --git a/dev-python/nuitka/nuitka-0.6.4.ebuild b/dev-python/nuitka/nuitka-0.6.4.ebuild
new file mode 100644
index 000000000000..b7b8079ee4b1
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.6.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7)
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="${DEPEND}
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-util/scons[${PYTHON_USEDEP}]
+	"
+
+S="${WORKDIR}/${P^}"
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 6a91abc2cebc..3741b5350877 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -18,7 +18,7 @@ DIST numpy-user-1.14.5.pdf 574418 BLAKE2B 80738f1760932fa74b07334d1a355ba3ce319e
 DIST numpy-user-1.15.4.pdf 596191 BLAKE2B 1387b7aac9cccba4b7ce259391f56372959db35c4ddce111afb9949347ebcf3290e7d3fb5b1b2d2e7850911259cddb07edfe104c1396ae8e31a58a81e9293f16 SHA512 2089753b48412f094b279c378be1d221ec9b171957171a4e26b4589d594e00b4f66b6f8a88a7eb665e8c3fa3e6ed505d63da80d4d01ced041544b97ea56fe212
 DIST numpy-user-1.16.1.pdf 592508 BLAKE2B 88ef7aac2998fd8eeebc3ab92df9ad9ba139b67ab0442cd4ed91cdc7b1cd72acf7905468118df25634640b709106758455c7d316539b941d7760010b8135fafa SHA512 d089b4c663f92c38aa075c37974df757bdc457f75980737477a4477f67311d28149bc4c20f5d1cd0877221a78e5a9ff10702b1ebcc8ab062d328cdda4087d0f7
 DIST numpy-user-1.8.1.pdf 408305 BLAKE2B 2956e42ebad45b021f72c7e71d357d953ea8a26639b4c6e81dbe1718052304ac5ce1a7f96646d94ad48bf737ddc6962fcbc304e31dfce32b85cb8165b0ada6e0 SHA512 9e646e89e7e67834fa596e43082b43842d1c59287d22fd8d20c9f0a1d3d56a518a08cc2c036de4972ad0d6d9d3c2f56e2210f76e7244d3f7547b5204d84d3c7c
-EBUILD numpy-1.14.5.ebuild 4101 BLAKE2B 98d425bf7dea77b228764e3485792f810b4e2f0981af7f8cbca1dbba62ce8f93e3b0a045a7b19a67352c1de889fcf5295fbd49d0f4ed384b171b0b6f30bcafd3 SHA512 47e4bd19139ef23fd58265005cf536f6c4cdc82ae58e238b9d6f5bd20dd016e720d0456c5b1981f2c89755ee8f6bc5cdbd631e58fffa6a1ce0c8127e632d6d71
+EBUILD numpy-1.14.5.ebuild 4100 BLAKE2B ef8db45fdbcd2a3e43065b74e2498e8a555727925594073631b7743f6e73f244cb302abf29b11c567e83bfd2667362ae0bcaf7e89e97b7a8a9cf7151f7cfcddb SHA512 1c82e4f559c04130d2c70d43c1a9142eb7da2f1def3aeb8b736b8b97ad1c71b1b081dfe8b54a32f56342bccb8f55fa6a4ccc01abbe3153baf2d806a396122b60
 EBUILD numpy-1.15.4.ebuild 3911 BLAKE2B 93ec5d217f42a505248509d642a0039c6342d2011b9c41cbbc45ae9ebb34e8445b6aeef1e8e827b99a78525b37569e33b22c4a0ffdd1af4b4d4237d8dd2bba43 SHA512 c72491e09fb7d85bb33b245eb9106fde1e6209c891651d46c101ac43174d934f1994503f93db3ff032292ffc6a59c3b78e747fa310d6a9dd2a7fc4dc092cc431
 EBUILD numpy-1.16.1.ebuild 3931 BLAKE2B ab8432f6fecf5b5a7d54410ffb22786808d958cbacac260262929d240721a00df3982bb679f47e238c3f769ab24cc08b1cc31a20c524dd85d98d48f9567d9a00 SHA512 ce0349a7b111f50cdbae132fec2de20647b0bb254c69408e5e68d8837a8a9039e8ce2259f4af1182876966f797b467857361f2a87f0ff3d1e78ff1f423acdae9
 EBUILD numpy-1.8.2.ebuild 3986 BLAKE2B 398fe9fc9afbaaf6e92a70c311a18fc47856453446bdd1a0db578c9885c53640a6faa1a6c8bc5c61450b4eb6bbe07eabc5593cbd2ea21eea8c51a68306d68b4a SHA512 58879a52e5bd331fb7dd363f8f5548a5c85a7b931b2cd5ab8b87e6cbd735997bfa9ae9e58bb940e3cb3766c1cac8929a4043fa256b40d1ff5183b56a4eba2d8d
diff --git a/dev-python/numpy/numpy-1.14.5.ebuild b/dev-python/numpy/numpy-1.14.5.ebuild
index 86c5bd0abd06..0b81bd275073 100644
--- a/dev-python/numpy/numpy-1.14.5.ebuild
+++ b/dev-python/numpy/numpy-1.14.5.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack test"
 
 RDEPEND="lapack? ( virtual/cblas virtual/lapack )"
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index f37bd2f2d058..68d447de4ae9 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,3 +1,3 @@
 DIST pallets-sphinx-themes-1.1.2.tar.gz 17054 BLAKE2B 2c106be4a8ba68c6c270035ad6764bf87c65a20ca3515991f6287e3bd6a280d3ad0df121c6bad995fe8964425bee4c6ec4d229eef15489c3ae4e4e98eebe4d22 SHA512 0537f1e24b22612720909f1e19f2893b35622411d72298a407cb19318eaf33a0f7c97ee6f69874a172c135b65c9c16726115c1decd6d7a3d6cbda3e1dbdb50fb
-EBUILD pallets-sphinx-themes-1.1.2.ebuild 659 BLAKE2B 5965d91ddcf7b9891a0e64cfcbc45f80952ce97f3de123d7d11d0725a9e0de8a5fd8106a74c0bd0e3d33abf07586a6de697c91089b86592fc8df68448599fe47 SHA512 8ecd69afd95a32140b21338bc2465895aa7c34ecddd38a4148355ce1f5c940e22e1a19a3a17700b42b8036cd5014cb1b768f5bd447f2ace651d7417e85ae9dcc
+EBUILD pallets-sphinx-themes-1.1.2.ebuild 665 BLAKE2B 072d7327e802257cc804725ff6461412d1186f037ad358c982548f4abc0c557901a8a4ea9fd3a5fd55424d4c4ca01da5cc91caa8b258d3c64437f4ba8dbcf3aa SHA512 988a69bf6b05afd7b8305056c65ab6332759c938280358d704713603dc845e9814fcb7ed23e8c828956d48b17a5ad5b76248ad497f36312e2067585f035c0aff
 MISC metadata.xml 324 BLAKE2B 270575fc533cde85d524756cbbe22ce43375a25f5d2b83ec37423b8af4a54fea9c679ebb66433a3c3ee090150201551c8804ff86fefe12636a6e0a83da25f417 SHA512 dd0d1c39fbfdcae041c6cccee7855d5fb6eac3037be3ac79cae0d36122f3ff75ed86c7ad63aee8a5fcebd936cfd2a03bfde52cc009655aebb1f25db77a18e698
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
index 574582349bf7..909b3cebb435 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 688cb319c50f..c19ae3450a1e 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,4 +1,7 @@
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
+AUX paramiko-2.6.0-tests.patch 1193 BLAKE2B 86063ffd478f5772e2aacbbd6e6a74262ebaa1e67126af598eb589e49484efc15b581df0bbc796c0790a5ca80d6b5a72cbd07782c7790a9782e66f857e9c2336 SHA512 5b5de9c209d6aee83dc57f2f04d1d43f7106ed135fc12427d9237cf63932408c6385f878d02ef5dbb3d09476ee516148208d0390caa21f82a113bf6ed5a8176e
 DIST paramiko-2.4.2.tar.gz 289126 BLAKE2B 767f81a09b32762241eed6661e520e3b3a96acfe8e6e638ea7ae180a8b6866f8f4adeae0a0146d46ecbfccbe71334c5f5c14e2d049744258ca4808ac21365185 SHA512 894c2ebfcfb35a84fe74670d0eb67022a49b7bf165f31acd929045c17509d8a2be111e8319f20513b5034efd033edc6432b2ca2e7027dc7e3c6703166a96790f
+DIST paramiko-2.6.0.tar.gz 304469 BLAKE2B cde861069c8924b2f685675266fd28600ffd24a39074e9ad5db8fd1d010c6e23ca13a2c78a79b23504dfff395b773b171e7c787119d01e3b92a2eec44ca8b40a SHA512 1ac2c3486cb786a1e4640d7b7f8628087f9b78ee247b09dbd3ac2646790da4f12cf95fc4291f27f200b63ec6c11d9ebf5a1283f88cf2de7c2eb6e6f76e892ef2
 EBUILD paramiko-2.4.2.ebuild 1526 BLAKE2B 7ab3ec8d7d0ba9a8ee7391c1d9c410ace9be2a3717e7d91c39076518e9152395ddfe9c290afd27a68471cd209fb3934548c3043a53107057a392655dfbe530b0 SHA512 d2abb05897eaac0334a1a3ebee68521f76c666fbd5a807e79d86f5bf3eb331d4d58a1f14e13dce12ced9fe4fd03b8eaa71a4a7125a9820925e6643a9d4f42ec1
+EBUILD paramiko-2.6.0.ebuild 1667 BLAKE2B 13f04d9366f552e2e0d3fdfecbfce795ccf46a874054a2c3223e715365ba7d479e4ca15fade78ac7bfaa041df594c71a9ca8bbc2fd7bc8f72c9f2007e6943eac SHA512 90a9f57bc61661a780b154e1f7fd00b2f28e91fa40c91229e641f6a62fd0c92812ee1c0c4801f2d017fb5a9bbd7da47bfb16b38f176087d3c324466f9e0fcf56
 MISC metadata.xml 1306 BLAKE2B 5bf88516d7d34aa0018b00250edddcc3d7044605e59fd9c799775043f2984a071f743994712cbdc009893a01ee9cbd60df85dcd7f644f7dd33e05a426b06391b SHA512 30bbefd00271e8a61c886e638f30aae8aa751dea4ed0e023e50e31d28d528a203c36e80c8a142573a4b39c958be84eca5c7c19986c2eaa86575ad9b3779ef0d1
diff --git a/dev-python/paramiko/files/paramiko-2.6.0-tests.patch b/dev-python/paramiko/files/paramiko-2.6.0-tests.patch
new file mode 100644
index 000000000000..4b15f6a50502
--- /dev/null
+++ b/dev-python/paramiko/files/paramiko-2.6.0-tests.patch
@@ -0,0 +1,34 @@
+Skip tests requiring pytest-relaxed since it was removed from the tree due to
+breaking pytest.
+
+--- paramiko-2.6.0/tests/test_client.py
++++ paramiko-2.6.0/tests/test_client.py
+@@ -33,7 +33,7 @@
+ import weakref
+ from tempfile import mkstemp
+ 
+-from pytest_relaxed import raises
++#from pytest_relaxed import raises
+ from mock import patch, Mock
+ 
+ import paramiko
+@@ -684,7 +684,8 @@
+ 
+     # TODO: more granular exception pending #387; should be signaling "no auth
+     # methods available" because no key and no password
+-    @raises(SSHException)
++    #@raises(SSHException)
++    @unittest.skip("skip tests requiring pytest-relaxed")
+     def test_passphrase_kwarg_not_used_for_password_auth(self):
+         # Using the "right" password in the "wrong" field shouldn't work.
+         self._test_connection(passphrase="pygmalion")
+@@ -705,7 +706,8 @@
+             password="television",
+         )
+ 
+-    @raises(AuthenticationException)  # TODO: more granular
++    #@raises(AuthenticationException)  # TODO: more granular
++    @unittest.skip("skip tests requiring pytest-relaxed")
+     def test_password_kwarg_not_used_for_passphrase_when_passphrase_kwarg_given(  # noqa
+         self
+     ):
diff --git a/dev-python/paramiko/paramiko-2.6.0.ebuild b/dev-python/paramiko/paramiko-2.6.0.ebuild
new file mode 100644
index 000000000000..eaa0bb58a7ab
--- /dev/null
+++ b/dev-python/paramiko/paramiko-2.6.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="SSH2 protocol library"
+HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
+# pypi tarballs are missing test data
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+IUSE="doc examples server test"
+
+RDEPEND="
+	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
+	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-tests.patch
+
+	if ! use server; then
+		eapply "${FILESDIR}/${PN}-2.4.2-disable-server.patch"
+	fi
+
+	eapply_user
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx -s sites/docs
+}
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins demos/*
+	fi
+}
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index e2df2bf6c8e2..285e51682270 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,5 +1,5 @@
-DIST parso-0.1.1.tar.gz 376876 BLAKE2B ad0b9492273d23da1f4133a2f1e6edd2fa7f2213dbe12868f891863e9286fa0281de7fc6c6924b78a5820f94867971bbc09f18b3d0f2e4832c9c875850205254 SHA512 1199651136af1c9f0801a031a197e367f7fa73b5878b863103a506481e8b325e6b305e4260510a567dccf91f298fd7e9e5674f4dc410765ae1f9112f742aa6a0
 DIST parso-0.3.1.tar.gz 375226 BLAKE2B 71481f5f382f14e5f2c7826f8eb50a1c35f8c280f14c8bf52bcf44f77aa9872cddce7d7fb7b0a586ab7cda547e43bbce11812077ae84129c418a9f0bb3c5b856 SHA512 f83e316a41e21d3132d9ee8a45f9042962c01a2b906e8791046112b9ed938d378b0dc28c4ae05ce03a8c2d19563a49cba9a9a230654345ff62e87cc763536ddb
-EBUILD parso-0.1.1.ebuild 878 BLAKE2B fbe609cfd719d50180ac4ca635d619e01baf8aeb93c014f5e890d7f24951da58f545c612fc6c35042c3d53db7ba9b1a90002d7ee6140c80dea98a8cdd6356920 SHA512 04221d44b408f2ad4f22d33b84417e9e182bf209eb0983d9056a13004abaa6e0c4f960eedb89406a923cfb1d54538668405c08ca67663514c20befb10e0b170d
+DIST parso-0.5.0.tar.gz 386652 BLAKE2B f12e34aa9b93a1d3eedca96588148ac1e9ecb3a6af3910627d251e2281df285ce8768c11bf3cac35f8a977f0dac2f7a906fb20171db35fae2bec1c60cd0d7dc6 SHA512 cd2a38e538faf4faf3f1828f4e69dfe685ef1fd3e120326ca5260f0edbc23952e51ffd8370a2bb2de513a90ecde76e6ea2fe76d84d3ab4115c7817e3af08e701
 EBUILD parso-0.3.1.ebuild 881 BLAKE2B e1da487c3c25e9cbea3e9c54bd70a9499d10ea80f11be51e21dffe3e97e9c8d0a26a4318cdb9e795182aa5cc7f8b76ca97579c91ac7a43fcb19e4d4eabf87c81 SHA512 07919403e2eb42df62695ae253d53ea9644804c7ea1fe8bceafd755d832699adbcb6332b3e455388cb1e34faafb512e17427349e702be0a8dbfc6160149c44a2
+EBUILD parso-0.5.0.ebuild 883 BLAKE2B cc65a51ed8b8409881789e996c4fe99c7dd460743c9166a5dd21414cab92f09a35bfb78ae74422b1fdf7f4ce93dca586c9e3d407c51967997cfb840c9f379a6f SHA512 2a1b53c1a4911e94fce49828e4b15ec99692e836687eb4345fc16e5b92696ddbc209f8a564c963899f1eaf653023fa7fb5be57e9bbff48f1c8ed13b6b654434a
 MISC metadata.xml 377 BLAKE2B 0ac7d9c46c0b591fe46ff373bcb8942261cf0b819d9397500928546c4b07541c958edb116ecf1ff79f0a83c2f02784b019e7d64bd8a82bdfb397ef70fbbaa0c3 SHA512 7d719c633f81372caafbfb0a913fa455fd1d150210ea09713a0888b38d18ccae646b17bbe32a66b931016ee6e4bc826a1670a033466c945a2591e77f9d6d7b7c
diff --git a/dev-python/parso/parso-0.1.1.ebuild b/dev-python/parso/parso-0.5.0.ebuild
index f82f4cde8efe..9c33ffe3718c 100644
--- a/dev-python/parso/parso-0.1.1.ebuild
+++ b/dev-python/parso/parso-0.5.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=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="doc test"
 
 DEPEND="
@@ -22,7 +22,7 @@ DEPEND="
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 python_test() {
-	py.test -v test || die "tests failed with ${EPYTHON}"
+	py.test -vv test || die "tests failed with ${EPYTHON}"
 }
 
 python_compile_all() {
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index dca4c02becac..5934ad8c3040 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 1151 BLAKE2B 68d394222c897ff404e9d755b0324e05b9e25c5c385657ebc19b23151266e202f0bc4957c73f115e296a072ed072309be723e3679be80afad11658059554f6f0 SHA512 723a932f09ca1b9082a3fc0c1e6c393f32aba5d3c1875e434a23a71ae274303b80ec1a3a2aeaab0e0b84b05909815063e7be0fa80898c1597ab99f1247d8c7c7
+EBUILD pexpect-4.2.1.ebuild 1149 BLAKE2B 8b6296d58f431abd70a1f53494d0553e8145b8f4082f4becb02b486ef6853cace7e222960e5227ce3753111a1503fe9369aa9eb30748a1d26747a82c116e1b3a SHA512 d07ceb0fde4e4aa8f669bbc201585f2520dadde966a2f92c1c5c264b20116b280b69b5dc9b029b701e441ee043f42e97a4e3fcc07be1cf379d00f1fdde3d9882
 EBUILD pexpect-4.6.0.ebuild 1164 BLAKE2B 6dfb7eabe320e7f32b0298d8d2d488201f14f3538086f7d5fda6838427ab328346d0a2c2d99dee4f235f74c6ccc03aa51a04f1efe8408f30e5f42c232d302401 SHA512 d0db5239cde3dc6aada5f2676018809df0f4fdb47c19fe3eef7afc50d5e021e3bd95e642c8a0ca332f7227466b0c988e7787c4c64c71d6e4f7ee54f4662431b7
 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 5062fb45375c..5349ee03bf6a 100644
--- a/dev-python/pexpect/pexpect-4.2.1.ebuild
+++ b/dev-python/pexpect/pexpect-4.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} pypy pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index d12f76fcc24f..6e9624df1c56 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -1,3 +1,3 @@
 DIST pgspecial-1.11.5.tar.gz 43649 BLAKE2B f9b8956cfcd81bba946e0323d584668c82e6fc18a0aa08012c3236636d0ad801f10f786b71707daadafc1274d5733adecf9233871b13bded8fe8e8f41fad0fc9 SHA512 984a09a10a705d91d9b97142eb2502b44b2a79d95cc1ed8596dd2f7f31515028f4c34cc54383d762a73fdefd6e59418f677b020181740b82cebb5d8e77bbc234
-EBUILD pgspecial-1.11.5.ebuild 561 BLAKE2B 8f84da2cc8b33e448905674f15b0b7b5d4532ff14a50ed97349a35b47540aa211e56e14cb8d3a25965b57dfab1f2354fbc9d2cc384221a31d947fe009efc735c SHA512 41ee7fdfd03e4de00a27c0f75956b19c6f8b31e05c12ced7c68f81e6d7ef6673fa9969a1b0941aecae3d8cf7969b4f1c553faac1c4a388dca62738a4141fc6a1
+EBUILD pgspecial-1.11.5.ebuild 841 BLAKE2B 6e307bf10368f73fccb8581b4f71187a729d982c5823204eb49588f5694f237b2761e68242db1c815b43a4c72e42bab01f730b7716362f127a30fe65a1ce326b SHA512 5158f7d875fe0bcc768ed053b9a2ae9f8f01159442e2163b4546e23c9d7bb7b63e97adaf124d346c87020c8e43a405ea811862063368c5546565a3a8cd502be4
 MISC metadata.xml 467 BLAKE2B 4a1fe580d03eee97746d0b3f25ae0f33a693c5095fffbc30e41edb78b5cf48d4e8d39e1bdd6764956ba675c282548993878455177bb766d9f5bb333630925c25 SHA512 fa46dbfa82bd12f191d99d189a2286da31cbc42346df1072b3f445bcc1a79575a8adf17ad79cafd0a5a4a17fc7094a7f3d2e5fac642b2ad61ce84a2299a13f60
diff --git a/dev-python/pgspecial/pgspecial-1.11.5.ebuild b/dev-python/pgspecial/pgspecial-1.11.5.ebuild
index edaec9de0592..6318ec7b5292 100644
--- a/dev-python/pgspecial/pgspecial-1.11.5.ebuild
+++ b/dev-python/pgspecial/pgspecial-1.11.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Python implementation of postgres meta commands"
@@ -13,9 +13,22 @@ SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/click-4.1[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
 	>=dev-python/python-sqlparse-0.1.19[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 "
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	# tests/test_special.py require local postgres instance
+	pytest -vv tests/test_internal.py || die
+}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 0e98a996b92d..a8b1b378f296 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -7,4 +7,4 @@ DIST pillow-6.0.0.tar.gz 29205509 BLAKE2B 83e2d1abeea468b7bf344ea5003940b14d6c69
 EBUILD pillow-3.4.2-r1.ebuild 2493 BLAKE2B 01326658c00545bcd6162167e735c4805b3b4ceb159a24f2b76c993edba56bfee27ea51b5bcd3db401f07f3ec794286042f603bc03e9a4c41934fd0073ddcd43 SHA512 88c6758dbd10f8c9e5ad8637c3bd14cabf8c66d9ea8fafa5e7d824d460c1eb4e2ca209832018acfc654c17550199df6fddbc14fc3b44c725dfe0690a70ed520f
 EBUILD pillow-5.4.1.ebuild 2770 BLAKE2B e3a3b8f2ae0ff3aca9e881f6355651125cb3d606a0332d614d68be02cb8f5a81a4ce002d1676f9ece74bc8a120076ed9e2f9b741ae30996da6e4d1de85975f1b SHA512 bbf551cadcd03fde029c19678b47267c0558b42e0c7b93a64c634f5ddd576c05bea04b26e568bb3d632d0c18505eec4f4a1d0e797f9a66caed2de8e8d8dcba3a
 EBUILD pillow-6.0.0.ebuild 2773 BLAKE2B 9332930703d43e2600618b3ecf24471a52288348ea1067c2508948cdb2addbc22ee37ca077e2c5773e8335949ed0331dea1ecd57b43e9152abb70c9ab48af3a0 SHA512 89cb0af57b9fd3347a88418b65943d5c2569598bd4a2fa822c3fef9a2a538150506581342124080fb5a64f52f331aac65662947c0d514de6840e3c48cf4ce8a6
-MISC metadata.xml 590 BLAKE2B 085c6481058e0ccc50934eaef9ee5fe97666c067f847eef8f569af8d5f4f41fe5934d77cdcb0679f24a4ba411bf1885e03c74f365919080e86a4f8a434d2da8a SHA512 13e51fa5ba4ce8e0ed0f81b0a1d16ba8be875a24c9e93dcc87f08724a151c90ff40c8a9e09ee69143dc4400f067a7de90324ddd5a90c8d33b1d818a716194e9a
+MISC metadata.xml 476 BLAKE2B cb4b4524b417cf9ab8938074443a4d1519ab16d90d459878b45fdaadf46b75d4454cc6718a2963fc14db0948ada0cc92c89e53ee9a830f43228b54c12cdff28b SHA512 a3de4e446d11e115ff85062a12866ebc5988079eabb658927fe2f319df5b0e944ca751d1070b051f44733ab22533496b2b006ec831b99e04f81fef55900cab6a
diff --git a/dev-python/pillow/metadata.xml b/dev-python/pillow/metadata.xml
index 270281456096..c3f74b982665 100644
--- a/dev-python/pillow/metadata.xml
+++ b/dev-python/pillow/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>vdupras@gentoo.org</email>
-    <name>Virgil Dupras</name>
-  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index e2ca12a77fdf..9056fe116fff 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -2,7 +2,9 @@ AUX pygments-2.2.0-pep479.patch 1669 BLAKE2B c39e582d85d5903831749ccf563b13a88f6
 AUX pygments-2.2.0-sphinx17.patch 645 BLAKE2B 07601a0e952d6e5f978d111a273bfe8c6fa6489e23acad4f61beb535e37aff1e3182a5317ab4e424a1b632924bb3c1b3562aefda17b638aa5a367d861f164c64 SHA512 937ce1168ab488387918220995f1f32e4664a505af3b6610143af15b6cfd3bab1d1fa4a0dc54c59db2ce0775edcc762f70ff948f8bd4e3bbeceb14774d30f287
 DIST Pygments-2.2.0.tar.gz 2113944 BLAKE2B 58d5f2fa0e6d97f5b7d7a17314b82ef219f23b72f8da49b4f8ce9b892d54ffbc1b490e87e87efe8d727dab297f775d0d8abfc4a31a734c5a7f8df885e5eda82f SHA512 cc0a4f73e19fa6cbf46314de2e809460c807c631e39ba05cbe5edb5f40db1a687aafcd9715585a0ed45f791710eb6038305e273f282f8682df76f30e63710b29
 DIST Pygments-2.3.1.tar.gz 3124216 BLAKE2B 99a5f96a2d2f9deb1a6b6ad94a21ab7f517cde47b1e91b67ce594732004cf99db51b1240e0270473f87f5d8a435172545b9fa3449a2ddc113faf5aaef6c34f73 SHA512 2c36cb42f8dd62e04b7664b5e87f951a8428ccbb6dbe5b5b43d8c7e6923ada0ab55a231bb8e9ed79eb5a85344ed64d3acc8e7bc991ab1f49c58eb612b8002c1e
+DIST Pygments-2.4.2.tar.gz 9405880 BLAKE2B 20a955fce2b06ab12bd4ede4da9308f1cc5f2286391146fd83f3d598cd38ae66e7df3c1d779c8f6f5de67ad92d032ff02fef8f41141edb007e2f24d3586d82e6 SHA512 c8f378700e99d9e5701ac7e27363921dbabab50a910686aafda1e016c813e99915fcfeed8298323b9b681b3d81f4265ab9a5bb75b8cdff0668c9eff745337b66
 EBUILD pygments-2.2.0-r1.ebuild 1617 BLAKE2B 12203987ca08ccd71d28d8bbfcf1a5bbd4a91f2c9ba2418f6cef611b1735e4a42815d63d731b8d42b5bf6e0104f9078662bef9e03394e62a190a5a954dd5ba98 SHA512 a5a31baec8484f8a30aa29207f6f7ed5ab3dd9819510915a396a624426305d2128fb593e611bb984d18a8a6471a1c151341492d7a5f8d15436fb0854dd4c41ca
 EBUILD pygments-2.2.0.ebuild 1768 BLAKE2B 09ad9ac25d4879a54c59ea4dbdbc2699229d2bb150d81a4ab6a8ce6ec567ede12c5f2a341ca69532459c8510324612da1d4a77b2e7bf2132f7b09084b5b1bac7 SHA512 cf4bf9e7785589231cdc8c31e5ec86714b99c65bb8c71dd0c6defbc2e75d3be6f84429562c727e75e3d5a0149f13c300e442aec19d255c00c57a3312dc111186
 EBUILD pygments-2.3.1.ebuild 1432 BLAKE2B 559c78518805b1a66687cc53ae858f4143ef355647c116b339b4ec188ccf440723c57051022f6d198b7bcdec33c1d206f6055c899628046ec181b448b3d67ef5 SHA512 7753e8558e0252be0204815372fef692c046da229ed019a3c700ae592628d457913ee2ea02a81b61eac1b96bedb6a1a9277ab28f64ac0acfc01f782d3a2b0d06
+EBUILD pygments-2.4.2.ebuild 1314 BLAKE2B fa63d9ab360809b8d5ebb7ae45d653b7dd1f3838c2165813c8b2bc0015eaa7d5464588bbac3c95a44e664b9b547b3d6023918451b228f2ea2334fc4f16a8ccba SHA512 af07c65f0a9cb0d8b5cb5c61c96ce6dccfcea86164d00c5c8916ece0827c5cf06d19d0e765332776c32fa921a10704d84cc01311c36339eecc226468dc9be69e
 MISC metadata.xml 542 BLAKE2B 88e44c4b6f29e096e67521c621724d1a5415d089f73612fb8d02ee714a4af1e8080cf98542d7f0c9b1331d919bbeba31b1fa8269a28cc1be841af069a497d889 SHA512 f15732bb743ed5ad4049036c7b87118c89be09e260ae483b4c7e25155a31c0ab8844f8a1050386a0ee81d2b1e55d240f90cab3e28749b8f943baf64ec176814b
diff --git a/dev-python/pygments/pygments-2.4.2.ebuild b/dev-python/pygments/pygments-2.4.2.ebuild
new file mode 100644
index 000000000000..490a253a0d40
--- /dev/null
+++ b/dev-python/pygments/pygments-2.4.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+
+inherit distutils-r1 bash-completion-r1
+
+MY_PN="Pygments"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="http://pygments.org/ https://pypi.org/project/Pygments/"
+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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		virtual/ttf-fonts
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	cp -r -l tests "${BUILD_DIR}"/ || die
+	nosetests --verbosity=3 -w "${BUILD_DIR}"/tests ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+	newbashcomp external/pygments.bashcomp pygmentize
+}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 94e252f54c2e..ceb90375c712 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -13,5 +13,5 @@ DIST pygobject-3.32.1.tar.xz 551708 BLAKE2B ba7c34e4747d6a11424a23195f71877ecbd6
 EBUILD pygobject-2.28.6-r55.ebuild 3537 BLAKE2B a5b8ed9f09176314ffd8584203f5688399c9aa4320379765c0867c4605e38d2fdfc51986b58960465506e36b70260afdf48e68d4de385b4ce0d0113a20309d40 SHA512 c605ab80a65d3a8e71669c22675b4cf54cb94fefad28126df05504e84b0d867bb5608952c0b0e161df4c8895c159159035622919b9321d81b1f26b34ea677b0a
 EBUILD pygobject-3.28.3.ebuild 2781 BLAKE2B e61485d38a4ecb0fffab6b2be57ab6eb7f73b7b3d93a3dc5b6053a590b3dc5b8808e015ee799e97e385af58398312c9d4eaf3253ea8edd443e68d7240ee681d5 SHA512 26d77d8707389f991564abcf4367cd8219d41161eff8a8e0a780d40fb678e204ad8873e25813b20fb797fd7a07ac41b32cf2e6f9fe7fb6551ea5628a47bac6b1
 EBUILD pygobject-3.32.0.ebuild 1799 BLAKE2B 30ce722d41ec0cfe78a21bfae59657bbb7c0b247e23ab33753f69922ad236d9939fadb5a51f6d30009d116c5eae973e180bf6ba4d06755e8ad2edd084730ee96 SHA512 3ed9eac4109e19cff59c189da5c04cf53f4ea7f63dd828b5a95b91bbd306f1c5b41eda1cde0a68361cf58da9109d2a9c5f3d0547409e83a4bb92c041a2e65f35
-EBUILD pygobject-3.32.1.ebuild 1801 BLAKE2B 393a2f7d9df36498b9f37ae206564370101eed3d7ca2108c130ee1564707820cab078d8e704a4c0c62954ee7a38c232f952fe6da384c86367ebf5b5c3db5339c SHA512 5e398fd87ab145f14675e5fead1cc4531b8e800fc8d67fb83603fd20de34784ebb14801d701e06da089be1151db234d7b1e169f57f28e76a5b863e93c904795b
+EBUILD pygobject-3.32.1.ebuild 1800 BLAKE2B 2eed3a626f58d89d8ae19fbe605d34592c05dbfabce32cb7f5ae3ebb93c7f44137b0e2b009fd888ae43c948744144ac8d87f724e87dcec6eede4f588a1b64031 SHA512 54ae349228c42e80c9d7f5562e2bac2ffb59a0ee1566b2d3a962c1eebd2ecc8935746645249c4bc2da603c521ef88f44117c44c9ead20f238dcbbed2c19dfbe1
 MISC metadata.xml 1220 BLAKE2B 4f2d4f1091eef503e2ca7457418888071d70509e346ded7c5e77839c8e5e6dd1c27957e6645a7f32bc7ba0810aff8a55874e7225f7a9e7674e4c1bfccee2ce1d SHA512 991d11e7aba9fc7d6ccd6971a150d50ebcd397968a9a2c2c901093f598acfa70eb8719a3a590c10433147fde97603012862fe1fc613f766ccaa2a159705a6ae6
diff --git a/dev-python/pygobject/pygobject-3.32.1.ebuild b/dev-python/pygobject/pygobject-3.32.1.ebuild
index 153570a2301a..f38a65845a7e 100644
--- a/dev-python/pygobject/pygobject-3.32.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.32.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index 79c53d71903f..b77d81e50dbf 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1,8 +1,5 @@
-AUX pyilmbase-2.2.0-configure-boost_python.patch 782 BLAKE2B eaafa48b991524400c70f9c6c156ae8abb5dc25132dde1f001b8852efc7fc6187fa27aec533c0022d15efd1ba60342c051f071d32582e0675838a8a20c8593dd SHA512 ffbba202eea36a14a9734633a9510632f8859bdf4f9791f72f020c9600a48a1941e58ea74d5f6b2b9b1e03d874f04cb6e9f5e8ef9cbcc5cd604e0b33ce297772
 AUX pyilmbase-2.3.0-fix-build-system.patch 1169 BLAKE2B 6afa0faf264ffb4c863a148684d162ef3154fa2802cffb2802315933e5df4781fc24d9fca23a985627a29d123a53cd4d6815beaa3b56487cace67896a22ae57c SHA512 691cdeec3361954fd41c085b38f8ec3a2a6a024ac174aeecb2b32df83844c3e25dbffcb3905b91e0b516eea6ac4597a067bb9ac794a25f5d1ac8502094b4095a
 AUX pyilmbase-2.3.0-link-pyimath.patch 454 BLAKE2B 5e2bc6d09bb7012f8d0087aa0d76b8a89280349fa978cbf926cd9cbce1b2b611a6862d73da35642e037ba84161e658915831e63ed9aeafac9db5669e38e5c4f4 SHA512 760a217d5af2e8de48f52351bab18370f3a74453135a401d8f5d964d3c445519ddc41a853c989c4f29d492764e42dfbcf4a8bcf839e43164b4bbe3e125e9d1fc
-DIST pyilmbase-2.2.0.tar.gz 469927 BLAKE2B 74a806f30bf8881a4c58135110c3e805b9748074eab08e9afa17735630ee7de16ffe6a797ced926bb93d122eafdeb04c5e6e80ddba1a90bc551cb87ddeb30671 SHA512 111deb65a73b4d0454454d4fb64d09165fb25aad2e5714e35510c2b7ef301dc8765041de3188c2f89c9bd2770494a55a24372953fcda8dcedb23c401137e4344
 DIST pyilmbase-2.3.0.tar.gz 524975 BLAKE2B 7c3114921392ad29198025c672c366e6c98d2da968ed213ccfb446533b81fae4b78c687aba2108e476e16c4e97f11924799d0b0474ff3f82f17632f886bb6a39 SHA512 c20c26155315f2ae38efc183e5f33e2c18610365f5f1bca7a50363a005ff91c8782177293290ea037cf5f164f9b404f5710ce3cccba862e5e7f830727753589f
-EBUILD pyilmbase-2.2.0.ebuild 1129 BLAKE2B b3876947d8104e5dca92dc6e02780228b30c5c3b3fcf0975b8a8876b3b48e8f95990d16b1a94101626d439972128e0c4f0d901d847a93468f88592e92f0855bc SHA512 abe726f6a70ee90242eee1a9b70ca8386e09a1c7de32e30372407cf4c49ef653e260f392b15407f7d13d76b737a424699d72d0c35f92793c470bddeedbda3e65
 EBUILD pyilmbase-2.3.0.ebuild 1427 BLAKE2B 5b353ca731b5efbbf90313789a0540fb469f3c1665359bde264b837703fe0c7e16e82ea3005447216ad2aef00609e1f0b527ab254b9d2c8f6c6e1cad4b36afe9 SHA512 b4a1cc005b53a03ddea0bef680591ea1eb87e231ff6a6fb898f8a104c67c6b08d9893e7b4e20d3c4be73b13f1316922375679a79e24f06303375036d3a876518
 MISC metadata.xml 537 BLAKE2B 88a1d7d89fac2094eefd766ad23b01c12cc49bff080e83f6ad63318294c97b18ecd83c6d908979ae8345a6601898b7a01295d9db886f0de500e460129d9c4a6a SHA512 c685de970979ac4ad5c3392a4b41b23bb523da5d003e3f6757a8d61fbdf0be1ea2bddc1a756176a9887101cc5bd6e19f5ac7e038e9dc9e5976c676a8817b9a87
diff --git a/dev-python/pyilmbase/files/pyilmbase-2.2.0-configure-boost_python.patch b/dev-python/pyilmbase/files/pyilmbase-2.2.0-configure-boost_python.patch
deleted file mode 100644
index 897bc02baf90..000000000000
--- a/dev-python/pyilmbase/files/pyilmbase-2.2.0-configure-boost_python.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a4d6027..edfb49f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,7 +76,7 @@ LIBS="$LIBS -lpython$PYTHON_VERSION"
- BOOST_PYTHON_CXXFLAGS="" 
- BOOST_PYTHON_LDFLAGS="" 
- BOOST_PYTHON_LIBS="" 
--BOOST_PYTHON_LIBNAME="boost_python"
-+BOOST_PYTHON_LIBNAME="boost_python-$PYTHON_VERSION"
- 
- AC_ARG_WITH(
-    [boost-include-dir],
-@@ -90,7 +90,7 @@ AC_ARG_WITH(
- 
- AC_ARG_WITH(
-    [boost-python-libname],
--   [AS_HELP_STRING([--with-boost-python-libname],["boost::python library name (default: boost_python)"])],
-+   [AS_HELP_STRING([--with-boost-python-libname],["boost::python library name (default: boost_python-$PYTHON_VERSION)"])],
-    [BOOST_PYTHON_LIBNAME="$withval"])
- 
- CXXFLAGS="$CXXFLAGS $BOOST_PYTHON_CXXFLAGS -I$PYTHON_INC_DIR"
diff --git a/dev-python/pyilmbase/pyilmbase-2.2.0.ebuild b/dev-python/pyilmbase/pyilmbase-2.2.0.ebuild
deleted file mode 100644
index bf77c879e00c..000000000000
--- a/dev-python/pyilmbase/pyilmbase-2.2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils autotools python-single-r1 multilib-minimal
-
-DESCRIPTION="ilmbase Python bindings"
-HOMEPAGE="http://www.openexr.com"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+numpy"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEP}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-RDEPEND="
-	${PYTHON_DEP}
-	>=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]
-	>=dev-libs/boost-1.62.0-r1[${MULTILIB_USEDEP},python(+),${PYTHON_USEDEP}]
-	numpy? ( >=dev-python/numpy-1.10.4 )"
-
-AT_M4DIR=m4
-PATCHES=(
-	"${FILESDIR}/${P}-configure-boost_python.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf "$(use_with numpy numpy)"
-}
-
-# fails to install successfully if MAKEOPTS is set to use more than one core.
-multilib_src_install() {
-	EMAKE_SOURCE=${S} emake DESTDIR="${D}" -j1 install
-}
diff --git a/dev-python/pykwalify/Manifest b/dev-python/pykwalify/Manifest
index 6f000c108ffb..39a467a27d0a 100644
--- a/dev-python/pykwalify/Manifest
+++ b/dev-python/pykwalify/Manifest
@@ -1,5 +1,7 @@
 AUX pykwalify-1.4.0-S.patch 862 BLAKE2B d92c4e8d4d85d28f6df574bfe2f1ab0aa82c32ba8ce2b4a2d6ecdc21fe1db4056351b6aa6dde04d897525ce596ed492781bd7dcf0fba2ca5970a3af79a9abf3b SHA512 f7d9189993cd73a0412ef01fcb01a99fcbc61edc6863a1997333de085294b9c5772d026f7ab8f16703568404f2ff76bb1aeed760d7908c7865e0891ad5752dc9
 DIST pykwalify-1.5.2.tar.gz 42965 BLAKE2B a4c0479e12975e3b603c9293bbce04564415c07ffad88b54784aa6e723465c097f50a732bf2925833f80fc5e6c86cdd39b72ebd76f4b1ba118e9e2991e2dc2ae SHA512 1ec425f4a755dfd6e94b7e6ed098b49919e4d0de46c984e73c6452370ecb8898dc00cc383b01b27153b0d5e12dd6f5d1df4f6324e1e4f9413ed7a4d1565c5d50
+DIST pykwalify-1.7.0.tar.gz 69402 BLAKE2B ad2ecafad8457509a5517917cd3bbb078a244a9ef96e5560efc4f6b0c4a3939df7f20a9e3e72e43be97edb8af6315d49e2c2f3248aaf17d3c4f0962f60132185 SHA512 d0db48814712dc26eeac8f00ee0751a006c8b00521c9829e3c1a4ecedd6083194e9e28da1ed3c13eaff30d9b5c3dd1dbb499ba8864251400e34c23911110d848
 EBUILD pykwalify-1.5.2.ebuild 794 BLAKE2B 1e065ed2454610862033c4397a7eb8c0be6a9d1a0c3c3c77de9c288031d1ffce02d2caf94820a344997e996ce084deb3ac4353d98b90d070efcdf93a78a245f8 SHA512 397b0ad43f41766faef03b317c9d39abb597b7f0b3091b4d5d384f53fde9f06d8fbd28cf8777213ce3dac2cdd5e94b2c5c9d89dbdc959930cc6c8554cab3d709
-EBUILD pykwalify-9999.ebuild 782 BLAKE2B 04de1c0bc1eacd7ad5b6e15a74ca4b466a9ece541c5efa6fe7e03ef747d596a9db89a96b9d6432c6298e64dc6b65a6cad6e5475da5b2b83ef3cab92f31b183eb SHA512 01ac0086b8bfbb99bd96c5926edd89c30c0422c619da577e9cb1f0b091a08a4cb0d38f2f1cd2e2044e856dc7c789da669b58ce161a4d664c4fb074b822e99685
+EBUILD pykwalify-1.7.0.ebuild 926 BLAKE2B 19a5c0f7aed8514c5af28e196ea2f9733d5bb3a7449f521e8eccfb8fe12418173aaf0055ffea092c435f46b57b27cdf3be6d1efe712d217d83490682d01af060 SHA512 65392ecec25092160a853a179588f279393bba6350aead0f27750091cad571a7b2904015fbfa1fafbe47da07c42d09545260ae57c745ef1aaa3a00e4e82d637a
+EBUILD pykwalify-9999.ebuild 887 BLAKE2B ac0102b55feae4236b96f82a319deda7cd941c1d0bd2813751186c37592f32cecae2cfa59c26b266306f448766ad4f5e8e9f29a950c1f1797a7de54fca3affd0 SHA512 1d31c5b545f91413decc145aec44d988e706b22137d4b0526f86641d1ddd5d4a59d525b90473bc363f65d4f20ec9c5cbad73f10badc84800b944bc9e0232cb51
 MISC metadata.xml 369 BLAKE2B 8c31d9164a8a1c9210a56c2f7f7a604f2fa2bd4bd7de3047420074af8a19a63f12ec18f4d5c436aa28533ea9d7e15307ab99c114cb8a0aeea419ec1d185ea7f0 SHA512 a99ea380231e9e3537bc693c2bb1ffa6bc250ec086f88bfa19a7c7a8df04d21be8dad752535f8e89eee4fa989b79c38e998946a44dbd9bae64def2cd2e858913
diff --git a/dev-python/pykwalify/pykwalify-1.7.0.ebuild b/dev-python/pykwalify/pykwalify-1.7.0.ebuild
new file mode 100644
index 000000000000..f78bed72ab1c
--- /dev/null
+++ b/dev-python/pykwalify/pykwalify-1.7.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python lib/cli for JSON/YAML schema validation"
+HOMEPAGE="https://pypi.org/project/pykwalify/ https://github.com/Grokzen/pykwalify"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.4.0-S.patch )
+
+python_test() {
+	pytest -vv || die
+}
diff --git a/dev-python/pykwalify/pykwalify-9999.ebuild b/dev-python/pykwalify/pykwalify-9999.ebuild
index 60facbc65fa0..37c94c83063d 100644
--- a/dev-python/pykwalify/pykwalify-9999.ebuild
+++ b/dev-python/pykwalify/pykwalify-9999.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=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit distutils-r1 git-r3
 
@@ -18,13 +18,15 @@ KEYWORDS=""
 IUSE="test"
 
 RDEPEND="
-	>=dev-python/docopt-0.6.2
-	>=dev-python/pyyaml-3.11
-	>=dev-python/python-dateutil-2.4.2
+	>=dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
+DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
+		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/testfixtures[${PYTHON_USEDEP}]
 	)
@@ -33,5 +35,5 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}"/${PN}-1.4.0-S.patch )
 
 python_test() {
-	py.test || die
+	pytest -vv || die
 }
diff --git a/dev-python/pyocr/Manifest b/dev-python/pyocr/Manifest
index 8b569cfba9b6..fdfdbfbd04df 100644
--- a/dev-python/pyocr/Manifest
+++ b/dev-python/pyocr/Manifest
@@ -1,7 +1,9 @@
 DIST pyocr-0.5.3.tar.gz 18067 BLAKE2B f7e668630f0227d1e3df90de673f7c7b437f0c7ac0c5fb567ea1633df0184870d4472d5c2c4c48e7b65ebd8fa6516ae04409643910a527eb4a17ce2cfc00e504 SHA512 bc1010fab290e96a973dbdd6a4fe7ffae3bed0ecdf20615dc609e4a784faf9668c2673c2398626a3b08f1d840d1aa07661506d35343ae122ad2666f6a7107ba5
 DIST pyocr-0.6.tar.gz 17826 BLAKE2B bc7239a5a9d07f55650247d0586bc0856c8f0be6aa549d2816a3703559fffc8b53aee5e23b9e5a24a2e1c655d5c605c73dbaff9fd3129fe08ffbd6f24709b07b SHA512 f517f5c9180cd1cbf0faa56f733a8b6015abb4af25647f513f95022dd72ee0ba07350475b238dff810a35677278f457dfbf9448a50b9c275fa4f1aa08f4a4c2f
+DIST pyocr-0.7.2.tar.gz 65376 BLAKE2B 065084c19c7722e590c5f20abe5248b2be0c76dab864b4a4e2c457770ff61dec84df7254f19e4926753f39a5d1ed0618ed87827b85773ab96a51e3f7798c656f SHA512 002c3302ed20e19e06dc6fd995ce30150fb95650824df9e0a3d6b2bdcb4c0ae3f2295342c2df44e0d5a9c9bbf5432f47a9d7562e4866b87738ac3436a8c0dec9
 DIST pyocr-0.7.tar.gz 67838 BLAKE2B a5bb88ca981cf2bc68344d739ce35eaa7db26cae28c581cd72a7855e67ac668ea064ff2a71845ededa640a8e9a54fc0aaba464527cc43acea5eb4edf3812bd9a SHA512 054f3190eaaafea0e2b591af2220af519d8a2fe3c623417e4b84c52faf9d98339570e896983713e9fbb54087f5eb4afe0b1d6f56e43ea894f7206a7c17203438
 EBUILD pyocr-0.5.3.ebuild 679 BLAKE2B 8c7e4136251eac927fa72d7d12aaac341d6c77568cbe7a6a95123a8ae36a5646388fcd1702ec973fca97a95212734eb0f98d1769f905971a294e78cbd5a916f3 SHA512 8dc96807a2f6402f58dafde3f55ffc1b111426439aa1a29066c3439c1b30f126decd755217f245f41ecade68f5648cd8fd32cc48dbfc918e98ce8019c3339a7e
 EBUILD pyocr-0.6.ebuild 613 BLAKE2B 9aed7132d856272c881493af267fc50d064143d0e1a58e073ec6f0830ab0d7e72b49ba88746d01c99eb5cad9ea0acd4a2bac52854a439f1063e3426b0a83bf8a SHA512 64f07c267b0a89708f8cd22f8eaafad449a9de1491413e5306644b2e8b16527c02b711182a9515be4886080b3fc107552cf25664a5f332029acdb94d9ab80ec0
+EBUILD pyocr-0.7.2.ebuild 705 BLAKE2B 6de6a3cbbbed259dd59bacffc2667686fc1899036325d5f8faee0ab66f1ef6f2e7e5b2e1c946d2cda77f8bdbdc8fafe2154456642cf8f543a6e7b12e0569175f SHA512 80859eab7f6f3efe841f69acf3bbb46b30dbe8770ca5675bd862d47524fffd7593e5a833e5b5e5ba6754ccddc87b2c63e653c10d84580c0bf64cebd1a37efd43
 EBUILD pyocr-0.7.ebuild 705 BLAKE2B 6de6a3cbbbed259dd59bacffc2667686fc1899036325d5f8faee0ab66f1ef6f2e7e5b2e1c946d2cda77f8bdbdc8fafe2154456642cf8f543a6e7b12e0569175f SHA512 80859eab7f6f3efe841f69acf3bbb46b30dbe8770ca5675bd862d47524fffd7593e5a833e5b5e5ba6754ccddc87b2c63e653c10d84580c0bf64cebd1a37efd43
 MISC metadata.xml 1111 BLAKE2B 600c0dd7b6bd10906b03db7aa0963b440eb5cd8f2f06a4a8672e0f63960838881d735fb2268f652dcc1a4bf865fb71eef6bba888c0ee72c88d472c0184c80889 SHA512 ff3ac9646095f8434423a5fe098563c7662dc447be9ba395879d5b66dc76236898e94964cfc2f5034b2bbd08caecc3635adec65369dbb5c21ce1ae2e23fb7cbf
diff --git a/dev-python/pyocr/pyocr-0.7.2.ebuild b/dev-python/pyocr/pyocr-0.7.2.ebuild
new file mode 100644
index 000000000000..07ad6371df5b
--- /dev/null
+++ b/dev-python/pyocr/pyocr-0.7.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="An optical character recognition (OCR) tool wrapper for python"
+HOMEPAGE="https://github.com/openpaperwork/pyocr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+IUSE="cuneiform +tesseract"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="cuneiform? ( app-text/cuneiform )
+	tesseract? ( app-text/tesseract )
+	dev-python/pillow
+	dev-python/six"
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]"
+
+REQUIRED_USE="|| ( cuneiform tesseract )"
diff --git a/dev-python/pyperclip/Manifest b/dev-python/pyperclip/Manifest
index dc41a472687c..03ebd4fdb5e9 100644
--- a/dev-python/pyperclip/Manifest
+++ b/dev-python/pyperclip/Manifest
@@ -1,7 +1,9 @@
 DIST pyperclip-1.5.27.zip 16938 BLAKE2B 653b2e74b6f56839ef1f9d59b864218ffd55866660aa7de4284f0bab4c28b0c1aa7a4a65bce0842003d4744a5d40c87943e05bdea13098e250e534a8cb6c2132 SHA512 cefd79f1d246c9aa9d4d0f3d8cdad291ad31bcc2e000c83e5e05704978bbf7b9b45d49667c2e88305d0a5d6baaeacfb47b26bb69fabf89b6b6e3a1e6f1e23d74
 DIST pyperclip-1.6.0.tar.gz 14273 BLAKE2B e91f198d23eb0791dc610e4b9af940694f0857243fbf5caf46d485882a588e3ab537e2a190a1b40e0d9ff4821c8bf977da19559a5b33694d106a68f1001f61a9 SHA512 faf1cd8568a911b263c167fedace8f5f6756e108e3a2484dffa8d3da441311fb3277fd703d5eaea662181250d7b2cc975e9f8ca484dfa2d1cd4470171bbb972d
 DIST pyperclip-1.6.4.tar.gz 15687 BLAKE2B e3520e228bfe2f2de1d307e927f15cee7e5327acfe07071432605d0c0c021ff6bb702e20a743da8120db58fd12a05fca19f5881e80851f41d2cc1034e310f6fd SHA512 4a07476b96fc704551248eb4eb2d69a910f75c266ef0adf4bf804f8694645d910089cfef831569e1d819570873ee75c4339024a89c56fe3eabc5529d07b8a540
+DIST pyperclip-1.7.0.tar.gz 15977 BLAKE2B da1473f71bcadcc6dcacdfb6d1a1447b055eb1aa7b31fad76bd3a51245ad9b1e512335f9799d7d416a53b8471ab66c28afa5f9d3f3ee2b39e85d9c239a7e2c79 SHA512 7f22227ea894a236703f61ab950e198fab969fac5713ca8eac6df213183a47a244add88a462b9ddf63ed5bec36af5bc2578949f01ed31e0b63316d1761a935bd
 EBUILD pyperclip-1.5.27.ebuild 476 BLAKE2B 2b8f0a38d32a5879b81933e549f5a5dd41bbb4bbedcf17a20fa3496c9f095ee45c448f8f9ca30c0ba4df4ee460cff21cafebdfbf52301001234a6417f918c429 SHA512 bf7544a12eac638e0640b8497d1cf9c76015170a07bb7081b20ab7273eec18ea015c2d699abfabc2d323f8aaefee67ae756fbc22f45beecf4c2faca6b02e5a6b
 EBUILD pyperclip-1.6.0.ebuild 472 BLAKE2B c6d3caa29cd21b94bea656ee9f6b173fe54810fbeeb94620dc43fe6033372bde10fb0304917dd84edd096e0630ca6c2cfdf6311dd28fd8889ebc00b1e4ce8e59 SHA512 2977f1aa723f057a0c5f24cdef8937117638d2f11690df518b87eab8bc43482134f665718b01749f2e28923058a295e674ed7da36f5a7e66047f5c94494e648e
 EBUILD pyperclip-1.6.4.ebuild 463 BLAKE2B 94f2f385c34bf3294051bbba3bf99ea0cb404508d34d0b52019fd42f06f927d0d158a0395e579d57fd64c033dfd7fefcb327a5da546246ce4406cddc185f1cff SHA512 e3105ba6d7c3c6784cc6afb3b2d2728584e234c440153821c085e6bfceb3eb0fbafc6795e8f71f7c5985a8460640a05a392d1a45b254512bddaaa7f6763c49c0
+EBUILD pyperclip-1.7.0.ebuild 822 BLAKE2B 1c14a8f875a2eab710dc179b24e199a604a08242f90397ccf165779013b0f04c572cb8bb7b1775ecf51f74842806ce39c38c9ce1f8697f29a849419ee1027754 SHA512 7ffe2b90d9ac805f6f1e345fd873cf626d7bb63f3fc8d5196650d041cdaf78438a7c028e777fc6a13d32dc3b72355c5da9c79fcd21724ada481ffaffa3f1edfa
 MISC metadata.xml 430 BLAKE2B 0010f6ce7e189967ada83b89ea6449d6d4a894f9a04a649895f46f9d5af3349bc2b97ecbdb1e6f32a35c4ab3caa97c2799a950d6627e8225b0170bee943d6950 SHA512 883b80ca383707db508144d0434f091827e1809c9029a380c9369f8f98d920e69653767e9034eadeb730611601a0fbf09a222a45e015e08ef95c7fb54158d228
diff --git a/dev-python/pyperclip/pyperclip-1.7.0.ebuild b/dev-python/pyperclip/pyperclip-1.7.0.ebuild
new file mode 100644
index 000000000000..6b173121f867
--- /dev/null
+++ b/dev-python/pyperclip/pyperclip-1.7.0.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} pypy)
+inherit distutils-r1 virtualx
+
+DESCRIPTION="A cross-platform clipboard module for Python."
+HOMEPAGE="https://github.com/asweigart/pyperclip"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	|| (
+		x11-misc/xclip
+		x11-misc/xsel
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pygtk[${PYTHON_USEDEP}]' python2_7)
+	)
+"
+
+python_prepare_all() {
+	# make tests a proper module so setuptools can find the test suite
+	touch tests/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	virtx esetup.py test
+}
diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest
index b0550f2d7807..e864e48966e6 100644
--- a/dev-python/pyro/Manifest
+++ b/dev-python/pyro/Manifest
@@ -5,5 +5,5 @@ DIST Pyro4-4.76.tar.gz 477132 BLAKE2B 49621974ecb485e1809366d9933ccb1027d62bfc82
 EBUILD pyro-3.16-r1.ebuild 704 BLAKE2B 1270e3906b70a94640880fde94d51122843def778a244791c095dc4a353ddc7794d0494087f013662866f5703ad505ab133ee8ef280dc622aa90a09de1c63618 SHA512 6bcf4f64cb78d82e0d682c7e04112a127228e1aef9abd4977db00136d2eaf68c6a1d78515f71f6dbfd452b2da1737a15efaf67d5539641e2f7ab874b12207d58
 EBUILD pyro-4.41.ebuild 1872 BLAKE2B 51de78b3672b040abfc65da0b245510085e8dd051d59152a4b901dd4e7fa9e6cecd801c5bc17d5898f7acbf5b80c6a065ee033808aaacbd321149fe696301ae2 SHA512 e7ed9d0c300e62123b0b58b959ebfdee5097c58df9fc8cecdf62a548eaffbea7766eddd556f5d21af15203ce4194e676b97b39deab74a35fb7f4463985e03afd
 EBUILD pyro-4.56.ebuild 1872 BLAKE2B 509bbac0dac628598e27defe07f99ca6a025ca5d23522f1ed0f87eb24d069b32ffe3002b81d0afb86b18c93960c5e72d84c34fddb1a44c539652ba1a5f02ddaf SHA512 b7f57aabd06b9a21e5ee18c2012385d9e15e1d91b3668d19cc03f13af5f93ffb8522d5fe69107e3f01832b9e860094fd6438d48f8be22f953dcff87e1b746b9c
-EBUILD pyro-4.76.ebuild 1440 BLAKE2B 06cbc35ed39d8296a6a519368e30bbf1022f2a86d569d06055035452e94daad1adf3681ea53610fe1347ab2e7c608b040ddd77de8596c649522b8e839c3d1317 SHA512 bf504b1b66bd0390cc94e500859b72b8f17e0cbdb3198802e236b182e2906c02808c1aab602ae8f9d8f3c0ba6a53d0eead47476b31c5b72f58e06323835c119a
+EBUILD pyro-4.76.ebuild 1447 BLAKE2B e9a227ced99e8cc89e7c1f6b7b1c6a313f33d4aa897b1a088ba318d77119b47340ac33f7243cf404c241c75fbe614d7e50ce52beb2d4d23baaf28b936878f3e9 SHA512 fc944ec9458bc5f9007c1cf61c6058ddede1312eb8689d914d736fbf44966b55d5df5372406a946831bf40722d704c097dbfcaa1c6819d353289be450b7fa1ac
 MISC metadata.xml 370 BLAKE2B bf0ecf2b63d7e544a1193349f0d171d107d23e66a067012cdd0ecbc4b736631e3c78fabc0745e88efe711219e8c3ce187da3ac67f4477f8bcf4996546a56a94d SHA512 59ce12c791648049dcaac68c75f9d8af472635442b25c4ba81b37e89d913b5b1954dbc40eac44694e5093008cbc41256ef2a177de1906598bb876ab0ab17d544
diff --git a/dev-python/pyro/pyro-4.76.ebuild b/dev-python/pyro/pyro-4.76.ebuild
index 4df5e84f0a4e..41ddd249dd2f 100644
--- a/dev-python/pyro/pyro-4.76.ebuild
+++ b/dev-python/pyro/pyro-4.76.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 4575e3a947cb..357907eb7407 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,11 +1,6 @@
-AUX pytest-3.4.2-pypy-syntaxerror-offset.patch 996 BLAKE2B ff6d362d20f6432f73956e1aee4c2bc596e3d8e3347da3624dfd3cbfdd1eabd8872058737e8f9b558f3570878756c7b87a65514956b1e81235c2727e8ff2fc63 SHA512 4a28ddc07389aac79e46528e85229aba126a89c27b7bec73b406766be49f5c8be9bdc2cb3158bfb475b4d6371e2f33960e1ed154e3b9eda15aeb8b151f3d2148
 AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a0124dc4f35892b18ecbcce34280a00774012822fced0045ac7113a50f8f88d042b88e404dbf4d8d3760140c66a48daa3da2a44c6 SHA512 d34d7c1db57804f0d1ff71f3f51c9a736592945fdf564f54c0c20c398c86f08616eb21f75d77457a71738df4d254ec3d69e46aa3378dea6f7913933bcdf45c08
 DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f
-DIST pytest-3.4.2.tar.gz 812719 BLAKE2B 96623d6cdea4bd79778175c18c949938505f1862010f700f9a8cb85f445910381af391a5b69e664fbbfc254bf46502c798c72026772070236a0a3bca7aeeb3d6 SHA512 787065ab76d4482799bb2da9f024c9c383e68cc1cc01f3b80f6ed9444ca6383d20953615696ed4dd01668777b094cf5002b23c4ce51828879dcf8ebf2170c71b
-DIST pytest-4.4.2.tar.gz 932427 BLAKE2B 89734bc49bbfb40de1e613678682e3c5994e1991abfa6c6aac5e9d67c58db874a91c03c05ab15cb1b70680289b409db6546c3540d33a50791a882be0e2621e2c SHA512 14a5a93fef129f58f37686b39ae1bfa3a32bc81f7ee83b6f754e0d7f18e85c0c7f44f12651dc9b3eb2ff62ab4aca5665b33e1c319051c7d8e3d5e004047150ec
 DIST pytest-4.5.0.tar.gz 943607 BLAKE2B 49a0e91fda7f4231fdd39f90eb2daa344d3034c10faff221330ea0ae7482a2a7d0fb9443a0a264db00f1d92568d5a6005cb73e07d8643b46906f7ecff831adcb SHA512 cbffc6216f83491b1de241058315c116697bfaa5206b5f558192a7f861d43dd036d30d0d689bedae7bdee4f0258dd19ef5827c356e11863dd596a5fabe8249fc
 EBUILD pytest-3.10.1.ebuild 2442 BLAKE2B 510febc15eb52b5e5c6b66c1849ae23911a88340172027a3c92dabe68de9e49bad4dd10265b9bfaace126b8ef61b9b9dfbe758c264d75c900ab5852dd30a9443 SHA512 ba012c44d8ec1981f36bd95c0ea17570bf64ed28ba51194be772be382adb2b1e239b2556a8549794deda4916ee94dbbe3cddd6aafc13f3d5607f2c8ba59bd5cf
-EBUILD pytest-3.4.2.ebuild 2521 BLAKE2B 7948419947d7d350f32457db8f35068f8aa1cd468a8009ce9079cb3141c78cf306cb3516dcdab00960d0507179503f45d3fac381acdbf306a8fcbb8edfc62d79 SHA512 a5ab31e0ba04e0ff0aba3c98ad1b961eb061e85092cc9b852569584b82a7d0cc9d3868f30904554abcf72f30515ce599ee9a396cc928abe2d14c9fb94df24f2b
-EBUILD pytest-4.4.2.ebuild 2103 BLAKE2B c24c03dea08c082154dca26b9a5d7027efcfb87a9b027fbd3397f087e3a64dc1676e49b8586572b65fe2ee61643639a3d123d6b6564a113fb6b1bc50a5b97d82 SHA512 1536b43aca2fb115f3f198b87591a191ff289540ca622e645f18e4583ed76e1a2893ac3d58ab4397426b7e21bfb5d140ed5ca4b34fd3797432e6ed53cd42a46f
-EBUILD pytest-4.5.0.ebuild 2054 BLAKE2B 4421866033a8df11789934608511a116c06faa5aa1a2e50f450e4f13882657f65b5ad00ab4e3903da2bdbdc03a5852f668df16d68993aa85cbe68a83f3edfe97 SHA512 334e9e67905b4a5c934f4f43fd38b555547583a3321f95e51c4046e03f22b00052fa958d8e6360af437937ceccbd672fb7b8a337ed3bcfc4668065a2f132ff84
+EBUILD pytest-4.5.0.ebuild 2060 BLAKE2B 1bf5a649b72e1669d37596900fc81264b99c0654c9218635a4fcea4254fd5944cf74a8640ff34a9d359ca236d252d9aa00a0820b3084f42f183913e9a6df6ab3 SHA512 1c4c081301e3ff42caf703196aeeb9bcd377bee18aef182a2c2d499d567285437305c06c0a02f0ce28ff99324af25946b310f8071c6330bcc7ac79bd163ac1f9
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/files/pytest-3.4.2-pypy-syntaxerror-offset.patch b/dev-python/pytest/files/pytest-3.4.2-pypy-syntaxerror-offset.patch
deleted file mode 100644
index 622be56b4e50..000000000000
--- a/dev-python/pytest/files/pytest-3.4.2-pypy-syntaxerror-offset.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://salsa.debian.org/python-team/modules/pytest/commit/405c05a0827592515de76e23c94de1f7773273e6.patch
-
-From 405c05a0827592515de76e23c94de1f7773273e6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
-Date: Thu, 10 May 2018 11:42:56 +0200
-Subject: [PATCH] Fix PyPy SyntaxError offset in tests
-
----
- testing/code/test_source.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testing/code/test_source.py b/testing/code/test_source.py
-index fcce3fa..22278d8 100644
---- a/testing/code/test_source.py
-+++ b/testing/code/test_source.py
-@@ -117,7 +117,7 @@ def test_source_strip_multiline():
- def test_syntaxerror_rerepresentation():
-     ex = pytest.raises(SyntaxError, _pytest._code.compile, 'xyz xyz')
-     assert ex.value.lineno == 1
--    assert ex.value.offset in (4, 7)  # XXX pypy/jython versus cpython?
-+    assert ex.value.offset in (4, 5, 7)  # XXX pypy/jython versus cpython?
-     assert ex.value.text.strip(), 'x x'
- 
- 
--- 
-2.18.0
-
diff --git a/dev-python/pytest/pytest-3.4.2.ebuild b/dev-python/pytest/pytest-3.4.2.ebuild
deleted file mode 100644
index 05a7c58b0902..000000000000
--- a/dev-python/pytest/pytest-3.4.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} 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="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.5.0"
-COMMON_DEPEND="
-	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.5[${PYTHON_USEDEP}]
-	<dev-python/pluggy-0.7
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)"
-
-# flake & pytest-capturelog cause a number of tests to fail
-DEPEND="${COMMON_DEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-3.5.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.22.2[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-		!!dev-python/pytest-capturelog
-	)"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	!<dev-python/logilab-common-1.3.0"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/pytest-3.4.2-pypy-syntaxerror-offset.patch
-	)
-
-	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
-
-	# broken and disabled upstream
-	# https://github.com/pytest-dev/pytest/commit/321f66f71148c978c1bf45dace61886b5e263bd4
-	sed -i -e 's:test_wrapped_getfuncargnames_patching:_&:' \
-		testing/python/integration.py || die
-
-	# those tests appear to hang with python3.5+;  TODO: investigate why
-	sed -i -e 's:test_runtest_location_shown_before_test_starts:_&:' \
-		testing/test_terminal.py || die
-	sed -i -e 's:test_trial_pdb:_&:' testing/test_unittest.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
-		-vv testing || die "tests failed with ${EPYTHON}"
-}
-
-python_compile_all(){
-	use doc && emake -C doc/en html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/en/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest/pytest-4.4.2.ebuild b/dev-python/pytest/pytest-4.4.2.ebuild
deleted file mode 100644
index 9c6fd6af78f3..000000000000
--- a/dev-python/pytest/pytest-4.4.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="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/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_5 )
-	>=dev-python/pluggy-0.11[${PYTHON_USEDEP}]
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-40[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
-
-# flake & pytest-capturelog cause a number of tests to fail
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
-		dev-python/requests[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-		!!<dev-python/pytest-xdist-1.22
-	)"
-
-python_prepare_all() {
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Something in the ebuild environment causes this to hang/error.
-	# https://bugs.gentoo.org/598442
-	rm testing/test_pdb.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# In v4.1.1, pytest started being picky about its own verbosity options.
-	# running pytest on itself with -vv made 3 tests fail. This is why we don't
-	# have it below.
-	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-4.5.0.ebuild b/dev-python/pytest/pytest-4.5.0.ebuild
index aea581bd1ca7..9ac01361eb3f 100644
--- a/dev-python/pytest/pytest-4.5.0.ebuild
+++ b/dev-python/pytest/pytest-4.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # When bumping, please check setup.py for the proper py version
diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
index 9a46b049b258..ea27f8168b26 100644
--- a/dev-python/python-caja/Manifest
+++ b/dev-python/python-caja/Manifest
@@ -1,4 +1,3 @@
 DIST python-caja-1.22.0.tar.xz 288324 BLAKE2B 11649dc0d201e9bc0063ad8845ccf0ac7b474e87edce1938311723687253c73058f2411170897acf80e4166169ad2675afff171c31808b22269dcdf857954fa1 SHA512 36ac6feec8dbff345d5657d0bc9eceed7a58648c104ce309f20aaff18cedd8822fb8bc0c13662796d15391af72285fa3ae4185043cce9e471f22a2868f37cc2c
-EBUILD python-caja-1.22.0-r1.ebuild 1001 BLAKE2B a0a77984d74af9c1ad0f80c95b98d474c0305ef0dd5a520029ca4e2e5b09685fe0cbe20846a1dae01c0ab5c826ce4b4ab23cb0936b4199e1974c1daa43fde789 SHA512 84fd9fed1a8eea5913a78d586f3f815c00bde5b2bb671fa86a2b443b4993092288af72a82f7af22549a230b44028ab132f67f0be08ebee996b90796c08015629
-EBUILD python-caja-1.22.0.ebuild 999 BLAKE2B 3cc2daeef5a15ba4ff482fa0fa5de50aaf797687bfb49efcdbbc15d46031f085b2c0efb726f2a6e6489fcce2a3547eb76885ef0baad40f223fec72cf0d66b90e SHA512 cc97e381f50de131641571bd7d21deee8ebf6422fc659c5b271fbf3c6ec3723d976cb0c10745fa86d21272bec1f0a7476274add04276d875eb0f8ff63a107514
+EBUILD python-caja-1.22.0-r1.ebuild 999 BLAKE2B caa4ee4dd9219f17c0d0f3436d78ed62cdf0e077a991e9121b2fb3b184f47a6f4030d92cb94bf283901f8554d9e301858952724fb4b0cc1a0d4f47bde84d0e30 SHA512 be23cd7bf71fd21e8003fdeb27d12b39677032bbd858619b8aac8a1a2227b022c6f1577f007733058f3cbcfad1e456133e925fd4151e379dba9e47499a3cd91b
 MISC metadata.xml 340 BLAKE2B 38e2ec7c21175122fe4d2439ef5b70277caef629d7275055ae44146db7d9def0c2af3f4d190a7a4ac426ff6fe19f9cf5a707abf71dd1fab85ec79e5d81e1f075 SHA512 5892ee1cdadbfd6a93d5bea5a6232ce8351373df7a6037ed605a8d66c3367fb7afb39e1b4b31052a599cb1e7ea155ae818e9f8225c7992a21443131e98621b33
diff --git a/dev-python/python-caja/python-caja-1.22.0-r1.ebuild b/dev-python/python-caja/python-caja-1.22.0-r1.ebuild
index 2b856fe5ad92..079f91676488 100644
--- a/dev-python/python-caja/python-caja-1.22.0-r1.ebuild
+++ b/dev-python/python-caja/python-caja-1.22.0-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit mate python-single-r1
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 DESCRIPTION="Python bindings for the Caja file manager"
diff --git a/dev-python/python-caja/python-caja-1.22.0.ebuild b/dev-python/python-caja/python-caja-1.22.0.ebuild
deleted file mode 100644
index 957b39792592..000000000000
--- a/dev-python/python-caja/python-caja-1.22.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Python bindings for the Caja file manager"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="doc"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.50:2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.17.1[introspection]
-	>=x11-libs/gtk+-3.22:3"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	virtual/pkgconfig:*
-	doc? ( app-text/docbook-xml-dtd:4.1.2 )"
-
-src_install() {
-	mate_src_install
-
-	# Keep the directory for systemwide extensions.
-	keepdir /usr/share/python-caja/extensions/
-
-	# The HTML documentation generation is broken and commented out by upstream.
-	#
-	#if use doc ; then
-	#	insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
-	#	doins -r docs/html/*
-	#fi
-}
diff --git a/dev-python/python3-lxc/Manifest b/dev-python/python3-lxc/Manifest
index ef1993a711ae..790cbc2ba577 100644
--- a/dev-python/python3-lxc/Manifest
+++ b/dev-python/python3-lxc/Manifest
@@ -1,3 +1,3 @@
 DIST python3-lxc-3.0.2.tar.gz 27300 BLAKE2B dc4ba71b156eb0f257bf9d717f07f22afee3d00666601b709341d9091a1a75d237c174f613a93b6ecf7c69b4e6cc75187316e656a02a1d52f0e9970b8f3af6ad SHA512 2fc776decf6248be39f9e8a607a967acf180f3a07e45fadd6be4450f01caa4a854f217dcf7e81e27b5b838c2cea04ef09c8ab8b87c5be5091185bba2eb6b6d23
 EBUILD python3-lxc-3.0.2.ebuild 487 BLAKE2B bae27e4a694208ca3ebbabc9e7a3defdb4206f534009f2b90e7c7fcf38807fa93f6e16f27ffae94ec6b29e2a3a4dcfebf67b543b39ee4fd36c88a2d19d3eda82 SHA512 f60783dba4066631831e55a31d8aacd51c048a8fd533d263460ea9f504556f36eb898f61e81109bfbdab56dd8527d33aa9991704594e5d775651de6da988759d
-MISC metadata.xml 475 BLAKE2B 4542a3c6240d1afce6fc554a255ed7097ab9923879241e73a77e391be5ee7f6638aaeb5f28ee859735c8abe412c3e62726aa64d67ce744ee1805bb7375dc1d87 SHA512 9db5e045665924cdcd5aa9d843be61c602440d2a18328db38733091ed0050e3c21f14c280a49c1db1bdcf9ae095b7bc58e50b5f3690e092502da87b2b5fc984a
+MISC metadata.xml 361 BLAKE2B ac875639b7fd2af373b46fa94f9d89755785417ab97ad2b89c3d795aae4d64516fa03c4d65d0872cb1f8b78e320f53dd71995b2a8a97f14420ecc6f8b0feeeb0 SHA512 8930d025f9924645eaf87661d863f6a049aa15fd9f965dc0ed483f77c37354f0fa075d00b19677bdb038bc122311ebb890d321453e0073e106554fa02aa3a589
diff --git a/dev-python/python3-lxc/metadata.xml b/dev-python/python3-lxc/metadata.xml
index 168b59d5f4a5..334a9d8811ee 100644
--- a/dev-python/python3-lxc/metadata.xml
+++ b/dev-python/python3-lxc/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>vdupras@gentoo.org</email>
-    <name>Virgil Dupras</name>
-  </maintainer>
   <maintainer type="project">
     <email>virtualization@gentoo.org</email>
     <name>Gentoo Virtualization Project</name>
diff --git a/dev-python/send2trash/Manifest b/dev-python/send2trash/Manifest
index 334e18ec603a..19957292dd21 100644
--- a/dev-python/send2trash/Manifest
+++ b/dev-python/send2trash/Manifest
@@ -3,4 +3,4 @@ DIST Send2Trash-1.3.0.tar.gz 5563 BLAKE2B 54fe34a5f984ded219a3c17f0e06b74a2e5624
 DIST Send2Trash-1.5.0.tar.gz 10892 BLAKE2B 36b51f1859a3b40aa5d9b619491a13da8453ff6615e71423724131a2a88207665d3fbaeef49ecc0ff02b77738d02023c08543d8a759cc0807d74740a8af9b9de SHA512 3c08ef513e5707cd4ac82290b326bb19161222c7a84b8ffd494789ba9858929241f55ea55482947af464c14e32fea27bd92cd762a32a1d55e2daf2e21fd63172
 EBUILD send2trash-1.3.0.ebuild 616 BLAKE2B dcf1f7363c76916232db265f9fee4108da31b128d7943c431b9a10888d2edc81190856a0335ef1e5ab6b8166a271b3376ba69695fa068c00ba99a5e3e958f74d SHA512 d91f43d71d15cc0821891d1cee1614fedfc1b82e695950590c92da1d41549ef1e04dbcf3e71c7afd263a8bd7e83973f1617438a7fad025350f45aa118bb7216b
 EBUILD send2trash-1.5.0.ebuild 690 BLAKE2B 741f79918094127a8b83b7cf342bfaf27245c37d7bdacc4244cd9ffb8315f6915684830e393d8d9ea65753ad25adc4d1f0dfdf19d863dd0af6da72ac08acc5f5 SHA512 ab84e22b16a150c079b0d97c08118c7e652434ead58300af98b3ff58afe2f1d8857fca283f82a67928bdb307bf0e167aec53f2bdbd8dfc7589d523f2b4c4f865
-MISC metadata.xml 495 BLAKE2B ae16e355c25ecd42a185794076c1c16315e311a59165c3ca76b4452374d1347d075b626fb0c450557c3ac3e7dd200854ef06b1d45213ee80fc7c6ece4f34b357 SHA512 1c8d9152257865cf74594076405912a922cf3c564d56b6e660cce4615995a4d2809ce4e4b3edc30e35fdb5ac71ad4da2534bf5e242dc3f74cee7704c84ad5328
+MISC metadata.xml 381 BLAKE2B 5afbd1afb5fab636015e710ae55c2e7b6c9eb24d1ffe0418f4ae4c6d02befdf4d50922d25ae6dcd134e2f17de1cc5a7bcee0467cdfc03ac86cbf5b31d33153dd SHA512 309a92e88f854e9384519bb8a959025c97a8c75a7ee317a17d2c51c0a444b0fa008fd46fbbe07be3dd95ab2fc1930cfdf2a0c6df7ce68fc190610176f841067c
diff --git a/dev-python/send2trash/metadata.xml b/dev-python/send2trash/metadata.xml
index 0267c38bf914..9dd529756191 100644
--- a/dev-python/send2trash/metadata.xml
+++ b/dev-python/send2trash/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>vdupras@gentoo.org</email>
-    <name>Virgil Dupras</name>
-  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 38999d2c5222..848b1efbcd90 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,6 +1,8 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 DIST sip-4.19.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
 EBUILD sip-4.19.13.ebuild 2890 BLAKE2B 7e98f818a312f0f2f7267974687fd565785d55f52766dbc0f7112f8d8e0bb27d7fcee86093f1d791317002009750c9883e1688f56b7275f09046ed07c8b22d18 SHA512 71c635af1a2a9e9e05fe52e125e15e1e52e4e261d868617d0f4f2fd48f3049b138b966e7db13ec952f3efd50d6054fd5841c95ae9169e58c1745e19ddeb6cf59
-EBUILD sip-4.19.17.ebuild 2452 BLAKE2B bab80aaddf65f0ac19e475fc8c6cfb919d6a2697032f7043e32876d651b88d42af8dba1c895c6b47d8bd56052171c56b89ee0d4787975c3939dbd10f7bc42258 SHA512 ba18690557373894f037d05f53da2d699166b46de4ed03a5e4e239d047b04ad8961cfe6ac2bfa7e86a62d5ac2892d2ad6dc6f22a3e374aa9b83f50e83c76c20b
+EBUILD sip-4.19.17.ebuild 2450 BLAKE2B 713045900981e56d541090e9d0a067727372021fe2f4e7fea116fdf379d7565e7d83a853f0007c7ccef860e3694656b4c9f4bb9ee5c307fb19808b8f687377be SHA512 3c5727aac8c0e7bb90211bb9b554600bd2348016cbd55894bf63d4537f4ae5b0c204d4f4c78c8b66ee18366c521b2f36aac07521cdcb87bf5b92f48deaff4d8b
+EBUILD sip-4.19.18.ebuild 2452 BLAKE2B bab80aaddf65f0ac19e475fc8c6cfb919d6a2697032f7043e32876d651b88d42af8dba1c895c6b47d8bd56052171c56b89ee0d4787975c3939dbd10f7bc42258 SHA512 ba18690557373894f037d05f53da2d699166b46de4ed03a5e4e239d047b04ad8961cfe6ac2bfa7e86a62d5ac2892d2ad6dc6f22a3e374aa9b83f50e83c76c20b
 MISC metadata.xml 648 BLAKE2B f49eaeae5e37d91c569b93fdadc4401e478c54a754290ce37dd51d1d03340ead54f4d0f52389d87b91801a2c1ad0040347e629068a6c0ffe79a9e3442498e4f6 SHA512 1a2a4fb4e7fb35fb6177d62d5c866a5c65c1915ff38de5815823864fb6d9a90beaa8897e28a65f79770a621ccdd83755c682df29a25bf00a76ffd51b215dcdf9
diff --git a/dev-python/sip/sip-4.19.17.ebuild b/dev-python/sip/sip-4.19.17.ebuild
index cbfa17402c9d..ca5070f83ecf 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 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
new file mode 100644
index 000000000000..cbfa17402c9d
--- /dev/null
+++ b/dev-python/sip/sip-4.19.18.ebuild
@@ -0,0 +1,98 @@
+# 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 ~x86-fbsd ~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/tabulate/Manifest b/dev-python/tabulate/Manifest
index 61ce628c4485..fc48d9b2aed6 100644
--- a/dev-python/tabulate/Manifest
+++ b/dev-python/tabulate/Manifest
@@ -1,3 +1,5 @@
 DIST tabulate-0.8.1.tar.gz 45666 BLAKE2B f46a0c8bed50e37a2d536d28fe822fb92fbc124c7ac4c29260b6a7ab9828588f49b7e94ec8925505ef9724b1fb4647e5e9207d29b2f3a2f526641ac7ac229ce0 SHA512 f724fbabee53c738c846a5cf645470f5f97074e2b33eb030b4859478931661dac53e5446d77a656553e2dec323230bb116d350997e1407d794382f537e6dfdf5
+DIST tabulate-0.8.3.tar.gz 46234 BLAKE2B 1310de381265bf150cdef72b653175b1ab95a8339bf1934cece830ce9e644ed9d3d441eb3c3721509368334d11160054aa4d75a17751e493c47dbeee22c466e2 SHA512 7f0205a4d80ed0b426a45622a3b8ec0a9b77cf6d67c1207db7fbc20a12e83a15748e63d5f8e5e65fa348b6265fd0cac93be4d04f9c1c182476b93507e1131cbf
 EBUILD tabulate-0.8.1.ebuild 669 BLAKE2B f06e4ca27a9cb82f430e94d6bd420a0e68efa5849570d6949bb7f13a70470c772593d4ae6bcf94c393daa8d0c3d100eef4f6d3bcfaa94180208e3e07e1264cd7 SHA512 e68facacc2298616861d53743ad0e0141324026299f2969fb6dc7ebe34580157c5bff0a3aff3a40246db6d1a2740f1991845a4a2045ac84d9ca225f12c6095b8
+EBUILD tabulate-0.8.3.ebuild 820 BLAKE2B 0906c3100855b6c01787169db035b8eaf029e275a1c7a9624255e048c55fe2270cf6ff58a5ade70e44d9d2305db44052b5f9a82f360c90e4f338a12956f4bf9f SHA512 d8ab95f8981b90ffd6fad3051839e29ad6b42ead52fabea18c85d8538f6bf63e5475b8c4c33979e6323ea8b2a5a6836ed4c1ff188b11452ce99e4b66d16c36ef
 MISC metadata.xml 321 BLAKE2B 8b68baf97f22e2360ba30d2a86e181492217d12162d7717d3f69dff5a51926867d5ac8a227fa93c345e3ddb80036ba97839e7ab22aab5df27ec974048b666a41 SHA512 4967ca411c6ee428e897be2be259da008f9dec1991754235f0e8f79d64b5175e69d460c3cfee72f49faa41704ebda3c46bb2f30fc157e95cec4d8d60ae7ba89d
diff --git a/dev-python/tabulate/tabulate-0.8.3.ebuild b/dev-python/tabulate/tabulate-0.8.3.ebuild
new file mode 100644
index 000000000000..3d5757f8c857
--- /dev/null
+++ b/dev-python/tabulate/tabulate-0.8.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pretty-print tabular data"
+HOMEPAGE="https://pypi.org/project/tabulate/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]"
+# TODO: optional test-dep on colorclass
+DEPEND="
+	test? (
+		${RDEPEND}
+		$(python_gen_impl_dep 'sqlite')
+		dev-python/colorclass[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		virtual/python-funcsigs[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/terminaltables/Manifest b/dev-python/terminaltables/Manifest
index d4738a21cc2d..d615a09de058 100644
--- a/dev-python/terminaltables/Manifest
+++ b/dev-python/terminaltables/Manifest
@@ -1,4 +1,4 @@
 DIST terminaltables-3.1.0.tar.gz 278484 BLAKE2B 733bcfcdc51c5e78e85e8f7fc9db00fa96c1ad48f76a9ec48ed546dc0acd62af90f437de346fe05d4cb09151b33ddea2f62beb21b418d7f76d8a719423a5f694 SHA512 dc49458652fff8bc6094d316d84c9b8e9fca1a26e3230c0b668bc03ec8528793f4ef024e8032d4a56fbfabfdfd4a1142870f550f0b373ba6a42dd2e3ead3f501
-EBUILD terminaltables-3.1.0.ebuild 502 BLAKE2B abd3f1ef75434c38e5471080cefd50ff0c773985fde572bc64cd4371f4c05674273e390ea2711ba684e8413e6a8bdaaf9b96b6fe4493764005a045745c747091 SHA512 f72d7b6c6e5c5e1c46d8017022c5fb243aacbcc0a5931e6245a10ba94e7646fc2aa841a4ee06c8644134a23ee2bdc5299a08560c369ec185c401a3cefde61932
-EBUILD terminaltables-9999.ebuild 482 BLAKE2B 1d72352bc1d7954561f3eab2111745fa45de22ea063e2b1a8f29579ba831e8976ef0a495ca89297d3f777a262981c073e6ba172f1bab19cb400994ee8e2461db SHA512 3eb5f96e1f89eec1d8035ced93c868f20968b488357a2ee163b485bdea6839e9616e88e8e28683b1a1d4290b07375de145be65e1acd72e46e05beff56659c01d
-MISC metadata.xml 322 BLAKE2B 16f308194537f996ff6a54d92c996267e2ea37d78d9377d3d3b5a6246ebf511c9dae536f03627a32885753a2d3943554a9748513a036ef6e10b952e5281ecfbe SHA512 ae5215f13b457aa43dc95d67bacc371292f0c8f6540dcb49633f0120232dbde7fe12479c3ff16c203b20ac96700be12c187444a768f50e319320684553509dd1
+EBUILD terminaltables-3.1.0.ebuild 767 BLAKE2B 694c68b9a42456e33312070c0cebb6db396ff1bbf4214341e9b8e5c58642cc058584b1051324354bd67558b6a9ad965bd7c2f1c819f5ef26a4ffc358170e0a53 SHA512 7b18189494ff4683fc7adf179c76164b6e6322718f45cd229faded499885dd68503619bf1c7c4f8b96d6b80033726b3a408317e11cbc9f8b33bbd0ecac24e667
+EBUILD terminaltables-9999.ebuild 747 BLAKE2B b731bf7e2c578d019ade1b5e47968078983ec726193d277a67d6a105845035b4ce19bbdcb10b5c01f4a7befad9c52a3c4ffefdb2855fba95c0fe4cbf5c993046 SHA512 9bb965b1414737bda07ef3f86384a8818830f6229502bce2738dc778f710c990dcde86cab68725dd0eb69b9714fe3b952c2bd2358b98d43d4c782551e95cd1cc
+MISC metadata.xml 412 BLAKE2B 14b2e95e0eec6b668bfb7b0ad0c1b969837c42ba40bf5672089b7e5f409d9d2f512a1161853f7cdfcd7a69f6bc7365eb1d5bd0a4d480e983c47d31141abecf52 SHA512 7c0d6f0e618450e0789e984834352ba353c053f7b2e32be269120628f0688a3a08d7e2ef160244d3c48d98b226e43f5f7e4b13d0541d8a2fef6329bf67f8b4e6
diff --git a/dev-python/terminaltables/metadata.xml b/dev-python/terminaltables/metadata.xml
index c80f94490085..671aa966e36f 100644
--- a/dev-python/terminaltables/metadata.xml
+++ b/dev-python/terminaltables/metadata.xml
@@ -5,7 +5,10 @@
 		<email>grknight@gentoo.org</email>
 		<name>Brian Evans</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>python@gentoo.org</email>
+	</maintainer>
 	<upstream>
-		<remote-id type="github">dbcli/mycli</remote-id>
+		<remote-id type="github">Robpol86/terminaltables</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/terminaltables/terminaltables-3.1.0.ebuild b/dev-python/terminaltables/terminaltables-3.1.0.ebuild
index 7c1b9f0d30de..851902172a43 100644
--- a/dev-python/terminaltables/terminaltables-3.1.0.ebuild
+++ b/dev-python/terminaltables/terminaltables-3.1.0.ebuild
@@ -1,18 +1,29 @@
 # 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=( python{2_7,3_5,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Generate simple tables in terminals from a nested list of strings"
-
 HOMEPAGE="https://robpol86.github.io/terminaltables"
 SRC_URI="https://github.com/Robpol86/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/colorclass[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/termcolor[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/terminaltables/terminaltables-9999.ebuild b/dev-python/terminaltables/terminaltables-9999.ebuild
index eab7f76a409b..891efcd3a4e7 100644
--- a/dev-python/terminaltables/terminaltables-9999.ebuild
+++ b/dev-python/terminaltables/terminaltables-9999.ebuild
@@ -1,19 +1,30 @@
 # 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=( python{2_7,3_5,3_6,3_7} )
 EGIT_REPO_URI="https://github.com/Robpol86/${PN}.git"
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Generate simple tables in terminals from a nested list of strings"
-
 HOMEPAGE="https://robpol86.github.io/terminaltables"
 SRC_URI=""
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/colorclass[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/termcolor[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/toml/Manifest b/dev-python/toml/Manifest
index 66fbb8ef5bb5..db6db1d41cab 100644
--- a/dev-python/toml/Manifest
+++ b/dev-python/toml/Manifest
@@ -1,3 +1,3 @@
 DIST toml-0.10.0.tar.gz 16719 BLAKE2B f7863e9cf0ca5185a59d64010346b4b960c40bc3711d4cbd1ad907d15da823319b748df1a5536465e9f36428bf1599624ede3b1fa68cb420684a52ba137227c9 SHA512 26f26c38ce9cd48305218c2c34c5a5407b00aefc25a933f044bb7be22c23cfdfa3b8cf2da952d17760c4b9038df62e405fa039cc7b63dd3e94c9c312f04f9182
-EBUILD toml-0.10.0.ebuild 570 BLAKE2B 1ba72e409d75eb5c2abd6c4f5fdda95805cb6fb1ad4ec3621085cb0b97c9441fb03e0d4f070b4a213578759b103d3cbfd5f48307123a233019668189775e3c1e SHA512 a5b6c0115af3e9c219b2ea85b454d7a2022e1cc332f244ff011335f2813215b0d67b3b59c5792437896b9dd382fe767bb573b5f2734a477fb3584aaa5748d76d
+EBUILD toml-0.10.0.ebuild 576 BLAKE2B 131527c874e6a9de5830e70927ce745ea1eb08ab9ba7fe36d02b3f7fe8a99613dacd23124f8df7808614ea7b301fbc0d2cac10ed92a0c561cae895fe758174c7 SHA512 e080c369558dea5ac4fa2c97d92dc98d85bb5ecc07e3a286029a13b1c84d48b68ed155867f9a7ca360d2f15bfda3727f67cb299cf89ddeb6ca84738ebde225f6
 MISC metadata.xml 324 BLAKE2B d9ee23ed157896fac55ab5bddc1cf299572ad05d4b1de97749c0ae196f01515272feea6cbb3e93a71ad908cfb1cdac70a702b2d94b6ef2a74ebc25b044b5c049 SHA512 d5578a5e1e35bb8b263dba80e0f56ee663bfc6fafe052a82889e3d1551a5143345645fcb09107b5115f78a1d40dd4b2a50609a2df096cf870ec6409764d7715a
diff --git a/dev-python/toml/toml-0.10.0.ebuild b/dev-python/toml/toml-0.10.0.ebuild
index 6f9915920a42..ae782ee485d1 100644
--- a/dev-python/toml/toml-0.10.0.ebuild
+++ b/dev-python/toml/toml-0.10.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~sparc ~x86"
 
 # peculiar testing depending on https://github.com/BurntSushi/toml-test. Not
 # particularly worth the trouble.
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index f015ae58e823..ac5bfc8abed8 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -6,4 +6,4 @@ DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a
 EBUILD tox-2.9.1.ebuild 1307 BLAKE2B f9523dd73e57889bc345f1e6d9e47a70b5c63727bd029fd0cdeeba79ca0e6c523248c845270035d4e26d70f31ea788fe94e2d69529bb99625db2a1f49880553c SHA512 09987e74d9cdf82fee990dc7e1813ed8df54a8ffbc157413c6fa0b61763853640066c108b78556601d16f278bdd303d572f4721dcc8dbcd7f4183187f4fe4692
 EBUILD tox-3.12.1.ebuild 1419 BLAKE2B 1f0e72e54f89624464ae9f46c70f0d61f584b9e2523e73795e612b2022cc1244ae8802e2be685a549e7a9469028b482b7bd31fb6fea3852144b51a63ea3a0992 SHA512 57a64b605d495e672f780902d2b89af27f625817f133e9250e62131652fda714d302d86a54cafa91bec6addde00ab66744ae44cb9350220754816fbc31f48056
 EBUILD tox-3.2.1.ebuild 1953 BLAKE2B 20ef7befbe5fced2de522b65745e159fdbdc323c887eaad5feeda601bc68180651716913e8c84a5fe778a52ce3dcd0db2b7ee76309cd3e7583c2b90914c0ad74 SHA512 255146b77fedd2a709cb6b0bffeac1469811028d7dd806219107139bc27a171826dee2cb0d65672e8e206cd8c0d37fa5d84dab8d81b53aa6b5627b39a9e0e376
-MISC metadata.xml 465 BLAKE2B eba47520bf4a2f615fbfad7c26ac19af51d6b9c0ef8dff0212a6723376b34a0d17386f05b3f4dd3ab715b9af867fabc038c300fa8df357c648dedb03efbeed88 SHA512 9bcd58c451d7196c9870a04b76a504090ec217c7c88f47f17e141c5c9519fc41d24dfc83d97eb48b935d90b621a0ada1ed664fafffd7880e91627e56259b3c76
+MISC metadata.xml 357 BLAKE2B bdd98bc9f7cc557df1218d1d6c6dd6c0b77fe41ac2e7133728cec5e0709059b60d778fcc958c6932996dd6776c89aeb2e5d1059ee92e8aa824296c512145a2c7 SHA512 8955a371491a0ec5c85704134be03aef40584281a4c7cc74b3d63a0820050692ac7ebeca042b8847fe415170d83dacb27bb51a1d545da0ee28e77c7e405e59c3
diff --git a/dev-python/tox/metadata.xml b/dev-python/tox/metadata.xml
index 92419b0faa7e..9a563f6807cb 100644
--- a/dev-python/tox/metadata.xml
+++ b/dev-python/tox/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vdupras@gentoo.org</email>
-		<name>Virgil Dupras</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/urwidtrees/Manifest b/dev-python/urwidtrees/Manifest
index cd6b2274017a..643930c36fa4 100644
--- a/dev-python/urwidtrees/Manifest
+++ b/dev-python/urwidtrees/Manifest
@@ -1,3 +1,4 @@
 DIST urwidtrees-1.0.2.tar.gz 36082 BLAKE2B fd9dad1c1b0425fae95930b00149932a2fb5bf537c510ef4dd788408c315d6657553b92f6d1cc21769ed2a7af1a4c15c8c476d5d5b244f57032a5537ba92b27e SHA512 535b99d91154c308260a0ee6490868724ce8dfa89acf3b623c08409ec6e15194d9e94085411dd7796cad98865ed57692a88cbc11540e6523fc371eaf0204ac17
+EBUILD urwidtrees-1.0.2-r1.ebuild 877 BLAKE2B 5d6aa326ccc205bb55a11b588810db7e57fa0952e10a85621d4e88b519cc14a92e6086d72270062cf32170388fbaaf9f685ac86569042be8fdeabbb09776907c SHA512 080f8ca5c550870e77369f27ae6d03f1205771ad869a6340d6a1cc0f233ab25d8e04e1846bcb20d9fcab33d250c81e6a29c41c3c1ca0be710732fcfa68ccbc8a
 EBUILD urwidtrees-1.0.2.ebuild 986 BLAKE2B 39abf4ff65cb71fe9843e51036d289a0abfe9f468d35760e844942676d806c2d88a0636105e78c47a8114b24214051e5753eeb563d33af9841b43085e6147b4d SHA512 2a83b5746e0e28a9aed9891a454fdc2f8c3409da8a820ffdb31d4fbc0338b78591f2adc713f346bcc8d325e35fcf98a0a642e42cc8957ec68b7cd6d359815153
 MISC metadata.xml 550 BLAKE2B d6355209f6388d488c91217a36158964d3a1db24f88990f9736a12bd29339f9ef60fb261c75df94a4233e2a6e8ec38b52116975c7734424b316998fb5cf49f44 SHA512 f76048059f997bb98de85f445bcd77a5fd1f0523a3c1a77859e0bf1dcdd1ef6f4a99312e7a0261b36753a9b2152231cb84b41f6270c028983033fcce6ec12298
diff --git a/dev-python/urwidtrees/urwidtrees-1.0.2-r1.ebuild b/dev-python/urwidtrees/urwidtrees-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..57257e1b3565
--- /dev/null
+++ b/dev-python/urwidtrees/urwidtrees-1.0.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tree widgets for urwid"
+HOMEPAGE="https://github.com/pazz/urwidtrees"
+SRC_URI="https://github.com/pazz/urwidtrees/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND=">=dev-python/urwid-1.1.0[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	find -name '*.py' -exec \
+		sed -i -e '1i# -*- coding: utf-8 -*-' {} + || die
+
+	distutils-r1_src_prepare
+
+	local md
+	for md in *.md; do
+		mv "${md}" "${md%.md}" || die
+	done
+}
+
+src_compile() {
+	distutils-r1_src_compile
+
+	use doc && emake -C docs html
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	if use doc; then
+		dodoc -r docs/build/html/.
+	fi
+}
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index 0c21c5fe8093..aa0fcd681e1d 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 698 BLAKE2B 361b4311dc2ca5473fe31529ffb9ef994b8db4ae684cd7e484f5816928b4c48e31fda9df166804f58cfb77f4af8a183304b12d910d61348a0b7bf9587c54545e SHA512 3bc5d7bf7269d0712be82cbc226b4e02f3b73d3f5f7e3184e6501ed32bc5d4e2f9f0308a2a6f2d61de31122002e85f513804522bea65e391ab0caaaed7a1ecf0
+EBUILD wcwidth-0.1.7-r2.ebuild 704 BLAKE2B 690b6fac0980ae13558e4b1c91723322a7ab07c6ecbcfdf7bc3651e2b248c5e1ac04ce31a3ff13e35fdfcdd125cb97a1677d7d916887ff4cd4abef873fc5874f SHA512 ebe1147a8f93cf08e6daf523364eaef60e577f4c7fa151ebf6fca1a31af22d83e353e6c80b478fb423b1e9edb3e9bb8596aa7d9762aaf97eb2e7801305cd9d0e
 MISC metadata.xml 376 BLAKE2B 94917ec41c518ca9b328d9be7afbcba198376b1c28c3f24e24e3e994aecd877db745b07377bbba0a1c7d7b00e21cd53de31ca9ee4a0f08696d11b922cdc98771 SHA512 9f797fb27ebf7f1fd99d2c9a8c61ccffe1cc40f46991d9437dae121366da1edb31ee6ada3c202ced30fde0a90766453e72bcbb43a48919519f3de0b31681e213
diff --git a/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild b/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild
index 467f92b6c78c..a5e2691b66e2 100644
--- a/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 642f8e5a2309..b282018f85ed 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -10,4 +10,4 @@ DIST wxPython-demo-3.0.2.0.tar.bz2 3992212 BLAKE2B 9defe133e3863be5ae07b7adb4bcb
 DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4
 EBUILD wxpython-3.0.2.0.ebuild 4603 BLAKE2B 2bf6c068b38efcfda0d6a6f95e27d7a6b72ac5dc0f013ce01ee750720919314e60930a5ccc46b13734c09669ccc2cf7b2b344c650867535028f62908c4e392f7 SHA512 68033a3e0b684276f68159b8d9f58d0c35aa082b993598bbc664b10572d011b1c80b503adc4fa5cae2b95d8780724790064ef1acf9062d51031a59b574f98f81
 EBUILD wxpython-4.0.6.ebuild 2402 BLAKE2B d45ecb93d4890b4aa9a32fcf8d739e9bdfe928db2838a412f90e83dac9e8636c1c1ca68bfcf1baab7a0ed2cf5b4137047d6e263eaa4405b2966e2aa3a304a327 SHA512 f8dcb2bc80b1fb01f0dda282e703e4261a916ad392fa2f191341bd36b1e98208834369ebc84d29a884337d3a10d5b88808a7f540375dd6f4d7afa13b775903d8
-MISC metadata.xml 658 BLAKE2B a115ae210604ca2165d0c50cd7eee27170b2f9f235fa159f15812782b741c1481c0f806b951a30c5da43e45a2873ab4d2a09d44de2daaebeacac3e90aaa1a125 SHA512 c9b36cacc2cc3136637483886bbe0198934e5c9dc99f854de49cef263fbfe75a5a8452a9de2752fd55a43dbac4d5bd8bce32d3cadb3f6b14614c171188473270
+MISC metadata.xml 550 BLAKE2B eb8b5a9f5b6c0bc12d5eb1848888549a8d18fc086cde9d4a819dd2765b654470a18ff627578929ba901f09486b96b34644269c09102861bc09482b107d018332 SHA512 ad9e10ffc69cc3a103a30166448a09b84013b3dd3eb9a62583a0c562933b5cc056a62f148e34aa2fdd5bcbffeb81596b2cbd3c4eee485cbce15b649083e59d43
diff --git a/dev-python/wxpython/metadata.xml b/dev-python/wxpython/metadata.xml
index 7012622a0818..f0783659f226 100644
--- a/dev-python/wxpython/metadata.xml
+++ b/dev-python/wxpython/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vdupras@gentoo.org</email>
-		<name>Virgil Dupras</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>wxwidgets@gentoo.org</email>
 		<name>Gentoo wxWidgets Project</name>
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
new file mode 100644
index 000000000000..31c39f30fe89
--- /dev/null
+++ b/dev-python/zipp/Manifest
@@ -0,0 +1,3 @@
+DIST zipp-0.5.1.tar.gz 10763 BLAKE2B 4f70d6ed94203d4b9fb9127930a07797c3cbfa023e0cd472e9d3a18e1877619dbefee654cd0364592a594b6e9e0aabc813e0560695bb18f8e3a64cb4ce76f0e2 SHA512 d4486ae98159677cd481cddb3bd00d5d2237dc94f0f3129b03994800b0e136c12b05e02d2ca7d628043dabce323f34dd919b9ba731549656802527abdcfea120
+EBUILD zipp-0.5.1.ebuild 1045 BLAKE2B ba2452da28b41fdc3d8ed0db560f149fe77a4839a556fb8114d13490e51ac6a087665f427029585bb7877003d1fdcd53d9997a5250000f840f06643437cb2621 SHA512 ebdcdfeffddb439985b144ae72c3738d08503e400526cd7f3ce1ee4ee9ad29429904df5d5df3d42807b67c28f51eebe6e66cc2232ca90854fb35f97a3b802016
+MISC metadata.xml 523 BLAKE2B b2c729977d84466557f0fae273e5463a41fded78780842e4a92899cc79ad8cf2843fe9c397a70f1d7cab8a7ca317a6723b119047323e0be8862b7294afe96b33 SHA512 82b88eb00bb385c47ebf5c5cd560de25e4f865086983fd9a5767b7fb286406dd06273e8a596df31aba57baaf051b7c353f50f445753541de5b15e6a439132381
diff --git a/dev-python/zipp/metadata.xml b/dev-python/zipp/metadata.xml
new file mode 100644
index 000000000000..a0ceea39a38e
--- /dev/null
+++ b/dev-python/zipp/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sbraz@gentoo.org</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">zipp</remote-id>
+		<remote-id type="github">jaraco/zipp</remote-id>
+		<bugs-to>https://github.com/jaraco/zipp/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/zipp/zipp-0.5.1.ebuild b/dev-python/zipp/zipp-0.5.1.ebuild
new file mode 100644
index 000000000000..2d0e62d3d6e3
--- /dev/null
+++ b/dev-python/zipp/zipp-0.5.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
+HOMEPAGE="https://github.com/jaraco/zipp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/contextlib2[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	pytest -vv || die "tests failed with ${EPYTHON}"
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-07-10 23:40:16 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-07-10 23:40:16 +0100
commit	51af5f0eb4cddbe6aa7953717873691d77aae9ff (patch)
tree	1541525274162b033ebbc3ed38abaf335fbbd49a /dev-python
parent	7014a5a3ea0feffab9701fdd6b64cc7667a985af (diff)