gentoo resync : 19.07.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-07-19 22:05:27 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-07-19 22:05:27 +0100
commit: 121ed4eec41fbf03e1998d09eede1bf449da63b9 (patch)
tree: ce9341d77d1507f67d4a3a1472da9011b5baa0a8 /dev-python
parent: dd762ff83c330186ee2ede002e08b2f780cddd51 (diff)
286 files changed, 2111 insertions, 465 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 3afbfdb656fa..c6a82c56e5f8 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 b91b39cc4fca..81b534bbbc6c 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,5 +1,5 @@
 DIST sip-4.19.17.tar.gz 1056156 BLAKE2B b5a7b4cd3f2152e9b7ee7b715c3ad72c2092598e0405cefc24d6283e9da07e54fd65da89e137618d3b84f3138fff719cf226600135d646e7bd7c538c2a02cdfd SHA512 d393cfc1643663926bd315a8df92abd82bec071bf0488b047625bdac43e9074bc8a510ac23244a7a2d2d181f70af9691db9d0b759e79643981d6afd71a49d3cb
 DIST sip-4.19.18.tar.gz 1056840 BLAKE2B 6c674405e28a64c9db635deca8a00ed78bf52d2551ed578a57d31ae96071ca77ba49e3fc92329942ca61de78bc98049694cc48ef54ea645819fc48f2fae56060 SHA512 e3c58cc6c38b277b3b9fd7adf33df91b47e0385e59d52c543e630a194d73d04d91e0a3845cb3973d1955f77049e75246fa7e6f544e02e1efe0086a297cf1d887
-EBUILD PyQt5-sip-4.19.17.ebuild 2121 BLAKE2B 13ddf9636275d6ba045f2d1b5e5e94cfd4da5546ab3a2e59cf6beeb51b17963a56602e2d575272cb7efb24d6f70aa92af35e1eb8568facd1da334b63c6f3ec58 SHA512 729a20290e2b8f7f1de6b76f246a2af92bc9e2d59a0b1bbf2fb80f6c4e5c05e5e92eb3819d2c7154fae513c399d37f30f1bbc106336b04687f6cc0473c6600e4
-EBUILD PyQt5-sip-4.19.18.ebuild 2123 BLAKE2B 2f67b9d51eaacc89582a6ea84f94140f79652804a9c0480e26acb72362cc552d3eafde1a8fa4528ef92aae74bbd89518b17b0186732e373b28ed4bda6059422e SHA512 6ddfef96ce24694c2035a6dcd232e6f3a23f32357f35c1126310432d828db82a94638e3ecbd3dd4bb4ca624d50956859f1fa50fdb72a54f63b3cdf6fb2853123
+EBUILD PyQt5-sip-4.19.17.ebuild 2149 BLAKE2B bf6be182e322c0290ebb3d8fe77627cc82f0a59226a8bc1f9ad884f6c46efd783394e076b05c1d54a30908eeee6556be6db519cd27c6244244ad0b6a2dd7eaf0 SHA512 87db2a20b94dc65f8641eb070a9094a61d1c9d6418e40a00fa4fc8b2d096151412a7750603fc149d7b7b1d0e3832f1ed5f9fd70e9948c029c3ba6e16814d8e2e
+EBUILD PyQt5-sip-4.19.18.ebuild 2151 BLAKE2B 91cbd13d522b46ab030d5f25f41c9aa3783e579dcc7d96d525576ef8d63735a4e7619871c69e87956cadc0c7c9342a319b18f066f30745da839eace27e41486c SHA512 0ba17e1c999fb3b8257dffe62acb0b15b56ae8b4c0b1ad8baa9004cde3a335866d242786f1876d854f3a4fa186f9590d4cd63108ab37bc63ca88632eed0641e9
 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 b3a21709e306..72fcbe2e1091 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.17.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.17.ebuild
@@ -26,7 +26,9 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!<dev-python/PyQt5-5.12.2
+"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.18.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.18.ebuild
index 7a8d6adad884..5c2245942214 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.18.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.18.ebuild
@@ -26,7 +26,9 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!<dev-python/PyQt5-5.12.2
+"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 1301228fef28..2c1e836bab7a 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -3,7 +3,7 @@ AUX PyQt5-5.10.1-timeline.patch 1063 BLAKE2B bcf04d91798b0dc2136ff9c85802abd14d3
 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
-EBUILD PyQt5-5.10.1-r1.ebuild 5789 BLAKE2B 0c5209887d90e42e69acf97227950d3b6048d7f3f0c0198a5a15fae632232fb626431e019809dc9d6c03cecd404f69df0fdeff22489b55e7acd2d81191ffea09 SHA512 981f6dcfbdb1f5a29eb32796013e6f8daf3e4a5d370d7f66d62198ad287538ed77cad62fc0aa9c8f8d9f6d1d8a23fd79d420108739fde990c5dd47d7046de738
+EBUILD PyQt5-5.10.1-r1.ebuild 5812 BLAKE2B ceb731b308578c3d8dc511f3bb56b49656bca92bb8e4a89cd140d8044d7445bbb3f4e3a018b63cc29624d273bce1dd8976f7f848b8485d08db00022a293b9be8 SHA512 6f2169fb459bbe378db594edb9ae0e56a96b1bd0014c5855ef038229a8bfa4dd328fd7e7f0659469805b81d7c4589f3d306e1fb7a4cac21c4c2658e599d53f84
 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.10.1-r1.ebuild b/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
index 304c6df9ec8b..f636c196bc02 100644
--- a/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
@@ -58,6 +58,7 @@ QT_PV="5.9.4:5"
 RDEPEND="
 	${PYTHON_DEPS}
 	>=dev-python/sip-4.19.6:=[${PYTHON_USEDEP}]
+	!dev-python/PyQt5-sip
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
 	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index a3d152885a7a..b59da07fbeee 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,5 +1,5 @@
 DIST PyQtWebEngine_gpl-5.12.1.tar.gz 42474 BLAKE2B 6cb333d8e429ae6b9f8c20a7486754767639693351605e85c0226ab3f1f065a549d40d69669d91f501fdf2c30346304a547e36b416d275a8bfe4ea621c0633b7 SHA512 2bcb0e4da51de9cfb5128e03c03ada77f2d4b99b0885da910584717681b96759ce4301c325cbbf43602d46746e2d37d81ed62f77dd63b33359fd5fae74d7f010
-DIST PyQtWebEngine_gpl-5.13.0.tar.gz 43939 BLAKE2B 151bfb9b7a619fe581078ce9fd42f54377673fc8873719577cddc40a7254c37b794c31baef0086897f9ed3d7914add0ac5c930dadde916ddc11e37cee428a279 SHA512 2dedffb7bde073922b357118d4bbd0327b81baaba3c69c6cf85f57401b5998bac56e01f2f7b39268b4a1e13c0b34ed116564d7f4f5975d1075d4242b1b06c065
+DIST PyQtWebEngine_gpl-5.13.1.dev1907131806.tar.gz 43891 BLAKE2B e1c8885ecf910338caf81554d2a0d06f4292ed35d567c98f932c2e9e75aa0b946c0fb6fae0b1b16ec3247061cd8d4d585492a6c5ca41dd016797e538e8ce3757 SHA512 a704a1e7ea1a97a29b741eeb6d06312e459857d88284fd788af9395cefde895a0f48310d90101e1cde6c4f445a76887d8a203f0a8050906637d97c487fb963ed
 EBUILD PyQtWebEngine-5.12.1.ebuild 1705 BLAKE2B b51701dfda0e9d66565a7af45b78ffa6533fd89ee5511682dd054518682f5d646998f78f3302e861572e3f5743ca023bf1c391cbe52bf1bf07e79ff6f84475f9 SHA512 8e544a85482823c00024f2f0675eb6f986e9cd3e5f34e1c2941e256ad4cad09d322011fab51b8674f2631aa49a2c0009e1ac3b4d974b75ce0a3fc5b1359a23f3
-EBUILD PyQtWebEngine-5.13.0.ebuild 1707 BLAKE2B 2eba1ecf7b3a889b29e7e38106f7b577f053e2afeb537ff3a2eb612746547c7252965d4f2e82f222010bb7b9152735bca46413300310a718f5d576824fc253f4 SHA512 33216824bd9ab45ce76a36d5b20b2e06b038bba5265b99b217a55883f070b99aaa69d7159bf5bdf307233d48d257242c6b14d5a2776a4067136f274b94ae2322
+EBUILD PyQtWebEngine-5.13.1_pre1907131806.ebuild 1707 BLAKE2B 2eba1ecf7b3a889b29e7e38106f7b577f053e2afeb537ff3a2eb612746547c7252965d4f2e82f222010bb7b9152735bca46413300310a718f5d576824fc253f4 SHA512 33216824bd9ab45ce76a36d5b20b2e06b038bba5265b99b217a55883f070b99aaa69d7159bf5bdf307233d48d257242c6b14d5a2776a4067136f274b94ae2322
 MISC metadata.xml 1059 BLAKE2B faf1e1abebc25799040955794a28cdec2f24f1cbe358f15df5fbc400a55453b5281acd7ce0925d122661a3b290771d280d6a2cd7a2d536a5cbe0b0dde4aa9a5b SHA512 b5721a82b18f9c5b9bdac1937d68616c20b290fd609e2cb02dd837b6f435eafc436d68f3aff9593eb43efd30ee2e7201efafad8a38b41a198076305ab9de3862
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.0.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.1_pre1907131806.ebuild
index 7ca87eb7b53c..7ca87eb7b53c 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.0.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.1_pre1907131806.ebuild
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 02887c54fda2..2c6520fb5be6 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,7 +1,3 @@
-DIST QtPy-1.3.1.tar.gz 25061 BLAKE2B 5e504c9fd6182c23ec7f3160f6d2c073bb64bf3145b4336420be39dfda2d942633792abdcf2b7c0772ca7066e497d456667cbec2067a7798114929b0c9ca2d7d SHA512 3d06359b2793a57d8da715384b83e332cbc40d9f55699a2ddff0ebb04f527b9c629ea74b385103fd2ca98a79b02c8a582d16fa594048e7d56a32bda743da2008
-DIST QtPy-1.4.0.tar.gz 27019 BLAKE2B 6b90876f4801a19c98ddb8c4d678737a3b3ad61af1fe47c79b59b970ea4a895774bc554dfb9c99a4d806ad0316fb7c00e731c32a9d3f0a929a1f8bd4352851ab SHA512 7a989011114c17de29d5de6ff075935efdf9ebbae72d14580646bc81ce877f0beceaac511cade9e750dd9ee7e9f0f133c5676fa192ea906e7483feb543743379
 DIST QtPy-1.4.2.tar.gz 27471 BLAKE2B d70de67944a4019031b52cd3f6c588261537a74ce8b968d9577b016d18767e3e2b6981dae983573bd1644949b13ee271a10beaef9a371ac41b3cd1b9cb506cb2 SHA512 eb8a059f110f3262ab62f8198019b9826a5b834da62e59791fb3a6c235eb797291e4f180b31704d7d61811791e5b245a05b57fc385de358480561508e3b29a4d
-EBUILD QtPy-1.3.1-r1.ebuild 952 BLAKE2B 345d0a1329e3b3a265203d9d8503511c8cbccaecb7af6904c9655ff19d57956bd281c6b55c53ef3b305b1e581b1380c5769bda97f12659c88e20589df2f70468 SHA512 324d41c1c14fd3720a4f900b86c5c77a0266333a261375799dc8e95903d0403e137d0af14b92ef74b2598fb0d031bcf8dde3fbcdfaf4fe9c921ede7243d8e9b5
-EBUILD QtPy-1.4.0-r1.ebuild 975 BLAKE2B 933495d5cc66dc1282eb2b0b2640b479bdde3ba3d465d400877236defbe57466ee199d27f7beb715a5b5a9612cbf5930b97fae3a2507d9f2463839cb62b9fc02 SHA512 79a4c1fb59c6c2e937a82967196c58a6b0da65034406c94d0353fff848b034b7878d8ecc6e9a2a43bd6358bc158c6e2b958bff323ddf3d38148c181e28aab487
-EBUILD QtPy-1.4.2.ebuild 1065 BLAKE2B 57f8210658e5eb067aa5debb9fc54a36434a748be9dfbfcc048efc57a09a76a2eea075afce16a5e999b843c00e97089f26875368675aeeaea0456ecb123bd591 SHA512 2dd04914793896145b647b16536c12c9c60f9613a000541ef3d66e737fe9a242ad6d255457b37f08091ab34a4f37bc888dc9b403788fca0bf4fa4b609bf32180
+EBUILD QtPy-1.4.2.ebuild 1063 BLAKE2B 8caf6f72e1da759c30a963a4e5f74d46ca09c7f70e86bebcd15ae9d16e8499242e1e75538a972e7b27a0a07e1e421962109c715ff34c9899d9ee3b2e45225a90 SHA512 abedccd9814fd3c1b7ab1ce873df111e2feb5d4cae0ef011fbd66222a822f317128f97272b44e192cf3793b7bf49741c8906c87f3969134f7cb79e9f0563b793
 MISC metadata.xml 1338 BLAKE2B 7eee8e39324b18bd84a076882dc539fe2e18f38ec68a539ab40968a3a6023ac0cdfc6899305df0ef0c7561409ca81526d474a1154fb645dccdffdb0779282b12 SHA512 08a2e0b2d0aaecaf91bffb82dbba9d24d4b4753801610102db08c3e29b3ff51f1bd6d46f9c2a706f4b9a887be781a97ead1c753631717f82cd44080d44b67c4c
diff --git a/dev-python/QtPy/QtPy-1.3.1-r1.ebuild b/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
deleted file mode 100644
index 346853542581..000000000000
--- a/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstraction layer for PyQt5/PySide"
-HOMEPAGE="https://github.com/spyder-ide/qtpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="designer gui opengl svg testlib webkit"
-
-RDEPEND="
-	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
-	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
-	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
-	sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
-	sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-}
diff --git a/dev-python/QtPy/QtPy-1.4.0-r1.ebuild b/dev-python/QtPy/QtPy-1.4.0-r1.ebuild
deleted file mode 100644
index 3108385eeb5d..000000000000
--- a/dev-python/QtPy/QtPy-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstraction layer for PyQt5/PySide"
-HOMEPAGE="https://github.com/spyder-ide/qtpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="designer gui opengl svg testlib webkit webengine"
-
-RDEPEND="
-	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?,webengine?]
-	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
-	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
-	sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
-	sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-}
diff --git a/dev-python/QtPy/QtPy-1.4.2.ebuild b/dev-python/QtPy/QtPy-1.4.2.ebuild
index 2675e70c03d5..08987abc73d5 100644
--- a/dev-python/QtPy/QtPy-1.4.2.ebuild
+++ b/dev-python/QtPy/QtPy-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="designer gui opengl svg testlib webkit webengine"
 
 RDEPEND="
diff --git a/dev-python/aiodns/Manifest b/dev-python/aiodns/Manifest
index 417e3a0a3f9d..190b05bd65e4 100644
--- a/dev-python/aiodns/Manifest
+++ b/dev-python/aiodns/Manifest
@@ -1,3 +1,7 @@
 DIST aiodns-1.1.1.tar.gz 6084 BLAKE2B 8e58cedcf288f87ca9cc8d5f067bdf182f220979aba3d2aa53eb998ae877dcaa7c2a7419a50719ba150fdf17271d025668b28a3212fc5a819bf13129b4fb25a2 SHA512 4bd8b80a10f84b82b13ba4ff6abbb1afd13ba6cfececc4db7c4bd303569473316f1c0e083f1017a450875fc8994a70c30c9a1b3fb2278fee5e27158973bc3810
+DIST aiodns-1.2.0.tar.gz 6457 BLAKE2B c1035e5a31b179665be1c7c75e3e8f6665e04c43d5f2bada7e0d7ef76f17d99d2d86c2bd5063fbda2d2947c7a4aa1e21e66cef070019da6bf56e94d716edc0ea SHA512 2e80c275d98f54378b121cafe4680221f29eb57346976b3c476c7110fcb215892744982de25736193663ab4ac3f3cf516fa38b664e3303e6c67180ed6c31e21b
+DIST aiodns-2.0.0.tar.gz 5948 BLAKE2B 70944ffbfa3fa1c591c5aab6ce2c4c59564a7665fd2eda1b544616a4481e58464f918081dfb21f74db08ebe4c7e43eebd17e0dc314cf79423835a182a257cd11 SHA512 d80b8f7641234c4d367e4554b10c5a66265e75ee82c58adf2a36f9e369bb1dbf4341dd6459f10540b771de3f102454511ca81eddf3082733e88c09bbdf125fe0
 EBUILD aiodns-1.1.1.ebuild 708 BLAKE2B 11ae61d4a66ea3fb1c940417e21cbdb209d6b40bb3d3831b289ddac551b1d9e0d1aabb7de8ccd4147042532d7589eecf38bce138cf482bcf7217159943256f85 SHA512 fb5abb7d904d927e81af9123cf40f3d2b1c21599ff8342bc9734dca2b214eeb246e2c457ea17dc9ada619feb686198f0dda912236b33e0566c44b3e7adc6df9c
+EBUILD aiodns-1.2.0.ebuild 692 BLAKE2B 978d98048ffc0d239493730dedab4e580dcb411885110597494ad8390e09d9e31ab3b5ab888c32a922dc854bf6dc1321230c5fac8d47db567aa05e40bb4d85df SHA512 6a6f8802e5e0e5778a98ecd5be89a408fd731a4b430603170c09163044da5bdf8b778ad00b3f8e11ea6210edf17d82e29dbcd97b82f5f793eed82249a91df846
+EBUILD aiodns-2.0.0.ebuild 620 BLAKE2B 888cb9792f90ba164b9b91566427b99e5ad53f19cadac04ad8eec09fd8624cd260ae1426d3c4acf2f3188c0ec4563cff96de387d5a845fb8ac6197f47c8e2a61 SHA512 57dddd8c913582912c15245133832dbf7b7480093ffa815f44ccc7e2e1fa12f4d1f68402687301c920ef35e4c48daa044881e64cc411d2d429d769d55508a4a7
 MISC metadata.xml 340 BLAKE2B e607777274ea754605542b7ade5ba3d118ff366ae3bc57f586031450dd54e43189e0e1b3fd8305e351380bda96289e0cd95e074fdebaa7816da757329203775f SHA512 b77ba4eb56072b4801832400361bcc80e73c2f0f1507e9abfd8c9beaa255594554b4a2555e3304307af6c515bea097311c70f515f875a7a98cc197e5cf538ce3
diff --git a/dev-python/aiodns/aiodns-1.2.0.ebuild b/dev-python/aiodns/aiodns-1.2.0.ebuild
new file mode 100644
index 000000000000..3f3766200b23
--- /dev/null
+++ b/dev-python/aiodns/aiodns-1.2.0.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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple DNS resolver for asyncio"
+HOMEPAGE="https://github.com/saghul/aiodns/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# Tests fail with network-sandbox, since they try to resolve google.com
+RESTRICT="test"
+
+RDEPEND="dev-python/pycares[${PYTHON_USEDEP}]
+$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' -2)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${EPYTHON}" tests.py -v || die
+}
diff --git a/dev-python/aiodns/aiodns-2.0.0.ebuild b/dev-python/aiodns/aiodns-2.0.0.ebuild
new file mode 100644
index 000000000000..7763f5b57eb9
--- /dev/null
+++ b/dev-python/aiodns/aiodns-2.0.0.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="Simple DNS resolver for asyncio"
+HOMEPAGE="https://github.com/saghul/aiodns/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# Tests fail with network-sandbox, since they try to resolve google.com
+RESTRICT="test"
+
+RDEPEND=">=dev-python/pycares-3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${EPYTHON}" tests.py -v || die
+}
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index dc0c354ea172..3477072114b4 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -6,11 +6,13 @@ DIST aiohttp-2.3.2.tar.gz 841030 BLAKE2B a291baa1c5e915815ec80ea1cbd8434b31f4098
 DIST aiohttp-3.0.6.tar.gz 738111 BLAKE2B 28a3560a7b351ee974db8bbdd372798e01696e66660b6330707c542253c4d8a0405e6e8c2c8ec03c3b0ea8b548516ffb2dfe14b800b5f17e908991244bfd9335 SHA512 43f1b3c2da1bc57ac6e83a01abb3568b71ed5514e9331aaba4b691ff036d2d3e72eeddadd0f2f20608fa1f622a673ce1d4489bced2096ae546a350ad5f438d0d
 DIST aiohttp-3.3.0.tar.gz 722307 BLAKE2B 3bf1906e8a518d443a2f1bfff536fe9c4024dd18d12ed791dd4a81cfa3f81260bbbf293ae093086fa45c068f3417bcc797d1ee01e64a890a9427944ac9836760 SHA512 e7dd320abb0d9baa0dd583ce034b2d2dd328aa37750197789207e80eabfaf1e998a58e9aa0a6b98ff213f8c78ca90b85698ac559c57f44ce1b643fc317735a4b
 DIST aiohttp-3.4.4.tar.gz 822110 BLAKE2B 808c125f0d826b11d5b333ecfc35ed15cfe5a4f4242df5dd1b1e8edf6502c78d6162ad21e4fb7026294bc7013251a3b55d50c9cf34539b06b32348be2b1627a9 SHA512 968b701b8a19aa445a4af402f4bb38754565e3b80b4248127e5017671c921c370eea63fcec4148b7229ac1a74bb8739f33513abd6cb7fe02f3feddfd3ec1a6b1
+DIST aiohttp-3.5.4.tar.gz 1097647 BLAKE2B 27d3631cf33cc5052deecfeca23f6c052fce344d9a889b0c0c0e68d9dcc19eb56e2ef2496f025c795dea4f906a59ae579ecd489188f8c56bc41255b4f450f4bf SHA512 9bc31457029f7db5bbfe1e213c1f428bf90ac96d83b6d2c8838261a3910ab9f7632a4299618377acb1bed04b0cbb4b4f6d9ee814495c05f210ed9bb4f4c61714
 EBUILD aiohttp-1.3.3.ebuild 1538 BLAKE2B 0a09a1834fdfa7acda3b6aeed04217f71d01b5db13142f5c2c6261c7e33d6dafbbecfd2bc4ef667960dfad9bc953d2398541811c4ff6093b3358107ec25fc051 SHA512 2fd4ad6d6f98ce4b66d6b9e4150ddac9cadc7664a40ca93ec0059e0fc8b846ba5fc94b372211d65704ec386800a48a40f4934670796fd1408524f8f1439a168a
 EBUILD aiohttp-1.3.5.ebuild 1538 BLAKE2B 0a09a1834fdfa7acda3b6aeed04217f71d01b5db13142f5c2c6261c7e33d6dafbbecfd2bc4ef667960dfad9bc953d2398541811c4ff6093b3358107ec25fc051 SHA512 2fd4ad6d6f98ce4b66d6b9e4150ddac9cadc7664a40ca93ec0059e0fc8b846ba5fc94b372211d65704ec386800a48a40f4934670796fd1408524f8f1439a168a
 EBUILD aiohttp-2.3.10.ebuild 1716 BLAKE2B a2736bc15b41a4a29bb45ff422b86c30d886fbc80e968bf7b435045addf953bef80e24950e5ab6573e5e84f358f89c59d217e56c717a9e13aa06410f8d5e7a2d SHA512 541325c91470dc74f8f51843c5544efed81ad52bf706a8160f6fb269ae9c594a4c1f86f556b846998667b8996a80dacbc86bad968dbf5824fa81b509f3dc4049
 EBUILD aiohttp-2.3.2.ebuild 1583 BLAKE2B 4f4268a8b8a32d4d8aa4f982cf386575f9aa00852819d07e08e4e128dae10d7247585b5ef798d58fd687eff109e70da671902b91073962bdbc3b2b19c8cdfddc SHA512 3dbc911cc0ed37b993a398722c9314636cd39aef0f2a47a58e825d5df90bc49a239d6d30192304b120a87d837968f21047b85faf108d9af94bce3c60d9638ce2
 EBUILD aiohttp-3.0.6.ebuild 1833 BLAKE2B c0d3a1c13ebd7699ae2d506e78de5df605cfcebcc5c25d06aa5d696e534768dea9a0439cb6dce1aec76c042a07f852e87a228f6b1b8150a8b3f3347f8d914e9f SHA512 67b964d4905c55423ed6a1ed30db93b8439a69d0ec1b3d642f4c9b79da669dcdf4cb012c750c34a616e23767df5a1094218337fc5037a29ea35b87e775755bf6
 EBUILD aiohttp-3.3.0.ebuild 1833 BLAKE2B afc0463eaac8b5bcf7317616a3dab30adb223792c64c7516a528c235e53e72e8254cccfc9c2ee8693b83e56c26ce41dfe0107736d00dfce169d587e7541fbd3e SHA512 5647745d6f7225498f8ff20a13cc050d6e6a45091f5e84b411075ea686772971ab3d82cdfa175353b50d567a01ee9002694b45e5fdf52bcba113ec116d946daf
-EBUILD aiohttp-3.4.4.ebuild 2102 BLAKE2B c01efa97ed06a1ecd37a0f13e04a9eaadc32a5742fcdaaa78c6a76c65feae1a241e137c097515d9505469c89a15f34620b7e17ed47e498c006d5da6f9948afe4 SHA512 a183aada3345f04a0290ecba5a0ef574af152df596e3de2b262155b3210b1fc9638348538c7d5ed0cf3b2e6002f026b472b3e185fabd412b365cfa38d69fed1e
+EBUILD aiohttp-3.4.4.ebuild 2261 BLAKE2B d2a2ed87c1966d02a25a3d644e3d6b7ddb51fbea0cb8f9db507fd59b562ed297f6bd86f47029cc65b9b6d7b126627776f9892f4f02c279cec89bdab60b452a13 SHA512 57d9346f6372cd6249d7cfb6887db812217868f59170dffc342d45caedf9f04ae716573fc6b583ceb966cd144790237b7f5dfae82a157de65248f49e45394c19
+EBUILD aiohttp-3.5.4.ebuild 2184 BLAKE2B 24418040a58103cfb951e19b24aed1d89ddad4a9ad7867e84c99ef2f12bc8002fd132242e5cec3a16b8ceb45631650cbb0c731eba5c6b0a45b730fed43dc3713 SHA512 3c00cc5f0cf954e85a818ce6f604f1e1686757198648b83fba3a278405953e94784e06c70079aeb71e319dbe97d4b5b702cecb2344b0609da0eff924c224657e
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.4.4.ebuild b/dev-python/aiohttp/aiohttp-3.4.4.ebuild
index 2cd4b9b624ed..ec6ebeb0b474 100644
--- a/dev-python/aiohttp/aiohttp-3.4.4.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.4.4.ebuild
@@ -15,6 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
@@ -57,6 +58,8 @@ python_prepare_all() {
 	sed -e 's:test_compression_brotli:_\0:' \
 		-e 's:test_feed_eof_no_err_brotli:_\0:' \
 		-i tests/test_http_parser.py || die
+	# make pytest warnings non-fatal, to unbreak tests
+	sed -i -e '/filterwarnings/d' setup.cfg || die
 
 	distutils-r1_python_prepare_all
 }
@@ -66,7 +69,7 @@ python_compile_all() {
 }
 
 python_test() {
-	esetup.py test
+	pytest -vv || die "Tests fail with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/aiohttp/aiohttp-3.5.4.ebuild b/dev-python/aiohttp/aiohttp-3.5.4.ebuild
new file mode 100644
index 000000000000..3b9fe39c93de
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-3.5.4.ebuild
@@ -0,0 +1,80 @@
+# 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="http client/server for asyncio"
+HOMEPAGE="https://pypi.org/project/aiohttp/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/multidict-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
+	dev-python/idna-ssl[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' \
+		python3_{5,6})
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-aiohttp-theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/async_generator[${PYTHON_USEDEP}]
+		dev-python/brotlipy[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.4.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+DOCS=( CHANGES.rst CONTRIBUTING.rst CONTRIBUTORS.txt HISTORY.rst README.rst )
+
+python_prepare_all() {
+	# FIXME
+	rm tests/test_pytest_plugin.py || die
+	sed -i -e 's:test_testcase_no_app:_&:' tests/test_test_utils.py || die
+
+	# remove pointless dep on pytest-cov
+	sed -i -e '/addopts/s/--cov=aiohttp//' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest
index bd6bf6800877..8637708ec4c3 100644
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@@ -1,7 +1,7 @@
 DIST alabaster-0.7.10.tar.gz 10486 BLAKE2B fa4e08cc06a22830e7ad1a5cc5e2ead40d919158d200af2d7259c478d1999329ccd798594b1ee3302d5610a972438e771cd83c82544f0f1783bac345643737a9 SHA512 e2391079360e050e532f878619e70a120f141a3e84d1e213e508e4be25ff2ac704717fe8398dfaf016dfb6dd3ad1105a67e1d5438737f45064f7602a5ce5fda8
 DIST alabaster-0.7.11.tar.gz 10998 BLAKE2B 93975fcb93cac425d6db903f89c862041dd4817a1a411adb2b8d0e9af754be6f1a9649934b183678290debd71722146a547ced7407a9da10741d88a806d5bec2 SHA512 3b3762cc9f0a04296d07bdadeb7e77ae007e307bfad81d8ddfa8e883dcf7577bf544957b3664ec4cc354749fa249627071474466dc771c5883c75571c86d8f3b
 DIST alabaster-0.7.9.tar.gz 10485 BLAKE2B c3a22dd8b813f2dc717a1fb24d252db949f6336cb5b785603f933d4cf32236f9bdff117118d85ca3f6995e761e8d2689feb2c69be516ab681dc664323da43605 SHA512 b1286c4d5d17d172baaacbc40ba6a435d433f0880e31416c37ac88df8787bf522f1c28b6903fe92c88414f54286734508860eab86ff7f12da72315bf9ae0e6c8
-EBUILD alabaster-0.7.10.ebuild 544 BLAKE2B 67e06ed2e8d48e9a18767c53ac3b6745659dfb86793d05f3408421fdeefd1c39a688e7437acc6ef32d3187a18e8ac7765c678b069fed64fef8d92f36e3ba9e71 SHA512 3a49aed1c759f2ad490281f690383b772d18b9b3d22ade0e0798b5d57b387e462d205f1f86b2a4c7ff6c292a7e18c4282a08bd4f29f9007945560380486180cc
-EBUILD alabaster-0.7.11.ebuild 546 BLAKE2B 2ae9d3bd94c53321432fa27af7ee424094baa1e3484109f8f4a47351237b64ac8a648cdef931b4e700845fa0b14570051aab37d872bb7c915b104683017e1e15 SHA512 8719802b760b3f91530b7ce06bc9ce68a03c24b16f54258f439c8296cd43d13b0025b54910057b47f1eb7cf9fd5523505402c3f5def37fad04f67dabdb4130ed
+EBUILD alabaster-0.7.10.ebuild 544 BLAKE2B 261433d2c93694b46f386f9452df1881c876c8a65b534a4c43eb3996bf6ee919ef2110af2991f39123c46f6048a3d506439dc5421a7ea9df2cb84f7944d2a243 SHA512 ec35e9fd7130fd237138011a0e1adfab0830e5bde822420e68288a89436068cb1f037dbb00c76bb791e61af2b60e5227e2e98297c6ed3b8f139e5645fa57ab2b
+EBUILD alabaster-0.7.11.ebuild 546 BLAKE2B 3de78868e4dbb65d3aa5b6972d120471c85e607090ff9bff7169b870dc059fb5148efd3d87a19edb1721343bc57d35a46697152d7295bc263228b58aa8010b82 SHA512 c131aa03104cc3ae07f30094f0d12bcade954d27eab62f46acba3755f8c66685b87f0b70e8c2e739c386efeb256e1f401f02a3e9d7ee7471a8b82f75da3a3db9
 EBUILD alabaster-0.7.9.ebuild 508 BLAKE2B b6af6d5631bd3427cbada4bed6f39b216cfba0854e038321eb2ff1d1f695a712c42a485b435c4ef736bd55d5b734590c01d4f4451de1342d74e7621f4221dc1b SHA512 0154b11c3df291810dc7c09d8c1954c32f4d91695875acce07b80f711267c218ccd95474d5947ddf4aed7184750c9aa0831af1d122c75d53e678f664bd489057
 MISC metadata.xml 384 BLAKE2B 55991f34f966ecaa57dfd6474f3ffc0d25b04b106c3a45c6d5fbb88457598b7ea93ef5edbb84af23fcfd1ff4b6314c6c56397a5a52da64e3fde3ce1f40587d6b SHA512 7464f7780562e6a8aff5a243e0a87e08740b06210a25c83ec82649974b0b50aabcab46f6c35b5e568b898ae8a4d10087961ae8953785f4dab33b62cf782e4657
diff --git a/dev-python/alabaster/alabaster-0.7.10.ebuild b/dev-python/alabaster/alabaster-0.7.10.ebuild
index 7726d1473db2..d67488c169d7 100644
--- a/dev-python/alabaster/alabaster-0.7.10.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.10.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/bitprophet/alabaster"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-solaris ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
 SLOT="0"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/alabaster/alabaster-0.7.11.ebuild b/dev-python/alabaster/alabaster-0.7.11.ebuild
index e019b796ad06..50d51f78f933 100644
--- a/dev-python/alabaster/alabaster-0.7.11.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.11.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/bitprophet/alabaster"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-solaris ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
 SLOT="0"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index a0b0cdd146e1..cdca43b5664d 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,5 +1,7 @@
+DIST argcomplete-1.10.0.tar.gz 47271 BLAKE2B 78a67b56d4871120d7384459c8ee591f42dee195143712c5c70d144d4116041d36ba687d4425beba6258b58d5a0a3ef847d10d6267f372282f37e953c6f92d80 SHA512 59e9cb721ddffd85d9f6461a70d50f9ba0795e36044cd46fa5fe707fb1be28c12f4ef531d2844020efc156300861b2ca8b73f56a116dd54bda0e52cf68c0a411
 DIST argcomplete-1.4.1.tar.gz 37219 BLAKE2B eff9c8b8a2996d2d57ca99516071a1c831f9e64be4efd72bf930dfe7fb2404db2aa03546e761ae73b5d22f8ebe683728c433ab837eee5c073616e7d32fa32010 SHA512 3e9fa64fca93baf14fddd653947ff0269004e8783de0567931dafb9e4d0dfff2e2450ef6df331a4d648f5ce1d817a422f52d8d30b94315cd54fd82102467ded5
 DIST argcomplete-1.9.4.tar.gz 47471 BLAKE2B ba64acc1fb2ae336166504db3dd991227c4e2a04abc6909ecf6723c1d2ce82ea65453ca2dde97316da9eaaa5b60026a6c8e4f3d658f1ed8122ca4fd00723fca1 SHA512 831958dffc75c65e2a63918d1e6f5e1fa47ec753b913c978e8d1d30d430ab8fedf66c99d8df23b2abc547b42c27335ccf47811224322994316ca2225c85ce346
+EBUILD argcomplete-1.10.0.ebuild 645 BLAKE2B f78fd478264055f0500bf5ae6fba0772ddad2ada6a70c7fdb68b6781e48c21bf23b356233ff49c40b7538e59f273b3845afcf671d86ceb75e4963aa4ce4bb5e1 SHA512 d74dc0158ec3b96ef8e4547ce349df386dc2fca9fa6660cfe7e1385c1b3d02b71e804005caae724f710c455d19dc067ef3c69f3798bd54614e8359e1e5bb29d3
 EBUILD argcomplete-1.4.1.ebuild 959 BLAKE2B 7028b6136fee5572def13a0bbef23a4e9acf805a2088c2c11289b2a94cd7ec48ade2fd521c2db5b4bef6cc6ba9e4ee2d53bd7b8ea7614bd2e974554533645375 SHA512 8a114e18f7d238bf0e8a078977f066f6fefb50ee3e63f995bff9f2afd61dfec9caa70e05373c55be7ca11f54c558f9584064927a1951d548173802f8b2cb5ef7
 EBUILD argcomplete-1.9.4.ebuild 777 BLAKE2B 99c7f1c776ac0546926c408a0fdd7654cf33cdb9cec6252daa1b015e0458a426dcd6278e8cb33fc1c96b21bcc45221df1715ed94f9606c1218dbab8c2f8ff2e9 SHA512 4db430d1c46ea9831404e36d0094136303549038ac3172c6c77db9d45cba8e6b5b52091c0cc49d1ae942367b85efdf2569856c8c6a36d35fe89f4fa8ead6a442
 MISC metadata.xml 385 BLAKE2B d552f29df1805f58bef2bbaf91166ef43daebf78d36a079c9b93bee54a8165d33576e1f9c238e7070f64253e0ff71c9b6a18c63b3321b5a400f8d287b10e4a82 SHA512 125cccb9f83bacb68944c893b76905ca6db26c41f0e843bc3b2ed4fd8b18df4247696c0fb34acff77c41bd57fce517669878e071db6dcdcedde42f85cc012e5d
diff --git a/dev-python/argcomplete/argcomplete-1.10.0.ebuild b/dev-python/argcomplete/argcomplete-1.10.0.ebuild
new file mode 100644
index 000000000000..7df8a1c38a08
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-1.10.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Bash tab completion for argparse"
+HOMEPAGE="https://pypi.org/project/argcomplete/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		app-shells/fish
+		app-shells/tcsh
+	)"
+
+python_test() {
+	"${EPYTHON}" test/test.py -v || die
+}
diff --git a/dev-python/argh/Manifest b/dev-python/argh/Manifest
index 4a04d772917f..afc0ca2e25e8 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -1,4 +1,4 @@
 DIST argh-0.26.2.tar.gz 32913 BLAKE2B 315dc36c4a98cb4a8fdab68a30ed3d4d87d1565717722ed496255d8b1b4e505277032217da4c5d750f210974890d8094c52f920044173ff2168adf7cb7f6a2bd SHA512 90382900d5cec9629dacb4459a2c9491d1425b66fa3f90d7cbf511dec846a99dbb9424f3e08f0c006da48fbf9c067078705be70b314700541fd800630e4b1707
 EBUILD argh-0.26.2-r1.ebuild 687 BLAKE2B 728bc87783cd12cd93a70df307eae0469304cd521cf6e884c03dd1a5fa32c8d2f89ab908d9ca264678648be6b0ea9236e342b8c98735a31fa8780ca2078dd04a SHA512 2ac6f7014543815d7ec66609cc596006c4428fa99f668174192749b0383350174607ddba25fc71961ee1af67a6e808c9ca089d8dffdd4d08ea20d8b7579afa90
-EBUILD argh-0.26.2.ebuild 676 BLAKE2B 4b53d7676224d65bf26bebaf41bedc229a9850fb4d0159ea34f712e1049a448d37729f46bc96a2c34d8ffb3a67efab8626ae25a1a4ff47322e838ee4f486276a SHA512 2de4d1f9ac42bd6a0269abc39d3e8aa867da67635008e103a86336081cb8028669959ad73845ba1decec9e1dfa8214d6abc8e4e3a5430f50eae920eabbee77e3
+EBUILD argh-0.26.2-r2.ebuild 683 BLAKE2B b08010525352f00eeece024743afa0b8cf9a5127399a9ae0d1efe376c9167a7a546e706e261999ca1aa9a44809aae7d22b4c617eb5b3a11cad686d7003cb8c05 SHA512 c4b30d8c866f91e66a5890bfe3265ff85849d74a130d271debfe35a6ffbae3483ab655dfb84a7fbb8143fa31872618264d2630ca9ccebc353bffb27bb541ad67
 MISC metadata.xml 307 BLAKE2B 172ad4318c81373d000c3138ea3efd86183f1b17fbbdbb793a99aa43732c85ebbaa90235096835ca07a70db115fad09debf1f9ca3c5a46f6f01b6273b4e04d5a SHA512 6236f4f54de93e831341d268725741e3a46e4a4cd815ead1d5751ab551ec06fd58acb410d2cff973c992d564b69f21e6e56168ad567fe3e7c810eca5c2a83712
diff --git a/dev-python/argh/argh-0.26.2.ebuild b/dev-python/argh/argh-0.26.2-r2.ebuild
index 2cd8e62af6dd..2e430e755443 100644
--- a/dev-python/argh/argh-0.26.2.ebuild
+++ b/dev-python/argh/argh-0.26.2-r2.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} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1
 
@@ -12,19 +12,20 @@ HOMEPAGE="https://pythonhosted.org/argh/"
 SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 LICENSE="LGPL-3"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/iocapture[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+		dev-python/mock[${PYTHON_USEDEP}]
 		${RDEPEND}
 	)"
 
 python_test() {
-	py.test || die "Tests fail with ${EPYTHON}"
+	pytest -vv || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/args/Manifest b/dev-python/args/Manifest
index 932029fa7acf..e4fcefdbc23a 100644
--- a/dev-python/args/Manifest
+++ b/dev-python/args/Manifest
@@ -1,3 +1,3 @@
 DIST args-0.1.0.tar.gz 3048 BLAKE2B 4f31ec64f740640c9c927585ae35877654eb99beb5f0673ce8561ee093efd8b69eb5cb0c08a304c2319a38496935b62286f8bb9b2f1dca7c9447671ab0e3732f SHA512 664d33386af2ac0b9d30344db5fb5cea4210f600df28708ada19266afec237d6e6d9d57f03c8b64cfdbb6a17eff05f633a2cc4ddbfedc320dd133be246aee033
 EBUILD args-0.1.0.ebuild 431 BLAKE2B 636997990e8cc8976b0b2b7fde4a98f9727f597de4aea0c6e1c1eba1f782165dfd1cf2f4efeb8fc81fe90c3ee505c714eee0284db4390f65d75fa71c1d5dd6e6 SHA512 6ba87c5d3751b2446d72236fca46c8e70e78a34e070210384d016a62c42603ed7eb2b4cebdd4ee30039c60675c1087c882b5970d2d4871d24cfdd7cbc6e7cd51
-MISC metadata.xml 263 BLAKE2B 7f205bb99d5cbf7bc3ffeea336f6c58b17dff256c0b7e1dbd4571e2d9aaaaca0809bf1e526c2d1e3e307bb78fe6a287883b59e809cc19a302ba1d9d8a2da8d54 SHA512 68e530dcdeed8175dcc8efcfebaaa7a397e7f0225ef945490ed249a62f0006054863759dda2001db41d0ba195da00e960c505fc37cf6759e2ea8f658d0f55125
+MISC metadata.xml 289 BLAKE2B 9c506f540fde2d50daea0c83d559dc27456e9de951493e87d2df4f9dccd50ea7b26046815c05587608667939108dc7a335792ca923b8ef731ff6511024a2e003 SHA512 ad6f17d093352ca14bbef50d96672c676a617d17fbb0813ac36b469b0c72e88858afa427f788877f40496a4300af6d6e893d80b6ad0eaf64759e1a19bfcd97fa
diff --git a/dev-python/args/metadata.xml b/dev-python/args/metadata.xml
index 3bf32b8f28b0..5fd0c8752fa5 100644
--- a/dev-python/args/metadata.xml
+++ b/dev-python/args/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">args</remote-id>
 		<remote-id type="github">kennethreitz/args</remote-id>
diff --git a/dev-python/async_generator/Manifest b/dev-python/async_generator/Manifest
index 031b5cb731b6..a206cd135d2a 100644
--- a/dev-python/async_generator/Manifest
+++ b/dev-python/async_generator/Manifest
@@ -1,3 +1,3 @@
 DIST async_generator-1.10.tar.gz 29870 BLAKE2B 7f1bea82b1ed9ed87774f1fb42af2c58d8f9e34a02f067fad018680d46c94b811075107396b29e948fa5f72131c79f3b45544fae5aeca9f990e809db85bb28dd SHA512 3874b4e474cc7febec981f704672e233512a999e00e1672e46fe3a18e45168373fabc83142926763b7c6fcaf16948e031702d5854694aab4b5cae96b9b1ef819
-EBUILD async_generator-1.10.ebuild 663 BLAKE2B 805b2b5d2629dd6d4d29e703e6e69ddf455f4666b5f68050a66447ec499e8f7b3f2c2ea7d14a5593dcd987da8b01d7133acb62035baf5fd405f7c8b4a05a27ac SHA512 b5b6d5221a93dc60a5c31dad381a99f93a3c39f87e614f54d3dddf4756336491b0e200dca0683923412bf3b46b5c93310110187b11409dde7ea626d4671e0c6c
-MISC metadata.xml 363 BLAKE2B 66c5d766fa824da76a0f6cbdcc5938c053cc9e445ced509af995b55574d4d92c626fb87c47683d09286965c186de9d2b4a8090fb94e7957b36d5b3ab95a503e8 SHA512 05a73833ea207a7a6ccfb87322fb76726c8801793615ba271b174fd5cb3aa4339808f6f2a1d56d1be9c390f3cf62c6d6417fb33666dfdb75e8b291849181ed79
+EBUILD async_generator-1.10.ebuild 694 BLAKE2B 6d3af75d4f4e480e71bc1181f66fca6ef5715dc2648b596a234b91e21f3647977b472b40511a625106cbb482537bb68ebe03f016dca3716dc3b028455bac764b SHA512 75be118094f69f7cb8ac00574b84ecbe4ea4da9d47181f467d3aab510884679914910dd9964b6877629e1bcf87fefc2135a56dec414ab2374f9baa0e196175bc
+MISC metadata.xml 442 BLAKE2B 93ff73ecbd80ae38cb18b2ffe11bb60c411b7f3ce36b196566e230fecda350a13d19892e672a65fd278038feb53273b39ed7eb42809bd397bb71b8eeb4baf5ca SHA512 fdd4036bac7d48e387e8ad059be940d3eb3cebcf1d6a6079cf4effe25265c3a52d360269fccd8e45f67374d2ce4c2b67245e75fd59656df92a36744265494f07
diff --git a/dev-python/async_generator/async_generator-1.10.ebuild b/dev-python/async_generator/async_generator-1.10.ebuild
index 7e17bf06efda..216110e32063 100644
--- a/dev-python/async_generator/async_generator-1.10.ebuild
+++ b/dev-python/async_generator/async_generator-1.10.ebuild
@@ -1,24 +1,27 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit distutils-r1
 
 DESCRIPTION="Making it easy to write async iterators in Python 3.5"
 HOMEPAGE="https://github.com/python-trio/async_generator https://pypi.org/project/async_generator/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
+
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 DOCS=( README.rst )
 
 python_test() {
-	py.test -v || die "tests failed under ${EPYTHON}"
+	pytest -vv || die "tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/async_generator/metadata.xml b/dev-python/async_generator/metadata.xml
index 0731896574c4..2b736def6706 100644
--- a/dev-python/async_generator/metadata.xml
+++ b/dev-python/async_generator/metadata.xml
@@ -4,6 +4,9 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">python-trio/async_generator</remote-id>
 		<remote-id type="pypi">async_generator</remote-id>
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 658ce2e3fc7f..a88aaf38d172 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -2,10 +2,12 @@ DIST async-timeout-1.1.0.tar.gz 7590 BLAKE2B 855a630b1c1be6751ee416a9f394b93b25d
 DIST async-timeout-1.2.0.tar.gz 7700 BLAKE2B a658cc80ba0b35d1f79286d8f6edac4aaf84e1bcef680b1ef096f6f9d14873800f948429d00fe09b26e20ab109c676fb1ca838931a83473f59863d490caf2c0e SHA512 81a8d3fd8a6756335ce7ea292afd0ba508ea120482dfc4526017dbf6ee809e6828818653be25dee123e8626fc89cc49cfbcff41748ec950b8797b2bb21f262db
 DIST async-timeout-1.2.1.tar.gz 7797 BLAKE2B d8f736423631a2b2c0fb748eb2857e0f9a143af9591ddfae15d42ab13af33196a6624db5b0a705265269ed28c6c15a4e8cfe56143ccedac75a555ae62a82891b SHA512 2072caeb65a74f1a24b59a4ea905ef96d70f8fb117e3dd9c95c1107b1d67ffaa4d76b68f00364049e6e29cdb0a6d247ba0c3638ccd0a8db27bd6ee0f180f9ccb
 DIST async-timeout-3.0.0.tar.gz 10803 BLAKE2B 3cee55e523a652c27f73bb3790d3c214f2744ef1ba3e0fe6fee80e5e4172cab808b08513d1beb99e71a36eda0a27d31fcf23e7a1ea0fb4569dc1310fef3557e6 SHA512 17df44da4d6038dcfa30b1394bcffbe9a31470c45fcd20c21da8dbea154fd2d508afafb19ce4da7f65422057e3a141be2bd9171d0a385556814759da0fb0496f
+DIST async-timeout-3.0.1.tar.gz 9724 BLAKE2B f18ae75969b7048469fe22949f25ea25da3fdbf08b98a16b5d5ffe823060a75e6de9ed764727e08d4344c79426e9c89013d49522f20ed62e6fbe912b5c7a8787 SHA512 fd30842671a79edfd52c7350e7fb2120533a6d97b44975f7b071ce2cbde43443bd5bbe1f2ad0ad3ab2156e1987b9e58e0c149b0ecfea8674eb0cb78eee79c986
 DIST async_timeout-1.0.0.tar.gz 7554 BLAKE2B a069f79eb25c1b698f688cff482970c60197ac6f22e610fe487e33180644a197961f97e1afc7d6ba86f9250add9c7c72d386b5209b8d99e0518c137246106225 SHA512 b02fa2f9558d23e6e1cc076f8d144dcfee7adeaad67c023ce747c99935c2809e2a2223f72b0a12274f11bacadc9b69a6bc3a2914c305ef05d483dc29908e9c97
 EBUILD async_timeout-1.0.0.ebuild 638 BLAKE2B 9461a752bcee0a1d66136c7466b3455057f75573d33d242620fdf64cf81393170d5a97bfe468b3de3edea41fad619d4e90f121bb70307689dbc4a26ac56a82cd SHA512 702b02fb755ea0c5395e07e28b8247799614d28921a7d4396c11b7e143987547c237687cad4ae696de7a58edb16ce8e02d98ce4a7aaa03bf181d39aee243b4c6
 EBUILD async_timeout-1.1.0.ebuild 687 BLAKE2B c31d7fa2f9f47cc275309a5d76d0a7e165efc67cab7a3c49fc4cf5b472d1fd89ff9895cc69d7a6d40e8a3e0473378d30ecd6acc3be0d9c92f2b17698ca18de24 SHA512 93c91df2eb301d17db8b4cb16ef1d8dd65c2aba649c66382784d515106acfe9d4448bea82664debbc87d6552ed761a6ab2f699f2473ed3e3d375eaf506acfea3
 EBUILD async_timeout-1.2.0.ebuild 679 BLAKE2B 79e40255cddfa20cff962f045fbf45d73bb967acaef923004574051bf64ec26920f041028c3370bf26732edfb0d32de9d4812e372a3ec677b38866c309299d15 SHA512 fdf7f5f6cc6d5c82e28e21c6e68f3a2d23bb72a43b1197fcdde29d346efe63acf63c6216a93ab3da29fbe315ef8a9d3ac7710a9059455fbacb21ea13c18bd51b
 EBUILD async_timeout-1.2.1.ebuild 769 BLAKE2B 6d8dca0f71de64dd55a2eab295818d2df64e51d774cd4c2fa1dddf6c69ea68f5dc1f35a702779bc76aa40daa4c143d8daa406ce365a004de1ebbf361fa035648 SHA512 dddd3320c35f7223504b500284ce96122b948a38a47144b5f92efc7a822e86ad5f8992d0cf4517af8e5a32adb293584845efe3cd597245ef98db9989219e2191
 EBUILD async_timeout-3.0.0.ebuild 877 BLAKE2B a01317eaaf886515525c77aaf49bf3a23ead7eb0b5ad686af1964fdb1dfe734a6c3ddb185c01a0b0599934608aac0c56df932523c134c20f3bf559726510832e SHA512 49ff65d96b9ba843699a3c04cb699ab68392ef2e2e076b326327a244e18e869357537f16dcc4feaf91f87f197b5cc0607a9a0fa8cdb576a35f635206bd274f55
-MISC metadata.xml 356 BLAKE2B 77e8b06ea11139e57100ce9de95f8f452a3ea036f5dd7556e0bded549639dbad3a534c37dea0a30bebb329fab4f8f8f36d637eb1aa630ca756c009492f01b0ca SHA512 efb996fac98f1e12c041fc6828732ec61f5e85f7d4762faf7387a0a0f59c60b64ffdb0b0c4d29f2f9f8c125f30b1462650be1bb13b09aca70e555c139fb6316d
+EBUILD async_timeout-3.0.1.ebuild 975 BLAKE2B 97badef93f00d807695630a014404b72c8d618a96aa0850fcd9fd135ab4f5790d1594c8e3b9651532aa81c6d5cf76e816a3979be2c4498ec547918dcf60b3fe6 SHA512 aebbd80203fe46971235df7a49193e8678c4f47d3da8a2718fde913218e1166419edd1b53692572666ed7831f0d4c9f98416fe604d44d7a2bc1daf89c85929fc
+MISC metadata.xml 435 BLAKE2B a3bf9896730a3f697c6a41257e9f3c168154760ffba1cc5d5660a1442a3b5f5f8032d48ae0b069a412e3ef2e792376e29d3a0867a46576bf8b412acca0798388 SHA512 a7a43ad3fabf98be2d846d8a4bea1ff2a867f934e27d9f88b1c76daaf4d4195f8ffc6039f283313dd009566c732bcb0ab8a847e0b6424afdce902539530637dd
diff --git a/dev-python/async_timeout/async_timeout-3.0.1.ebuild b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
new file mode 100644
index 000000000000..c463132c66a6
--- /dev/null
+++ b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+MY_P=${PN/_/-}-${PV}
+DESCRIPTION="Timeout context manager for asyncio programs"
+HOMEPAGE="https://github.com/aio-libs/async-timeout"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+S=${WORKDIR}/${MY_P}
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# remove pointless dep on pytest-cov
+	sed -i -e '/addopts/d' setup.cfg || die
+	# tests fail due to missing fixture when trying to load this file
+	rm tests/conftest.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/async_timeout/metadata.xml b/dev-python/async_timeout/metadata.xml
index 94ccc65f454f..897d9765df48 100644
--- a/dev-python/async_timeout/metadata.xml
+++ b/dev-python/async_timeout/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">async_timeout</remote-id>
 		<remote-id type="github">aio-libs/async_timeout</remote-id>
 	</upstream>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/attrdict/Manifest b/dev-python/attrdict/Manifest
index b96670afd2c1..39b708fe4f40 100644
--- a/dev-python/attrdict/Manifest
+++ b/dev-python/attrdict/Manifest
@@ -1,3 +1,3 @@
 DIST attrdict-2.0.0.tar.gz 8994 BLAKE2B 5d2fa4faaf19d275cbf3c21125ea0916e5d52da5a443702c2c2fbfbacf362890218610cb799ef718e8131dacac403ab18e54e3e588012b6155d42ea7f3522855 SHA512 6dd363eb3bca83c84dcbcdd04fb2a7f5360ff5c97b7e52159c4efe61856a37bb6a9427da00da07cb9222f3cef6de18b94bf2da5d0192372f9252a130fa476b7d
 EBUILD attrdict-2.0.0.ebuild 606 BLAKE2B 1822ac4da040578a75fd3d5f584ee9026a1943581151d0cf0d78a89d4c4f5cab43a6a661ce4ec6cd7b33a5809af78a2e930a9d433024430b7178b496f58f657e SHA512 407f21708a7294d9cf085ebe8a6ff96d5ac1a7b3c9f3843678069f8f883cfe7fe270ba1616597cdbd9fa766c6a5440e871278dd6135a1e40fd6647eee8e8a0cb
-MISC metadata.xml 262 BLAKE2B 796cd107cbabe7ee51379cd87904fadc8f225edc1cf7fdb82d3e226564d0430d17275acd7c8925fa792d02fabd52768a1e63ac16ce191fd1eae2fa94f95f6e39 SHA512 3d79c02053b58c92ddd7a6ccae5e3d4c82953fe3a0307deb90f9d22902f1146cf7bc69c8cc79fd6a1d72f74223b0687395124c1c2628321a74611aa6bde97656
+MISC metadata.xml 288 BLAKE2B 9a65e428e3e59387b1b012e1b18583e7df62c14944da5b02d14799bd178401c961c41f7857090e5a67e2c4e1629abfb0f15ba81de67d351c92eb5ec83b3163f5 SHA512 a05f6666787f9df3d1c0e5c69c371d93f5f9b081fc8fc5eb4cda7119c0b7d83a951ffb6f7f9b41e7f9307d3c7a3cb324bcd2838adfaa8b0f4828ff16082e8fcc
diff --git a/dev-python/attrdict/metadata.xml b/dev-python/attrdict/metadata.xml
index f02ea6f6f1d5..a9a59b0d94aa 100644
--- a/dev-python/attrdict/metadata.xml
+++ b/dev-python/attrdict/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">attrdict</remote-id>
 		<remote-id type="github">bcj/AttrDict</remote-id>
diff --git a/dev-python/bashate/Manifest b/dev-python/bashate/Manifest
index 5b1f5654a5e0..da80c8449109 100644
--- a/dev-python/bashate/Manifest
+++ b/dev-python/bashate/Manifest
@@ -1,5 +1,5 @@
 DIST bashate-0.3.1.tar.gz 16016 BLAKE2B 72bcb6ef2c8dda48b40351f37971473b9c2137f3a727a355f1742f20355aee8a3898d4aaf61e0e6538b22adbe3ebd34bb30d67d0fb6b5f3535c9b46c1544ce5d SHA512 dfa3e8f98879169cef445cc9a788b4ed051630330e2270c721e472f080899d6742cd3deb571049ba6b943ada0fc77a70f5a7e4742a54d1ca6d5f075a92a00ffb
 DIST bashate-0.6.0.tar.gz 30980 BLAKE2B 5b210edaa44a0652a03f30a641a072dba1482e1ca3b42c6b7140a52349ddb271f0137373a4d2f364032c22c176d6caf14be2635038df8a4e86585773d17a1f97 SHA512 bb64d8de0143bf2662497b1571ce654f4ceeb7d1dea3f625705b609ab70ed3b4bca6266c4eba7c2e7d99a1520fb9566a4a4daefa34c9c16538537b446c1da255
 EBUILD bashate-0.3.1.ebuild 691 BLAKE2B d328f410b6a483f5c8f7c6448fe75fdbaeecf1bc9a8342d2eb299b862cd08daf7bb4e8406a177f3646bdd0ca111340cef23ebf774b0ee4b87d7ce3b00c12b8eb SHA512 b3b5185dc22ecacf7aa82d2e8e40d267c7c98b7f26d3743f8da94d567f02a67e389adbfa016b6e89a2bd08035caedda8d60337817fa18afa06b29b14cde18516
-EBUILD bashate-0.6.0.ebuild 705 BLAKE2B 2cd18cfa27714dc4d5b99f18d7d78c5b6e5b844ec642b3e706ce00286ae4cd0a31093516d67ebff3470076cce60c93079e685068d7b05a7975500c3947d1b46e SHA512 67af3dded9d2cf0c3e9fc5db318defc4237f791bf7d591c5a6f990abb554d77c5cd9a60d3524c096a52591b31fc0cfc48c06aca724a613b7cc0fbb0df1e049b5
+EBUILD bashate-0.6.0.ebuild 706 BLAKE2B 316d757c9a3797e5ae325bde0a63682c5dacac0c5aa2f98bd43636cef3511881483ea72234ea1b446f2aec986eae0310299815059b28a75faa0b4bf712e22e63 SHA512 d77731f7d40b9c262bce13da8f2a7ee13c6fe918979838a3fd00aeb9ef369c5353c89c020102c64b8791137030fa998ce2a1ee6d0814fb2d2ba08560a3268346
 MISC metadata.xml 517 BLAKE2B 74c61fabea9ee345173582be1486426377f97187d976b992380d6670fb024c00ccfa818e6bac19e1e637c371280ca8d5535c8e84bff52ae874eeae939728a400 SHA512 eca862a58ed6a1571e626ddc24e73fb8d295f0a6e5fa36246d261688d9de81ff7780018df8defd159094ed8badf8449982dcf07c2415067080f38ba516da481f
diff --git a/dev-python/bashate/bashate-0.6.0.ebuild b/dev-python/bashate/bashate-0.6.0.ebuild
index 8f865c04d8cc..02b8b73e7e8b 100644
--- a/dev-python/bashate/bashate-0.6.0.ebuild
+++ b/dev-python/bashate/bashate-0.6.0.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 "
 RDEPEND="
 	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-pythn/Babel-2.4.0
+	!~dev-python/Babel-2.4.0
 "
 
 python_install_all() {
diff --git a/dev-python/behave/Manifest b/dev-python/behave/Manifest
index 284ba0d4dfea..7fd59121855e 100644
--- a/dev-python/behave/Manifest
+++ b/dev-python/behave/Manifest
@@ -1,3 +1,3 @@
 DIST behave-1.2.5.tar.gz 385738 BLAKE2B 0474d6442339ea263cbbc58a3d4ce86bd576d3b4a9e46cc14ebf9b722a07c4d85f7203791bab427188d24ffc75b92011dac3c967503177cae4e0d26d25d171c2 SHA512 137ede0baed9df154087249df8dcae81ab0cdf1de91a5790fca7ccf3231ba2ba4e64623abd2b8c9bfc459ab6575f68b9ef7e03e33ef79e524d9443a8489ec7fe
 EBUILD behave-1.2.5-r1.ebuild 1409 BLAKE2B d2e703777f9ec5e2a3c1373f979bcbca103659ea9ca2391f13b8e620026f51e7442b61cf89d6fdce8f2ce84665d55e94d95c82b850fdfa4ad6a515f44165ca90 SHA512 749877c8c07b7c5298d56a1da86bcc89e16c3022720e3f751c58bd62071c1cdf1b66e64bbd69b3795b840a3908f7f308919164d5696a948eb0e511e7fb902abe
-MISC metadata.xml 261 BLAKE2B 36c9f189064357614d9be7714f08b4bf3616226e65ba0b571839897873ac629d6432b3ea89bcb896b11f1d2d7e335247c5356b5a5daaf45ffc01cb8ba5f3e43e SHA512 2fb363da61f79ff9d647644f210b3aa8d0ca307510816318f69b91c07a9ca6a0de5b23452ebf82cfff5b518c8314c8f94cfd116cc22f1b67ff949e63fd46ea09
+MISC metadata.xml 287 BLAKE2B 44ef37aa60392839a27feaf73bb9e9c3d52addba0ba77a1fb3019c1d8ea4d9a5d925bdd8a3e8f589ba5a8afd56a80e2500f1974d83d7678f75c2ef3eae102872 SHA512 8debdc83fce934b6d17b07fdfe9f0f3fc6b3fd3fc12f012e0da02c74cf8f0854ef14cdc16b456143e137afbb5f9a76a6874c4b20d78126a046f4819773d3bb60
diff --git a/dev-python/behave/metadata.xml b/dev-python/behave/metadata.xml
index c8179e523f89..99d6f508ed26 100644
--- a/dev-python/behave/metadata.xml
+++ b/dev-python/behave/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">behave</remote-id>
 		<remote-id type="github">behave/behave</remote-id>
diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
index 7a0fc4385282..7398730ef22e 100644
--- a/dev-python/blockdiag/Manifest
+++ b/dev-python/blockdiag/Manifest
@@ -1,4 +1,6 @@
 AUX blockdiag-1.5.3-py2_7-test-fix.patch 551 BLAKE2B d7e44b823390b6338bdb2d33cbdcea1ce3785adc0c6ad2b198f4157336ee2f823f95023c0eae9724cb695fdf8576f754430baff5bfa2a77099649991f72ccde9 SHA512 08273d2d3ed14a88082ca1c21b9eed73bd7e878473509d2d00eff89f0be1b15441e9d60123f41f29afc7752d10a357a9457100ac2cc0f8f9daaaf76bdd24f659
 DIST blockdiag-1.5.3.tar.gz 2704391 BLAKE2B 4d66263d63c73607a9f1e180172be49d25ffd042fb5ab088138dec542a47ee3e68c99442713f32b004ec31ca608686e495d3ec9172f8ab8b074d94d111733144 SHA512 11ff6334d1ae50c103158db6ef9acce76116a17cfb8e0066581c234138f17fabfddd183b154f407fe95dcd414b0054aebdc22682e82a8e7595905f1ee2fd6222
+DIST blockdiag-1.5.4.tar.gz 2693073 BLAKE2B 8a825742b4144667153af00d5e334325f8a3b49823355787dbd577729da8b0fc221ead14ab899ef8aef1800bbc2cdc47f060330bf0a2f2f1bcd055d172d8adbb SHA512 0eef8b3837282ed611e044ee618abca1f799b4a151bc2d7cece140c97ac728b2f3b9a3bb6877d3fed42a74e0173d0cbfd2966521c4dfb21c266975b4062405d2
 EBUILD blockdiag-1.5.3-r1.ebuild 1613 BLAKE2B 356ba9c7c742561fa180b4eb5e7a9ac43179f5a2f0893574128396a59ad35c95cd4ff551c3db4afcb371871efbdfb2af788a64f1420badebbe46c28346ace657 SHA512 38c898c6cec91f13924a34c1d9fecafb58565b49b465632da172be332a71c6420c67eacbfe699b992675a9ac45eec1fccc27ce5964560318085b9d0b971a9548
+EBUILD blockdiag-1.5.4.ebuild 1830 BLAKE2B 1df20c47f2bd53ed59ee82a959a2184e1f65cff56b59b38734084b608d63c72fe9b1a6c6be8a3d235671ec0a4cd4c0dd70d63dfc45405472c85b5a6503dbf89a SHA512 5f1f564fc0a1e77f18abbf9a9533b083ee406c16fabce7a2b77f3f440ee4067c0248d3bf2136f949e487903d828cad0690b29688800daca9eb9a18a1e4749605
 MISC metadata.xml 830 BLAKE2B e53725abf1471f25def5ee17b11893b8395a23d105d1582fd25c39cdbc3334460b6a9737d134c9830cd2af0900c834ba112b15f772ac5bcb0fe2f0740a4557f7 SHA512 0b02e5328a040a199253e3a0aea67552d564989bbbb8c0323c5ccbacc56e44546562ef5a4ba10964eeb10ecc631b4e1c8c902fd3450f6d77290b3d7af354b2c1
diff --git a/dev-python/blockdiag/blockdiag-1.5.4.ebuild b/dev-python/blockdiag/blockdiag-1.5.4.ebuild
new file mode 100644
index 000000000000..ae884c40081d
--- /dev/null
+++ b/dev-python/blockdiag/blockdiag-1.5.4.ebuild
@@ -0,0 +1,62 @@
+# 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="Generate block-diagram image from text"
+HOMEPAGE="http://blockdiag.com/ https://pypi.org/project/blockdiag/ https://bitbucket.org/blockdiag/blockdiag/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
+	>=dev-python/pillow-2.2.1[${PYTHON_USEDEP}]
+	dev-python/webcolors[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' -2)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/reportlab[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		media-fonts/ja-ipafonts
+	)
+"
+
+PATCHES=( "${FILESDIR}/blockdiag-1.5.3-py2_7-test-fix.patch")
+python_prepare_all() {
+	sed -i -e /build-base/d setup.cfg || die
+	# unnecessary dep
+	sed -i -e '/pep8/d' setup.py || die
+	# disable tests requiring Internet access
+	sed -i -e 's:test_app_cleans_up_images:_&:' \
+		src/blockdiag/tests/test_command.py || die
+	sed -i -e 's:ghostscript_not_found_test:_&:' \
+		src/blockdiag/tests/test_generate_diagram.py || die
+	rm src/blockdiag/tests/diagrams/node_icon.diag || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	einfo "For additional functionality, install the following optional packages:"
+	einfo "    dev-python/reportlab for pdf format"
+	einfo "    media-gfx/imagemagick"
+	einfo "    wand: https://pypi.org/project/Wand"
+	einfo "          Ctypes-based simple MagickWand API binding for Python"
+}
diff --git a/dev-python/boto/Manifest b/dev-python/boto/Manifest
index a504418dbcc7..cc1a6f2ff8c5 100644
--- a/dev-python/boto/Manifest
+++ b/dev-python/boto/Manifest
@@ -1,5 +1,7 @@
 DIST boto-2.41.0.tar.gz 1440323 BLAKE2B 9d72fcd09cbf57d22dc45d42699af8cecef6f2c8e4009c9d70b54a9b84e23801ecbb5f7bc484692ca93ae302793b4d2f511c1209bcd33d0703a39b809bda1e00 SHA512 ffb503e8f7ec84ec973e109ae9524e1db2ef5f34d9424c380eed9a85871f07f8c9c798ca358fefd772ff45a72226bb02eebbbf6ab2d56b2442c41ede736f6f5e
 DIST boto-2.48.0.tar.gz 1461372 BLAKE2B 0069ddc6def7d8698471bd66a5d8d4b62d49f49138036b3ae6a9655e7b7432af5449f2812e83f2012be2f01e93a61d9608157c9fd4ea0a52f8801e31877a78a7 SHA512 ce8e302b059ef31e81078ef21999b96b8770d2ef0c70358624c8cc6a79b1a43a78e1c206cbcba50eafb9c964c4eda5b9b0b127ea9523dcf7438453b4b2293f9f
+DIST boto-2.49.0.tar.gz 1478498 BLAKE2B 6a897ea162f5f4bd34a2d488a3e3897f7f2f5b8707dd0922c01b6a0b90ea577223bf3e588b6685bda1f2bc0e92af426711fcba67a70377183465a530065c6c84 SHA512 2175cf30cd25bbc05812e83e5ade7668c3e21b1bb09aa1b43f0f0ac7d6967a646394fb52c9be673ebb65618c5b33a52d6f31f6da702f5cd1d6c9a18169476dd4
 EBUILD boto-2.41.0.ebuild 1402 BLAKE2B 7f769e6d77cf1e65c804eaf723b6bc4c18f052c695a2e5acadaca36fa55a29b16f7837cf89e695d03d25fa45c260f179f233e646f0a10ce9c88a096811b82b7f SHA512 f1f33c9eca24e2e02aaa71b8cdf4ba32011c278a00f927842822d0ea7a4d2a8c0b3c0754d1a300b3819bc3594c614c6f554f545ee568e4c748ae33124cbc6d66
 EBUILD boto-2.48.0.ebuild 1415 BLAKE2B f7ae0768ae73745cf8c3ce2cfdb00752cd875aaaafd4b195c09111b5d889f70c9ebfc69c396e3f5592d43f0bf8bc25137b6477cd45e032106f1bef7cf0e06d06 SHA512 2d39d0cbe80133c9b3e56aa7425cd4b7aa4d4fb953bc5d8ecff64ae735b15e6790d672cc534d29a055448da417481becdb975ac1ea25403bb614f71be48f66d5
+EBUILD boto-2.49.0.ebuild 1415 BLAKE2B f7ae0768ae73745cf8c3ce2cfdb00752cd875aaaafd4b195c09111b5d889f70c9ebfc69c396e3f5592d43f0bf8bc25137b6477cd45e032106f1bef7cf0e06d06 SHA512 2d39d0cbe80133c9b3e56aa7425cd4b7aa4d4fb953bc5d8ecff64ae735b15e6790d672cc534d29a055448da417481becdb975ac1ea25403bb614f71be48f66d5
 MISC metadata.xml 419 BLAKE2B c6c19e4ba3ecc5a36b535267b75cdf3afb7317e577e8f0899d43a334632633d771b5e5216517537616cc99c7766a852d2b4c5b132e174f8481d86649253e0897 SHA512 ee5587224538b14f67c30eda60c161e4c07c801c4b4edb24bcb0350e17c4d655c4d9a6907ebe5913d7689e1b6078ef25f47b4fe0a7c655cfa8d5ea775b4d0329
diff --git a/dev-python/boto/boto-2.49.0.ebuild b/dev-python/boto/boto-2.49.0.ebuild
new file mode 100644
index 000000000000..23aa3a1ddca4
--- /dev/null
+++ b/dev-python/boto/boto-2.49.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=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Amazon Web Services API"
+HOMEPAGE="https://github.com/boto/boto https://pypi.org/project/boto/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# requires Amazon Web Services keys to pass some tests
+RESTRICT="test"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_test() {
+	"${PYTHON}" tests/test.py -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		# Appease the doc build and supply a file for _static
+		# the usual emake -C docs doesn't work under this authorship
+		cd docs && mkdir source/_static  || die
+		emake html
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/brotlipy/Manifest b/dev-python/brotlipy/Manifest
index 0eecbdf080ca..375e94875b8e 100644
--- a/dev-python/brotlipy/Manifest
+++ b/dev-python/brotlipy/Manifest
@@ -1,4 +1,4 @@
 DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
 DIST brotlipy-0.7.0.tar.gz 19375 BLAKE2B 035dc8757e491bc4fc0d8e2b6b82703eecc8f6f4150da42fda0f6c6f42a617519f5191371eb1dd976b8bbfeab88845bb018b874a395cdbf0ff409a6911f969f5 SHA512 bec8183cf3cc8ba9e594d1a86a8a33d88a6ac8e9c6a6287c837bda3726183ff1b486f2c49da4e489b5b3cb51b57dd5816413b59419920c2ced48435221f1beaf
-EBUILD brotlipy-0.7.0.ebuild 1387 BLAKE2B 135f376060afd36b125a5cda9ebf82b1a9b0c1bd84302a582b83bd9cd6dc60ebf868dcc0ce4e5373b2a3e96d2596b1462e17aefacae8ecfcf8e120d77a0cb21f SHA512 8ce6281fd42144910efd73c099829fbd7098140a8b8871792a26e693557ba2c25f35cf7020e396cc6c97520bcc5d7d18cefc24702dfd2b769ebf74e0b4ea0bc6
+EBUILD brotlipy-0.7.0.ebuild 1391 BLAKE2B a9ba9333522a46b821d4a63dcfed7e02f6616ffa2fac484777130d026492ef908196a4ce1624a7e56ac2d6e935858f0e123c0382cc06a912c981bc5625692987 SHA512 d3bb2132eca0e2507213c19b57e1a37681504359805549bcf87638b1e90319f800a1ee35be6215c53c32e2ebd0b90ffff92242f603491f2030f68cff7736760d
 MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/dev-python/brotlipy/brotlipy-0.7.0.ebuild b/dev-python/brotlipy/brotlipy-0.7.0.ebuild
index 8ea258845409..4af02f271a99 100644
--- a/dev-python/brotlipy/brotlipy-0.7.0.ebuild
+++ b/dev-python/brotlipy/brotlipy-0.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
@@ -44,5 +44,5 @@ src_prepare() {
 }
 
 python_test() {
-	py.test -v || die "Testing failed"
+	pytest -vv || die "Testing failed"
 }
diff --git a/dev-python/clint/Manifest b/dev-python/clint/Manifest
index 267a78916c6c..d405640d53a6 100644
--- a/dev-python/clint/Manifest
+++ b/dev-python/clint/Manifest
@@ -1,3 +1,3 @@
 DIST clint-0.5.1.tar.gz 81140 BLAKE2B 5b42e7d46321f0416d3ffb51edf66c53476d3e4a211e971f36cab54a412f6b0f0ec26486c2b95871956ab09e7e4adf68e8329dd7e9e3c7ed1adb3f8a0dd2a728 SHA512 3ad8bfc587acb1322c7d7c3e73756a07c98f3b4215a3d4dc409b5a2067bc70dce2dd98d19250b8122b319b7bcf5e2859251de2829780345de06f93b35447c4e8
 EBUILD clint-0.5.1.ebuild 946 BLAKE2B 638d1e154a0dfefdfd8e7be29c9e06959bdf6fa4910e5d26ea88f4dfc6ca54ef538a11a16dafe0e030f731c1bde72dfbcaa9e86131cabdbb760ec64e061538e3 SHA512 27a4c3c4c70fc393bf8290aea84ffbf01d5d7a992ecba28a5862f6c44c4890c37d2df72aeee85d3062293f35738f9448ba7b2b74d76e37d34c931a870e4ae78e
-MISC metadata.xml 222 BLAKE2B e38fd6b3adcc5736d84eccc152fae308171324da8a845eacd6b5e5d0b4d18cf1ccc5436bb66f26dc3eb0cf5e4eb03549f52b23a51403d8677713c2295f773f0b SHA512 714a5bebab34700e6110a052f7b6a094ca2532c6b860d7a707e645c75da1c2c7710aab5f9e9fdd4a5c189a92c115dc27e9fec70baaaa3769550c4a0218aa1c94
+MISC metadata.xml 248 BLAKE2B 886e9928c5735483e1b88968c7c68b328965d8b77022184e2428115042bfa146439a44a5b3b6ae1c813fc9626617bc5158d0be4d0c173594dc93efa84f1c2268 SHA512 28daaa3233c61835448e78dfcf4381cbb1d6789f0fc16b309aa9317d36f81754d1757ba5d6be5b6b6209fad9921708619b4e92011d91c879eddc440a819fbbdb
diff --git a/dev-python/clint/metadata.xml b/dev-python/clint/metadata.xml
index 1e32239530f0..7ae38406c025 100644
--- a/dev-python/clint/metadata.xml
+++ b/dev-python/clint/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">kennethreitz/clint</remote-id>
 	</upstream>
diff --git a/dev-python/crcmod/Manifest b/dev-python/crcmod/Manifest
index 8c461b1f6263..9c123cc57c40 100644
--- a/dev-python/crcmod/Manifest
+++ b/dev-python/crcmod/Manifest
@@ -1,3 +1,4 @@
 DIST crcmod-1.7.tar.gz 89670 BLAKE2B 542bdde18f4565f574a2746de5e1fcb10d015d5c89f3eba7a0c316a3e53eb5a895664e2f51e54dcbab7d2ee6f30055137f22498f44b6c27d40d0692ff9652813 SHA512 3c2f65004761c84f19d6ba95a0af74512108bad5007d9e20f8e684822e4196ce17073e58b47d2fa997e058e3d82782f3393458b6f0e86935418f38877d319a31
 EBUILD crcmod-1.7-r2.ebuild 495 BLAKE2B 394f8b4fa416c20004803a3b03ac4615e22231a96f79e26d60d27e2e248b18e44275e44202c28e4faed90b694e0b13e01749ca09081f169ac06bf9cd14621560 SHA512 15d4a4ea178de8448ee441ca81c235382eeb2c59ac465a17964247871e2b2112fad0877498bc1c5d972643bd787bee007ce51352f0ae7b527d7087de3b7e2b19
+EBUILD crcmod-1.7-r3.ebuild 506 BLAKE2B 6c919985e110b06cc9a1852c3e9ae0f00a2c31d121d1dca68a1fa9abf7b33dd5c4574a95e44b14ab8bb1210c1605952639dc645146cf1e559c21fe0da37acda1 SHA512 7edbb06ec7cdc05c326cbd5675983ab0f682e0f23e0283db3101457233218040effb0fed0caf3d52f6b0553794719bc5bd158165cb6f7401b3d0bab72e551897
 MISC metadata.xml 592 BLAKE2B d936b9da244fdf7e037e990eb21fa657a29e77351583bcb07485e1a89b995bfa63cc135573eaca2dc9bd5c0a5a1df88f4940c7d47dc9aa2ac14731e3882883c1 SHA512 b2cd4011048abcfd7853c8411820b7f5d8ca69ec9c12f121f4c2f406989a8a829bb998c05019e68c0dd702f32ccdae94e83d4897d174c4e09a99177ae3a89433
diff --git a/dev-python/crcmod/crcmod-1.7-r3.ebuild b/dev-python/crcmod/crcmod-1.7-r3.ebuild
new file mode 100644
index 000000000000..14a3f65d101e
--- /dev/null
+++ b/dev-python/crcmod/crcmod-1.7-r3.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=( python{2_7,3_5,3_6,3_7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python CRC Generator module"
+HOMEPAGE="http://crcmod.sourceforge.net/"
+SRC_URI="mirror://sourceforge/crcmod/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DOCS=( changelog test/examples.py )
+
+python_test() {
+	"${EPYTHON}" test/test_crcmod.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index 0f0f68f2a21e..a6bc8175b949 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -4,10 +4,10 @@ DIST cryptography_vectors-2.3.tar.gz 35303908 BLAKE2B 694f5a741ddedce2101632dcf1
 DIST cryptography_vectors-2.4.2.tar.gz 35087269 BLAKE2B 2a8df1e98b6bba127bb8634ed27b43d4d99c77115d0206b4730feeaf6179d31e0b54eb38ad809e828c2ac6db2ecaa5cbc47f6ab2f99a888eb7e738380cc3b8ee SHA512 cddd46916b6e5c9101589e6aaeaae0da61eabce9df21a196e09ed0c12bfa7da6e3afcddbb75c657f3370b2a3bc67ca862b22d6c7750301a867b6b03cb9bc83a3
 DIST cryptography_vectors-2.5.tar.gz 35094063 BLAKE2B 93b97e5483892a43e69c3bc8d408e0e831246e530b2665fe372f1caa6284a2701c119a85113a85f86128f71e8be0148328f623c6a48f7d4cafc774ea3eb42da5 SHA512 cdd066c597731eb782a3288ddd83ab97b13097360399e8368c7c7c8ba16ff3e6269405885c2ad81aeb0f79d8ff84395aa00639b3453576ac0b57d37d8d36dbf7
 DIST cryptography_vectors-2.6.1.tar.gz 35097785 BLAKE2B cf5784e97d288b464d79d0aa13bcd19fed3e1c585c1589b52092d654a9988dd52e64c317c50774d4dc54f535d37296df8e5da070fbaa5f38d4eef3cade671a87 SHA512 44d318d5f983955f42791cf182dd80070a87c3c05f7353e204a520588243041fec97367c6fb6d9febcdab0ce7bcf1d135a8e6b44a7387b599752b7c87fc81d9a
-EBUILD cryptography-vectors-2.2.2.ebuild 683 BLAKE2B 6b1174d7860066e053dbf897126217ba1c2baf680fbf5707bac1c839f4d39b9a13de2379e370c0a7fea9b9bbe98ccaea5a77aa6aaf356075759f9175e52d912d SHA512 4c3c13b25b046f282ec9630ce82c8cbd7f25aa727dbc217099c502e437390bd7b613220a17ab776b924794489cce7ce2ccd8850333afc3f54446769941f463e1
-EBUILD cryptography-vectors-2.3.1.ebuild 708 BLAKE2B 4af0ac29aa18a9981687c97e39eceae3709a62196008adac94e3c5a86fada700d8d2dfcb2339b65144820a2d46b314514f74dd3c8166ee386c88376a40b55873 SHA512 b3fff41acb748fef5a77bc54ad7344722d28b9a2637f8911c2ca70a0e617d3febbb50042f92fecbe5f2e75fb0478894079eafca66a6ec944a51eed04f8fbe4fd
-EBUILD cryptography-vectors-2.3.ebuild 706 BLAKE2B 232c46859a6bc10de44db964149fd451e9129883f44ba2972354e13d957e512bbc47e2fb71717282bf7b26712ce3f966d3821a374b5c1b08f7cba33c8f885e6a SHA512 7ad83b772e9ec0a91e9d512663d3b2ea00916e192f8deca2dce09ae909432daa301fc6f0dd3e46f67764de7dd606ddbd79ab51600e26f2fd52182678fbd53bd1
-EBUILD cryptography-vectors-2.4.2.ebuild 706 BLAKE2B 232c46859a6bc10de44db964149fd451e9129883f44ba2972354e13d957e512bbc47e2fb71717282bf7b26712ce3f966d3821a374b5c1b08f7cba33c8f885e6a SHA512 7ad83b772e9ec0a91e9d512663d3b2ea00916e192f8deca2dce09ae909432daa301fc6f0dd3e46f67764de7dd606ddbd79ab51600e26f2fd52182678fbd53bd1
-EBUILD cryptography-vectors-2.5.ebuild 706 BLAKE2B 232c46859a6bc10de44db964149fd451e9129883f44ba2972354e13d957e512bbc47e2fb71717282bf7b26712ce3f966d3821a374b5c1b08f7cba33c8f885e6a SHA512 7ad83b772e9ec0a91e9d512663d3b2ea00916e192f8deca2dce09ae909432daa301fc6f0dd3e46f67764de7dd606ddbd79ab51600e26f2fd52182678fbd53bd1
+EBUILD cryptography-vectors-2.2.2.ebuild 683 BLAKE2B 14c689b0fe1ce428867ea594b3dd257b537aff0577a25c24b37efc28ac57b05427195fd51bbb54d1aec85a6d1acb0f85fb45846dbb9e1a65436df62da6dabd05 SHA512 ec57ff26c72f11f48257b19726e2f17916cb1dede23026d76b723079ec58a12ea561bb5e44a09269238049ae0443ac5e42145a89b868b80b7bda736cbe9815c5
+EBUILD cryptography-vectors-2.3.1.ebuild 708 BLAKE2B 7c013c701827c3b9388d6a51cdfe1fa3be55018054ec60130b59cae09104be198fc5ce7056e0e8ba3cae3bc2ebaa03eaa9bb56a6408e7262b2d34b21ab07f740 SHA512 06ba07ffdf41aa1de0ce0042ebbe8c52e0a2211d0856b0df560b9caffd4c5136df4cae3e112ac08d0a839bc72ae23e5f865992312dee6bbb2f8de7ead69b4d8f
+EBUILD cryptography-vectors-2.3.ebuild 706 BLAKE2B f76f74204d63ed328e92e56343d8886f37e235cf734183b88498afd83910dfd2bf4e108cf9163020d14eb74e498a6ebf174e6e424ebfa4e186275f201d41e9aa SHA512 7f2cb39ef10afa831733bf78eea20257ee29d8ab05dd5bba14131310c4a6f9bd8f16e24b4091e0b9756056fd96465dad8ee25c684343d93b2d70291b902c2110
+EBUILD cryptography-vectors-2.4.2.ebuild 706 BLAKE2B f76f74204d63ed328e92e56343d8886f37e235cf734183b88498afd83910dfd2bf4e108cf9163020d14eb74e498a6ebf174e6e424ebfa4e186275f201d41e9aa SHA512 7f2cb39ef10afa831733bf78eea20257ee29d8ab05dd5bba14131310c4a6f9bd8f16e24b4091e0b9756056fd96465dad8ee25c684343d93b2d70291b902c2110
+EBUILD cryptography-vectors-2.5.ebuild 706 BLAKE2B f76f74204d63ed328e92e56343d8886f37e235cf734183b88498afd83910dfd2bf4e108cf9163020d14eb74e498a6ebf174e6e424ebfa4e186275f201d41e9aa SHA512 7f2cb39ef10afa831733bf78eea20257ee29d8ab05dd5bba14131310c4a6f9bd8f16e24b4091e0b9756056fd96465dad8ee25c684343d93b2d70291b902c2110
 EBUILD cryptography-vectors-2.6.1.ebuild 693 BLAKE2B fca6d15447ed2bb690c11174eb7232611c0cc5fb71c064a7902d847fb6e94519961c3a0fd0d6784f60511ea8cbeebe73b0e2f5b4f85f520f9b439dbda02f8506 SHA512 cc88ec4012c7faa0d19a4518773b8225aa0e88fa739fa02ceb97314841062375cb9e786a830d6b1f519ff69ad5b518a8d20c19709ef7b8d3bfcaa1a72560f1d3
 MISC metadata.xml 333 BLAKE2B 31fb9fd463281fce83ac94d33dc69e54eee748ab3a230fa26ef36f29026ce8bcaf821e69994d2d94ed3b69c24b30cc80fa0a67f100cd45327ff1bb36a91c6014 SHA512 d65176e5ea86d82a13687d70fb2f29ca046bd71526752fb3583be9b0507b124363f271d697cfe6724245d6863c5aac36e67b1e50808041c52066d66e1f8b586a
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.2.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.2.2.ebuild
index fab5e7a04264..ca774fdc116c 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.2.2.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.2.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.3.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.3.1.ebuild
index 8b8c811d8095..6d0862d60504 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.3.1.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.3.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~amd64-fbsd ~amd64-linux ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x64-macos ~x64-solaris ~x86 ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.3.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.3.ebuild
index 81b79f99f0cc..dc69a046a72f 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.3.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.4.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.4.2.ebuild
index 81b79f99f0cc..dc69a046a72f 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.4.2.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.4.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.5.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.5.ebuild
index 81b79f99f0cc..dc69a046a72f 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.5.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index ae34d87581d1..6e5b7e505418 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -8,7 +8,7 @@ DIST cryptography-2.3.tar.gz 449464 BLAKE2B 7485c745f9c6512a5efce42181970deff19b
 DIST cryptography-2.4.2.tar.gz 468645 BLAKE2B 80ecde87cf1568239977fbe4f835db98f689a7dc3646d44229b5b33932885c288d4274427f5d04eb74e9e064b01b11b7eac40fc6221ea2241371bca618cc66df SHA512 800735fa86e9ad0f8517328d47e55dc79a2b86d8c7539ee2921c526085782d8dad5559bbee84f7effb42275503fa9a984b099a688c530c92f5672c423c0f1a28
 DIST cryptography-2.5.tar.gz 487694 BLAKE2B 9502e7b7987ee0101ad8e5fcd09208034222a7f20b6b3bc3126c8b59081c9d8ecf872985d5fca191fc132dd6759afd4d11c0e0d39268627f35990c005a2095d3 SHA512 5e8f8818fcaa8143526006b027107b8afbdc925d40c846701e65b2c7ee02235b7e0918246515520ef2030b1c87bb157d0d403c28ad68c31459d677af7e2d0b3f
 DIST cryptography-2.6.1.tar.gz 491580 BLAKE2B b81114b57e9973c80fe999a63a3b1269d6289ac67851fedc263927b74e9e5ec4f35356cf5d46e4a27a994d5a3b2b3b599fea264b3ebce3a0cac27abfde3ef046 SHA512 f14319e24d9dca52e74548cada5b78a6235f089ef875dbff4799e862f94da8b087f1b6e03e84dcef9fc7d7693c4a349c5f0cd54b8535806da777420ce8757d39
-EBUILD cryptography-2.2.2-r1.ebuild 2167 BLAKE2B 61ec989c66458bf9ccc4a49b08c86285ae20ffd76d3b36ba22c1485f5d5c1b68b63a4f96c0561b8f9cf5fc15df95cd29987de24314613df9f32d25789defeeca SHA512 e9077230eca155e20f3f82915efc868245d47c3f9537ea552bc15307c052840ab25aa95df703db31d4ce2393cbf554b53efc455c55bdc2503fa8b666f15c033f
+EBUILD cryptography-2.2.2-r1.ebuild 2167 BLAKE2B 8e134891d78e2e8651a21839784cc81d322f478616f12f6f3b550a77262065a3de42dc0fe58a4c8b8c82bb144cdf62b16011551abaed03c83e31407d87051af2 SHA512 fe98cf1615072076650bdc00c42a04b992e33f47ec27cf4153d1572017c622c2fa7285c7c759577e8750b215dac7663685564873ca83008d8cca6b172d770121
 EBUILD cryptography-2.3.1.ebuild 2162 BLAKE2B 107ab46113d303cb65ea7a525dc52cdbe4002effbc751cbbfe4e60eafa9cf9c7b6b991f8644503fab0a1114b2c63740fc966662a9a3f66576891753a8ec6e47d SHA512 788f58ba1a66ea0a658acb686fc2a9a1693274482e96cf95832c68df4c81f1a43ea545da163244385601cde5a56a83071d9340ccb2f100df6ba8474e2d019707
 EBUILD cryptography-2.3.ebuild 2117 BLAKE2B 3e57b574745c93c3418cacbff7e878c55b14623817dd3568146424b8a58e55e16365e8df0bc484f56e95914c50d5cec9babb8f77d1663512d458dc2e62a396d9 SHA512 6c507578db5f181ef9b72804d7b0ff33d2314bba8dc9a59d378e0ff7d36a51fdaaa1d71a06ddca25854850900159553e4597da96584e5a32baca4ac7d555a4fa
 EBUILD cryptography-2.4.2.ebuild 2117 BLAKE2B 3e57b574745c93c3418cacbff7e878c55b14623817dd3568146424b8a58e55e16365e8df0bc484f56e95914c50d5cec9babb8f77d1663512d458dc2e62a396d9 SHA512 6c507578db5f181ef9b72804d7b0ff33d2314bba8dc9a59d378e0ff7d36a51fdaaa1d71a06ddca25854850900159553e4597da96584e5a32baca4ac7d555a4fa
diff --git a/dev-python/cryptography/cryptography-2.2.2-r1.ebuild b/dev-python/cryptography/cryptography-2.2.2-r1.ebuild
index 349c98d1716a..566702d29ebd 100644
--- a/dev-python/cryptography/cryptography-2.2.2-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.2.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libressl test"
 
 # the openssl 1.0.2l-r1 needs to be updated again :(
diff --git a/dev-python/cssselect/Manifest b/dev-python/cssselect/Manifest
index 68440f3d0c7b..6ae747c0efbb 100644
--- a/dev-python/cssselect/Manifest
+++ b/dev-python/cssselect/Manifest
@@ -2,6 +2,6 @@ DIST cssselect-0.9.1.tar.gz 32952 BLAKE2B 7f7a78e8085036bed72c2a1a0e4a97cd1988e8
 DIST cssselect-1.0.1.tar.gz 21849 BLAKE2B cfe3637746329db224a44b680cda044238fa831ed0d05cf3484be6181de13bf8660330362626ddc03c7284a80e7c4a814bba293dfdca07a529d9c0c7163c95d2 SHA512 060c4b8d427a935b851b4b20d10ef89b9d6f685692b7144afc8f848e318abaa182ed60538355ea3f25050e358f24904fa0d9c01fe77e3d2428e2ef2a825e2928
 DIST cssselect-1.0.3.tar.gz 34027 BLAKE2B fff15a50d26ce83a0480020e54d00a027a7f21ca2c4c45d5552c6b4c19f7be21c390650c4befa61b7ae2b63946de88945deb488ebd6c7f7fc470950dab233671 SHA512 08feb3a515cc75089657a508cd1a80c6aaa97d710f27e99f9e749a1519adc13c5540134c6a4e0d7f548b022b8bd23dcbe360530d2329c5da36e43aca1f9627d1
 EBUILD cssselect-0.9.1.ebuild 1120 BLAKE2B f5d877f48eca65296629f61b6f59924343c9ee61d7d19dd2c4f1f0138e524b122c34046e4c00c3213b8c7b91a000bed4506984ea8cb0c97a3599e153e2e35a9c SHA512 21f222c66eee1df7bc155382b0e135a0572830e5f4517b01a2fb6650209b7bbd0811c13ef18306ffdf9bfa2ee4a5bd9fd7c30142afeaa947ae36b78ac7763fd1
-EBUILD cssselect-1.0.1.ebuild 1258 BLAKE2B 87fe2a3f6e13da836e1e9a0ba5aac05e3599e99139f1489760c9e4580884742fc046cdc750e91fa1fb6bde3d394d4e8875ae67df0d270a0364bae86e27baaf5a SHA512 cf53192515fb44fc8de12adf19f02e79797db33e148bae0a95ae9f263693f9ceab7684109143ad94ffbaed1cd5f2c9501094c2a23a6c7ff39b0c7fb0f6a31f21
-EBUILD cssselect-1.0.3.ebuild 1214 BLAKE2B 287268f346abdf7c58a567e65fa6447ed8e2fdd2a64cfd88ed9296055ebf28e3ca28127c3934d4b0c4b58d823bc7d2773fd0a0ed36c843b06195a359f7390cad SHA512 9f301833d601b9af48b059832769bfd119a58e0950bfa5a47d0ad2259b010d56cb8caad28f7490477cb5cd29acc2017678e1a0e27de4b5fc147ca8e9eb68c20d
+EBUILD cssselect-1.0.1.ebuild 1258 BLAKE2B d0b0aaf15d6a90727b73d760c3f5c9cda76c917fd367e08007fb327a32d43f159bdef67ead90426ae4149ab0cb738adf3ef96daaa25f89833b12e76ab0715439 SHA512 981db102be3f9e67c2fabb74b926066edb7815b772956f9d20649c083d2daf9a2058392705f5c4fb655dba651c81ea5c8f469b4fe1a0c98e1d6013c5e6b5ae49
+EBUILD cssselect-1.0.3.ebuild 1214 BLAKE2B 7794bce94ee5804c99120e11cb39a4924e6999e6f8310d197a72647ac4e0715f4eaaf3abb4340a2a6c7b8cc0dd6ac32d359634d04f93b93e1b75348aae789a0d SHA512 ca37dc91429d57da02ab63e6aaa5d098764bd56776ebd87efbe8846bd9ab3dc15d5bacd90048b863111be9c81a6452261b64503524fa51f31449bffa137cfbeb
 MISC metadata.xml 322 BLAKE2B 2ec56f6e5522f780aef1a27df29af54f7169cedf727e4698c0c3764002501a06e52db5a94901d795d75f792ae2e8eb7d82625f88e2069453c2ff4190352aa7c9 SHA512 9933f17432e27a6a708ad4c9ec1e5f65197c4c0048fe2deadf3ba66d878f98510e150dfdb83cf935294a529e505b261808b33503f5d6acb622ae1821e065d798
diff --git a/dev-python/cssselect/cssselect-1.0.1.ebuild b/dev-python/cssselect/cssselect-1.0.1.ebuild
index 89d4a074b772..12fa798f874c 100644
--- a/dev-python/cssselect/cssselect-1.0.1.ebuild
+++ b/dev-python/cssselect/cssselect-1.0.1.ebuild
@@ -14,7 +14,7 @@ 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 ~x86-fbsd ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc test"
 
 # No tests.py file in this release.
diff --git a/dev-python/cssselect/cssselect-1.0.3.ebuild b/dev-python/cssselect/cssselect-1.0.3.ebuild
index a6cf851232c0..e77b1296572d 100644
--- a/dev-python/cssselect/cssselect-1.0.3.ebuild
+++ b/dev-python/cssselect/cssselect-1.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/scrapy/cssselect/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/deprecated/Manifest b/dev-python/deprecated/Manifest
index 4cfe25bc520c..17fef0a45496 100644
--- a/dev-python/deprecated/Manifest
+++ b/dev-python/deprecated/Manifest
@@ -1,3 +1,5 @@
 DIST deprecated-1.2.5.gh.tar.gz 5038752 BLAKE2B 82ceadca4ccef4309b2a7d493620cc8a4dd9160ab7449a3019c9e9bc3a99e8016b6125d4165b71813d9543b7629d55372affdbd14ad2c71d101061595bdb677c SHA512 3a16b5d4f2475788ce919c327b668bb8852dab88adfa959826c9b68ccbfba3207a1c60ca164edacde8a756bd3895225af944a51eebde1230a93a973145231234
+DIST deprecated-1.2.6.gh.tar.gz 5043633 BLAKE2B cc72838dc772db62ca75637268d09cbab4c9acb84b42bd1d2d76397d43b81781cfcef075a9a6e6ca2ab55eda19acae95cdfbdd820c1363e7ea4841fb1cb61b7b SHA512 fcef322c6d9c317081dae365d469d4b26b0d23d8290e7aa0ca18592fb098ae7f535cb5e898cc81e5c734e7e211c847cdd9d5430c1999a4b9612f30934243ee9e
 EBUILD deprecated-1.2.5.ebuild 656 BLAKE2B 9763106db3ce5682550668baa7e5bc03ed271fa8dd115ebde5baaf7cb20016235a0b7e36794468db0264567ad1c64f0e87f2c45e7e3efe626c41e0cde49acbe5 SHA512 58a383055c50ade947e689f9b0ad529d7ee77f40b5d3e50f05a5d80928a022cce56e11f0bb597abc93303643630cf371a5ac304fb52d08d6473471b6ef72503d
+EBUILD deprecated-1.2.6.ebuild 656 BLAKE2B 9763106db3ce5682550668baa7e5bc03ed271fa8dd115ebde5baaf7cb20016235a0b7e36794468db0264567ad1c64f0e87f2c45e7e3efe626c41e0cde49acbe5 SHA512 58a383055c50ade947e689f9b0ad529d7ee77f40b5d3e50f05a5d80928a022cce56e11f0bb597abc93303643630cf371a5ac304fb52d08d6473471b6ef72503d
 MISC metadata.xml 326 BLAKE2B 465cb8f46170cfced4ed1ba3af61210b58fba1c1fe0af7f5f9b5d498f1a32993ff19f860231ac84b5f6661a67cc7837aa8a19b81afc108cd44e5d836f3fb93e3 SHA512 19656915996f8905a7c2ea398da098d5ae704445273471730c82c3bc391d4662a6e7fe8bf9b416ce23d3c171008d93bd6b462fe278c7bef64b304b2e467d894a
diff --git a/dev-python/deprecated/deprecated-1.2.6.ebuild b/dev-python/deprecated/deprecated-1.2.6.ebuild
new file mode 100644
index 000000000000..4f502db5e1b9
--- /dev/null
+++ b/dev-python/deprecated/deprecated-1.2.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit distutils-r1
+
+DESCRIPTION="Python @deprecated decorator to deprecate old API"
+HOMEPAGE="https://github.com/tantale/deprecated"
+SRC_URI="https://github.com/tantale/deprecated/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/diff-cover/Manifest b/dev-python/diff-cover/Manifest
index b375302a2bac..da955534e819 100644
--- a/dev-python/diff-cover/Manifest
+++ b/dev-python/diff-cover/Manifest
@@ -1,3 +1,5 @@
 DIST diff-cover-1.0.4.tar.gz 73907 BLAKE2B 81562c30533739f950e52703ce235b214f66932f806a47b1ab245b69bba8ef46d4333924ddf2ba4ca6b70a7df85ae071805a4fac7181711495f46540c4a20301 SHA512 aa5646c5d097e2b3ace5807bde007c9d8ebcf99578dee2aff1174aaafbdb9777c4794a8e9ddd4dc6edb5af7f1afc812fce4410db87d0bab4159f044489eabb5b
+DIST diff-cover-2.3.0.tar.gz 76738 BLAKE2B 467d8ed3cb2f4b0f76ad6b1928a87ad6f75ce46e555c061e30b56fc4856089fb270670ad9f704b9dc407e5c6cab2cf881696bd263befafbe3863bcda4ccd4ac2 SHA512 c47d64e1695596ba1244d687cdbbd6edf391b0c4a18b2550004bcfc36ce8798ef9e6a059e726e52eff45251b3bb27cca873be493c37b3b7eab9dec02f99953f6
 EBUILD diff-cover-1.0.4.ebuild 1039 BLAKE2B 3177e8f9381bd12d818befbbfe22d074dd1a99bdfd17c29dd09e56797f0f83a39107da1d21428325a32bf8929d1b2655db7838d3b27dc214cc79a16f3dc1a9b0 SHA512 6091446254f177768f0d04ebac7f5d754435965b0bcae732f946bd7f624275766066b08e78b440bd76410c508d070aa5cf074e4449f0a79c6b936a42b5e7d174
+EBUILD diff-cover-2.3.0.ebuild 1323 BLAKE2B 34db5fe4ccc7fd623d02e1428eb2de0560bd546391f27d84cb0a400d260fab82306901e11b43bd06a04bd6f1614cf2f6b87a42946a61cca850282884a78278c3 SHA512 d2ddf235db1dc0d11b7e1f79ee2fed4a55e098ce8f937fe9a55bf0911adce4627b84a08c5cff8062f783f9fbb83769035f6c975359c4abd5b792ef28fc9f6ac8
 MISC metadata.xml 380 BLAKE2B b3fee2fecc0de95a5056955412d4f069a57a405a887966c1511c4c63f6c2c77778ace33d439fd37c6b5db62c247fa7fcd71c15f6cc8a97de46e72a841aaa9514 SHA512 80581412380ac1b87077d5e1c74596434ae398bc9b654c5492db7ce60270e9ad40c0e13b5c95a11cae57bef6b2a1dfa8888f8061a2ff221acdfc30c21e57242e
diff --git a/dev-python/diff-cover/diff-cover-2.3.0.ebuild b/dev-python/diff-cover/diff-cover-2.3.0.ebuild
new file mode 100644
index 000000000000..b16f1d1cad99
--- /dev/null
+++ b/dev-python/diff-cover/diff-cover-2.3.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically find diff lines that need test coverage"
+HOMEPAGE="https://github.com/Bachmann1234/diff-cover"
+SRC_URI="https://github.com/Bachmann1234/diff-cover/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7.1[${PYTHON_USEDEP}]
+	dev-python/jinja2_pluralize[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.4.0[${PYTHON_USEDEP}]
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+	)"
+
+MY_PN=${PN/-/_}
+S=${WORKDIR}/${MY_PN}-${PV}
+
+python_prepare_all() {
+	# TypeError: test_parse_range_notation() takes exactly 2 arguments (1 given)
+	sed -e 's|test_parse_range_notation|_\0|' \
+		-i "${MY_PN}/tests/test_diff_cover_main.py" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/django-cacheops/Manifest b/dev-python/django-cacheops/Manifest
new file mode 100644
index 000000000000..5c9b8f29033d
--- /dev/null
+++ b/dev-python/django-cacheops/Manifest
@@ -0,0 +1,3 @@
+DIST django-cacheops-4.1.tar.gz 53766 BLAKE2B f74fa8b93700fa930f31e8db83b161c48eb520894d3e2072bf50ca4e18b20a8563438ac95ef5920a1371b3215a0d3b7c2a216a9d1f040cc51f4d468da438a966 SHA512 ea66f0744d9b0e3b03e92ee7083c17150c050a992e25159c50f766898d7ab9e2bcb0432db135abcc2dac0358aaaa7d2e86a8216ddf9afcdbb6c7400c3844ac02
+EBUILD django-cacheops-4.1.ebuild 606 BLAKE2B d07928e7e232983adf99c66eeb10f35dcbd9587dfff9cb3adb1324cc6aa0f97339e400050f4d2c3ce67bf7c5b5540f623ed8d27a1a33faf598bbc1df31412039 SHA512 2bdfb8cdfb35e739e5c254db92c1e52350bd4585260b5e4b6ea1704a068526337bb9f4c5373a418812146b19adc9e4c84f91582c41875dfa1db5d50b46cb3136
+MISC metadata.xml 327 BLAKE2B d4518f6d7090440fec7e9518fbce9813be8c9e7bce9583bdf0c47b1ca456a078d23fea12f20febd4f4bad6d2e57109e5acf301bdf724c6cdb5346749a3e42989 SHA512 88bc51ba0079d132b0bf9b053e33262f5cae9c4a66f561d6c7303066f117e2196fbbfbce5b4cfe35c7f1cc5020b3818c365dab4dde696d5543dc70ca32d40ff1
diff --git a/dev-python/django-cacheops/django-cacheops-4.1.ebuild b/dev-python/django-cacheops/django-cacheops-4.1.ebuild
new file mode 100644
index 000000000000..af2b57419842
--- /dev/null
+++ b/dev-python/django-cacheops/django-cacheops-4.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="ORM cache with automatic granular event-driven invalidation for Django"
+HOMEPAGE="https://github.com/Suor/django-cacheops"
+SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-python/django-1.8[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-2.9.1[${PYTHON_USEDEP}]
+	>=dev-python/funcy-1.8[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/django-cacheops/metadata.xml b/dev-python/django-cacheops/metadata.xml
new file mode 100644
index 000000000000..5d3d9dc0e2ac
--- /dev/null
+++ b/dev-python/django-cacheops/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="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/django-prometheus/Manifest b/dev-python/django-prometheus/Manifest
new file mode 100644
index 000000000000..32597ea027f0
--- /dev/null
+++ b/dev-python/django-prometheus/Manifest
@@ -0,0 +1,3 @@
+DIST django-prometheus-1.0.15.tar.gz 13708 BLAKE2B 64d72224da9cb481108ad17ed1409d97108353a39894f824428743f3ee894292352de4d4beebf1984294e34cea7b6d0144c5066d0fe5cca7d9c682f9410355d3 SHA512 48794f6d07ebdd3487060e62e808a66a97630045433dd91a27f1095f79a72197124c44c5d178c89785b8d048e8e828f84804c789cb5c2f0a053cf18864cde6eb
+EBUILD django-prometheus-1.0.15.ebuild 478 BLAKE2B 5b17706f111c72c0417b2cf795f77a6ef34366fb349a2e668ebc921c25ae582884fd09d8e3f23713d1d67f087bda1576992288c6078ce1bef48477c9be6ac9c9 SHA512 8ea8adc6f8e1b2f950c7feb220c44493640fc5048b20c7ca52718fb54059ced42a383249963746b4d5222593a74d97e5841f1da383f5f3274d2eb7a5563b51b7
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-prometheus/django-prometheus-1.0.15.ebuild b/dev-python/django-prometheus/django-prometheus-1.0.15.ebuild
new file mode 100644
index 000000000000..fe4f69261888
--- /dev/null
+++ b/dev-python/django-prometheus/django-prometheus-1.0.15.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="Library to export django metrics for prometheus"
+HOMEPAGE="https://github.com/korfuri/django-prometheus"
+SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
+
+LICENSE="Apache-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-python/prometheus_client-0.0.21[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/django-prometheus/metadata.xml b/dev-python/django-prometheus/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/dev-python/django-prometheus/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/django-rq/Manifest b/dev-python/django-rq/Manifest
index ebce7708c10b..3ffe248cc915 100644
--- a/dev-python/django-rq/Manifest
+++ b/dev-python/django-rq/Manifest
@@ -1,3 +1,5 @@
 DIST django-rq-1.3.1.tar.gz 37462 BLAKE2B 17c3eb4527315c7d562586b5d62ac1866d4e1de755a61f6d882007139494921efc689b3c649f0647ceb2b29d6b0914159c5247af33cc6c21ac6108beef7c40dd SHA512 7e8443889fb7f7e8059f81fc8e7cd319e5a8b54c0388130190a39cc167bcd2e85b761f7f3703a3cd37e5be245cbc788d98a121d048837dc77072c8713c332577
+DIST django-rq-2.1.0.tar.gz 38237 BLAKE2B d99a25655ab0f2ceb08f433b86e84f54f76bc6a93482655f117dced1f8242fb527acb8cfc598fadd282f932f9b7f02b780ef925dcbc8ee7778594a95d73e8ad2 SHA512 4bc59ed32176a121debcbc259386bd406ae141ad859b52ea779e7ee8c8b1d2634a1afc31b666e55bc8a70c841ce7aac81ba0e7f4207e925587cbf3817d9da666
 EBUILD django-rq-1.3.1.ebuild 536 BLAKE2B a2a8ccdab041255c32a5f4d80cc9995c66b4ccaba6e9190c30dec396d3b2ca676f88979da668ffa8b446f80203ba9be56ef1e4e4178411182d6ea3158da093ad SHA512 00db47fa7a946eb892ac85979f2660077687227b7a679fc33ea6845e8b759d5b936adabf3c47af729d815f2db07359762399a0243f1590df423626cd620d9188
+EBUILD django-rq-2.1.0.ebuild 535 BLAKE2B 14ff7dabf3f073db79935ad0d28145e17ab87359c1148ef2183b0ca71822ff883d72eaef2523669046d5943a7b128221771b7d3d1fa212a0eb65743324ce38aa SHA512 3356508a3e65e49a94ddeeddac2b4d0c57b4a4685e47d569eadb47e1f0faae8cd3b97884542c9e32170ca6780c4c7c8b34c404b0e24aff1025ad4ba71de49458
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-rq/django-rq-2.1.0.ebuild b/dev-python/django-rq/django-rq-2.1.0.ebuild
new file mode 100644
index 000000000000..f3e8b1727a7e
--- /dev/null
+++ b/dev-python/django-rq/django-rq-2.1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="An app that provides django integration for RQ (Redis Queue)"
+HOMEPAGE="https://github.com/rq/django-rq"
+SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-python/django-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/rq-1.0[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/dockerpty/Manifest b/dev-python/dockerpty/Manifest
index d79519e42777..378df7b5965b 100644
--- a/dev-python/dockerpty/Manifest
+++ b/dev-python/dockerpty/Manifest
@@ -1,3 +1,3 @@
 DIST dockerpty-0.4.1.tar.gz 19608 BLAKE2B 1c7229bdd18100bb75a8ec80f0b8a636137efce40affb2bbadf27eef5ee13322ab92f9a3f77db0ef79c35366daf700550eb9a358534f7a1f1c2b92ec2cd4d5d0 SHA512 1f27a1d1cf9bfa21a77f2c0695334ec09a81ed5b70190b16fb23ec0e2ab4cb84af334b5e9275265eff2d8014aac5f96890276bed5775bb805c3f30260c99da70
 EBUILD dockerpty-0.4.1.ebuild 778 BLAKE2B 51ebee072c088eae8bbf0ea266e69792f671e3426b3e7a7fd437960fc874e5b354395da4312bae15123e96d9f9ea1b26d36b8ad48b08b2f20853e3b2128146c5 SHA512 8f2175eda9b20d242b738ed5569b46c3d3c2dcc175fc2afc6acd52e4dbd65201f3686bfecf8f662c9c6459b241e12eda20f83bba4318ec4418df96f10e55b4cb
-MISC metadata.xml 220 BLAKE2B 40c610207f83c594fcf2d77853832138fd0f24196a36de37219311477391a0a4fb78ff1d0cf4bf4cd18eb5c289c2d5ac9d5bcf06121ee39114af1425a384eae7 SHA512 f14e0899fa2b1e1df186f4331f8dc7f517c169dfb578ed87490fb6b4255e8cb2013ed7f99cddb2f59ed224a9c5d85845284b52c67d7cca1e457acbef78fddd04
+MISC metadata.xml 246 BLAKE2B a3790516e837d7d62a7efa31295004ba64b36026f45d696d87b5fb83e0b08815b887209bd5ba4f0be5a8b1371797d4abdbd125f4f018b32dd95613b36c53ffbb SHA512 c9e4e7717be1b4f5571d287b57d59c6de4bee0f4bb0a21a55cbbc886f711d57e52e74761bcf7f1102e1efa4b0e56f508e5f15eeb69cb38866692bc232032f936
diff --git a/dev-python/dockerpty/metadata.xml b/dev-python/dockerpty/metadata.xml
index c0403a2dfbcd..a46f63a01b20 100644
--- a/dev-python/dockerpty/metadata.xml
+++ b/dev-python/dockerpty/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">d11wtq/dockerpty</remote-id>
 	</upstream>
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index 0dea2743d4b9..e4402611a159 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -2,4 +2,4 @@ DIST doit-0.23.0.tar.gz 316588 BLAKE2B c7c2edc3e38e60bf4cdf6bd7eae4f65606da3168e
 DIST doit-0.29.0.tar.gz 222341 BLAKE2B 8489568fe9236af04f87debfb4889840aa162d17d20f82ac0a9a22d1034b4c58976cd6829486a15b941ac1f50e7137c052fe332657c2b3f529fe2345bbcba2fc SHA512 a686457df31b414d0c3797789e0ae1ae5cdfa3674025236419cb59b254f342cd2db07911ef18b2cb576d8d817b44035b9372265b34b786b2779fb7074b394de1
 EBUILD doit-0.23.0-r1.ebuild 1931 BLAKE2B f7456f62b23d8fffc448e60688820b291e4d367477bde64f61725062bedb2909e2e9d6af37b0349f3c0324a320684540c2d6ffc0018b1a09501d9113c5535627 SHA512 1bc004b86aa9a74cbba791d918b6893bd7685d0136754fd1c63038dcdcb0c53133110f9d6d6828ce8172b5cf405af6015a099d539d91ece404aa4d3388fcec30
 EBUILD doit-0.29.0.ebuild 1959 BLAKE2B 38d1131df9b051da0037918dff7e17ab5ed41b4c30e6b12becebb359efcdaee93079780f8fc4688515da9290d87bff49f4c971108b68dedf167f3f9f2a3d2e50 SHA512 ef7a2ee93fc106c8d1f58fcefc2d34ed2f5c577d124e32c31cf32aed2d406332fef4ec680c90d7a96966a77d3b2a1e3dd9918e3d329f7ac32eb9f4ee7c24472d
-MISC metadata.xml 268 BLAKE2B 8c954a752c6b0d24a4622e78c29524fa808dda953da46229a5d1e757ae6fb88f796e0f8473e30a9748b07ab9464186bbd988f12dd96c3d2f19e176419eaf3ecb SHA512 7318c022300ab1ccfddb09bbf4789f64185dba13c3e4befa77f0e7aaaea4fa650508f66cf39d00c760ceea31872022d40523af05ecaac1c6b59005bc23f5bc42
+MISC metadata.xml 295 BLAKE2B 3613e0bcfa3a5b2d21fa4eeaf8eb44475f01a98462879581f558f1c7c9cf9ea9a8b39bcfbf0ded02f964d7d4060726c1bc4dc622ea19cf75b35afd1e1560a408 SHA512 67b65f9a4adc57efe3c9846e3088737b28b74d80025bf2647aac3becf7cf542f0dee0f32e4a5d05299c768a8eb65729373fbe4af2c72ab073df1f43040b0c393
diff --git a/dev-python/doit/metadata.xml b/dev-python/doit/metadata.xml
index aa35e52686ed..d1235f896cae 100644
--- a/dev-python/doit/metadata.xml
+++ b/dev-python/doit/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!--maintainer-needed-->
   <upstream>
     <remote-id type="pypi">doit</remote-id>
     <remote-id type="sourceforge">python-doit</remote-id>
diff --git a/dev-python/doublex-expects/Manifest b/dev-python/doublex-expects/Manifest
index 368fc3b2ac9f..27c5741aa6be 100644
--- a/dev-python/doublex-expects/Manifest
+++ b/dev-python/doublex-expects/Manifest
@@ -1,3 +1,3 @@
 DIST doublex-expects-0.7.0_rc2.tar.gz 6151 BLAKE2B 34d385467fec24a5210dcad53ef768d23eb5117b14679b89bcef721bf90ea380da50c62233afe92abaaf3bd015dc1bb021adedaf98c463400af3ec4e462b7aaf SHA512 94e499f01fbdc73f3f97bbfb64f299d43e3b767f8eb00eecb7c05e062cedd8fa84569cc97ef48aeca24df5ff94b1bfbb330a786500641c857039c2e7d287e952
 EBUILD doublex-expects-0.7.0_rc2.ebuild 750 BLAKE2B e0a826173f92a0ff2a8757530df6507ea031d09d3248a6bc4d8b584a33a8b5eb2b16bc0c0ec2b69444d0f1702a94ec355e03dc7b9434fec5ecf9acb8f8dd5186 SHA512 388c420d4e8973a2419998e59ca7b7bbefcd6f050dfc0d0d971220269ed16a3d86ba760e7ece2e020a25395472644fef2065fcd9d1ea4fd23bb213d65200245b
-MISC metadata.xml 237 BLAKE2B 444828ba665090177635ecafaf39aff3967d2adb4546737b4f84691fa60ffbd704f5893c53ff127f4522f6f5eac1110597d156ab91cb11c7e529ff7d50c8bb24 SHA512 b64b8bbac240cf5c5ac737ddfe3d7db7105afa8d667c00c6b3a84ec9c53ba858297b854ea866a5aabe291ec33593cd8d43a509e27d8b431caec940e3e5992c14
+MISC metadata.xml 263 BLAKE2B b2f81a90ecd9e66c5495a4c8cf4bb7d0e2dbce41a5e5fbc172f1d2ab65569bf15223789dbc356ae93774af872c3267b756eddaec82014c64f242c92455e8f3aa SHA512 0281999c203e87325a1f2688efd19a57088305289308fdf2401b775a3ffe375ceefb200dd4896417a7e1a5f436e5681143326c74635acc504af8e25d3b876c1c
diff --git a/dev-python/doublex-expects/metadata.xml b/dev-python/doublex-expects/metadata.xml
index f68f92082094..2a41f4498fe9 100644
--- a/dev-python/doublex-expects/metadata.xml
+++ b/dev-python/doublex-expects/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">jaimegildesagredo/doublex-expects</remote-id>
 	</upstream>
diff --git a/dev-python/doublex/Manifest b/dev-python/doublex/Manifest
index 783ce7b2a064..e4077950585b 100644
--- a/dev-python/doublex/Manifest
+++ b/dev-python/doublex/Manifest
@@ -1,3 +1,3 @@
 DIST doublex-1.8.1.tar.gz 69685 BLAKE2B 38f80ac0cf68dc2401eaa8051542c91d382e9ba22ed229b3c12a192f0b180b33a5660e54f647b2273401500a3292619d918dde9b0f685807217bca40e1aafbfc SHA512 30d2b572862370da8402cc2cfa5481d3278f0fefd2d5b2f5be126a793c8e165df0e2ae6089ba321e71d994f14024b882933c1523f7a0b9e341bf75644b49e073
 EBUILD doublex-1.8.1.ebuild 965 BLAKE2B 0e180f1884acd89d78cfbe82e075d424727e075ec8d4866a6c894802f838fd6e3da93e4528eff2b08485fe12915876c9dd8fc8e12ec798682266ff1e8c790815 SHA512 d7ee64f9ff77843f97f7366e43bd4b31e65f8d31be15c31be690eea7a9c906bb1567432f1dbd2053304f21afe33ac5e8d452e40312217a10eb72aac412f3c118
-MISC metadata.xml 277 BLAKE2B 563ae4ae4ede406674ba1ba83be6202dfdd79a1aaa02ca96cecfd27ef8cdbb35406a27336b7fbb48eb0e216e1b101b83ea04e95f4e9243ce9a755994d41f9e16 SHA512 3cc2947b7aa4a62c02611bb9e7abf2ad9f8ce358e5d8b9aa75be0fdd2ece325e7566716302d53c8ea476c1e3af7397c7e153f7368771fc8cbf87c89959bf858a
+MISC metadata.xml 303 BLAKE2B 45ebb26950f3f4fc9bc3d6d99418f544523b778c3952e91e6bfb5f37bdfc13b73d25e24bcaf199d61a69cad733fe370cd19ad0c934b3d478097c52ede1316784 SHA512 efe73a700fe748323eeb26f9203b3aab0e189c8ceb56efba5ba97a91793a5deb0ad973dad345e240fc9c15803b929fd84f26524055de1f2290f40042f318d2c9
diff --git a/dev-python/doublex/metadata.xml b/dev-python/doublex/metadata.xml
index 5b9f3b2a2fbb..20551dd2425c 100644
--- a/dev-python/doublex/metadata.xml
+++ b/dev-python/doublex/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">doublex</remote-id>
 		<remote-id type="bitbucket">DavidVilla/python-doublex</remote-id>
diff --git a/dev-python/expects/Manifest b/dev-python/expects/Manifest
index a592c370c224..c151772f3712 100644
--- a/dev-python/expects/Manifest
+++ b/dev-python/expects/Manifest
@@ -1,3 +1,3 @@
 DIST expects-0.8.0.tar.gz 27801 BLAKE2B 3371ad3b494a6cfaf463660d013dbd5c26d88e0cd7816be11a39466a831d2a3c19e9459967947651e004dc1bbc6f6e9a61eb0b9f69685482440056061fb9bd95 SHA512 c2379bb6b3b6181a0365a84b0602f2552de40760b7cbadd775705bacfe113ffbe55bcde818c5766f7079867ae38c8c02e318f3c9ffdccdddb58e6cf0559f1e25
 EBUILD expects-0.8.0.ebuild 811 BLAKE2B a9f705392a85bd8157b62dd8ba521cd8243a39ca809123395a0f77d9750fc045cb09418276244371b28b81acd07d3067f9540158b265de7751ecc926895a6059 SHA512 883b70ccaade3e678efa74f08c7aae685dfb46836d06aea41edc33a72f4c1441046da633be68e6f4249d0e0694eff7a64ed79318ee6275e82769cd2e3b88002b
-MISC metadata.xml 274 BLAKE2B fb1fc8d6bca26cdc3c2678f2b86b410c3d9e83ce5d27ebf3bd2d90477f20f35361e8194364f7cc80d39f918798bd10e087efd35689b1130018449b3fb414b9bd SHA512 b43b9a0e58dc6a73b1d3a8f99639ba7424a871961b76c778363dd6ff14bd4df4696723babdbf5075272d6aa6503d2adf1109c366f55a0935fecdaaea6084b42a
+MISC metadata.xml 300 BLAKE2B 31a0397f19e9d532bcf03051b430f97e50cda0ad360e9ae6ffbdcd17ddc5d6067495ed3ddcb73fad288fd7a7c0808e6e08a1a629ae1eb8fdb92749ef423a147c SHA512 8540e7e195b657fce1c062e1a41b3e0bc988a393f4f251069f14379a072708707e4ffbbd5dbb80fa217eccbf887bccc4c6a550dadfcb9aba54a1bdd4db8ecca2
diff --git a/dev-python/expects/metadata.xml b/dev-python/expects/metadata.xml
index cf43fcfc5ead..d45da0f37ae3 100644
--- a/dev-python/expects/metadata.xml
+++ b/dev-python/expects/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">expects</remote-id>
 		<remote-id type="github">jaimegildesagredo/expects</remote-id>
diff --git a/dev-python/flask-babel/Manifest b/dev-python/flask-babel/Manifest
index 245de10b7eec..c888dc7b0876 100644
--- a/dev-python/flask-babel/Manifest
+++ b/dev-python/flask-babel/Manifest
@@ -1,4 +1,4 @@
 DIST Flask-Babel-0.11.2.tar.gz 41105 BLAKE2B 88cd5f2f72c7533f173a3fef7acdcd9ee882b06111f112da18075ce007f94cb342acd16f35da138ca0548b5bd0fd8070d4b3b7941a136e5490c3b45d1351d239 SHA512 d95947983ff5bc33a28384f000512e85ed64c16555aa03e110a32b7c0c9e91eebc02259bfc69a0dbc84adb6ecf8155cffaecde5726658d64d36435060de3f22b
 EBUILD flask-babel-0.11.2-r1.ebuild 1107 BLAKE2B f698a39491c8ec1852386174992c9a0330176c5e4836670d111d16bc5c512e14287805f959cb86bfb6ab9fe94676e51be092ef4fb6b8836d4ef93d92625fd266 SHA512 c6f53e535ea1194b7fa0d4db5f267042bdd28f39103f5bc7f4d244f03e46c3d77499de456ad89135bb4a629067491a869418b64d2c3fcc3f23db378bcb007817
-EBUILD flask-babel-0.11.2.ebuild 863 BLAKE2B 94aee9931f697600a46fe52f45be6be45029580dfd4b1fe9df3ed0ac33185421e7778290aa6c19a0a2195aa0ef8b8882893c50891026fb985fca38dbdb94f103 SHA512 a93c39e462a60bea6be1f7085998f5c599df2a4b3c3496a0f9780711c93e25014fdf4915b46209eab84dc9dfba57b3806da1364b93c9dff7ef66130dc5129649
+EBUILD flask-babel-0.11.2-r2.ebuild 1192 BLAKE2B 572e2d24e27d50519f7dee10b25647fb76decd63d114d1be24f8566ddcdbaf1f165dd83cdb54304e9416707b8c00764ddeedbb6793a0b8c6bf74c6e7d3b83488 SHA512 f426ccab215782bdbc970ebdaef37f3ec53245471167f47faf1b2b6ac6a543d33755718e12704c7b2824ff8663f54e3593fefef257219bb2c45c9932d6ad7aef
 MISC metadata.xml 450 BLAKE2B db38ca56f4b683429248baf7411355305672c23126c4b6c7486971fb1e099bb3117b9246870a24f6ecd66e7f27647e80285461d046c02e9227970a111c58dd98 SHA512 d6fb2f7cdf0a8d4b54dce372bbb3d9728a5ebb0e6d714da9c58e5215d6711e3f4211e2a6ef5390cdfa663d375d7e2942a210bfa2822489dd04a911d9e9c24985
diff --git a/dev-python/flask-babel/flask-babel-0.11.2-r2.ebuild b/dev-python/flask-babel/flask-babel-0.11.2-r2.ebuild
new file mode 100644
index 000000000000..194980cc4134
--- /dev/null
+++ b/dev-python/flask-babel/flask-babel-0.11.2-r2.ebuild
@@ -0,0 +1,55 @@
+# 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="Flask-Babel"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="i18n and l10n support for Flask based on Babel and pytz"
+HOMEPAGE="https://pythonhosted.org/Flask-Babel/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/flask-sphinx-themes[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	sed -i -e "s/, 'sphinx.ext.intersphinx'//" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	nosetests -v || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/flask-babel/flask-babel-0.11.2.ebuild b/dev-python/flask-babel/flask-babel-0.11.2.ebuild
deleted file mode 100644
index c99d258e67e5..000000000000
--- a/dev-python/flask-babel/flask-babel-0.11.2.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=( python{2_7,3_5} pypy )
-
-inherit distutils-r1
-
-MY_PN="Flask-Babel"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="i18n and l10n support for Flask based on Babel and pytz"
-HOMEPAGE="https://pythonhosted.org/Flask-Babel/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/speaklater-1.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.5[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/flask-paginate/Manifest b/dev-python/flask-paginate/Manifest
index 194afc967622..0eff284e038b 100644
--- a/dev-python/flask-paginate/Manifest
+++ b/dev-python/flask-paginate/Manifest
@@ -1,5 +1,7 @@
 DIST flask-paginate-0.5.1.tar.gz 5397 BLAKE2B 819740f6d1ff55331932dfb1a588fb0a92b2a6ffbf66c0ffcedddb2014c42c10f76ce50306fb9e389c66fdeba98fbf0d476915e935530bfeecc853ec25c1f9d4 SHA512 f17610cc3861d587e1940a69957a9266459270453d8f7c15ae6b6e5fa91633194e01384b1cec98647db70f38090d18fd44bf2fc4cbbd8d1d64cf541a5bd620c2
 DIST flask-paginate-0.5.2.tar.gz 5535 BLAKE2B c343fdbd04097ccbf187f7a0aa127157fd18e39e68c6ca6dfee0e30a31f6e6b25bac4f2d64cf7a88b4c9addb53e45f381146f9710d84335ceb684198ad164372 SHA512 03cdce455f64da226a64137c3a69fda23749280e52df5d4fc4850e816c38810519a2f5a79bdd06709fc686ff413bcbc4a1bf20da44eba7678c5f3e542c277037
+DIST flask-paginate-0.5.3.tar.gz 118570 BLAKE2B 0c6d1163dcd8144afa80b217ab3a714a39f4015aa732b4c32cf0feee0d7ee06968bd8549651f2941be9c60d3fd36a18e132dd4c174eb4148e63f83e461cbf519 SHA512 fe3cdc808459528c449611b2411c377d46bdef4995cd2851730e90dc0091da15479022f401e31113c4d39f766841d9701f285c81e0ec6293eddd4c8f0821567e
 EBUILD flask-paginate-0.5.1.ebuild 519 BLAKE2B 991a5e31ff7876609146937efbeff40f8d48d9f06f0c30f00215db77f34e42c9d832290d166f85b812d7b5f02db7f8150ba82719f46250199a080f54b7981daf SHA512 8b899d8bcb98aab56878e2d4fc71a6311a49a43b20053b29b8d96c4312e5eda32badee668105df44c1898b1c0fbb809147586aadff4aeee2c5c542791f93f8b5
 EBUILD flask-paginate-0.5.2.ebuild 556 BLAKE2B 345acfd9853826a8d0f1498b0855292d958310d6f5a2b7e1783fa24882d25d3723b7966c4039512003ccde4566dac79ee87a4af08bdca1abaa3ab3a6af0e90f3 SHA512 96a2b5f11b52a32c96899583363cb90c9c2878223e1aba448cd833a1db9e07baf762a0397b7fdb682c0f4df88b25961275966c454fbe7533c90e5ad8cb886167
+EBUILD flask-paginate-0.5.3-r1.ebuild 800 BLAKE2B f46c7c3df9ce9b6a96d4fbc3e9bf637017b1922522b89193efcd9833917c7f0860eed81fae86fb899cd8effafa147432808bb699385f79b17f91a994dac87329 SHA512 8b3b33c61fa02e1ea249c54b3dabf3773f07adf87847b0df7f34095092494eb78a09d5e83d431ce9f28872fb286a5a23e00fbffe469b18a5c3f5a593d68cb5cf
 MISC metadata.xml 618 BLAKE2B f9feebe27aa247c8458d416154475e0c0234e2ab391d6b9dcf06016c01cebd3d7078efde6079646ff3a8b718911cec1d0699bb5cb4eb2a319b14752718f8fdb5 SHA512 9f6ff105f8b01580628888ecba7a9175e42618ef17e96a90dce15f08335b5dbc76a6b09cbabfd9a7fb659557e04531e4fb46ec3856418d96e18cff5da7a61cba
diff --git a/dev-python/flask-paginate/flask-paginate-0.5.3-r1.ebuild b/dev-python/flask-paginate/flask-paginate-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..1cdce8d7c42b
--- /dev/null
+++ b/dev-python/flask-paginate/flask-paginate-0.5.3-r1.ebuild
@@ -0,0 +1,32 @@
+# 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_COMMIT="510ad833106134711868653fb597bf75ea8ac34f"
+
+DESCRIPTION="Pagination support for flask"
+HOMEPAGE="https://flask-paginate.readthedocs.io"
+# https://github.com/lixxu/flask-paginate/issues/68
+SRC_URI="https://github.com/lixxu/flask-paginate/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+python_test() {
+	pytest -vv tests/tests.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-sphinx-themes/Manifest b/dev-python/flask-sphinx-themes/Manifest
index ae63dba556ee..0b611dfca1d2 100644
--- a/dev-python/flask-sphinx-themes/Manifest
+++ b/dev-python/flask-sphinx-themes/Manifest
@@ -1,4 +1,6 @@
 AUX flask-sphinx-themes-1.0.1-python2-encoding-kw.patch 256 BLAKE2B 2ed9a849832d3e5233494c053183b0f54fedc761efc27973fa84a0a9a19cd8182f60eda706f9e0f3f047e7d0808bf0f448f8a096da213f9f66bcb38fe8f10fb1 SHA512 c0d0421de3492f7cdf7c29790e7df4476095dcb7d3f310997eea74b3c2370d8e3ebb27e661024326e587a15d9f888096695624809f592e69b4e026695bef89e4
 DIST Flask-Sphinx-Themes-1.0.1.tar.gz 8150 BLAKE2B d228666424318552f3c865f64b0ad478a3794162c533ce7c4cb50414964c04d3a8ec84d64fdcd05f26bdfdb6e3ceeb9d96b9ee7dc7d632f07f99454f92e1231c SHA512 65ab8dcc75697fc61e6f6f78ec497ece99eba19c48e778f79e3883079cd0d5e42a2e0f1cf3d656dedf92423d1758caf6fd2279907dd87b50f3a79700f66c5e65
+DIST Flask-Sphinx-Themes-1.0.2.tar.gz 9066 BLAKE2B f4c67bf6c8e064a9d278779613182fa2139c83255b6e5c28adfd7d5e8df90c2203a6758dc22702b2d708d9876de029ff4e4d05daeb462dc8127bbb28a1392ac0 SHA512 55893b19f1c3da026e1e6d98143ccb4d2939da0d76e6530dd00f72ace6095d0fd038213a4ad02151a82670543634c6efe61a546df3ef90d71b1864914d36e2ac
 EBUILD flask-sphinx-themes-1.0.1.ebuild 708 BLAKE2B 42e829d1349361d4a0c0f85e8ad8d914f848c2389788ccb51e74bb3fc25324d5149bd1ce60c4ad5bb1fe26481d57dbac984afbfdff7f7df177f03f188936ac7c SHA512 facff4fda74cc23d3f1444f6446dedc1637636f3005cf631bd7a49370e3734328f8b425cfaa6137e0c004b419756f96620fa6cc3d3502df911565f9a8693048c
-MISC metadata.xml 401 BLAKE2B ab2d8a70343e2d3fd3759e515323e03730854a6a2fe2c9ef28c7993ccedeb3f3edb1499041506075e9a31db360d8c6816a90953796e516cba0e3426b44ba8886 SHA512 0e955337b9b299ad56b385c1773eee4f1d3c6b191a31d9e23053034489571d7c0da6dab3cfc4a40cf458743155661356d22c2524097f88ff46dfb52dc824abe0
+EBUILD flask-sphinx-themes-1.0.2.ebuild 594 BLAKE2B cfb82bf054631445d3ce38238a0a2559a4bb036a2f02cac1fe7b2e7c58edac5ff373696ea9c49a86913d596e41cc64645d875e206ce7237e821b355eaf2a1af2 SHA512 5e1d8e7997601006d072068371d6bf8bfa953421f5799a7ff182c8fc409879a6bdaeb95d0fa30ab7c3d2edfd58162551c139758fa751b214c02525628e04823b
+MISC metadata.xml 478 BLAKE2B 0842416a53a98283c3cbcdb25aa3e0ce1fb41e5227b326c2a5d60e669d270f0dd73950d79d737179a0209d59a82c1c0d1e680718dbd572fc0b4dffef84074c0a SHA512 6a8b152272da403e849cba183f6bd7b97caefe6be58a06b72c3d5e9900c56375ad4c384112803b1985e1740ddf3bb0ee2d6e650cf23443e4917a5a38ad59d0f8
diff --git a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
new file mode 100644
index 000000000000..27e48c611905
--- /dev/null
+++ b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+MY_PN="Flask-Sphinx-Themes"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sphinx Themes for Flask related projects and Flask itself"
+HOMEPAGE="https://github.com/pallets/flask-sphinx-themes https://pypi.org/project/Flask-Sphinx-Themes/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/flask-sphinx-themes/metadata.xml b/dev-python/flask-sphinx-themes/metadata.xml
index e6c5f932fd7a..0fab26d3567b 100644
--- a/dev-python/flask-sphinx-themes/metadata.xml
+++ b/dev-python/flask-sphinx-themes/metadata.xml
@@ -8,5 +8,6 @@
   <upstream>
     <remote-id type="pypi">Flask-Sphinx-Themes</remote-id>
     <remote-id type="github">pallets/flask-sphinx-themes</remote-id>
+    <bugs-to>https://github.com/pallets/flask-sphinx-themes/issues</bugs-to>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/flask-themes/Manifest b/dev-python/flask-themes/Manifest
index 5c41656ccd15..6e99d2044023 100644
--- a/dev-python/flask-themes/Manifest
+++ b/dev-python/flask-themes/Manifest
@@ -1,4 +1,6 @@
 AUX fixtests.patch 1036 BLAKE2B 5049bf5a41ec630408b2ff4ddd8062529d615271a3d0afbc4a11e264f0ec3a3928deb393cde691351167414619848addac1243359a51afb3ea77be396413da03 SHA512 a3ca31a2bde1539b0ae2a552952f8ef82f7979446eaf7874029d65362bb30151a396becef07f97c12bd5d3264696ee66f2213cd7b3a305bc7ff6faa628320575
 DIST Flask-Themes-0.1.3.tar.gz 9723 BLAKE2B c141363ddcd4d0fa510845fcece4aedf831fed6c1ffac8a6b625265165bce77193ba6240bf5acc9ba990b914d88dabccb76871ac62eff629886348c3b4c7a382 SHA512 baf609b8b08446dda5b5d6d39bc0a2e7406f9270d70924c795243384be8967c82f82adcebe5e060352a0c33b763d600eeb5600d3116c10bdbbb3ceddfadf764a
-EBUILD flask-themes-0.1.3-r1.ebuild 898 BLAKE2B ec024c6d3abe748f89c2638c8a89c1a6d3d3f97664f91838c80721d77227e366839fd8f4f0c2e15402dd00e0293876f07b69520416f267ff23289a016966f13e SHA512 da3899c0d7ee36639685fd450b241d2b45786750944222a3eff029d8e89383a94516c1b9c328d7b9fe558a8dbe8b34c7de9f0eb5f6d44a6907716c517087e1dc
-MISC metadata.xml 315 BLAKE2B 727f5d8c5e8c977bee96f7aade10a33d39107c7f664335f9ac30caa02186df69ecf9548b935e8be235574683fc445be72644dadf84ac2844f26da5014cc88b94 SHA512 87b5e27ef6869c29956604c891a2f8fa0a945817de4642aae7bd735c798cd08c3f1d26196b03ae7db52a83060af468df311e51d95a9a460b2882b4604e05fcd1
+DIST flask-themes-0.1.3_p20180112.tar.gz 35526 BLAKE2B 71c606b8d0f2d2edf65594904c2ae11ca9236bb9386452592dae347293803e6c613cb2223e92e58f4b8a4e3b20365b17520889d173cd0ceb2255f849ea216ee8 SHA512 e7adbf309b07690906700608963f2cc8dd0fffb3edb061a10dae3b9d40f9ba6c6a56661ae47d34d808798d4ed168376c32642b47cbbab186d587bbedf1eba722
+EBUILD flask-themes-0.1.3-r1.ebuild 858 BLAKE2B 0f2cb864f0650db3f179ed9519ffec223d8aeea3e0aa2369b691e7b1e0953cc344c876e4591ca92853c805daaa17a5f11fc870dc4b458d7d6dd4e5e3eacef1a7 SHA512 55d7f468be5efd08b804adff1e4c6978e84a0531639044d085f5e459220f278063f36cfb99f79d702a58c5cfd94a62e3a5ee1b29c60999ca69b8427f934917f9
+EBUILD flask-themes-0.1.3_p20180112.ebuild 1261 BLAKE2B c809cef9a811197723bf3d90499455c9e7318ce23f50eec24bab337e7d987bc9f393a55dd600613b656f1561a1b0712c34321b4a52d8156943348a8324181c11 SHA512 47469ba6af0b8280e5462bb27b6eaff671b5af9efd1e1e8c9a3389d727517ec079e49783a31dbe7499ecd121ddc8a07bff8161e71aca5d2d0e9a982e3b5dc8eb
+MISC metadata.xml 455 BLAKE2B 81dd8f3a0b03e34cfa6580c83f493a61660814163ddf00014ada553c5de2035b02e659f1928868e4d33f9985a6ce86a39feaffb41b376e8e2806c757065301a3 SHA512 9626dd965d51739ba74c6009c3d1359236393ddec3cf63adf224458342a1d505f565fa692bb453862e63f213b88e8cea750a293882f58f20d5f76036a39d994b
diff --git a/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild b/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild
index 65a42e1ada5a..c51b0bfa94e9 100644
--- a/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild
+++ b/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild
@@ -10,8 +10,7 @@ MY_PN="Flask-Themes"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Infrastructure for theming support in Flask applications"
-HOMEPAGE="https://pythonhosted.org/Flask-Themes/
-	https://pypi.org/project/Flask-Themes/"
+HOMEPAGE="https://pythonhosted.org/Flask-Themes/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/flask-themes/flask-themes-0.1.3_p20180112.ebuild b/dev-python/flask-themes/flask-themes-0.1.3_p20180112.ebuild
new file mode 100644
index 000000000000..c0e38edd02a2
--- /dev/null
+++ b/dev-python/flask-themes/flask-themes-0.1.3_p20180112.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+MY_COMMIT="9eac2dcc9b81c3af29c2386ce1afba9b446562bf"
+
+DESCRIPTION="Infrastructure for theming support in Flask applications"
+HOMEPAGE="https://pythonhosted.org/Flask-Themes/"
+# https://github.com/maxcountryman/flask-themes/issues/8
+SRC_URI="https://github.com/maxcountryman/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/flask-0.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+# No need to depend on dev-python/flask-sphinx-themes,
+# it is bundled in docs/_themes
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+python_prepare_all() {
+	sed -i "s/, 'sphinx.ext.intersphinx'//" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	nosetests -v || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/flask-themes/metadata.xml b/dev-python/flask-themes/metadata.xml
index 646bcdf7ccef..80f7efa3b1e2 100644
--- a/dev-python/flask-themes/metadata.xml
+++ b/dev-python/flask-themes/metadata.xml
@@ -7,5 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask-Themes</remote-id>
+		<remote-id type="github">maxcountryman/flask-themes</remote-id>
+		<bugs-to>https://github.com/maxcountryman/flask-themes/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flask-wtf/Manifest b/dev-python/flask-wtf/Manifest
index 715a82dabac5..5c0f4afc56ce 100644
--- a/dev-python/flask-wtf/Manifest
+++ b/dev-python/flask-wtf/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-WTF-0.14.2.tar.gz 254903 BLAKE2B dd6b650d97622dbb56cc0bdd3c036f14e562181720ede0c48652b8fcbc88d2d684f013f0468e723b8b0746f2c6f44ca18ffe0ea353594680b47bc1212664ce52 SHA512 9d4b4b24eb24827aeb524699e6720eab384c42901a102daddd9fdc6b8dbc8eebec8c9d31a1e9052c9af4d61bd08eef8ef9dc4cdc8d9b950ff5bdd0201db1dfde
 EBUILD flask-wtf-0.14.2-r1.ebuild 1357 BLAKE2B 6d31950b693b291f718a308afc7c92c100e1389ddcff80679ecdfea442f7c08a2e4aa6383d54efecb2b11e89c2e50b828dc338fcb048802506bd722bca6257c7 SHA512 f4b370741de91b8908f5304730806e3dc18a8641ef0f50f4c255cca87c2a98b0e2b12752612d0cd9383c2844aeb7ee893389db38c22b5ddfbacebaad4b52c63c
-MISC metadata.xml 628 BLAKE2B ff9c34258d4f106beb1089406a7be3b776e9b60f72fe2885d7141a88096250334bc26c43881853ca5019f3a0b24f306315ac36f303efa28e2921698d8d5484d9 SHA512 cc8c127cf6483396ba9a849683ecbc34527a9d51c8464b8ba523f015244a5a4efe1052691150f8888e4577dee538a1280afab28901be367f8856405bf380aea7
+MISC metadata.xml 635 BLAKE2B 1914db37789f92c3a41a30564fc58298b32a6babd32c812f3c5be7dbd22e5ebbea6ff4c7139772bbbfefb502f8325ee9fda9854ce9b167305541e8f56596cb90 SHA512 67b6dd0104a4f949aa2df5f9de39c7d77c18ee1a20104e92b68ece9c9ce04b7d7d27721b4170b562855862c99f4080df0949935d23c8f82cd27d15d8e93972e9
diff --git a/dev-python/flask-wtf/metadata.xml b/dev-python/flask-wtf/metadata.xml
index 39cf0b536952..8745bfe157af 100644
--- a/dev-python/flask-wtf/metadata.xml
+++ b/dev-python/flask-wtf/metadata.xml
@@ -8,7 +8,7 @@
     <upstream>
         <remote-id type="pypi">Flask-WTF</remote-id>
         <remote-id type="github">lepture/flask-wtf</remote-id>
-        <bugs-to>https://github.com/lepture/flask-wtf</bugs-to>
+        <bugs-to>https://github.com/lepture/flask-wtf/issues</bugs-to>
     </upstream>
     <longdescription lang="en">
         Simple integration of Flask and WTForms, including CSRF, file upload and Recaptcha integration.
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index ced7ef145dd4..cac3a0f83d37 100644
--- a/dev-python/funcparserlib/Manifest
+++ b/dev-python/funcparserlib/Manifest
@@ -1,3 +1,4 @@
 DIST funcparserlib-0.3.6.tar.gz 30401 BLAKE2B cfce97cf08914f67ba3bd743bd3d6e7e7a03599ddc00d58a884aa84118d197d92bcc67a93ff1f7a2ab2074d66704078f5392c1d846004a5cd6eed2a423ba6b61 SHA512 efa52f788aa902b099660cb8bc60a025085a8c383e52bd0824a0c3ae28a6c13804a0659de0c80b4dcd839ee70491805d4eecda6cea221e35c3750ec569098c24
+EBUILD funcparserlib-0.3.6-r1.ebuild 701 BLAKE2B ace78425db364907ae69bb659a3c326278dbd673916b3d5ab4aa91964d5b6bed0c60229cc84ce5dd329c5b6c29b24067353f627e01a4c3efe6f1334d0cec6ed7 SHA512 f4709c4abb4d5ed6f4b978ae1bf1fd9e5d14644abf89c4906b1f054bc0ee77cb52c5b5fecce1c415803f0d47633f679143841334baa5c066f31e3843312db80e
 EBUILD funcparserlib-0.3.6.ebuild 709 BLAKE2B 2c44c142f5412fefda9a6b74371c59b76ec4fd8e2db1bcf2577f59a4483468a55eecc55af481721497a1eaf590a72b92fd71313abf8721c747d6f7ece7733818 SHA512 89307f2baa6c80cde2a1e3d31ed15437d2fc940ac2df57f6552bfcf4e0d69db3c25e53945d30c38c6d5b0ff52ccde76436e5b4a2950b71a86964cb2c534164d0
 MISC metadata.xml 316 BLAKE2B 1899ee4255eb25643967fafb8aa09ea4b8e6319074de967e512d98ed182c2c7f7992c11c6689000f7bd2076b7296fc544fb8aff86fb03c86d661ce183a41c9b1 SHA512 9fe54328f405d097056ad5e3e0795ded4e3eacd72381dca3298a9af0e7c78f11eab97548b251c6bfaa9144dd0b00c00ac4292ad2ed5e84c31ab6c593a26b8caa
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
new file mode 100644
index 000000000000..44bdd4a9935a
--- /dev/null
+++ b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Recursive descent parsing library based on functional combinators"
+HOMEPAGE="https://pypi.org/project/funcparserlib/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( doc/*.md )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/functools32/Manifest b/dev-python/functools32/Manifest
index 307f8817451f..9f12537f3fbf 100644
--- a/dev-python/functools32/Manifest
+++ b/dev-python/functools32/Manifest
@@ -1,3 +1,3 @@
 DIST functools32-3.2.3-2.tar.gz 31171 BLAKE2B 6f228a7ae4977f333a4979b583e636394691036670f8ab330450153e77262929d981dd0988dc00ab245df6dd0667f5ae12d296bc72513a4ed5b031159e332a7f SHA512 ad944019f4aefde292b6872bfe06862d01920a2f44adf8740c36ed51d16d879be7638591aaddf9dac4ec83b6f05bbf81972d5f32854abedcce3dde080459f7f7
-EBUILD functools32-3.2.3.ebuild 620 BLAKE2B c1aeb0e11c8776a5e8d7474cbf60ca8649bd1068a910c9f0d4725e726d8b2c97e4776d1a19693731573d6f115015b8594ba01052bca0757db7b4fd9a9495c244 SHA512 ee89c4211a0ac8a20ebf2a834fc30b7ff3fee85d4f01d02a85885db51a6ba44105cabf49a3b2b8b21506ac66401a614490ac98755f627341c70c3006488376a8
+EBUILD functools32-3.2.3.ebuild 615 BLAKE2B a03f80bea21a62683aa392ddaa232cc58a3fe2c6654a55557bf59f339113c629d4ab2f50cefd5ef8dc7e77d15ac18c56865241edb40acb83f01fa86158a0b8a5 SHA512 ed3a7e48d55ddf07fe2ab17dc9a42f7a7bd0d6aad357a6ddbca70f965c578a038168edf77a8ddfd82b4e6b4ab3f9a9cfd7e4e4bc0715bdefa042b8ebea6057fc
 MISC metadata.xml 380 BLAKE2B 112a93cd4165bae11a99c2668c01427f7deaf5d2d780c0a7a2d5d8a5f6d6d9e1e3609b1ca7bd96f1f37e718121d6284a3094fa87d376348cae1176b2a92b425c SHA512 665568fc9ce82f570e4601ea9574856c6e1d3db18e79a04ea46888b61ddc6da5aa0f73950346a8940a32ccf1c832981e6ed18ad547fb2f37edbea9b123b0fcce
diff --git a/dev-python/functools32/functools32-3.2.3.ebuild b/dev-python/functools32/functools32-3.2.3.ebuild
index 654c411860de..11a5dfe1dc7b 100644
--- a/dev-python/functools32/functools32-3.2.3.ebuild
+++ b/dev-python/functools32/functools32-3.2.3.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=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}-2.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2.4"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}"/${P}-2
diff --git a/dev-python/gdmodule/Manifest b/dev-python/gdmodule/Manifest
index 400cf8ddd8fd..e4920ae71674 100644
--- a/dev-python/gdmodule/Manifest
+++ b/dev-python/gdmodule/Manifest
@@ -1,4 +1,4 @@
 AUX gdmodule-0.56-fix-libs.patch 2629 BLAKE2B ea89424775c3461a06cde21e5b0f8dd5d7e3bb35e5404b5a93be42a9509b01d32d382829a2360fc70ca43cf633bde99833edb949b8387484142e6c314f9f609f SHA512 eb8993b77f5b893b568d87e572a19caf84ee11e4c0c76a13ef81e7185678bf007d7967e1d68ce56f869bc83cfe502b8f67ab0fee2f7f477e9aa2b4f0017e0a0a
 DIST gdmodule-0.56.tar.gz 48748 BLAKE2B 56a348a3a6c62a6d805d13ce80dfd2082af4a103d08d9a2466aa719d07b1bf8d52e0f08b48738377d1145a467b78aed0d7607f450c119c1a9c0eb9c2b39f038b SHA512 9570a9c06a1c7d76af760fffe30cfde9a840620c608f0d55123898e030d6f3ab4c91fe75bf02b326f13f4a85ea5429c6a0ec0cd20fdc27fa83e656b81f7cce88
-EBUILD gdmodule-0.56-r2.ebuild 1104 BLAKE2B 8f77fbc6e0a01454e8fb8ea9859ac5df1d25f1db2a086a9d3e112833d9481b0272e6b045a497ea5556e70660a348c825682f88d75b0fc098f9ccb06450dd5477 SHA512 10248982c643358824fe477c38e48389ea84b562e42f8856c90d08c07ef669dc02bab0034f49f373b99632817395506abdf4401512bd3151a62e5ff23c720e8f
+EBUILD gdmodule-0.56-r2.ebuild 1101 BLAKE2B cbb58cc33ab4dc6f7839180abc10df9bb777641b756e63ca800f4238fe58863af75fc27052a4b48c903bda986b123626f869da5d999fd03817668ce1333bce31 SHA512 9401747e451b3707b8cfb6270bc38a100657c4a7cd6ff1110478acbae558536d2389e7634a4d418bb611ec8652aba9e51a806f97fc3e7d30708314dd7f14eb99
 MISC metadata.xml 450 BLAKE2B 47c85c159ef7d3b0c873eb7c4e22a73133288d28f776b7e5bafc4f6dda97b97f8b6740a291de0b1d9a70bf958d6aab18b7dc9d693eff76da3ad678d022102425 SHA512 58ab6153c0955e9d9e37fe1b43c3b92cfd3133bdb9f0b52df7618d21fa14170cab255a06d88a110a0bfef09da6cf51c13bc8904d15d1585bd4cc1743b7846900
diff --git a/dev-python/gdmodule/gdmodule-0.56-r2.ebuild b/dev-python/gdmodule/gdmodule-0.56-r2.ebuild
index 0ca691c8e2af..d1bdbc4c7272 100644
--- a/dev-python/gdmodule/gdmodule-0.56-r2.ebuild
+++ b/dev-python/gdmodule/gdmodule-0.56-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://newcenturycomputers.net/projects/download.cgi/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="jpeg png truetype xpm"
 
 RDEPEND="
diff --git a/dev-python/ghp-import/Manifest b/dev-python/ghp-import/Manifest
index 4fab62a03ddf..916463f53e28 100644
--- a/dev-python/ghp-import/Manifest
+++ b/dev-python/ghp-import/Manifest
@@ -1,3 +1,3 @@
 DIST ghp-import-0.4.1.tar.gz 5002 BLAKE2B 667a40c0d852799e97d295df76d17d50017880afc9b2daa27d49444da84c791af619dea06b282e15c4d627a9584a23c2aa9fafcf45d9e0e924f9a6a966d071b6 SHA512 8b0e6578f05dc74449082a840ccd609a43fba3ca1c4dffacaddc4b27d2e9e3eac565a5c9672734e6ec5f2e8872b13ae0bb8a5d6bae4ee6c4cf41ef7d2c0b2eda
 EBUILD ghp-import-0.4.1-r1.ebuild 707 BLAKE2B e671850d756dc51c03872187f114778a6796ef1136d0ff27c6d8ee63e9e67520c673d335b70b3450f50171c9917cb0502d977675ecf074232e9fb08f5f4c4a5b SHA512 0a3842c01434eec9d1ed012f9815bcfef6dee8aca78f8ea1c852537d814631a6dd36adf1cfb496a23d4231d52cde104e78dc0640c30bb0374032d7a7bc282f41
-MISC metadata.xml 269 BLAKE2B c267b42e0527b3ab1992f4fd3e9b039cd25f184a3f344da4fb977770f44fefc0b9d0aa9f9ce1242496c53c67e39d897f0da4f63ceb94bcc8982bac47cdb2864b SHA512 c2c532992c1bbfc4679cca8ba3e1f920a1e45a82df940423284e344f560a4a978efd13feb7c8ffe7285f2ec0d8cdb1939783df2036350d09cce2abb3863be91e
+MISC metadata.xml 295 BLAKE2B a35ddaaaa21dbbb41d120d1cc45ee75b667bac1b6de115a587c9e46d8a86665560d5972db14b83af7a12e17509cb0414b889151cb63aa86cbe5a8d7db6d5c754 SHA512 c97c267838cdf557698e371efe5c544c787b53d3a7df771d718bc593be3e9eb948aeff7f3f9a833b6a9da19a5b380a954794f36b773e779a8b2dac752055f012
diff --git a/dev-python/ghp-import/metadata.xml b/dev-python/ghp-import/metadata.xml
index aaefa1f9da5d..9bba96f1e08f 100644
--- a/dev-python/ghp-import/metadata.xml
+++ b/dev-python/ghp-import/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">ghp-import</remote-id>
 		<remote-id type="github">davisp/ghp-import</remote-id>
diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
index ee4958b907c1..60eb71dc28d4 100644
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@@ -1,8 +1,11 @@
 AUX google-apitools-0.5.22-drop-cli.patch 788 BLAKE2B eec24eadd85439bb978502dab49204849d9007a18866e64b1a472f40d12a45cef4e1c1b0ba23026a484870c7f3bb958e3f6d858d79c3c859e2b5c2ceccdba3dd SHA512 575140294dbcf3c1b0d5acc0b528db4dcee7625353e9a202fd3916f8082bdedf88fc77d1ab38a004604db92cfc0da949ec8796ecaebb1690ec62448c7b0e24c1
 AUX google-apitools-0.5.22-use-friendy-version-checks.patch 328 BLAKE2B cc25ec61871ac5ffbe068167b625eb20f0d3cbf32e32e014e4a17af276970cc5f71bbeaefc908a407a982a72ccadf188ff7c40b6a2c9704dbb5d682d2a8d34a2 SHA512 a21b43ab16678caf0ab1b18bb373fedb204dc3630aac26f584221ce0d5fa2834a1f44646c0f5eff6b8d9e7a3436c29dbd412ecca1cf354a6429040f308232a45
+AUX google-apitools-0.5.30-skip-enum-test-on-new-python.patch 807 BLAKE2B 7753d11545ffbf40abd7003e3efa777ec7245151eae2a3ee825e4fd5905af99cee3d5306a9b745d749785f818f6cf6daeca1f25895a179d2ac5aca2a58c18865 SHA512 a614ebefabc75ced727dece6a5a531e857b1282c7e7053c4a5fff90514f8240177ebfac8af8d000791f2adf69d624a2e5d68c16bfd1ec8e1083e354121d6f434
 DIST google-apitools-0.5.16.tar.gz 405331 BLAKE2B 9bd086a68e5787f6dcd426887bb5e0af23ac985f851471da61567266fe52dc254054f0f2fb49e08b461c9281a32c25a764a7b751e10fe6ccca13c2758cdc4637 SHA512 cda60ec21622368c67cc47900218ceaa4137e6d602ee5196f59dac82aa87d35382785323971cc7e4aedf9d69e0a1baf8017c5d941d05171df9e1d5eea15570eb
 DIST google-apitools-0.5.22.tar.gz 422977 BLAKE2B 1734f7e19ff90ff5997921ec1e57a29eec13f20dac4d7c84015d40f13147429ad93400a2eaa6038fdbf3ff2b5700dc1a0f6da6cca0706598b3a1eb5abba341b1 SHA512 f184b0ccc17ae80e8436727afab62a3e655ddecc37bde23dd144cc285461b80846fb1df24f21d75f06f521dbc28e8f3e9d5838d769ac52aff83c0aa8d1be66d5
+DIST google-apitools-0.5.30.tar.gz 363524 BLAKE2B ed8477c85911f5855a449abe81b465635d3cc4e08d2915de5e882608e634f3dd9ffdda929bd8b25eb3daa5922851aa9304ffe07778cdf3a3aa629e215633515a SHA512 2dffffada829b9b962c64aab22b19cd227981819128c34f3e32515ee599297b3d5e8c97152d954110c2ef27c02737d3c30c785840b9f9767068688f62dc0b5c7
 EBUILD google-apitools-0.5.16.ebuild 772 BLAKE2B cc645f6a373240dfd8d9eb5ecd3206604e99cec1477b54b0e343732b99a5e0e4ea8f21577d4c6498a1e9a7a8486cf3f82693233e7463b6737cbe540224ddd8ad SHA512 025f4583be50f927853dd96e2b6f22f840c6cb4301636297c3eb3917065509a2cdfd49b89a03b9caf0cab56ac517187b8cbb91759a329acb6a85869437a5f7f3
 EBUILD google-apitools-0.5.22-r1.ebuild 1324 BLAKE2B 0a405e8294c51afad152754c9cd18e31f4e0ce4f9f3b346b65c693760c619fbca198d32d25f74c4e92aaade17a9978cf810757471096e5818dbfeb421e33bdcf SHA512 97e700ec57791ad16b6c81d72a4d18c706aa7dd2a20a82fc7d56a87dc54c8ed19f564ed1a493bde81e8b92a1e3849d510c6a572de4a2f7f7dd1853feaf948c33
 EBUILD google-apitools-0.5.22.ebuild 957 BLAKE2B f4a0e09a1aed739804e17d3c922a90821f306edb160cb7262fddf28a0aa4a497002059e3d99630489fad0caebfa035509395aa7f81f7c8c17818c71b7e7ae5da SHA512 c3782afb5070813298da99148c64bb675bcddb197673908a56cd7ff340dd0fcba6efc4299a830182658a8bcfc8ed4585e8ae27450700147e653b7e9ea6305c63
+EBUILD google-apitools-0.5.30.ebuild 1096 BLAKE2B cd1683a3e379a8c08d91ba7168d47c0f902ab78a9a9aa1799151b13dcde3878d85f5ab5ffa88747fec4959d59ce69f49b572b6ecf2b3dcb99e489e8d3b7302ee SHA512 b5c6f2e4b5df36721f0fd825de127019b9a9a260b2894b626470323b78e8002692136063aaf4ebd29828839437025e850de59904b8c501b6163b36bc8b919ac0
 MISC metadata.xml 330 BLAKE2B cea2ae09b3468b95764b84c8891b9840e918db4961a77f4d514a4c15a33248a011b79f235728883e31a968c69a07c436a31a282f1e4a2baed2cbb2c7ba3c4982 SHA512 a4b6c01f3d8c411c5e96b911585770af30c8a1f262e92bf01748447111798a8e6ede7aa5979f16c3cf7068b3f158842023546e234049e2345f1a2f2891e51296
diff --git a/dev-python/google-apitools/files/google-apitools-0.5.30-skip-enum-test-on-new-python.patch b/dev-python/google-apitools/files/google-apitools-0.5.30-skip-enum-test-on-new-python.patch
new file mode 100644
index 000000000000..6003db87a97f
--- /dev/null
+++ b/dev-python/google-apitools/files/google-apitools-0.5.30-skip-enum-test-on-new-python.patch
@@ -0,0 +1,21 @@
+diff --git a/apitools/base/protorpclite/descriptor_test.py b/apitools/base/protorpclite/descriptor_test.py
+index fc27ec4..d518e24 100644
+--- a/apitools/base/protorpclite/descriptor_test.py
++++ b/apitools/base/protorpclite/descriptor_test.py
+@@ -16,6 +16,7 @@
+ #
+ 
+ """Tests for apitools.base.protorpclite.descriptor."""
++import sys
+ import platform
+ import types
+ 
+@@ -78,7 +79,7 @@ class DescribeEnumTest(test_util.TestCase):
+         described.check_initialized()
+         self.assertEquals(expected, described)
+ 
+-    @unittest2.skipIf('PyPy' in platform.python_implementation(),
++    @unittest2.skipIf('PyPy' in platform.python_implementation() or sys.hexversion >= 0x03060000,
+                       'todo: reenable this')
+     def testEnumWithItems(self):
+         class EnumWithItems(messages.Enum):
diff --git a/dev-python/google-apitools/google-apitools-0.5.30.ebuild b/dev-python/google-apitools/google-apitools-0.5.30.ebuild
new file mode 100644
index 000000000000..460f5faea92b
--- /dev/null
+++ b/dev-python/google-apitools/google-apitools-0.5.30.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to manipulate Google APIs"
+HOMEPAGE="https://github.com/google/apitools"
+SRC_URI="https://github.com/google/apitools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-3.1.2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/unittest2-0.5.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/apitools-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/google-apitools-0.5.30-skip-enum-test-on-new-python.patch"
+)
+
+python_test() {
+	nosetests -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index c4e038af620a..774252ddeabb 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,3 +1,5 @@
 DIST hcloud-python-1.2.1.tar.gz 63592 BLAKE2B 9a6d2dae97ff405ebd9b92bc833c9d953c13840e68be4eb43fed375a60e55cf4bf9b4b742b26fb03401f631b7f7127815961861cb673adf4839c829141c8ed00 SHA512 cb70d190350457fc3c6e474bc6c943070102762595dac2f386041956f64255f390a928a2f2411be861645cd65b015ab9e0c931b36aeed0076b06d9f67ac72d1c
+DIST hcloud-python-1.3.0.tar.gz 71208 BLAKE2B 1a074f64aaff87991ef5c565bb8976184a1f5ca54c0d2fe19ac3dc4f8425d3a2d92ef13cbcec7ecbfb8958572ab5561953098cf0ed9f141ba43c3eb0a90ffc10 SHA512 6dfff2301ad91db3c79fc8f68a05b5a886f86824a34f044d14a6a35771d23fdba9764055c797d11f404cccf3ae6338af940e4814113859d7809733629d7c2659
 EBUILD hcloud-python-1.2.1.ebuild 1056 BLAKE2B 94a8aeb9cf22f4263222ab52e186c8604912c1a0931d96e3a47698019245d318753fc5d5686255fa0ef6f9460fe55a94b2125804407da5f94ca92f4577189a37 SHA512 ac4b6bb887fb0b1ff076c4ba02dd1a33256f238eab49f250db3b8a1908c68784dfe5c51b5dfa2b7db7f5dc57496e472c8be8d50d152392984c2f2c6674722e18
+EBUILD hcloud-python-1.3.0.ebuild 876 BLAKE2B 62435cbddd008731368ceee8965656420e7b9f6a6b35b974e27b98ae9bf23ec9a50d3b467d472307f266a2368f9345a4695659228fc7c1eca48167f694ffb613 SHA512 b3d65bdd8814d8c8d6b0c5b62e35fb2563938db46d8213619c265eb9e737b4e9ba661264f5fb2eb7a1838bb8c6561a9bc62e0a1b1548f4e62bccb3b1527d44a1
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/dev-python/hcloud-python/hcloud-python-1.3.0.ebuild b/dev-python/hcloud-python/hcloud-python-1.3.0.ebuild
new file mode 100644
index 000000000000..d9ca18e4f9c9
--- /dev/null
+++ b/dev-python/hcloud-python/hcloud-python-1.3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Official Hetzner Cloud python library"
+HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
+SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples"
+
+COMMON_DEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+
+DEPEND="${COMMON_DEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/future[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/hgdistver/Manifest b/dev-python/hgdistver/Manifest
index 465c6060a41c..e610d93baef5 100644
--- a/dev-python/hgdistver/Manifest
+++ b/dev-python/hgdistver/Manifest
@@ -1,3 +1,3 @@
 DIST hgdistver-0.25.tar.gz 9879 BLAKE2B 71caa059359b8ea1be58b6463b260741586ab81e6d8afac5dcadbb35604a564b947032ae645cec683a3c692de8307b23f7abea40d0a1f3802b5257870b7e3e02 SHA512 3fef872af3c8fffb3ba612d2505260468b510c17219257640a4bcf3dc6568fdf59eb3cc544ef41b7eab32ee6cedcd81bfffce753c98bbc7d1e538fe4937d039c
-EBUILD hgdistver-0.25.ebuild 816 BLAKE2B ff660872624f5e177951bdd04a154e9f9f7f41e003e89f13caac43b29c91c194ad364b0afddb6b5841e4990e02936bed1fbcf7273d60d2afe6705e6afe1db72c SHA512 e0498b1b59ceabb430c1bf0ffd03016c0beec66681d102309b7169171c229c041fd2be75021ae15a0510db063ec4303070b5f7366f8b2c1819e6141fb0c999d4
+EBUILD hgdistver-0.25.ebuild 816 BLAKE2B b908c8a2fd37bba90018e1aef39799c45796e9eb37c61a0d7b88a7a658b66f2d1c2751ac99281ac97cbcc11a229a50034483370a4b0550949f01eac70b1a27a0 SHA512 0105dd6a64b48657b8f22bbc8b8f9970fc32c6a9ffe982f0dddf451ea1fda2704ea5ca7892989140131179edb33bcdf86fed51a5498c0574d3d1ea7b06c22da2
 MISC metadata.xml 394 BLAKE2B d2ea329a11dc2b88867e41b22717505a260db3715d8b254fd4fe51224541a428fe7d6b6180dff00ce82b74309f51fb5d8c3a47aa8664bb3492155e8282a112d7 SHA512 01c27a5f8d42a579acc1d21bd2f4b7a569183652c9637403b3efe7dfa515b9c86cee97f505ed909f0f34443cf2912cd1ae6b568a11954b6cf756815a5db82cc7
diff --git a/dev-python/hgdistver/hgdistver-0.25.ebuild b/dev-python/hgdistver/hgdistver-0.25.ebuild
index 7dcd79752eef..93a872db9aaa 100644
--- a/dev-python/hgdistver/hgdistver-0.25.ebuild
+++ b/dev-python/hgdistver/hgdistver-0.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~amd64-fbsd"
+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 ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 6d0b181e5359..56af9cc7519c 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -2,8 +2,8 @@ DIST imageio-1.5.tar.gz 187004 BLAKE2B c2fa082ceef7be0b1571fcdd4b0a30f46ed027838
 DIST imageio-1.6.tar.gz 201043 BLAKE2B 0ab903f159c7e99bd22aff7b56f7df2afa1a9885242a346dc7e1c58240b1e8c67114f422cd3861de797a817df3e45352978448fdf83cd4f4ad0878c3b2b8c60e SHA512 bbb22a8c48f54e5bec8475eea041ce361b259cd8113463fb85e6c02b9c5a9805e675eaf2c693a26d51d1609071ce92d54fe76ed5563ad48f562b465ab586bb43
 DIST imageio-2.0.1.tar.gz 224487 BLAKE2B ca6247f3cea3edc435d8ef8790d49fb3ce722229e45df7032fae9fd05d01b8ec1ea02771ba2ff3713ba54fcf01d22feb60093f7d063c32f5cc263cf8eab9e640 SHA512 8adfcdb897d898806ef4a3227730a45a663eb485e126db62d8c5f79063aa8aa2b83f4a9c27d4ae47b4ca8e2ed82125d04642952c62fb29dd1fe8dfa11430bb58
 DIST imageio-2.1.1.tar.gz 227148 BLAKE2B d7ca2227d5efa05dc9fcde7d1edbb1c2a818beb7b9f54e8f2f1c9694b403d66c0a80954ab4e1c3e3674f7ec31ccc0caae5737c6f6f7b4b2afa56e42562ac5721 SHA512 a01ebf8fe9cc3761b0779107bcd610ecf4c9a5e6e789bdc15983e2f4ff65d03351266431391519cd637a98f48a1a9f91a2123191d0aed5790bc731b007a85d29
-EBUILD imageio-1.5.ebuild 546 BLAKE2B e9887c1a04190c826052bc58a2a1f135617c52d0cd10383b23844b30a51ec33c92541190f3397d9711cda3ce135a033c54b022e41e2619881c05fddefe9ddf45 SHA512 afa38bd03156c729332f4bdaade4c0e482aa517474ee498b02a00d67363d9ddfbd53f165320aa0fbe8aa3f6fd8e7f0cfad586b570674987463d712664e89be66
-EBUILD imageio-1.6.ebuild 546 BLAKE2B e9887c1a04190c826052bc58a2a1f135617c52d0cd10383b23844b30a51ec33c92541190f3397d9711cda3ce135a033c54b022e41e2619881c05fddefe9ddf45 SHA512 afa38bd03156c729332f4bdaade4c0e482aa517474ee498b02a00d67363d9ddfbd53f165320aa0fbe8aa3f6fd8e7f0cfad586b570674987463d712664e89be66
-EBUILD imageio-2.0.1.ebuild 546 BLAKE2B e9887c1a04190c826052bc58a2a1f135617c52d0cd10383b23844b30a51ec33c92541190f3397d9711cda3ce135a033c54b022e41e2619881c05fddefe9ddf45 SHA512 afa38bd03156c729332f4bdaade4c0e482aa517474ee498b02a00d67363d9ddfbd53f165320aa0fbe8aa3f6fd8e7f0cfad586b570674987463d712664e89be66
+EBUILD imageio-1.5.ebuild 546 BLAKE2B 94a9fe0cad2595eb5a72730d48f3a44e6a0f51e1be801c6278f9e31e44a4ce716ff889d55bb8bf5f771afa4229e016a8388e805a759d69c8c0e094404defd019 SHA512 6487ac5cc088be30d1b26a175c7b66b776a246c11f005c9963d3db0f9f632f0a1c5071509e00f3ce712e684a2caa6be7d18db145e5dc35f708d16b7917b289ad
+EBUILD imageio-1.6.ebuild 546 BLAKE2B 94a9fe0cad2595eb5a72730d48f3a44e6a0f51e1be801c6278f9e31e44a4ce716ff889d55bb8bf5f771afa4229e016a8388e805a759d69c8c0e094404defd019 SHA512 6487ac5cc088be30d1b26a175c7b66b776a246c11f005c9963d3db0f9f632f0a1c5071509e00f3ce712e684a2caa6be7d18db145e5dc35f708d16b7917b289ad
+EBUILD imageio-2.0.1.ebuild 546 BLAKE2B 94a9fe0cad2595eb5a72730d48f3a44e6a0f51e1be801c6278f9e31e44a4ce716ff889d55bb8bf5f771afa4229e016a8388e805a759d69c8c0e094404defd019 SHA512 6487ac5cc088be30d1b26a175c7b66b776a246c11f005c9963d3db0f9f632f0a1c5071509e00f3ce712e684a2caa6be7d18db145e5dc35f708d16b7917b289ad
 EBUILD imageio-2.1.1.ebuild 549 BLAKE2B cce1441648fbc39d0c3c27459708797e1f2a3411cb3a2b49da2ebd13fbb4a2b7018c06c8575bfdedb28b52296c50d0fdf01629ee20bd0de9b5b5f2fb2493f279 SHA512 d4985ea9a1484152b07d44edd63cc9a8d22f1cac4c5406717b19b3a6e06b5c26dcbdc82c1731be18cf106403055d9c5416128867b1fe6cd92938be6dec7f6955
 MISC metadata.xml 763 BLAKE2B 27b20ebe876a614cc94676106128147bdfb59ac16e1a513b1d868922ecbf7ea8c61b4a27c973a8321a29c8f2d2dbabd92974f403d1bd036937ddca6d43117dca SHA512 b6729dbd110c5d7c977618ba6fdc7585609e4bc69f93d904a8796781273b38c9dd0e9a29e782f47e36d49dc72032d6967803f88e418a6a1ea8715c719342136e
diff --git a/dev-python/imageio/imageio-1.5.ebuild b/dev-python/imageio/imageio-1.5.ebuild
index 242eca5320df..5c9887ebb9ee 100644
--- a/dev-python/imageio/imageio-1.5.ebuild
+++ b/dev-python/imageio/imageio-1.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/imageio/imageio/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/imageio/imageio-1.6.ebuild b/dev-python/imageio/imageio-1.6.ebuild
index 242eca5320df..5c9887ebb9ee 100644
--- a/dev-python/imageio/imageio-1.6.ebuild
+++ b/dev-python/imageio/imageio-1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/imageio/imageio/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/imageio/imageio-2.0.1.ebuild b/dev-python/imageio/imageio-2.0.1.ebuild
index 242eca5320df..5c9887ebb9ee 100644
--- a/dev-python/imageio/imageio-2.0.1.ebuild
+++ b/dev-python/imageio/imageio-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/imageio/imageio/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/iocapture/Manifest b/dev-python/iocapture/Manifest
index e8b14969bf96..67fdc95e0f26 100644
--- a/dev-python/iocapture/Manifest
+++ b/dev-python/iocapture/Manifest
@@ -1,4 +1,4 @@
 DIST iocapture-0.1.2.tar.gz 13114 BLAKE2B 4404ed96cda15db41d30c10fd68747e61980c1ee173671ff496ba05af5d122eeebcbd7fa901a8ad43ffd46efe219e437e205236392855d43fa3bfdd1416ca6d9 SHA512 1205d13b107d83dcb45d5546038d8b0b5417a20a51149c405123111488c351ff81a447f10653cd3dd9ecc236e01a0fcceb6647091e38ff2fa34c69e0baff1567
 EBUILD iocapture-0.1.2-r1.ebuild 689 BLAKE2B fb23239df27085435f09274280ddbaf79fe5b4a88b33b32546c3d9bce50a583446ac1dd6c89d4d32b1bf17e1bac2e4cfeec381b27f095864c4c8f14ddf372e54 SHA512 e474b9da66acdd97bbe7b9eb637272334f6ff11c767dc74a0f8eab1aaeb7d49c604f55eb297a07ce58b548b4b194bed54f6561585401a0e34b86b73f9f8994d7
-EBUILD iocapture-0.1.2.ebuild 678 BLAKE2B a0923e678dbd0a6733577e2435bc8684f28ed3fae707cf4e21cbcfae22bbeaf1a6bb3913de019ffdd81c292b769592653968b5467ebbcd9d4b22f3dd862a309a SHA512 9a9f2230aca4776c0723a5428833b7d9da00645d870a9a55e622183f67842915be264e3bb72faca9a8ffbe93790b12de4a2ab3666ede004414e23cfb90edec7f
+EBUILD iocapture-0.1.2-r2.ebuild 658 BLAKE2B f4ce17615ceb43997917cd694e64c28f532556bc0faf15e178ab5d8d8e5a9ec319aebbda8d83a84c68a6d9d9a15af4c4bd5e5d7ff8d114ed036bacfcc1c8ff5b SHA512 9db2b561edf8258dab9de51a04eeeb8f8ece94e23874e7e653c296728697a905d60a9233b70f9d1e7bafeeaf29772f876b28e75a061ab39480c447d80c69b041
 MISC metadata.xml 368 BLAKE2B 69295da6af2e74122fdf5f62eff141417283e7e51729f0c35ff593387fcf3640bdfbeffe079427b368e175f3aa80b97637d6cbefd68e2a3a9a79155735570560 SHA512 463826d4afeb4be68800318809427cb4762f9fb7e14f6f4ed2fe84a7765dfb5acaf9d5fe2f1e339e06a092d8a4dec5d21b3a9f15fc10c9112b69e85f4903b932
diff --git a/dev-python/iocapture/iocapture-0.1.2.ebuild b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
index 8bbcc5e69bba..3ad57635e00d 100644
--- a/dev-python/iocapture/iocapture-0.1.2.ebuild
+++ b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
@@ -1,18 +1,18 @@
 # 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} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1
 
-DESCRIPTION="Capture stdout,stderr easily"
+DESCRIPTION="Capture stdout, stderr easily"
 HOMEPAGE="https://pypi.org/project/iocapture/"
 SRC_URI="https://github.com/oinume/iocapture/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 LICENSE="MIT"
 IUSE="test"
 
@@ -20,10 +20,10 @@ RDEPEND=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+		dev-python/six[${PYTHON_USEDEP}]
 		${RDEPEND}
 	)"
 
 python_test() {
-	py.test || die "Tests fail with ${EPYTHON}"
+	pytest -vv || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index 9857eb813bbd..d3ee59909ade 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -1,5 +1,3 @@
-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.1.ebuild b/dev-python/jellyfish/jellyfish-0.7.1.ebuild
deleted file mode 100644
index f3bfa9346a12..000000000000
--- a/dev-python/jellyfish/jellyfish-0.7.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-DISTUTILS_IN_SOURCE_BUILD=1
-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-runner[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/unicodecsv[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile() {
-	esetup.py build_ext --inplace
-	esetup.py build
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( build/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	py.test jellyfish/test.py || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/jinja2_pluralize/Manifest b/dev-python/jinja2_pluralize/Manifest
index b51319cccbab..0f959c29d96a 100644
--- a/dev-python/jinja2_pluralize/Manifest
+++ b/dev-python/jinja2_pluralize/Manifest
@@ -1,3 +1,3 @@
 DIST jinja2_pluralize-0.3.0.tar.gz 12638 BLAKE2B bb7399d287cf0d1bfed5398c0ad7e6994dfe1d8e942d82190570d0b40d8bec4939d497cb2d9d4415c913f3f3f9c11b017035941755219effa8d92a6ef188dac9 SHA512 8830c01ff82befa353302cadc305147a950038fdf3808632f22dfce9a564a6ba7967781f579a2d94fecb1b5bb01f80d2a53ff082332b94c6e6e3f5f4106e7313
-EBUILD jinja2_pluralize-0.3.0.ebuild 593 BLAKE2B bd18fe4cd1b212714465c71055c0ca559d34a68be42b5f96fced189469bcd10718523d07b6fc728f5ce74476d033ca94915cf0a1c4a60df63d7fe71018a9f5bb SHA512 0cdc791e05eb90c7e194e57582305e4532beb690274e8440c2bae9d50db98ae7a1c139b1398c84aadcf59c3ddea1952cf164a8d94ca2caf65b1b7623d54fade5
+EBUILD jinja2_pluralize-0.3.0.ebuild 595 BLAKE2B de28c0eb9d70fae6ce7498bbb7533e30d099c13d7aa07de818f26e2bb1df2aea1cdd44c470320569f091e02cbbb07af4d07d71b1c0b7742236b64c1e05a92ab2 SHA512 a81a1f6b025774dfe2d0b2d4585d41ff528564f466ce42b1c3217a320e5b4eba7e896c571d15d2ea822d38123a52d2fa0fbdf8497ac90daced2af0d294091e03
 MISC metadata.xml 387 BLAKE2B bbf1f15fabc767c47fdfb69fc1dff3722cde37c075f15404667ed1a9e51ac3147bb093247af3941d9165e26118dd725eae8ad7823be1f9d7a9727ddfc2777e04 SHA512 1b5c9b39ec7a445d8cc673517d3552a9f256804ac8b4f24be6fc7a19d5c7df9613eea3f15e44009c19df3944b9a14a8dd353407bee415883322dc6e973e403eb
diff --git a/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild b/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
index 2a38c47e6761..b6c1ddee4936 100644
--- a/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
+++ b/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 8c1fa38c0d52..9cf44fc0232f 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -5,7 +5,7 @@ DIST jsonschema-2.6.0.tar.gz 53252 BLAKE2B 38d2d1d9f91e923e66aa44fede2597b129813
 DIST jsonschema-3.0.1.tar.gz 120834 BLAKE2B f99d77847a697bb28bac39b7b9a2c6c80cf93eb09a5d585e1f734ebe7d1bdb732b8fcd0c945106ac55c6d64a236def0e1d803a18a2df5e27322a2452ce99a55d SHA512 564e7385728b15387cd44c06cf50c36342fe4c6f497d208ce3d611d1659023e95ff032b2609a786cd9610bd915f878d138eef47913f18cc56eaae0651eb6efe8
 EBUILD jsonschema-2.3.0.ebuild 665 BLAKE2B 1b6302d154842fa3e9cd3ac2fabd83e26d86daf503b05da892c81f28dcd3e249cc1d530f5b45077021f7d80ac33a2a1092b2cfc410cf07b6691179091a40fb95 SHA512 407fe94887ed6aa35bdcd18f383eec24877cb1b986bd9e364b122fb3488ac1bb99abd61e5803ed231783d049ee8b5b0f730df57fb4d699005175fa96b64f1e7f
 EBUILD jsonschema-2.4.0.ebuild 543 BLAKE2B 79c7480aec9efe6be737e4e5aab91b193e2d9d8d2704ffd04fcbafea2ba2e5f571737e3c97815462221eb013a25c873bce0ce16634f791cdb0cecc4ab08c7d60 SHA512 1e8200698645b388be340204925828126f3fdbb0b493852039e53eb71429308ac5e34448370ac1d26c4960e0ffda09c3100e3e7c0a3dc99337b367af0d95b37a
-EBUILD jsonschema-2.5.1-r2.ebuild 1006 BLAKE2B 80f76c4fcd3019994eaed45c286923d6c8412ce3ed10231b053f3591d37bf3e1f9d62a1b58846f0f75952320cb8fe23f97a0aa113ff7bb56c672f528f4225990 SHA512 ccaecada03ef7e628c4524999d74043e1c66c2df3a248f5104d3b9eaea3f19bf2e5361866b2d969492cf0c42c993ceb84ed4ca70aff8e9969131dfb080eb8f06
+EBUILD jsonschema-2.5.1-r2.ebuild 1004 BLAKE2B 015dd8f892875f200abe3674ef171ad55b45cb52d2d5f41569462afa3f0da5887636afb85ee533fb1ab9606c8dfac07d0a8eec88dfd517de1cbf796b7ec4787f SHA512 3d6ac20590af0541ff41b1e02a7acd50b7efcfae6136f4be29b55ef76e3f28f651ba450bc89c0e14180c6845c80ba6ebbbf1a7725be1dfab5c6ce8f401fd4bf0
 EBUILD jsonschema-2.6.0.ebuild 1033 BLAKE2B 720f1d017b67897e1587f0c6bd2ea4c8775cf82a1f75e6fb53a172c96b0850347912f0840e653a10f60d0cb0510eb48e9d9776d9b05d96d833253ac3d8f82bb1 SHA512 5d1ca07d4a4ff476b5ff3cdf637a0cc42e0fc036bf0dbf7071c872d9ddc8e53a3f48d3f1942c61fb2fb365e5095f76328b6a0c93b1d822e8360aa14493e4e8fe
 EBUILD jsonschema-3.0.1.ebuild 1185 BLAKE2B c8ea01ef35113e087021e5b1eceb36e2cb3dd255323be2c54cfb24ed8689fa838d4890f3be1754612245683a23bc1949e59c6d01934096c2d06d870a1074ad61 SHA512 4c187920e3f02b58e6e3327e20df4db4baebcdf99b5e234981a57de9409ecb1dfb05ddc23fdc2e49a47d54d32f83c72c3549a48734b7192ad20f6099ca2f58bb
 MISC metadata.xml 559 BLAKE2B dbfd5c0c2d3b9e3ea197db40ca1c1ea22e63e61bb540646a4b7dd711ed4e5a8a3bf5cc149a90e9911de76db8895f4a807b7ca1500d8a3937527902b0036a8360 SHA512 6824c104780402599891db143c021ecb833d2bca3dee97a6d12cc51f23856f6e9dcadd2a438ca8ad13a6e292048cb5bdbdf024665b06da547fff1c7b9f5090cc
diff --git a/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild b/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
index 53449e6264c2..dd7476a301ad 100644
--- a/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/kconfiglib/Manifest b/dev-python/kconfiglib/Manifest
index 17b91ac31a59..f57046fc3b8a 100644
--- a/dev-python/kconfiglib/Manifest
+++ b/dev-python/kconfiglib/Manifest
@@ -1,3 +1,4 @@
+AUX kconfiglib-12.12.1-setup.patch 463 BLAKE2B f2e781ea3f2e28b308424b1688b9ccb575450bede07c4f00fb24a8196c3f8c514e3d4af222d86203f369e5dd9f2b97f778cddac757d1591d1c4af34a59e7e631 SHA512 c3d0c56bf3a84af57f0ef0fbdd987b3cfa8acdf1828efbb4e66d928256d47a64ad116cd7d9c66d19b5a8b1dc167603e0f8db1aeec2ddbcc0cec98235771e50f1
 DIST kconfiglib-12.12.1.tar.gz 181307 BLAKE2B d256148bd6bf01f7951c78751604eae1be4c2fc156b815bdb570e6fcf185c2f5c97259f6ce0ed275104234ff7180afa2000a81feb281e745a8a0c4db162f57b9 SHA512 49e8746e6c83a93b7500130b21b864346ab8106c0c161de0ec62b3efff794080e734d34d88cd9c816c0d6514465729fbc3a4334fcc9c0a68f17c1688bb210325
-EBUILD kconfiglib-12.12.1.ebuild 1047 BLAKE2B 0c4bef5cbed70c1c39a602438a7fddf86f36059837d5595eba561c6f2b3706593c7fcbaf41595b070a75b3473019a5a95eb745c658c54f6458ebdef276c8c6d2 SHA512 c6f8f55aecdd22e37b85de9808a6b53bdb50cd4fa081e3ce7f65fcfcf5d561f1ed308087fa5fb721721fd9554d020c07cfd10791bec4ffc8346db4583ec5cedf
+EBUILD kconfiglib-12.12.1.ebuild 1049 BLAKE2B 34797f558424ea5b8a91ded661b7f180042c78d65dbae66ed37686ca4438066b9e53ff2795af642d96ca1e819d41f10668e47ee7b08e7a657b1227829d87c452 SHA512 ec2a600938d4a8296952aba0d88dbc03ce499824db71ab775ed923b4aa62af04de7928ce8919f262924d3ed10189254a3f860c1e8635e38456f1e7a199d34243
 MISC metadata.xml 331 BLAKE2B cf19e7c3a4a2511e58382941904de06eb12e21c0a1f27c89fd3f61ff1e2f96d9e8509aba80f52080ce4a53da8f99e8a15685803b143fbc9071d33ae6e815a1e1 SHA512 453f9a6063705a3f9db24e5c0658e31c73d234dead14ccecd8d46fe56f26b16729f4f46c0ff7471689c60eef5d9c006b455a14f349f1249ae2e9f0b677ef80f8
diff --git a/dev-python/kconfiglib/files/kconfiglib-12.12.1-setup.patch b/dev-python/kconfiglib/files/kconfiglib-12.12.1-setup.patch
new file mode 100644
index 000000000000..b5225e90d5d9
--- /dev/null
+++ b/dev-python/kconfiglib/files/kconfiglib-12.12.1-setup.patch
@@ -0,0 +1,16 @@
+Python2's ConfigParser module used by setuptools throws parsing errors when
+encountering tab characters.
+
+--- Kconfiglib-12.12.1/setup.cfg
++++ Kconfiglib-12.12.1/setup.cfg
+@@ -1,6 +1,6 @@
+ [bdist_wheel]
+-	# We support both Python 2 and Python 3
+-	universal = 1
++# We support both Python 2 and Python 3
++universal = 1
+ [metadata]
+-	# Include the license file in wheels
+-	license_file = LICENSE.txt
++# Include the license file in wheels
++license_file = LICENSE.txt
diff --git a/dev-python/kconfiglib/kconfiglib-12.12.1.ebuild b/dev-python/kconfiglib/kconfiglib-12.12.1.ebuild
index 42e22c8f41fb..b1a5baccde7c 100644
--- a/dev-python/kconfiglib/kconfiglib-12.12.1.ebuild
+++ b/dev-python/kconfiglib/kconfiglib-12.12.1.ebuild
@@ -2,8 +2,7 @@
 # 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_COMPAT=( python{2_7,3_{5,6,7}} pypy{,3} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
@@ -24,6 +23,8 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${P/k/K}
 
+PATCHES=( "${FILESDIR}"/${P}-setup.patch )
+
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
diff --git a/dev-python/linecache2/Manifest b/dev-python/linecache2/Manifest
index 717c1b8fc5ee..de394b546a5f 100644
--- a/dev-python/linecache2/Manifest
+++ b/dev-python/linecache2/Manifest
@@ -1,3 +1,3 @@
 DIST linecache2-1.0.0.tar.gz 11013 BLAKE2B 5f9b125819d9c812d37f1c14ef9ab52f2d5787c83a3d0d891a4def65f17aea26d903b269a610b7247927f72c1594b434ce9274c5358b29799e4ca5b426b37836 SHA512 e585a6e4c054c1965bc4241a1e36b57cb04f32b2d778df0ae4381975700497975251f509354d3622e36c82973c726a207b815f8b12060d9d583b6669a9eb279e
 EBUILD linecache2-1.0.0.ebuild 764 BLAKE2B ff3f141f0d88ab45872116aa1a63bf97dcc48a7502def968406a1c1d74e50e3ff7eb0ab87bf012ea92820a108e3eeb21d1ee4653c1e7fc03a2c647397776a88c SHA512 caa21603d2e7f94c8dd4301f5cd8134830d96aaa0e8a6e2a7d9a86af55fcfd80f66037b47e62f9b2be9e5b3da7251d247adeeb0942f15fb4a1518f49f42e1d9a
-MISC metadata.xml 276 BLAKE2B ab1cb64b3a917d8eced0d55be858ef505e3f578f1b0a8beff000329ccf5b53bdedfcaddf28a2564d35525fda36cf5d2117390deef58320f500d0647a865c2f23 SHA512 4ae389040c0420f9f1900c0eb6d258c7dbaf8ba413599a2e3568b0b2bd018b45bb6f68436e0abdc4c84b1a522a9220fb9d3875ede3503e805f5f40f2c0d6c94e
+MISC metadata.xml 302 BLAKE2B 121d88c715f0ef01faa1e813371b3a6f021ce034816667e62e1048ba9220d8ee4871500fa8e1a54821a4af1134e46ee08e569610c937f50492b135d8b7cc3d15 SHA512 8a62ad98f7c44a165b2e9daf3eb54b37ad4bda18d2d0404a72780e4155298f98c6cfb232dcae693d76cf52f10b2fa4332bd988fb06d56d53165911f194a52400
diff --git a/dev-python/linecache2/metadata.xml b/dev-python/linecache2/metadata.xml
index 37b6f8e771bf..c5a2319ffea3 100644
--- a/dev-python/linecache2/metadata.xml
+++ b/dev-python/linecache2/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">linecache2</remote-id>
 		<remote-id type="github">testing-cabal/linecache2</remote-id>
diff --git a/dev-python/livereload/Manifest b/dev-python/livereload/Manifest
index 099095b5a38c..d65f59959e65 100644
--- a/dev-python/livereload/Manifest
+++ b/dev-python/livereload/Manifest
@@ -2,4 +2,4 @@ DIST livereload-2.4.1.tar.gz 25593 BLAKE2B 97a37349f14cb9d1841ec78cc3d1965b59f65
 DIST livereload-2.5.2.tar.gz 27070 BLAKE2B 9d2af1eb313f8fd6e7a5176565c3f7a9ab7d8a36260d568d47a427e14e8ed76c0edb0c227ba5784681c82d7c7b5994e151d14302d8c9d0e76caea7d12e130586 SHA512 bb4ba50a31a912051f6036754bfc6ce7ba33b1b8abd5a20ac151f996e347d84367d4cc26f9c798ed6aef487ea335e1591d40ebd1c12f9487f74992e53e129749
 EBUILD livereload-2.4.1.ebuild 857 BLAKE2B 3b2367c6a1bdc108b6ff9bf8ba73e58bfbfb377e8ee48f8df6c9f346244e0fdb4acde93962a167fe7aae82a253e051ad974e25b64c66a5f8aa15adf9074f4294 SHA512 78b33454fb517c69e38f39e696d7bbfc3eeb8f6a0d9a7cda66ea70173e2df85f4fd144dec14fa2da540bd6401bb87b3e5667b75adf643a80790614d95248d9ba
 EBUILD livereload-2.5.2.ebuild 858 BLAKE2B bf2189498b3adc7f1f2fe8762945fa5f53654955bc12cf6bf4bbe26918290d2b2f33f9a71d2bdc08d95db941561d496decd1de387c95c5bc5aea415879e1a01f SHA512 82f4be1c05cd911d140852ec78e42477962d7e66e4fb047b9663bea99df29e2205617dea7f40c73d7504c99fc43423877de1bcd9d494f299c25207d979a2565f
-MISC metadata.xml 229 BLAKE2B cc31119586b2dd54e97e4f9646099f6395fd6ceb133acfcf64d450c3ce63a1838a89fff3880917accd41ec5ca44c88cb65618cf4df02a914f343541b9c394612 SHA512 d93aed94a1c9d1a0ff3c88a46b18b462d40a901d2b5c67bc957fd1fb8000b80f76e75467b928bc57f09df162a55e9db67df16bbc781b0fb346670703d56ae2c8
+MISC metadata.xml 255 BLAKE2B e88348eaa3bdb7b0d49b6041be22aea520b3c8725f8fdf9433bf9ecff7f5835e9ca46ef054a110a94b394fed5e14c12459a1fee88449ba47cf23bfd9d44da951 SHA512 42395b9462f906c39def6b21217119364b03682e624539e1ffea1f95258d21ca9c3bc3e94f86cd4294e6e4d92ecab7e6355a5068b243aa2d11d6cca1fdd95012
diff --git a/dev-python/livereload/metadata.xml b/dev-python/livereload/metadata.xml
index 0c2c7c1a61bb..271d14bdfb6c 100644
--- a/dev-python/livereload/metadata.xml
+++ b/dev-python/livereload/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">lepture/python-livereload</remote-id>
 	</upstream>
diff --git a/dev-python/loguru/Manifest b/dev-python/loguru/Manifest
index e68192881f89..760cfe139fec 100644
--- a/dev-python/loguru/Manifest
+++ b/dev-python/loguru/Manifest
@@ -1,3 +1,5 @@
 DIST loguru-0.2.6_pre20190412.tar.gz 362315 BLAKE2B 8273fd42522396d4a17c405bebf01f8de272a56515e4a63766126494b4449333e7c25f5be5851bdbcf922d35affa9ee091ac7138482f9e2daf30f48093cee812 SHA512 49320c19f2bfdc55569290740b49889133003329dbf6cae2e993730a957d69e5200b41b75d255d2e19d937658778945ffe44350431661162eaa6141edfcfc499
+DIST loguru-0.3.1.tar.gz 377834 BLAKE2B 4402a6dfd8e36efb966eb0f31ba2161183c03a7072f45ef86110587b1f3653e4711c0461d39d5e0047fb7b84c7da417c011644ffee815f82bf1f4847588b17b8 SHA512 b0b75aa265839be0a522101671bf9992c1fe548439988a5c2feb58702be77944137e4f78920ec5dd4fe5953daf7160714a4de940527d0987dba4907ac27a0e15
 EBUILD loguru-0.2.6_pre20190412.ebuild 1125 BLAKE2B 442009acf68b49846ca90ffb5b5234e9e99e0fd6d1c25d11fbbe01c9b5b9bb34e5d968b4a9035846912c1313b165969d8e920e6b93298b20d868122c53892389 SHA512 fa0e737d2b3710e7dd1bca02d4e94d2136084a930a43955b6c8c462efd2993ad6bb0a6a69ec9e0e10884a76d3d81fb6692df04bb07ffe792068c3238d46ab94b
+EBUILD loguru-0.3.1.ebuild 1013 BLAKE2B 2bfab0b4b5623bf2ee15605e619e315ae4b3c63f2571e25d17ef144de1134d51d3072231d9e981b30871769c0688b51bb70bce58cf34edc12d4a2259bb4c313d SHA512 590dc4cfc49b9050b3cd9b220d3505da83c827effdee520ec35fd7b23123f57049ee27c1cde064ca7ca306ad04d45e68de8807602307df0151d57df2d62bb58b
 MISC metadata.xml 683 BLAKE2B bd44db6c47f17a714eb8080d63d5002bbedf247787d568735f87f8aa01a13fc32d383f4eab2b92536a2f98f5b76b0ae01c407bf3c746b08c668ef562cf488ed0 SHA512 8a671ba69aa489f384c7074623f62c03905442b14b6b12bc9f306416a66390a334dcdadf84a5485936b47ff9992ac87e35ffbc8ae17d035b381f53f721b2369b
diff --git a/dev-python/loguru/loguru-0.3.1.ebuild b/dev-python/loguru/loguru-0.3.1.ebuild
new file mode 100644
index 000000000000..f3f34085887e
--- /dev/null
+++ b/dev-python/loguru/loguru-0.3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python logging made (stupidly) simple"
+HOMEPAGE="https://github.com/Delgan/loguru"
+SRC_URI="https://github.com/Delgan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/colorama-0.3.4[${PYTHON_USEDEP}]"
+
+DEPEND="
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/colorama-0.3.4[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.5.0[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/mamba/Manifest b/dev-python/mamba/Manifest
index b520a79d4084..66e1a4cb1d7a 100644
--- a/dev-python/mamba/Manifest
+++ b/dev-python/mamba/Manifest
@@ -1,3 +1,3 @@
 DIST mamba-0.8.6.tar.gz 10430 BLAKE2B f3629525cfe882adb040674852ed9e725332ab19525305efd42a0fa0a0a3ab20df7a257299df525149609858792c267219eb3caf761a6f15b7d3b2557d4e98a2 SHA512 f35396bcb607c2eb10caa99f4c82924b0c75c2eeddb3d18ed5db3d5e38dca41917c23f1fcd7003b596576436cea6a02f40c352e6a11f63e472144e0ae0575198
 EBUILD mamba-0.8.6.ebuild 900 BLAKE2B 40cb5baf0060e9471d8dfc540d81b0f48dcfdbf9ad734d3e37a3e56416b76da340ddf304fb229ead69b3c89a0474764f83fecf66f88cf6deca4417594fcc8c13 SHA512 7d871f80457fb4d3adbec2fb7da33bda6bc983a760e591610b4ce5cfa1bda4353f1361a818dac0f21a8ddea11cb8789eaa37b3dd32022388e9f58cbdb5f20ca0
-MISC metadata.xml 272 BLAKE2B 319bebdacca75fe0f885e35d8286f70fe5310e2592652ad84cf4c23d246a82d7159a45439588c0d94f596d1d136026e5cb22e1f492a4e2de5b2d2926c7d13079 SHA512 835f509dbc78ca30d8cd22f80e9d86c520836cfa6ce348f28e1a802940edd5724a6e6d63ea56f16a7896ac5d49abc389f567adb164d647631c6ef1e93a2d59ea
+MISC metadata.xml 299 BLAKE2B 921f7b7d5add4e7decb67da81d15bc1382bb3c51125d99342a9d8229fbf4cb0336ac13623290d0977ee9db821565bde14a1a5d9769dd5e2b89e333efc2a44d54 SHA512 ea6d9b306c3a8691697cea16a1582c8b5a36b54977534e4937feedc34bb62f4006d57227df48e878174aaaee03229d272bd940f23cc5e831cfbe79b05d827f93
diff --git a/dev-python/mamba/metadata.xml b/dev-python/mamba/metadata.xml
index ee958cca5aab..fdad142d318a 100644
--- a/dev-python/mamba/metadata.xml
+++ b/dev-python/mamba/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!--maintainer-needed-->
   <upstream>
     <remote-id type="pypi">mamba</remote-id>
     <remote-id type="github">nestorsalceda/mamba</remote-id>
diff --git a/dev-python/mando/Manifest b/dev-python/mando/Manifest
index 5f6f25d11f9b..43e32e71d1e3 100644
--- a/dev-python/mando/Manifest
+++ b/dev-python/mando/Manifest
@@ -1,3 +1,3 @@
 DIST mando-0.3.2.tar.gz 22393 BLAKE2B bf6a7df4a6e2e8270d0b8fa278cde7d520bf5c9d490dec748927d8f7c024381094f946e5feb4b5334b0d7255df002aeb1b42b8545b7514194425e37f739d2da9 SHA512 57f5041ad175c4eca4c158d9d917dcb1f9c25978c60aa0e76322d0395b0edbc3fb7b062da7b9af871a97bbd46cfe7f81e634287f813baf15ef134be53150bd11
 EBUILD mando-0.3.2.ebuild 921 BLAKE2B fd74042408b0bcd6214b930a65402a0772a4b3811ffc6f3d59906c5ff316900064d7c33b4115fcbe01fcd9e60d9fcdbb7cf16dbb4bd1e64d6741d3c73c7c4be2 SHA512 ff47573e4ff65068914cf451b0454f413d643f657eb23b20981adc8581dfc68eb2cf9126cb6e1c1229edf82ff90d14ed792d3c5dc7d02f175cd7906ef21f1adc
-MISC metadata.xml 215 BLAKE2B e2ef74a95d35d60458c06e8a781f8bfd50fc7f83fac9938ade3cf468e472e0a3fbcbf5daf602ce57cd2a8c78a65bfa855873066812f022cc14fd30c34fd0570f SHA512 93cdf44b835c2f86583832287d71794c0a0d8d44fbbfbf6b7ac57a4e0e6bdcc41e5f30199f164b50aba514a1c3052c0176f8c96dc49407ac8a2b8b69fb9612d9
+MISC metadata.xml 241 BLAKE2B cbc5b40c8cc94046b0c3f22ff09d1d4808cbb26026213495d792da8c605df005a5670fd55586aee9ec26e66862695768683dce22127e5af344ea529302b4cd31 SHA512 3ac90d64a94a1c32453b3fe9e3fbde47602aa1257f1a15bb08e8d5c1abf779eef08378376ab4910904a672fc66b1b36f781f1ab144eea0be3c1d36f35ea6337c
diff --git a/dev-python/mando/metadata.xml b/dev-python/mando/metadata.xml
index d227be3e6386..90a9955a56b1 100644
--- a/dev-python/mando/metadata.xml
+++ b/dev-python/mando/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">rubik/mando</remote-id>
 	</upstream>
diff --git a/dev-python/mkdocs-bootstrap/Manifest b/dev-python/mkdocs-bootstrap/Manifest
index 06382f95551f..a97f79f9a895 100644
--- a/dev-python/mkdocs-bootstrap/Manifest
+++ b/dev-python/mkdocs-bootstrap/Manifest
@@ -1,4 +1,4 @@
 DIST mkdocs-bootstrap-0.1.1.tar.gz 363121 BLAKE2B aecbbab8a0ede98d52cca778d6d8430945f3b1e962f3bd4b3a5c0d544c51d0a06a21e4d0b15390640097d57b8f30ea5f271d201ef9ed0a15ff034e08e1529e33 SHA512 edaf4178f2a5914bf6fb7daaf4dfeabe42eff6872e60ca78bf748b55bb2e487742ada279696ee6f8aad87106d38e7bcf0e24460b85d441b5f77e4f64a99a4b66
 EBUILD mkdocs-bootstrap-0.1.1-r1.ebuild 396 BLAKE2B bec1f3ddbc78669f78c70ceaa58c751b5efa9ee8d1f3d9ebca5d16ca1bc648c1081b3df3d2468be46ebf7500c88cf45e597c210e45365c322189b7988e651a6b SHA512 d9d7110aa538bcbf00b69a18a0f458643467ef9db7a02d042689fb2b148dfeafff2f7e9fd555bc4ebc47093b68a6d1362977d9691090f1b018c8dad704f8336d
 EBUILD mkdocs-bootstrap-0.1.1.ebuild 414 BLAKE2B b207532740c8fae6f1c2e337b7e28ca1c94e11938dfb4b7a746889774d5f7f42a65275c04441ebfe767aa5f3e38eb7be93576ea041ba802ad0d9cf139a1bf5cd SHA512 b8a5cfe702bd593e17e999c6b12037333af40d2f731adcf461b745627d473a0e7e7aad9e23662260df94cf4555068be260d7ff842f07905e1dff28e8161ec23e
-MISC metadata.xml 218 BLAKE2B 380c076eb85df222a33b6668edb486e085a5b110876236da6f75bc2a2a3d98f34be445909a1731b7312bd047be38fef520e04e3d5ce1b6badde0220dafd931e2 SHA512 2d0a29a5f8a3a80415912b7925f2da5a6b8ccc735fee7667a7c8da82b72ad5f5de60ffb2c13a8625904784ada9ca638fbfc950effcc35198e17d157df3e193af
+MISC metadata.xml 244 BLAKE2B 984a07400477f088442a2ed1491b8f96a78d1895f5186dacf5ff5c9105199d82a7df31deacd1d5986338db1fe2e2de130bf8615965fe2466492b308fa9ee8a0f SHA512 c767d00b3250438eee0e53e0cfb185601b33c09743d3d4ad7131254ba752a065465b316a279956587a70715920bf7563f420ee1fcda261eed4510528fb78e1b4
diff --git a/dev-python/mkdocs-bootstrap/metadata.xml b/dev-python/mkdocs-bootstrap/metadata.xml
index f8a0113847d2..d351c1e4ca54 100644
--- a/dev-python/mkdocs-bootstrap/metadata.xml
+++ b/dev-python/mkdocs-bootstrap/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">mkdocs-bootstrap</remote-id>
 	</upstream>
diff --git a/dev-python/mkdocs-bootswatch/Manifest b/dev-python/mkdocs-bootswatch/Manifest
index 13d6291311a0..cf3eb2f30731 100644
--- a/dev-python/mkdocs-bootswatch/Manifest
+++ b/dev-python/mkdocs-bootswatch/Manifest
@@ -1,4 +1,4 @@
 DIST mkdocs-bootswatch-0.4.0.tar.gz 4409488 BLAKE2B 219d341a995f39e58ed5aaceaf0b94f468b21a9959220f598cb7d6370c550f67591fb8a480583a0969d6b6bad94af84d4b874ee80b63b430c6f7177a0e2ce46a SHA512 46ab2f40fc5167dd96e7dd6d80b99696f371c46a1f0dca029dc444d352da71c0f05f765acd67a7a79a9e3f15140c0b0cec4e395fa247b4bc09f3b77d69b905ec
 EBUILD mkdocs-bootswatch-0.4.0-r1.ebuild 398 BLAKE2B 7dcbffce62c5cb4fb1f5a3a6506783eab2e8da050fa0123dd3ecb1fadac6a5ad3ce5ae0c7ba53424276006ce40a51ed77128fbe0aaaab777b3c6045897b06759 SHA512 d88fecccdfd83ad8db2575ad49961a712cd0d13a09137181069f0f9bd57a0f18fcf4f4528323907ff1c7dac0396fb57e2ec28a0b1c58c9b0f5779d2f7686a3f5
 EBUILD mkdocs-bootswatch-0.4.0.ebuild 416 BLAKE2B 393e16e84165427c04dd767364fb743809cb6266f8a4c1ad219814470c46eeb279ab90cff9b0cde52878409ffa3a7b4d8602edb4b5abce5d36bee113fdc4ed21 SHA512 69b2d4d32535fdc6df88b9919451868959ecbf6770e7996f0aa38e5693229db0198dc3bb1c57b6f19e363cc42058bc4e58c0cdc1a2114bef743e605a7b71931f
-MISC metadata.xml 219 BLAKE2B dc8d8fc0f0c2de2b23c1228b5292d19263c41fa5079893a782bfaab97951233d30c6ea7c171704fbb6bbd071802b4c4acdb4110e808ba6b1de392c57e0d0429d SHA512 494f403e0b967fe03e0fb856fb85952c0b84dd50b0b733078f30c14c3ec6dd2afaecde66bd7e02b02f57dc568bfda4e3f3a997be3fb5bdcc5377c8a06576bea5
+MISC metadata.xml 245 BLAKE2B 95cae7ad600443b5a08b11a0193a4a30ffa6b084ae5d92b416adfd5d2324224f9f0a2df337d8636b031f3d48e9e615c44f3d30e91021aa39fce748a8a5debf57 SHA512 683cc090312ac3e11fda27d1b788d7a5c1686600d727f09b441de333753d9737dd0228a974801e8bb18ed6470f61264cb8af45ab90faf077a8e431f328fa63b0
diff --git a/dev-python/mkdocs-bootswatch/metadata.xml b/dev-python/mkdocs-bootswatch/metadata.xml
index a0b4489d2083..ed7630180722 100644
--- a/dev-python/mkdocs-bootswatch/metadata.xml
+++ b/dev-python/mkdocs-bootswatch/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">mkdocs-bootswatch</remote-id>
 	</upstream>
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index a1cf27cf8f60..1c34d6eb69ea 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -4,4 +4,4 @@ DIST mkdocs-1.0.1.tar.gz 1589767 BLAKE2B 54f7a33c166fa44b9471069db45436e1381d451
 EBUILD mkdocs-0.15.3.ebuild 1057 BLAKE2B 3640da1fbe83a6fec22d39d3ef73753ae235d55c1d4615c5776d21023f85b200e22df70aad8a08eac397ffae9558424d28c78cef7fab3e01885454c340d54123 SHA512 eb04fbce2ec836f647ede8470cfced79d46ac157b092f77ecdd6a5b0da85f92b3248f002130f8cfba8a0a0711ea4c6b2a910b781da5dd6af0560310c58030df3
 EBUILD mkdocs-0.17.4.ebuild 1317 BLAKE2B 3f9fa445600b882c511710a0855516aeb0e9917e37c41693b66206368a45ad2c2106c3abfa48160861ef5165cec4f1bf536108839cff8d0a414ec413da922b0e SHA512 811b02f47cf10a07b6be892bb1ee09c1895dfe453d559985af5d3a3e7773394aa0dbc66083441d0507d6e99d6b727018f1422d0db09f6f50a4349462bbca4149
 EBUILD mkdocs-1.0.1.ebuild 1317 BLAKE2B 3f9fa445600b882c511710a0855516aeb0e9917e37c41693b66206368a45ad2c2106c3abfa48160861ef5165cec4f1bf536108839cff8d0a414ec413da922b0e SHA512 811b02f47cf10a07b6be892bb1ee09c1895dfe453d559985af5d3a3e7773394aa0dbc66083441d0507d6e99d6b727018f1422d0db09f6f50a4349462bbca4149
-MISC metadata.xml 222 BLAKE2B c3730d60b92f5db302a2cd11c9f6143cf2eb847b81a20d3208b29c7000b0b748859c1e04fc44ffe79515b3bd8cf2b226de3ca2577bd8f15f68dd6c76aa12fa91 SHA512 294e924a6b8205f1f304a70d18ea3f0d0036574aca90fa7652ceed05c8947957a32869e2d659648b73ba1b34a5bd8d8fa321adaf0f7c62b55a778646672fb533
+MISC metadata.xml 248 BLAKE2B ca12914d7dc6c1711fe96cccf5fe6a62c7854264634cd4bf62450125107655cbd64ab6e214fbef1065948a6adec5e83b3c0ba272f307a3c5b393dbb671f2d8cf SHA512 4b39eb7ca7e3e9fb49cdcefb0f721af61ec5e2e701becda0e3746b964be7105117fbde1601415985a7bcf23b3f42a0a44a55556a48c80c4c8d09ab1c7d848b9d
diff --git a/dev-python/mkdocs/metadata.xml b/dev-python/mkdocs/metadata.xml
index aeddaa5f97c4..251c93451e3d 100644
--- a/dev-python/mkdocs/metadata.xml
+++ b/dev-python/mkdocs/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">tomchristie/mkdocs</remote-id>
 	</upstream>
diff --git a/dev-python/monotonic/Manifest b/dev-python/monotonic/Manifest
index 433e6d7ffe03..a30ea588ad33 100644
--- a/dev-python/monotonic/Manifest
+++ b/dev-python/monotonic/Manifest
@@ -4,4 +4,4 @@ DIST monotonic-1.5.tar.gz 7525 BLAKE2B e6022a9c134031f1b89e643b4f7b37417366e08de
 EBUILD monotonic-1.3.ebuild 480 BLAKE2B 093b94d38cb66fa42e2a1a28a17fb86c26bc5b2dc519d1846754a86572f7d1fb941d1c5a3ea7ad0d474c84c578ead64804ccf67a83de96b58b5dbe78c2534fe6 SHA512 aacdc803fc46fc605b43ec372ec2dfa3a058efb9b7784b95cf6fd9962929ea43ddbd9f59ac6483ccf0220c034b68c4ecb16dacd959f158daae8dd43e5355d117
 EBUILD monotonic-1.4.ebuild 485 BLAKE2B 8aa2c97ac58e7484215e33dbc38b9b3a8b65ca3843f9247416406ed8fa93f48319551be417c2ad395dbbbdf759d80b9080216c49af5d574e6f120225a53ae5d3 SHA512 e91f6bccfe1e044b077830daeec55df1389827a0ab32c387bd0b85a3811a725d33cb2814f08be055ed4aebfb77d9a7b4d0d2dac8df4375397502a36145d887d7
 EBUILD monotonic-1.5.ebuild 489 BLAKE2B fd2db7e3196fc79790bccdd3f701bd9ca6636eacbc2286dbde4736064935a3121f5310d343930f56bcd78d00836f0925c3f3fced41ab045d5098d881c66f4157 SHA512 4b5a8ccbf48afdb8ca5c821ec278984d82599caaaf3ad1baeaea99c90beb2fc350d375602d09d63a49e3a7d1790f63f848884aaac22e240ce75735489769a21b
-MISC metadata.xml 265 BLAKE2B 3933f653f010c95cad9fed21d1511497c49a48ec369592bf48061a987133ef492a792274685c56a0aaa640cc1f39b2aafe6dd141191191dd1693f6ac9a9aab1d SHA512 46857509ccd598f4774b26386248a7309cde1fdf63a3edb3e75926029abff5cd653a57e213bdea8b976b452ad4ba9f35b65111f6a53ee5868ca4bf76bd8bd1f9
+MISC metadata.xml 291 BLAKE2B dca62d0d7e7adf50cf0060332562bc3a6fc361a7f3b3b8ae25c142d93992a26c2b9ccfb0be5fffcd18e359989d4d6f603f46c93b23c2dbfe6283198fbaa7676a SHA512 f67a64d81a33f4356c9011fa9ef6ebe195ca28c6c8b9567f07e0756c7a2f9009e5cbbf5b68e495f9f840e5d75f34fc82e440626c80b024df0797e15d610dc9d8
diff --git a/dev-python/monotonic/metadata.xml b/dev-python/monotonic/metadata.xml
index 3766c08c9e6d..f5098fadc75b 100644
--- a/dev-python/monotonic/metadata.xml
+++ b/dev-python/monotonic/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">monotonic</remote-id>
 		<remote-id type="github">atdt/monotonic</remote-id>
diff --git a/dev-python/nose2/Manifest b/dev-python/nose2/Manifest
index ea9638e804d5..ea6cb245d109 100644
--- a/dev-python/nose2/Manifest
+++ b/dev-python/nose2/Manifest
@@ -1,3 +1,3 @@
 DIST nose2-0.6.5.tar.gz 134808 BLAKE2B 5f094d537ff7c48b7bfaf139b4c96a93875013ca5663d1e5b3feec543e7efd55335488321bcdd5752529cb36685dd28c91bd29665aed9e5f58fef837e5e2944b SHA512 fc84aa19d486ff1441dd43666182212e4a05b3be054f3c8967e36e624c08ee6eb10b01bba45b5f5dbbd38cfd057d53877e0bc0d9aba59b842688a5d4ec944b40
 EBUILD nose2-0.6.5.ebuild 942 BLAKE2B bf5a88b98c0807c34a5aba0e4a7905f0905d2f081e955f824993fcde0935864a75107ce6cc0dca061f9c9903cafda1eae0ce642040d78a8832b0701361d1d256 SHA512 9c0ccf948ea72af4eda1b9c3c5728132f0d8e06bf9543146f5c0560dc2da25083e74b6af3d7ad21bdeb64f190603ea991bcc857f1012ae36130b3371a66dcb31
-MISC metadata.xml 219 BLAKE2B d029050891ce875c82037bc06584e6ac7cf5332227737dcb08449ff842d361f1f373d90fe5628b6305d8b372fdec3e66adf1fb6d7b3856bc444e0a899f7d0c5b SHA512 f7f050059c8022343085629b71dc33b31c18acac3ba51fefb5ef64c8bb0933a11fae700f12033c3e757f86c17fc41eed75d5e7c4394ca4cd9bd5aa2641c93150
+MISC metadata.xml 245 BLAKE2B 3add0b4d7a53d7fe522e4b78a567cf1a8b1fe89d9abfd8fd5ccbc70104ccf52b15c4081cea951454752df03f43de328c975f280a42f8b248e83fc37a89716fdb SHA512 1ecded9f7a627a77dd609108d3bb95d70fea72e3fcc70436a6f0e54abe609bf9553644a8aaf2333e1aa0b14095768dc8f5d35b510173ccb194f4f8ac4243e33e
diff --git a/dev-python/nose2/metadata.xml b/dev-python/nose2/metadata.xml
index 1e3940e0914e..684f51f49353 100644
--- a/dev-python/nose2/metadata.xml
+++ b/dev-python/nose2/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">nose-devs/nose2</remote-id>
 	</upstream>
diff --git a/dev-python/oauth2client/Manifest b/dev-python/oauth2client/Manifest
index 720d077abe69..b2408850cb8b 100644
--- a/dev-python/oauth2client/Manifest
+++ b/dev-python/oauth2client/Manifest
@@ -4,6 +4,6 @@ DIST oauth2client-4.1.2.tar.gz 184731 BLAKE2B 09ae16a94b1f6b3eedb02ac10d660d8fda
 DIST oauth2client-4.1.3.tar.gz 185589 BLAKE2B 6cd61448e0d55cef7f2ba640c8cbb50ac83e76d0993391eb0acb3e156f937fcdee80576c9d45d505235a9f266495069664ccbfafd649a4e2d7a0990517ee8cb6 SHA512 80f49e09a6dd6767307a2c278544926fbf20b4f55e4cf83563ac7a7c1043622bd3c8c7fcf6de62896b623ca8c7947b309a5e6bf2b7cb0fccff3ff7634386b287
 EBUILD oauth2client-2.0.1.ebuild 1116 BLAKE2B 6f44662774bbcc87956a139350f7f80e603f786a78ef752104bd4a636a2f1ed0569e0f930ecb9b887ad48caf6b98d96d9fbe5fd35fa180fd5090d3b36643d9e7 SHA512 8fe080acfdbc270f5c367982c1686531591d0bbeb4d150ce8726931f5c502f7e46feb9b8fbfc9bb1dd80acb0adb8ce89fd6cd3078b2f00d80290c66c9b256975
 EBUILD oauth2client-2.2.0.ebuild 1119 BLAKE2B e35cf70076bd57d2dc5c32b1cded13a6a72dcf223cd4823b60f78fa54cb8a1a0313cf9960c41468c9abe3509a0dc4cd62ea12852fd1cbabda38454c0956e04c1 SHA512 e560828a0ce512a6de838d61a945053f8a5b5f0c54ed82edfa1ae00bdbd20d3d49e7be3d2fb4838f7fae9341025f8512bee6e20330260edf93931cf40000b610
-EBUILD oauth2client-4.1.2.ebuild 1698 BLAKE2B b4a550bd1250da40d38c81f45c83c1bdf52099538d5f0390e82d0a9bd9e495b8ba4cf921a5d6a5558dde4c8bd0618a5540227abbc137b80bed43a98318f586fd SHA512 ca329b4b337f78132ce1a78e99848f404ff9ece552cd08c89d2c4b99e4b77e5964d1669421416f6a057f1c0a4d1cc322cf7ac36ab80198528e00de9f91f7d34e
+EBUILD oauth2client-4.1.2.ebuild 1698 BLAKE2B 134a3c75b91b4453188e70a3ae4bca794107a23b86c1482e3f691fb8cb7246155ee7ac25270659d51a1e47690968062f182ae1ed376ec4ac936e53b66660750f SHA512 e8f7b6e97b688eb442d5ecb8e7df549402b4d1039ac148085e0081b5cdd9d79f7031e5700b15f0b027c94d0f19150757b753b2f2355d70fef2b910411498484e
 EBUILD oauth2client-4.1.3.ebuild 1700 BLAKE2B a42fa6c8989d7ceb7f5d2dfbb03543814a8aeb988e9df5e602d0071c58bf959c6d41b252eb24c0de6b586e4ec9791328760732bfff5a83c70d80cd4fda7eb7d4 SHA512 5e4e4288a8c6818111a7475bab8e1120ce1de0005079db146b352cc17d39be49c48c79047baf684b08fed64151fd44381fe2f4127255fb937dfa57d420162f8f
 MISC metadata.xml 334 BLAKE2B 474087a66809e8ad113f10c3f674b5684858d0eb67d58f54d19557f9a32295f96c587aa945eb6b4fbe338690a096fb59109f907902cd4e08f40c4d62f5dc7e54 SHA512 585f6ddeaa1a11022fcb9bab897e02392157abca2e638cfef57d76a97be2d85071405bbd70a256172d6202e4a4deca47ddb2374b98cd810e60541c2d4d3d373c
diff --git a/dev-python/oauth2client/oauth2client-4.1.2.ebuild b/dev-python/oauth2client/oauth2client-4.1.2.ebuild
index 9900607bdb67..56b88e9b51cd 100644
--- a/dev-python/oauth2client/oauth2client-4.1.2.ebuild
+++ b/dev-python/oauth2client/oauth2client-4.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/oauth2client/archive/v${PV/_p/-post}.tar.gz -
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~arm amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 REQUIRED_USE="|| ( $(python_gen_useflags 'python*') )"
 
diff --git a/dev-python/paramunittest/Manifest b/dev-python/paramunittest/Manifest
index 3bb6a000cb5a..9d3953abb9a4 100644
--- a/dev-python/paramunittest/Manifest
+++ b/dev-python/paramunittest/Manifest
@@ -1,3 +1,3 @@
 DIST ParamUnittest-0.2.tar.gz 2482 BLAKE2B 13d7de57fe0f3747fa5a8bdf2654a16b18c56d74545d05cfd8288fd902f43fec3c7c73d7528c1b3ada7e280e95b72855c14ac6e6d7419280197258eed2592a52 SHA512 ad39def15e5983ebe6b018b10f966b7f83085facccc50e71010f88b8bcfdb704e889ce021535b2e4dd84bc1ae413088e7c028990d934d4fe28d3186b4b01a3b7
 EBUILD paramunittest-0.2.ebuild 526 BLAKE2B 80e5d16d0a9751fa94a082c2e994d36590a531eaa892b7b44c3d89167f30bfab0eaf263413b2deec8cc22fb43e496da156cd8acc9f5441829fca5405138c367e SHA512 5a505d1e06ae8cfc55a341f58f3f936820da899dd6ea1cd30512c9996d4925782e8fb44d19855104c04fa04aecd66babf7668f9cbd4081e31ade5f7057199f89
-MISC metadata.xml 273 BLAKE2B af555ec4c4c81838646b20caa693e4f7729cab43c956bc0f04507f989da78745e6635121a50e10ac5ba2def42742ca3ef3b88cdb389435d1b1fb3d87e44285c0 SHA512 c39fea66f547a98efb450d90cf3944c19583bac423ee308d7e349d9effbb23fda485ceae7c46339e24195e7ddd991b87a46b0662030d124fd7f898240fd4b75d
+MISC metadata.xml 299 BLAKE2B 63557ffe11e7306ee858e78150e1e9581505cbe9498b0bc4cf0e2113757c8d22518f4afdda9da0af358565c6a5aade3487bb3f443bc354906c621ecbc3327919 SHA512 b7bf38d24afab09b5d2da40d7ea77601ba094ad322f505cb5dab4991955e2799c2cdb33d0a5a387de6f2df6f0772020e1fb9cc7bbe74b3198077defbfb6f0b92
diff --git a/dev-python/paramunittest/metadata.xml b/dev-python/paramunittest/metadata.xml
index 6cb0ff4423e0..d4840cc0a39f 100644
--- a/dev-python/paramunittest/metadata.xml
+++ b/dev-python/paramunittest/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">ParamUnittest</remote-id>
 		<remote-id type="github">rik0/ParamUnittest</remote-id>
diff --git a/dev-python/parse-type/Manifest b/dev-python/parse-type/Manifest
index 6dc042591a33..4a43561b1ce9 100644
--- a/dev-python/parse-type/Manifest
+++ b/dev-python/parse-type/Manifest
@@ -1,4 +1,4 @@
 AUX parse-type-0.3.4-python-3.5-tests-compat.patch 1382 BLAKE2B 0e2f122df1f8db5647cfcb30940b12d8c93c2e75309121314954eb8e78f7ac63a2bec50b065310bbb655072cb08d3aeb6546fdb5426b83e9141389b4e6f39b7a SHA512 95f66bbd323f5ca621db2803dcc118c392503188dd4569bee3418be85b644dabc0b15a48a83a66f218466e0764eba409abbe8574b3c7340589428de90a6a0acf
 DIST parse_type-0.3.4.tar.gz 62199 BLAKE2B 8d1c89d837c80ff9cdc3585cead4a24b44256e712f5ed7b824833ce35b25ffef27513c167c41266246da403fecdadec404a6a7cdf968bd35a827b5d02364739d SHA512 5ef80ed820cc7e2f4fa8fd0fbf64160c81f77b4a1af38015e3ec7e3be3f613ecc2211d5dba15ef600cbe11c556a2c1fb6cdc8374c52c608914aa903fad84267f
 EBUILD parse-type-0.3.4-r1.ebuild 937 BLAKE2B 05c8a53aacb7800da4479d1fd3c197b551e5a3b40f185b4d6002da75b28a8a9e4358fcd7e986163574bf70ce14072c89117568b56041658263ec0ddc2ac03efb SHA512 33b8f0300755e3b34fc09e9c291392c82d61bb85e4c7b59b251e5f50b31c93ac9933c82b83a955eacbb0c07b1a82bae5689f7a3b7ec9e7b9e52981dbfd741268
-MISC metadata.xml 270 BLAKE2B c2f522ac83cfe77da8e1a7e8e87ad5c482b3e769aad8c8686eec62697adf5a792f9a39a9d97421da8e80f52f606eb83dc045f36e4be23dee68782f3158f9089c SHA512 292fcc6f42176c9ebb9544f9738692680980b665d4333ec55ba2dbd9bf068b194cdc20bd4109a96a8f38db00e8f69ab72be51b693dec97fcd1d61f3fa0cb7cf4
+MISC metadata.xml 296 BLAKE2B a5e861ce115e7ef1373426310befa894a13fe3c2f9ba48d62ae2d4e4a698f91e5bb8197fca46937fbe318d81dfc1153fa7391c55e4b35fdc7115d547c54d7170 SHA512 f8d5beb789d58e183e322fc448c086000a3511768673264586efa27b2d966cf3dcf91ee6ed652edca2a2f4fcbdf2ec2232007af7d7cf380e58396ee3ec075403
diff --git a/dev-python/parse-type/metadata.xml b/dev-python/parse-type/metadata.xml
index 9244c15504d4..958b45bd9ff9 100644
--- a/dev-python/parse-type/metadata.xml
+++ b/dev-python/parse-type/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">parse_type</remote-id>
 		<remote-id type="github">jenisys/parse_type</remote-id>
diff --git a/dev-python/parse/Manifest b/dev-python/parse/Manifest
index b2bc59bf06cf..d86fa9b5817c 100644
--- a/dev-python/parse/Manifest
+++ b/dev-python/parse/Manifest
@@ -1,4 +1,4 @@
 AUX parse-1.6.6-python-3.5-tests-compat.patch 1694 BLAKE2B 661b7bf97d4bbb392ad5b83aea092075765d133a655e1927ba5094ec3004d6120bbacea20160241d8d20f3210388a58fe54784662ca28c6838a61370a751ff44 SHA512 ed4fa6d689304798f289c11d441bb9c66c21dbde115da4f8bd87f538c5a1ccd7c1ea277ccca6d4c2b2e3560335130213b3d24bfbd6896033c55bd75f01424857
 DIST parse-1.6.6.tar.gz 24638 BLAKE2B dbf1844b09bfdd0fb8ebaecba14f4a6289de315f4d658eac4853696e11b32dc9cda5837ed654072941846f112b480315961d9660c7d111127f57aac8f2c30250 SHA512 fae467b6f6e35f04d9e501162117423506701d101b2265e941b5b34420e833a0f4dbc44f62c33d51836a62ef51da9b5b8a3a1d39b3ec490f9eb77c5b6f302cdf
 EBUILD parse-1.6.6.ebuild 547 BLAKE2B 2b24927a26aac92c7830fe81eb04bcc30558b4939eedf1b35de34bd67f59395008565db4dfc0abe8619c7a90ce5fd9fe3dd9366f2da1872db6fe830c6f56f9bc SHA512 c4c27c74bed52dc5cbd02069bba8b91052740a9bc098f142785aa728d79b6d1385cbfcf0cd44e703aed220eb1607e427f8f1ac9bb1e023a1d130410c44cb24c6
-MISC metadata.xml 265 BLAKE2B 15707d5b008687ee20cd174ab1dea69d3082fec1097e71079be4455b9d4590e9b5a3f793ce1a77b5a5d9ed269c35c2385e130018373a988bc0fd54edb43af21f SHA512 d1fa77115df5e5c3ab3fbf26f7ef5255165c179812e574f483ef52099e993812ca679530c00de8047c458c6f49dde4a70e335870eb77e3b313355a44192bb514
+MISC metadata.xml 291 BLAKE2B 0b6d9b55b3bbae1af67c0c99ea01cacaa7b5bf972c5ac46668e8ecb322150fd50832b8440ab0363e1dcb393daba2815a6df572c29e9f8efef353aa14196852fd SHA512 cd6f34b051251472999c026cb7af5e2d199de4b632dc5b39bd7ff149af2664d370e3b835505da730d9287034130ae18f66b1293039500ce2b1aa54fe7c582677
diff --git a/dev-python/parse/metadata.xml b/dev-python/parse/metadata.xml
index c8488c4b44e0..33e17f1c6c8a 100644
--- a/dev-python/parse/metadata.xml
+++ b/dev-python/parse/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">parse</remote-id>
 		<remote-id type="github">r1chardj0n3s/parse</remote-id>
diff --git a/dev-python/pathtools/Manifest b/dev-python/pathtools/Manifest
index 87e90af96107..5f7e90c94c8d 100644
--- a/dev-python/pathtools/Manifest
+++ b/dev-python/pathtools/Manifest
@@ -1,4 +1,3 @@
 DIST pathtools-0.1.2.tar.gz 11006 BLAKE2B ad257edd9a62477a07343ecd6786c24ad2472da8844e3358980973c9daee9c52f3317976b2971f9afe33bfcd0dba1c1497230b105fd364a45c0d138abec41894 SHA512 e014cb17f3d61ce7979e36663f94a44d4f1116c35e3d2ec8c4ac207a81935dde246495ed06597e6edade1509f384b9e5729a97ffd3eec31b1d1c4a8372d1dfd7
-EBUILD pathtools-0.1.2-r1.ebuild 457 BLAKE2B 391e40c3a83cb8ff9a448439837920461263a0812404128ba299897afd4ee0ccc383874085b11f5a5c6fb3b89412ec805cdbd5ffb2c4e107c01f5d679ca1ce3e SHA512 751a4a38380b1899cd7a566302c58e8f33f6f1fc7cd90d060ca474b0f57445a9881eef6c9d89e7d93ac4088833b5cbc46c413a30ec8c39e3339839a8868854ce
 EBUILD pathtools-0.1.2-r2.ebuild 468 BLAKE2B d88dc6de0870989d92ee5e206acaeadd7712be83c19395733c2709d1e1aad864477ef75ef3277c5a2f0efbae14e464d031a0beca11c42c2fa57f6dee8ab0b956 SHA512 85fd10027beab21dbfb962ec59af6616a046aa9e347a6d432767fa78c8de033404f17fa1bdf2d7a0bfb91e771ab8a3ecb25b5c6651aed7a0ac0ad281e1a1c9a4
 MISC metadata.xml 312 BLAKE2B 655db0f4e05f6f22057f5b40c38a0790aa4878190ba1f2eddd703c2a13a1d8010282517cc827bdf2f48597024c9069ddff7be23a4f914899d5c432115d150c57 SHA512 f1187bfa80d1a0e64b04e3d474d8d805fa73f7c23ad412fdde4a51f347268c764d1f808d9c9b1f191c661e777dcfe6aaf0966bf13ce7ea9e8c02f6a8e5249851
diff --git a/dev-python/pathtools/pathtools-0.1.2-r1.ebuild b/dev-python/pathtools/pathtools-0.1.2-r1.ebuild
deleted file mode 100644
index 445b1eac31d3..000000000000
--- a/dev-python/pathtools/pathtools-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} pypy)
-inherit distutils-r1
-
-DESCRIPTION="Pattern matching and various utilities for file systems paths"
-HOMEPAGE="https://pypi.org/project/pathtools/"
-SRC_URI="mirror://pypi/p/pathtools/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index a8b1b378f296..4ff6c1f939f0 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -4,7 +4,9 @@ AUX pillow-5.4.1-toolchain-paths.patch 516 BLAKE2B e794866ebfb5db41cba72def46907
 DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39
 DIST pillow-5.4.1.tar.gz 15799745 BLAKE2B d9e3851a80a1f94d7292852b9ab806d9a26870795f499bb109a440e64c07112055a4cd382688b977f3c3ae76ed3d6fd38460afff594f964338afa668d288e4de SHA512 20b75ab50df7e9545c76d66ad585922d1f86fbcf8df9d2566882ab8929c3122573b9ec622766523ec46f5e7a98740cc78ff192e3e8f08ab0b77a7f2b033a7f62
 DIST pillow-6.0.0.tar.gz 29205509 BLAKE2B 83e2d1abeea468b7bf344ea5003940b14d6c69649e02a954c0b3810fc5d77288c361fb40747171176d29843848d802b783a2b0c0de15476462f17f15552298fa SHA512 c5fbe1432d576fe4a70a15fa7a70a446ccbcb247fbd4c3605917fa26a6345eb9319c0153dba7637d521c358963f2f06f525219aa1af1502da2565d54dceef4c5
+DIST pillow-6.1.0.tar.gz 33523149 BLAKE2B 305613aa1f444327c0a70a9e88b51035dc87c17af9d0dd4be47192eeef1b496ba0da3675d9fed5dbaed1bd9a5f2c739370bfd7d1292d7db27230c7ad60b4db14 SHA512 b531644d7214f624369ada12a953c773a0009eaa50217e91aeae30b1ea065c685c7ad331bd9d5e952cb25edfaaf4e8255025004b4c83624ecd2dc06f3501d60a
 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
+EBUILD pillow-6.1.0.ebuild 2776 BLAKE2B 79e2cb6931059aae03c1bb4c5e52e2dc8c4b717c525f1d4ce3250ca1800f2a90d7db0fe7ef135bdc301e554ddb4f582ac83c936e0a34afdffcf192f9544cba18 SHA512 005db4fe72b81c9a2fbe1edcb9a917adf4b887fdd6d887da8e1180b55099d7c7042775cd50d172c25005652c699a80a9b5f133834e55fc385a07cc6d11b4a936
 MISC metadata.xml 476 BLAKE2B cb4b4524b417cf9ab8938074443a4d1519ab16d90d459878b45fdaadf46b75d4454cc6718a2963fc14db0948ada0cc92c89e53ee9a830f43228b54c12cdff28b SHA512 a3de4e446d11e115ff85062a12866ebc5988079eabb658927fe2f319df5b0e944ca751d1070b051f44733ab22533496b2b006ec831b99e04f81fef55900cab6a
diff --git a/dev-python/pillow/pillow-6.1.0.ebuild b/dev-python/pillow/pillow-6.1.0.ebuild
new file mode 100644
index 000000000000..ca751b2624ca
--- /dev/null
+++ b/dev-python/pillow/pillow-6.1.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 toolchain-funcs virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://python-pillow.org/"
+SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
+
+REQUIRED_USE="test? ( jpeg tiff )"
+
+RDEPEND="
+	dev-python/olefile[${PYTHON_USEDEP}]
+	imagequant? ( media-gfx/libimagequant:0 )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		media-gfx/imagemagick[png]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+python_configure_all() {
+	# It's important that these flags are also passed during the install phase
+	# as well. Make sure of that if you change the lines below. See bug 661308.
+	mydistutilsargs=(
+		build_ext
+		--disable-platform-guessing
+		$(use_enable truetype freetype)
+		$(use_enable jpeg)
+		$(use_enable jpeg2k jpeg2000)
+		$(use_enable lcms)
+		$(use_enable tiff)
+		$(use_enable imagequant)
+		$(use_enable webp)
+		$(use_enable webp webpmux)
+		$(use_enable zlib)
+	)
+
+	# setup.py sucks at adding the right toolchain paths but it does
+	# accept additional ones from INCLUDE and LIB so set these. You
+	# wouldn't normally need these at all as the toolchain should look
+	# here anyway but this setup.py does stupid things.
+	export \
+		INCLUDE=${ESYSROOT}/usr/include \
+		LIB=${ESYSROOT}/usr/$(get_libdir)
+
+	# We have patched in this env var.
+	tc-export PKG_CONFIG
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+	pytest -vv -p no:relaxed || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	python_doheader src/libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples ; then
+		docinto example
+		dodoc docs/example/*
+		docompress -x /usr/share/doc/${PF}/example
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index e352aa90b990..d6c9f9bf4c81 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,8 +1,11 @@
 AUX psycopg-2.7.3-avoid-mxdatetime.patch 1832 BLAKE2B dff21302f85dc05be27147d1a53ac525bca24cd9c2282edb92168ba38e73c38bad9f5a8b24910a690105bb4f98888e174f8d7c2a285e6e42efb36a45499ed02e SHA512 1c582abe153d73bd71cdfefff4293f2c497a5818fe2ea7e0deffe71d0acb89ccde8e20aaa33acf3d47900743c548eecbf01db24b01abe35b5ed60ca20bf4a658
+AUX psycopg-2.8.3-avoid-mxdatetime.patch 954 BLAKE2B 073eca8e49dd4d7fd2ec920dfe52e255d3fbb0e9975cd0378574d7c6f6f097c4b0bae0f4eba74e939b15c19ccab1dbe84d28f434830d38db6b59e18246c3f2c2 SHA512 9e0ac41a70002bdac03628ac15b84edd3e67e589f8ca145242018aab03fc42b8befc1c0330f0111d01b239dc00b6ffc29965ba3c18ce0965cbe9e7b31d1fef4d
 DIST psycopg2-2.7.4.tar.gz 425331 BLAKE2B 9d256ea340e4bace53981596d9d42863ddc9c8c079579b0621d8043af34daade05b9cec5465c6b3990f537a4350d9cf60a43062a0aa34db1f39b336296b32d3f SHA512 e78db528a4d3b897e0d8d38755179082dacddfb2d10bda963fc3836548991eaa0d4c1b8f81b329b15f4e685046c39e6f2a352b6c47b1da42af3a262094233034
 DIST psycopg2-2.7.5.tar.gz 426358 BLAKE2B 301bd4c6ecbc29b1b02e477ffd3576c4bbb00142998a85f5a79678a96b521098a8d0bf75779ab7ecb082c6d374cbf41cc845dcba0e1413b98621f67f9b139135 SHA512 5bf85b6760871f904b6b570ea454f99b72cf97acf9cce10b63dc7b6b0b18913b50ad4f24c469d101c54de6ad6100f1cac3c58225076b5e584a677f5ab4170a93
 DIST psycopg2-2.7.7.tar.gz 427474 BLAKE2B bc721b721693bc5f560a4829e84715d15e8c14523ada00109c7d7ba916c91928082fff286bd3c2ff5987c0436443128d1408ac9de073ad538b1e356fc73aaf8f SHA512 032344957c00bf659ca5e46f54f827a6d79809e370d661cd349e2ce935873359bcc4f440b74c6f14658bf1cd9598b6d884abae507fd33db9e07b01fc87967fb0
+DIST psycopg2-2.8.3.tar.gz 377333 BLAKE2B a4f22fb4dfc5492147bee198c587c5c5e43e197e5abb60cc7d5d7a006d91ffd22e35fbfeba35b8d36322f3802073fc105cb8270d436a3ad4d52b1c3c41ba39b1 SHA512 74268f6d05922c968d46ad62a49b4af54dc30463daa67cc0f32d5930c366596f9a1b2f368f2b38c8a9d45bfdcffb13be469a5cbf3911c62d163bea5c7a3ad928
 EBUILD psycopg-2.7.4.ebuild 1555 BLAKE2B 84dc8e350573ca5a2dd6d8a19e2d5cfe12de395a8c7a9f7da4aeb675d6cb9dae4898c0f8ffbadde71ec13835fd795df122b5f41434d2a3d8014c11bdc4f6d0c2 SHA512 a148a9135cb0c52498850266bceda6e2c17fa4200be31b8116e7e1bf76108fc92cb771e14b04c66e845eb306d8d7f81e98aab6696550cd5694b552c397ed8f04
 EBUILD psycopg-2.7.5.ebuild 1566 BLAKE2B 3e506ec0eea0272920049c3afad528b65f7ef3107ed0e28163afe3ed619a48b5a5a2ac637fdccde26992f2bb020d98f4a3f27c5dd8a0c7506c92957ec9a5c5c0 SHA512 18382ad0ef2488d73d93173a71bfe20614e478490c814dbec077e9be40a8e9eeb17775331cafad33e37008db47c5ad1a27c4ec7cb92d6d8eb262f5035e837839
 EBUILD psycopg-2.7.7.ebuild 1557 BLAKE2B 0c98bf10fcd08c5a7ec7f4413827a68d12e9e3e0f66ff94bd0a06482779ac3c5d045a904de62435731ef933138f03e5eaa553e487d1601d872f171770792b8d4 SHA512 857d953640a880ea792b38a7b6bebba38d34bf024494c301a1354bb98d49c6337323eedf91a138e2e69b2bbdc9770b309434f971ec8c68f0be8fd9a365a4b239
+EBUILD psycopg-2.8.3.ebuild 1567 BLAKE2B 73ec01602ed4301a165f436328672f37d33a856e77eb517ba3f13b499127560fd7cf1eaa2ec2dc6462849957856a9ec000f2499064cc5e4f51bf02928e5a26da SHA512 3bb47e98eb4b2716cb29f61c6aa5513b1b69afb7eaf50dd3ffd0b2c9fb2cb297eb5e66b6812aa4351ee582182ce873b77d8f8a88c4507ff012cbef55eddcc305
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/files/psycopg-2.8.3-avoid-mxdatetime.patch b/dev-python/psycopg/files/psycopg-2.8.3-avoid-mxdatetime.patch
new file mode 100644
index 000000000000..3475bf31795e
--- /dev/null
+++ b/dev-python/psycopg/files/psycopg-2.8.3-avoid-mxdatetime.patch
@@ -0,0 +1,24 @@
+diff --git a/setup.py b/setup.py
+index c1f319a..c44fc69 100644
+--- a/setup.py
++++ b/setup.py
+@@ -525,19 +525,6 @@ parser.read('setup.cfg')
+ 
+ # check for mx package
+ have_mxdatetime = False
+-mxincludedir = ''
+-if parser.has_option('build_ext', 'mx_include_dir'):
+-    mxincludedir = parser.get('build_ext', 'mx_include_dir')
+-if not mxincludedir:
+-    mxincludedir = os.path.join(get_python_inc(plat_specific=1), "mx")
+-if mxincludedir.strip() and os.path.exists(mxincludedir):
+-    # Build the support for mx: we will check at runtime if it can be imported
+-    include_dirs.append(mxincludedir)
+-    define_macros.append(('HAVE_MXDATETIME', '1'))
+-    sources.append('adapter_mxdatetime.c')
+-    depends.extend(['adapter_mxdatetime.h', 'typecast_mxdatetime.c'])
+-    have_mxdatetime = True
+-    version_flags.append('mx')
+ 
+ # generate a nice version string to avoid confusion when users report bugs
+ version_flags.append('pq3')     # no more a choice
diff --git a/dev-python/psycopg/psycopg-2.8.3.ebuild b/dev-python/psycopg/psycopg-2.8.3.ebuild
new file mode 100644
index 000000000000..685d96de02ed
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.8.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="http://initd.org/psycopg/ https://pypi.org/project/psycopg2/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc examples"
+
+RDEPEND=">=dev-db/postgresql-8.1:*"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-python/pygments-2.2[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
+	)"
+
+RESTRICT="test"
+
+# Avoid using mxdatetime: https://bugs.gentoo.org/452028
+PATCHES=(
+	"${FILESDIR}"/psycopg-2.8.3-avoid-mxdatetime.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+	! python_is_python3 && append-flags -fno-strict-aliasing
+
+	distutils-r1_python_compile
+}
+
+python_prepare_all() {
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc/src -j1 html text
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r doc/src/_build/html
+		dodoc doc/src/_build/text/*
+	fi
+
+	if use examples ; then
+	   dodoc -r examples
+	   docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/py-cpuinfo/Manifest b/dev-python/py-cpuinfo/Manifest
index 140aa4b995e6..faafe8c071a5 100644
--- a/dev-python/py-cpuinfo/Manifest
+++ b/dev-python/py-cpuinfo/Manifest
@@ -1,5 +1,7 @@
 DIST py-cpuinfo-3.2.0.tar.gz 76019 BLAKE2B 2a0969911b385e51ead94a92b89a21bf6ebd6a49ce5229329265ec0611fabe1180cf4ac617c1786ab25605fbf11463e85d74a02195cf01ebc40a5f8d1350f83a SHA512 737d5a73d6991ce5cb99125951a75492f48177030986270bbe7dcc0efb4e3200c9957bfbe51bd5a7555bfa8e62db68c3a5227e47e5e6bb2115ff2c10c0bfb688
 DIST py-cpuinfo-3.3.0.tar.gz 76052 BLAKE2B ffa9d53ccca034b8b4707cc60c8c38b66bd76101e4c6c8d8bf5de743904270a4b9236c0f03192336c2fb32fefb665c5a6d5587639a408ff0bb9183b33f9c3ce7 SHA512 b31ebfb0f066303813d699a7aa5bd5b8d4e0b3b6e8422dfb4aa53c5b64d2234c5275fc293b3eb3ee72752691e023dc94fc013ccf6a0251d307c4b10619135524
+DIST py-cpuinfo-5.0.0.tar.gz 82118 BLAKE2B 94df998e053de04cf7b470799eb7595b5a398bf7d2da6417e3f5f6313a3e1152adfa5ef6a67461cd10d521be88d0a9ccf9495715a23cefb557f673f10dec7468 SHA512 d3a22ffdc4d1668a58330016e3297e57c07f6380e544497b1ad9dfcf0410b000f69418bf1cb9a434a2ffdbc8f17be89a25d33c65817913a823c6e181df6b760e
 EBUILD py-cpuinfo-3.2.0.ebuild 602 BLAKE2B dd1ba74bf0f689cf122d8a12867bbfba4be903e39e848a9792f4f8eeef5c9495ef7586d2e02d6d524f1cdebf39f048b2c521daafcfd8f7862b769721ac1e2730 SHA512 2b2acf4fec7185161cba7219cad55099fb8e169b309b7a5ef2fa1a5f64a3f149b872f8bef8857e6a418bc91de650cf206a5ca8cae10cfd573a701256a8f54c3a
 EBUILD py-cpuinfo-3.3.0.ebuild 602 BLAKE2B dd1ba74bf0f689cf122d8a12867bbfba4be903e39e848a9792f4f8eeef5c9495ef7586d2e02d6d524f1cdebf39f048b2c521daafcfd8f7862b769721ac1e2730 SHA512 2b2acf4fec7185161cba7219cad55099fb8e169b309b7a5ef2fa1a5f64a3f149b872f8bef8857e6a418bc91de650cf206a5ca8cae10cfd573a701256a8f54c3a
+EBUILD py-cpuinfo-5.0.0.ebuild 604 BLAKE2B 17b40a01066412547b4eb4638e5712ee14fafae722df5ce3203add2c6f3233d81f3416ffd0cf5ebb42e27eb31cf18355d274e6f9d6417f2d3647f4ce1ca8b75e SHA512 5534fb37118a7abba64cec02cf58b3274128e28c21304c3297cdf46fab3eb5fbe0341c6f62abf06183985bb0bfe56f061da91f7026c0db56057110c0d38f0e07
 MISC metadata.xml 531 BLAKE2B ae246808bbc91d82d4d635474be548d3a3e5d48cf45dadfe17e13c6b3e766871106c329a1e478ce7f65478cba17bc28673b459c83b6bbe779891a7f86d605ce0 SHA512 388ada1a9c39b57369dfc9f164530a871801149d44a1439679509fc733b90f33256e8f9a5b5ef22af854e5aaa7c9e1857e87943f25f0c4e06eff2c6b64d440d4
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-5.0.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-5.0.0.ebuild
new file mode 100644
index 000000000000..88a18ba0cac9
--- /dev/null
+++ b/dev-python/py-cpuinfo/py-cpuinfo-5.0.0.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=( python{2_7,3_{5,6,7}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Get CPU info with pure Python 2 & 3"
+HOMEPAGE="https://github.com/workhorsy/py-cpuinfo https://pypi.org/project/py-cpuinfo/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( ChangeLog )
+
+python_test() {
+	"${PYTHON}" test_suite.py -v || die
+}
diff --git a/dev-python/pycallgraph/Manifest b/dev-python/pycallgraph/Manifest
index efe9384008b3..1cc229f186db 100644
--- a/dev-python/pycallgraph/Manifest
+++ b/dev-python/pycallgraph/Manifest
@@ -1,4 +1,4 @@
 AUX python3.3-tests.patch 3268 BLAKE2B e6784c758e83ede0edadeae1a14d1e85657db1e715abf1a66562dd54e902cc8d2dd592f52723b6a79f14175d99e79944b41205ac3db6d30d07af42d2e13b3c50 SHA512 274b3af41f80058e1bbacf681b8f2ca7e09069dfb7f0a333cfc7ad417a1a88e738abb0d0ad340ab1b342076b7f331977617dce8b46bcd6e158764ffc09ee6a94
 DIST pycallgraph-1.0.1.tar.gz 458254 BLAKE2B 51cd70d131fc3ab1c702d40c6b411595f26f9547fa2d28dbfc38f4e4b6eb7b56d32c0f2c1c024482376ed4f91299f2a7e3afe099838c045912b18d60580cff8f SHA512 75a20cd8c50f070c961466f89b70384c914129c8ffcbca3ffde8c4729cd5f8a3dc94c4a33d54990e5cb9e502ccd1038c64e878da84cf832065fe4ece74356e2e
 EBUILD pycallgraph-1.0.1.ebuild 1817 BLAKE2B 7e5a152e4b6e6ccc402ee21fb010c4e8a8cc3fbf02f6a8756f7053e8b96d90f743510a628f8f03e268511c2f67ef449762164d070beb575c971318371bd6c66f SHA512 662d009053f1cf0d5c84fa90eb55b4ccf084b59b1228cfa5b785c9aa9333d59dfc88c326cf1ad8663a7da27dfaa0d47e03de206e6a99a1ebd44b3c7e6dcd0766
-MISC metadata.xml 219 BLAKE2B 2f18b5734c8e48a893f628fe312d2c2fa8a43263deb0648d15ffe7d6f0df272ee966fc8a5304d3b085934ee13bc946a0c7476912e23ff2e9fb8258bac7e67557 SHA512 01ebeee6ddaf645337c48e50f68b809e50de83db52ee5d23c1c359d28c1e62b2aaae62a5c72d9b1a675fe2eece6f9195bf276e32e94600000de6375c6a48899a
+MISC metadata.xml 245 BLAKE2B 794e70d186dbd6abb42251821d227dd36c04540fc5e27b414cd0dcbac013dd6dc3aaa96b8ddfce6446c01f98e009c7277adad6fef1cbb89d625b2491b85d8ee2 SHA512 de5888d4711d9b5d1f3007aef7d96600634f4c88f27e2165988fa51ed5a70d23a2e6cac16400483cc17828622089e10e445f45617e2b29a9556e1bb9b0bd3a8d
diff --git a/dev-python/pycallgraph/metadata.xml b/dev-python/pycallgraph/metadata.xml
index 202e1572957c..ebd15db30675 100644
--- a/dev-python/pycallgraph/metadata.xml
+++ b/dev-python/pycallgraph/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">gak/pycallgraph</remote-id>
 	</upstream>
diff --git a/dev-python/pycares/Manifest b/dev-python/pycares/Manifest
index dc0c85230909..a619ce747838 100644
--- a/dev-python/pycares/Manifest
+++ b/dev-python/pycares/Manifest
@@ -1,5 +1,9 @@
+DIST pycares-0c831407bc32c6e78a80c5b3d7865ba4c7ac26df.tar.gz 215641 BLAKE2B 36aed2a16138dae5ba05a22418509cbc8cfbf7878d0f27aa2c71110407c5aaaf48445d29ceaa4c4f041f01bb4f4b408c81b2cf5c9f7ba4470dbf4317457f93a0 SHA512 0ef0edd124eef7f897e0bf8b09ffccefaed5ea9eab149cb11c2874087acfb14f15efa6ff6b3967f285b8910adce4b8c228bc69b8ed54c8a6392d3435fc57875b
 DIST pycares-2.1.1.tar.gz 226787 BLAKE2B 26716906e78a3fa16bcbd143f63e633ffe4664706b2230f698ea933c15d057f92a0fedc45927743690e9ef8f84191e40f4215878ff2845fd1fb4bcf91f49b765 SHA512 c3524a49f5abe4222c9371ca269918eecf30a77bd52258187766833b4663be861678ebe6f1cb2f50e824d36e75938162d5528abd5445c477f23fb85c24572403
 DIST pycares-2.3.0.tar.gz 224941 BLAKE2B 9ab59f8f7294930b5ff97c7340c3f64cd039c4b291b7b33d00da85168638cdfc75552508a72afd91db28c4c1b823a018b45c346a3daf8da15d5160fd691b6c4a SHA512 dc707ab0320e03fb20e728e2e2e52e92ed3388afcf19e4553bc2a15c33a129abee39a9bc423edb7be7113d42989286ab8e8ad48699cc7433a6d8823460fd4678
+DIST pycares-2.4.0.tar.gz 214021 BLAKE2B 481d46e9a5726d953d0dcb391a549ba4177e5ac1758a0ecb25bf634b9eb6baa2fbb0544874a78ae46e30a1dd4be8a981f5ebdf1b36cb9aa2e42370074731319e SHA512 7770a2b1fd69bb800019a292e5c9fc1f737b044fb4ca5166ead197da3515f2edac55f947a68f3505c9b404745529287114667d742162c98f2ff84b2c330ef295
 EBUILD pycares-2.1.1.ebuild 602 BLAKE2B ce0cda0f1b027951c663a279d280937ac152664938c5e5fedac4db04f660d4d2d33e72f7d51515b2fe01ac2d2ff2374446336a1d44bd12913b671ce471189e9b SHA512 a5b6ee83309f088e87daff32f42a35c7cc0f3938a8f8b46bda754601cdd1d78db20846355fdef7e72e3af576e10af536665d792f2d75f383e228ecd15eb7a7b1
 EBUILD pycares-2.3.0.ebuild 602 BLAKE2B ce0cda0f1b027951c663a279d280937ac152664938c5e5fedac4db04f660d4d2d33e72f7d51515b2fe01ac2d2ff2374446336a1d44bd12913b671ce471189e9b SHA512 a5b6ee83309f088e87daff32f42a35c7cc0f3938a8f8b46bda754601cdd1d78db20846355fdef7e72e3af576e10af536665d792f2d75f383e228ecd15eb7a7b1
+EBUILD pycares-2.4.0.ebuild 600 BLAKE2B dbb606d105ad2e232253b042ecd123ec8b302fa064ada4518e3aaf768954c8de6188341e69bd957e0a67a75e35b4b7f8d312e3f42b56cd5fd9fc345a620c8733 SHA512 ad3623df4d977822230d91d8ed2ab3ee4c5fd92834d904afa7d2599bc9271d77b255eb4112d324bb50c6efea8941766c5857f6386a9eef5ff7ea4fe39896e338
+EBUILD pycares-3.0.0_p20190709.ebuild 791 BLAKE2B 7c26bae47661bade0de214a0a309a212d50b3c9cabafc5812d4768edc2c320a116f52fbbeb1e5f5e46cdff5e597cb11456264f370394914265fa59a015986fc1 SHA512 f7a18d40beff2ce2f713f904a4ec806215dfb6e57354b7be6b3213776f412f56a60d29837c12f798af3df4dd644f37459fe655d3736bac06babb847b394aeaa2
 MISC metadata.xml 342 BLAKE2B 673fd0795be11f8ede70971b4313e5b9cee3aec6b93ebdc38f4454f0c6bb024c8128598208a6ba9777f52b584a9faf71f386de2e33aad2b96bba1023c6599046 SHA512 fdd177da9082fc650173331be63823ef6eb8dd195c526c3f5e7a38521f3203fc12ca591ff2ac4bba5fa64aa2ac8a9b419385285991696c9f02dd29bede7784a6
diff --git a/dev-python/pycares/pycares-2.4.0.ebuild b/dev-python/pycares/pycares-2.4.0.ebuild
new file mode 100644
index 000000000000..63fae6d646f7
--- /dev/null
+++ b/dev-python/pycares/pycares-2.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface for c-ares"
+HOMEPAGE="https://github.com/saghul/pycares/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# Tests fail with network-sandbox, since they try to resolve google.com
+RESTRICT="test"
+
+# uses bundled/patched c-ares
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${EPYTHON}" tests/tests.py -v || die
+}
diff --git a/dev-python/pycares/pycares-3.0.0_p20190709.ebuild b/dev-python/pycares/pycares-3.0.0_p20190709.ebuild
new file mode 100644
index 000000000000..12865ccb31f9
--- /dev/null
+++ b/dev-python/pycares/pycares-3.0.0_p20190709.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+EGIT_COMMIT=0c831407bc32c6e78a80c5b3d7865ba4c7ac26df
+MY_P=${PN}-${EGIT_COMMIT}
+
+DESCRIPTION="Python interface for c-ares"
+HOMEPAGE="https://github.com/saghul/pycares/"
+SRC_URI="https://github.com/saghul/pycares/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# Tests fail with network-sandbox, since they try to resolve google.com
+RESTRICT="test"
+
+# uses bundled/patched c-ares
+RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${EPYTHON}" tests/tests.py -v || die
+}
diff --git a/dev-python/pychroot/Manifest b/dev-python/pychroot/Manifest
index c7cf9ff43206..11863508dad9 100644
--- a/dev-python/pychroot/Manifest
+++ b/dev-python/pychroot/Manifest
@@ -1,4 +1,4 @@
 DIST pychroot-0.9.18.tar.gz 32879 BLAKE2B 769b3347bae3f7dfb47c0335015cc898ec851a3d45f774a4e21aeaf9b8d7937331bc69aa5bcbb298e76e7e51ffc2e55f049336fd90f6b08fc3bba87089f2205d SHA512 59c8750c9ba8d601eca485079c04d4153bba92531dbd30fba0104694e4435d76e65b762b76ef89a6a6f8908dd6054d1d95fe4be74825ac1c5a56e473370dfa41
 EBUILD pychroot-0.9.18.ebuild 1142 BLAKE2B c8f1f4eb6f92378d0efc61c95d6e8e8bcaa1ffebe44db08d30b5552495f34ce84d4ce8e45ffcf753aac2f7cc01d26c763fc5cd829a7b53b65c322ccfc7958838 SHA512 be1db019faca07cefba2d1ef02b03792383ecd53ff9d1ced5e79151809bc6a60c258933718978b44f810cdde254be82d4c95c3c4b12e58249f05c3f9020326e3
-EBUILD pychroot-9999.ebuild 1077 BLAKE2B 9dc673b8688ea55b8bf5774b0c6e5d54201796e443e976dc42e4f45503d231562b02ff010aa984f157ff13e3c9a883462f828963615250633a4b68996fc06ca2 SHA512 1289c367e4f698670021dc7ee154a2dc0d12d48545793142378541214fd5f271fb8f2a47c5cc1b1e95b876df0bbd24a217d5e57121ad57d0bcb7f0e819f50c66
+EBUILD pychroot-9999.ebuild 1075 BLAKE2B 99fd4195e1ab0e2804c64ccf69b19f32e34bcf0bb1ad86d4951529d597ac8b7f8c15c99e20f8a4837a44f3f5b298db5eb0ac49cacc67f798ea7b87b306157a4a SHA512 ace9b23a4ac509dcc3c9da7f2305ac71ce39eecba477a64e945a262259d1ec7ebe1346aa54604395a0b72573bfab5d84cafd63a458d6840235f4ad990c048e2a
 MISC metadata.xml 337 BLAKE2B 3c60605dbe9296fe7f6c285123fa649b47c4997af6f715cefcb5047817ddff55f15c4813c2c33dcffa4e771ab3d0afb83bd88506d915e313b237e51ca4729c70 SHA512 4b0da70f35cd4983f6f5cd8aa02e5555b770d3bc2b7e90a8e8287c64593fadf1fe532cef6becce24de96766f94d24d8ec731ac3acff6f42a2c7b06c3e1e1e4d0
diff --git a/dev-python/pychroot/pychroot-9999.ebuild b/dev-python/pychroot/pychroot-9999.ebuild
index 6ba82dd84eea..bda4fc26dfd5 100644
--- a/dev-python/pychroot/pychroot-9999.ebuild
+++ b/dev-python/pychroot/pychroot-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
diff --git a/dev-python/pycipher/Manifest b/dev-python/pycipher/Manifest
index 2cb1cfd90a48..fce775755092 100644
--- a/dev-python/pycipher/Manifest
+++ b/dev-python/pycipher/Manifest
@@ -1,3 +1,3 @@
 DIST pycipher-0.2.py 9174 BLAKE2B aeb994f58452bb8e8808f48a217ceace8118e9fa378d9af9eaa68fd4a28aac0b7b0a23e9e66c28b4359f0e723a062007a82d5fa949f0ccd86f2c0b2a707195ac SHA512 ce3890184affc761fcac7a19284437ca5bd7fd5be6594dc6112eccc27971ca2a62cdff106bffea29c94f3dbc8bbee5f67af3bcd3a53838a1c7bfb19dad45dcda
-EBUILD pycipher-0.2-r1.ebuild 642 BLAKE2B 45097814c17357944d5c5c4dd0a0561185885a412cdbde9293eb43d0b7fb4bbdff57d961ce808172d8c679de5b95af1964c1b863965830cea5b51d700a96413c SHA512 ce55099559a090535a2229e0c600145db949a3baef66dc37cb55b646eec2ba758b03cd4336fdbe77edffb24a79488847716d44c8aed0e8487c7e182c9fcb4eb6
+EBUILD pycipher-0.2-r1.ebuild 642 BLAKE2B 0bf2d7f489d78fe8ba683f91d889c75c97c7e19752f6c4d9693f3ae1c60b910566b6b77c2ae3e2943b5f0957c27618317eee7a4521b3b86f9cb1fecafe30fb90 SHA512 70d0d1a2e129fa093b31ebb355a209deaf521a965b8507776133af368f7e3aff5bda72c75c2e8fd2446f531cc53f053dcbeaaf4f77a089fdd7482a9e598c2c64
 MISC metadata.xml 318 BLAKE2B c4e881cdabe022937899237f2e89fd584a1f667c9b051844449cf809a35c18854e083006482defa161a929c98b94305fc3af869e2f744cadee5286ae594d2895 SHA512 5038596f685157e786f10f04e89d766479e8f29262787969d36f2aae2d5ad8031e0233b3a2d1176e4d007cd5c01534d82863ea19ad85715dfb3b0cd979f53a01
diff --git a/dev-python/pycipher/pycipher-0.2-r1.ebuild b/dev-python/pycipher/pycipher-0.2-r1.ebuild
index 7f467f071621..47d3d3f7e748 100644
--- a/dev-python/pycipher/pycipher-0.2-r1.ebuild
+++ b/dev-python/pycipher/pycipher-0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.py"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/pycollada/Manifest b/dev-python/pycollada/Manifest
index 2a8f7f604372..accfd837708c 100644
--- a/dev-python/pycollada/Manifest
+++ b/dev-python/pycollada/Manifest
@@ -1,3 +1,4 @@
 DIST pycollada-0.6.tar.gz 3109963 BLAKE2B 92e9b3a28c959700fad4f4af1c6375f47b1a3cabb4ff3b8eec47a5625bd680d7088b7c9677e0d395f3be296d555996e5e5819f11ab82a0fa37b0c6fbec33795f SHA512 043eaafbd97a588897870e89202e281777094e4bf63ea56a979b6f7aef7ad549fc2b71f3b575c0b9c413bc10756ba36e02cc7cbd497a6cbaa51f06e99b34f0cd
+EBUILD pycollada-0.6-r1.ebuild 1367 BLAKE2B e59f3f30f4cf54192109ad6f490753ca86ed6a14bed4754b55f85193374ecb9a586d5b11bb8b502b159cbcae9ac690b766946af71baa9625b865f89a3f5db7c0 SHA512 3e6a2d5d17a692e763d70091756c77e927b73e37fe384df441e8663ef705390760b4d8dcaf4bb95035bee97259916cbce9e9c0379062f2d48fa3b6dcd8eb2fb9
 EBUILD pycollada-0.6.ebuild 1494 BLAKE2B 43e055d11615a8e4fb9e1ae447807daa37e3d6e636f6c4538c43050cba6262004b09ed704aa694b36981c9d214d98d4dae61be83c451044a9c1078a9d3a4eae1 SHA512 9409bd3e77fc969ab7b328d2ab73c1357993dbabe9d66e1693e0a6c3f1a3e8439869e8a6a292212a3a3fd6a4cbd6c6a8d32b924ddbd36debdd5419dab096a637
 MISC metadata.xml 559 BLAKE2B 4a6983c74b48af34e314f348e781cde10d22c7419f11932f40e28d47cdd0bd5b940cbff2431cba17793a813bc3d8a697a7cd3dea4e4d122834ce91fbff79fa53 SHA512 401e7df61bebe47ef2f8de32766df5013994c624285ff5f352195e0b316f2c831ecb43e513efc29b4a5710de6c810b8f80add2b57513d5cd5aa6904aebc0ec7f
diff --git a/dev-python/pycollada/pycollada-0.6-r1.ebuild b/dev-python/pycollada/pycollada-0.6-r1.ebuild
new file mode 100644
index 000000000000..47a0d7434951
--- /dev/null
+++ b/dev-python/pycollada/pycollada-0.6-r1.ebuild
@@ -0,0 +1,63 @@
+# 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 library for reading and writing COLLADA documents"
+HOMEPAGE="https://pycollada.readthedocs.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.2[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND} )
+"
+
+DOCS=( AUTHORS.md CHANGELOG.rst COPYING README.markdown )
+
+python_compile_all() {
+	if use doc ; then
+		pushd docs > /dev/null || die
+		emake html
+		popd > /dev/null || die
+	fi
+}
+
+python_install_all() {
+	if use examples ; then
+		insinto /usr/share/${P}/
+		doins -r examples
+	fi
+
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# ensure data files for tests are getting installed too
+	python_moduleinto collada/tests/
+	python_domodule collada/tests/data
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 0339081249a8..65d145032aa2 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -2,8 +2,10 @@ DIST pycryptodome-3.4.6.tar.gz 6968560 BLAKE2B f066199a9d05bd046303be62c43835908
 DIST pycryptodome-3.4.7.tar.gz 6483140 BLAKE2B 02368e2af0a12686cf2e635cca8e2c279f7c3b147a66f99e97cf04d829aa66eca5629f7cc8e76420970a4fa5ca5f97e7d2a04438b3a2ac5feb980fa96998b3ff SHA512 a328df1f3b2cfeccbb5984aca4c5cbd59e8a352c817e82411d2876b2494476027f63e61200b0cc87e9420e8b47e91fffe71865fb2c23a66da0276814641eaab0
 DIST pycryptodome-3.6.6.tar.gz 7137656 BLAKE2B 72a3dffa22ca4a90a6515ce0bb6939d4c11aab31793ca330523feb08f6529cbfdf3dee01b1caa4577caed1818c0227961e7f25d855b2dcfb09757beb3e0790b4 SHA512 ce03d9940c23ce59e19bcd795c300dbddeddd49756a4bfcc6933da66dfb8b7bedb8d6eaa2b01727c53e72c8e84dfcab2961d1580a188afa9c9451bd2099bdc61
 DIST pycryptodome-3.7.3.tar.gz 9285823 BLAKE2B 6f215a3bb0337f5b7469d92bd2d5b5a19ab4e2c6a8f119411c3a5bcdcf93307752d99113866268b5066cceda6470bd0fbe81b1b2f9e30b5e5e569c77ede087f3 SHA512 b5e09c08cd252cad4d76249be84ce29e16a9bba4f2c5e81594c24d9a39df0f3fc67822698497eb9daa4cb6a43311c5d5a2543f187a5d5f801288596c2941f08f
+DIST pycryptodome-3.8.2.tar.gz 12441359 BLAKE2B 857b77ce23bafe8a296d6fc2402914491818b51142d2a08aa882a0d4e15899bc2b18a6b69ffa904cad406fb3ce8bf029404ea178532cd4580ce118ec03311cd2 SHA512 361909d479b3478b72f2723f2c94cafd4e9d50c2d4156535d217f0566c534dc27435f64e9ba0cdb8215c2c3d3800ad1e0befde95d9999eed481f33f9ed2ba318
 EBUILD pycryptodome-3.4.6.ebuild 808 BLAKE2B b38ed83737b71e5a37c127ff797eb6287148c454016889e33251b1db22ed3ece1a72d37f9a4e205e0f7705505b94ad32377f2f235ba139b7432e7ba96837ec3a SHA512 82dfb29667405d80e1e4306d868eb4fbc7da0c5e4102a9f2ce5e350d7ab7fdf2c0b1b7239cb1f99e6abb81648391e81d78a9ce1335b8ef342b5edb93dfd30e07
 EBUILD pycryptodome-3.4.7.ebuild 870 BLAKE2B a3412a85ff38d5fcf607c8baec34bdd528b24e8d17265bb590850cc613b364972e2e32f8ae1436e0a5aa74abe05343df48ca5b55ef067ab8e5d7fc0e6699b64b SHA512 ba9b9e16ad102ab595a718a73a70d88619a3eefa03658057387d5e68db18e45a40d9b7d7f7651c7a1c1f763e6491eaa91a0d02471e012aaf2780e4976eb275db
 EBUILD pycryptodome-3.6.6.ebuild 903 BLAKE2B dfe2d85efb2a051414ec28505c328eaad25e25ac742f20a323d832b112ce618e8ba6b5f05c37dffb8dc8ade97ac180ce904459b3259ab2a1c8088a815460f96b SHA512 e65576817c779755b6d6e9a476fac64dd2150e5d39fdf13b793edb4ff748217670cf6385985f6453d088ce33efa1f3e4e3472079b8c2fe1a58983d53d5910265
 EBUILD pycryptodome-3.7.3.ebuild 913 BLAKE2B 4424d3b87cf05ddac40f79c699a7ddcf4531abbaeefcbf93b810f88e4cbffd1271d46911417f8cffd97ada7019608373a493cd3464e67c0eac53919e368e563b SHA512 ce69deabe6ee9bb66fb74c9ad0f78509cc0a9760dbc0ab434cacfc4a4ad6899f55edfb81cbe0bf148f5f351b6bb6d31746bc5b2c9c8296dfd2edb238a94f976e
+EBUILD pycryptodome-3.8.2.ebuild 913 BLAKE2B 4424d3b87cf05ddac40f79c699a7ddcf4531abbaeefcbf93b810f88e4cbffd1271d46911417f8cffd97ada7019608373a493cd3464e67c0eac53919e368e563b SHA512 ce69deabe6ee9bb66fb74c9ad0f78509cc0a9760dbc0ab434cacfc4a4ad6899f55edfb81cbe0bf148f5f351b6bb6d31746bc5b2c9c8296dfd2edb238a94f976e
 MISC metadata.xml 334 BLAKE2B dd22c5da46085356e8049d290266f66f81a648683dacb4ad33faedb86b890c911047f245eb96b418cbde226b91bd91567036ab31919ae28e488c5eb993418c1b SHA512 f314a41851c5f31d68a7fb93ab304aab44007756472c9f18c746a0b0a7bbf464a9f196559f4ecf6f8b68b265b7ba9ef571398e1893d316b48a0fa435eb7a1b3a
diff --git a/dev-python/pycryptodome/pycryptodome-3.8.2.ebuild b/dev-python/pycryptodome/pycryptodome-3.8.2.ebuild
new file mode 100644
index 000000000000..e1d8c93c74ce
--- /dev/null
+++ b/dev-python/pycryptodome/pycryptodome-3.8.2.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} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A self-contained cryptographic library for Python"
+HOMEPAGE="https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.org/project/pycryptodome/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2 Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-libs/gmp:0
+	virtual/python-cffi[${PYTHON_USEDEP}]
+	!dev-python/pycrypto"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index de249cd383d5..a286e196c817 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -2,4 +2,4 @@ DIST PyHamcrest-1.9.0.gh.tar.gz 57650 BLAKE2B c497688f03ec3b072d8ab076fc096a442d
 DIST PyHamcrest-1.9.0.tar.gz 376623 BLAKE2B 808c74aa4dff89467c126cbc0e18029a9504cb27bbf03662a90666f85c76d7d7617260f50d35acde3a8e9e437b846589423cbb3697f8ceb86d0b5b838c586ebd SHA512 3b8393d0079b619b208ec7f06ed5133c4ff9d9dba050f818adf56347fc2225fd1c85d60f3dc262b7b9722061f0b8e4966180b6b96245a371e578d0d51633b4b0
 EBUILD pyhamcrest-1.9.0-r1.ebuild 1340 BLAKE2B 4b0a5e0d4def1aa42f9bd2056c77f38d56bc51adbda9f0d40378f57154b45067fcfceb6bd6153a8b10c3a75d48831c6da0bcd1b17831e96cdb0f73e3a32dc151 SHA512 8e1434c065afb7cf5cd132309919a7518f6b62278792e00786d17a5e433a08203cd49a58f3e6d1b7fce0282069a2511ac5d13886e756ad61151c5a824e9b2bc7
 EBUILD pyhamcrest-1.9.0.ebuild 1222 BLAKE2B 5b50d8b8823b1d399ae78ca675b6ec9eeb7235b6fc1c59c70057148d0ecfaa3a47bb907411ada7a965d1ba42672fac671379e129f5d035175d05d01816b6bd69 SHA512 eee23278b27afc96cefb11410a48a76fb23daf64b826d66c16756a949ee7cd2e18229950cfbea1778f3629eb46df837446127511cedea8c33c8c400fff707556
-MISC metadata.xml 271 BLAKE2B c9035b9fb7a0fca1355aeda317feceecac5790bb6723360063b236d6633a040a594eea8f304c3b5bc8e918b1781f0e5e887ec15225d51a021592391195b7e8ff SHA512 89f447b79dadbb441c4c51527f486fcf7110b67c0a86c9fe6413c563463be57089faa1ddb36701080c368ff0a8442532bc774602e0120cd5466a4d7fb6bb6e0d
+MISC metadata.xml 297 BLAKE2B 1d304f6e46130d706190ceaa75f188fba8b3934ebcb42b48d7209f9a9dc67e3561cc2a823b9a591cd58a945161c382698178979e4dacf776178367e43c5519a7 SHA512 999f2517a446b5911d475789246dcb70a08566fba9ecec5f2b69fa29180fdfbb17f4f24b4c87ef71c422814bf7502da2812e5c7938293e96affe721d92e428fd
diff --git a/dev-python/pyhamcrest/metadata.xml b/dev-python/pyhamcrest/metadata.xml
index 6d5ace80933c..c9e22b107cd4 100644
--- a/dev-python/pyhamcrest/metadata.xml
+++ b/dev-python/pyhamcrest/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">PyHamcrest</remote-id>
 		<remote-id type="github">hamcrest/PyHamcrest</remote-id>
diff --git a/dev-python/pyringe/Manifest b/dev-python/pyringe/Manifest
index 374fd8f7ea06..ca19835843f5 100644
--- a/dev-python/pyringe/Manifest
+++ b/dev-python/pyringe/Manifest
@@ -1,3 +1,3 @@
 DIST pyringe-1.0.2.tar.gz 42804 BLAKE2B d5557c8d72175e5f70ba82205f990126919816f03d856c67c97dbd48ae4586809b815a4889ccfa1220a2769bf940cfdcb1bbca2a6e2d070f77357850ed129d5e SHA512 8da1572fda50bd135dc5d49d41a2f5c9cf2f5a7af729aaa9c34cde892a76e5a1b0a6818a6ed67f0f757910eec77f9931daade627141dd9964e9545ccc75a6052
 EBUILD pyringe-1.0.2.ebuild 473 BLAKE2B 1dba162d68ee02d971c75e43c6a319a27dd8cfe01ad9be9d8de3581c335f192d39397a6e70dc021c738ff8b25d6eaf9595a771ce217f6247c2aefd70f05423dc SHA512 86d6a4db391452f4fed94b85fc3e29635429a1b3278bb0df66612182eeb4b1f66fbf9071761df128e0f76b6f0530b38522204677a48d582002e0e9973ac16014
-MISC metadata.xml 269 BLAKE2B b1bb5a41df83eafa184f806c4c393b0595277ed17f2b978f015280240580cb2e87bc0858ba7b17d674511379d43bdf69adc5077c5d92520593a470f56f7e48ad SHA512 d3d03322123b7f5014b1c28e0689630db6935a65f3329c6960e27117ea0d4f90d8ed60ed058c54a69103ec6e422871a43c19ce8cedf7e68d72e5bedf7c91c1fe
+MISC metadata.xml 296 BLAKE2B 868acf6fef91fed55254e544120114e601a22a036eb07af1a8e91888d096c3cc3f3860bb5daf76724991b293faf458fb368ddc190c03a53c17a489a9963dd2f0 SHA512 11012332f2b51dc6fb1d0b54aad18db8646a2dd985d38511c7a57ec70e55572271f16fc38bd1a43a937c9b866b017ed71e1d17d34e2353f8a751c6a8e404ccb6
diff --git a/dev-python/pyringe/metadata.xml b/dev-python/pyringe/metadata.xml
index 9223541da6dd..68e5f99038b9 100644
--- a/dev-python/pyringe/metadata.xml
+++ b/dev-python/pyringe/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!--maintainer-needed-->
   <upstream>
     <remote-id type="pypi">pyringe</remote-id>
     <remote-id type="github">google/pyringe</remote-id>
diff --git a/dev-python/pyroma/Manifest b/dev-python/pyroma/Manifest
index 94219d254f0c..29fa785fc4d8 100644
--- a/dev-python/pyroma/Manifest
+++ b/dev-python/pyroma/Manifest
@@ -1,3 +1,3 @@
 DIST pyroma-1.7.zip 359654 BLAKE2B 8485b205225521455541eb82c21e9cc7b703434d3686e9b6b4afce62f6520872888a388b16b37c1eb583d5a22471f40d25faa1b64ed0cd5c6f2f07f6aea5ccdb SHA512 d7c95283273befbed6a747a1f3c0aa0af0db5c8d486128bcf5a3439dfe7204e1025afcf22cbdf5b96b6f4302b8d569c60c1eb9c646c035fd8a324e3d69f7195f
 EBUILD pyroma-1.7.ebuild 591 BLAKE2B 24aacbad4c75453e5e6aab05cb2b2128138bf2f9e43e51e66cd9ff36a6a7ed313c6ac102875e928615a807fbf03687d8fa1812ee4f3da77de23e9fdea3ca57fc SHA512 0e1e049ebdd13bfd0fd076322bdbb8ff13ff2c5c0bda492556648b6d1bc969c87d6a6e1b3dfbe2669526af2efdfb0d9875498be1f16790d7aa03b0efe718014e
-MISC metadata.xml 271 BLAKE2B 912da21c798a02a1d3a823d8241701f3c353e6d493fb51861b15cac2413197a8aee5cc6219194eab41876890f7094377ae9c6da9dc0f1bb1ecd88c9b356f421d SHA512 7345d6ef057762aa750573ecce7c46f9dcc53f9f19775b23e6dc4bf66b04ebce7fc076a94ffb3687d6fe27010da5755aacef273addfb672f59c601879d55898a
+MISC metadata.xml 298 BLAKE2B c952b58d9292e42ea1c8f5e63839f9375ff3ffa01fc9170ebe484e3229d2ce33ddbf5d12aeab5218460049cf73753946293c235ee668af5ef0c7835ef9722a26 SHA512 88d93e8578e673c211d062271406be0a43759abdcf97491d3af916a4a3133cbe4aff4c233b61c2c5cdc0a43b49041ef7ae3e42dc47727d234ae45281ac54dd54
diff --git a/dev-python/pyroma/metadata.xml b/dev-python/pyroma/metadata.xml
index 55f8d1cfd0ae..6ab46b231085 100644
--- a/dev-python/pyroma/metadata.xml
+++ b/dev-python/pyroma/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!--maintainer-needed-->
   <upstream>
     <remote-id type="pypi">pyroma</remote-id>
     <remote-id type="bitbucket">regebro/pyroma</remote-id>
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index ed8f69f40e8f..dbed5ebb4017 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,7 +1,7 @@
 DIST pyrsistent-0.13.0.tar.gz 96326 BLAKE2B 47388d7d48841c3a093c5309e20e92619b16c9f7c59a47929b8504a7e6aed803cb1fa07260ef8fbc5ebb4b243a52329a5a9976ca947c00243fc5dd3bc9e34e8a SHA512 6bfb657841382c4ad402c383cae5092b83e93a3dde0b905f6cb8ca8a50b8acbe0f3241e9cc50cb83892c0d59b13145764faa2a3db1eabecbe6606a35d07bb5ff
 DIST pyrsistent-0.14.2.tar.gz 97650 BLAKE2B 343990acbd1cd566a410508514393b6e3c4cf074bb2f1bb46404cd64af05a7397c3abc357ecc29fc82b9fd390f567ba4fa4a3c9c6dd52045f40f28fc7eaa97f7 SHA512 06ae1b9d15ac72b09d2fdb80e28849a105cd6955f206472649996318c2dc9915f251d76908a913c02d5583e1e818ff456af496b13fe9b094c043cd2548b2b6d5
 DIST pyrsistent-0.14.4.tar.gz 98660 BLAKE2B 08c6773ed6c8f4951bcddccd1b67ea11187feddb939b5bd9a529f3a2c3a162507a274f5efccdaf7b41a435484c89e42f78f065b4ed4d1f5dba02e39407096858 SHA512 6a2807be742c8aa33e8e244a449457774a9fed9a8a3d5f368f2aa91ca94904d3a8b73faec80a4e18bee48f765305fba4f8f1d2e66153a6cd3975ae412306fc35
-EBUILD pyrsistent-0.13.0.ebuild 916 BLAKE2B a48705c2f29df85fb8fc02d99988421dc8691fc69587dbd5cb8c659a3c6d4fcc0408b91d0405acb6f66869ae8047d6ae11a3f2f5a6740dacffa2ca20b063db4f SHA512 dceeabd1bf4399d3dad0c791212f0543c179153822ee839cbc579c75e3573316a926d4a2ec0d6806f8fd7133a9e544dccd5603ceadfd9a1e5dd52ce431028452
+EBUILD pyrsistent-0.13.0.ebuild 916 BLAKE2B 80fcbc95b1d4e9fef04fde4d7c6b636a5be1bf9107731de95fcf6b2217e37b6e8ac222f32fa37588e36b6edc33b8b35cccb9c0a97e3af027e12b366cb0b29128 SHA512 4ac1abdfaaf94f2818c4be08da60f4c31a1f98d13b4c7d7eff65fe3faab53fa88c7b4f1b09aae8a1983081c0905001491cf3e14a18d0281ac218f61c52f3792f
 EBUILD pyrsistent-0.14.2.ebuild 915 BLAKE2B caaa7ffb07117a8077c9f99140362d7959a3c219f4026b138adaadab23db99e363272cd4d624e5774871025c126ca326e01b4aecb51941bbf23643985fa6c7fd SHA512 14d3b4d4dd6e876bc1e8ea69f45edae40a7d281638387666df30439ef8326151c649e4110720b4d484dfc15c05893d893f8043e8c830170da237a308792f6910
 EBUILD pyrsistent-0.14.4.ebuild 928 BLAKE2B f49b86ad56cbf11f8dad3ae3225432cc213f29f5f6b7c53124298662bd97ac609d03f54d592867095a51786334340f6449867aa464fdcfd82db08348392d773f SHA512 34754d0d9401fe816b659f9ca3fcb5d02038cd14c5567a798a3f2c3100e44d3873b13f06b28b1c4a6e7a3a755d8aa28d00f91bc0f908f82a144063f1a3c427ba
 MISC metadata.xml 521 BLAKE2B 0081a54c9db451d020647e808b80c47e590530bc952c40d3dc6c11e187cb6ff4c644c9c8c448b206ef3036a3a0ae07760e23ba88d41938667b0a83ab2299cd9d SHA512 16d13966bbf6d52360d9438a56a949e6e31a9d2ace85e319db27be14f85c8446ee28e00c6bafc9232b3608e3a209396dc601cb3ce193d3cb4e8284cc8b3cfef1
diff --git a/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
index 9c339b57f9e0..ceda30313ec6 100644
--- a/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
@@ -13,7 +13,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-linux ~x86-linux ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pysol_cards/Manifest b/dev-python/pysol_cards/Manifest
index b23d45752a07..dece41ec4885 100644
--- a/dev-python/pysol_cards/Manifest
+++ b/dev-python/pysol_cards/Manifest
@@ -1,5 +1,5 @@
 DIST pysol_cards-0.4.1.tar.gz 16635 BLAKE2B 8c4ea9257656e3da66d464e8f251add18bb143bc2152a6ae7c5385650867453b806f1e6bf80abb87af0bcbd3c8072c89dab058b4e7578e8d977123a13489c996 SHA512 96518549770a9d85021a60da17a0d71f4928415f7226fc7d7aecc1c84345b0d46cc16cc33b197f84b31143bc0c91c6459db19c7bcb763fe956a7f5e6a47735d4
 DIST pysol_cards-0.6.2.tar.gz 17032 BLAKE2B dd93ccaf14ffeb9cfc8228d129005b0733ba96ea90fccb105f97ad92fa6077cae30876150f8a866cc6c977563f3ff81118ebf49e87a3db8bf6370afaec67121b SHA512 99ca6de08c1e1cbad0e57d54e1482d021ad8b7c9d4c956df0f199ed4d6a1a367ab5e821ba504f300f38f5ec329f67564aead99df728df0e498d733d55435c7da
 EBUILD pysol_cards-0.4.1.ebuild 546 BLAKE2B 5116be48b217caaa7153c359963aac67472a5ccf4230a6c5b07e47104f69551ffe4917a0f41cc3c738a909f8b26ad0e52a84f16a499d11dbb225c1b994053a36 SHA512 c19a25f44a7d484442bfc05c9eca4ad63d2fe4bca5d4c134a5c46274def61d0e12625ddbabfe696ed3d87b4099f6528871b566849a5b20a16fada803539b9c7f
-EBUILD pysol_cards-0.6.2.ebuild 546 BLAKE2B 5116be48b217caaa7153c359963aac67472a5ccf4230a6c5b07e47104f69551ffe4917a0f41cc3c738a909f8b26ad0e52a84f16a499d11dbb225c1b994053a36 SHA512 c19a25f44a7d484442bfc05c9eca4ad63d2fe4bca5d4c134a5c46274def61d0e12625ddbabfe696ed3d87b4099f6528871b566849a5b20a16fada803539b9c7f
+EBUILD pysol_cards-0.6.2.ebuild 545 BLAKE2B 0186181072e2bb56e59d9f8ff01e04dc36b1ba307c7df2a5686f726d8e4add2177bf2674c148db7146af93defa2d4a741af2263bb3caca8fd217c751568f2198 SHA512 78dc4117c08366e63c95eb2969fc4a8a400f294fb63bb7f007f7e958cd5f3f2d10dc1fe4c361fad5a365c4cd4a8769f092b5695c3f2d8ab3f9c309640a12eb2c
 MISC metadata.xml 289 BLAKE2B daedbd790704b3663910c8067dbf69dd886eafcac1aad5b2cc18f54a8dc74596a9a4821a945250e2ed997c754151995b675965cbebc64abf5445c1c63db91ba1 SHA512 f48ef730220d3520d2230ebb0caee8e3456c8b8b7255bc978944897c424d1338f7d7a865c37455d279fdca077fb1436233fcf085564b1d1e9802d28e35d7fc1e
diff --git a/dev-python/pysol_cards/pysol_cards-0.6.2.ebuild b/dev-python/pysol_cards/pysol_cards-0.6.2.ebuild
index 5fc779fa07cf..190f6568ed98 100644
--- a/dev-python/pysol_cards/pysol_cards-0.6.2.ebuild
+++ b/dev-python/pysol_cards/pysol_cards-0.6.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index e46d4288913b..33c30d1e6490 100644
--- a/dev-python/pytest-aiohttp/Manifest
+++ b/dev-python/pytest-aiohttp/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-aiohttp-0.1.3.tar.gz 6192 BLAKE2B 23f4eebdefe757328fc8621e29810835fee8e8c3e8cedf45134716cff77208bcd7aa82f537ada5d567b143d342b1a9fa14a5ed1e5208548e55353de1748b270c SHA512 2271f7730b91812a619e04522c13b7e2ff76353179a4588226d0b943b67f7397b966c1d3c24016861cc3eda3a541b3f0d3b2858a6ca3586f7707e10581c34e4c
 DIST pytest-aiohttp-0.3.0.tar.gz 6884 BLAKE2B 02b50fcd14192d23a4b257c2b7cb235966eff52b1c0ac87a4c61a20bc0babdb22eb999938c63e267a797d52ce57c9fb471232db3d0bc6566168a2d73f6404cd4 SHA512 4164166465dc40ff78a86304d1bcd4db9fb3f7dad3188f8ebe2ff151ed51eb0bf9c1b7a608d94cfe3339ee3b6efd4d5abbaa0691388460d5ac95635afa14984c
 EBUILD pytest-aiohttp-0.1.3.ebuild 574 BLAKE2B c851de347f06edcc34b04b6d75847cc4637770df220de07debf9ba9abc567384f30fee0315fb751b9819825f39480bce11fa4cb8b9ebb3d3a325e6d0d5589e48 SHA512 47915bc93ba42e9ab83945e875eb24165d427163fa1256f60cd3a26778d646418bb8fb17f72795160a5da9c2dc8b720b486df3c3ebcb7f8682a78106fbbb2fad
-EBUILD pytest-aiohttp-0.3.0.ebuild 574 BLAKE2B c851de347f06edcc34b04b6d75847cc4637770df220de07debf9ba9abc567384f30fee0315fb751b9819825f39480bce11fa4cb8b9ebb3d3a325e6d0d5589e48 SHA512 47915bc93ba42e9ab83945e875eb24165d427163fa1256f60cd3a26778d646418bb8fb17f72795160a5da9c2dc8b720b486df3c3ebcb7f8682a78106fbbb2fad
+EBUILD pytest-aiohttp-0.3.0.ebuild 576 BLAKE2B 51be3bad7eb73506b77121244e8b47dc6ae7bd982b1cf69f342cffa1fc6a226717e4b2ec8a1819728616c1488ab26a54b0a8196908831c2ff7519874f96da044 SHA512 9bf71f0f780d136a87cb23f4204add44afabdbab68ef92fd126fd1f51b0cc97a9567e9cc00ce1ce4e758325d99cf803824c3bb54771b65ca3fff668bb945b6ff
 MISC metadata.xml 358 BLAKE2B 8d7d3a4d56967f16b3c8b5facccb0af056201daf975aeaa8cb9b651db735183cb38e35d1a86037306d6c61971690b7093ac8bf0c4197b2ce6228d0323c15ed0d SHA512 4f7db25811be35ac9976bf5707b0ee0927dae9f00d8be85f18eb165708f08ec7c4bb7ebfc4ca021a6432eab8ab25785c8b27959df8ff9dfc2a969b588de68829
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild
index c08cffd23bb9..9e78899cf5fa 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="pytest plugin for aiohttp support"
diff --git a/dev-python/pytest-isort/Manifest b/dev-python/pytest-isort/Manifest
index e1d042dff951..21811f96ebec 100644
--- a/dev-python/pytest-isort/Manifest
+++ b/dev-python/pytest-isort/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-isort-0.1.0.tar.gz 5502 BLAKE2B 9fb03759871d0dc35d53806ce460fe637b1580ed928e1e86485f1a0603b92042fea4972008aeadc890c79cfe42151e77a6628fc7856e4b230dc4e39293a8bb57 SHA512 86c964b6a998a32c9c474dde0a9400c45da8b26f3e8dd6f4092baa4bf1978a7f67a384bd910ec824f85a8ab49b4ea30967e1e7f908a31619ee88391d3505440b
+DIST pytest-isort-0.3.1.tar.gz 6429 BLAKE2B cf68cfe061be097c576c9cb7ad0a808729aa03f031128d2d1064bc960c7aa27e0d94fc18c238d95ac2074f056ecb8fb33064f6f0311756c73ce8379d1b8317f9 SHA512 2fd39108a6acacf18ce68bb537d2adeb4ff7cd8ea4c9611e5312edea5a0bc4841111ffb544318aa7b3bebe38e9f4744f07a45b2ebcbf872f79003b249ee115ca
 EBUILD pytest-isort-0.1.0.ebuild 654 BLAKE2B 41fbee69f0f96bdec3876e01a66437e37bc4920bb1f288dad39fbe0fa8bde9309d76b891c32f733b56d941495d434f3318130638c1e876dc3e58a2462417db14 SHA512 ce9703f3000fb94a71b5d908520338cffeb121b9e8505e3ed14a47ad77573a7ab8be01126826a74f7c7a9e048dbe23060e6cbc0a9c7b994feb70b6f0c407954c
+EBUILD pytest-isort-0.3.1.ebuild 694 BLAKE2B 1c77b2c0c9c82b8b12aeee37bf4b4c9c6194a9a8c81a46e897c27d43d14acab9c229f29d4db4871958bc7137ab19025c4228ee9320c890aeeff386940c25df94 SHA512 4cff6ccab6500b890b1f78ce9c19f4e0415c38f6a9771a50928a06a7b0768625f2f0bb5cedd62f0202f23a73aa32b395e16db73be71987e8b9bb245baef81268
 MISC metadata.xml 505 BLAKE2B 25a6f8c03a7bf69bfbfd8fd8e45d9ebf90930063ded11da4e7bce31732d3328f17975327b79c66ab3af85112f8e4fc1d91aa7784d297f10a3c5f4770176941fb SHA512 3d77c078c21bbc18af28a19cb1d69c9277bcb1fcdcab004b21d18e715242d0d8e97aa05ebb2d232dcc2411cf068ab40ed36728d56f21ec4ba200319012e94fa2
diff --git a/dev-python/pytest-isort/pytest-isort-0.3.1.ebuild b/dev-python/pytest-isort/pytest-isort-0.3.1.ebuild
new file mode 100644
index 000000000000..4f49aee54ec6
--- /dev/null
+++ b/dev-python/pytest-isort/pytest-isort-0.3.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for isort"
+HOMEPAGE="https://github.com/moccu/${PN} https://pypi.python.org/pypi/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/isort-4.0[${PYTHON_USEDEP}]
+	>=dev-python/pytest-3.5[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	py.test -vs --cache-clear || die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-raisesregexp/Manifest b/dev-python/pytest-raisesregexp/Manifest
index c76cceba3206..75da0d1ab318 100644
--- a/dev-python/pytest-raisesregexp/Manifest
+++ b/dev-python/pytest-raisesregexp/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-raisesregexp-2.1.tar.gz 3159 BLAKE2B dc1d45be8758c2e79e9dece38b6499d4d6e797e38dc4be58e9ab8fd67321683884a1f510107b1d0c3578e04d8364a939dc7528c6873457e0a5a2c104f1fb1659 SHA512 2d54413c3e5e1aa203738d5b1ad67cc478a0e57a5d5340908bee7d1da23702f52de45e6b7503b7122075733bde2b83080b20d563d4a485688dd889c7e1421130
 EBUILD pytest-raisesregexp-2.1.ebuild 736 BLAKE2B aa9e2e1568b9cb227cb1a8b5cdf161e3902e95ca38f94e567faec24743a80360b35944b0ea34662488536afc66d9dc483ed4905a02ef300803b0e52f08d70406 SHA512 8909bd0372cc0805638f93c2da5703d7f47a53f3253e894693d9db63fa0024d75c347b76122a4c09a430f227f2b02b601064fc2692333576dcb9d7c44ffa3dc3
-MISC metadata.xml 288 BLAKE2B cb1c92a235a60e0fd2f8c27429db7c53fb34a6fb06b78ed192182ad04c9ab8b2edbb1e04d5798454bbe3c5efddc1ef9415e5eafbafb5bb755f2fae0da7727371 SHA512 3b80ec45cab82572d317cfa40e56084c3c36223aa0999cec2fe7cd68606de53e2064a7c2cdbee7426738bb0c2dbe4eef2d3135ca9a4514c4703ad9182b8594dd
+MISC metadata.xml 314 BLAKE2B f3621cac9b53d89969c5fb58a89270ab749940b7a2f000fb49d58048db09a0b7790f629d0b9c36de84623aaf9d71f6d45c8383c673ec934478f5c1adff697297 SHA512 9f54110185186f2837705670bab47bc66e256d87743724e83cf8bf7130575bcb3c537a67a8979c0da91f72b5d633724c110b5ca56372d9bd29fbc648e1789ffc
diff --git a/dev-python/pytest-raisesregexp/metadata.xml b/dev-python/pytest-raisesregexp/metadata.xml
index 22bc687de822..2b89d8053b82 100644
--- a/dev-python/pytest-raisesregexp/metadata.xml
+++ b/dev-python/pytest-raisesregexp/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">Walkman/pytest_raisesregexp</remote-id>
 		<remote-id type="pypi">pytest-raisesregexp</remote-id>
diff --git a/dev-python/python-gammu/Manifest b/dev-python/python-gammu/Manifest
index 0198d57a5a77..128cebe55b49 100644
--- a/dev-python/python-gammu/Manifest
+++ b/dev-python/python-gammu/Manifest
@@ -2,4 +2,4 @@ DIST python-gammu-2.11.tar.gz 135567 BLAKE2B 133172cfd0715ff6b5bd47b93e5d93d52af
 DIST python-gammu-2.5.tar.gz 133090 BLAKE2B aced85e9f7a4d861a8f11ff0ebb97a7f3062e5f3ad3a60614f6f5f16a30b5f5cfbe70958e630dd55d02d0f190648f2976cf60ef3259c21fbc882acc865a4ce8d SHA512 e61bb340546cf3f98c20ff5d4ef25ca05676b4dea91e02aeee2856f091ac12fbf07a597637f9562432e298bf9678ff4445d24d8cdf96274b735aa9754b364e58
 EBUILD python-gammu-2.11.ebuild 757 BLAKE2B 74cdb492687349fbbdd0026b2430bc634eacb4a7c03e4f0f6898570943fd8911885a635dfadc8729a296cca8b0dcb5471e3a467b1958c91e5d4b981dcd333ec9 SHA512 c1a2144377bd9430e44870c6074d0d615510d49528f0785cc1f662be7208133303e9ecde5d3cff7dbee26097fd859eadd269a23fb304b1f9d6352450a9b0198c
 EBUILD python-gammu-2.5.ebuild 707 BLAKE2B 63e4b50c50bc060d9b84402452cead77d5cf957af71741fbbd66295999859d2f0273b33da992b1f05e82057801a7e5beb501d33e3932b3f58cce583933c80d50 SHA512 847aafcd80301d086b4e23144fda8c488c9a2c2fbae64e2934f67158ff52ff0d52119994b73f887d6d36d0f27d939999b31062d575347fc5f9f0fd153e104e27
-MISC metadata.xml 349 BLAKE2B 9bdfc54d7c335f6aff3886d8579b9da2a3f916e36f1eac59257042d14c8a1fc53e704c0b083a60ca64ab6c930b9153f211f1d3a25008d147fec557f3b7d18a51 SHA512 5483032f1d347017ae5307f278c17fec9c39674b0f739ceb11706b2aa47a8340e547c6fcd5661f76461f0c18a4b78a800daec94a7eb4c956389a074a244a93c4
+MISC metadata.xml 375 BLAKE2B 2ce9558b6704f95ab2897b077cfea90e039faa0ae01e8c96bdccfc8cf960d532f17e464eda20c0a4790db35b2e33fbbdecf6eab96efed8773200c0cc045237a3 SHA512 ed96e59e555b77c67b72e065eee123a0cc111e53332660da5abeeefd046514ff40441810d6f496fd7992b130498fe1c5b0a4bcf2ffee72c2cb817c118f6d4c20
diff --git a/dev-python/python-gammu/metadata.xml b/dev-python/python-gammu/metadata.xml
index 76afa3f3bc52..cf11a1ae5e5a 100644
--- a/dev-python/python-gammu/metadata.xml
+++ b/dev-python/python-gammu/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<longdescription lang="en">
 		Python bindings for Gammu
 	</longdescription>
diff --git a/dev-python/python-gflags/Manifest b/dev-python/python-gflags/Manifest
index 3cfffea01b38..da62f143d9dd 100644
--- a/dev-python/python-gflags/Manifest
+++ b/dev-python/python-gflags/Manifest
@@ -1,6 +1,6 @@
 AUX python-gflags-3.1.1-script-install.patch 1178 BLAKE2B 26f5694548762a2d6b8e6787027862edba91e8baf39a7c8dfc573be61af48cebf7a280646c948c0b59fab48d3b46fd4049d8422f8d4e6d9a57afe6e363c63999 SHA512 7247303c33a845949b1db7104f3170497da980334cb02155501d194eb53eb61ae2231cd4ece06194ca64514271252f8f1fc7c7683cbff2bb8f96d6d4e88123d5
 DIST python-gflags-3.1.1.tar.gz 52633 BLAKE2B 78966a7ffd924dcb16b4c6459d10cb06b9494150887433fec1e32e1b454f151386d4024f3ba1d307f756781128224c8106539480d9291dcc2ed82e85c8eef36f SHA512 28009cdc09b94b416af5237d3897d6ab516cc3b6a3eed18a31adb8c199f31a8c7d07b1d69794cb37de84b50eefbde1de57f9f0afaeac0a4747b352f4024ef12c
 DIST python-gflags-3.1.2.tar.gz 52093 BLAKE2B 4275b43ecf2c58f76fee0b1ff4645eb3176a9ae3b68fdd4a059c2f6f659ca1d9b6e4fad152a2fa48f1eb22c467dbc006835c241c21f89c0ca92367e484f34c6f SHA512 7a3c08b6b212cdb9cb7feaa48e3875d1204a4b3a57182508a078331565f70509d00c315400fa0316dbf61ed4d6a6a04ca8c1a2303567d37650d8dfbb329e2f6c
-EBUILD python-gflags-3.1.1.ebuild 856 BLAKE2B c551cc061fb0cdaef70429ffa9c94f69c21351b2b33392355aab2fac76946df4a9024fcd5078dad10405f98ca2df89d95386ca44b9046180dd91c8316284ebd6 SHA512 380ec4ea584144f6e7e111283a1ecb08eff940ee13d27dded5ba798bccd8f2bf8c6906c229bddffb764b252d38ab9fa5855b64b8bec658ccdc92d02f34c2ef6a
-EBUILD python-gflags-3.1.2.ebuild 877 BLAKE2B 502d25482cdbd6453feb82dec98a9e5c320b0c74cb6341f04eba9bc5fbbf6dbc7571d4dc46b4abc382f6195f52bc9fc97a9586a579f76b8b463d9eb884d502af SHA512 306b608bb8ebe028a83bb320d30d62d39f10a2ebe7906927e1b6b739f3900aa69aa74044629d739eaa4ebae3c6ed7c0eb4e7dab07709fdf104c10f6ea9a35b31
+EBUILD python-gflags-3.1.1.ebuild 853 BLAKE2B c4fe015452aee391fe8db9bb8a136cd75a72605580b2cbcb4ec6847a68e94415b11801635c556809fce18d4256a863656a7947a1636b880f4fd0ffa2476fe999 SHA512 3df6a26a20262391aa044a5bea5378a61b6f41761aa0363ce8cac5d4ded6cfe33ef1224931a399d2529c93bed42b8fc3a07307d0a9b095be70512ae03691ef3d
+EBUILD python-gflags-3.1.2-r1.ebuild 876 BLAKE2B 8b71ca0828cf411dfd4f4958b24a0b15f18e3a5c53c859e0059537b0518f592751698adbe8c2e4d33551f9950c4db79ff20ab1b37d6853186663513aa52b82a5 SHA512 dd108215c22c101007ecf92e28fc72f52431f4e5640412326a39051fcdeda40ab85c022e7ca51be0f471337d5b322db941ab0ab110ee4b34fc59821ef183acb5
 MISC metadata.xml 376 BLAKE2B f93ffa8d2487172461a680a02dad64b46c2edb87ed47ffd8455c30c82278587daa1d2baa42fd0e77f0cbdcff7936e9b99a1f8a8bd496f55eb27975d708656069 SHA512 acea21fc3fc83a3ab1a24f47ed7250c1ffc15ac4507c4c1472716a55b42fa0740b0a5d2eb20cc3dbfeacc575eed67d59b59e722e96dcbfc87672ddf9b9787c26
diff --git a/dev-python/python-gflags/python-gflags-3.1.1.ebuild b/dev-python/python-gflags/python-gflags-3.1.1.ebuild
index 476bc2824667..b227f6d1ecb7 100644
--- a/dev-python/python-gflags/python-gflags-3.1.1.ebuild
+++ b/dev-python/python-gflags/python-gflags-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~sparc ~s390 ~sh x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-gflags/python-gflags-3.1.2.ebuild b/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
index fbe985dcaf55..645b558ba52b 100644
--- a/dev-python/python-gflags/python-gflags-3.1.2.ebuild
+++ b/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-musicbrainz-ngs/Manifest b/dev-python/python-musicbrainz-ngs/Manifest
index df37b01e2416..06e87318338e 100644
--- a/dev-python/python-musicbrainz-ngs/Manifest
+++ b/dev-python/python-musicbrainz-ngs/Manifest
@@ -1,3 +1,4 @@
+AUX 0.6-fix-test-submit.patch 993 BLAKE2B 3347bd841f0f1b23477f387275ad8e6d40fcffc434150e93c0d57c9291c239639018c28e519032ee2cb251371343d0f3ce6c070b960d4ca8bd1dc5b5b480511f SHA512 ed5b6b674edddcc1d6047bfd97ffdbc1bd4ae3b83e61100b0389cabad84014dce894857faf5555824f245eacaea7541ee18424f630881698b8f2bebceabf8b78
 DIST python-musicbrainzngs0.6.tar.gz 110948 BLAKE2B 9528d966565f7c927a98d311dcbb6db73a84614efa3eb071fe944b29b655526f9dd6e8a4a217428883d30b93c18e45c3d752d321d3c0689e5af00423b5fd7faa SHA512 901729f736b207f2f086e3d44a3515d405f6621706ad9c7ca07dd304349e048c5790bb16b054393651808bac4905ceb9493dd66d9fb17a1612692427c0bd3bd4
-EBUILD python-musicbrainz-ngs-0.6.ebuild 1063 BLAKE2B 2672487cb31fbb65d72cc962b8c28b797c39a99491a3bc9c1ada3267d42aae11537091bf3cda0762d473142e13950ed88d688f954bc6b74f30c5cd470cdf5eef SHA512 5c8efd8ca84a857f79bf42a2c0b42794345d7bf268ed914da98378f1c394ce61d37e463197748cb95c9f0e8f62279337a33b42d1d6a7573a1fe8f14e6964c566
+EBUILD python-musicbrainz-ngs-0.6.ebuild 1127 BLAKE2B fca3698bfdee1c08be861bbb8701a04b8dc0901a5cc8ea2d3c2259da2239fec66a7a0ef16bb7179aedb7b0088046ac486dab475abbe8ca6656c0d1d20a649f93 SHA512 32cdb9268f706fdea88fca4a61796b686f81c71bf98c001ed756d9d1bd575af8fc5ca29641bfb1ce2ecfe8198bf934179cc461fd48d58066a8f2b89c8eae96f3
 MISC metadata.xml 608 BLAKE2B 2fb7e36555a1ce07fc8da2d81e412e2b1194cbacb6657779e37a40831878dc6b462e0cddfbe983d301bb84736e4bdbb6d12002f94a4038f0afde45fe35c82069 SHA512 811ffe495005e46570b10c03f4de36d8fd096123108300f21afc12f7c6af46f2ac66a9c69d1df89f1266df4b83afc5281aedd1e978d7eabd7cdd9acda7a338b0
diff --git a/dev-python/python-musicbrainz-ngs/files/0.6-fix-test-submit.patch b/dev-python/python-musicbrainz-ngs/files/0.6-fix-test-submit.patch
new file mode 100644
index 000000000000..4881936c80b1
--- /dev/null
+++ b/dev-python/python-musicbrainz-ngs/files/0.6-fix-test-submit.patch
@@ -0,0 +1,32 @@
+diff --git a/test/test_submit.py b/test/test_submit.py
+index bce5362..2d13811 100644
+--- a/test/test_submit.py
++++ b/test/test_submit.py
+@@ -1,13 +1,23 @@
+ import unittest
+-import os
+-import sys
+-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
+-
+ import musicbrainzngs
+ from musicbrainzngs import musicbrainz
+ from test import _common
+ 
++
+ class SubmitTest(unittest.TestCase):
++
++    def setUp(self):
++        self.orig_opener = musicbrainzngs.compat.build_opener
++        musicbrainz.set_useragent("test_client", "1.0")
++        musicbrainz.auth("user", "password")
++
++    def tearDown(self):
++        musicbrainzngs.compat.build_opener = self.orig_opener
++        musicbrainz._useragent = ""
++        musicbrainz._client = ""
++        musicbrainz.user = ""
++        musicbrainz.password = ""
++
+     def test_submit_tags(self):
+         self.opener = _common.FakeOpener("<response/>")
+         musicbrainzngs.compat.build_opener = lambda *args: self.opener
diff --git a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
index 6dbb0b8902d6..0a6996ca9ef8 100644
--- a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
+++ b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 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=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
@@ -20,6 +20,8 @@ IUSE="doc examples test"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
+PATCHES="${FILESDIR}/0.6-fix-test-submit.patch"
+
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
@@ -35,7 +37,7 @@ python_compile_all() {
 }
 
 python_test() {
-	esetup.py test
+	esetup.py test --verbosity=2
 }
 
 python_install_all() {
diff --git a/dev-python/python-systemd/Manifest b/dev-python/python-systemd/Manifest
index 982602f6064a..41fb4b9e5749 100644
--- a/dev-python/python-systemd/Manifest
+++ b/dev-python/python-systemd/Manifest
@@ -1,4 +1,6 @@
 AUX 233-xfail-bind.patch 1077 BLAKE2B f2fa3f197887d3a14cd7bd2a8bdd33100eb18f4b348bf4ccd1877c843864a71bd52b19d53ed3c98f0de0b690c2158b6ceffe10682ed79c64c829103a2e34fe14 SHA512 63a5325812bb3530a8681b006fc66630a33cc6740ed63171025d4406a68783a3fba0b55141fd9620f049f2225191ce9cffd3d91a9d1c5cef7af94ec82b2ebd6a
 DIST python-systemd-233.tar.gz 49680 BLAKE2B 7d612022738d3114a39f7ad7f4d7799ac3d027980592a5205247d4c866ac3d9520d63ee02f143e26865f0d83338f30422dd0c2299f575e8b03f3112900e9af73 SHA512 92a6cc7123db586e5ae5fbb56e5065b17be9da47ced9dbc5920d80b7db7f56d15b127e72d30889c5b24b119724a33f68be1ef322529620ed95b0f95707e4c2ab
+DIST python-systemd-234.tar.gz 53900 BLAKE2B 2658ee7083036ed8259e5f4ad0714ea15227ee836ad34c7fbbdb55dd9df48751b8d9998350d789b4f47e78fe7b4a7134e12d637e5a6ebeb29a0b31e5a4575d91 SHA512 164e34ba46827711e9c6ff9ed58b2706d9a22abfc7001de030ed7d463d8ddf783eb5fee93b207c29950a3c566018cc3f1a21a549421cf3e05c1287b433367eb2
 EBUILD python-systemd-233.ebuild 821 BLAKE2B 24faf5079019f64fff7e9c110254b7c8fde43869213ccdfdec26feea99c9d817250b8a0210d1fc31b30595b888183d7c5fa6927fa54f2130d4925f468452a90f SHA512 4322e83de8f7af7dd2a68112680f79601c9f6d0fbbb969964f9159961d23bc0b5321ccd38af7de1628bf5175f86163a4c1d2281e49d0e3c6bd43aa1c15c1974d
+EBUILD python-systemd-234.ebuild 863 BLAKE2B 6b4b008287fc4e16b9786500a447750b73568f9752f3444abf8341dc096ecb53a54bb9110cd715917367c1d916b687962ac5a1a951a0a8ed4f241b575e8f995c SHA512 bcf001df1ef785d13b1d72019c1c7f6015bcff3ff48aa21376d38da3f3371971c0d4f1ac3065e4c8b76a00e46feea449bf2e66a479de907a8f1bd06de53fe2d2
 MISC metadata.xml 306 BLAKE2B 2e77cf6814775cb575c96548a69609034e4d9db62eba44684df463c98fe1b105ae5caffea7e1d05880ad2d8236405b2848fa24bd245e3a8627578d2cb128b055 SHA512 ca004982cde4fe1bcbd821109ec70f464a2014a2c0aa77f9976eedaec78ad68dc8d39e2e2f7023192bf807307e08259548f1ebb298ea7f3654c0b8658fba97f9
diff --git a/dev-python/python-systemd/python-systemd-234.ebuild b/dev-python/python-systemd/python-systemd-234.ebuild
new file mode 100644
index 000000000000..978b842ca4bc
--- /dev/null
+++ b/dev-python/python-systemd/python-systemd-234.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for native access to the systemd facilities"
+HOMEPAGE="https://github.com/systemd/python-systemd"
+SRC_URI="https://github.com/systemd/python-systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	sys-apps/systemd:0=
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!sys-apps/systemd[python(-)]
+"
+
+PATCHES=(
+#	"${FILESDIR}"/233-xfail-bind.patch
+)
+
+python_test() {
+	pushd "${BUILD_DIR}/lib" > /dev/null || die
+	pytest -o cache_dir="${T}" -vv || die
+	popd > /dev/null || die
+}
diff --git a/dev-python/python-termstyle/Manifest b/dev-python/python-termstyle/Manifest
index 64576602fc88..aa3b9519cc4d 100644
--- a/dev-python/python-termstyle/Manifest
+++ b/dev-python/python-termstyle/Manifest
@@ -1,4 +1,4 @@
 AUX tests-unicode.patch 212 BLAKE2B 0c4d38d0fbdf3871cc81741f0f4533fd989b9636f5d9f435230a154b33d9fabdc5c3ec135f8168a4be1d9f990767871cea8ad19b3f8c6af7e5ab7ca9f9c07500 SHA512 cdb60f341dd186febe72e09586a7b1d65087c0773b1192d9725188cfa4b9bae902026ec7bb723359863695e08992b2b5bae2a25d7aed0c2018dd22dadb8b850b
 DIST python-termstyle-0.1.10.tar.gz 5025 BLAKE2B af652f560f3c6657ca01080cdaece77af7a1ecdf0758cf777035427197142b04a7d39a249da6eee90dc06cc2d15ca484c8b1d086c8e32e761acb8adc0eeccf3f SHA512 a0ed484da8da10c7fe1b8422a26861fb115dc29c49ce79c113053f913d3371edf6222de1ccf40e6aa34c3cfa9da5805eb3928fb07bfae18a13683621d7547743
 EBUILD python-termstyle-0.1.10.ebuild 850 BLAKE2B c2b0dc32b17e82bb90889ac8cc667b9ea6611dc0b902aa7a1eea6e3d5fe336cb12adf80013cc9f1f5bdfc827df25959cb250e57c9cb135edb177a5c1453439f0 SHA512 a73142f1c20fce756b8d3b020fca7b816cca69b2b67d8c2d4620bb43de56b8af95ce20c72c10e3f3a106052a6366727a6b7b658a3f4fc7234f57bad2674c3a5e
-MISC metadata.xml 221 BLAKE2B 2f422cb7330c3b501a8eab9e1f5471e6f5e71c36b72a6a4a7f44552eaa014de74aa896d4570f9875d201c095dc948788ddd1535f38819718d26c46db14cfed98 SHA512 7b2209a5979a8886321399bb1204e69f5d27773ff2a6c945f83188bb05790848bbca84992d0e7886a5d839fd37f469d5b892f552f25c874367c4daf65306820b
+MISC metadata.xml 247 BLAKE2B 431d545f18d9c8ff5e50fdfdd55d89303f283a6bb008c5eac55d8762b8c9cb62dfcf40db999b66b1bf9ec286b9552033eabe7ca0376b415e5f6c7037a0eb8927 SHA512 6b6b38e681e7ca67b2f09aaef6db3340993b2f78c5be2f25234d46f8688ab3ab85289de8738f9199589817d3e2697de0788a45457cc6dfcef5e33ac5adbb558c
diff --git a/dev-python/python-termstyle/metadata.xml b/dev-python/python-termstyle/metadata.xml
index 9f0912b384f7..47400ec692e8 100644
--- a/dev-python/python-termstyle/metadata.xml
+++ b/dev-python/python-termstyle/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">gfxmonk/termstyle</remote-id>
 	</upstream>
diff --git a/dev-python/pyuv/Manifest b/dev-python/pyuv/Manifest
index f6025586872f..391d13d44f5f 100644
--- a/dev-python/pyuv/Manifest
+++ b/dev-python/pyuv/Manifest
@@ -1,3 +1,3 @@
 DIST pyuv-1.2.0.tar.gz 98578 BLAKE2B 01f7bfd2b3a7d2480ebef75c746a5f2d7b0212b6fa562122df2d7fefbdf4b2c63017836f316f5d6d9ae7d7cbeb2ff0d24ab3d04f4e9d15370b6d6077175611d6 SHA512 10a8448700c609b6e9844c6bc9bd6428920a455c94bee79569006f783c7f5d2683abe46c4692d0f0016a621d0c6d0ef2decc42a9f0418e1242b79ab0f06ee9f2
 EBUILD pyuv-1.2.0.ebuild 628 BLAKE2B 7dedf009bf567df784c65556e6972069aea32e938ed817d3ac9d0c86bfd1e3570b96c7dcc48a29a952186a0f2f1584348449234856727ad641bed3a8d49bc2bc SHA512 0a0fe8296e04a757ddb198cbedbf67d257c79f5231cdfbd6ad18f2a84888ea82ac29bfa23392db2e3f8e9d5c9c440409d1a74fd830894463e2774413a9fb1e0d
-MISC metadata.xml 1336 BLAKE2B 43efbba576edd19d05e2ddb3ef504445f33606c257fd80be52191d3a532e8a8156e9200cf80c58a975cef580116f0758cad94b59a98b2c7e9646682dd479ac9d SHA512 5188d8c0336c9583d15da1a82f8c6866bbcd806d4e6025bc9cbdf450ae1d02d394c2bb5186d74b3f7e05c071612071d9033358918fa11cc2114f9c5eaf56d01c
+MISC metadata.xml 1362 BLAKE2B d7bd3fd33aa758f3a81e48a14809c44e7eb52ed9876078042f0ab8f3aabd19e9bbcd61adc60a51aa3a93b60999baaf59ea141eac9d50c1cdfbd5e238b77d6aeb SHA512 4a8f25d9345f5be1674a3844cb86e96d2a3f2d4e0d8ae0cbb6bd50c0e19009da50b8ef234b66b5796077a6ca3c6dd7b1289291e53e0f7f2e7c931ac1812f1cf5
diff --git a/dev-python/pyuv/metadata.xml b/dev-python/pyuv/metadata.xml
index 5631539a3d3f..53d991102794 100644
--- a/dev-python/pyuv/metadata.xml
+++ b/dev-python/pyuv/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<longdescription lang="en">
 		pyuv is a Python module which provides an interface to
 		<pkg>dev-libs/libuv</pkg>.
diff --git a/dev-python/radon/Manifest b/dev-python/radon/Manifest
index d2d7704ef049..22f403a6a324 100644
--- a/dev-python/radon/Manifest
+++ b/dev-python/radon/Manifest
@@ -1,3 +1,3 @@
 DIST radon-1.4.2.tar.gz 1645389 BLAKE2B a379a552b5e31c106d2a870a16b3cbe7d70f3565b0964dac5139dd0e6e09c5d945001386de83017d05f4e5bc9f58cf481e9386caf2edac3f1df5a8b187ea0693 SHA512 0e440b36a7edf0ae8002ee27d00cd14a351261972407b4a960d9033712fc0f7f04c1541d7bcf1dc918f2abd46e1bd720f914f3fa3c101f36bf502bd1ce8cb7a1
 EBUILD radon-1.4.2.ebuild 1166 BLAKE2B b6cf0f84d6c5fc0d1e35eebffa26e39974ac3e1da9c53add118f213d126e2dc50cb821425f5ae17f07bb9d64d828f55664a2388b9906315170a9566df81445b9 SHA512 09bf5be53e477f40fc72bf4a3be735b6b8d3e63b8401940e2a181308d2ce0cda52ced00e1231677291f1dae0a40839ca297580d4a4f0fc2c4a4c3a7187db0af1
-MISC metadata.xml 258 BLAKE2B 299a68420e8d8e4bc3b6c7f2bb2a5f7c94ae154205be7de9b8a4c6a3c85d36b6a044e6255bd541fa029624c37a218d83413e67b94e1a997665cdeefabac6cfac SHA512 5ac00c1f96a22fc485627dd89d1432265fc625331e2819b217a6c773ca929b98ad7e4bf971da5dbfad1b3f2eeafa80bad19fbacb228e31da9b8ecd150686a53d
+MISC metadata.xml 284 BLAKE2B 93c4d56ccedd9e190f11ff9efc0e8a9cd98b842c866296d72662ed89a77982e0262907e3c4e057c1a022a72c09bf4bcca752475489349adfd5ee76c2a563264c SHA512 d0c5d0f28e04d527461841465b2280b16622abc6f6fd784e9f1b2630fa794666fa3a88b9962520cf13fa4b9f2817acfe2645c18ecb3aae3f76b62fff198a7ac0
diff --git a/dev-python/radon/metadata.xml b/dev-python/radon/metadata.xml
index 16b590105ecf..9e6e4bdcd5d1 100644
--- a/dev-python/radon/metadata.xml
+++ b/dev-python/radon/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">radon</remote-id>
 		<remote-id type="github">rubik/radon</remote-id>
diff --git a/dev-python/random2/Manifest b/dev-python/random2/Manifest
index 4f08a013d408..4c47088ec996 100644
--- a/dev-python/random2/Manifest
+++ b/dev-python/random2/Manifest
@@ -1,3 +1,3 @@
 DIST random2-1.0.1.zip 21088 BLAKE2B 69747711e355d3dea2b16562a6b9cdaa170732172e9eaac9a5cee4b8058f569e0c4527aec89e408e6472168fdecfc52b87703d23f153ec04f6ed2c049bcd162a SHA512 31de31c27bc6e07e99c24d30e97d9ddc3085fe557bcb0725881d4ab0b4c06e6208f64ba6267098c7b1be4f115ad45b399e841beecc90f71da2fb7d82982e75ff
-EBUILD random2-1.0.1.ebuild 454 BLAKE2B 2e4960de9e9209a4f1cfa0cd4e6e671a35126166af18c7885bba32e7ec358efca952bd103a2874c4d8325e8d4f0fb11cfba893ad39aa9c5895c369bf03f29c6c SHA512 d9628428eb5b1f7052457870dc38855a93a1a5e748b509e2ffc250699139a2f9639c371bb6cd53931b563c874ea75531d5628a69979e973597cb2011f33a4d2f
+EBUILD random2-1.0.1.ebuild 452 BLAKE2B 4f4fe7182d097612d692d0849e29c9a644f3fa866e9459834766e2fc253ff0cd393503addea5e22a802f6d85ccb5bd8e853980a3f377faab77e882aac861c769 SHA512 9d4a711b481969741cc4057594b99629b6d414c23b8bf01d37976484428f7cf98889881cf8fff6ab7a519a88e23a2c1636b959e7bd6001d9827ede97194cae06
 MISC metadata.xml 303 BLAKE2B 3510f40edd7e8583cebf85be1df4f124c3976f30c1a161fb4cf855ff57d3777a389c181346ba8e77234fb251e20f4b3b9fac10e9ee12f5db74cdda4e35e2913a SHA512 a921cabb1c8d9a5fc1271f2fac0c2a31b9a308d53e0b800b9dd14d3d830d5f9ccc7f0c8a773868033dac656891fabfcf19cb963bbcd035d73bfdb5aecee1f1ab
diff --git a/dev-python/random2/random2-1.0.1.ebuild b/dev-python/random2/random2-1.0.1.ebuild
index 28874240b659..3d3b483174c4 100644
--- a/dev-python/random2/random2-1.0.1.ebuild
+++ b/dev-python/random2/random2-1.0.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://pypi.org/project/random2/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="app-arch/unzip
diff --git a/dev-python/rednose/Manifest b/dev-python/rednose/Manifest
index 02bba9c98457..54cf04c3c40b 100644
--- a/dev-python/rednose/Manifest
+++ b/dev-python/rednose/Manifest
@@ -2,4 +2,4 @@ DIST rednose-0.4.1.tar.gz 5888 BLAKE2B b221403c676947ed61e6d9aa2f32c069ca6171a65
 DIST rednose-0.4.3.tar.gz 6046 BLAKE2B 0486d4743d0aecbbcc49cbee108e3d6841d6f3f4e6165614c96122dc9b9a626ad56cea9703f04adad83db3a2dcd934896eed93ad5ebd30c9a7f6711e3e1be375 SHA512 e0169599f251cd90a2906e489b870e7d10322a82253a3a814bc71aa257bea34bd5eb833b637dbae3128f8f37df79929aa4d6331e246654c83eb16118d637182a
 EBUILD rednose-0.4.1.ebuild 477 BLAKE2B 8b8d0c98fbf5d6703e587c1b8eb90578de6f6bd8da42e7afa3b2176d26c16159b278d460ea867e463e2e34c0380aad31c4a7a4be3f05a9470ed14129dce7926e SHA512 954eef5bdd78b4aa21e80327836a8d96fd9c9bfccc38efd94ac1b4a3417c8b3ca0da3d2ba80b87ad9818b94f94911b724ae250bff901ef5f9b04268fc580aa0b
 EBUILD rednose-0.4.3.ebuild 591 BLAKE2B a4d66229d3347e1867abcc45fb0a6531de9ac4c49f16f93289730d98526631964cc3de252126ef0755f07e89c34a566367fa1c271b49a70e4e36695df56b210d SHA512 6da6a92ad070af97bf33d0f57fdad9c88140aca97042d7e6d9b450d0b2e804979ca187c56fa0648ee703ba26ef3c498bacccda2154111eee7bc2ecc36bc7b2eb
-MISC metadata.xml 213 BLAKE2B 1e766602261a36b4b08092e26df3c49d5b61aee0b8db481ac725ef25c5a8a186a2dd62a8c153cfeb355372b50be596b21c4435f794d8131cec520884c6048192 SHA512 c259346d3ce8ae708deed1a255e59c42c64b88b8301fbc2be5754e8f2327a2f5d21818da297b100d3ea35012d7ddc4004c7af19e70e2d80a1c74281b566235e9
+MISC metadata.xml 240 BLAKE2B a0bef4c8cb43f09e3568f286142b660aebbb07ba60fd5d75916b57fea45bda9ed18f23eaac7e2bf20089ab0d9cdab1e2cc412be19eeb704f6437c0dd8a44bbea SHA512 fb4bb85332dd0ba19ce0141c882a04c4dc93e654ec0f63d4ce43e562b8c1eedc2d65471f2e1122952e14695d25c3cc4acea0f4e9d113c1d05df892637f2a9744
diff --git a/dev-python/rednose/metadata.xml b/dev-python/rednose/metadata.xml
index fc6ac987a55c..465ceb1fab87 100644
--- a/dev-python/rednose/metadata.xml
+++ b/dev-python/rednose/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!--maintainer-needed-->
   <upstream>
     <remote-id type="pypi">rednose</remote-id>
   </upstream>
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index 712c0562893f..6e714b256ef0 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -2,7 +2,7 @@ DIST rfc3986-0.3.1.tar.gz 21591 BLAKE2B b24500baf27e4f17d22dbeb839262edb11b1c8c5
 DIST rfc3986-0.4.1.tar.gz 22354 BLAKE2B db2a7edefa89fd3780721904c5e1b623d34dea5e8913c606336771d22f03c258f0a3cd3b71f42db6a6f2065bb055cf6938c10f166730953fe78cdc50dd0f148a SHA512 a4731206a4179d3970fcf9c21405f7e9686268ef3610ab5ca2413a867d83b83188c0efd5958b0b4ba8fc4076da9bc0cf18aef774213a1b58fc42bfc8a6d5dd92
 DIST rfc3986-1.1.0.tar.gz 39381 BLAKE2B cb890ae46c1428ddca1aed4a49660e2620659e7af64dbdb22c2514323ede374c28bbbd8401a5b4db257ba47e617ad7e8ae486f751fd4a7580808c68ff289ec13 SHA512 5e43ca7df586011900d2f01edfb20388598f77218e5a63904557bec0f1d0cb0a35f4980014de9c943ecc43a5a7ab3f7b815fbcfc9318e494c24a14fed2d1fac6
 DIST rfc3986-1.2.0.tar.gz 40162 BLAKE2B d51db37285366fdc7a6d25632afe440bbcdf4fbca46488082286824f046cfd81129b8f0e0695f986120276cf446dde5751dc52ebeb5f2f61f60c5acb92f2da1a SHA512 b88bdc47fa2daa6a9ffc339b1b997a85d0c8b3bf3ab271554e2a1a684c0394370e9cba07a82a542f39533a4c8cae69414234545db6caa2508e0ee7e7f8bdff3d
-EBUILD rfc3986-0.3.1.ebuild 686 BLAKE2B 9f0bd1c385290078ed8663b8ad488e397e64c591f542c68101578168bf2479a92bc0d868f0b02a75a5c7841126076aaf46496e07e1fb897b48f93f041f49e73c SHA512 491690df366757ea34a039733f1a0df0b0643137f2bc40141dd11cf945948de3f47959e1de773c23dc7060bae093ac47d04b7bf3c89bd480d0dba039a64516b2
+EBUILD rfc3986-0.3.1.ebuild 684 BLAKE2B bbfa4817d01dccdbd81006a1a61a1105bf2c357eea435a5049914ee77807a95dd131dbfdd6dc72bbcec9986722b8263677f6613491155c1c78e9e57efb7e3659 SHA512 8075cfe84d1af350892b7f810cff4a4ab2dd0983a64129a3cf65605037a8b98e1ad52e0325774545b19f6276036eedb16ab316672a3b67c6a5f58312e65649af
 EBUILD rfc3986-0.4.1.ebuild 690 BLAKE2B f7639837c58d894feec2e5b92f56116f408be2f499f80d512222cac28798b7b2be9d30d141e90fb71ca86cc13dbe41b35813bd23c251931fc1988cfc4cf1aac8 SHA512 2e294c4cc04988aeaef22ac15617fd903205a286d9e818e5317b604427e31f867064731d5468b3c6627ab4470904724dd6adc7725b090185aac110c579f07395
 EBUILD rfc3986-1.1.0.ebuild 688 BLAKE2B c44320f38cb46cd539b198d5458bb48d7535bb6713fe41a4732b1bdfaec54614d4a8f81f4273d0dd92cbde35d33f4223352242a18bafe4712002d4a1f8208d0c SHA512 9f2283b456e0302f2bc41704c2f0cacd585453cff5c781ec61ab44c1875dfd7b7106a20d0328832ed4b4adceb335d026c368bd58325e28a51aa17765b46662e6
 EBUILD rfc3986-1.2.0.ebuild 687 BLAKE2B d6497000ea1852e52f43e44c90f5026ee9c98ff257f5f692f56894fa2f34e1e6425cade3ba4b5ee043437b5a7d6d890338b40876ba61729abef2861c942cdbc1 SHA512 156c01c2b8d1f22b3f91644e973e382b8ec0454d9e9067b6ff66c354fa056a69672ffce0b65cc93f1b55b201aacc6d0ab9b6ac568dcbd5179b75817972320802
diff --git a/dev-python/rfc3986/rfc3986-0.3.1.ebuild b/dev-python/rfc3986/rfc3986-0.3.1.ebuild
index e76bd5cb7344..bea78dfa82bc 100644
--- a/dev-python/rfc3986/rfc3986-0.3.1.ebuild
+++ b/dev-python/rfc3986/rfc3986-0.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~s390 sh sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index c4d1c1415f15..f39e9f501f94 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,3 +1,5 @@
 DIST rq-0.13.0.tar.gz 45487 BLAKE2B 1985a097d419b50b19771a5f1c1526c8b8b3e9b960f7ecb2817cd731a9af0c37dd38e215a556d35ae8107cc93c3da9c023d4e73eda90e776d62a994d74f5bbda SHA512 f8cf5c3cf7360e0640a2ca97a42c85e67e59835317d04dc752008463224e073053c70ede17e179e1e8d287b3e4ed832971a0398636c49e2680f1183f0ebd2302
+DIST rq-1.0.tar.gz 45516 BLAKE2B 10af545640c757671d2da4691d06b03fe0b61c82351824a51f8f382bb0e7380312d6902ceff86bb5fbfe06ac3bedca3275394063e6576db33e78d20610083527 SHA512 eb3040c5c312123ff99158d504f5fea8377c382a1067d923db29a9087e7e0f7d5214ca1ab1df190d3e9872d6d00917c2435730c121dee1a4c410e65d2875d918
 EBUILD rq-0.13.0.ebuild 517 BLAKE2B 43e42a588fc0ce20d86e0b5feed41504288b6d4db77c8a27185a849d872658adc77d3af8fb207b210ef7e1d9895f075f28186ce52a534b4478df362caf445433 SHA512 8fc44fcd6cdea706be024d5975e004603b4ebab7345018bf959572cc8004fd4e58330c84e4a743f5bc45f3e6a3b319aa8bd53d1bfd4539285a2dd2d4187d02ae
+EBUILD rq-1.0.ebuild 518 BLAKE2B 8cab95159ac28836339f82e2409ec2e1fe0f972021b085c69c0e763dea9e5440dbfc7079f4979f225ed07d5c3d565f1171cd41b12b7247e7b693b9e9863a589a SHA512 b1fa464889fdbacb193b5f80f4a004b2599724dcdafd61868e8c4f9752db6618691a1eeff1777cb0e5599a6261a6ff7ad83b80f497da6cb617b1af8d29535b8f
 MISC metadata.xml 327 BLAKE2B d4518f6d7090440fec7e9518fbce9813be8c9e7bce9583bdf0c47b1ca456a078d23fea12f20febd4f4bad6d2e57109e5acf301bdf724c6cdb5346749a3e42989 SHA512 88bc51ba0079d132b0bf9b053e33262f5cae9c4a66f561d6c7303066f117e2196fbbfbce5b4cfe35c7f1cc5020b3818c365dab4dde696d5543dc70ca32d40ff1
diff --git a/dev-python/rq/rq-1.0.ebuild b/dev-python/rq/rq-1.0.ebuild
new file mode 100644
index 000000000000..41b1969f2d48
--- /dev/null
+++ b/dev-python/rq/rq-1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="simple, lightweight library for creating and processing background jobs"
+HOMEPAGE="https://github.com/rq/rq"
+SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=" >=dev-python/click-5.0[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index 274274f9f596..3f928a807340 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,7 +1,7 @@
 DIST SecretStorage-2.3.1.tar.gz 16073 BLAKE2B e4769e748ee39596c51012a6ac626dba2b019238a8237678c47d713c2af4b0e88b50d0068b5dbf3a405b9f7b14a7df64aabf751009dd21ab25de65ead2a79c38 SHA512 69a2c86a1abd904b7d71bbb59cead3b2588cf88d7f35cbaf64d18ff9aa9ed62ba9f79d0bebd10136aa8a0edb1ff8a1d1aff70cf8e519dc74303993ef0d564047
 DIST SecretStorage-3.1.0.tar.gz 17767 BLAKE2B e234a7f34b5ca2debfd04d4f3b4b4e2a1625aa346133e464bbc1f094381445e3d0c5460457c687f55f6682c6b6085a757edb23a6029fe5c2abf139278203f326 SHA512 a044009480b359aecb0c8782f04e4d02c3c1c0e682f72733896c98f386562c43766318963452d60028d0a92d02903130278cf26a5c206f5f0909e106bdb2d133
 DIST SecretStorage-3.1.1.tar.gz 17036 BLAKE2B 1dda10a5f74727ec29392ff2a3ec65b841aff86db21223ebdbf291afcc9ac7ee68de8c62e5929aa45aafabc791ac02ed80b6785e69f2d4b51d827fce8bbb3443 SHA512 295e0f75c772edf153480730dc20051f06e60e040a18f169620cb4aaa37b8c1a254a496464d3794a38cf49fa884a7b561fe364816f0d12a5b2622c77259f03cf
-EBUILD secretstorage-2.3.1.ebuild 685 BLAKE2B 5224d391e50831fbf97acf6ef2c9e5375037400ea81f5deb04010fd206369461e99b54a9d8bcadb47333bf7d4270b9213cf20a6e0f9553e7d05849df4a3bdfbd SHA512 ec262452b5dd402eb99e013e4da29804d0d2df0b566869efb2beaa3b4d3af3f7e8c38b3372c4e77d28da7ded7e36263cbf47b819bdf159aa03163f37f43e176e
+EBUILD secretstorage-2.3.1.ebuild 685 BLAKE2B bc52c297a34d07f8c80f7d76c83f5dfc328618a1fa0a691a2cdf8d19f00eabcbf4b7e5ba5e45507b7fdc32b59de0206540ab856f3a2f0798d35904970c404b21 SHA512 a4dc1d2c2e156ad187b202b06c2e116c51ca229985a1bed269c99e9121952ab2f130a104c680a55444cb18449cf5d9f4239340e0103e08c645f028c441f727a9
 EBUILD secretstorage-3.1.0.ebuild 1069 BLAKE2B 702c60c40f07c6196e45fe96bddce9049cec6f24ab4ef488dd36245a85592c8d743d7d7a8c1df6565687d00fb3df1be06d4f8b3c39daabfc710aa174420158b7 SHA512 1b7e96d396029f2e804279477b501b95c5c6e61882aee5a68fe871844d874f51ae86e62deba076aa7178d25dd4e1c5b008daef65db51d2568c2d911cb2e4fb48
 EBUILD secretstorage-3.1.1.ebuild 1069 BLAKE2B 702c60c40f07c6196e45fe96bddce9049cec6f24ab4ef488dd36245a85592c8d743d7d7a8c1df6565687d00fb3df1be06d4f8b3c39daabfc710aa174420158b7 SHA512 1b7e96d396029f2e804279477b501b95c5c6e61882aee5a68fe871844d874f51ae86e62deba076aa7178d25dd4e1c5b008daef65db51d2568c2d911cb2e4fb48
 MISC metadata.xml 377 BLAKE2B 6401f07923ff58cc70bb0eb9d08efec05924c5b74102e1ff2e9eac0d1f2dafc1f4ef8e31f2434344ad25a6f2ee71061aa23c232d23214d91c4ce5c7de437da64 SHA512 56c6fc8a7b58a5ffa5e2d705567203cad260629bcf8581203be8ec2480a16603334e3298583c297a8e093881955fecd457b250af56bac05871476041d217bd95
diff --git a/dev-python/secretstorage/secretstorage-2.3.1.ebuild b/dev-python/secretstorage/secretstorage-2.3.1.ebuild
index 15b6811e5eea..a706011c6aa2 100644
--- a/dev-python/secretstorage/secretstorage-2.3.1.ebuild
+++ b/dev-python/secretstorage/secretstorage-2.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/S/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~arm amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sexpdata/Manifest b/dev-python/sexpdata/Manifest
index e0c12fb0f153..d132b6ddf550 100644
--- a/dev-python/sexpdata/Manifest
+++ b/dev-python/sexpdata/Manifest
@@ -1,3 +1,3 @@
 DIST sexpdata-0.0.3.tar.gz 13105 BLAKE2B 36c4082a63f6748759d71fc38a056ecb7467eafebf0a1a0b006fbef1302488f23a859462c9526dc365f7c88b8b6c331dc6e4892e1d96358abb44ca60a909d283 SHA512 03d4d1557bcc950124e408d6870894c8ee9e72a2ee83c881adf48f8e53bdf3744b4f3e3e133a74a195d236424b434cc690583a68d8395324ca4e84947e548501
 EBUILD sexpdata-0.0.3-r1.ebuild 500 BLAKE2B f314953b5c2679bfccc10e5ebc604e87e4faf4815df8c2df124d14241878664fc7cad6ecbc1d52f1c310160c332acd2f9e70eef5007069ba9f2a26467dbcc6e2 SHA512 97ba4723096a9e4662dc549a22d878df1f201ce2da81d08ebbc7bb21c60c01066c74dc233988ebeb6a9de319900cd597133d0345f0d621237cf4dce2a68fb1c8
-MISC metadata.xml 220 BLAKE2B 13c90cc108b275cd3375ae10544b5268e9c2c64ee4405aa160040d3b0aeefa02f5c96be269188910ac7e891fc926a1771d4dbfed7f8b8af6a672a88c1e37dda6 SHA512 6d5e0b0f03275b339a2447c81365962abe55791c508e85862a098b740dcb09fc5307d4b0c98d1c86f3673694d255a4b786c8aafd6c54382de6e4da9c793ece80
+MISC metadata.xml 247 BLAKE2B e205358ad766c8aab0a8a989527dddeefc2f823cbcf03bab4b79f6a8fa1094286715eaaa0abd97c10f9d3a1c58c2a486ef9846e851788daade0e567c31848067 SHA512 9e0ba28b7310e552922e103b228d991b97d2e670bdf48f384f496099b676234ac5449e4ff2cccada5affa0510272bb33c125226f1f54733fa83038e8dccb8e6b
diff --git a/dev-python/sexpdata/metadata.xml b/dev-python/sexpdata/metadata.xml
index df41c99cdb7b..9f415dca82a9 100644
--- a/dev-python/sexpdata/metadata.xml
+++ b/dev-python/sexpdata/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!--maintainer-needed-->
   <upstream>
     <remote-id type="github">tkf/sexpdata</remote-id>
   </upstream>
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 848b1efbcd90..62519a195536 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -3,6 +3,6 @@ DIST sip-4.19.13.tar.gz 1038815 BLAKE2B 0b6f2941140a535cfdfb51db71cf9a55e5f65be8
 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 2450 BLAKE2B 713045900981e56d541090e9d0a067727372021fe2f4e7fea116fdf379d7565e7d83a853f0007c7ccef860e3694656b4c9f4bb9ee5c307fb19808b8f687377be SHA512 3c5727aac8c0e7bb90211bb9b554600bd2348016cbd55894bf63d4537f4ae5b0c204d4f4c78c8b66ee18366c521b2f36aac07521cdcb87bf5b92f48deaff4d8b
+EBUILD sip-4.19.17.ebuild 2446 BLAKE2B ca7377f5a6a3352ae0622fb032a5fa6e5ed3a3b8d993dbb9306364c47b873b055a9a0c54712c4e91f904ff92beb86c428ab85df023eda727a6acebaef9be8359 SHA512 34c1643d95d2244e82e5a948352ea58b43af6bce24994f00d07465906c0b2e80463c0737c7e99eba0358c01acaee41e35c4a0417e444d69d18999c80e376d8db
 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 ca5070f83ecf..458a82626d2e 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/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 6f98f08ad2f4..e3e1f4ca38ba 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,4 +1,4 @@
 DIST snakeoil-0.7.5.tar.gz 303270 BLAKE2B 66d00cf50c8efd73d765904b9c7e8ba725caef9608e68f5707ddc09358507fe64214af73b333ec5bee2ef950d8dbad474cb5d9e4412757bc3c82d75909f6fc23 SHA512 b9f6efce2e3f5df83248b1faa84493aa11d8a08935e3991a56daace96e0de39dd5c7d25a69a4394f7ba163de78ed56a2619ef64c33114128fc02052d676a86a5
 EBUILD snakeoil-0.7.5.ebuild 961 BLAKE2B dfa8bdee5204a242d8445a7f73b11735c31334a368b4afb22ed04112ed5f6aad2aeef2cce592b3a18664308c9d2db05e6ead41ca9a780f8af8dbaf0d2f794263 SHA512 29daf7bf4ff953e2e3f2533528de2daf343ce355338a209a37ff396cb80ff375ca2428eb8a2e093cbe582bdd6b2f7f05c9b31a7d9b348326a99e0602073c478f
-EBUILD snakeoil-9999.ebuild 892 BLAKE2B e85dfcd2f5b553e0566b7263e0c0d0991e917ed1dcf5c23e0e6fdca91287304ad6b710ed593a68971e86a1751f233239d116788f4efce1382cc2a04bd89dacd1 SHA512 c92e62e19861b8f68aac250065b8a27ef678d4cefb7a3699bc8d2e692cc58824d90c8a4aa29a2f6a049e1e5e6307ced23370728f278e3f40d261bc43b4fcdda9
+EBUILD snakeoil-9999.ebuild 890 BLAKE2B 1578889268cc914672d064f43dd6a68ff3114f3b622d9af4dc22ace00d692e02577ad2a9c58e702171741f92e352f8854bd4f45713360c03a22bf354a30928d0 SHA512 9fc132ef92de1f43d4f46fa86046a3f1c7db096dea68fa43d417bfcb9cb4ae345383147681d1373b0f5325e78e86b8e6fb66a39f002dd57e639efbd4af7498a8
 MISC metadata.xml 385 BLAKE2B 7e7195d4876c5cb5db98288566121559c8bd9208138fbd211edea15b324acb11d09a2bdd96c0200554d7e9c734202c7fd341f0d134f271c82dbfdfe75e5774f5 SHA512 32645380ddb0bd1edca1895714aeaef3e0c61c04cbacb50a414c2fd26b6978c8ea83b3c420538cadebf3a631b5aec2e9e3fc0dab98d1e1a99cfbad33b8d58715
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index e7629b6dfc9f..901b625aba59 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-aiohttp-theme/Manifest b/dev-python/sphinx-aiohttp-theme/Manifest
index e8ae04d262f8..0d0912dad5a8 100644
--- a/dev-python/sphinx-aiohttp-theme/Manifest
+++ b/dev-python/sphinx-aiohttp-theme/Manifest
@@ -1,3 +1,5 @@
 DIST aiohttp-theme-0.1.4.tar.gz 10723 BLAKE2B afc398bb65e69fcc931f214c613f789da07c89bafd26ff207d4c5666edbe323f77c4a6fec09817d4dc6bb1d40e21ddd82f0b7b5c25dc5fe89b8b83c1c423bad7 SHA512 b487c9095a677baf9471b93be5b9cc3a697f62d2674d27ea4a7aee043e5dd75c5543a0e0a2e51c28e36e5bbf324bcb6d06786b31ae3b492ad2f972c6776c40af
+DIST aiohttp-theme-0.1.5.tar.gz 11132 BLAKE2B e405d3a3ccc0d8568ecc42f8891eebe405d2d75cd47e60910f59ebc979da07362d3cbc20833412a462454b2703aa945f491e85c10b206a356545a13cbc07984a SHA512 106a77665d907c45db1fc2c23990eab61cc70f9f373ce7fe0d231f9744efe5dc7119606bcbdf558ceb038edd7e0cb955531fd74c496923038bcfd799bf67616c
 EBUILD sphinx-aiohttp-theme-0.1.4.ebuild 564 BLAKE2B b00223be97236b9e638138ca3cbbb37f49e304ec1a4cd852641ebd29d4fe3c1410bc69e2744b75a4934e4b6af27beb70dc978da00331deb8ec17b841f5682d3a SHA512 90c40bb2301d3a37a6a85220637b77738ac2b63c0eb7ca337bda899a68da786a13960bfbc0d484d3bcc1002751f15555e76bda99b607d82cf1be6c79cc43bec4
+EBUILD sphinx-aiohttp-theme-0.1.5.ebuild 566 BLAKE2B 525cc18aab65b52e73e3429bf6a5cf60a0765f3eb544d0a1077ce82256a2e93497862018e48315869d8e3d7ae6196f6c9bf06a653260b19d6b34607223c8c0d8 SHA512 ff114b399f620e2271a83ef2cf4ccbf1a20838d3f8289a4d7eb9e27ab71122b4953f40ccd2d3a93fcee761217f2ac647b8c7a595d7eeda1adf8a6399f3b2b844
 MISC metadata.xml 356 BLAKE2B c6f21942be22de996083446c4cf4d1d188e582ffc7550975b513475021f7097835512409e58eee10f86b205770734c968234d5fc542ec1a622d3883714685824 SHA512 9130b60a4ba5ad45d7bc2ae275485917c365933b215e9551ab000cd5a34a6932a07b02b7513d0890403fbf6a7cd713dd8cfcaaccd1c4819a0a9f15207f062d9a
diff --git a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.5.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.5.ebuild
new file mode 100644
index 000000000000..b6446239067b
--- /dev/null
+++ b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+MY_PN="${PN#sphinx-}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sphinx theme for aiohttp"
+HOMEPAGE="https://github.com/aio-libs/aiohttp-theme"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/sphinx-testing/Manifest b/dev-python/sphinx-testing/Manifest
index b72cd12b750e..24c32e3e87b2 100644
--- a/dev-python/sphinx-testing/Manifest
+++ b/dev-python/sphinx-testing/Manifest
@@ -1,3 +1,5 @@
 DIST sphinx-testing-0.7.2.tar.gz 11040 BLAKE2B 503e38eabfe8dbe28942f9165a83db2dec0f9ac52e1e55f7298848b7a6b55244e1b5623bfda7f4e1380eab16ef81cf51c6bc11e919a8b45506f17759ae0ee181 SHA512 d267c74d97443db2df69914a825da969021e37fc61b8a664ef382504fa826387a95230bf9259b58c6f26721f33985fa2168d2714342a2166b59740cf1b3ad724
+DIST sphinx-testing-1.0.1.tar.gz 11513 BLAKE2B 46ede243507a0d90b2ad4b918deadb818491bb0ed15ce41886040c52650f9fd348ff57c03766fd1e7719bbb54726f8915e091cf94a5396da946102ca49fd07b2 SHA512 2d377c0c6fe8e34a463b35e96938507a3ca35fa06cd19a2682eb55825e1b88982a80a02ebb9a02a47f11ca5e8fe6a5b9e5c8114d955fa3b774e0148e82121818
 EBUILD sphinx-testing-0.7.2.ebuild 670 BLAKE2B 91b3ea4398ba4e34b54136fb3e101a407cbebff496b6236ef44b462494d579c5fea5b7e216ac2cec3f042b6d6a07a78508ff4dc8808df9a12d7dfe9980e02cbb SHA512 f707f939fbed55ac43e1dd8cb025623de0cbc84fa91aac7cf6de9a2292c6c5bcec448765a1e655535369a09ecb5fe46302127d688e4c631783a752b1ed0a219e
+EBUILD sphinx-testing-1.0.1.ebuild 861 BLAKE2B 9607853fc044848f4a64c547c522a3b90e1a01d9766d8b2a74be7ccf9740b2e24a4b94ad382f60b1f35b35dd4529fdc88006fcd395a99a4d2c940778c4455974 SHA512 7e6996b3b5017ade03c6532860931305a98adc2d62eb6b0e0bee49c8f485acde24aaa198714e1c7b52b82b49a470058c0b1caf731fa1970669ec3b0e8ced87a6
 MISC metadata.xml 340 BLAKE2B 9a1df283aab1420d7818f4661b57f6d60cd734016c3711c633b9a6a11c401c8603503530fa5e1f50940bd28c1fed83196c1c543d16b5217b996f6afef23175a8 SHA512 f5299851dc6aa3c3ad1109123ac6c4eb5b5c7e1177fa1f068da5cef0920bbece63a8f1c424c5b95addf661e5a7d15a05a427676f6c272a54741495c77e316b78
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1.ebuild
new file mode 100644
index 000000000000..d4cb8e44dbb8
--- /dev/null
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Testing utility classes and functions for Sphinx extensions"
+HOMEPAGE="https://github.com/sphinx-doc/sphinx-testing"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
+	)"
+
+python_test() {
+	# NB: while tests don't stricly use nose, they rely on some side
+	# effects of using it
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/sphinxcontrib-asyncio/Manifest b/dev-python/sphinxcontrib-asyncio/Manifest
index 5532f52a8416..dbb6e0d1b248 100644
--- a/dev-python/sphinxcontrib-asyncio/Manifest
+++ b/dev-python/sphinxcontrib-asyncio/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-asyncio-0.2.0.tar.gz 10689 BLAKE2B 9e03989a1ed22d7d467bdb7626e2e908407a0de15a943a432ff9707340f0cefe7caf1684380c25764637798b585b32287c4bcfc0f2014a78b7019547405e7ded SHA512 2ca25717c03385ae9bf879b8efeab8d508292d07f96d941032720d755d3db2e7bbc3c9a33c6103af9d83849ed8878bea1048d349bd0873288ee2addfee9756b7
-EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1017 BLAKE2B eea07c8ee16bd43974402cc0f20365b88f9febfd483c080628c0df615d70e85a8537a5d845d00bb784b9938935cd59ebf9a57325fe7c2c99208a504863adcf84 SHA512 8c3fc78bfaff76c3cf0e984155ccc151cd140ccdc3c27c1464bd2c91d915f0ca543c62268ec8d50a93283fa5bcf4aa07857c67cb9611bd69a52f51b1a8514f0f
+EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1019 BLAKE2B 9e4a1fa3d46c612385990e2dff5beb00f2bdd9beac9940c92a49627cf23e0ba998a0c68b9da881aacfaf16c2bdad9f6c629342b96fed76c1f6ad1597c8ccf286 SHA512 60a75a779341e0525cdab3e8b970c207ec38b62fa9ec186a748b82d46fd21f6ea84886de129ee290e937f95e81df073e150b4b0105d0a77d0d456d40035387e4
 MISC metadata.xml 372 BLAKE2B fc779af5274229957de772908e2a2fb9bc0cd75673af9ab88e4b6869164c75b7cca2fff4895beab62bbce984e93255b6578a6360621c5d0eefadcf49ae3f787f SHA512 63aeaf1b521f6c789128dc03be198ddcbfb6dc7e63fa6b24eef1cd23e9557d5de5f7c990514b95dd2b74634f47f3f5db89f233dfbbfb711527e51806bcd5a367
diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
index 7a46f7473fc7..f68ae6d84125 100644
--- a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
+++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="sphinx extension to support coroutines in markup"
diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index a597a12d6f6c..00188d00586d 100644
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -1,4 +1,5 @@
 DIST sphinxcontrib-blockdiag-1.5.5.tar.gz 12066 BLAKE2B 4913aa53b365a05db2962c81c3f15df748c3424c88dc70bb5c97325c92492852698246b2d644748fde46ccc9ac6535871036851798db6d9db5e9610c5ef58b45 SHA512 4c007e2c394bf90ff84a000cf44ec1d50b39286a32929c89a64320299a70f10e44da35d942e7bb8697a9d61eb6a551f74bd15349cf0b439369aaaf12d175635a
-EBUILD sphinxcontrib-blockdiag-1.5.5-r1.ebuild 871 BLAKE2B 81254dd1370890e677b8cf300d2a36d40fb1c2c2858b819d8613ee43e4f1a7f6e219895e1781a1aa6ffd8871f302f5f507ceaf0e15526c0acb27e919a596ba6d SHA512 3099521e1a7c8131c279b71962bf7c3368b5268fe066e38f3645b4dee3afb5912faa7b0b0940c2c6e43ee438afdb262329863a711230c34044388505948f2577
+EBUILD sphinxcontrib-blockdiag-1.5.5-r1.ebuild 923 BLAKE2B 29b6a166090519a8a6d7aa3f381661161429db8e5f912f0a92dcb669ad92b23c550097755ae57bf7024e23fd4b58f3dac496e9f973bb742fe75d083249afd816 SHA512 f5d13643c66e24c6095badf6eecc4072bfdbd41928b2042b901042818229ba21236fd4bb0de71ab6161a5031f861d008b839d1eea2c2b592892a47c52189d875
+EBUILD sphinxcontrib-blockdiag-1.5.5-r2.ebuild 1322 BLAKE2B 985de97e36f3531ac5b3ab35f5e868ae5ae1caedd468544b7e255c67d04b697254ec2220c110ac5fd3622b06e361cca7550c08ee90999c557ca6c1eff9466a01 SHA512 0c97a3c79a693911ff35a6a21c5ca74ac79ac472a0a31496c44bab722c6cbe4283d8039a1a031d9c30e8a3c5854dc29b6b3561b629bcbb45cde19b368e20e80b
 EBUILD sphinxcontrib-blockdiag-1.5.5.ebuild 674 BLAKE2B 58d9d30ab0ac583c6414fb8a650bdc1bdd37ea55a942fba667cc0bdcd2618d842518c694636ef5d1a09990b36375c1e6ffcc68c68dea88f6d5e6e33ce50a31d7 SHA512 ac98f936ae0824a53ac52a3cbe87b10a67d44c938eef071ff2bcf3e8c9996d32b858acb4777adc39a0d730261dc35278479479fbffbf41176552373312235fb2
-MISC metadata.xml 415 BLAKE2B 3fc15637b9b04474ae8c9a0dd7ada374a37648e6cfe691e0979b9bc6b122e4b76c22f64faca554f03fa404f63fe6d0447bc3530382419319904c849efcc70160 SHA512 857a231d759fecabeaa764a2ec8181788f5ae4d9271414f75d001ef60b0a146f533a277dd6473678d398013fbde58c4f0479291089653a521d30cc1931f7da89
+MISC metadata.xml 494 BLAKE2B 07d540997f553498944f9ddc98afa804bf1dd6e4cce5447aa8d7990ebbc375813cb7d9d284915d7bbc181b12cc905923a1b858b663743eb408bca485e40ba22b SHA512 f83022805ed92e559cc35f663da9eed77d33fbe0d25bba287b77fa53235c14534493c493d107af0ad9573d6cd7fbfafe74017fe0b96e65afcdd45c5e3761fdde
diff --git a/dev-python/sphinxcontrib-blockdiag/metadata.xml b/dev-python/sphinxcontrib-blockdiag/metadata.xml
index c0b469c17c97..718fa6583747 100644
--- a/dev-python/sphinxcontrib-blockdiag/metadata.xml
+++ b/dev-python/sphinxcontrib-blockdiag/metadata.xml
@@ -4,6 +4,9 @@
 	<maintainer type="person">
 		<email>dolsen@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
 	<upstream>
 		<maintainer>
 			<email>i.tkomiya@gmail.com</email>
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild
index fc5d9a3d0f2d..31208c5e314f 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild
@@ -7,24 +7,20 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A sphinx extension for embedding block diagrams using blockdiag"
-
 HOMEPAGE="https://github.com/blockdiag/sphinxcontrib-blockdiag"
-
 SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-
 SLOT="0"
-
 KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
 IUSE=""
 
-DEPEND="
+COMMON_DEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
 	>=dev-python/blockdiag-1.5.0[${PYTHON_USEDEP}]
 "
-
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild
new file mode 100644
index 000000000000..a66bb2552775
--- /dev/null
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A sphinx extension for embedding block diagrams using blockdiag"
+HOMEPAGE="https://github.com/blockdiag/sphinxcontrib-blockdiag"
+SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=dev-python/blockdiag-1.5.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${COMMON_DEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/reportlab[${PYTHON_USEDEP}]
+		dev-python/sphinx-testing[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i -e /build-base/d setup.cfg || die
+	# Those tests are known-broken upstream
+	# https://github.com/blockdiag/sphinxcontrib-blockdiag/pull/11
+	rm tests/test_latex.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -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/sphinxcontrib-cheeseshop/Manifest b/dev-python/sphinxcontrib-cheeseshop/Manifest
index 696cbd284ce2..74e14e699936 100644
--- a/dev-python/sphinxcontrib-cheeseshop/Manifest
+++ b/dev-python/sphinxcontrib-cheeseshop/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-cheeseshop-0.2.tar.gz 3568 BLAKE2B 1d3d8378cf5c1d13ba2ba3f9c47a8f2f7eeb4b48daa4c57e639c65101cd7440932e3f62bd112a87ae24bfc3578a1e4b227584d011cb05a0df5f699c05daae69a SHA512 5d6c88c0c43f37b94ebe6a2a62f795a6f7d5d6c407b808d6b21d54c1775fc4b5f22466c13e61adc16ac7973ba11e99a66da8650c869856f766e6bb3a6e99923b
 EBUILD sphinxcontrib-cheeseshop-0.2-r2.ebuild 743 BLAKE2B 44bfa6856c8eadeed00e5824badcc8b6e0ea44061524d21b4547ab36c47ffd33c7f4612e66182a8c75339538d484199bbe2ba32c8a6775ac1c58510ac884c8bd SHA512 c60cae92ca6b469f8927c2bdd5fc69953495b176cbe4b2c9a1b74556aefb1f8190ae94b8f646410276fb6e10d55b8a79581340d852bad1818cd00f9e20b32fbb
-MISC metadata.xml 294 BLAKE2B 333c8af299498ae2721ce4e5a588c5faa950265aa0e46524ad514244a16b2061d9fadff09a5cd163b331516efbd75ac93c3f18b1954c27c3f821d4834f28cd85 SHA512 d259bb77b24de727ee5fb0f978c99240bb97c15f31d61d33961b54254ded998f05fb3a318c2b734b4e251b90ec99942a599763bb3ef7a1a33e3defd2940a4ced
+MISC metadata.xml 320 BLAKE2B aa668887453d4114659d84b157fc186d07f0ffd776f04f1637d5cb3379751ca7ee84ae89793ebab4bc86bbafe0c532483ae122351e047265aea930ce48e1f3d3 SHA512 93a35e740af47448bbc48981f7d2912bde5783da7d2ee40fca7c72e164fd5f3d4d4d64beae5d2df610c13b4216c5a657f3375b48de1135ad7060fb8026af0df4
diff --git a/dev-python/sphinxcontrib-cheeseshop/metadata.xml b/dev-python/sphinxcontrib-cheeseshop/metadata.xml
index 0550855b51fd..61161ea3ebf6 100644
--- a/dev-python/sphinxcontrib-cheeseshop/metadata.xml
+++ b/dev-python/sphinxcontrib-cheeseshop/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-cheeseshop</remote-id>
 		<remote-id type="bitbucket">birkenfeld/sphinx-contrib</remote-id>
diff --git a/dev-python/sphinxcontrib-newsfeed/Manifest b/dev-python/sphinxcontrib-newsfeed/Manifest
index 31d0dd17a712..20fb00ac7cd2 100644
--- a/dev-python/sphinxcontrib-newsfeed/Manifest
+++ b/dev-python/sphinxcontrib-newsfeed/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-newsfeed-0.1.4.tar.gz 10862 BLAKE2B 708c7a725ac36f54ea735953ba9d230b05da95147eabc91de9d610d3e02ec7d0d1ab8f5882d4e97327da425fc49e1b1a1753e011445ede859edd4f3cd5fb2a16 SHA512 96d9d0c15fca8b62f945bafc8f0eafa62df9c471f7510e2f153e47b66534e5f3041e5c01df772e6c35a9f09baa70064642f7f0fa43ccfd33dd64c2604494f2fc
-EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 825 BLAKE2B 04626ea9ef85f430826c0841866c470db1f556194062beacfd96d9d5928d0857c5a4c5ef15285ec7225aa4064b618912171e5b4b691587af7a867f000f1aa958 SHA512 76199e8a4c2b044232d96913f82a2c38b4eed4b957de53c7d85b0123f662663dc9564b8fe4b577cf6e5d90a974ce0afaafef74e36841a74b6ebf2f9abeab7566
-MISC metadata.xml 300 BLAKE2B 965265929cfb966b7914f8111736a76f8681cf8cd3a17fe0b530e777553c66f7f26d7e994f25c288769c091bfc0e89fadf8f9fa4793050b6943de8b3920f1839 SHA512 e1033c151480876f5aa0a93db30e147b587215059224915f26b76a8aac04e699bb4bd66ed99e4af6f5126ca513f4946e9b6eecb358a9d6a7b53977e4970f7faf
+EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 827 BLAKE2B b9378fd412ff863993f7a7d48f9527ae7798f6056ebfe9c4b9c65bf559066747143703bf0ee83a9e361467e5187bfc8ed3385882b75906cc4c3e6ac30527f213 SHA512 3b400e6b75e7f172eae9b096b39a3e8f3e1c63181fcf96b635fedf924e09ecec4a1125105b4a34b5f412a378d4705c53559b01b9aa473385b4ae14f62fd834b0
+MISC metadata.xml 326 BLAKE2B ee27050dba4cec236f08ae168f2cae643f35f0e20e20d0803f7783694f4f6c3289faea1df4ae326dba6125eb6b7f8d275f449769b76220eca973bc5fcab11e45 SHA512 e47c6ab16713c27cbd5353250642751d73d39bded06b14a6571c2221f9ced2f73c6f33156acd1622789a1aaab6779a49bb85192c130e77aeb3d05d9a1513c69f
diff --git a/dev-python/sphinxcontrib-newsfeed/metadata.xml b/dev-python/sphinxcontrib-newsfeed/metadata.xml
index c07ff69afaa3..8958a646ae22 100644
--- a/dev-python/sphinxcontrib-newsfeed/metadata.xml
+++ b/dev-python/sphinxcontrib-newsfeed/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-newsfeed</remote-id>
 		<remote-id type="bitbucket">prometheus/sphinxcontrib-newsfeed</remote-id>
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
index f6207761256a..200775feafac 100644
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
+++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index e36881032229..e54104261076 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,5 +1,7 @@
 DIST sphinxcontrib-spelling-2.1.2.tar.gz 35411 BLAKE2B 9738e18664fb68f6f8f7aafb626b6712f7c30947681f6c5ed288dd76c2b24245cb4083887330fc05ef4fdc64756245d997797ae36899c2c762489fff13219a21 SHA512 993f371e064e8748eb61faae649fb293b154a35955ff84d86fd041f4e2cc4c6e22c686007a67c3b63b0c50fc01ed226708f27db347e58847a46ca733c997d51f
 DIST sphinxcontrib-spelling-2.3.0.tar.gz 35687 BLAKE2B 9b48f1953616875bd5f0106ab0a01ac22d176b93eca88da7e36804eaf744aaf6e941d3dcb9f905f9bfe54ea51eb5c0d14d954b3def809994e7ba661e09cdb18e SHA512 194023d2c5ba594a264740a2a45ebd90d37fc17fbd3bc8c53fa303581a652c58332f998a159c9c6c58718dd9898c9b4639e98ee114a2ee1e5f2097e545134a1a
+DIST sphinxcontrib-spelling-4.3.0.tar.gz 38316 BLAKE2B 4bfcbfb22c10b5bd181ef5ba7b64815ccaeaa50f01ccff96adab914cfbe6674ce28088e5eb5717b44531565f961b1f159014d235275065070e22d96d08cd4af2 SHA512 0d1575079be7994df905de02d31ad2c9c3af9634a487fbc9c565067fcbef6c36fd4fbd326ccbee4b40b3ff14696ad85a97c68018a956ff3e2f7e1be46bb3a074
 EBUILD sphinxcontrib-spelling-2.1.2.ebuild 1003 BLAKE2B cc764ed935d0608ba908e03c9aa702105f1613ec1fbcc1c582feccf7b92be69ed08037795999fd14e70952ecb0749ae8ab53d3bdbde174353460679b705f95e3 SHA512 237b19d0e13c0c9c19820ab2f52bdba0b6bfdaeb01e7781b43ce0caac00c6ba69ca7ea6b795e30742374346cfd040bc16211a92c13eed58cc698ff83373aaed0
 EBUILD sphinxcontrib-spelling-2.3.0.ebuild 973 BLAKE2B c9f7b69345a2367be31bd1527eba0c2e96e71f681584eeddd65b4c87dc189c4f5cfdb57e6e7b351bb10b4e81d8ac109e166287e3eecd0a3ae4d9a646fc9cafbe SHA512 3a00a54d44f22027dd15fdaf3a6405eaef877d1d657d9cb9c3f5c089377b7838249ee523113fd9838dedf12a42b69fb5923c4362b881b67b72fc9078970c0ab1
-MISC metadata.xml 299 BLAKE2B 2723daae5f4870ee334a53aeedc5172034e5ad084b91369515b36e010e4e63a436a1967ec5e47fb0a7c57a4a440f2f616639aec965d5c1a5bc1460bf702b47dc SHA512 18274fbc4f1f75db3554f10ff652bad19076f694aa877b2e8135052655f5d41bd3ead6d2ae3aac9c5debc72fdaa746d9508de96d0719e91f83bd2fc6ab797f3e
+EBUILD sphinxcontrib-spelling-4.3.0.ebuild 1219 BLAKE2B 05f2f7f0c37e11084b7e9ad29a76546daa82dccf27ebf4a1c239eb1f1ae39c3931f4fd6ab3eee3a4507663851e8b9c82a7e4f7e306261712cd41f0782a92e1f7 SHA512 549cca4890f5701a5c4c2101e05cb1252a7737722c9ac03170f4d27109e594dee510fa4b3af6ff31982f8d73d9d137f84e738acc996c7ec4db924920f1218c65
+MISC metadata.xml 378 BLAKE2B 238ea1508c65e2b5c05360aafab23da6f6f25693c677232862302d372dcfbab0530ad8964d6e393935193b5f9341f697de28dc2a3634c7b726a7f10762df8d73 SHA512 b5b909cfff41351a21e2fcfda9a9c022d600943038676ba63cfb525cef2d7b85c78b61bc58e33965f14a0d559f74cfef1f943058a4bc7c70cac2be34cda8dceb
diff --git a/dev-python/sphinxcontrib-spelling/metadata.xml b/dev-python/sphinxcontrib-spelling/metadata.xml
index 0269c4fb8409..e91b686e0033 100644
--- a/dev-python/sphinxcontrib-spelling/metadata.xml
+++ b/dev-python/sphinxcontrib-spelling/metadata.xml
@@ -1,6 +1,9 @@
 <?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>
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-spelling</remote-id>
 		<remote-id type="bitbucket">dhellmann/sphinxcontrib-spelling</remote-id>
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.ebuild
new file mode 100644
index 000000000000..90e3c702237a
--- /dev/null
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx spelling extension"
+HOMEPAGE="https://github.com/sphinx-contrib/spelling"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${COMMON_DEPEND}
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/strict-rfc3339/Manifest b/dev-python/strict-rfc3339/Manifest
index ab8161d60db0..0c2f99a7c509 100644
--- a/dev-python/strict-rfc3339/Manifest
+++ b/dev-python/strict-rfc3339/Manifest
@@ -1,5 +1,5 @@
 DIST strict-rfc3339-0.6.tar.gz 16856 BLAKE2B 635da447439282ec64dc7c27a2602d35b28f0a02fb36c16b622b38e73f907e9a39b709c5d87319269ef1357d5716a1d92de7f205f66b2aa77339d63aabdb21df SHA512 7f1e15d60c2295c00647af84b31a1836b6c3994fadbb2695f5709861caae543ae69a3199dffd6dcf7e0768eadf39e496a5e600e291dd0befbe8fc35fa60897af
 DIST strict-rfc3339-0.7.tar.gz 17552 BLAKE2B 74370e28134ee22545c536d9eab383c0de6bba66d1440a77d020c7dc754699c32072300f380bf044e5283ca663beb370a587ea9d111dbdeb46985f76b5c9dfda SHA512 94a2992a9ea41b75527348f0f8dae1d118d57b0764122f874baa85f5e3b523beb219ed83c2d7224725e504cd3737a6bde485957135856dcde470f32675e44e77
-EBUILD strict-rfc3339-0.6.ebuild 635 BLAKE2B 49a1c5c740e0219a6d013eaceee35995b9df9e3da68697df276fa9525ccd76871b5c0962ebb4d84ea626de6e74c401afb7526a0cbcb03ffd5beda8061b30f0b5 SHA512 dd392fdef82416e0c948dbd9f1716b6fae90b22a09d5696f0c6005bf1ece8c89c3bb10d2b760220baaa33f76e6cb4fba952b544c37d9589c949211f031dab6f2
+EBUILD strict-rfc3339-0.6.ebuild 633 BLAKE2B e3a7c14bf7f8c8176b98c00b0386ddd956a74d6fb9ac59a803e4119e0b8d4339f9e69db483cce4cd200ab8ee463b96bfcab5a7270161c7b93349f43db198fd8d SHA512 178a43fe87aad00c19ca8edab6f1a39bef89f1b3c24df94fe27eef77d7c0482c051d7b9d219f7b7c9a58ffa1d2e6d9a2efeb7a2b8746405cea72b88b51c82c78
 EBUILD strict-rfc3339-0.7.ebuild 657 BLAKE2B 7a7632fe48b642a5cad0bd9338cd14313a059ef6a16d235548ce8a07749c0a332377aaed5f95879a633ba51a81901ce1207f1e799389d497f98302d0a3eea195 SHA512 ad6e73c18b9a60c2c8f9b74361be57caf34d3e5c07ff7628361e28cd102278466abef062c43d3989abd8f554d9e49587ab899b52206a80c2d501fc95071c5419
 MISC metadata.xml 385 BLAKE2B 3b51a7f471d2ff03a26cf4c129dd6ef190101b5312d21b303226a7c2c65b06d4910959581c413675030804904029931004edb3a005c47a0bc6caf11761f9928e SHA512 c825fc57c6aad0acc8775432fe511055f26a7bb453628340e56c1615b777cac4ae43dafe6d648a7ded7dd4138ebccc3e5620ec9c5f947f2f491d544d2c69ccaa
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
index 8e8654ce429a..0f0f76928b34 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-3+"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # Not shipped
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index d44d5b42c28e..e30fd5723a75 100644
--- a/dev-python/texttable/Manifest
+++ b/dev-python/texttable/Manifest
@@ -1,5 +1,5 @@
 DIST texttable-0.9.1.tar.gz 11074 BLAKE2B 465738a7b980f2a216d63b268044c1a1b8c0deb986fd398f0ba0ae30ab84020ac6f179b5314a2071592c38443f9cb86387b9ed573342533af9e825000472ebe5 SHA512 7ec37336ef4b253879d0232dcdb4500cad33ecce1067dd7ea26c221dc2c003ee56360bdbd1dd1e00133301c51c67fb2fe9b1703628804a65f2a6ab8a1e830e50
-DIST texttable-1.6.1.tar.gz 11185 BLAKE2B d3fd85de8b6fa14ec6c520c0c0049ee043285fecaf7d31fbc1f361e0c9a27b66a75caf8aa0f85109523143f36ba2da47818ce91c4946c0b4d5391a0a4c5d9028 SHA512 72d4bb5c4f03b1f9dbfc4b1e375ad754e92610f71e65c7e9a0b7bdc88b3753254b143aa607570d49cfca56a3cf889a819e12ea184fdf34594f1f5d118de3c12c
+DIST texttable-1.6.2.tar.gz 11450 BLAKE2B 8090914b20a93283ea3d533a8120d4d2c5f058a0e79550b29d4b9fa740db5e309d84a7983fb6665149e3624ba7039b67ff6a553b180b915a348e5b53e793d5cd SHA512 e59275c64813bd00fa5172c43491820122b6045e1a416c917576cbf595c1ec24d146e571708379f4b32775bda904f16ced0e9e15ab7b2dde78a214f26a1c4de6
 EBUILD texttable-0.9.1.ebuild 426 BLAKE2B e888f87140391d701eae59056abd2f60c30991efb1070234ebb2a9b2d39d1dd30a536c316f9088ba55e8cbd09d546a7d90009364498b94f77909a9419d378d1b SHA512 65182f08de9b8b952c60adf04fb87f02220f94ef6dd5c17980c57e7bf020161dd459831ae402a25bb7573c7f1717e83a948909743218ef8c9702708d676c38fb
-EBUILD texttable-1.6.1.ebuild 818 BLAKE2B ea52168c3b5b09ade19f3019f2e5127546f176f15ef7ed8b037cbe48c90113b037eb58a9e045ac960ee8716108ec62086668f6d0e09122fa7aad98779e7382fd SHA512 0bdb37f701ab1ff1706a5792fd2689242342d53f5bd5071e522c5f635b3c8c262ebac39db6f9e5d1815046579ea25fe365356a7271acec8c445b933283b50d8e
+EBUILD texttable-1.6.2.ebuild 818 BLAKE2B ea52168c3b5b09ade19f3019f2e5127546f176f15ef7ed8b037cbe48c90113b037eb58a9e045ac960ee8716108ec62086668f6d0e09122fa7aad98779e7382fd SHA512 0bdb37f701ab1ff1706a5792fd2689242342d53f5bd5071e522c5f635b3c8c262ebac39db6f9e5d1815046579ea25fe365356a7271acec8c445b933283b50d8e
 MISC metadata.xml 420 BLAKE2B 8af873837a719776cd0b19be2e7dd63656a8620f65dbd81d8b2e68c35ba17fa7c4ddf95dd60e53bb42912b475f4bee9ebee02b8312fcde789922ae9f08b77b0a SHA512 4c300a07ec0a6062c79428596fb523a220376d603105f5ae25e27911967d3212c60885f7f58d11167afc02f9c63c1ee5d57d20597bafe57fbbda32ff3bcd0740
diff --git a/dev-python/texttable/texttable-1.6.1.ebuild b/dev-python/texttable/texttable-1.6.2.ebuild
index 7b84c8a238b9..7b84c8a238b9 100644
--- a/dev-python/texttable/texttable-1.6.1.ebuild
+++ b/dev-python/texttable/texttable-1.6.2.ebuild
diff --git a/dev-python/tinycss2/Manifest b/dev-python/tinycss2/Manifest
index 4c1f6f99ca7f..e8387d5c6f90 100644
--- a/dev-python/tinycss2/Manifest
+++ b/dev-python/tinycss2/Manifest
@@ -1,5 +1,7 @@
 DIST tinycss2-0.5.tar.gz 61802 BLAKE2B 2bb6093063e6a1b2bd9f78484db73d34c2336bbb00e9aad14a9c4c589e315ca377a5ec7f1b50b8c28f91d496bb668a65032a422ae9c9fda62218bfb7560e0a46 SHA512 321af21a80dbdf8d1ad218e33c87edbe7c0b4c1bffeeb38a9b14bed9064749f71636bf70775186e8785587d5fa96e3488465a76b59f643658f84b6bdc1c5c4bd
 DIST tinycss2-0.6.1.tar.gz 59548 BLAKE2B 9c80ea593ce4831bb4846eadca44595a5b30247a9a4ce9608bb4c505cebe47d151936361e0d9d4af124ce9097dc664b6a4eb7f926ce28c4336aebd08450b71cf SHA512 fa064bbb06d641a497a3c1eb35118bbf8ca8c4d32fbd3d8c64bb10d6cdab24387e77cd4c3277a957f23de2bd527a407836245f4387d7f880958858bd9cc7ab89
-EBUILD tinycss2-0.5.ebuild 667 BLAKE2B 63a5d15958e917fa0962195b7f81d7557a08b744a6ec57a1197d9891a57bf01a53c13d253120352a7c5ec95fb9de06d6086fd1a88bd78f8328ac243672214a8e SHA512 bc4c576da70819cb01d0217f29349b6a76c335af276747698136410a4124e87e2db93702094bb334c59ce1af899d9fe0e34cb1e51456e10e87ee03b1443c8805
-EBUILD tinycss2-0.6.1.ebuild 665 BLAKE2B f03a63963077c384064cbec972c999bc932dfb9ad024e7e258ee973b969ff20e2a5ae4fe42f24a17530140d53e280fc62e0b73a76fe81cde3eada78792718794 SHA512 4e8eba1f00dc4f6212ac8ab0f2ed06fc96e4b274dc2131de857bed4568a2c77e274f9a644b1286718725d7e9d8d79e33a99ed59667a7522b083491782416ab17
-MISC metadata.xml 502 BLAKE2B 683c99288181a663a49a9046df435933df6e1c634ec258fb34016ac877b208f4d250fd23a4616451e2da5adb519ecaa38696aad15093897824b4232a80988cb1 SHA512 7f9daa5d348f1a239e5c2cee779789405263c09c86b32dd0a8efabd97a77793baf800741f3c2f8660f9721dcef4f47dc6a2cfa170588982df0fd092377dd7233
+DIST tinycss2-1.0.2.tar.gz 57728 BLAKE2B 966af74a499b9eb696beb3aca2c832d4e07641ed61415aa85a1798e30c568932875ff69f1ccf71cde8823194ea8dfbd54226fa93e718291f09645ea60620b43d SHA512 69bdf52898f9e704c01fe5fd11170e0efc9a6aca14646f5331fc06ebbdf941f9b6c798ded7d93636c7b810b35c659750c3ece3917c5c9cef4092e3e17b382dd1
+EBUILD tinycss2-0.5.ebuild 662 BLAKE2B 688726d799f95df41fccceedfa7ff532bd013d3cc1078999d05d45f5e385df4e48b0ed6f2bf30694f04dc3b1c60c764726a7f32bfb55ef6772031d6d2689d66d SHA512 6e2a96157c846636f2695e387db4a2831d8e2a571fb6fde01429bc7784b6568bf873888e699168fc4ca3b2bf0e3f1113da385b2cb210b4650e3f396c0c531bb7
+EBUILD tinycss2-0.6.1.ebuild 660 BLAKE2B 51963adff1c77c919b4ff1e97aa624b8163f2d863222932d4b9374579fe8c404d0ee73a1f29a5bcd9fbdea4f7aac1ff46913e042aa1fb47563c673c3f5b8ea38 SHA512 baa8ff9b42a4b163da3345d08fc96be1c1ec17a52aaff845fe68732aab4dc374959e32744bf6add2e0c94f0a74b75a2c62eb7d230a0f69ddd64e608a5f286b55
+EBUILD tinycss2-1.0.2.ebuild 870 BLAKE2B c89b65dd633e79f96212aa32601edc9c778d66148824132813dc711ad0772ca03a8bef9caaf4d23f9bdf39a2c2970776accf534c9bdc268a2b615e730ebc9cd5 SHA512 4c293441173fd5d566771bee8c03d4cc1f2cd2b3bd665424bb72309baef4266cba2dbb28058fdf4ee37b770ce39ce5ab4961d1dde3339cd3ec5f39b5479b8dbf
+MISC metadata.xml 497 BLAKE2B 99c42dc1977fae24cf0af136eab84efc6cd86bdfce5d92f96afbe941daf9a62656232c9da866ead72f82e35a709c4850d58a793a4261d511bf2c84fac32b5eed SHA512 8004da866ba4038adacebe1eb03c7304ee7937e643babc75ecdaff33d22a13ddd9583344e239f3be50ea3eaf0026ac626813f8aa10d1b192196f524eb5cf5027
diff --git a/dev-python/tinycss2/metadata.xml b/dev-python/tinycss2/metadata.xml
index 95e6d41f324f..68107d658316 100644
--- a/dev-python/tinycss2/metadata.xml
+++ b/dev-python/tinycss2/metadata.xml
@@ -11,6 +11,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">tinycss2</remote-id>
-    <remote-id type="github">SimonSapin/tinycss2</remote-id>
+    <remote-id type="github">Kozea/tinycss2</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/tinycss2/tinycss2-0.5.ebuild b/dev-python/tinycss2/tinycss2-0.5.ebuild
index e57b9fe860ce..134351470cc0 100644
--- a/dev-python/tinycss2/tinycss2-0.5.ebuild
+++ b/dev-python/tinycss2/tinycss2-0.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A complete yet simple CSS parser for Python"
-HOMEPAGE="https://github.com/SimonSapin/tinycss2/
+HOMEPAGE="https://github.com/Kozea/tinycss2/
 	https://pypi.org/project/tinycss2/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/tinycss2/tinycss2-0.6.1.ebuild b/dev-python/tinycss2/tinycss2-0.6.1.ebuild
index 3fa5642c9134..0003e8fa4b97 100644
--- a/dev-python/tinycss2/tinycss2-0.6.1.ebuild
+++ b/dev-python/tinycss2/tinycss2-0.6.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A complete yet simple CSS parser for Python"
-HOMEPAGE="https://github.com/SimonSapin/tinycss2/
+HOMEPAGE="https://github.com/Kozea/tinycss2/
 	https://pypi.org/project/tinycss2/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/tinycss2/tinycss2-1.0.2.ebuild b/dev-python/tinycss2/tinycss2-1.0.2.ebuild
new file mode 100644
index 000000000000..40307a78ea0c
--- /dev/null
+++ b/dev-python/tinycss2/tinycss2-1.0.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=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A complete yet simple CSS parser for Python"
+HOMEPAGE="https://github.com/Kozea/tinycss2/ https://pypi.python.org/pypi/tinycss2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/webencodings-0.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-flake8[${PYTHON_USEDEP}]
+		dev-python/pytest-isort[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( README.rst )
+
+python_test() {
+	py.test || die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/torment/Manifest b/dev-python/torment/Manifest
index aa1a075bdba8..b1801cf34cc3 100644
--- a/dev-python/torment/Manifest
+++ b/dev-python/torment/Manifest
@@ -1,3 +1,3 @@
 DIST torment-3.0.3.tar.gz 33976 BLAKE2B df784ee7ae367e9c94c04885114176238748524ab511e161608ef59e08b7b1f765c361563bdd2799381e9679a58816d5f907f0467284274c3a8c1d0b206f1a91 SHA512 85876668ce2ee898f876711aa11186ee2edb092ac1b768ee828670a6aef8bfc9cbcdee4aa07d8068ebed2edb60aa0774d74d2e7976a6c021ae5264aee1e83fbd
 EBUILD torment-3.0.3.ebuild 943 BLAKE2B e18f350c8076f657e4b7b4ef4919538b489549ddfdb0bed8d2fcc036eab28ecc4dbada7c4f685005560be9caed065941b1b620bf543d5015e0f515a2d930dd6a SHA512 a1e2d7285654519b059e4317c7eba66b2e6919361906f8ad9519328705d438ca4f60fbef1873438b7a5aefcdf3cdd74559de585ec72d66c18351502991eda8df
-MISC metadata.xml 263 BLAKE2B 660800ff320a863f1206a14dc29048485a5fabb8609d8354bb4cf9d45a0093784ecb13b15d2fe78e4cd86c64abd1e32f975b07e90cbf73dbf7679ed27d480f04 SHA512 4f57bf78cd01e1b157690b3f482dd82f56d794da20c78702978998e20ffccfaca7155f3c6216eca65f6ff65edf95d84e32cf97f31e712438404df810aac471e3
+MISC metadata.xml 289 BLAKE2B df99d201706d1e9d9f9fc0b7d78d9feaa5f88d95456bc054b2d0e3f23b2d8dc177cb0e2284f69d7d989b6ee3bdd4d0f5efce56a3844fa8c4e21b9adb4bdd3bb8 SHA512 2b22fe1fa9e573f4ccbf45c868cba66c2a8474582aa494cc100110c0c16ee9a81eefeaed7e9de923cd822b9e46f76d89930a03e6dd2e4fb8f715f6e0c7c132fb
diff --git a/dev-python/torment/metadata.xml b/dev-python/torment/metadata.xml
index 616203f3cd6e..6e5c3d93ec80 100644
--- a/dev-python/torment/metadata.xml
+++ b/dev-python/torment/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">torment</remote-id>
 		<remote-id type="github">kumoru/torment</remote-id>
diff --git a/dev-python/traceback2/Manifest b/dev-python/traceback2/Manifest
index fafa40fe26b1..2321cc15e15a 100644
--- a/dev-python/traceback2/Manifest
+++ b/dev-python/traceback2/Manifest
@@ -1,3 +1,3 @@
 DIST traceback2-1.4.0.tar.gz 15872 BLAKE2B cd2e1fe91e1e71a6dd764675e083857f359cfa5aaa3d2fee7f1709e24c545bb9e337f0af1d87f9e286fa2c36dfa12dca84589a936dc9f9805a1c4891739f337b SHA512 84c7fc291c8f2d4cee10441cdef1820aa453e631dfa91ed58e40fc205e97a9dd2101388d5689e4fdf10edfbf06bdb5b895d1635ae7218ba0c9b697d3f95f9342
 EBUILD traceback2-1.4.0.ebuild 625 BLAKE2B df8683d0c705abf40111aff3b7bbe8a56e449de857e0c354a71304d9c5f6357afac267b469cbb4084dae18a563be673356411cd6b4e6fbc8033e88a3a2280290 SHA512 dc8f921baa6dca2c60d50c7d9986ce3a581a20630d82878f659dc78e6b3ea39b5e751cfce20df75f050df2adc88d80916541d6cfe5358e436ef95ad494722408
-MISC metadata.xml 276 BLAKE2B 563ae71afb266c7d05063c3419fa37500d977a315f313f50369bea04971964d9284a880d00e926da1e53ade6bdc53ba91b021c63a4e09eeefc6e5fa1f405fdaa SHA512 a3c2b11dd3258894fbc16ca98ecd74572fbdf279ce9b537d0fb3482f2ac0d1221cf9d2a5903b969af13b09c166c25286a3d9ced8dac6bcfcb5c3c33b454908f2
+MISC metadata.xml 302 BLAKE2B 97962b0a7d9fff03c6bf59aa6b2702faf2153df607b896ceb41e6eb7886045b9180048b121102caee6229950711cac23acec5bfc72771b112fcac0fa59536dfd SHA512 59c7be20af309b3258f6d3208da4956963e89c47ac2d15b68c6917d5d33b9aecbb359111579959fcbba5c5abace520ab7181e1e993e015f1d1971e1f5e4a3564
diff --git a/dev-python/traceback2/metadata.xml b/dev-python/traceback2/metadata.xml
index 2ad9c9420813..d819a58d5a74 100644
--- a/dev-python/traceback2/metadata.xml
+++ b/dev-python/traceback2/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="pypi">traceback2</remote-id>
 		<remote-id type="github">testing-cabal/traceback2</remote-id>
diff --git a/dev-python/trollius/Manifest b/dev-python/trollius/Manifest
index bfd52f3410cc..f566420f5052 100644
--- a/dev-python/trollius/Manifest
+++ b/dev-python/trollius/Manifest
@@ -1,3 +1,5 @@
 DIST trollius-2.1.tar.gz 276425 BLAKE2B 3337712e482c19ce06bced64a4169effee74f8e6d33e60f4ab411d636acae586a104766639f63d0075fb12a39f09ed7e54c7396f3295aa99db04e0b60aa433fa SHA512 d800e060e13da22c83fc20f2c0e61d6c50cca309d90e8faecaf24e68240d78ec7fc9cfbb68a968ba7e9d73268e974353d9bd9063eb0ca02a4f0e88610abd6018
+DIST trollius-2.2.tar.gz 276391 BLAKE2B 8debb662498551f2bee85605388813bdcdb720f798b2e2e2cb16a86340fe2759b1a59abcbd6d302e96f6d9860a464c140a521b9a7e731579329351fd11baeebd SHA512 d4a123cc0728eb3548f434ca227a36afce0fca8bfc9fdb0005ff501538c8fad9507608112c4b63c7d273cec2d2310b941068093c9bbdf28d984001753b4956cb
 EBUILD trollius-2.1.ebuild 664 BLAKE2B 379ad7dfe0fc7b384ac8c1c6f3f2358aed06ab68596fa0f95997bd9b0ed7aae8ee8dc3b45fd1565a41a846773cb952257baeefd54ec1c07b59b866825239943c SHA512 42762d8e9e55efc8a058e025f2fc82a69e090f6d4dc400c524e712652d9bd7a41951fbff0000ff38738a3f54486bf75da3539c6644f0b710386a8e5efdaa6aa1
-MISC metadata.xml 439 BLAKE2B 3b7bf1ea728debb964c4fcf499d81bf98d1afe4b478d3df3f2567d0b184fb95a873e52405169e8bdacf64e7376d81100f8408807347d6b8d7b1bb099d072b391 SHA512 5d0bb280c9e1a08248701899de4f30f59252232121939655aa27af4ccbd77e1cda800ec64e0e051e3437e055490787d52ed0cbac4d9e47319832b5f262d08915
+EBUILD trollius-2.2.ebuild 666 BLAKE2B a81ba883d52588fee17ae3c8cf1e40caa8c3b9ab1802dd1e702c8c5a68a2c5621d2483203d134792f708ab309df3eb25e286bf4dbcafbec0b87f4395381d5159 SHA512 fc485eea591095ab9139fb344d4d70351137fefa4216dbd13fb583f2ff07b2dbbc0fb2af1fbe82cf36a9f5c3c388aeaec399b79a1017f7260dff63112b6172ef
+MISC metadata.xml 380 BLAKE2B 67950aab96abdce21c702fb2aacf3eb4f0376483105bc656988e7d95f65b3a47e2f027dfce5e1a75e23875aca710f8c0d20ec47bc02dee4ff4ea4733b7e8f4de SHA512 96c4e4f92d32c6a7844ffe4412e24ac7985c4c534d5c607873be067a89350b79a112557f9c88b63df6d1135706920a3e3cda79ec0c9aa534cc3f84e9043e6b71
diff --git a/dev-python/trollius/metadata.xml b/dev-python/trollius/metadata.xml
index 40c20e19f5dd..1c03de904bba 100644
--- a/dev-python/trollius/metadata.xml
+++ b/dev-python/trollius/metadata.xml
@@ -7,7 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">trollius</remote-id>
-    <remote-id type="bitbucket">enovance/trollius</remote-id>
-    <remote-id type="github">haypo/trollius</remote-id>
+    <remote-id type="github">vstinner/trollius</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/trollius/trollius-2.2.ebuild b/dev-python/trollius/trollius-2.2.ebuild
new file mode 100644
index 000000000000..9de2fd0afd5d
--- /dev/null
+++ b/dev-python/trollius/trollius-2.2.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 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Port of the asyncio project to Python 2.7 (deprecated)"
+HOMEPAGE="https://github.com/vstinner/trollius https://pypi.org/project/trollius/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="virtual/python-futures[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" runtests.py -v 2 || die "Testing failed under ${EPYTHON}"
+}
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index e4a923cbb9c2..96d551330ac8 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,3 +1,3 @@
 DIST trustme-0.5.0.tar.gz 21232 BLAKE2B 3804fe4e9b7049da0bab926bb1180af6bbb8f882cfb16109bed040ca50c85e7b83b5468c3388dd8478ee9fc6478523bba98c39b74cb76c86a72761a26685122e SHA512 7ce5041b8d3687fa462fe93e55b2f83549ab805cec4a2a94c9178a02af557cf8900fe6c05bae0bf100eb36181952fb2bc31cb1d4d6ad6ed2fd2b0706d569518f
-EBUILD trustme-0.5.0.ebuild 920 BLAKE2B cf0196924802665ee926046944ebeed741a897a52cd8fa91473fbc6d1ed20e1af91db1b387010a63bad55587aaaa313e01a630b6b32a2629cefb7feb488e1d4c SHA512 e33ce31590744456408b8230227fcd0da9911bec51925baca3b9264534401c214620ce503eb07511db93e60af64bf5a862147136a4a486f9b351f9daadaa4706
+EBUILD trustme-0.5.0.ebuild 925 BLAKE2B b123598d85677428c4ed65d8ab7fb20574de5443eb6f43e393a4c3de78e343ba7afeae25e68e8cdb594f45bfd064955cad9789770f5153d0d49dfc4bbfa36b6f SHA512 4e37ad7c44d60930380bbdb8a9392d30946634c81c473af02618d8cd123f68fd9c2acf1d5b163e4bb22217e6add690766b9026c41461f14c53ce2e6534603833
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/trustme/trustme-0.5.0.ebuild b/dev-python/trustme/trustme-0.5.0.ebuild
index bdc3fb22d15c..50fd9fa9611b 100644
--- a/dev-python/trustme/trustme-0.5.0.ebuild
+++ b/dev-python/trustme/trustme-0.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
new file mode 100644
index 000000000000..3557b44e99aa
--- /dev/null
+++ b/dev-python/typing-extensions/Manifest
@@ -0,0 +1,3 @@
+DIST typing_extensions-3.7.4.tar.gz 36058 BLAKE2B f9e5efe9a7d51beb683bd4a88d7c1cab247b2c4cfd300131591bd04837dc15af277a8725c04566b9317be577f8f11e330f2d0169b52c3e9f92a8d3140e9e69d0 SHA512 82c15e6e67dde23456c3b01705729804dc21bd2088dee3aa63e53a5e597f474d34b1a37fb16bc5e3497f93d338c0115f49a070621523fb0fa3e994632785c6d9
+EBUILD typing-extensions-3.7.4.ebuild 804 BLAKE2B ff4253a32643dc8e7c05c3d7307a03dc3a6767f55c4c506834e64cba79eb174077e3ecdc48d73e0f3454dff1dee991383d3ec531e9f94101c253e272314b40fc SHA512 e1284d6f9c080ddb72e033953e4cf36effe1e3fb5d9ef68934ac19893f097b2801ff65cd189d53a6c5ded2f5ec2d82da66745116992d1a361ab4cdabd8a99430
+MISC metadata.xml 309 BLAKE2B 22c8c811a8b91dfcc0b4b8e2b6081e10cefda4e3a37733ac985c7412b71bd995dbf21b43ef6766a80e6decf3a5d9c6878623785eed9fcb817b63a7ca853502f7 SHA512 c483306bdc995969591e21452fd1cb20310e5e9e496b2b4a0ace1c1533023b6225dad6ea156ee12f0045e9bfb6a5426d9a16f05131395b960e529b3194b4331b
diff --git a/dev-python/typing-extensions/metadata.xml b/dev-python/typing-extensions/metadata.xml
new file mode 100644
index 000000000000..8fac39f099e5
--- /dev/null
+++ b/dev-python/typing-extensions/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">typing</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/typing-extensions/typing-extensions-3.7.4.ebuild b/dev-python/typing-extensions/typing-extensions-3.7.4.ebuild
new file mode 100644
index 000000000000..84e920351e6a
--- /dev/null
+++ b/dev-python/typing-extensions/typing-extensions-3.7.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Type Hint extensions from Python 3.7 backported to 3.5/3.6"
+HOMEPAGE="https://pypi.org/project/typing_extensions/ https://github.com/python/typing"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+	cd "${S}"/src_py3 || die
+	"${EPYTHON}" test_typing_extensions.py -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/uncertainties/Manifest b/dev-python/uncertainties/Manifest
index 82a03d7e7827..619f90188a41 100644
--- a/dev-python/uncertainties/Manifest
+++ b/dev-python/uncertainties/Manifest
@@ -1,3 +1,3 @@
 DIST uncertainties-3.0.1.tar.gz 225752 BLAKE2B 6dc872d5617b8c4e9deda5a5a60492ae1eb0facd7f053f0799b3762831f9bad7da39726811feffa3630091e00dbedf89c296ed4e1b2b1f78399ed45663ea5339 SHA512 d4b2a905665c46224586f5f9702ad9e69580fc5afe8c6c045b04141fdc54e0c402cdee033ee0ee7055823b922bd33c732b3066453876509d45add15abf9d85f5
-EBUILD uncertainties-3.0.1.ebuild 975 BLAKE2B 2790765e1a26f81fc21a19bcf0c935d94d46ad0ec51ec729fc91160edf5ca2da7d764bd875aadf274be07b4bdd49f8bd234099033caa0f1b658e1989ef4ecc5b SHA512 030443048dbc8a4713f6f0f419c3b6451c1af4646c5c8cd350654bc6088177fa2d1c2db8a6f14438516bdfd3d3fac365cfd3a415da47e5aa5ef312d04e2d8a29
+EBUILD uncertainties-3.0.1.ebuild 968 BLAKE2B 32f764f5b9fb63ba235cc1c218cac140cd12c5a255881e337717d1d8f7c460b74271613f80c979781d1a70dd9177b35ec56f997d363c97c0ea2292baa039b202 SHA512 dc9c87dd35ba7f3740d9531ee83c8be4ab9b0747fa94a8855e061c431e155004cafd55d5b93c92b4ba8a960565d966267e80b151169eeb7d8ba1386e0b808db2
 MISC metadata.xml 859 BLAKE2B 54ae46c343fada9aabb973c5297eccb0abe7299a2a1f0009df1d083698c91ce25339cf63d77857febee0798b27a84ba83dde95e19255f45f8cb0141c6a009954 SHA512 833af2fd16f097d61942c7f9323d8e38688eead6d5d10ae8e7f2547c950cd53ab6ce28f434d2c1bb2f15b71ec55bfc30b8bd53a94a0c5f02e824e3ecb08ecc89
diff --git a/dev-python/uncertainties/uncertainties-3.0.1.ebuild b/dev-python/uncertainties/uncertainties-3.0.1.ebuild
index e6d408a79b38..afeaffaa8632 100644
--- a/dev-python/uncertainties/uncertainties-3.0.1.ebuild
+++ b/dev-python/uncertainties/uncertainties-3.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index 70ec1054a05b..0bc3d457787d 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,3 +1,5 @@
+DIST uvloop-0.12.2.tar.gz 1922375 BLAKE2B 49d17dc0899d59975d02dcc0b56e53e506e83a7f02ba7e9021abf92e8518b9904905c0175c3e2612a10f6f6d7a69505bfb024c00debf01823dcfb597966ab1a9 SHA512 59e34c83946facf70e839831dcd61fb7a8cf22df48d2ede6de84edbd4af5e789b2b404c8b7835e9a8cd7be706ad370bde2a290beab72c5d7411d35d07ee7974c
 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.8.1.ebuild 1011 BLAKE2B 1b346d72198adca94752c7bdc3612b2c29b5607cba21c1eb7dce812939b3cf6c4d4042eccbab0e7a192dd2c6f8f989765b116bd0a71ca50b59c997ada30c4047 SHA512 49e5aefbf9e4084e00a941ed316fe86372ce98ae02ec7c1c09e8d808e9a30e9f84d316bbbfdf8f670dcc3d04a042ca0522d65ab44bd67f6f5e23f3663a227947
-MISC metadata.xml 700 BLAKE2B 72504f2e608de619c0288610639c44a69048f1ce0cc7caf5b7a1febef1bfbe9ddf4ecea9dbcca97ace3b91428dcf5db8d6eabe49de24e4e28d778c5d0e4bd103 SHA512 c4fd3a1a846bdd4e30272fb923a69da10c97a6cf41a26c255c29412ce0d49da2bb962fb0232c55a98721217de882435260ce4f658bc38b7474d19264eea9ab6d
+MISC metadata.xml 783 BLAKE2B 2fb3d516b870a609a0e8b4ea47e888313e0e692a3455a7d6e2088dfe0e40b38000e4c0c83a15229993ad596e923f8040a5ba07e15ce4df96ae22d7c22383cac0 SHA512 c8445c26cafefe41be4ca84129f3ddaa53843120009d49a46ae181c105a7d636f59fbbbfeb723c5b4f29855d8520535d5d82cd0038512cf7374412759a1cc4ff
diff --git a/dev-python/uvloop/metadata.xml b/dev-python/uvloop/metadata.xml
index 5b546cf7d7a5..605410286c3e 100644
--- a/dev-python/uvloop/metadata.xml
+++ b/dev-python/uvloop/metadata.xml
@@ -9,6 +9,9 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+  </maintainer>
   <longdescription>
     uvloop is a fast, drop-in replacement of the built-in asyncio
     event loop. uvloop is implemented in Cython and uses libuv under
diff --git a/dev-python/uvloop/uvloop-0.12.2.ebuild b/dev-python/uvloop/uvloop-0.12.2.ebuild
new file mode 100644
index 000000000000..4b6fbd02211b
--- /dev/null
+++ b/dev-python/uvloop/uvloop-0.12.2.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
+
+	# failing not only for us
+	sed -i -e 's:test_write_pipe(:_&:' tests/test_pipes.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
+}
diff --git a/dev-python/vcversioner/Manifest b/dev-python/vcversioner/Manifest
index 81ab319419b3..a4769c1703ff 100644
--- a/dev-python/vcversioner/Manifest
+++ b/dev-python/vcversioner/Manifest
@@ -1,3 +1,3 @@
 DIST vcversioner-2.16.0.0.tar.gz 9024 BLAKE2B 70d61a0d65129c28c9febfae54454a50ce99fa3478b4948fb677b90f52d7abff4c14b69ad8e71b26c45cb40a7535be8f916cdf3951a1ca932e1b7d0f07ceae0c SHA512 e4e34693aa813e57991eca01d20102bd2e939b536461e2e9e063ac0e3558580e57d7e8d5e08d010690b3c901c97e53f187f20b48520b333eb492ec33e85757d8
-EBUILD vcversioner-2.16.0.0.ebuild 690 BLAKE2B 8dac6fccb545639115041a2b8cf48ceb1ab28d97fe712a67df14b942f6132e0c2921093d3625716dd485ebe9b26595608f3335342e8c99f70164bd472a6c74db SHA512 a732b5f8dc7f426b42017392b826a6ba014b8b42c452deb0cc9fe3378695473a1dada0a2821e959329541dc9d71d0d0786cac17b9ee7b07c3c4a135e44c8a282
+EBUILD vcversioner-2.16.0.0.ebuild 688 BLAKE2B 878eb799ac749a7044be70eea52d5d44289a46e6d84bc6c13731669eaa64493b276c2c103bd3acebddf945030361c2f74a99352a46a2278aacd1b631c8e8d278 SHA512 61abcd9230223b30f12b5eb8d2c95ef1a55c366e2173cd1ee05edd4843767c5840e827d0b6ea648fd3fe054b478afda8b4ba78399c8857733ac6a614d9e350b5
 MISC metadata.xml 308 BLAKE2B 4d08920d23a6a0b63b12dd665f4002efc68eab182ee8be145f7d9f707bbf028ab84daaa2ac37386397173c9cb6251270a7500e776d9f3264d371bade8ac923d1 SHA512 550f181e53960f17bc2aff125dc10ffdce51bfff4e8b61572bbf1133e39a1e18ac8e473880504994447fdeba479c172c14aa0c20777ab4e7b07c0e855c686fcb
diff --git a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
index 892903c1c043..2d21790f0d91 100644
--- a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
+++ b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/v/${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"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/webcolors/Manifest b/dev-python/webcolors/Manifest
index e8dc1090d515..eb620612e439 100644
--- a/dev-python/webcolors/Manifest
+++ b/dev-python/webcolors/Manifest
@@ -1,5 +1,5 @@
 DIST webcolors-1.5.tar.gz 29960 BLAKE2B 0d46fa57b54525594547b1224801308961f9265dc76866153752e411dcf81d3ca2566cb289bb9f0cd486bd6ec1ffe7cf88f99a04f5554ae43f183175c9eb925e SHA512 84ce8cbbbdb4523bb146cf379845b549570623411a56651a7f9b9687152b7adc9dc42a3a0f684b55b61fb7a3d51d49d3871100b56725c86a727e3374b53c84b6
 DIST webcolors-1.8.1.tar.gz 33118 BLAKE2B e16ff2d9549eb09638722a6513749ec0bc91cd63ba69c19667ddea9c07aae7f9fa2b0fd3390a9b0f6f420f245ff3157d86a585301ba77e724146a7cee0ef4ad8 SHA512 45ddb4ec030206c3ff1edb7de6b8ec1b5f2f9ef5068f37a7c43b66531a2dc6b290cced2af1ca18794aaa9ba17f297022b2f9cc7a92a74ee9b68f758abf7c104e
-EBUILD webcolors-1.5.ebuild 680 BLAKE2B a82834acd69b74f9dae987ca366bfdc1bf16f194338edd2aa2770907dfc7f5698a4b54328127b57f7935db58250b02d5edc2b133bbb3791c64e4e8c6f19f9195 SHA512 835be724fcbae31e461f3b1a98c350f54bfca0016c19406af1a86d1c42803ac79440b95c365a2249fd3e798f2584a23ad4294f5fd76f30beea01e04395d17a90
+EBUILD webcolors-1.5.ebuild 678 BLAKE2B d239244076e5c4a53ae53bafa8c77843c04f04b63a2bcdc0708b51f7757bc0ab6f7a254eeb6237e8a384c8dfbd8cce7473b0f58077d0717faecae2fed5079e6a SHA512 0da60e5743a1558324104fff45f02c77475c9c16a5751da48b8adac6352327a1130bb6d6f18e85209ddace53812c2a5dc8ff99302898aebdd97e1875b9513066
 EBUILD webcolors-1.8.1.ebuild 727 BLAKE2B f044719604a45ec1d76cde12254d6d05f8b3955c64460c911a24edbe2d64172ad2554f64cfe86daf1a70ad5203d533fd190a25b68f48dc6f92b7b5e8b11e3919 SHA512 dfa43309e4cf88e75f622ef616a749fe40ee29a5e9b13c01732068dec64dd1c9faf6019fdec79363555dc80052d7f17c3427394780b77798cef060656445a3ae
 MISC metadata.xml 373 BLAKE2B 77ba0f1d033aa4955155891349878942ffb67450d1e4891c87f068454546c73feade5f683574ae6a4263bf9cdce3f2beebc188e3812086d84a6cdeb840328c48 SHA512 0b99d1cca8cba614a64f182192f08d168e01c3d5dd3227f4425f41f438769b7b0566be41c9d3a3b3bd98825582315c035a7641766416fc5e57816b72d27d726b
diff --git a/dev-python/webcolors/webcolors-1.5.ebuild b/dev-python/webcolors/webcolors-1.5.ebuild
index 625bb890ff8a..ce7a5a2673ba 100644
--- a/dev-python/webcolors/webcolors-1.5.ebuild
+++ b/dev-python/webcolors/webcolors-1.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index de709c287229..786865761f84 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -1,10 +1,7 @@
-DIST WebOb-1.7.3.tar.gz 216028 BLAKE2B 66af12ab34dc9a18555c6e480099a2c9b9f0ba8eb8f1e1066d501dea9ed2ff541c064bc40bfc74c284fef5f06281178d4d631b33f29c04d43da9c8e3bd138d0a SHA512 23a51f184754c525dc293b8b71855d40f52445c0df5434af7ec091219e0ea81be162623157b6ec67214cd151b25014bf86991246785816ebcb5a0d1eec9479a1
-DIST WebOb-1.7.4.tar.gz 219331 BLAKE2B fe046905bf127dc8fedbf2b993e83b3614cd62ef614add939d54e241ecfc9a9ed77cfa5b961b436105c72cab36e885f94d604cd90909cc4ada9283c7a098a8ca SHA512 43685daf6dbba5daa99e4fabfb930495b8c2bc976e968d93af7681284cc127d7012f8423b2986dd7daa10cbf7b3803aec442c1ef88102e16cadf07efe6714d1a
 DIST WebOb-1.8.2.tar.gz 271737 BLAKE2B c6eef650e9b03c83d7c618d0187ef7fbd3432d043ab27501cf8c4d6dc3889f3b542c54bf35963d8a313d62246183373c30706bcf5fd00495808e21d3dc9e0482 SHA512 691a6cfbbff376e7b1f71adcaac4dbe8cc26cb4ddc396e2ab946ddf15b34c05c638113f48ee396d4edaf6ef77498ca8539d1c63de9f58894afb0e4b88bbf04ae
 DIST WebOb-1.8.5.tar.gz 271955 BLAKE2B e1d22e91e8e04c88d6adcb4dcad93e1e0c37b5b3894eee7c2b5a92d2eea41719d3b42e05916bb355a3ac9a2f7357fe791ce6f776261bfc764eadf59d4be37bad SHA512 cc0b956a7c3b8ae58d6002baf5c6de4e442201280468f8fc8b5fbd2c7f7cb7a8f46447f97b98a32a9959c8d1aa7a2a8a7b9d624cb27ca79b2ad1ce94f891801b
-EBUILD webob-1.7.3.ebuild 1067 BLAKE2B 472295e417be504bfdb2ef1e9cb782665436fc3d5aefd604bcbe92ae86673a703cafc38674746bf9780b926abf4e536f3ce123a0f0b9179318df12bfde6d3a44 SHA512 7336a233893b1accbe56fc6ec45f69340fe40ca7dd755da911092873711329d037c00827c0304360d54252714b4352d91be99adbaceff5d15c00c0e9e19ce6ee
-EBUILD webob-1.7.4.ebuild 1066 BLAKE2B 1be7cf99afaabb8af90668b8516e7e9197810e7e741623d76a7a004da5f08ddbf03a6d36d6f2a57d103e58933243633c7cde498560590ee71642c374ee3abd21 SHA512 64675418edb8cdc92e2799b579bea7d883b5ade46d079268160616c699f8d1600f8ee8e8ac5fc51121c58eaf5d83e17fbaff307727d1b78a811238aabc313cea
-EBUILD webob-1.8.2-r1.ebuild 1078 BLAKE2B 4bb1211c67d3a92e4d24ece6bb4767eaf5578a052a1023fabac96fe18c6cf95e7a27a54502f4a278134681ce016a8617686e0445dd227c42f68bef51896704ec SHA512 61e63326093fdc61cbf0ffcdf8885b4e3d261aa722561599b70dcb5fbc159c7509b6d8e83749a937ff19493d3c97e6344210ff2918e5b8a80e506bbe82c19e15
-EBUILD webob-1.8.2.ebuild 1062 BLAKE2B 13cd02ca2d5d9c04fbc7b13ac2e2235e684ac724fe957b63f32fd6c2032086fe3de724d13397f4b4544d91dc3b0d2804fed4aff4c8858e54c67197b71c37913f SHA512 0f65983cae24d665e31c063e2d99b1019117033805131ff109405b7a343387f4551e02adc3e1ccb6fb012123120e5d3cb177981aad6ea395206baf79e82ef145
-EBUILD webob-1.8.5.ebuild 1068 BLAKE2B a2a806f204967587b99724bda64d3801d589ca950832520909cba25904f3edfa093f17d298de06a358ecabd1cf41c53f79f6ae182c2b374f449cb68e6b1a717f SHA512 889498791c4b8575bf99f225a90da38d24618c51b4a1d9fc654da958554984956a64d4e9e964c7d38e92bec4ffa4cfaf19ba9b5d8b7aefa9bd856dbbddf0869e
-MISC metadata.xml 308 BLAKE2B b14e4d8d46fb386647015b3ba5028f737f440f53e8a13d3afb4b9f418fccdb902f81728c825f65969577d765140230ea623ff66814b12789d45f22e53ae48534 SHA512 cab03951839671b7600ab7903e1b27c98a02101d4a5f34b6a2382ad8f925049d82e4e4ff32c904d4dfcd7f4865124d7adf194933a5d2790b9f3ce1a9478e8234
+EBUILD webob-1.8.2-r1.ebuild 1046 BLAKE2B 16c5d3e80e07039d763be8a4942f7247406ee6c8ca36de496681db8e41718e7b2c97ac77cd959af3d503ed446d464d528eca11462073ca1d89051f9c62eea3b3 SHA512 352796274ef6f125bdc6bc48cb009a60eb8569be718a73b2c24ae6a20c99938cfcf11b957fdb5f3ac207816f7b189b8e5e1dae30c3670d082c51be2acf67f828
+EBUILD webob-1.8.2.ebuild 1030 BLAKE2B e8d186c50a932b84bbc75aa61351caed5c63928439a557d6f74d181cc658be09054b85c38031f7eb24181eb9001a4294dac0e3c8d0124d86974ba5abf344e00f SHA512 646a184106d430083c3fb43f6557bdf022fe594b266adf7765d3e7bbd53c2ae1340afdffc2ae80be42029d729eff7bbacee3490999e1eeb9d45fd35e7f70cf80
+EBUILD webob-1.8.5-r1.ebuild 1080 BLAKE2B 95d0ed416661ff2640be1d62d7e226bce1dfca1759bc346b0aa23873ffdeb390de8338671bedba58401d0986e66b303a12550b9b39c1a31bf02508e2a47ad24b SHA512 924a628bd9a2c4ffc41997a6bc00aec094969694a41589fa0759c1effeddbf40bb32359bb2dedfeb3986268702fec2d6d4ddbb920558441ad7c49dbc611c39f1
+EBUILD webob-1.8.5.ebuild 1036 BLAKE2B cc9f30abb2df4114ee6a20eccd634b6598bb7af66fa7e02f9644afc79a03b56ea46fdeb88c88e844d3be02f99b26e07e1d2ef6ebeab45137488ed6cdc7a5a232 SHA512 b5a2b2dbadbbcacace3c842b5fe8577dc163187efcb672b0179aebbff9d5e9fd21504aa8464a0b44c0d9c4bbc59bc5c35923dadf53c064e6fb1ff1ce3e58b281
+MISC metadata.xml 420 BLAKE2B ed66ec7dfc302248e6e5b18c9ca6dd2c339ebe9b69e0d1fa964d86e7337321a0a4c6d5136454f9435013fda73ba3d52322dadaf67a3bfbf3764d504b5c1b7147 SHA512 a6b9423edcdffc02b7165beaad70ec8819a8da7bd564ec5b082c2c361ce1ac88e28a738b78c3bd2e92eeb344368e5690d8d3a90dfdc2675f0cedc0a026898f4b
diff --git a/dev-python/webob/metadata.xml b/dev-python/webob/metadata.xml
index 5a814750bb86..0589353db33e 100644
--- a/dev-python/webob/metadata.xml
+++ b/dev-python/webob/metadata.xml
@@ -7,5 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">WebOb</remote-id>
+		<remote-id type="github">Pylons/webob</remote-id>
+		<bugs-to>https://github.com/Pylons/webob/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/webob/webob-1.7.3.ebuild b/dev-python/webob/webob-1.7.3.ebuild
deleted file mode 100644
index 3fe592392bc5..000000000000
--- a/dev-python/webob/webob-1.7.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
-
-inherit distutils-r1 versionator
-
-MY_PN=WebOb
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="WSGI request and response object"
-HOMEPAGE="https://webob.org/ https://pypi.org/project/WebOb/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-	fi
-}
-
-python_test() {
-	nosetests --verbose -w tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/webob/webob-1.7.4.ebuild b/dev-python/webob/webob-1.7.4.ebuild
deleted file mode 100644
index 0f50aa1efe04..000000000000
--- a/dev-python/webob/webob-1.7.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
-
-inherit distutils-r1 versionator
-
-MY_PN=WebOb
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="WSGI request and response object"
-HOMEPAGE="https://webob.org/ https://pypi.org/project/WebOb/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-	fi
-}
-
-python_test() {
-	nosetests --verbose -w tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/webob/webob-1.8.2-r1.ebuild b/dev-python/webob/webob-1.8.2-r1.ebuild
index 17c6f9332b83..ecc4fc525473 100644
--- a/dev-python/webob/webob-1.8.2-r1.ebuild
+++ b/dev-python/webob/webob-1.8.2-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN=WebOb
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="WSGI request and response object"
-HOMEPAGE="https://webob.org/ https://pypi.org/project/WebOb/"
+HOMEPAGE="https://webob.org/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/webob/webob-1.8.2.ebuild b/dev-python/webob/webob-1.8.2.ebuild
index 34d8ff4862bf..ce15a6117158 100644
--- a/dev-python/webob/webob-1.8.2.ebuild
+++ b/dev-python/webob/webob-1.8.2.ebuild
@@ -11,7 +11,7 @@ MY_PN=WebOb
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="WSGI request and response object"
-HOMEPAGE="https://webob.org/ https://pypi.org/project/WebOb/"
+HOMEPAGE="https://webob.org/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/webob/webob-1.8.5-r1.ebuild b/dev-python/webob/webob-1.8.5-r1.ebuild
new file mode 100644
index 000000000000..a1502c69dba4
--- /dev/null
+++ b/dev-python/webob/webob-1.8.5-r1.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
+
+MY_PN=WebOb
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="WSGI request and response object"
+HOMEPAGE="https://webob.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.7.5[${PYTHON_USEDEP}]
+		dev-python/alabaster[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/pytest-3.1.0[${PYTHON_USEDEP}]
+	)
+"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/webob/webob-1.8.5.ebuild b/dev-python/webob/webob-1.8.5.ebuild
index 587599a9d65e..9e18e3c527e8 100644
--- a/dev-python/webob/webob-1.8.5.ebuild
+++ b/dev-python/webob/webob-1.8.5.ebuild
@@ -11,7 +11,7 @@ MY_PN=WebOb
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="WSGI request and response object"
-HOMEPAGE="https://webob.org/ https://pypi.org/project/WebOb/"
+HOMEPAGE="https://webob.org/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/wehjit/Manifest b/dev-python/wehjit/Manifest
index 59b263572e75..b2f727f5cf42 100644
--- a/dev-python/wehjit/Manifest
+++ b/dev-python/wehjit/Manifest
@@ -1,4 +1,4 @@
 AUX wehjit-0.2.2-SkipTest.patch 648 BLAKE2B 8dd41cdd67e3cf90b93e02d98e7a0bc30c591600cd058951233d8d315ce78397d3a93347ea74d7ed7c2e224de0c9d8889139a0f9fc5a5dd2c91348c4295534dc SHA512 56c7cd048f9faa71f0fbcf77e894c064f9c4428e165a0fd470d417c9bdde631e4594ddb9dcaa060f3c438d98b2007e5fe815fd949d62aeb58b6161b608abcf78
 DIST wehjit-0.2.2.tar.gz 100515 BLAKE2B 2eddf7ce81583080b051ecfd07d108a2e72dbcaba3616359d463e5c4f92d11463a03197ba372476cc5ab1523cf58614db3cb8d8a72586359a7d95620bd578d7c SHA512 f8fb2edeeb9e90315d3c8f1e9e7d73d556fcad780c4dea637599291b2094e292a42b6f3671407f3d9d88733894501796484fa05ac52f3c1f3e1cb29d376a87fb
-EBUILD wehjit-0.2.2-r1.ebuild 742 BLAKE2B 043c2bc7e2e537f40a87d2bb86ef38d07fbe022b17cb58ae59413606253210d3152896174dcdadfd52eecf3145793c58d8ab44b3a63630837260f289382ea004 SHA512 7b47dccf4365662aa000818cd4d79e0d65c4ba2693f955459dd7e537d5a3d6062d491c48c5cf2a119f5f3f39781718ceec10522ff98e132088111f1f8c4b284f
+EBUILD wehjit-0.2.2-r1.ebuild 739 BLAKE2B 05ad9750e7d83a102bb7c861fd5255547eb1db6266b06212c8464a1694d786bf041864277d0ec0a8eca2ab3783b4d9902ba2ea38cd79a3f51b0c3887f8abe3a1 SHA512 36bd8920229c4b9fbe461f109580e48b277ef68bfbe51bf71f682475b6459ba56fa9df6cb95483d458e6a5d94a3da98b5b73ede428356c051b53630b10426987
 MISC metadata.xml 578 BLAKE2B 48514e174995072e4e89560d31aceb0440a4cfd22230ded9298fe3b1e70ac9c699367dba2282e6e3e347375040d5891631d172255a5fd98fb8d5db8dfc5ce5e8 SHA512 cb9f24891df1a9c13cc0c165514b63d4877947a0793bd81c98fe7735b4afd7e9620e1dc742c6cc01a7f82ba9dc19f3770bd289ba15343a0324eb23a5cbe9a4e7
diff --git a/dev-python/wehjit/wehjit-0.2.2-r1.ebuild b/dev-python/wehjit/wehjit-0.2.2-r1.ebuild
index 55996c08bf61..4e5915f50607 100644
--- a/dev-python/wehjit/wehjit-0.2.2-r1.ebuild
+++ b/dev-python/wehjit/wehjit-0.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://jderose.fedorapeople.org/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="dev-python/genshi
diff --git a/dev-python/wtforms/Manifest b/dev-python/wtforms/Manifest
index d3d7e4b2ea28..d86cb4bafbc5 100644
--- a/dev-python/wtforms/Manifest
+++ b/dev-python/wtforms/Manifest
@@ -1,3 +1,5 @@
 DIST WTForms-2.1.zip 553644 BLAKE2B 0db0c1d9b3249ad43ad5aa4da597fab3bca38f87eb636768b867365495a30d5f4d4a1def16c9965bfd4bce8ed28ffc7601b3b352af74208086feb7b54ab3de07 SHA512 2bdac0a35eca465021df9fb37dc0acd87bf487c6158b782d48870e9d5aab6ed3eb635af89bb38b9e8419688185f7c7b7875e68f7435d94bca8b074b2dddb12a0
-EBUILD wtforms-2.1.ebuild 1237 BLAKE2B 6f8ba168129de16d302c6ee8e9c9529cb852d2543726d35a7bcaafa94ad711e8400db442537f12c0555827dcb6c940f5892c5dfa9a244293635b4e94ea5e37da SHA512 eda4a8f0f75c996ca81532ed9b211eaa25ad34d47f915162091fb01bff5a88af57afd994fe5625d32581b7f5817a7885b962202eebc609f410c6b061aef54597
-MISC metadata.xml 310 BLAKE2B ff2a72dfc1bde47eefcbb451956253c0fc5bbcf12c78ee22b851902c40fc220a654c8d332006df144e75ddc9f0712a4d250ec084b09ed557d15597c54006883e SHA512 12e5d9d017ccb42db1407a0a567cdb5edc794c2655b5f1179c00337ad97af7b9f621847d1e643f02dc952b3abe34abef9c31cb9620b47a80d99359dc0360594e
+DIST WTForms-2.2.1.tar.gz 156904 BLAKE2B bec7c526f72b264888f7be45ba15d2bc4d194b09adc8ca5806cfc04cd1671663c851b7f1c99c602bb3e13d14a38733be61613058e46481bcea59901ac1f5b6b2 SHA512 06478790a8a4bf728e5436edaa63c7c0e596f71d63b273e1f296f9255d9fa3e31a7bfa95971c214a8cea684034ac3c77b05371f4b4e14da9d9ef2c5afadabde0
+EBUILD wtforms-2.1.ebuild 1203 BLAKE2B f105564161fea7270a244537cfd8ebf7c9f0038375bb8dda8d70c48499d7c1a85faf58ebfe1c47a889b06b92fbd78128812479fe3daaf7bdb85c0b195d90bf1f SHA512 3d978277b6f2abad504303fb87ac7f9b9902b44b093855949c672c243a5354bf089380b1f383fbe77252d162fb7270cf9aded6db7922fcc902ca52b01ef81a65
+EBUILD wtforms-2.2.1.ebuild 1312 BLAKE2B 427b26353efd246caf5b1ce6bb9faa551aa5145cbf1436420ec32c48764fbef6d8105747dc07943e5efc55bcbe8328af242437cd2a1e3d1e7a7952184e7cba3c SHA512 a9d8c13252f1dc646566b0581c8380d29b4f5ae5b2dd768653689b1a25150f684e264e314c7c76fe0db0283389d2669d9fff2a0f20a4afc2d5a30bbf43202fb8
+MISC metadata.xml 428 BLAKE2B 56881cd6ce12c4829ba29d6571369d4fe5f0d62810934c5f89b04c61cb00ec592773f7a6b79dc9034ee74240db95d9af690271027c87bc4e2997902a21614940 SHA512 2399e15e7dfc3dfeea12c49f3f4df7bab32e03a38860d268ce1de64ca7978dcf197c7658250778b4d4006eb7d2626f2d17632cb3dd2ca507c0d918e5996918a0
diff --git a/dev-python/wtforms/metadata.xml b/dev-python/wtforms/metadata.xml
index 3fc3226c6f71..cea903f60e3a 100644
--- a/dev-python/wtforms/metadata.xml
+++ b/dev-python/wtforms/metadata.xml
@@ -7,5 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">WTForms</remote-id>
+		<remote-id type="github">wtforms/wtforms</remote-id>
+		<bugs-to>https://github.com/wtforms/wtforms/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/wtforms/wtforms-2.1.ebuild b/dev-python/wtforms/wtforms-2.1.ebuild
index 6eae21679f9a..8bfc1510c613 100644
--- a/dev-python/wtforms/wtforms-2.1.ebuild
+++ b/dev-python/wtforms/wtforms-2.1.ebuild
@@ -11,7 +11,7 @@ MY_PN="WTForms"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Flexible forms validation and rendering library for python web development"
-HOMEPAGE="http://wtforms.simplecodes.com/ https://pypi.org/project/WTForms/"
+HOMEPAGE="https://wtforms.readthedocs.io/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="BSD"
diff --git a/dev-python/wtforms/wtforms-2.2.1.ebuild b/dev-python/wtforms/wtforms-2.2.1.ebuild
new file mode 100644
index 000000000000..54abdefa4a6e
--- /dev/null
+++ b/dev-python/wtforms/wtforms-2.2.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+MY_PN="WTForms"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Flexible forms validation and rendering library for python web development"
+HOMEPAGE="https://wtforms.readthedocs.io/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+S="${WORKDIR}/${MY_P}"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/Babel[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/webob[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Extension-tests are written for an older version of Django
+	# Disable pep8 even when it is installed
+	sed \
+		-e "s|'ext_django.tests', ||" \
+		-e "/import pep8/d" \
+		-e "s|has_pep8 = True|has_pep8 = False|" \
+		-i tests/runtests.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	"${EPYTHON}" tests/runtests.py -v || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-07-19 22:05:27 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-07-19 22:05:27 +0100
commit	121ed4eec41fbf03e1998d09eede1bf449da63b9 (patch)
tree	ce9341d77d1507f67d4a3a1472da9011b5baa0a8 /dev-python
parent	dd762ff83c330186ee2ede002e08b2f780cddd51 (diff)