gentoo resync : 10.11.2019

53 files changed, 662 insertions, 169 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d3017278cef0..21b95d105b74 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 2d74174342cd..0e445d593faf 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,5 +1,7 @@
 DIST PyGithub-1.43.8.gh.tar.gz 2842219 BLAKE2B 7711885beb4cb855ea5a5755abe881f7ae7825feb76cb0ab30aa9ba4a2530440d2816439c43da23a42f134286fa0806875d075920776960f04cdd21131bcf700 SHA512 dc58166ebb27f855ed4f32448029abe7e53b8050d8d99029d460f2dd94180ca8bcef68a75469293abd021f70cc3c67c32061e6439db1b3f1dc77af464c658bb6
+DIST PyGithub-1.44.1.gh.tar.gz 2866013 BLAKE2B 90ca7f21fe0031c6cc6d50f54facd7c086037f942f9595e78a3b1a0fe0d21b6bc587f07b63152afabbaa2f38d165b8014600cb195207519a16e3e05fb9bfbcff SHA512 87b6c05f3bbfa463995b67d0bb257700e8c67050dd291c60737a84c4e8bc6bcbde1c0e2add98ec38174c55f2c21abcf4c46bba8be752d132d7e63e423ab6fd1e
 DIST PyGithub-1.44.gh.tar.gz 2855748 BLAKE2B f728562617632f99d5b8a141e7b8eb7527812388e71c7f6dcc55fbec2b0da5ab3882985d4e815fe18affa662351942ba2223eda3ae68bc1cf550c2cbc2bee7f9 SHA512 26aa86822fb8c3ca8a8a0e8d5cd9bf9457cab8a4aa006fa195bb4922867627b5516adbee19cbf5c30d24de8266b496741ae7f4dd8c7cc0494044e6cd585402b1
 EBUILD PyGithub-1.43.8.ebuild 1201 BLAKE2B e142dace911dac44389a8407628c295465de3c86926be5f0d49df62c4e602a8346a5714afa6b52028d9d024ea57b3d5fcc1c1b3198a33a34558cbc2060b17399 SHA512 c061c186fee870038de0654d7e671c96d6be95d0cd7662b477d434a6ff73f74c47f002f88d3621f149487de59985e449d79bada852e3676c07a77764d9e27ce0
+EBUILD PyGithub-1.44.1.ebuild 1198 BLAKE2B 01b71695d8a27e35d089ecc38d575beaf12d695b5e51a25f9789b5c355abeaa79e4eebb9c8cd397aa60d9ff1002017c015b492d5208b0524923c95e7e4b22ee8 SHA512 abf395749fc7aee6dda576e25a4670679be85954734b2d7a3686cda3e7ff1f96538abcadfd29c19778185fb0f2b138f724cc4cc2501cd432d2c32657762cf01e
 EBUILD PyGithub-1.44.ebuild 1089 BLAKE2B fe2cc32412ec96bb845e5fdfcf4127309165497ea00142af5c3f7fd10a87f8f8d2dac102250c8485ecf9d5d61a219cff0c724f580d9198afc82d15198e83f231 SHA512 f970501be33ee797717c3d7556e9a0558c8af047349333572bfc89e14829876c86875dd602ed97ea25afecc51252997330e73c8735db8421a4e8809201b0fe95
 MISC metadata.xml 446 BLAKE2B e5a5f28e076db18ae39b757db4c480cc7d77314361c050df12276a8770c117140670067c4d1785d7a21fadd1d3435f7245a85f2bb251c57539315bcd97faadb8 SHA512 e29338330c42ccefee0ebeef682c8877a37c01c10ab9976988f846fb8c6d0a02114d0447a682499ff306810d2c12535a3cb031c9728eea016907382cca8ee1b1
diff --git a/dev-python/PyGithub/PyGithub-1.44.1.ebuild b/dev-python/PyGithub/PyGithub-1.44.1.ebuild
new file mode 100644
index 000000000000..385efd59ba3e
--- /dev/null
+++ b/dev-python/PyGithub/PyGithub-1.44.1.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,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to access the Github API v3"
+HOMEPAGE="https://github.com/PyGithub/PyGithub/"
+# Use github since pypi is missing test data
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		>=dev-python/httpretty-0.9.6[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
+	)"
+
+python_prepare_all() {
+	# tests requiring network access
+	sed -i -e 's:testDecodeJson:_&:' tests/Issue142.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest -v tests.AllTests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 68fe7d7cc95a..819c1fa5f4da 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,11 +1,11 @@
 AUX PyQt5-5.10.1-fix-testlib.patch 1293 BLAKE2B 8ea2a9de5913578c951b4acc05508662fd63590e097fbb8b681ac02cb3d96c9670ab1a1bbe873c1c1320dd78cc4c738f9f714c8ffd5be732bc15f084ad7ca721 SHA512 bfe80fa6018174a6981777031ffa97bc834e17848580d02c994c61507aa4ea16091e582b6bbc3754d469de1901fa8cf2e3e12240cced44fd0dbe928bdd360925
 AUX PyQt5-5.10.1-timeline.patch 1063 BLAKE2B bcf04d91798b0dc2136ff9c85802abd14d35fb6daa952784ebce23a7b3c930421260f0f1dd80e47f2bbfc49ca9e26159f05c23ff136af4b68e69468d117dcc52 SHA512 8e09feca5f42ff61c479d098f7ab0299cba51a9234eb03146568166e50d6b2fc7d424bc4297905bd0d733508c891ac5b2287c05c6039f9f60bcec12978ac5821
+DIST PyQt5-5.13.2.tar.gz 3162810 BLAKE2B 383aaa3f1f51ed618a3b6475432a96f6a8f89ad4d97197fe87469e0a69e1db79c762965adfacdf92cc43d1bb2eb5e2790f6bdb7e8b288f0feade828bf8e30090 SHA512 9a16450d8fe2a7e94e182ebb03cc785c6de516e356251753abfb79af3958230043f2db59750cde0a6f1fd6cf5568eb8b7ae76d5a3fbcfe9f7807e02867973b55
 DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
 DIST PyQt5_gpl-5.12.2.tar.gz 3147205 BLAKE2B ad0b09548521ceff869bb44cfceb0c2cf31338f46c76da23582f7949fdcc0e8feee3cc0dc0610e8152dfbc701c3ac765eea7898f5061775a92e2601c5b7ea8ca SHA512 dc23bb7dacb305d4f9a630f2b5c3809d5d6734ba234c9941a3c44c770af8534dd737160dbe007a1f15d5c90e2e52419dd749b3ef942b4e71917c1cea2220a666
-DIST PyQt5_gpl-5.13.0.tar.gz 3152704 BLAKE2B caa9b11f70b656a23d28f4b7b490df544e82f669e38e51e87316917f015f9cf137a0902333323cfc5c6a13bf446067d5714fb33c091efdce03a0f7cfa8771a15 SHA512 72cdd700956f8a5791fd38cac6a348f189eec9e69f3fd79a0c711ff49c770d4982fe62ec9057830d26abc4c12133922df915be0844449212f0bdf338fe1e4cb0
 DIST PyQt5_gpl-5.13.1.tar.gz 3162737 BLAKE2B 1242069b757ef7d9532375758ab29954f216f6d8b1fa18e433ab41cf56df13b7408547dd5c58eb0417a011d834ef9301aa090a4e88a9b10d48f15267eccbf6a3 SHA512 7b7001b16a8c730d7ff2d340fa1dd118868b53519e8f75e8c2ce00b44e3637ac6a31b41a7456fc610df11ff3928b924cb54c0c3712f22ed4df5058fd8bc77281
 EBUILD PyQt5-5.10.1-r1.ebuild 5812 BLAKE2B ceb731b308578c3d8dc511f3bb56b49656bca92bb8e4a89cd140d8044d7445bbb3f4e3a018b63cc29624d273bce1dd8976f7f848b8485d08db00022a293b9be8 SHA512 6f2169fb459bbe378db594edb9ae0e56a96b1bd0014c5855ef038229a8bfa4dd328fd7e7f0659469805b81d7c4589f3d306e1fb7a4cac21c4c2658e599d53f84
 EBUILD PyQt5-5.12.2.ebuild 5904 BLAKE2B 32191a4182088ea16548c68bd45a5081fea20bfd67789380e2150c9ed9c6f919fc6a3cd0620d4b181d393edf5cdfcba8110866f5c51f92e13504d64c4bd9478a SHA512 1ed8f4be78ea9ef0f140d32c5b4fafcb04440237a080a06d88bcac2d8f85a7715c554df4b23de57ba9f332ad7d4c0149dc5e6d831ed1fbf21bf76e8f46cc7ef3
-EBUILD PyQt5-5.13.0.ebuild 5908 BLAKE2B bfc735c4c3606d2247a5486c8eded9121bacd4af52f8d73f87f054ab17054c30e8be576a935e3c618362e71225d6311c7e37b743717c7c08d32819742f266719 SHA512 9fcf1fcbbd30288f06b268a9819263482868a3f4bb100754d7db9fbf76f9d65bc4506b9d5c3c5db098e80973586b2c9e67fbaddb097155fa796e9ad599f3f8ee
 EBUILD PyQt5-5.13.1.ebuild 5908 BLAKE2B b71caa77bc38e19dcc4edd952aac100bfefae7cd5e77991a71175023eafb264a061bbfa57159e8c88a944e8e0d84732d523f6c85c9dc5d72e7ab2679bd1a15aa SHA512 6915af2b75a45d6d3eced09af924a084a41e5db64cdb2f58200bb87276fa86275702e12629647df6cc04a6503683616600f75b27f49459acbf7bce06f8a002bb
+EBUILD PyQt5-5.13.2.ebuild 5843 BLAKE2B a6abd81a42c6268ef6e8097a007b260426a55bab2ada39767c3bc6a95c21d244d3e164f5d811b8e7de576de2c7fc22489cc468b4bbe2d53db172c1402ba02cfd SHA512 3eefeb66e3e43564da5aa3f38b9e0f335aea6d0be345260ff980c5b83eeb7c9513d51cc253628984cd0c25b6a84b2cfb1bcdba09e85827d6a9c0a29c0f31046b
 MISC metadata.xml 2594 BLAKE2B 3c8c7159c42e050e4e4487ea8c24bd8d7213f9590656c3ae7152c0dcf151d4db99f07546636df0b7142107f506ae72e8d8c31a34aeafbdd325001030088a5493 SHA512 41e4d7e868a9b101d2bb41e8976b20d460544b1d103b3600b5b7cb5fbfc456538027d4b02283587aa747fd1789d7e675e5ce832df71f3dcd9b22eb095087328a
diff --git a/dev-python/PyQt5/PyQt5-5.13.0.ebuild b/dev-python/PyQt5/PyQt5-5.13.2.ebuild
index dc2c0203b8b7..615d14f2da91 100644
--- a/dev-python/PyQt5/PyQt5-5.13.0.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.13.2.ebuild
@@ -9,12 +9,11 @@ inherit multibuild python-r1 qmake-utils
 DESCRIPTION="Python bindings for the Qt framework"
 HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
 
-MY_PN=PyQt5
-MY_P=${MY_PN}_gpl-${PV/_pre/.dev}
+MY_P=${PN}-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
 	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
 else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${PN}/${PV}/${MY_P}.tar.gz"
 fi
 
 LICENSE="GPL-3"
@@ -57,7 +56,7 @@ QT_PV="5.10:5"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/PyQt5-sip-4.19.14:=[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-sip-4.19.19:=[${PYTHON_USEDEP}]
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
 	virtual/python-enum34[${PYTHON_USEDEP}]
@@ -90,7 +89,7 @@ RDEPEND="
 	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
 "
 DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.14[${PYTHON_USEDEP}]
+	>=dev-python/sip-4.19.19[${PYTHON_USEDEP}]
 	dbus? ( virtual/pkgconfig )
 "
 
@@ -155,10 +154,10 @@ src_configure() {
 		"${myconf[@]}" || die
 
 		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets' ${MY_PN}.pro || die
+		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets' ${PN}.pro || die
 
 		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${MY_PN}.pro
+		eqmake5 -recursive ${PN}.pro
 	}
 	python_foreach_impl run_in_build_dir configuration
 }
@@ -169,7 +168,7 @@ src_compile() {
 
 src_install() {
 	installation() {
-		local tmp_root=${D}/${MY_PN}_tmp_root
+		local tmp_root=${D}/${PN}_tmp_root
 		emake INSTALL_ROOT="${tmp_root}" install
 
 		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
@@ -179,7 +178,7 @@ src_install() {
 			rm "${bin_dir}/${exe}" || die
 		done
 
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${MY_PN}/uic
+		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
 		if python_is_python3; then
 			rm -r "${uic_dir}"/port_v2 || die
 		else
@@ -194,7 +193,6 @@ src_install() {
 	einstalldocs
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
+		dodoc -r examples
 	fi
 }
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index 41f41e20d5dd..f1eb22e27859 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,5 +1,7 @@
+DIST PyQtWebEngine-5.13.2.tar.gz 45234 BLAKE2B 4ad3aa63856cf3627c2f4ba29d93394f13297deb5e54bdd200bd419f71322d541ae72e45d70cff09cc53808f0d2430f8922d44f18bbf177c42a6b9c827854d6e SHA512 778aff78ea731230029e8dd993f4bc59a32bf74d65f06a8b3d1467efdc67e3b3caf0d9a968682c6c275c8ffdb8d85d9c756cb51727769949656620e944c736d3
 DIST PyQtWebEngine_gpl-5.12.1.tar.gz 42474 BLAKE2B 6cb333d8e429ae6b9f8c20a7486754767639693351605e85c0226ab3f1f065a549d40d69669d91f501fdf2c30346304a547e36b416d275a8bfe4ea621c0633b7 SHA512 2bcb0e4da51de9cfb5128e03c03ada77f2d4b99b0885da910584717681b96759ce4301c325cbbf43602d46746e2d37d81ed62f77dd63b33359fd5fae74d7f010
 DIST PyQtWebEngine_gpl-5.13.2.dev1909181828.tar.gz 45197 BLAKE2B 203dacf4322e8293221a59fd9a2f34a42981aefd5861e47141b3cc58770ff9cff2c0922de1f03c0eaff4b0d1c42bf26b172787cb3fbbc9367e9d8b717e927d50 SHA512 ebb1b6de8cba1619c96a4a120b51bfe885b737669f246f4e5c2cd5023320e74f0927a62a0b87586b519ab5767e0bd7b01444e7298381ffecc036682b4f1fcaae
 EBUILD PyQtWebEngine-5.12.1.ebuild 1703 BLAKE2B d7e28f4b15836437f1ec47c64da008d5e5f3113f2969dd08750d4f324219290e957391ed6d152cd949bb88afeb87d946b22e92223fb92e8d27160c8d184983fe SHA512 0329d51e5df79ddc6ec2de02365e86f49b3f3267abe492079396646bfd93500649b4261adfc68f4e3c1b86ad58b41a70263f9bfebbf5eb385b52a743dd9847cb
+EBUILD PyQtWebEngine-5.13.2.ebuild 1680 BLAKE2B c67b3d71502d986aa09d43255b28fbd07e16bf70851a30d24fa5874b8d5fdd493f372e2c8f23a285ddc6866041f01f72037a5e965bc298c53ecb9a64f5a5eb9d SHA512 8fac5f51cb220bce68a8af2f3ffae742891b8dc279cd975bfc731982bd8666098d25d28c7dcb4a39d3bdf1e1bb7469d7f98aefbc617aa731e0b152a49b440a4c
 EBUILD PyQtWebEngine-5.13.2_pre1909181828.ebuild 1713 BLAKE2B 085effbbb3c43dcd9cd18d08ddf35b4e26dd5c1bcb80e298e422bc6c432aa157026043473612a81f6a6a37cd3c96a649da443b236cebcf49141a690dfb7d49c6 SHA512 b81e603090920d6e2da7ca11d3d8e851be160344282ec6cf25f9ccc621ef1c915ae9f3fddd2032b04b2fa522999fe5d5afe016832dd7c879aa18e739c0e636b9
 MISC metadata.xml 1059 BLAKE2B faf1e1abebc25799040955794a28cdec2f24f1cbe358f15df5fbc400a55453b5281acd7ce0925d122661a3b290771d280d6a2cd7a2d536a5cbe0b0dde4aa9a5b SHA512 b5721a82b18f9c5b9bdac1937d68616c20b290fd609e2cb02dd837b6f435eafc436d68f3aff9593eb43efd30ee2e7201efafad8a38b41a198076305ab9de3862
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild
new file mode 100644
index 000000000000..9614f515fa23
--- /dev/null
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild
@@ -0,0 +1,74 @@
+# 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_P=${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/${PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/PyQt5-5.13.1[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-sip-4.19.14:=[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtwebengine:5[widgets]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/sip-4.19.14[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--qmake="$(qt5_get_bindir)"/qmake
+			$(usex debug '--debug --trace' '')
+			--verbose
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Fix parallel install failure
+		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets' ${PN}.pro || die
+
+		# Run eqmake to respect toolchain and build flags
+		eqmake5 -recursive ${PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+}
diff --git a/dev-python/backports-functools-lru-cache/Manifest b/dev-python/backports-functools-lru-cache/Manifest
index ddebfe8af4f7..8199beb3b09b 100644
--- a/dev-python/backports-functools-lru-cache/Manifest
+++ b/dev-python/backports-functools-lru-cache/Manifest
@@ -1,7 +1,9 @@
 DIST backports.functools_lru_cache-1.3.tar.gz 6685 BLAKE2B 7007b08fc536ba2a31d215999a73399004b2db0f5c9e00706cb03df35882cfd987026fffa7e1deee2fde6142bbe0c5b7707ba06567e702e0781136572c0b17a0 SHA512 946156266d4b1bccb3eb444d1cceff6568b8c2a62e09bc9197281bdafe912069efa4c857089a7e6ea0247ab9407256a7a7c92485599692e0c0159c428137a342
 DIST backports.functools_lru_cache-1.4.tar.gz 6927 BLAKE2B a0ef9f56abcfde51b9d7f03cb9170c3d500652e43c9498fb7dc4c404276ceea15dcd6ffb2fc7efd723cb12790f99e6fe249136ae0d4c949f06ea06cc41318793 SHA512 78dcd12f392bc110d1556f567a9f8fe977fa4ddc98a2121ceaf43606687171866832b8d32220dfb4ca335f53e89acecabda9e48ad48571f1741b21ab2d3b8a21
 DIST backports.functools_lru_cache-1.5.tar.gz 7891 BLAKE2B 5de046672e25f95e8b224d79deb4ce7eb40aef72ea80e0788ef54076fc98ea3a993daf5a607a6670925707f357b4be14affc626b45bae100c6feba9a41e4c606 SHA512 083a69beb050a6de0f838231ceae05cd1825f42310b2cd4f0e53f7ca043af4c699ad7042c32831ee365bb6b374d33189136e45689c77815b99773d145f0ef4f1
+DIST backports.functools_lru_cache-1.6.1.tar.gz 12426 BLAKE2B 361cc71e0a18e6d578ac007d4990c2f7ae86a5753c25da378a7a3cfbece63b088278fc998adfea3eccaa51146659d658cdd7ce4e4e19d6d2fd7639f8df0a7262 SHA512 5764cc6ed83dc4abc2a7e5f8b5bb30c7b7554aafcbb6dfcececdb3646fe9298a8c1791a02112238ec94a0e383855bdec43bf9094f40b57124d0a0c9aa7c67f88
 EBUILD backports-functools-lru-cache-1.3.ebuild 1086 BLAKE2B a74406a61033859d80fee63d45b82b1790e2b805d0707e919a72413b81faaf439fff70124ae09f6983c6816592109881ddafcb26c9bc2049d736de04a4bf9251 SHA512 ed213ceb4bc65459e84c04dbd59e50b561179831d5c2dfb4ce292f9aee5516119d9cbf49b64477629e641e14739fbd58f69d1e9f2400352c5f07944f8561f4f9
 EBUILD backports-functools-lru-cache-1.4-r1.ebuild 1329 BLAKE2B 7cb8bc34bb55d500adfb253449439bde98e12b18eb761f1433864a942f7fb75d99a90e730405c728d092536235c7d3d7da7ef725451b4c3dad1b6c88b2571198 SHA512 af64f7a5ff9f4f256c58d064ddf30690fd3cc2245a86fb0cc7733b4f3b7dfc6b8161d5941ea9c3244ba9f7237aaca5bd0d626b3fe118e092b047a9322ffe0ae5
 EBUILD backports-functools-lru-cache-1.5.ebuild 1337 BLAKE2B f6957afc4c805fa686a909d74c36557638add8ad918f9848cba88b0ebbec05f18882dedeff85d5b1e921c43ba3988355aa4a1f4b89b390fd36468ed2d37173bb SHA512 f0b2fe86c2d21e791506837a62c3049111294797f7f162ce01127b1455136854b99699e6a45585efdd74662b24ac7fd202ae2afa0ed3023e00db3cd0ed163ec3
+EBUILD backports-functools-lru-cache-1.6.1.ebuild 1472 BLAKE2B 14284dfa2b8d6c7bae8eb1bed13f16c14050cccfa684626b508e65e26112db2ffdd39664cce22e7a2909d456a92a2d6d7ed5cc68bd21d010af355fc41d638f53 SHA512 738d2254e86462af4a6bca6df71b6595085baf3dd6ca625ba81fdbcb8b3e5c91f7690450e853bf32d58870cbf2d21bb2042645c590356bf283204171c87bc315
 MISC metadata.xml 602 BLAKE2B 9fce22594360dac2cce70a5e636668f47097bf52db6cf2f0b663f7305831d53ec2d6671657cc72c64dcb1b6d459868c6645a81e227d7acf7c6de71d29d1303c9 SHA512 dface430e3611aaa78c2407e574d1346424b35732f54f0b29cb956bea7fc64f1429d229a4d6d09435279523ff22a998f09a450bc15a1b0e304475544c0748581
diff --git a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.6.1.ebuild b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.6.1.ebuild
new file mode 100644
index 000000000000..b70dbbfe3cbc
--- /dev/null
+++ b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.6.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy python2_7 )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+MY_PN="${MY_PN//-/_}"
+DESCRIPTION="Backport of functools.lru_cache from Python 3.3"
+HOMEPAGE="https://github.com/jaraco/backports.functools_lru_cache"
+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-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=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 and friends
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	# avoid a collision with dev-python/backports
+	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index 96745d666e0b..a72e2f3e090d 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,7 +1,9 @@
 DIST ecdsa-0.13.2.tar.gz 61595 BLAKE2B 0a8c8a0609a680ab26e84963f84d6194eaeb8aba78281fe277f585008d90a23469df66c9d4f4d0b7bf218445b596a13f7a9824c764827253f21bbd5d943b2702 SHA512 2b485d85a3cd48b2b9155eb36df8721a4bc76f1152a544970f535c056ddd944d72951e76b2cf5cbfe45277c2a156f2fb15f3b62c2b0fcc9a251962dec2a0f9de
 DIST ecdsa-0.13.3.tar.gz 60477 BLAKE2B 4dba6c4778460dc8b778c2d7294e79a33d0fa23a50b3c04f7fe9011b2df95e9712bb41fa502043ec62efa8186374555c0eb4b59b96d2ae99d9861f816bd6c9e3 SHA512 621d36dcbdc0338b5e595e73337f62de0cc69febcabae40a6ba9292f2466f5d8818346d9d29d0b1c479ad4400fa57bdc52a7b264a475f8abed4c4a1161902b58
 DIST ecdsa-0.13.tar.gz 55579 BLAKE2B b8fab652527f945820b87931477d431bbfa605ec123fd5fea313b377edc118809c4109737ec6f6a97fb536f4aad193a4fd3154401d40f26fe05a336ab730e33e SHA512 f21d4d196404455135a1a2255c889ffa26160ea1e9b9d16c914ea82614831816acb6d27c86aac68cdaafa8b1d5fefe065b5f49ce45acaae4a035cd7f08a97594
+DIST ecdsa-0.14.1.tar.gz 100303 BLAKE2B f7f02bcd99752a7e0c7ac7d22625f5a42638fefb9a92fefda3da279cdbb76d1a5337df5abfd43eb1edccf794c5b2fe34e10df876696d74e921c5ddb35f61f3a5 SHA512 6a66e07ec75e93af73d2363dfd817b35a103f8ff8d62c5ce3af9e98e917d38213aa4f80d570f81c830938123f9599e24d96605a36650eaefd806ed07ab0c14a5
 EBUILD ecdsa-0.13.2.ebuild 616 BLAKE2B 0ff8a541ea8c5e3fe1e2ba23fcae0f2afcd4849c976d78ad84a1f98eb103e194879ce90522b913422d0bda54e9abd7ead53e68f78fced764a63f16003884fb46 SHA512 1466057033557acd1000abcb5aa25021b012799027c0505dbd675552922890b1469b2c7d35a13980371648434fe8ad2393ab4f06e317e447db63cfcc07a913b9
 EBUILD ecdsa-0.13.3.ebuild 616 BLAKE2B 52893c5430fe5197078754423c817c425da0f1738e5dd451b6ba7e401ef9d3caef51e6458650af957f2eb095c5ab6b31f9861a80e0cb1086717ab7b2f6070a86 SHA512 f8437c0b95ef6d301c6c2f8ebe53f086a07cbaf3167362fde816acb764fb86b0eb5b159fd55e8d9d99233fdd0488ecedb5d57436a06b1d474a51d84c30444aab
 EBUILD ecdsa-0.13.ebuild 607 BLAKE2B ae318da321cfedd7f5b61d836a8892002a43d917885770690bf64b199337b5b026aeb550f474121de0ffd31204a8ea81d6368b7d188a7d57dfca91568a38fb01 SHA512 3b0af9c22ddbb13bf703fa1a6a28769c09898a555c4346539b16aaafb7b7bd0b77dbaf46ce594add453c20eb7efc0e3243cf7c26036bfcca2ff9d41f229663ce
+EBUILD ecdsa-0.14.1.ebuild 616 BLAKE2B 52893c5430fe5197078754423c817c425da0f1738e5dd451b6ba7e401ef9d3caef51e6458650af957f2eb095c5ab6b31f9861a80e0cb1086717ab7b2f6070a86 SHA512 f8437c0b95ef6d301c6c2f8ebe53f086a07cbaf3167362fde816acb764fb86b0eb5b159fd55e8d9d99233fdd0488ecedb5d57436a06b1d474a51d84c30444aab
 MISC metadata.xml 638 BLAKE2B 70c66edf039ec739f21145846f74e2306ce879551a2ae39a9321b53a6f5a636235006146c2049dae41ecf3b77dad887f88f45cbf67ead493288570b4b79c6d2b SHA512 b08361b7b3fca4f1623aa71fe1090e3a8890f7b475ae2edfb5f0d7d2075be226e9826ad54b90756060be1d58aaa03a942d39834bf29c09338359b402db5ea7b8
diff --git a/dev-python/ecdsa/ecdsa-0.14.1.ebuild b/dev-python/ecdsa/ecdsa-0.14.1.ebuild
new file mode 100644
index 000000000000..43d6450ce1ca
--- /dev/null
+++ b/dev-python/ecdsa/ecdsa-0.14.1.ebuild
@@ -0,0 +1,23 @@
+# 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="ECDSA cryptographic signature library in pure Python"
+HOMEPAGE="https://github.com/warner/python-ecdsa"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/html2text/Manifest b/dev-python/html2text/Manifest
index 076924f042e9..b9350d882ac0 100644
--- a/dev-python/html2text/Manifest
+++ b/dev-python/html2text/Manifest
@@ -1,7 +1,5 @@
-DIST html2text-2016.5.29.tar.gz 46879 BLAKE2B 0e7ccae7ae4d90fb202d9fdb8edd81f74b204f81c2410f345eb923fe610f61fab6ba71bcc95138fb3706ee51007a2c72c76497cee48818032934e7f809fd46ae SHA512 58b71fda6ea6fd1a71dec757c91cf342265a2c89ff5c45e752436068419fb6c1faa1ca0d5a6baafaaa60186a85aefdd840989177ce30e55bcda1c6209fc375be
-DIST html2text-2017.10.4.tar.gz 50527 BLAKE2B 96b7060761a629cf4313104323517c4a9070aabfa02be43e80c89b56b92329785817abc7ab9fef4a8537cbde4a797926d3c1d444c11f3db6112074a31d8a8e61 SHA512 c7f9b765572b5eac72837aa757f0be07df0270b49f9b3a3ec8c3c65ff929505166b0510c106116ffdca484b56120b6c162f86b600d88a5a35e86d06cd6b6fa19
 DIST html2text-2018.1.9-1.tar.gz 51173 BLAKE2B a21cd3e579d47081e669fda3f3147fc28d816478885942565a1b93b86292e2729e93bfea6b5326703e575f209f5bd7dd905d72011b8153b8c40d31c83acf9057 SHA512 773b508864a2fa31e961e132118702429f5b7836e90bd521db2ed6b4215de49d63991a99b7ad7d5aac3074a3c14e4d384557a4eb5b43c7e2aada46d5434ed229
-EBUILD html2text-2016.5.29.ebuild 949 BLAKE2B 7f798b1e17bcbba0bf27a1f96f9b930e77c6fddab60f28a5d73cefebf7c28639e04261f9984eaecf21c606182fb20a5b1aa67e49ff706b692afde12c1156a603 SHA512 1aef1975618384e8bf682f1d6645abcf6d67d5a6aaecaf26691fe7914d4d4e12a4787311d321a9a5670b4dd337690462ec00eea6b3640dda115f7a7b79efc098
-EBUILD html2text-2017.10.4.ebuild 931 BLAKE2B 6816adf37fb0ab530aa9bc24c8ee07ddff0e3e3411a5f145c665b757d56dd07e5e835b143fbdbe9d3184193c7db2b31046a9750f88dda1216c3494b38e2542f7 SHA512 7ba02932349b69afbbcc56eac334ca638f2e2a1929680aa4c0e2b08d5937c6622432164ecfbf834ca8dd2f76dbd4b93d3c74b66f7563b5f4fdb2fbac0db73778
+DIST html2text-2019.9.26.tar.gz 48634 BLAKE2B efece48c7b05171f9bae833663292d7804838b5a791f1f734b3a258843a71616ada2ebee7cee406e0bfa1a3dce67040d41621bd87be100a2c0d4ca6d75829aa9 SHA512 4c6a52e96d3997a6ebe41c2955e2f6bd5189f49aadd7d7afbe67b85a2f61a0aafd0fc09fef184cb9407b9ab26f120ef235294e4e9d8f41e3b6b8f6fc29aa386d
 EBUILD html2text-2018.1.9.ebuild 931 BLAKE2B 57fb5d8bd7d7123eb81fff832f043229c1cc52cc061e422978af1d16a4970677d44fe5baca51e64d365930ae9019e9fa7c362e338db2420b54ced463a21d2157 SHA512 76caf8cacb1f38867d375561dde5b24fdd76607b624c972b584789fd7f3835475e621ce22aa4b0ada86427aa1a0e8963f1003cf153ee3e50ffbda7717017260c
-MISC metadata.xml 332 BLAKE2B 2df3c377697f219f255f69968f31426f716334507a858fc4ea27f0dcb09ab1f7b2d98d4da2760c94ced1747ad908896a6c7c6cc1cd89fb5877707b14e37f825d SHA512 2fea207556f26e64296d5804463e561410aff69312cf947dfb2eceee8c664980d86cbdb6b062a0457953e16018cb0304771311a3313056efe0183a85c8b2d5fc
+EBUILD html2text-2019.9.26.ebuild 961 BLAKE2B 5e77053b1534d403e58eaf4c8d1f703e6c4738c527476e2d3a1370ef413151e96ecefefb2e1fc6efbf9e8ec3eaaf598fc71ebcfb6d434ffd0811a03573ccda1b SHA512 e3b27394ff8e9dac8832e8fd30cb68748d343c5c3bf012ff8b55830e3c51aaf0861a331ec00fb6547ae771af6055a9adf982cc70d781a5719211b8c001ae0f8b
+MISC metadata.xml 369 BLAKE2B d4f2c4f645c20a9e803e76df75ca78b79d8ccebe56ee8430d38abdcc096be85397b6541ddc2f25cb2c79d955b9ee913437edda69956cb78c1f0c38256b311be5 SHA512 dfa2834eca444d2c56f36b11a193c4e6b012b3a3afab08034c87d9ebb442010f2454788416380a4caf78ebaf47feb2212643977aab3100971fa99f29fe29955e
diff --git a/dev-python/html2text/html2text-2016.5.29.ebuild b/dev-python/html2text/html2text-2016.5.29.ebuild
deleted file mode 100644
index a573db30529d..000000000000
--- a/dev-python/html2text/html2text-2016.5.29.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
-HOMEPAGE="https://github.com/html2text/html2text
-	https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/"
-SRC_URI="https://github.com/Alir3z4/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS.rst ChangeLog.rst README.md )
-
-src_prepare() {
-	default
-
-	# naming conflict with app-text/html2text, bug 421647
-	sed -i 's/html2text=html2text.cli:main/py\0/' setup.py || die
-}
-
-python_test() {
-	"${PYTHON}" test/test_html2text.py -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/html2text/html2text-2017.10.4.ebuild b/dev-python/html2text/html2text-2017.10.4.ebuild
deleted file mode 100644
index 13cf26a86771..000000000000
--- a/dev-python/html2text/html2text-2017.10.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
-HOMEPAGE="https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/"
-SRC_URI="https://github.com/Alir3z4/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS.rst ChangeLog.rst README.md )
-
-src_prepare() {
-	default
-
-	# naming conflict with app-text/html2text, bug 421647
-	sed -i 's/html2text=html2text.cli:main/py\0/' setup.py || die
-}
-
-python_test() {
-	"${PYTHON}" test/test_html2text.py -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/html2text/html2text-2019.9.26.ebuild b/dev-python/html2text/html2text-2019.9.26.ebuild
new file mode 100644
index 000000000000..8cb53b668f84
--- /dev/null
+++ b/dev-python/html2text/html2text-2019.9.26.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=( pypy3 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
+HOMEPAGE="https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# pkg_resources is used for entry points
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+DOCS=( AUTHORS.rst ChangeLog.rst README.md )
+
+python_prepare_all() {
+	# naming conflict with app-text/html2text, bug 421647
+	sed -i 's/html2text = html2text.cli:main/py\0/' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pytest -vv || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/html2text/metadata.xml b/dev-python/html2text/metadata.xml
index 3f2858f880fc..10cbc1a47a34 100644
--- a/dev-python/html2text/metadata.xml
+++ b/dev-python/html2text/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">Alir3z4/html2text</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Alir3z4/html2text</remote-id>
+		<remote-id type="pypi">html2text</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ijson/Manifest b/dev-python/ijson/Manifest
index 838818ebf34a..e10530698935 100644
--- a/dev-python/ijson/Manifest
+++ b/dev-python/ijson/Manifest
@@ -1,5 +1,7 @@
 DIST ijson-2.3.tar.gz 11800 BLAKE2B 0cdd2a40c483341dd9dcd4e7cb52c38752886d02e5b0c5982bad975487391cac31e2b5993118fbb526f91866dc8441a711ec16e0e8f1d320d32eb026bb4c8b0d SHA512 4d6647cb72661b26a3b36addeabec79fbc047a6c3b86aa419c178dfb8ef09bcdefdf37ed729f26b4b6b176cec06230ef3dab53bdff4c4b401bbc835eb486d038
 DIST ijson-2.4.tar.gz 17570 BLAKE2B 98301c5572597ab9a52c33dd92e1a2bf1fa9956415f21a49b13de438a6f295221da43c110f94aa280834b85993f4c8a3cfdaa060f28598e5af50510e7657561f SHA512 c93548a0719a9de30d504dd6179dbffedfd91228ef57fe6600af30eaa2338a2b720e6c9c5b386868198945714a725d46dd2dee6a1ae6d6a0d61eb0230eb35608
+DIST ijson-2.5.1.tar.gz 23258 BLAKE2B e41cb4d903399384a1a1d18941a2ecf36e80c762e5d4e3e854e9337f3a72cab3a61576d9d5170b11e1513bd82ca0e2158b8a88d4c30855674366fbc9172c5042 SHA512 f8d2cf0496357d3385e2744a4604cef1fd6fcd92cbd52c8803d7e831c091c18b718ad0c1dc8735c3f10df04e25fe69ef73d6935b2df6f67845493935e2ca529e
 EBUILD ijson-2.3.ebuild 572 BLAKE2B 83129c0128d58ad72e59247802719fb411d87df199049b8da127fdce10420d44a64166a612ba57482608457fbd7bb9295353c7aeb2ba90bbacb136e927926968 SHA512 34ab27be8015a47e18d149cc874812b45b67721c1a70a62264836360516fb12aabf336cd70d79f6dce3ab2f2676a60012ad12dab8f35532ce1fe5cf8285df77b
 EBUILD ijson-2.4.ebuild 617 BLAKE2B 58c80d28c3a87add553363b1046ad4b32f7cbec378fa45beabe53c0a8ac13421db9dbec1ec04e43858bb49636051caa26034c7b64226a53154b4069f48d38bbc SHA512 183fd41f6d35bac0111ed3c14cf1e2d6c13f6f30f859840c7ddd933ea18c10bc4f5a6b1ffde094994ec9b5016b31ea7fac22f1c802f35a313e0140f4ad450665
-MISC metadata.xml 375 BLAKE2B b0b47eb0f90d6dcf828b9c06d77d6292119cfdf53c6c7c694a478c20e16c677fdaaa9a6e443fa985af91658d1e258eb09642fd259d58793e6ab7d20ed979ade2 SHA512 99d84d8cbffb0864a3473385642d96238a3ec4679b13d60361ce147536e58780978ac5ca947533fd25d97f05ec9b011ce3a831c05b90a24281b828b03fb80919
+EBUILD ijson-2.5.1.ebuild 587 BLAKE2B 2fba7d9448ce618819e438eb1bbc14f8cb710c96ac5f93cdba71d22f630934cdf3696fe5a501464053c2e7b282199d8c671544e5149b5a82f3a6586da31d64e4 SHA512 64fe70951eba5ff1a14612420f39c4ea1902a7599290815588fbe27ab590783539ce70874a6a3876e4d31132a0c3f4c9d6730cf70e1438da45aa2dc4cf3c552f
+MISC metadata.xml 371 BLAKE2B b69568a1fd9e7578de49b729826c1bae5b6aef3c6e34d3c32adb9745e4bbb0541fe1e43730fff84aa0dc85b3b116c1e4fb9d9301b3c0f1f8c615c24141b1657b SHA512 874354dc3c06b919b563b13b0b0dd64b9e5af1fd759d199691d2e45a3ddf3fac61412452a0c746c22cb43c3eef379f3c391c2cb04d109ad6859ca279566e1108
diff --git a/dev-python/ijson/ijson-2.5.1.ebuild b/dev-python/ijson/ijson-2.5.1.ebuild
new file mode 100644
index 000000000000..91941962119c
--- /dev/null
+++ b/dev-python/ijson/ijson-2.5.1.ebuild
@@ -0,0 +1,23 @@
+# 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/ICRAR/ijson https://pypi.org/project/ijson/"
+SRC_URI="https://github.com/ICRAR/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/yajl"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${EPYTHON}" tests.py -v || die
+}
diff --git a/dev-python/ijson/metadata.xml b/dev-python/ijson/metadata.xml
index dfdc2dc6c0eb..72fd239d1c33 100644
--- a/dev-python/ijson/metadata.xml
+++ b/dev-python/ijson/metadata.xml
@@ -7,6 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">ijson</remote-id>
-    <remote-id type="github">isagalaev/ijson</remote-id>
+    <remote-id type="github">ICRAR/ijson</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 0c056f2a3c23..ef99d0bab5ca 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,7 +1,7 @@
 DIST inflect-0.2.5.tar.gz 109756 BLAKE2B ecb64b0fea04602f112dfba11ade6828eae7a7f3f44d4c4fb15c2300ac18025ea4c51f9c36aae5e7e92bd09e24d08091ce096b888a520fd2d4c40374356333d5 SHA512 68371158ac90d9662c19657cbf697f44ee9ceac090286d53e29ee04252efbb7d0bfbd99ae6847e6eec1991ef4ef670eff60693d1f0a301885bab2a09c7ce4616
-DIST inflect-1.0.1.tar.gz 110413 BLAKE2B 4c7a5801fde8e0825c7a18612d7d4b6e92534c742ca9021e31c77ffb346e4e5b83f2ca1336d4a4116b721c14d1d6d7387838eff5a52b198c6490a1d00fa8d1a0 SHA512 000cd0e16d16b67cd36914c11d2230268e49be524f184f247d5cea29cc6b69d7b7259b9a67174efd570a2fb9eb6c392a7a6e223d48fd04d824a625fb7fc7f2a7
 DIST inflect-2.1.0.tar.gz 98767 BLAKE2B 2cddbeb7d4ca5e150435e42b75e0eff2e2b20a8cf38c89fe6e8958bc52d69aa070f7ba5c6c73bfdd2dab585ceb32006542f31abbeccc2375760742c70e0c6c50 SHA512 c5230ad6f224a6e9667ce3c135bf43d09939bf457f68fb3d52a4278b110df10c9ddddd05e68d94f04a6902319ad71440440bad019c081d0d781a2dbde9ab98bc
+DIST inflect-3.0.2.tar.gz 71546 BLAKE2B 951eb818ba1645a9e426468811ad449378aa5a7341575ac2aff5e9d1e06237fe8e96fa64cd678665cd6c05e1dc5e477a65b261b9d8bd170be4fb923d5fb90e9c SHA512 5858548e947f742b91630fc584f568a2221057ada7cd4a55f39de1b52a82c97884d6a78c2f32e5995e354fd1c4eae4d5b3d30491ef57dd5187fd6baca93d2779
 EBUILD inflect-0.2.5.ebuild 552 BLAKE2B cc0fff049deeb0bee5c71e0fdc2df51d51f7679bedd7330678cd0b5614de848e3837de9a3e7715385c7f60017b29f762bc97290f86ae9820b2cace6429a4ad36 SHA512 0865be3db57cf0dd6af0028abba516bdc5cd2517ec69cf424945d9757c346f7d1e6bd9fa1ff6a9c90cd5bfd3e9c90adb4f12170cd390c44cebe0774c46efda20
-EBUILD inflect-1.0.1.ebuild 655 BLAKE2B d0c390edae482912fc9769187bafef0ce22279de2611821473bede85966e0dc637179595f6edbe267eaaf784d5cdfdf5e42c8e03da9900f21a355a74d866ddfe SHA512 f4712c81dd99ced656ac80c725a943508b6f6ce251d1d03db9303f6df1c4de3cf1e3a843a768fd349973334e4e1c417b3945eed50a5c960d162dafdd8b4e5038
 EBUILD inflect-2.1.0.ebuild 652 BLAKE2B 68279cced816dba3cba21170e05ce451cdf30e89954cb58c86a4610c57efb2515802fc08836a3374491c88ef035107a19b07fb5e72f0eab25fa8165080236c9c SHA512 803eae36303117e82095c6a7989fca1b72350a2e1bd8a7bf2f644af96938f7ea69efafd0d9d17bed4c8fba7ed3935cfa67c88ace0c69ef8eb38a2ce841e71078
+EBUILD inflect-3.0.2.ebuild 1222 BLAKE2B 28a694a6b0c6a75a189d84205d7ccb4b269a7cf0ff0ba40126d14006fb5a93913d7111d880818694b1014ba7867b2dbe3d7f8ef3287a2172d4afdd0de1ee46b9 SHA512 cef26dacb4625206006080e6d7b9e7c2fc533f4fc67b0816825c9f425bbea5ba042ec41d8d2e87158c79133d3aeda4dc8671e04ad552cd4a76c3ce5d7802a27c
 MISC metadata.xml 371 BLAKE2B 0c72b1b5bfd404e494c2a6e2f48cf56634981d6ac86026dcd43f9c81804099b0a4693d4971f50db501e1f9421b5952ee6ab65805fbb17213cd0af75f4cc5aa1b SHA512 266d5f9dd95fc339a8653f0f8342996d194565a23e8e024523e1e8880f900301ca796a2abe5f550c51281be0df59d1704e44bb1bfed000d5a880f1a915b8af07
diff --git a/dev-python/inflect/inflect-1.0.1.ebuild b/dev-python/inflect/inflect-1.0.1.ebuild
deleted file mode 100644
index 17f586434458..000000000000
--- a/dev-python/inflect/inflect-1.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Correctly inflect words and numbers"
-HOMEPAGE="https://github.com/jazzband/inflect"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests -v tests || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/inflect/inflect-3.0.2.ebuild b/dev-python/inflect/inflect-3.0.2.ebuild
new file mode 100644
index 000000000000..94231ddd4ce6
--- /dev/null
+++ b/dev-python/inflect/inflect-3.0.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Correctly inflect words and numbers"
+HOMEPAGE="https://github.com/jazzband/inflect"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+# nose is still required by some test features
+# https://github.com/jazzband/inflect/issues/90
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/alabaster[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+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
+	pytest -vv tests --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index 96aeea5e11c8..28810d0c4c4c 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,6 +1,8 @@
 DIST mysqlclient-1.3.14.tar.gz 91391 BLAKE2B 06a781f21f608246ec2da8a591d7bf5e430d96bc4069e589d6466a2deb4e53ab8a51db0015e4db73a748d6cbdba9c8c550e888e415cf9390afe5f0d7f0620156 SHA512 2623130f67b989f981bec37d19fffd400ba1b144657ff25575d055d19297d0f94c0a70eac980d90a76ef2b0455a56ca033ad92bc54c9456b2c57d5a84475ae50
 DIST mysqlclient-1.4.2-r2.tar.gz 85662 BLAKE2B 5e375c142d392d79ca3b119d52625c3c65a074fb90e71eabd2791823738995d390de90c50c20dced9df91e071d74d7a318cf09779c44387eb4103845486b48ad SHA512 d42969bc37b5148fed14b815280890f07058f75ef99390674f6ba3921f5dbaddc3ab2344f41e3b6d36f35229feffbc419a2ad31e2268e70165b1973356ec9c32
+DIST mysqlclient-1.4.5.tar.gz 86278 BLAKE2B 5ad1c6662c699dfa35e47734e211aa67bca2cb5c74194363b30a1d34a67bb5cd9d549448068aa9f912863e1457e13b42f765b7eaa95a9be0e8596dc550dcd977 SHA512 d6ea6c04618fd274544dccdefc8a7d8f94989a368404d0db1514710d03de5df5c8b864509d8a28feb1cd1d68d9b23967ae9a34f31dd5221b569e64d28a6be022
 EBUILD mysqlclient-1.3.14-r1.ebuild 846 BLAKE2B 3f8d0d6144cc07229f5f958ee4d0202dc2a94854c8dac3b4aac87c7827ab971c953692b12150299a5bdab63f147b7ff2a1b96b8e9430ffbdde5111c521d31e69 SHA512 fea2c38e6a0de96b7d155c857172990412ebaae131315e5d4bf1b08df80f640d427f1c5cf68f57963c4b2455357be4e55a312a2d7a2099623a604060724d4c39
 EBUILD mysqlclient-1.3.14.ebuild 830 BLAKE2B 4709fe700a0acc12b2766d173d8b18250bb1df1f6a4a9d23ad3fdddb85f9de4cd8f220b31f5b97a12a94d0124f792cc4cbf62033b738ae6b08883ece0ae7c8a5 SHA512 67b9953057b054cadf0e9085e60714a732e1ba7a2397be684a6ec7c29f704bfdaac8d5c2bdd0a1728dd04e3e990ab2af3a63ffc517a96c120272fb6f38c65064
 EBUILD mysqlclient-1.4.2-r2.ebuild 892 BLAKE2B 0e2e8eff2cefe75275d16d2931417bc57e5b3f75c72122a2c37237f11d2de418abeb301114eb035db5f4bd7719bbc6eaeb15417dc9f71c56926211261043e558 SHA512 3a67aef4af0646787caf5c1133aab4e06453c47b581f3eb8b74bf49f3c9ce15150fa2e4122a248ca4e34f5bb865a266a034a90820d00c6bed93bd5c4947c7486
+EBUILD mysqlclient-1.4.5.ebuild 862 BLAKE2B 47a80cb3830703d4f5f1498df921420e7f52e5b6103a85670eed17e93052aa61e18f3868f14315e8374b30b88836fbb9f3185a8b1bfe1eefe9ccc9c3d7fbfdd3 SHA512 94944e1615e711cdedb7bceb9997d6f4cf0b35c1d481e1fdb466ba79114eb70f6514643dede1bad3ce00a631302b37b95ed6d02fc73a2497c06d4b7d932c612f
 MISC metadata.xml 513 BLAKE2B a65aef9c59557dd33af579ee376553bd46fbd53158d0a02585b2403d6ee45acb281599ec593d5d75d69cc8bafd509a0851ab25764b5a79f3501a7cdad91faa40 SHA512 4a2756c3bde70c4fc73ba347e9648b356983662146cce5c1161f5d0c8333f795bc27d0aebe6019dcfe6402a51611dddfd87609c329a3c2fa6aa20808cee46b38
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.5.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.5.ebuild
new file mode 100644
index 000000000000..aea2ab9f288f
--- /dev/null
+++ b/dev-python/mysqlclient/mysqlclient-1.4.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Fork of MySQL-python"
+HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${PF}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	!dev-python/mysql-python
+	dev-db/mysql-connector-c:0="
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+DOCS=( README.md doc/{FAQ,MySQLdb}.rst )
+
+python_compile_all() {
+	use doc && sphinx-build -b html doc doc/_build/
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/nagiosplugin/Manifest b/dev-python/nagiosplugin/Manifest
index c8ea87e1dc27..cc577599d492 100644
--- a/dev-python/nagiosplugin/Manifest
+++ b/dev-python/nagiosplugin/Manifest
@@ -1,3 +1,5 @@
 DIST nagiosplugin-1.2.4.tar.gz 38290 BLAKE2B 4ebf230122a68919f82da7519e920b485075530cbde235d9f0d7a0f22e65a37c85f3ffe84af100f94ba8cee0a8e350b848d2e35606616808baada75c5abfddd2 SHA512 42c7823445c0dc1f5fedc6b8bed6c5be4e2b5e4c14cfa2cfbd158ae43485baa0fc74b80f9dcbb89bfdb27b984d72201c8a7c330c71d837c0f822603a5f8f7ae3
-EBUILD nagiosplugin-1.2.4.ebuild 537 BLAKE2B 0f6cec7fba70c18138d41bd7c5077077d6f9860935b765addd59e8abd311ed739557ab9d4ab236b75ed79c81e8c41995d539ede1efd2bbdaf4ef590f6e400860 SHA512 4a11598b08db93778b051135026b2e79e7cd105ace38475bcdac23e1e9b719fa37ea77b74b6f1b77b66aee6e82294fb4f00188500d528f0817ac40c3ee9474c2
-MISC metadata.xml 464 BLAKE2B b132f31c8611ba39b42c068d1efce0230f73aca04382ba1089bba09fa03e5f8c83ef8eebbbd74be55d113ece21890d93fdc07b211b538430a154169abe7edef8 SHA512 1476a7d2df7b50e0e908f970fdcfb7a63fa04f2014414e16c4dfa39659846fba26a6808949a741a1cc112edbaa500783db325b2ec5ab66ac72dc2e6152466c75
+DIST nagiosplugin-1.3.2.tar.gz 54262 BLAKE2B af2a8a876105a1ea26671b39d611beaa46303998544adadee3370c6d1b5096fa93160121f89412f3778a2bbc1c3e95606a49413b8f3f0880c9c9ca4e946fb1b8 SHA512 899650852397bffb66ad53843233adec2c91e96656674a9b21c5a02ed97ce4db69c1440d1b88c5799a54745e69b8c05f52188403b5a2fe9050acbd0067806d50
+EBUILD nagiosplugin-1.2.4.ebuild 527 BLAKE2B b0473f162c266619691935f8d7c92ad543203c2bcac1c68e38a1c8dd86fc11bac610e973fbff539aad41ab676e90646e73868730e63b54ad11e2ef879be70075 SHA512 a83503b8c92f7efcca305be3f5f8cd576759b896a9b30196b1dad232ec105b18f4866d67fa3fa1b2a58c6b1eb99245e073aa59a11d760cbe8f11069865186972
+EBUILD nagiosplugin-1.3.2.ebuild 881 BLAKE2B ea962b3530b161c5d8bb8bcf7a9ad13410ccdb0ac101b337252fff9b73f9997f6ba197ebf238455e523495f789ac2308c0c5a7df412dcb1c02538d9763f0444c SHA512 2b8b43a6049dfd14dc8bcd59aaf2617194fc17969f6e8c5f6dafa85187ecaffea0dc5740f11a66e0f141bae321be89c57b3c36cc2730a30e7d67214505f0b918
+MISC metadata.xml 452 BLAKE2B 39030b9d85edf373418952f1986d9a1b4c5a73ca191112d9e979b754eb12891f16a522d19a4d4278853ec4b07aaaf14537ed64eed658886c02859d8a451eb81f SHA512 2eec420a3b59460798f9d8504d86a8d01afd309867f0bdb0f46f5a87484c06f8398221946bff4d06c150cf8085a6cbc15a9e61ba815519e696a26376cc018fe0
diff --git a/dev-python/nagiosplugin/metadata.xml b/dev-python/nagiosplugin/metadata.xml
index 56b0f256a4b0..7f6a93a55022 100644
--- a/dev-python/nagiosplugin/metadata.xml
+++ b/dev-python/nagiosplugin/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">nagiosplugin</remote-id>
-		<remote-id type="bitbucket">flyingcircus/nagiosplugin</remote-id>
-		<bugs-to>https://bitbucket.org/flyingcircus/nagiosplugin/issues</bugs-to>
+		<remote-id type="github">mpounsett/nagiosplugin</remote-id>
+		<bugs-to>https://github.com/mpounsett/nagiosplugin/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild b/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild
index db0af6ad3e58..3d5a2c4be07d 100644
--- a/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild
+++ b/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
 inherit distutils-r1
 
 DESCRIPTION="A class library for writing nagios-compatible plugins"
-HOMEPAGE="https://bitbucket.org/flyingcircus/nagiosplugin/ https://pypi.org/project/nagiosplugin/"
+HOMEPAGE="https://github.com/mpounsett/nagiosplugin https://nagiosplugin.readthedocs.io"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 
diff --git a/dev-python/nagiosplugin/nagiosplugin-1.3.2.ebuild b/dev-python/nagiosplugin/nagiosplugin-1.3.2.ebuild
new file mode 100644
index 000000000000..cd0ca3c9a35e
--- /dev/null
+++ b/dev-python/nagiosplugin/nagiosplugin-1.3.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=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A class library for writing nagios-compatible plugins"
+HOMEPAGE="https://github.com/mpounsett/nagiosplugin https://nagiosplugin.readthedocs.io"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+LICENSE="ZPL"
+SLOT="0"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build doc doc/_build/html || die
+		HTML_DOCS=( doc/_build/html/. )
+	fi
+}
+
+python_test() {
+	pytest -vv tests || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/neutron-lib/Manifest b/dev-python/neutron-lib/Manifest
index 1b6ba90656ff..6a29133c55fd 100644
--- a/dev-python/neutron-lib/Manifest
+++ b/dev-python/neutron-lib/Manifest
@@ -3,5 +3,5 @@ DIST neutron-lib-1.25.0.tar.gz 434978 BLAKE2B 5e7687862a8e02b1b7cb1e10135f7940c5
 DIST neutron-lib-1.29.1.tar.gz 454760 BLAKE2B 21dc2059d7e34e8fb155620d176da999e839019915d6d37bfc0caced305964402a38ecc8f4cac59c1e9c89db9a57a6116082253d8359835ad0460e828c447a6f SHA512 b6f646806a137cd0114663c5f192b9b20ee72af30d453a19218a00f25cd48389f0888ddec13082838cf1c88cb6c9204a08f73b0605f82801b9f4abd610ab6798
 EBUILD neutron-lib-1.18.0.ebuild 2069 BLAKE2B 7f4a3e4ca80d7e6137cf1fa2643c868d51753abfbeb795c2c2f718ddc0b4d561b06f324172a1e456958372d3a3e8ebb19863ecc9d4a6d32c10c95e448d72baa8 SHA512 640f01ac20fc5be52fd846660868db2c82be065383bf5247096cbee1677262b6ddcb2a7e8808a87b7f98f05ce747990080d9a469c66ea68a3d8524ff0063e3d5
 EBUILD neutron-lib-1.25.0.ebuild 1973 BLAKE2B 77a522b5a6a28cf5929b9234a927f9bb83c6b788e1cf54f259505863c8869568f74c019306b2258d86f05aac7f07460d4e755be79a3ba3c8ac0a6c6da8fbddc1 SHA512 acb2ac65355cb7351f7e4b37c5ea345f5216c0e42c8a49d5c5359999c9ac1347ecd601a098d785526533c5f241e45991667a8d55289068ecc5efd8b5104e66cc
-EBUILD neutron-lib-1.29.1.ebuild 2067 BLAKE2B f1118432ef239e4375432a8d14efe643b43d4f47103273ed426d1c6dea200d970d5593fa16dbf2d8c30dfadc585c39a8f60259ed85941db4fdbdd61df64da585 SHA512 ecc77e2382ec6097589f5cc5c332cd9d392d93e9b49ae5eac6e4095782e636af8479564ab82f3ee6cf7e41b59c4d9340dd87092c510e7fe72e0989765db462a0
+EBUILD neutron-lib-1.29.1.ebuild 2088 BLAKE2B ee8aeb6ed37b1d88b42163f5db42529ec690f0649bc2323f62b539310aa0a45be9c66991dd5513aeaba35cd73bb0d058c93117747e5e8bf7a6e1e2dfed654753 SHA512 b50219928cf9bfa07b52a9d8bdf3b4d176cb4fed5760d341bcba893028a32535b993e573dcf75755d4f9bbe7b1156662da777084d997e8e168b52a63e0660659
 MISC metadata.xml 478 BLAKE2B 479b1ffc2e6b3de332fbdd2612c50a3471bd26615beed90810463b56122faf219cb602818de421a16c1e3227d13f5553d9db330dbbcfd6e67a725a3479566f3c SHA512 c642bad9f710c347629fca6952be3efe57e247dee81fac187d4a6458b4cb8280dc0d3d4a66e4d329bfd293b9e27edbb7a38247311fbb817088eeb70c441737bc
diff --git a/dev-python/neutron-lib/neutron-lib-1.29.1.ebuild b/dev-python/neutron-lib/neutron-lib-1.29.1.ebuild
index 05b744b8a266..027f06209214 100644
--- a/dev-python/neutron-lib/neutron-lib-1.29.1.ebuild
+++ b/dev-python/neutron-lib/neutron-lib-1.29.1.ebuild
@@ -47,6 +47,6 @@ RDEPEND="${CDEPEND}
 	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
 	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}]
-	>=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
+	$(python_gen_cond_dep '>=dev-python/weakrefmethod-1.0.2[${PYTHON_USEDEP}]' 'python2_7')
 	>=dev-python/os-traits-0.9.0[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index dca488e5bc2c..ce5469aece5e 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,6 +1,10 @@
 DIST openpyxl-2.6.1.tar.bz2 2403827 BLAKE2B 26abdea047b4d283f3d0e3ed499c1d7247d07b7a97426fd681d92798c7c49cc13fd53296e214d2c48e8461a80740a5ae600468bcf41c9cfd5b6f0b244ef3df93 SHA512 cf869b20ae8aeb068139eaddc8c915ba15405d531bc1a6e2b7c8068bad0ca628622c852cc1d4e11dfd8fab0078a9931fc33e5e47bda954b7cc994f60d79753fc
 DIST openpyxl-2.6.2.tar.bz2 2404387 BLAKE2B ce63ed51bc2f475fc12f510307e3cd417321588aa1a9adb5f8b780249898747babf211137d21442eceaff01bcfb4f7b8f3092b3dc64f751aa2b26d404d11fb74 SHA512 e037abd13e050e25146b016c578bb50c008b7c74a19702d9bae14b594ad5f30d352f8443fd5021a169991a96f5d19b84a3acceb9b05a713e8526ad478fffd31f
-EBUILD openpyxl-2.6.1.ebuild 839 BLAKE2B 48be3179e6206e68170ab979618c70d635ff05d256e487f3a187c7e14cb367c85755ea5c238daaabdeebc5847535cac19b94eeebc15c592c424a33b2812691d4 SHA512 98f40d7a3cf608d17a5c49c1f75278ab0dd8cf14d8c8122c99379794fe71d142208369209053a6cf93a1ccc331b111ac54536c6eb5df556b6d94c182e7489135
-EBUILD openpyxl-2.6.2.ebuild 991 BLAKE2B f96b0ac8d34094608a43c512aa4b3ae1861bb29d4da965f57fd1a6da5e9b3a901ec37568d2772647a310aeeb3bd69d8652c3224dfd50a8757ffde0d64e8f1672 SHA512 568bafa0b97f5f0be7305b6175334a62db4838df253e0ab3b89c2799f1d52cde6abfb4599ce40d17cc651b37ead94b3a66926ff591cc4ec249fbcbd55752c182
-EBUILD openpyxl-9999.ebuild 732 BLAKE2B cecca36def0b51c6cc78ae5573548abde5f636732ee725df7765d11548f2f135deb645414d961c3c46abf3a07b373f8adf2909072645b95d890d10b1ee16ff29 SHA512 4e0cfc6f865998e5ef2f07041cc0e8720a71c91d513b920c056f6240a22798d8d9b0dba6e625865a872787cf9c860634609a8577bfbe97372b7e3cfd5b25e3a3
+DIST openpyxl-2.6.4.tar.bz2 2406293 BLAKE2B 5395820c2b7a1c6f754f80d33f629b438cbf6421b91d8f3c0a3cd4b4105b84f1b4b90ec1a5557193924718e462af1720c166fc37295ebd0c3b0c270f4cd7af7a SHA512 0880c61b2f2fe6162a1aaa6815607ca20cadac3e58a92f737bc4c7a5a867a0d731ea3ad144d552fb2854b703b7426f1c8c3b3d8ea6c64ab2485f9733f0fabc61
+DIST openpyxl-3.0.0.tar.bz2 2405154 BLAKE2B d14e529c73cebd3eab6a4d93dc38c1807d38a5396032b4df77bc7af5d98b5b68369f1b44cce83d77592e7aca673ca497d49a1fafc1f0bcca3c0aff19486ea8db SHA512 fc0c31b1ae486f6fc8802dbd6ea2efee65e788b452240985202617109113dfccb5b26bfa94c2ac42a0ac218ff75bc310773f96122da1522537c063e8d55309f4
+EBUILD openpyxl-2.6.1.ebuild 866 BLAKE2B 375866ad3bf1672880dd2e1b1b5505fdc905e315c5bc8fdf537d959625ab967817a337ab5dcfc8a0cab72dfbed783bd10f49821ac0d8e57534af31f9d4f03b79 SHA512 314b97663e050e314360d7bdf8d01361c0a3b39b66d472278bee12620e6755d5bdb2eb7be117c8698ea209b6d379654e7106b7abc31841466936e3cf5462f614
+EBUILD openpyxl-2.6.2.ebuild 1018 BLAKE2B 270ecd698b2a66ed7b1504066ac274f5fa18d812db1a9d188368cfaa94570aa34c26de6a14a1ce43e93fab6dae93103a6c42599cb3a9ef02c1189407c311ba04 SHA512 5b3c675b9b02a6d23ef7160bb81cb1329324173ec491805269bd64a3c63505ff847f5fd3fdd90a15b0a7ebf300df558d15fe058b735c7e327d782445d14276e0
+EBUILD openpyxl-2.6.4.ebuild 994 BLAKE2B ac11b8779328c8f0df84d3205f298e25287ae323df3a5590b819cc9b9c9c52be5ceaf1e7cb755ff1f5e660ef3ba27f1c44b6922a7c58c798eafc40c7e6255f4b SHA512 8a756a3544b326d8602ea48362c1f5fec7ab2a5ef23443533f0270791a71b164a34ed595e6082fefab658d642906061704993520c2abe175f079361ffc842d80
+EBUILD openpyxl-3.0.0.ebuild 984 BLAKE2B 9066e8b85cbeca35861d188b69c2c7bc9a4fe3ccac196308712a1116a187640d0eeaddc40b13df2236bb6a0fc853603b1d8095858ffcafd3dc26a9b1a8aa3db7 SHA512 24515bab42ab933ba2a55aa74dd45cb012fba878af7fecc75571d0308b58d5159fd18dda3de5fb1dd8f4204248ee3c40c6e516d9d826c71fdec030e3d54510b3
+EBUILD openpyxl-9999.ebuild 756 BLAKE2B 8387d571e2a2d03bbdd228c211d75e8fc6f5a4f0f63fdd79fc381cb42e40df2d90ed9568b05bdd85540e2de68b1db7b22c374c00d0f54cbeec80c1c2432b1d88 SHA512 ffb3237c48ae30083bcb97547605216c77d785ee3be35677ed8facd48224626836f38f289458a9f5549b3a24099d9dd231d80729e778a0083fffa7136997ef7e
 MISC metadata.xml 653 BLAKE2B 7ea56953654fbad2982d2fb0569396bca3d32e2068bf6bceaadbcabd4b02520aea7f0ca04e810bfa5f8c3756658fe1915e53bb824eefca3c420506ddda048656 SHA512 4f8eba0d2bdb3a5b621abf9f2eee89d576d86f5a3e694b9755b0cf55e178e584afa599dad260ff5854cf6a00e0609d740727a62d1addeccc59b05f9e31e60fca
diff --git a/dev-python/openpyxl/openpyxl-2.6.1.ebuild b/dev-python/openpyxl/openpyxl-2.6.1.ebuild
index 7d8a538f2815..8255efe44d8c 100644
--- a/dev-python/openpyxl/openpyxl-2.6.1.ebuild
+++ b/dev-python/openpyxl/openpyxl-2.6.1.ebuild
@@ -17,6 +17,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/jdcal[${PYTHON_USEDEP}]
diff --git a/dev-python/openpyxl/openpyxl-2.6.2.ebuild b/dev-python/openpyxl/openpyxl-2.6.2.ebuild
index 5605f80fac2e..23c5dc191c02 100644
--- a/dev-python/openpyxl/openpyxl-2.6.2.ebuild
+++ b/dev-python/openpyxl/openpyxl-2.6.2.ebuild
@@ -17,6 +17,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/jdcal[${PYTHON_USEDEP}]
diff --git a/dev-python/openpyxl/openpyxl-2.6.4.ebuild b/dev-python/openpyxl/openpyxl-2.6.4.ebuild
new file mode 100644
index 000000000000..a737ad853545
--- /dev/null
+++ b/dev-python/openpyxl/openpyxl-2.6.4.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 vcs-snapshot
+
+DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
+HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
+# Upstream doesn't want to include tests in PyPI tarballs
+# https://bitbucket.org/openpyxl/openpyxl/issues/1308/include-tests-in-pypi-tarballs
+SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/jdcal[${PYTHON_USEDEP}]
+	dev-python/et_xmlfile[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
+	)"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	pytest -vv || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/openpyxl/openpyxl-3.0.0.ebuild b/dev-python/openpyxl/openpyxl-3.0.0.ebuild
new file mode 100644
index 000000000000..b29ebbc9571f
--- /dev/null
+++ b/dev-python/openpyxl/openpyxl-3.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
+HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
+# Upstream doesn't want to include tests in PyPI tarballs
+# https://bitbucket.org/openpyxl/openpyxl/issues/1308/include-tests-in-pypi-tarballs
+SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/jdcal[${PYTHON_USEDEP}]
+	dev-python/et_xmlfile[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
+	)"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	pytest -vv || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/openpyxl/openpyxl-9999.ebuild b/dev-python/openpyxl/openpyxl-9999.ebuild
index 01c0171d12e5..7c1e47d57b1b 100644
--- a/dev-python/openpyxl/openpyxl-9999.ebuild
+++ b/dev-python/openpyxl/openpyxl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/jdcal[${PYTHON_USEDEP}]
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index bdabc7525ea5..eae6649f15f8 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,3 +1,3 @@
-DIST phonenumbers-8.10.18.tar.gz 2307397 BLAKE2B 13e39a6fbb1a3d08dfbd373f1e425a8dd7fc7199e9cf0eb4386bf9cf1dcdaa6e90ff9cf1aa5ae9296397f827e8db1f02d740bcffba40810f4e6d74563b398dc5 SHA512 001c549d561770d1e0cbe6c8b15b091fad0eb362d5893b4d066f773ef497ed3b2b27c3a85f7114c1d8b41a16614005b8947ee5189b5bebfc6ee044cd3f0fa30b
-EBUILD phonenumbers-8.10.18.ebuild 510 BLAKE2B 2f8013c2acde1e9d4540256a1ee32649f126c6cd47f9e7a788ada68d82c7780ce1406c672136c0f9b42d21fb4955d8ee9ce133c1940233e5ed6ca5cd42b31c96 SHA512 a045105915d6c218dfc40be08afd0dcdbb5527cbde69bb1bb8da248b4ae759d7a1accda89271e644311f14209791c946145351b87c70042868f44cd1d35b2746
+DIST phonenumbers-8.10.22.tar.gz 2307815 BLAKE2B 397711a4cca97be68986cbb21ab971710c213a74fbb0e2c79de67b98ab44c3e25e95f6bfc2c469c1abfaf0d1c3848114a0be47d08650c7ac57a01240b7a79270 SHA512 f7c540276324a373bc0caa9aa3b87da31b98bfd24fbffab2f9137f0c6f72bba88022d9820193dfe482ee621fc3c90126bd93cb51bb4715dcbd1c3fa689e055b5
+EBUILD phonenumbers-8.10.22.ebuild 537 BLAKE2B d6869aae81a5b58c959cccff9317da77db0227abf34fc10de8c008ea543cc1dbba60f513da3e8b32d332323c1edb33990543569c47a2d7354f69277df28ed460 SHA512 b3491ad4d8209a1caa7f22d412863f14fe083a6f83947271ead7cf9af06a062972d61663ab092dd20bcfa39509cc26db228cf8973bb346257fc6fb75f646e298
 MISC metadata.xml 392 BLAKE2B 132a6d6143f7bdcca65dc93f90077577d9ea472aa6f2b107224f60a07c047e7e93a6fc9e9686e61d78299a0776487171e177c5fc3f6c85be74e29e1cd1132b22 SHA512 a610d3e2399621a5d222ae3de92108698785b077edc4bc969930fb60f6ba2364f6795538c6647fe46cf21c599ef00ecbab3458d45fb1d5f849e127c06f0b5634
diff --git a/dev-python/phonenumbers/phonenumbers-8.10.18.ebuild b/dev-python/phonenumbers/phonenumbers-8.10.22.ebuild
index 6504f27a128f..dd568b8273a1 100644
--- a/dev-python/phonenumbers/phonenumbers-8.10.18.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.10.22.ebuild
@@ -15,6 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/piexif/Manifest b/dev-python/piexif/Manifest
index b471fbc4a55f..b7df80bf6bf5 100644
--- a/dev-python/piexif/Manifest
+++ b/dev-python/piexif/Manifest
@@ -1,7 +1,9 @@
 DIST piexif-1.0.12.zip 1005725 BLAKE2B ff370dfea7b2e3b0013c484c586a294ed3b1590f9248104927974b4f7d2b82435da8fb0d8345ac23bd724606e0cefc2594ba9fa49c58d0f4f00219c1a4ed6cce SHA512 71de13b30d041c2de2136e9299bea96a0446352815de5358863324743aac6a5e187800214edd209dd212108ce9a0b0b4602aee54dd54f8b058228b255b543c63
 DIST piexif-1.0.13.zip 1008345 BLAKE2B f2f1ba520d661bf3f50de41b81ceebdaff8db2d83f76d4202771438d78c30beabf118f5732a5e76a6484fbf2bd850b461a9d1a0b675f12995dd7f3c8bb32e6cf SHA512 4234783a639e777b58eb0b4591a272d7d5e8c116a7a242cf36287e64d15089478c88327a16b4fa75786fc3621a6bf647f6a075fab0708e2d0aed6395f95b92cb
 DIST piexif-1.1.0b0.zip 1010925 BLAKE2B dd0eb4cd98cd77b639d88181f7f50201928d683285c661d6fce98c2cef92adfa0a809f45c3dbd38d25745fb1c88f21d31d45871b328052043abe4a247940db62 SHA512 6549f2b1f4a36b3455d561109fc9bdfc130f668ffa78af45ddd1c9ab9264af26617f8d9c7072b2e097d3951a931fae3d8b495589d665d972097411299e24d6e4
-EBUILD piexif-1.0.12.ebuild 559 BLAKE2B 4795ed5b6bd024b24cf58e57f8774d90ff23e0703eb6ca6497b1c6f67894b47fadc45c5eebaeb8a48fa195ff4c03e8a637b1cb2bfb90a9a7ee4b0d0da8bb90e4 SHA512 68286a25b0eeb2c838e6f9eefb61f1ae13c5b1b7cbf9f2ba912f03c6e186e6022191bd97e28f4bd90caa5d572490be58ef3d92753acaa887c24263e12e2f5ccf
-EBUILD piexif-1.0.13.ebuild 560 BLAKE2B 3285a5f23266ac1b496d5a96b8d04e1dfc0fbcd65e18b2ac482e9214dd3420970a84e1218c15e8cc833f2133ed5c1330ce05927b4855f82f2350e7f2cf197839 SHA512 a12ef1982f443654078d14aa8891cac8f72588e602dd3f03ccdc4e99983ea5f45223e62f4d246f0b263b01bfe8c27d547023a8ca8fb206cdda7931fdd632b7fb
-EBUILD piexif-1.1.0_beta0.ebuild 612 BLAKE2B e70f34f1b24bf10941ffa5bebb9eee35cd2cbaad225f0da021af4e54e875735265f60af38186c1da087fff66c410bdd5c85f541ff68e42cd0f8563fa38452df1 SHA512 a466756de158f465f55295c6a347f561afcb08f24eaff1bc0068d0fe402bce87d22ca06e6af09b11785e628bc5cc2e2a0a6da4ea58e2817f349717e6e99ab872
+DIST piexif-1.1.3.zip 1011134 BLAKE2B b27d4419cf545f6205b13c5646dff9fc7b1ce6e5de538f6a7189e6cadb54d301e11cbf0feaed8b073cbf16de95d67c621b68657b35fc0ba2025281ee64be4e51 SHA512 df5f7793c39911af58bbae76cf998e2a7bc820b84dcf9808ee8f6a38f766f824fef28392ef88387e18b10c270c4b27881be310f0368076b6fb65379a11a93270
+EBUILD piexif-1.0.12.ebuild 586 BLAKE2B 225b9fa4771dc83fd1852b5258394b03194663eb981d6874bee0d5a810cd44fd8112211931d2d054828f1977b07a1b961b23cee688a8f3110b0f6e23f4ba50a0 SHA512 91b8a00ebb7d0422d88ea74e230796b0510b93a6bbe6eb2b4a9e10b58e927f35b55b40601245ee98e0bca989ed6c3e1511d16a640938559255fc889027605099
+EBUILD piexif-1.0.13.ebuild 587 BLAKE2B 430c636e7df374e281fd3b0b861a5b6c8f2ff1810c8ab4499f6c4cce6aab853c45ff3e632e18625939f46460856a2787bfa65e94224c41ed9f1df8c7182d2c97 SHA512 1d91c58aa4deeffb2f524ad4fa2baf440f91816baf1049fdb3bea92c48be2b0a596a39db78da51f69bcff6d657291604cfdb9e6d29941c0692232f5fc18ff59a
+EBUILD piexif-1.1.0_beta0.ebuild 639 BLAKE2B 6fe27609bb73e56782e47faeb607264ddc59bfe606c3d707e6926d9bdf66247f67d28125e3e2f77ab3519295edd25215914d3b008afc0d4468fef9ad476c04a8 SHA512 47b3eb8348ee88b1a4e3cbf40220f2ed7fd92214e3b32d9675cd79d203314b0b723183bc9e1a9d1a51183e5722e353cd3ce5638abc54462302eb206252e0cd4b
+EBUILD piexif-1.1.3.ebuild 600 BLAKE2B 5d275499e92b285f34f1021f83f025680f51221f4ad273404252a709549bd9d57c383372b62bfda63f156d8bc678cd9078bee11ef4265976cd05cb679dded569 SHA512 5518cf94218d9d43733e659578ff39323258edd87f743314332c619b54b7e0b669bbacb55c6d2cca22849336510777bae66b097a568514a185d239de392495fc
 MISC metadata.xml 216 BLAKE2B a7f17874d9514cafd0bbab739d143a00ac66ad8446bce8e05932d122c1631d29ad8077c2bcda021bc92b7e89b77c03d55e8997cf250f3bb55f8a1aca046bb2a7 SHA512 1de1c9f4b223876125a0321126f2d7b1b564a113d24ae86b380c4d67bdf58ed4f2ae1a1f5d686211ccf4851eea8e970c20109977abbc79d0cd855164b6474e23
diff --git a/dev-python/piexif/piexif-1.0.12.ebuild b/dev-python/piexif/piexif-1.0.12.ebuild
index 24123adeb4f1..d831b6e88fa8 100644
--- a/dev-python/piexif/piexif-1.0.12.ebuild
+++ b/dev-python/piexif/piexif-1.0.12.ebuild
@@ -16,6 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	app-arch/unzip
diff --git a/dev-python/piexif/piexif-1.0.13.ebuild b/dev-python/piexif/piexif-1.0.13.ebuild
index b5fdd84359ea..e6fd91be4b35 100644
--- a/dev-python/piexif/piexif-1.0.13.ebuild
+++ b/dev-python/piexif/piexif-1.0.13.ebuild
@@ -16,6 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	app-arch/unzip
diff --git a/dev-python/piexif/piexif-1.1.0_beta0.ebuild b/dev-python/piexif/piexif-1.1.0_beta0.ebuild
index fd4b65576b72..7cead2ae93b5 100644
--- a/dev-python/piexif/piexif-1.1.0_beta0.ebuild
+++ b/dev-python/piexif/piexif-1.1.0_beta0.ebuild
@@ -17,6 +17,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 S="${WORKDIR}"/${MY_P}
 
diff --git a/dev-python/piexif/piexif-1.1.3.ebuild b/dev-python/piexif/piexif-1.1.3.ebuild
new file mode 100644
index 000000000000..156df0a63aa1
--- /dev/null
+++ b/dev-python/piexif/piexif-1.1.3.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=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Exif manipulation with pure Python"
+HOMEPAGE="https://github.com/hMatoba/Piexif
+	https://pypi.org/project/piexif/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	app-arch/unzip
+	test? ( dev-python/pillow )"
+RDEPEND=""
+
+python_test() {
+	"${PYTHON}" setup.py test
+}
diff --git a/dev-python/pymountboot/Manifest b/dev-python/pymountboot/Manifest
index a64828676d46..f5834ce16f53 100644
--- a/dev-python/pymountboot/Manifest
+++ b/dev-python/pymountboot/Manifest
@@ -1,4 +1,4 @@
 DIST pymountboot-0.2.2.tar.bz2 4098 BLAKE2B bbfbe631313189e6aef684ff29e73fcf2dcbbb998528103afe9c89e517e5a6c13bf6e05ced7c2eb05f668e0cc269212618b648043b65fb95da2e1b46c37476ac SHA512 bb6ec0772300b2edf9864a09ff64f67ad99f0cd29b009793e1b2a590be48146640c927b5772023d27e68fc2fba51652a55ab66d1cf875dd9b4134f043ac353c9
-EBUILD pymountboot-0.2.2.ebuild 597 BLAKE2B b6b84a76080f91afd8a25f0c7d16930849e392c5cae4ae165c739f88452821e29eb9cdeba19e29672c5b0efda4a6b75c7eb641ad07d5a3460967339c155ea7d3 SHA512 2a624ca96379f7b9f2a4c9a2010fbe84e3cb8dd3308fc337167667db0ef2af00c0e96c630f69221023b289197bf995e558f6b219d30ccd9bcb12c36b0a989008
-EBUILD pymountboot-9999.ebuild 722 BLAKE2B 49a12a2aeac7db34a0924a4302419da74e150a384e2ca27a85769aafe15dd3c1bac52387894ac9df18c4e38b4bc4b27404d2416a5fee8ae54b1c36d235a8b563 SHA512 3d36f32d071693fd2c59d36bc9681b1453076b2bff70904b535172152743fee82923d8fa16979f9a7b1e33321946a72a07b2cde9e3c25a7a58d72c56f67af15d
-MISC metadata.xml 539 BLAKE2B 0ab0699ff77f99bb28bfc66ddfad742f877f256a597305b3ce4d4a462c865696a7c466e32e0f68eccb138d367c5d360880372a5816683fb49d1063a5c55d9249 SHA512 d95f758cbce79b166abc9cf68c5605e03a4b5f168a25e46016c812e667bed8ce40a146beeb02ea236890f081154e2239e87386ccb37aa29acbb134fdf7704756
+EBUILD pymountboot-0.2.2.ebuild 615 BLAKE2B de114273c672574651df116cafa1326d9fa0ac3457d1ffbd117cf48e9727165ce04b69685f06db0cb53b6ff565e6b62a22367ba5c0458402e5e7e67378d4bf86 SHA512 3a7b02f50498c5a84cef10d7dfb0c972ff78091a9233f6e2f973e9985f0c949acd3a4790efad411dbbe96437699d7874cd72a62341ede465aa0163b2c295f751
+EBUILD pymountboot-9999.ebuild 572 BLAKE2B 540d38ffa2197a7f6a57bea60978beab6549a0d7d7571cfe0abe94fde3d8896e0500ba442ae56baa2a1ca4e6202c0f2d82caaf35bad39203b27538045d5b8bae SHA512 fdea9fd0052c1bb658babd110dae4fac8188f12aa310b036ce04c52c40b7bb1aeef660ac4dcdd54b00a079d1e6e198ef82601bf43bd5063eaf5625c85ac0a7f9
+MISC metadata.xml 533 BLAKE2B 682a500aa018e96494eebe8a43af1bdd269fc0a0e049b2b022d014bd8e977fe8160202263d5d6ed5fb5022551ceee3b77ca92f58cdd272faa00141995afccfb4 SHA512 b0708a5c130422d6d5150f1a1d07386ea3494fa667acc4e05f41550d6c33e7334b559fd0b3e71bdce67b53e109ccdcba4e845ad10a0fd39b6505b8ce8b27d17c
diff --git a/dev-python/pymountboot/metadata.xml b/dev-python/pymountboot/metadata.xml
index 66d4e59e6ec1..2ff52efa3df9 100644
--- a/dev-python/pymountboot/metadata.xml
+++ b/dev-python/pymountboot/metadata.xml
@@ -10,7 +10,7 @@
       <email>mgorny@gentoo.org</email>
       <name>Michał Górny</name>
     </maintainer>
-    <bugs-to>https://bitbucket.org/mgorny/pymountboot/issues/</bugs-to>
-    <remote-id type="bitbucket">mgorny/pymountboot</remote-id>
+    <bugs-to>https://github.com/mgorny/pymountboot/issues/</bugs-to>
+    <remote-id type="github">mgorny/pymountboot</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pymountboot/pymountboot-0.2.2.ebuild b/dev-python/pymountboot/pymountboot-0.2.2.ebuild
index c8572aee6146..8260ec0bb9dd 100644
--- a/dev-python/pymountboot/pymountboot-0.2.2.ebuild
+++ b/dev-python/pymountboot/pymountboot-0.2.2.ebuild
@@ -1,14 +1,14 @@
 # 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,3_7} pypy )
 
 inherit distutils-r1
 
 DESCRIPTION="Python extension module to (re)mount /boot"
-HOMEPAGE="https://bitbucket.org/mgorny/pymountboot/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/pymountboot/"
+SRC_URI="https://github.com/mgorny/pymountboot/releases/download/pymount-${PV}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/pymountboot/pymountboot-9999.ebuild b/dev-python/pymountboot/pymountboot-9999.ebuild
index d2f6dde8a987..7c94b1e3d222 100644
--- a/dev-python/pymountboot/pymountboot-9999.ebuild
+++ b/dev-python/pymountboot/pymountboot-9999.ebuild
@@ -1,33 +1,23 @@
 # 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,3_7} pypy )
 
-inherit distutils-r1
-
-#if LIVE
-EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
-inherit git-r3
-#endif
+inherit distutils-r1 git-r3
 
 DESCRIPTION="Python extension module to (re)mount /boot"
-HOMEPAGE="https://bitbucket.org/mgorny/pymountboot/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/pymountboot/"
+EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE=""
 
 RDEPEND=">=sys-apps/util-linux-2.20"
 DEPEND="${RDEPEND}"
 
-#if LIVE
-KEYWORDS=
-SRC_URI=
-#endif
-
 python_compile() {
 	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
 	distutils-r1_python_compile
diff --git a/dev-python/python-stdnum/Manifest b/dev-python/python-stdnum/Manifest
index 107935faadf4..693aa7ca48d4 100644
--- a/dev-python/python-stdnum/Manifest
+++ b/dev-python/python-stdnum/Manifest
@@ -1,3 +1,3 @@
-DIST python-stdnum-1.11.tar.gz 835905 BLAKE2B e6a65d9bc96879a7c39fc1c9c0d4442f475cd01b21a325274d98e237f4edf0bf8d5b27ef91696a5465492cee006e87d4d7969c5b8c531c6e8a6c7d839c302b10 SHA512 1369c38c93575aefdf727f831f68f7858390d9d29d5f1c1caba0de12afd994a5c6e9b89f76cff30a694ae056b19816c813e9c42f8a7a882f5b9257c374dcbad1
-EBUILD python-stdnum-1.11.ebuild 614 BLAKE2B 11aa8d822063c41ad78b537f6827db283bea94898a9d178e60f50fa31fc2c74ba4773c5823060b5662807ace5eb2dc299c0e2b406de7966adf78b0360d2da22e SHA512 7b749c043d71417da282eda9a1c55cd8fcf09020f97977899018abc68d91674f1c508a706fd995bc25aec23788071e06ebc962d78050a476f59983dc4291e8b9
+DIST python-stdnum-1.12.tar.gz 882778 BLAKE2B 49b0b83b8a76cf8963b35729b8acb1bb7f6cc8071cfee5490ba8f60fb2b74df28e11e65d9dafe6c717d297382628fe924ab5e193d8a39597cc214b98f12fa5dd SHA512 7eefc997494f538cddda8a6ca60d60c52e35f53023edd69b540c3f1aded00d795741ef429f84be6637e737e031b0ca771d4c1a060c94c90d7aa4144cdb0a536f
+EBUILD python-stdnum-1.12.ebuild 641 BLAKE2B dd6b4835068745a5b9b829fb59f74b3e8e7740be151f594e591d048a2b298e51db21502a4828f1f29ecd55df6b38938c06d29c67afba94b976182ad332998d91 SHA512 e915a3d92b4c90f2d88be84500f42ee167238fff29dafd46b40b901b05e7631193f3ed187fa2380dcd48067a5d5f54a1c77871704a1afeff28790a99a035e3cb
 MISC metadata.xml 475 BLAKE2B 4a2fe0a8f727cfaeb086d33e384b52ada0555f7c57028470c1ab2524bf4e12cb4b501736a9e9b0d14cfc66880e2878d93cea188f035fa52b8c959dd99d034797 SHA512 4aae016f69e817168682ce7a08e9cd61da5397d83706b628b4a743491251c80ee0947f5a00f3f3657c2f80f276661f0287a5359041451b997c214ba94cd2430e
diff --git a/dev-python/python-stdnum/python-stdnum-1.11.ebuild b/dev-python/python-stdnum/python-stdnum-1.12.ebuild
index 18bda3addee0..afa8a22186a7 100644
--- a/dev-python/python-stdnum/python-stdnum-1.11.ebuild
+++ b/dev-python/python-stdnum/python-stdnum-1.12.ebuild
@@ -14,6 +14,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="vies test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="vies? ( || ( dev-python/zeep dev-python/suds ) )"
 DEPEND="${DEPEND}
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index ae1fcbd00ed5..874767d99de8 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -3,7 +3,9 @@ AUX 1.9.0-mapping.patch 561 BLAKE2B 281a893fa6d0d589eb768c595e8931e4d743be9bc7eb
 DIST six-1.10.0.tar.gz 29630 BLAKE2B 1f380dbc7a9e746b4a7909de54a58a008a73d7b6c582611b2481475d5d9971c936b1742ea0821c65150694914af72f43155caa54616268735a4bd2447d5b4ba4 SHA512 9a53b7bc8f7e8b358c930eaecf91cc5639176a699830153f586780c3e6d637f1bd31349a69c383574f99da19cb3a36524e7733a318f3572b27aefb69c6409c2e
 DIST six-1.11.0.tar.gz 29860 BLAKE2B de4886ad9af7aa906f9eac213544c99323d74c1988d9abff96ce6fc3eea4464e577511f7c52328cbd9e6989db2128fa8d1ee57f9ce7bfc36b83ff655691b46c9 SHA512 33f246a2e987141e17e5edad9d3537cf3aba0cbdd0bc2a907ea52ce0d674b1474f29c3dd5cc26605fd960396054b189ca5f501708333cad234c223131483fe24
 DIST six-1.12.0.tar.gz 32725 BLAKE2B f40621076a7bb2b3b86d9f6ee49056a598e4853c6150952902053b8cfde86e562a7656b6ca3c3108f407d392cf7c1164a61b36142efd565eda909b8733c0bedb SHA512 937728372edf1e0ac13bbd706723d0de35e015c30d0ae41f789c5ed2e3669bb0db70cdc6e036ec2d437a6c4aa0d5d1e727b6d09ac34cca7e4e92e5d3b4775151
+DIST six-1.13.0.tar.gz 33726 BLAKE2B 9910a72eea4adc030710b67252d01fd74ce4205bd4e0ccf662bb2bce8837853cf341c765e4f9ba2db3aaeca050dd2b1ccabefacf5c71383dad1d275326313ef6 SHA512 55eb8e23e529cb0d2ab9e7c85868e695f36c8235e914b1548eb4b9fd561e4237266bf1839457f15a9513d57a343cbf8ab809d6187499300791fd9356854fcb00
 EBUILD six-1.10.0.ebuild 1790 BLAKE2B 6a65aca8d3ebf72591fa2195d986d9a3a88c46b6d08d2700cc80fbc8c2f1d28004f56a1ac715c6415b085a6a70ad55295bed6b1ed1b50e0dd9f62f0bff5c1be0 SHA512 925fda6e0e1da4566e89c4a8b78962a1d043b5639a36e6433cd4f2c55aa90750139bab8ef376fa85b9277b2eae85aab0dcd007d09a3296d8ff45a940d86b1b73
 EBUILD six-1.11.0.ebuild 1054 BLAKE2B b9132fa3c45dda3702e13d39de4a17415c634eb4ce5b8530b38c9eb4a656d94f4a0f900996178160dab532f2c2e2a12814ba530d751dbc496a0953f4a89a15fa SHA512 2002bd4217389a2f5b13fb90afbceecba7a1152cd8604739a1d62f927dfa3f1c5229b3a8d584fdcf72ab210201e5551be08554250bac6240f71f8160f8886ace
 EBUILD six-1.12.0.ebuild 1054 BLAKE2B 6a299eb827241e210d8bfe13d19f71d10d4eb39b02d38a68202dbc99704e8ed6f5cc72ad9572a5a528d4585e8accf881ebe16764b1aa4f70a715869320ea1586 SHA512 648e5fb86fe1e6eb6c7a35211f1099a88623f566fc9c0280e4c3dd814adb7c8e978cfa45c4cd417d5597cd41910c8d7c4b5fbdd3007558e12bdb7a99695ea5d1
+EBUILD six-1.13.0.ebuild 1094 BLAKE2B 9ada3798d2b0b42ccb325de407ebd3798a4ad5952fd271b7b9f511ec645e639cca2a4d5e14632228e16d3ca69c0ce24994915a93fe767531e7f92b6ea25a1075 SHA512 9044271a3aaa1676d85748e5ce4b27ef2f1ac34a17ce48d046f2053460336096499a600e5816069b9f187cae0f75c9af06c59eec0d49a522f67871c6f38c470a
 MISC metadata.xml 371 BLAKE2B 475b717d4c4bced0454ee0244b5d30f178098ff45b2fc7d168b41f446c4e8f3f2dc022ccadb953d6f4e905f95e38769657d42fb4d80157c816d6e7b5eddb33c2 SHA512 8171125815ab60f7c9a2756367ee6532fd862c5f411ff828b6555e4e21e6d43672f2c764f92134f6625abb161380bdbb739af259ba88c974cf3583f35af76a91
diff --git a/dev-python/six/six-1.13.0.ebuild b/dev-python/six/six-1.13.0.ebuild
new file mode 100644
index 000000000000..9a10d29473c0
--- /dev/null
+++ b/dev-python/six/six-1.13.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 2 and 3 compatibility library"
+HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx )
+	test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/1.9.0-mapping.patch
+)
+
+python_compile_all() {
+	use doc && emake -C documentation html
+}
+
+python_test() {
+	pytest -vv || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( documentation/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index 7d63a0cd6cb2..bdd9bb64f6f5 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,7 +1,9 @@
 DIST uvloop-0.12.2.tar.gz 1922375 BLAKE2B 49d17dc0899d59975d02dcc0b56e53e506e83a7f02ba7e9021abf92e8518b9904905c0175c3e2612a10f6f6d7a69505bfb024c00debf01823dcfb597966ab1a9 SHA512 59e34c83946facf70e839831dcd61fb7a8cf22df48d2ede6de84edbd4af5e789b2b404c8b7835e9a8cd7be706ad370bde2a290beab72c5d7411d35d07ee7974c
 DIST uvloop-0.13.0.tar.gz 1989805 BLAKE2B 5e825f54ab925056847b8369dfb4deaf9bc8120f7b9f3a0c58267954cf2d374f7ad91393744b7defaa3ec82f5d476f97a5555bc305d80106c84de71b7cdbc7f0 SHA512 4e24db94d207f23287a28d5b086cbd0a358f2fb3d35b55e9913b7b0867e4253259171f4d23969990b1e041fef0a28e44fcd1737e9be319293d223d987033de98
+DIST uvloop-0.14.0.tar.gz 2009041 BLAKE2B 4d984f5023e0974ee68795e6cf29585cee32345e8a682611a72dbc36efefdfeeecb3c22aecb581ff7e5ae826345e1de3b0e6c7a6e8319829b0b3cbe5a180ed11 SHA512 8a9a64c91fd34c65a1c40d8d76ad7dbd7e959d45188ef81cdc06995312f52106b2c648a504d51b64b470e54dfc4854dcf9a05cafa3d4a42f1bc1e31766114d61
 DIST uvloop-0.8.1.tar.gz 1719488 BLAKE2B eba6e15c8eb46286b6e8df6043280ec8b423f097fcf2d4d5be657ff18f0fb97ce83e5268a138cf46700f54b7040353b6588dc4b0140e11f38d7da2e26b1ff120 SHA512 45dba019a0dacaae6c2a732c3f321402c19c945b0d9fa35b9cae28f888a54c7d4b322b450c55a6cf21c1aac01dc49b90eccdffbf4cb8c812a5ec8b9e805e01e4
 EBUILD uvloop-0.12.2.ebuild 1187 BLAKE2B 19863628a45b97d7033efb15817b602dd6b83481c03fe3d47765b4027413c1fd2ab326f5f3096449131f684183c0a0ce1dfa73b51541ec3c78c07f279dff4358 SHA512 9dbd7934e45e04f06736994bc4b92ee0d36f8458402764332a22311435cecdbc46e398f7885bb7a933ffcc6502405bcdbe4f4180107857b83c6aafb127b96bb8
 EBUILD uvloop-0.13.0.ebuild 1148 BLAKE2B 89af9ff9acab2d2c2abb5a74b11a522c95bc1becdb1a44079227ab04f1e54eae4a628d0841fadc5aef3a8af33d5aefe4771e2bc58f7a7cdd67aeee1e440dfbda SHA512 309d37b79fefa06aba22b13029e872b6e25853853bcfbe68c5c3b125e77a509ec3502fc5df1ef2b763942309d2319b7880de74f34c89768e213b46e6eaaec1a1
+EBUILD uvloop-0.14.0.ebuild 1148 BLAKE2B 89af9ff9acab2d2c2abb5a74b11a522c95bc1becdb1a44079227ab04f1e54eae4a628d0841fadc5aef3a8af33d5aefe4771e2bc58f7a7cdd67aeee1e440dfbda SHA512 309d37b79fefa06aba22b13029e872b6e25853853bcfbe68c5c3b125e77a509ec3502fc5df1ef2b763942309d2319b7880de74f34c89768e213b46e6eaaec1a1
 EBUILD uvloop-0.8.1.ebuild 1011 BLAKE2B 1b346d72198adca94752c7bdc3612b2c29b5607cba21c1eb7dce812939b3cf6c4d4042eccbab0e7a192dd2c6f8f989765b116bd0a71ca50b59c997ada30c4047 SHA512 49e5aefbf9e4084e00a941ed316fe86372ce98ae02ec7c1c09e8d808e9a30e9f84d316bbbfdf8f670dcc3d04a042ca0522d65ab44bd67f6f5e23f3663a227947
 MISC metadata.xml 544 BLAKE2B e4154e8b5cafb357fd48ff454db34f4f7e8e2c9811222ae19285660f2a237e30bb9558692be2b82572d3108f1252ac483f488274fb88337e4b9ab2d731046a66 SHA512 2c081d40c5477bd63d98ccccc8ce7f73933a01d7ee7f39b332a9a0cc3018cb9765dd81510fa9d27845760bf384ee40d5f699aa1a9df934d595624b1f5bff7518
diff --git a/dev-python/uvloop/uvloop-0.14.0.ebuild b/dev-python/uvloop/uvloop-0.14.0.ebuild
new file mode 100644
index 000000000000..1762033eea50
--- /dev/null
+++ b/dev-python/uvloop/uvloop-0.14.0.ebuild
@@ -0,0 +1,54 @@
+# 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
+
+DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
+HOMEPAGE="https://github.com/magicstack/uvloop"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-libs/libuv-1.11.0:="
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	cat <<EOF >> setup.cfg || die
+[build_ext]
+use-system-libuv=1
+EOF
+
+	# flake8 only
+	rm tests/test_sourcecode.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_ext --inplace build_sphinx
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && local HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
+	distutils-r1_python_install_all
+}