gentoo resync : 04.05.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-05-04 12:02:00 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-05-04 12:02:00 +0100
commit: eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch)
tree: ce35c6d01b5ff5de95c3a20fef853b9a6518ad2e /dev-python
parent: b7ebc951da8800f711142f69d9d958bde67a112d (diff)
170 files changed, 1372 insertions, 1893 deletions
diff --git a/dev-python/Babel/Babel-2.6.0.ebuild b/dev-python/Babel/Babel-2.6.0.ebuild
index 0fcb34c842f6..cb1445fcc53e 100644
--- a/dev-python/Babel/Babel-2.6.0.ebuild
+++ b/dev-python/Babel/Babel-2.6.0.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 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~x64-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index a61369753a02..12bd5c2b6570 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -4,5 +4,5 @@ DIST Babel-2.6.0.tar.gz 7960433 BLAKE2B 0edc3b3391eb3d479eae9a223668af96e1ec47b8
 EBUILD Babel-2.5.0.ebuild 1465 BLAKE2B b232f3b8dc6c5250c4db5280b9a2175b895327f64ed149875c04bc72256336a52ce8ae5a235729ac8ea560d113fbddbba284e418ffbd7ee4c69320e49e023c05 SHA512 6f1ee6fb7f3379dfa11f6c387749166fb0e20507186c465f2bb47661c6800ad7c9eaa144389310f75ed2c14cf7400a31523696af23c1095133b9348d9d9934cd
 EBUILD Babel-2.5.3-r1.ebuild 1528 BLAKE2B 56f671bea49ee4af9cd8d85e5ff20db6120b016150671bde9908461357014e6830fceb8e46f864ef0766fd34a3c9647e7b7eb7d3a5c60e4bdd0e2950c7d25dd9 SHA512 abedff3f1722fec27790a1f25ec17c59add7f2b95641e919f6ac4da3684130325835699521ad8e43edbfd8ec248f2ece61ddc69e6dab4b2b4aaa57f93bf3e768
 EBUILD Babel-2.5.3.ebuild 1466 BLAKE2B 2ca3802dc8d14d20626c786ae11c5941d9e93761788ffeec77e8705b13b789cff425f7a2777f12817ae8c97bc29ee6cbd34c5a3edbdbdd73ceb55c96ab8b8d83 SHA512 1360e52ca21265dfc4c2b4e3dc73886f00ca6da042260eb111d552e93bc852bba442a1f7ee5b009f43b108bb35c88de864c2d3c93cd0205127ad9ebd76d33317
-EBUILD Babel-2.6.0.ebuild 1463 BLAKE2B 3c68d9a4c4f7a507aac843baa130c4baab6e1e2b16cb9f945374190082925f711f75a4c252cf4aa2fff7959f0ee48bc46c31ef85451a3d5581952ac0cead7434 SHA512 ada05ba7b1692b8b12ed44952b67a416b99cad13ca103224b7629fd1ece6e2c0a9bdc83e552310d3f0f49abace882d57dde771262463f5922965b7172afea784
+EBUILD Babel-2.6.0.ebuild 1462 BLAKE2B 2fb5f8bfa7efa6627fe8013919e59861f6675459ac1aa3db35a24e676bbf336213aa6aa2421cbdfeff2593eab5f614bfd05f052a8f0115c1884d003df7d1b1de SHA512 da15f3c27b49a97b2142a5256b502b1986dab099637a7a4667f5b425cff6bdbe86c4f81e527e082d79c6a5940df530f812a7b8203717d94611f6f11b3e9d545c
 MISC metadata.xml 839 BLAKE2B d9916ce88ce8436bb28d15300e78013e1c9e0f88f385a369c0ad6840f0fe81ad136052a3c257cef50a2fd86500bcde2b652ad0ed664f95d6affa4ccc8770445b SHA512 3688c1488c552b84c685d0aeb6251aea4f9d41be3db3aeb226291655107e1332df13445545b3742587e133de7468a40f22ca53fa67fd8d2e0db570069498654f
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 938ee4db120d..e4543542661f 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyContracts/Manifest b/dev-python/PyContracts/Manifest
index 3ae2bd20331f..88f9a832895b 100644
--- a/dev-python/PyContracts/Manifest
+++ b/dev-python/PyContracts/Manifest
@@ -1,5 +1,5 @@
 DIST PyContracts-1.7.9.tar.gz 61033 BLAKE2B 5202d39c91d7dff6e07058f3f7dcc29baa750f69ed9b4abb059de67f3be98e568270eb3d977a6e7a18f232880225fcc532fbd576e94dc3483bde9b8fbe68d526 SHA512 1db6491d4be3df96753dcdd6f85329d47409a2424177a52d1e35f5a1d58f671290d22d807b70f632f0376c86c58c093118f7223b7ad59893a85dccdb91d29f50
 DIST PyContracts-1.8.0.tar.gz 90577 BLAKE2B 988662274e3bbea1ede6d00f4a69b3eb23dad439f5355a9b0a2c5a2f76a6250254303b060ef720d13d9a297ded77f7713271a79a810227aa883dc6d4d46ea725 SHA512 7de933dc8b5992be670b4b34fce7d6f51769d3d2dd02a2400eff5991e9e686e36791234588d2dbdeccf437fd5d6abc6461240645e6d3f665394f390bb727413a
 EBUILD PyContracts-1.7.9.ebuild 1062 BLAKE2B 9afe8b53f34624be6f6492e04eaf7257b6d6d124caa8c441891f7ae885697adc8b212857e5227ca0470b0ef5c8954c19af6432419b998c6bcb562dc7859abaa6 SHA512 aad02fc9a621be1b579f6c9fe8ce37c7cfa70e5db04ce3e2b69ac24b6a4f8914e19d6d0e0da18553404ce90799cbde7d4adb44066ee8fae062502a4a7ad642b4
-EBUILD PyContracts-1.8.0.ebuild 1065 BLAKE2B 08ef92d9a739f7545ffc1a4be6069d167b64f7346aa99f27be9be449975e68410c0630065278348b715ab60c5fdc1b5ed41ac8314352f88cd3337311978943b6 SHA512 6c48745acd35fde53d08b97893603cefae4c8c91fdf8920e8823292afe848b7b5d6ff8df1d32084c6ebd6b454967b15ae1c78bab6849bdc6aa060e9fc1f1a624
+EBUILD PyContracts-1.8.0.ebuild 1064 BLAKE2B 7712d1c42bd90dd1c9a3dda346232c5a93083d4a02dfb3da51ae16dce3afad87a478d995a48f966776eee60f135474039df0ae87a9e1711bcbd2321bca0a2271 SHA512 28183fd0f2d7273aebdd9c0d5514a9401af06c1d79aaedc1088119852d77754827101065fb9e193ed7102c5c113e27b8981fdf99aa70d334d37f82cd4a55a242
 MISC metadata.xml 387 BLAKE2B e1a27603eeb8fdd909b3b7d8052c69b4f0c4aae087140d36e5b49ce470ee486706fa3bd6a8fea1354a50c17499157e540e3e9ed514802b9cb2640b396905b500 SHA512 b4c9caf597b04617af6bc61357be01e6687ba5b45258dc2f76bf02e3dbc126afe2f44e1298bf62ef502110a56cf6f0932fbe7b1a043a99a61a4d56a87ca17b27
diff --git a/dev-python/PyContracts/PyContracts-1.8.0.ebuild b/dev-python/PyContracts/PyContracts-1.8.0.ebuild
index e7b9a21c6ef2..dd48f7c45890 100644
--- a/dev-python/PyContracts/PyContracts-1.8.0.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/PyECLib/Manifest b/dev-python/PyECLib/Manifest
index bdfc69585631..58e7c0ef163d 100644
--- a/dev-python/PyECLib/Manifest
+++ b/dev-python/PyECLib/Manifest
@@ -1,5 +1,5 @@
 DIST pyeclib-1.5.0.tar.gz 6682493 BLAKE2B 3f3a595b67a8e216b90c61f8119be6f40de0863a0d77c4e65c41e699aad0d9a5f1d621e8bb9510d78b9eb495acc5fc5af7178afe127780151b9be60ca246fbff SHA512 89831fc8b04a1488504b632f75da8f2f29bc6b4e33b35d0d4305b4d5ec4bc25c0e16d149580badb15be7dbf8aeb2bdebef81f78f7b7871233afaaf96823e3a3e
 DIST pyeclib-1.6.0.tar.gz 6685306 BLAKE2B 0b758bd500afc7f9d8e38513cc41f1916413d8ad6f3b1bd34d9ff46d6d33321391eaf90164e412154a14d63d4ba61502457bb943e124dd7054a5d5ec20732294 SHA512 507f78388e941e4600f4b77f636ce27b7f63e635f108dd5a452b3f98f779e87d94d8f82239d9d5733846faa5cc574c0474e366d99e44b8f03b70707d352f56c8
 EBUILD PyECLib-1.5.0.ebuild 601 BLAKE2B 83d86a6789e013b4982c93262d673dd7f26ad453a9604d0af4b484c53eae08887e136e1771cc30189019f2654d3ae1b0b8096e77bd0359055d58f6a0a64cd520 SHA512 29f85f4f575703839132e64a84f23b57647d8aff5644b7edb70291e0a79c6945b27e9f0daad5436101bf6a2294639804e139843d5ecc147331f12a56d00aa002
-EBUILD PyECLib-1.6.0.ebuild 600 BLAKE2B 7c8eea6ec39977c8ef42d4d3a725df8a225f51339ce4468db5b514fa2340b0de4e5f222c2b413b8bbdf090a006f58beededdf87c6966ab944b1f9f7871fe5c4f SHA512 3fc9955a72b6c3c6c03b8e2eaf6896c47ae997678226f469ce6c3f14c50ed4a27ea271bac9ba0ed4daa70f6008e44359e7e18e5649c6a22e3cd6269f504b0f45
+EBUILD PyECLib-1.6.0.ebuild 598 BLAKE2B c1b72aca6101273ba51783449fa7f9407595192dddcd7d3440cd96488ff9628995dd4d558113ed6239916340c5b97defdf00ce782706899334f9a43f2fe3fa35 SHA512 213538bc83e5de9b7c168e1cd1738e0faf347746778937def7a37de8a643d45d8694155afd7aa9c90938d3c23147d161d1e62732312e2e49466dba0d121df7a6
 MISC metadata.xml 674 BLAKE2B 82076810eced6e375c341ec804b814d8d9bbad8e02c22a233f1c7891d75e6af7afcb23e835dd49c366e50c56f715b1e8d45675504bb6080347cf826ee66eeb44 SHA512 864d9c85e024752e0060644f9feca3b0d81c6f64610ca60be06c3218e1efc82be66b24bb61b966de238ab6e9278618013f613693fa1fca082287d4f53b4f98e5
diff --git a/dev-python/PyECLib/PyECLib-1.6.0.ebuild b/dev-python/PyECLib/PyECLib-1.6.0.ebuild
index ab29e70bcb74..ff9c7e770524 100644
--- a/dev-python/PyECLib/PyECLib-1.6.0.ebuild
+++ b/dev-python/PyECLib/PyECLib-1.6.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/pyeclib-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND="dev-libs/jerasure"
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 84c6dd444e84..d0382ccb34d1 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -2,8 +2,6 @@ AUX PyQt5-5.10.1-fix-testlib.patch 1293 BLAKE2B 8ea2a9de5913578c951b4acc05508662
 AUX PyQt5-5.10.1-timeline.patch 1063 BLAKE2B bcf04d91798b0dc2136ff9c85802abd14d35fb6daa952784ebce23a7b3c930421260f0f1dd80e47f2bbfc49ca9e26159f05c23ff136af4b68e69468d117dcc52 SHA512 8e09feca5f42ff61c479d098f7ab0299cba51a9234eb03146568166e50d6b2fc7d424bc4297905bd0d733508c891ac5b2287c05c6039f9f60bcec12978ac5821
 DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
 DIST PyQt5_gpl-5.12.1.tar.gz 3147086 BLAKE2B d5a018f1fca401b9f70dd16e2a28ea380c8a83f5e18dc8577e317dae5904a7b95f8fe979bf7f574f95e71222c514565fbf051b1de87f97cd2ab70c09d04e86ac SHA512 f8c440bd5e804b9f5fcabbdf1290cee3176f3d676d150c705b64136d2116ccd7b09233672674fe97a4aa521974c9355d44daf7a244b6cda7fa55757332c08e67
-DIST PyQt5_gpl-5.9.2.tar.gz 3102848 BLAKE2B b87f25693aa2b20211119f89cf13665bf88f14de8827d43ba757344ab9bdef0b0c197abb8386308c72925da263cabb6efd3f104db8a350c51fca3fba8c7c06b6 SHA512 5af2e65addaed7dd02d8dbf7a7c63767e565fc8edeb7b51e5991a00cda29f75b666529097646e821aaff556f350a929fd451f548bba76e97355b7fe10bd913bc
 EBUILD PyQt5-5.10.1-r1.ebuild 5790 BLAKE2B c75e543814d465ddac56368ab5398aa37c1c49b6985bbbaf0b739893023a00aabf94765715e30309a5f511fdae853b69057e4c4f50bf2854126e311f8d96d884 SHA512 9c242c66aac8d2d9ab358ded73ea2defd4a8e562c919d01af02d1f104becdea0532d7a228790f9eb73acd2de4c893f0be7f25d0a64b2c4f0bc5218452035b33f
-EBUILD PyQt5-5.12.1.ebuild 5791 BLAKE2B 9b5fe87ffb7d2d501786ac67e4736e9dc2222d496be144aec9ead9a3017e599a0dd48fcc4b50990a6e30b97834bbdfd3f89aae00cfe720a89b9e6950c54865dc SHA512 972bc5b07516a2926e22b6aa68bf8f3125b468517f05825b5ee2c9a9ce3669b295c43e03120c45bdb468561a21a1a58e2da6673cae020dae39620eddefe7f851
-EBUILD PyQt5-5.9.2.ebuild 5660 BLAKE2B 92c6ceb0c5332a6104828fed577d76f77e1c1b0d93d77ee28b83ae08e75f99c7475783ad24522dcd64e54e17b34a1b36dc2ead1f6967a986ccbefd26a9b7c432 SHA512 95831e63830e5a3962e36adca333784954c9b219a8bb818d04ce4a8212ebf14a5045e48822c8de48f4e381c8a8b26bd50164807855eb5dbf3cee2ce022b2b6d7
+EBUILD PyQt5-5.12.1.ebuild 5848 BLAKE2B bec35b735fcb80149019293301a28f43bf913448a84cfb10b308ef8a7ae9804310f410adf0606e6de814921b9dcdaa24e4e7a6dc913a1a820b56863b9d36d2a1 SHA512 beac1dd8bef4252a7f62117ff8570ad360bd4ef712849678530c4de48cec0f45360f65e2488dce6e9dd01e0e2f2c9a09b26e8ffab3ebe490aaeb5c2d102002bc
 MISC metadata.xml 2594 BLAKE2B 3c8c7159c42e050e4e4487ea8c24bd8d7213f9590656c3ae7152c0dcf151d4db99f07546636df0b7142107f506ae72e8d8c31a34aeafbdd325001030088a5493 SHA512 41e4d7e868a9b101d2bb41e8976b20d460544b1d103b3600b5b7cb5fbfc456538027d4b02283587aa747fd1789d7e675e5ce832df71f3dcd9b22eb095087328a
diff --git a/dev-python/PyQt5/PyQt5-5.12.1.ebuild b/dev-python/PyQt5/PyQt5-5.12.1.ebuild
index 37381dcdb825..909fa142cd2c 100644
--- a/dev-python/PyQt5/PyQt5-5.12.1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.12.1.ebuild
@@ -128,6 +128,7 @@ src_configure() {
 			$(usex declarative '' --no-qml-plugin)
 			$(pyqt_use_enable designer)
 			$(usex designer '' --no-designer-plugin)
+			$(usex gles2 '--disable-feature PyQt_Desktop_OpenGL')
 			$(pyqt_use_enable gui)
 			$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
 			$(pyqt_use_enable help)
diff --git a/dev-python/PyQt5/PyQt5-5.9.2.ebuild b/dev-python/PyQt5/PyQt5-5.9.2.ebuild
deleted file mode 100644
index a4aa37a0d7da..000000000000
--- a/dev-python/PyQt5/PyQt5-5.9.2.ebuild
+++ /dev/null
@@ -1,198 +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 multibuild python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-MY_P=${PN}_gpl-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
-else
-	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# TODO: QtNfc
-IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location
-	multimedia network opengl positioning printsupport sensors serialport sql svg
-	testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns"
-
-# The requirements below were extracted from configure.py
-# and from the output of 'grep -r "%Import " "${S}"/sip'
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bluetooth? ( gui )
-	declarative? ( gui network )
-	designer? ( widgets )
-	help? ( gui widgets )
-	location? ( positioning )
-	multimedia? ( gui network )
-	opengl? ( gui widgets )
-	positioning? ( gui )
-	printsupport? ( gui widgets )
-	sensors? ( gui )
-	serialport? ( gui )
-	sql? ( widgets )
-	svg? ( gui widgets )
-	testlib? ( widgets )
-	webchannel? ( network )
-	webengine? ( network widgets? ( printsupport webchannel ) )
-	webkit? ( gui network printsupport widgets )
-	websockets? ( network )
-	widgets? ( gui )
-	xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.9.3:5"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.19.6:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	location? ( >=dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
-	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
-	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
-	webkit? ( >=dev-qt/qtwebkit-5.9:5[printsupport] )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
-	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
-	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( "${S}"/{ChangeLog,NEWS} )
-
-pyqt_use_enable() {
-	use "$1" || return
-
-	if [[ $# -eq 1 ]]; then
-		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
-	else
-		shift
-		echo ${@/#/--enable=}
-	fi
-}
-
-src_configure() {
-	configuration() {
-		# Fix out-of-source build
-		ln -s "${S}"/config-tests || die
-
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			$(usex debug '--debug --qml-debug --trace' '')
-			--verbose
-			--confirm-license
-			--qmake="$(qt5_get_bindir)"/qmake
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--sip-incdir="$(python_get_includedir)"
-			--qsci-api
-			--enable=QtCore
-			--enable=QtXml
-			$(pyqt_use_enable bluetooth)
-			$(pyqt_use_enable dbus QtDBus)
-			$(usex dbus '' --no-python-dbus)
-			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
-			$(usex declarative '' --no-qml-plugin)
-			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
-			$(pyqt_use_enable gui)
-			$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable location)
-			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
-			$(pyqt_use_enable network)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable positioning)
-			$(pyqt_use_enable printsupport QtPrintSupport)
-			$(pyqt_use_enable sensors)
-			$(pyqt_use_enable serialport QtSerialPort)
-			$(pyqt_use_enable sql)
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webchannel QtWebChannel)
-			$(pyqt_use_enable webengine QtWebEngine QtWebEngineCore $(usex widgets QtWebEngineWidgets ''))
-			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
-			$(pyqt_use_enable websockets QtWebSockets)
-			$(pyqt_use_enable widgets)
-			$(pyqt_use_enable x11extras QtX11Extras)
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		eqmake5 -recursive ${PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		local tmp_root=${D%/}/tmp
-		emake INSTALL_ROOT="${tmp_root}" install
-
-		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
-		local exe
-		for exe in pylupdate5 pyrcc5 pyuic5; do
-			python_doexe "${bin_dir}/${exe}"
-			rm "${bin_dir}/${exe}" || die
-		done
-
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
-		if python_is_python3; then
-			rm -r "${uic_dir}"/port_v2 || die
-		else
-			rm -r "${uic_dir}"/port_v3 || die
-		fi
-
-		multibuild_merge_root "${tmp_root}" "${D}"
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/absl-py/Manifest b/dev-python/absl-py/Manifest
index e216ab6db312..7c347b415cc9 100644
--- a/dev-python/absl-py/Manifest
+++ b/dev-python/absl-py/Manifest
@@ -1,7 +1,3 @@
-DIST absl-py-0.2.2.tar.gz 189357 BLAKE2B b53976b50f1738d671a32df2fabf197785cb4be1f68dbf7f0bdd5bbbb1a73439646f5b6a9ea42d5df40debdbb8e8c72c554f428a948f3117dba5d6a8e2b473f2 SHA512 d2a393e78acc9ac28fc9b1129c23de9c2ab6059a7527eaa29e4182356b16cbce1fede94af2a8b51af9d1c606b162d8ae84eb3036ced784a89d4f7547bfce73ed
-DIST absl-py-0.7.0.tar.gz 213291 BLAKE2B 9a8575f1c6d0c98d750cf0fc5bc528778b0498beb67291368ddf210131ea32073228fe5b354be92bbfac2e36ede1638006d65b5517917b6453e2e599110699d3 SHA512 032201603aa0757e70cd35dc2eb1c4f7ef668060f42a5e22223e7102b2abf8d5e9e08c883deaa7bce822712245b040aaf99abf94a8cd5bd9688937fbad982586
 DIST absl-py-0.7.1.tar.gz 215669 BLAKE2B 6c7eeea6c21f03a493448dce12bd30b62a34e087b1bf932f10d638190dbeecb79ff40d90698b80bc2a62b6c45d9254f6ff4a789d8e8139b8317516ef2f7b5fea SHA512 19fc41effaeb22f6a4376b9ce32560fa8e3f36b7004e17806ac64fb6775525f3530b36ea8b224d1ccf2f1ee076ed0671039971b061b9185fe37c8f2495110a84
-EBUILD absl-py-0.2.2-r1.ebuild 562 BLAKE2B e81ae3761174f88ff0ffad297bab1cf509775301079aa2083a9a38920b1e850b417718bfd9f5eb437f7036899dbc0cf0679fe33a91140d37d7a7ef1e1a156a07 SHA512 5b3c3a169e2a518cd36f0330ecb642a341b53f84c16eb947b53ace1e1036561c0ed9b6f2ea9b13c543d777b6a294c5961fd6d09c2fa66bf0f5d1a6905b7dca2c
-EBUILD absl-py-0.7.0.ebuild 564 BLAKE2B a5619872992c9b8d0e45c9bda1667c5510d0139cf381e97c659cca5fdc930d9638a602d11c5c1baa03e9b277d4c922221ae2c7956bdbaacff4ffdeeb0905d2c7 SHA512 a5ce033e8279fc90215ac430d2e186938a653f72e37bb8759a7a6d5ae2b54e9ab995ffc9623661af558b4da908836e46b4724b984a3a7c1136c75a9c96f28237
-EBUILD absl-py-0.7.1.ebuild 564 BLAKE2B a5619872992c9b8d0e45c9bda1667c5510d0139cf381e97c659cca5fdc930d9638a602d11c5c1baa03e9b277d4c922221ae2c7956bdbaacff4ffdeeb0905d2c7 SHA512 a5ce033e8279fc90215ac430d2e186938a653f72e37bb8759a7a6d5ae2b54e9ab995ffc9623661af558b4da908836e46b4724b984a3a7c1136c75a9c96f28237
+EBUILD absl-py-0.7.1.ebuild 562 BLAKE2B cd094e19ddc15078c62e8fb7ea12e0a2a8752b70dfeab0814766259a3e4cfd8b6e1dad314535887c2b61de364cc9feca5479f69f5a5492e99cc563e165605975 SHA512 98a587678a6602545e85a6e62d67193293d40eb581be85191f2c46c068f822c842e516fb041385ebf115e56e738d609972f321188f14177a7270864e5344dc89
 MISC metadata.xml 507 BLAKE2B 0a25903f7c7a7b2954b7d7e9a6e405cf7191e4c759b5bd34bd5891dbfb1e328e6e3ebd9ed9fb34bced6b807759ee6b2c2b04673608d4b8db4fe63f93c3c19dc3 SHA512 64f94f3f0e4e2d4fca4d98aaa2886172019ae38cff25aa6e73cc8cea8e1d39a765918f93dec489439ef4ccae85e01972dece72f3ba06eeb37b91cd6f928393c2
diff --git a/dev-python/absl-py/absl-py-0.2.2-r1.ebuild b/dev-python/absl-py/absl-py-0.2.2-r1.ebuild
deleted file mode 100644
index 0d0b23e9d92e..000000000000
--- a/dev-python/absl-py/absl-py-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Abseil Python Common Libraries"
-HOMEPAGE="https://github.com/abseil/abseil-py"
-SRC_URI="https://github.com/abseil/abseil-py/archive/pypi-v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/abseil-py-pypi-v${PV}"
diff --git a/dev-python/absl-py/absl-py-0.7.0.ebuild b/dev-python/absl-py/absl-py-0.7.0.ebuild
deleted file mode 100644
index 27a30fd06963..000000000000
--- a/dev-python/absl-py/absl-py-0.7.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Abseil Python Common Libraries"
-HOMEPAGE="https://github.com/abseil/abseil-py"
-SRC_URI="https://github.com/abseil/abseil-py/archive/pypi-v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/abseil-py-pypi-v${PV}"
diff --git a/dev-python/absl-py/absl-py-0.7.1.ebuild b/dev-python/absl-py/absl-py-0.7.1.ebuild
index 27a30fd06963..5568397250a2 100644
--- a/dev-python/absl-py/absl-py-0.7.1.ebuild
+++ b/dev-python/absl-py/absl-py-0.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/abseil/abseil-py/archive/pypi-v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/ansimarkup/Manifest b/dev-python/ansimarkup/Manifest
new file mode 100644
index 000000000000..4a498fbcd4bb
--- /dev/null
+++ b/dev-python/ansimarkup/Manifest
@@ -0,0 +1,3 @@
+DIST ansimarkup-1.4.0.tar.gz 12533 BLAKE2B b43b1dd0d8fb950866a313b7f8bb0fe44f983aae1c8e5cbca95aad7b77ff7563e04e019622a3531228a891c6c8c16bc8d9ddbb55e9d418d8055f3eda41ce0866 SHA512 c397201f7789cbdec0d4e32ac5a4e1f130deb329535303538b48136381e7217ed7e80fe4eb586c6e2a30dc9848813c7d43bb01c0a2a6a4a29e14842bf4540c4e
+EBUILD ansimarkup-1.4.0.ebuild 718 BLAKE2B 0ffb23b594f642e81f02759cdee5407aae453617b5a34c6cdec3f2af140d6a0d421e78595d0316f419adbddbe0aa0a8a99308dc6143fb71ddf83431b79ff8fd5 SHA512 4095c9234923833f42b8a000a3b6fca9e2652fbc4c1c3df9c0fc017608e589a2204b9d8428cf52d772e5955b9a216fa31cb56507c085aa107abc9c5831e1bece
+MISC metadata.xml 493 BLAKE2B e57eaec5f0bda792267ee5cce190f2b1f7f1017bf5e28e28051f947143cfb9f9173311e57e9f6d490f3a59908bf0af11378f394f4c8edf2cc78466758753db57 SHA512 3c9c292a3e84dfa535eb062e3f71b0d3a8b374dae7810129473abc3f801937c2e09b489ac2f0fc66103ed4da110df661570ab8f0d9f8857f938d97d443af6793
diff --git a/dev-python/ansimarkup/ansimarkup-1.4.0.ebuild b/dev-python/ansimarkup/ansimarkup-1.4.0.ebuild
new file mode 100644
index 000000000000..4d836ae349e8
--- /dev/null
+++ b/dev-python/ansimarkup/ansimarkup-1.4.0.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="XML-like markup for producing colored terminal text"
+HOMEPAGE="https://github.com/gvalkov/python-ansimarkup"
+SRC_URI="https://github.com/gvalkov/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-3.0.3[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/python-${P}"
+
+python_test() {
+	pytest -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/ansimarkup/metadata.xml b/dev-python/ansimarkup/metadata.xml
new file mode 100644
index 000000000000..921967b4c0a0
--- /dev/null
+++ b/dev-python/ansimarkup/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		XML-like markup for producing colored terminal text
+	</longdescription>
+	<upstream>
+		<remote-id type="github">gvalkov/python-ansimarkup/</remote-id>
+		<remote-id type="pypi">ansimarkup</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index cdb7b87e87cb..9d2a054a8a10 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -4,5 +4,5 @@ DIST astroid-1.6.5.tar.gz 255688 BLAKE2B 7547e4c537f73ef77b61fba1ab8640c7cd50014
 DIST astroid-2.2.5.tar.gz 281829 BLAKE2B 2cc341caac381fb44b0302e8057a6e2105a6a82dbf807f8a59598e15c5658cc30d4c32e3b58ebbc94c4559f2b2274373f5ed6c4b86b4e8eff86dd91a5520e7ce SHA512 71c8c26314f666e2b9519a83dd9476fbfe0ad7d72f5308f6a94b83c5442dc695bc3e51155df45586ff2ff0eec522a02286d00ac566d542f0b82e5e0d0d7d9c65
 EBUILD astroid-1.4.8.ebuild 1088 BLAKE2B 27844625dd01b856e02e528e7da2be65b32065ea6fcb9d51efeebb39259f2da9737a793bbe980e0b9dd7aa7d082ff94b4b06752e0a45d1cda26c00841a9be6a2 SHA512 7e76ceba7ec1b416aeb5ceb82d948de7871590b978a2f185c50459dbf7c7252488f945d22e0d6a8b79a045586325dc97c434954c428b0ea7c0aa88d0b6b04a2d
 EBUILD astroid-1.6.5.ebuild 2016 BLAKE2B 12e9de767d5f016f998a4e3e2274a9af70e46c54ae9ba7f6afbf58fbba34125cd1f05f0f65c748869d0ffc87bd576802fe9a20689887594b2b423a4f074fde86 SHA512 8928624e50fea7da767fee3990bf4438c3ba6a1770dbb8b88428a4f4adc089f684ec27594b8493b16e4ee36c5637cf638c203e6eb9fdbe74be2209a2935d3d28
-EBUILD astroid-2.2.5.ebuild 1284 BLAKE2B cb34050b598fadd21fdebc49f8660a3117fa7a1e5799c8b0230304473695b4e32c97cd5f9b327ca944a346f3181ac6042b83ca27aab55a81dac3541b54ad9aa5 SHA512 f056f0d723a8545ef2049585bb22b851cbca7299ea4cac1cc415b13bc967918b4262dc9bb69b7886daf5b1ea4d59af63c12333bd48773e0c2ed1892ffdb8b427
+EBUILD astroid-2.2.5.ebuild 1289 BLAKE2B 8c70bab22faa7f9afffa3b804443370d6c013d233d025c3edf6f9576914be093c3fbe91277df30c79bfb6b438eec94f434eece515029dd4347e7e72ac8a66f0b SHA512 265d1104e022fdd9a04bc3edf76577890a89a63543d0b805af7cbafffd4fcec7dcf9e1c2f10f8f7b89b5428be2584c6d5fc2bf73edcd90a6768a0c7ba8458539
 MISC metadata.xml 1122 BLAKE2B 29f5f5eb980aa5e9035316854d7b69a803bf8507cd8f2b97880ef3a0be3e200936ddc3679e480741cf82203b704cd6c7b1610d31e9173dc3f8b97ebec6a6c844 SHA512 34a45382d84c03057ba59b40905138c2e048da4d602e5a26dab4b156c1a3697369e11ef66f451f3f823ec827f3771eb58c077c056f9609e5b55a27841fd5bf9d
diff --git a/dev-python/astroid/astroid-2.2.5.ebuild b/dev-python/astroid/astroid-2.2.5.ebuild
index 0846d84b44b5..3468e68a2d8e 100644
--- a/dev-python/astroid/astroid-2.2.5.ebuild
+++ b/dev-python/astroid/astroid-2.2.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 # Version specified in __pkginfo__.py.
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index 463dbd5a70ae..b62db184a065 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -3,5 +3,5 @@ DIST Automat-0.6.0.tar.gz 31767 BLAKE2B 28baa9d6cc7497f9c0a4b7f4050b197d3dff871b
 DIST Automat-0.7.0.tar.gz 61461 BLAKE2B dd09ce090c7333ee17b701bde2c78e01dacf40cefee847061a2019bb27f0982091e7628737211421ada351937caf9c6734cb445ee6462ce84b381030b013bd05 SHA512 a6f307d312a3ceb721071b5212297c73d2306894b5fafd39265578041a2859bd6f041ac43a654bdda4175a70a4e90e0db1ee35cd43fa620cd5c594b5d1988a74
 EBUILD automat-0.5.0.ebuild 1218 BLAKE2B 403ff7532bd738941a3d2db4daca9a7f256ebe9d095a0d914a4d9e4f802caa5bb36a41085bd651ef19176430a130132d5a7d0c4f72cbba9239e364765064001d SHA512 50194fa033d7641619a51efa9c8d12710586f3758f329eff03d4ab7679cc7923f227355f7bc89dfe098ad5518bb10cb6d5a5ad9f35f53d406874c7bbbc254bf3
 EBUILD automat-0.6.0.ebuild 1236 BLAKE2B a11595ef80ce5d9fa55e50c13e89a445b2008beb1f668e9373ebeeb4e41e203df567969ac9742dff311ead31241a4818fc1479bc4044289758d6a8b3cfb746cf SHA512 54b9abbd4446f2658b0b04ebad07fa1dd858f9aa5bd91898d9e7f3937174f9992b229b1e9e8b71e4c564e768cbab244040cc16a2002719291f1edddea51cf644
-EBUILD automat-0.7.0.ebuild 1451 BLAKE2B 2e247d124c9051888d610641814f958b3e5efd024e2795f14196029222691cf42826e87a80b8f735d90bc07a4dcd18c1f077ad0776afb998aa0dec8dd13650e6 SHA512 624a7ae76146726cf583f37a8515c538470eaa666902f0065d34b395c0616b4f859d897ddaee8013e633036e510882e3c42bfa99d54d831631d3cb5c416106b7
+EBUILD automat-0.7.0.ebuild 1458 BLAKE2B 6fef4a9bf3ff3e163599ee26793f52b59230c45751201f01a1e0be8f1d9bbbfd7ffd92e2e1ff49f8114c67daddf5aba1809af7180c731a1fbb171eafde0ef410 SHA512 92fb29d5a014074bfed4ff6a39acc5c4333777ceb866b04cb37820442d4c11bc6b179728f4e09ab4cad36d9c95513b7593430a3945916150ec7cf8bedbd8f333
 MISC metadata.xml 622 BLAKE2B 10fa7f62095186a07a588b374c55dc084a483ff8848caff3322822964d57175a729e82948f984f4348a1cd0e5d7bc08c1d548ef674fb93aa08bd55343c53ba63 SHA512 f9feb6bd4b545a707d0539d42d20a0371eeb8a9e0984e922b3a0416a0dda97b6783c21cf1ec63868c200535d9a46e80b820424a1d7199074419780b3e7328333
diff --git a/dev-python/automat/automat-0.7.0.ebuild b/dev-python/automat/automat-0.7.0.ebuild
index 7f06d65b96ec..948692f5b3b7 100644
--- a/dev-python/automat/automat-0.7.0.ebuild
+++ b/dev-python/automat/automat-0.7.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
 IUSE="examples test"
 
 RDEPEND="
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index 3727f7f3ce4c..a038fa54e6d9 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -1,5 +1,7 @@
 DIST awscli-1.16.104.tar.gz 1186611 BLAKE2B 8f0918b86c37e184ffc8055cb16a02379fd35e685c5ddfcbf2b7e1fb71a80f829569eb1c2264e75563a316d933143a662cd7dcf4d6d25d236d72c268fb4985f0 SHA512 738ceac890b28c335f0c9bc703975af3467f17723b8accf713ef131224602895f6b4fae06cad93495933563c08ede18e38cf67abff744e6f5b0042b182bddec3
 DIST awscli-1.16.125.tar.gz 1201382 BLAKE2B 4412aad3e892527c053cc5baedaf9fcdf82f9c28fc1c19249713d5bbf174ad01ca61e2519702f67580c67ac389359e4493c3ad16646216619516a8ec76f37a2f SHA512 01d66d2baf26377f5315f5b3b0bf52fe6643c0e695e83c75178d819b29ebf3d55b1ad4a4ab4065540fc091d2e12090687a1046dc586715c4021dc30519bf2feb
+DIST awscli-1.16.148.tar.gz 1227053 BLAKE2B 3dd32671fff511933703a418c34df8a0c71bad02ae76391eb279cb1148f7ae989dd1d98a9752a894e81f6feef55781129b82d938bc0b16f7bb0ccb8be0d1571c SHA512 c609e109da24e6d58f8c4bfaedfc6ded593dade51e60f66af4b1885d38920eada4fde8a4f67266931484981a6c6a9bb19ef8c36b3b3915a83f3d933912b6bb02
 EBUILD awscli-1.16.104.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
 EBUILD awscli-1.16.125.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
+EBUILD awscli-1.16.148.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
 MISC metadata.xml 316 BLAKE2B 29c8ad67f4e7c5db4439aeae00deda8b57bb36bea7bd6490ae60efaa30cd2db1f7b2cff5b21558cdadea05f9caa8a9f4ee580fe2ea80959fe6ef7ef6f740c550 SHA512 86b3359e64e41ac4f2216e5bbcee6468100df3cd6e9c25595527d6819a2c27ce327797163a3a43bab11516a4826cff47825449cb797d7fe845794700a3a2bed0
diff --git a/dev-python/awscli/awscli-1.16.148.ebuild b/dev-python/awscli/awscli-1.16.148.ebuild
new file mode 100644
index 000000000000..12aa770f418b
--- /dev/null
+++ b/dev-python/awscli/awscli-1.16.148.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# requires network access
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/botocore-1.12.81[${PYTHON_USEDEP}]
+	<dev-python/colorama-0.3.9.0[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.12[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/aws-cli-${PV}"
+
+python_test() {
+	nosetests -vv || die
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED%/}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/dev-python/backcall/Manifest b/dev-python/backcall/Manifest
new file mode 100644
index 000000000000..f6628bbe7ab7
--- /dev/null
+++ b/dev-python/backcall/Manifest
@@ -0,0 +1,3 @@
+DIST backcall-0.1.0.tar.gz 9690 BLAKE2B 975944b508a4488cd78620b2f6efa8b0ebd7404966db5a53e409000c11641c979abb269289d3e570d01dc50961c881fe80ebbc2c6b79a01ce563d4e3f855af63 SHA512 359c483fbc8998fc2420daee2a6af7566c47fb03f64e465aa226589a2f98a4b219ab5e5b90e5f677087827a1ac658c02ec3062e9ffe9ac1ebfd9db3bb40339cd
+EBUILD backcall-0.1.0.ebuild 504 BLAKE2B f4836cdf7d6f415121d10e9ee84c60a279e4a10c06e1113cce9b9cb5e024a30ce1832e13d9bf622ae14fb82f2d0bc574c3222cd4ce5cb1092a8aae5348f8c15d SHA512 77048000547e4e465fc030d236a2ff730b1226e9507390073dd36b9b231423e2d4d2516dea0c158aa13e4cb9d6ef46935907a48ca44dfbad34c2ab3761fd30fb
+MISC metadata.xml 311 BLAKE2B 7930b7db6a4df8fe11e5490dc1df86b4468954db1a5d7508e95007780b5df1cfc07a2783638310cc9d52ffee52ffe702d4f6f46146d8c88adb4e9036bc5de8f2 SHA512 bf3b5d9da6f976f24f791baca8e2703dca2fa1e7d0e7e3958951147770c0448300b6875c405bd4d09cec2561ad6856d4d562a511c57e94f342adda68538708d0
diff --git a/dev-python/backcall/backcall-0.1.0.ebuild b/dev-python/backcall/backcall-0.1.0.ebuild
new file mode 100644
index 000000000000..ef0e47971309
--- /dev/null
+++ b/dev-python/backcall/backcall-0.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_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Specifications for callback functions passed in to an API"
+HOMEPAGE="https://pypi.org/project/backcall/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/reverend/metadata.xml b/dev-python/backcall/metadata.xml
index f5aafbdae2b0..ca0712e086eb 100644
--- a/dev-python/reverend/metadata.xml
+++ b/dev-python/backcall/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">Reverend</remote-id>
-		<remote-id type="sourceforge">reverend</remote-id>
+		<remote-id type="pypi">backcall</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index 582887e0c74f..fa948d7dfe5c 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -8,5 +8,5 @@ EBUILD click-5.1.ebuild 1213 BLAKE2B 03d408ca41c1d8388774e33e99256cbac1e6a5a1e76
 EBUILD click-6.6.ebuild 1200 BLAKE2B fb5deaa2c1ac14b0f4653835afd3e22718cb4f44795cc315087ed61940993597d0392893e20c0c0ad262a68e50a09712d2b1babe6c21ce671cf5b1fd0d196172 SHA512 d33eb4ffd768d1a26641a62f7ed035b7bcd53a838e9ec413553f3951261b82e37c4905accaa3beeaa09ae6b52dbaaef6d923febc19de75320f1149d2f9be9ea0
 EBUILD click-6.7-r1.ebuild 1419 BLAKE2B 6dcb7b0998d5e05082260d3ef13f86dc8b4794675cf2c24e447c1b9c97787b842ac5a8f5135870f7764be2b3a167e7f7b91ed84cff9729299bf78e85e9d2e4a1 SHA512 6fc30acbbe305fca880f4a192568039d3ebd084ccfa0858d17dc07e11010c97132dff9df7d2f492190d080d6f7dc09c5056eab0371bc348cf51f41468bf6d691
 EBUILD click-6.7.ebuild 1307 BLAKE2B 2f13b521b88d734b69b9be4fc7bbc5cdb5aaf761121fafa9eb4c3fdd5f1f382844b543900a63e0af803dd43d46031018abbd8c73c52557126a3547ade1b2192c SHA512 ea837a3e2d42cf681efe634352b85ce8e63f568289f335dce6d42fe6fd5bd2f576fd52b70835fe4cd58e073013bde5e6ed55b8e29fcf352c12e3f9437e26c617
-EBUILD click-7.0.ebuild 1186 BLAKE2B 245799af00e5a1c63cab5273c48e489ffa82d55b3ca0c2a70101e524879cc77538f8ec98836bb180a61832b3145cd8a429af251bee92d2ba64e844698acf9bf5 SHA512 de2b9fd07c41277a703a977025d9b3cbb9c33658b705dd1840340b4516a6cc96b670d3661e0ff01619e92624a19936b3eaef6e8d67ca93485ab5cd9c8236b19d
+EBUILD click-7.0.ebuild 1193 BLAKE2B e7e6d032a9f4d9007722fe4531c06e6cdca61099fa3fa6ac32a34d79b1edce6847bde3eaa13935bef768a18db7126efb32e93914b0c63d515ce5ce4a568b0123 SHA512 a6aaaea43ad24c9d8e6ef020ff70ba6de918227e6b31e3b94b194baec6876f365d66f8de46163d60b2faddafb185cde19d9e4746706ca87d6b5a8f76e5cd7659
 MISC metadata.xml 308 BLAKE2B 813de6efdb1f5f1c8f59f403d8d7d46a4f75bd7b135a46714aba69ac841e12d650ac0c0bc53af62e3c240998fcbdc11a12cde34397af99e7483b29a7b701f1a7 SHA512 6dd2c4334b6ad8b0942f5cbd443e7bd5cefdcadf2541d341f46fa153a28a6ab5f074270638796efe6a7df48a20be9abcb3f41bfa19c58b1e30ed13fe56b1d6d1
diff --git a/dev-python/click/click-7.0.ebuild b/dev-python/click/click-7.0.ebuild
index 21c088ffe964..32314ed99fe5 100644
--- a/dev-python/click/click-7.0.ebuild
+++ b/dev-python/click/click-7.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~x86"
 IUSE="doc examples test"
 
 DEPEND="
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 74501dc48fdf..e5b6cdfc15b9 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -10,7 +10,7 @@ DIST Cython-0.29.7.tar.gz 2047944 BLAKE2B 79a2dbbbeef2c87e523d1222c1e3b62a632736
 EBUILD cython-0.25.2.ebuild 2136 BLAKE2B 9e80d1abbe44ecf401f9fa6f2c013e02373c294ca654272b3d44d2b39c7e42fb0e890efdf047eae693d3df9ab960b9778266c1bed7295adabf1ea6c858f448ef SHA512 ed871f7d255fbf7e112fcc67247264005f8c38cd4a9c8be0183e7f2edb6817cec0a47ab858133aa32f5042003fcbcec424ef7c6ef930e1e0060b0f2d73c1a0b2
 EBUILD cython-0.26.1.ebuild 2080 BLAKE2B 0d61c28232f347c0646c5585b3d868f0cd490affaafe70b3e3cefe14ca64dd734d36c4e74745acfe49eeb3f28ad8cf215c3059229c5e7059bf0fa5ef63600abe SHA512 1c1a079f24d7245201a069b757e1b490c7ffc8108cf72ae00cae8b128953a5b910aee4be6c1e78750dfab809b0c3a76214a21dd81785655453aba68f9298af40
 EBUILD cython-0.28.4.ebuild 2196 BLAKE2B 05f6e26da211e42cb46b6a182bc017077bd1e632b4c963cb4a0c48a64dde5926866a47195f235ddbf0143fdd35a588d4651181c1ab9443c67975a4abc0bab5ac SHA512 979bfda159eb6dc89cd7a790166926201f0e74ce8ac3f887a5a40a6ee023e5cf4e2fc9d803cc5e563fb32ba3f7ba9d4447fe47e38c5b7ce6f3292653d9f0f9fe
-EBUILD cython-0.29.4.ebuild 2167 BLAKE2B 4ac706c980726267209b18b046eb627c280896a5f5380c6f5593c05444c239e147cf0f6dd9ca32bbc64cdae7260feb06d9de5c8105ab021b5670bc4185b8c917 SHA512 d8a733b722bd8853e2a4f598d5b8256c5136608537f414038cde242656f0c753414dd9c472eed6fc9a5541a81e832cf51404b5203f05eb6915f17c91ea177c6f
+EBUILD cython-0.29.4.ebuild 2163 BLAKE2B c91f6b96e8efa825c19d1cb2bb228ba3d5143847c7bed4b089ad5fdd4cda6e48667b2c392f64054b96ac50e43296bf69e842c2080e6e4c49569fbc74b174b75e SHA512 388f4f9b56a58235bb832ccc7fd321256112663f02c63d9708ece8263d712c8e6dc3a72bba25c660cdd2dc732686b94e7f4a5690dee9a3d50987c53b5ffad6ee
 EBUILD cython-0.29.5.ebuild 2209 BLAKE2B acfa7a196a677da67ea43d8c392db746be319f5609fd34e24fb5a3de7ad83b57549f8473528d8b9c217f4de84d96acfbee3b828592dae4dc183cd00b5764ef21 SHA512 564fb57372436ab89b195bde9cb2f1883ca9da6b7ff576a6fed81ac1b205ecccade33ad5364180f8bde4d3b5c4fdfc1628ba7609d467800ca30c6853492eb4d8
 EBUILD cython-0.29.6.ebuild 2209 BLAKE2B acfa7a196a677da67ea43d8c392db746be319f5609fd34e24fb5a3de7ad83b57549f8473528d8b9c217f4de84d96acfbee3b828592dae4dc183cd00b5764ef21 SHA512 564fb57372436ab89b195bde9cb2f1883ca9da6b7ff576a6fed81ac1b205ecccade33ad5364180f8bde4d3b5c4fdfc1628ba7609d467800ca30c6853492eb4d8
 EBUILD cython-0.29.7.ebuild 2209 BLAKE2B acfa7a196a677da67ea43d8c392db746be319f5609fd34e24fb5a3de7ad83b57549f8473528d8b9c217f4de84d96acfbee3b828592dae4dc183cd00b5764ef21 SHA512 564fb57372436ab89b195bde9cb2f1883ca9da6b7ff576a6fed81ac1b205ecccade33ad5364180f8bde4d3b5c4fdfc1628ba7609d467800ca30c6853492eb4d8
diff --git a/dev-python/cython/cython-0.29.4.ebuild b/dev-python/cython/cython-0.29.4.ebuild
index 78ef43726a75..5e8e0344ab44 100644
--- a/dev-python/cython/cython-0.29.4.ebuild
+++ b/dev-python/cython/cython-0.29.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="doc emacs test"
 
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 6daa659a157d..7f21c20a65d2 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -2,8 +2,8 @@ AUX django-1.9-bashcomp.patch 1734 BLAKE2B d65bc505e4096fd8d23619f3d76b76d66fc3e
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
 DIST Django-1.11.20.tar.gz 7846576 BLAKE2B 11423edda7f2f08cc894957da65c746c99ce7ce5399ff236972cce627e347cbc4a43c7ff75282318fac2ac8f65fc4db691ac9fe8e04059b0de4f1bfe31278382 SHA512 5a0fff6c9b90a08e98dee6d4d090047adb900a8f6a061f98e685e8998bfe3d97fe7a90aa7d4d2feae67026fb6e4441393d50cb5ab295604ed362a080b987f062
 DIST Django-2.1.8.tar.gz 8613572 BLAKE2B 543e41f1b4031b624f903f075e95af7e010510f4c265aebd35a5f6b3f074703b3a4b54bc7f2a9752e717ac99d20c42d6e34e556ca619a531cf8c66622ce1419a SHA512 f84fcdf919091a9db6289f25da601ce447382f79118a99f8f316b2479a9325d629f725edb4618300f76e23bd68ae45ff4c6b6576988f109d1a7ba715c73327c3
-DIST Django-2.2.tar.gz 8843237 BLAKE2B 6e2468e655cbb1cf4800dcad11ddb47267e90f6be87667b913703238c8ade13ac4f77ec8fa3b6aaf4b25660d7d19bbbb9935752661f5b94c4e1bccfae324041c SHA512 cab4e31d9ad7bc1765dd922913ade5ced7308cb687374c650358585070f2d19feca47c9135b56e3d686df08a9a80b0af232b79cea18ec229f2a9737af6c1f964
+DIST Django-2.2.1.tar.gz 8973889 BLAKE2B 890ab092807a587dbaba69fb6da7a4c53c8e976d3a4c29003549d72dd69c374640df280885a62845dda0d00f432e398747b9ed652aebbd7e3434c07e71d9a80f SHA512 661ed7352847d2167f8d3410b476cb585a269ef5d3afe0cb59cf0c9a2ea22f0572f12825368bc222f33f8c6d4c71767adade97e25b69f5a619795ccb670773e2
 EBUILD django-1.11.20.ebuild 3223 BLAKE2B 441caed238c7d06ef1000fef060ba4050b8e0e85a024d405114ce1677a858fdc7015b10d16ee7abd8455a2c76a4449c0f2f4bde343f9b04eaf86afc860eaa7dd SHA512 b86aa3a16dc88b81b7e9822c545d4c2e63129294d5eb3e395719e963c83695e4939d6e5a4edda70ea8fddd4c587fbcc6965ada2394e97ad5bd0bf3211e152f96
 EBUILD django-2.1.8.ebuild 2481 BLAKE2B 25ae3441ef0e80a1b9a16df1a315180cdb9cb475231e6328457be807dfa0e5d944dd20d80da6de742dc4d4f91bf779ef63944bae2720203214e409cc4910d2cf SHA512 83b8407d681a9eecad1b6e70db357029024d059133ebd48d9e35488e2895ee4f298baecca2e5b4f683a74258b4844ebec9fb2a342325ffc6f98d17dc28fbcddf
-EBUILD django-2.2.ebuild 2556 BLAKE2B a42c417144a98be4dd133cebdbdbdc5f06d010f56089510ed47b2209c1f3579b0dc2204be29fb3b524a258bbe32f7a97ee1b21c94503d85f2f2c89a00301ed93 SHA512 0a7603ed18e5d8c79c889ef41a53fe9313753bc27e6ee89d9b3cbe2de0474a89b016aa5ba3d23c9cb63e2bb3096ea8bf3e93cc23933f8f1a11072612e4b65c0e
+EBUILD django-2.2.1.ebuild 2574 BLAKE2B f0388c060f2bd381b0fcf5cd701abaee16e79e9baca4b75c8d2b0987df737a7cb5ab7559265bd2924575d97ea1ccb97b9697d7fe94eb41a72b01ef8b2be2ea55 SHA512 5b7aff2a04931d65740652cf967effd310b5be60be63d373cafd71621d2630d32cacbf979859f05ce9bfc6e320a73805cf7a4f60e8df0e80e9331a4e1f6394a3
 MISC metadata.xml 488 BLAKE2B b3ffa7cc6bced74a890b71be2bfb3805bb51a523f485079a7da0cb2698f3fa0ee1746922813859ac95df41b3ef3249c413f1692f3635427fa965874287b83d88 SHA512 9091a2e41a992542b38251b12623c0b1ac737cf01a4f46ce63096568bcde4e3d8546705bdb10c14c128b4cb6564e38dbb6d1803611c5197923b847304aa69cdb
diff --git a/dev-python/django/django-2.2.ebuild b/dev-python/django/django-2.2.1.ebuild
index b308de852eb1..6c6406c92f9b 100644
--- a/dev-python/django/django-2.2.ebuild
+++ b/dev-python/django/django-2.2.1.ebuild
@@ -21,7 +21,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 
 RDEPEND="
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 186fb4b246de..01843905deb4 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -10,6 +10,6 @@ EBUILD fonttools-3.20.1.ebuild 794 BLAKE2B 0b51fc1ae19c6250b36d7f2685fd420ceb0de
 EBUILD fonttools-3.21.1.ebuild 806 BLAKE2B 454886f46daabf776695f5ac5305702797b251c31932e489ef3c9fa23b54f530c678921c72f46182fdedbf234af2665987d70faec1c18a9b89887a6aaeffdb17 SHA512 2e94a3d6f87b6b5b1f234262d06930b38a8620baeaab4dc953a5eae2547f0846ce3a289e896aba2658090bc7b7d7fe376e6a44826a67200cb1df587629c7ffc2
 EBUILD fonttools-3.24.0.ebuild 806 BLAKE2B 454886f46daabf776695f5ac5305702797b251c31932e489ef3c9fa23b54f530c678921c72f46182fdedbf234af2665987d70faec1c18a9b89887a6aaeffdb17 SHA512 2e94a3d6f87b6b5b1f234262d06930b38a8620baeaab4dc953a5eae2547f0846ce3a289e896aba2658090bc7b7d7fe376e6a44826a67200cb1df587629c7ffc2
 EBUILD fonttools-3.24.1.ebuild 812 BLAKE2B 1b4d0c1e549ecb16667a2078e6594b6ff956d9484358192e36e6321f11bbd7311ac881f7b9d8f63d7fffdf51012dd7731630203b7a2eda0f50f1b7453d17dcf2 SHA512 13f92f60845fa5064feb17be7c59df73ed98ccf44a19d2e2050aedc6977994fff9747c9df611b20b5be176bd8ec153410bf520aebaebc19a41617cecdc25f1dc
-EBUILD fonttools-3.24.2.ebuild 806 BLAKE2B e52a5fee8482cde3aa7b50be44293a5c11f7fc07b1e564c24ef78c79ed2c363ea75b58fc03902642906655219f8dc255ad55cd8fc88f2e901c6d72af780c6a3a SHA512 9c2ae03342609770c92842d3539780af3f0b9c2eb3244fb3c0947e769048010663a74c5b955e455b649658c1212f4b324f72d56d653273673ec56da84422e2a6
+EBUILD fonttools-3.24.2.ebuild 805 BLAKE2B 58960121545ef3af84a7c97afa89ddf73918771a336628e41e835d84acffd5ae195bc2cdd5154533645fb4eba9bc73d2764989602e8e50a4e2f192371f73853c SHA512 62725605e2d9dfaeb7bbcabdb9388f8668a2101ae155dc4c4fe51f557fe8e491c3c27a3e97fda4bbe7b144ca0fd57441249969fd450f54940e5d6486115d8e52
 EBUILD fonttools-3.28.0.ebuild 906 BLAKE2B aff079c96af058442e3a715328381a2606ec1c2db7bc880a67fbb8846693d1eb5ff159b5b0218d90be30a8348669d6b719fc8025f8487d6e48779e492b849243 SHA512 8aed64794180d43d14fe51ec6bb5db35ca9442f90134ab034be9130661ec0d3602b03615d4eea70f8ab18a54094f2c92c1800e6b67ebccbc8f30d879b9f7204a
 MISC metadata.xml 474 BLAKE2B 54300181cb1e91d9754d3a0ab96f3ef8ecf4dbfb2d57ac6d2fb2cf9727acd07fa39b45155e1109e570b498be6cc3c1c98919593620f050482a41490c6a219af3 SHA512 f683da73b5db5e132fa4eacd6de94e50e434f12a88e14b1d97585492c4c4bbe3dda1791eb7855e6b4111ecd61601da4da22c6b77305d9affdd8f9e478c140ed4
diff --git a/dev-python/fonttools/fonttools-3.24.2.ebuild b/dev-python/fonttools/fonttools-3.24.2.ebuild
index 53bdc3caa487..1c7caa2e57d1 100644
--- a/dev-python/fonttools/fonttools-3.24.2.ebuild
+++ b/dev-python/fonttools/fonttools-3.24.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index 1dbe5bf1d4f9..7b76830acfd2 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -1,11 +1,3 @@
-AUX future-0.15.2-fix-py35-test-failures.patch 2339 BLAKE2B 737ba57bc09a141ee2fbfc7339350e3bcf1a1e7feb96cbd8d54bda1e630fd5ef431c0814731d6191618ae88481d39faaa9716ece98c6a481a293cbab95df5ad1 SHA512 816a3d30461f6e0eed0106bc46952e3f6d98323d03ff3f212332871b7eaf7d3b9817ee2043110bd004152c4239bfa427d9ed74f1dc7166d41534ba0fc76ad055
-AUX future-0.16.0-disable-tests-with-internet-connection.patch 2253 BLAKE2B e14121b3b4ef9d2b57f39fe7bfb5dbbe1aab87f03b0a8d2ac0aec3b74314027bfa5f1de5f9fe0309e2270f9da55318b14326bc86abed4378ed3c8126ba8ca3e0 SHA512 f49e468ae59223c3e58fefec25f5006781b4e69cdc3bca4aa65035f6b65e040862c0bdf67798a982a5d9a593bb660949487689b82396a4af6e67d980206b9762
-AUX future-0.16.0-fix-tests-py37.patch 1700 BLAKE2B 175dd229c31768555aef3ed3156c040ed440a480afb6a3179cdbcf8bfec31f2a018cc0c193a0a6306c8c020388827647f4bdce07d05ab418b7003fa6125511cb SHA512 26dcd5fcb18dd0e01032ebbbf2135167558a08c79ed226eed461e4d6c48bc80ded90212b9e8c427828b52e2d6186992f8c2b60558dbb4478c6b0be10e596faa3
-DIST future-0.15.2.tar.gz 1583441 BLAKE2B 9c552a5f3598922f8910480d054015020112aae4f7e14d2c139dda13a0b26e878b75eaf5068d66f20823ac4659d85edd4087a95d9474dc27bf15767cf6e9d921 SHA512 24a0eaf70795efe1644b098c5abbcb0103d9172a5243721f0d26b1cbd108872b6c0616180da8f5507855ddfc7b26bb10a606a64e59d307d39042b346700f77ee
-DIST future-0.16.0.tar.gz 824484 BLAKE2B b098366cc7a7866c4aa4a35f1a6a5cf113698307de8f4cce6c77e4ce72a8433dd102111f991e35ffa920c09a0d31cc048b9502dacd0aba1b701c11eaaeab8392 SHA512 41c795cd1746a76df84de2da9fbc611fc6164322c1c712ec9e8a8626c21c2717cb4899ec150d95c5e0c037270e6bb71e099edd169609369aae619daea9df2e5f
 DIST future-0.17.0.tar.gz 827812 BLAKE2B 14bfce4927386b157da91e6bbad547e21bb622f7e81997bc4ac400842cec5f7a50d7a0f5a743c4c76a7b80be0dcb6f54c06901311fd27781d89a8d2df1cce7e9 SHA512 f2396379e8e36753aeafdf27225c2551a31b10036f21201f1c24d63c1bb318dbd491ec977af514a19a4d477b397df9eed9711be797a64e86fc00c4692729d876
-EBUILD future-0.15.2.ebuild 488 BLAKE2B 18c0e887f7906fa11d79b9f37855a41593d8cc23ea759c8fe9ca9d577798c33232c0c3877d8bf9134ff91400946e7a790b3c10fc18a0ce09c7a61207c9d4aaed SHA512 0d274b8ca40a88092df02c673a1cf8cc0bb265542ecad324c87c2b95733b273c30e6fead5dc853f0060c412be00456431c6eafca76fd32f763d3f5ad9287b464
-EBUILD future-0.16.0-r1.ebuild 1275 BLAKE2B cf18b9777cab02410556a3ed75155d8d795e31ad6b49db3d4430b1ef1d80da856e34435d824c4b3f0084eeffa90c0281571974367d139e6637e06e4abc445638 SHA512 f68cd8690f91d72738f14744d84a091d28ccfc0291af61906b347c133a13552fe8ddd4effd15c6cd1e5c1cced982a0bfe2183bc1250e5b173b450b048949cc32
-EBUILD future-0.16.0.ebuild 608 BLAKE2B c2c994a3777f6e3bfe07a93de2813dc1c20e1227175cb5951e9d1cfb5a65d87dd3854f5591bc0f2b87a6f3b2b246e1cbd6cc98cc12579a512eb257f268655bca SHA512 b63c1276bc335e62cff012bdbb5a378149b34b5725b2d2eb21ec7ec9c24e9488f9965feee3f03a1a64965eee8e3b1e7bfddcefc8dce40a16bf880c2ad79345f6
-EBUILD future-0.17.0.ebuild 1050 BLAKE2B 3b84fdf4fb509fab71a974eda92f3171ffe2ab076a111a9e350800db34bcac7b3d0a8be61ebb3622483e0fa39a069f3cb23cad9660a9907c03760a0af3682687 SHA512 6334208345accafc8218e2b063f4818e3c4ce7301efc7f67f399c2728708957c85b3b40ac431e1d5403e8a2cc53448df06c9ea8e25602e3ebe5f31f746dd392c
+EBUILD future-0.17.0.ebuild 1048 BLAKE2B a60d74627cd3f3dfe6b043857056012ff81e49c436d6290e8cee470bc843ccaf0d3fa7fa143852cad228411d28cd0467f3186241555d55d673cc31b1d109bf43 SHA512 026c93d4feed6ba82bf389d617a90e4a1e26855f5f0d4f12216f6164758009358c4068a4c35b1d5286d4a0fb1e4fbf74dcebcf045d5450e4678925071db0e9e6
 MISC metadata.xml 309 BLAKE2B ac0715185226cea8e3c38698ed3e494b6464d86dad0211e4d0583e3ceb6634c2b1ec230d9dff659d5ef47208b6f3358c701a0c42e49848816ae99703cab82f46 SHA512 e01e3b2733211e1eb6aaef4da19265c7165411a46fde4c2156118700c315bc2ad52cd87de1b90355741de77d91aa22eed5f9e5847d45186bf7138d246cd775e4
diff --git a/dev-python/future/files/future-0.15.2-fix-py35-test-failures.patch b/dev-python/future/files/future-0.15.2-fix-py35-test-failures.patch
deleted file mode 100644
index 8d8e5daccf10..000000000000
--- a/dev-python/future/files/future-0.15.2-fix-py35-test-failures.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-* Fix test failures on py3.5, backported from git, see also
-  https://github.com/PythonCharmers/python-future/issues/183
-* Fix unexpected test successes on py3.5, which are now correct
-
---- a/tests/test_future/test_bytes.py
-+++ b/tests/test_future/test_bytes.py
-@@ -10,6 +10,8 @@
- from numbers import Integral
- from future.tests.base import unittest, expectedFailurePY2
- 
-+import sys
-+
- 
- TEST_UNICODE_STR = u'ℝεα∂@ßʟ℮ ☂ℯṧт υηḯ¢☺ḓ℮'
- # Tk icon as a .gif:
-@@ -534,6 +536,8 @@
-         self.assertRaises(ValueError, bytes.maketrans, b'abc', b'xyzq')
-         self.assertRaises(TypeError, bytes.maketrans, 'abc', 'def')
- 
-+    @unittest.skipIf(sys.version_info[:2] == (3, 5),
-+             'Only works in Py3.5+')
-     @unittest.expectedFailure
-     def test_mod(self):
-         """
-@@ -551,6 +555,8 @@
-         a = b % (b'seventy-nine', 79)
-         self.assertEqual(a, b'seventy-nine / 100 = 79%')
- 
-+    @unittest.skipIf(sys.version_info[:2] == (3, 5),
-+             'Only works in Py3.5+')
-     @unittest.expectedFailure
-     def test_imod(self):
-         """
---- a/tests/test_future/test_builtins.py
-+++ b/tests/test_future/test_builtins.py
-@@ -525,11 +525,10 @@
-         self.assertRaises(ValueError, compile, 'print(42)\n', '<string>', 'badmode')
-         self.assertRaises(ValueError, compile, 'print(42)\n', '<string>', 'single', 0xff)
-         # Raises TypeError in Python < v3.5, ValueError in v3.5:
--        # self.assertRaises(TypeError, compile, chr(0), 'f', 'exec')
-+        self.assertRaises((TypeError, ValueError), compile, chr(0), 'f', 'exec')
-         self.assertRaises(TypeError, compile, 'pass', '?', 'exec',
-                           mode='eval', source='0', filename='tmp')
-         compile('print("\xe5")\n', '', 'exec')
--        self.assertRaises(TypeError, compile, chr(0), 'f', 'exec')
-         self.assertRaises(ValueError, compile, str('a = 1'), 'f', 'bad')
- 
-         # test the optimize argument
-@@ -1287,7 +1286,7 @@
-         self.assertAlmostEqual(pow(-1, 1/3), 0.5 + 0.8660254037844386j)
- 
-         # Raises TypeError in Python < v3.5, ValueError in v3.5:
--        # self.assertRaises(TypeError, pow, -1, -2, 3)
-+        self.assertRaises((TypeError, ValueError), pow, -1, -2, 3)
-         self.assertRaises(ValueError, pow, 1, 2, 0)
- 
-         self.assertRaises(TypeError, pow)
diff --git a/dev-python/future/files/future-0.16.0-disable-tests-with-internet-connection.patch b/dev-python/future/files/future-0.16.0-disable-tests-with-internet-connection.patch
deleted file mode 100644
index b4ba01ed796a..000000000000
--- a/dev-python/future/files/future-0.16.0-disable-tests-with-internet-connection.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-##Skipping tests due to connection failures on Fedora build-system
-##See https://github.com/PythonCharmers/python-future/issues/165 
-
---- a/tests/test_future/test_standard_library.orig.py	2014-11-21 12:52:03.000000000 +0100
-+++ b/tests/test_future/test_standard_library.py	2015-09-02 11:37:36.808826777 +0200
-@@ -318,7 +318,7 @@
-         import builtins
-         self.assertTrue(hasattr(builtins, 'tuple'))
- 
--    # @unittest.skip("ssl support has been stripped out for now ...")
-+    @unittest.skip("ConnectionError: ('Connection aborted.', gaierror(-3, 'Temporary failure in name resolution'))...")
-     def test_urllib_request_ssl_redirect(self):
-         """
-         This site redirects to https://...
-@@ -332,6 +332,7 @@
-         # pprint(r.read().decode('utf-8'))
-         self.assertTrue(True)
- 
-+    @unittest.skip("ConnectionError: ('Connection aborted.', gaierror(-3, 'Temporary failure in name resolution'))...")
-     def test_moves_urllib_request_http(self):
-         """
-         This site (python-future.org) uses plain http (as of 2014-09-23).
-@@ -343,6 +343,7 @@
-         data = r.read()
-         self.assertTrue(b'</html>' in data)
- 
-+    @unittest.skip("ConnectionError: ('Connection aborted.', gaierror(-3, 'Temporary failure in name resolution'))...")
-     def test_urllib_request_http(self):
-         """
-         This site (python-future.org) uses plain http (as of 2014-09-23).
-
---- a/tests/test_future/test_requests.orig.py	2014-11-21 12:52:03.000000000 +0100
-+++ b/tests/test_future/test_requests.py	2015-09-02 11:39:01.509378296 +0200
-@@ -57,6 +57,7 @@
-     This class tests whether the requests module conflicts with the
-     standard library import hooks, as in issue #19.
-     """
-+    @unittest.skip("ConnectionError: ('Connection aborted.', gaierror(-3, 'Temporary failure in name resolution'))...")
-     def test_remove_hooks_then_requests(self):
-         code = """
-             from future import standard_library
-@@ -79,6 +80,7 @@
-             self.assertTrue(True)
- 
- 
-+    @unittest.skip("ConnectionError: ('Connection aborted.', gaierror(-3, 'Temporary failure in name resolution'))...")
-     def test_requests_cm(self):
-         """
-         Tests whether requests can be used importing standard_library modules
-
diff --git a/dev-python/future/files/future-0.16.0-fix-tests-py37.patch b/dev-python/future/files/future-0.16.0-fix-tests-py37.patch
deleted file mode 100644
index d925d49f983e..000000000000
--- a/dev-python/future/files/future-0.16.0-fix-tests-py37.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit ce4f015978d250718ec8dd9f50721da90a9bd18b
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date:   Mon Aug 20 12:42:29 2018 +0200
-
-    Skip int() keyword tests with Python 3.7
-    
-    The first argument must be positional since
-    https://github.com/python/cpython/commit/2e5642422f6234fd8d0c082142b27340e588f96e
-
-diff --git a/tests/test_future/test_int.py b/tests/test_future/test_int.py
-index f1d9c5d..e306550 100644
---- a/tests/test_future/test_int.py
-+++ b/tests/test_future/test_int.py
-@@ -265,6 +265,9 @@ class IntTestCases(unittest.TestCase):
-     def test_no_args(self):
-         self.assertEqual(int(), 0)
- 
-+    @unittest.skipIf(sys.version_info >= (3, 7),
-+            "The first parameter must be positional with Python >= 3.7"
-+    )
-     def test_keyword_args(self):
-         # Test invoking int() using keyword arguments.
-         self.assertEqual(int(x=1.2), 1)
-
-commit d7a3451753982d944ae0894c9e9f01d0460d03d5
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date:   Mon Aug 20 11:17:59 2018 +0200
-
-    Make test_bad_status_repr work for Python 3.7
-
-diff --git a/tests/test_future/test_httplib.py b/tests/test_future/test_httplib.py
-index 968e933..a1e2b19 100644
---- a/tests/test_future/test_httplib.py
-+++ b/tests/test_future/test_httplib.py
-@@ -197,7 +197,7 @@ class BasicTest(TestCase):
-         if not utils.PY3:
-             self.assertEqual(repr(exc), '''BadStatusLine("u\'\'",)''')
-         else:
--            self.assertEqual(repr(exc), '''BadStatusLine("\'\'",)''')
-+            self.assertIn(repr(exc), ('''BadStatusLine("''",)''', '''BadStatusLine("''")'''))
- 
-     def test_partial_reads(self):
-         # if we have a length, the system knows when to close itself
diff --git a/dev-python/future/future-0.15.2.ebuild b/dev-python/future/future-0.15.2.ebuild
deleted file mode 100644
index 7cc10e8da844..000000000000
--- a/dev-python/future/future-0.15.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy, clean, reliable Python 2/3 compatibility"
-HOMEPAGE="http://python-future.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-fix-py35-test-failures.patch" )
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/future/future-0.16.0-r1.ebuild b/dev-python/future/future-0.16.0-r1.ebuild
deleted file mode 100644
index e65bb99c9ec8..000000000000
--- a/dev-python/future/future-0.16.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy, clean, reliable Python 2/3 compatibility"
-HOMEPAGE="http://python-future.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# https://github.com/PythonCharmers/python-future/issues/165
-	"${FILESDIR}/${P}-disable-tests-with-internet-connection.patch"
-	# https://github.com/PythonCharmers/python-future/pull/355
-	"${FILESDIR}/${P}-fix-tests-py37.patch"
-)
-
-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
-		sphinx-build docs/ docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	pytest -vv || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/future/future-0.16.0.ebuild b/dev-python/future/future-0.16.0.ebuild
deleted file mode 100644
index aa4638b61ae6..000000000000
--- a/dev-python/future/future-0.16.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy, clean, reliable Python 2/3 compatibility"
-HOMEPAGE="http://python-future.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/future/future-0.17.0.ebuild b/dev-python/future/future-0.17.0.ebuild
index e336aea03b72..7487bf92cefb 100644
--- a/dev-python/future/future-0.17.0.ebuild
+++ b/dev-python/future/future-0.17.0.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 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index bab19ffa0cd1..b2bfb45e003d 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,5 +1,3 @@
-DIST gast-0.2.0.tar.gz 9400 BLAKE2B 1392b9ef3a007d89b6b7af5ca49f3dcaa0689e166845ea25c2e544578f65915114d763b54503825dc2b6958a71ac284ec7ae2cc2cfa861494da28df786d679b4 SHA512 651719c3035d21e02e39cd83fd54212a12c39addf69f7c9e8810ccb7bb9aae7828e176ad0adf55182f0628f18d76cb1e286e498a9665ddb12e91a51dc2303381
 DIST gast-0.2.2.tar.gz 10294 BLAKE2B ad81309b1dd938a07f0cd39c21d4f89af6d902c136b8fe12afc5b26827c778f12561e06c66648a5b672b1c9d9eb79b3dfde7cad0acf8c7099451841b67c0daf4 SHA512 0be9b2b66b7815153e6f294b4db6b028c321d8a94d97c89d89b026df73e0c95dc2ee8af5c10f2eee51cbfb94af4b5a0da8a682896861870b98dec4c6c59a5dd3
-EBUILD gast-0.2.0.ebuild 487 BLAKE2B 94780b7ee17c6d91403e0e0e22e79c4bb878256280dd4d2d29c2c2c1a26dd52d8f70f538a68b5b791d9d1b526c7455cc48769cd07b862ed859cf5f9f77f1fc72 SHA512 60176d331514b66ce4bfb9abcffe3e9edc819f74ab729a70e06239f525c9379bf94985774ae06dea9d08c785a314165a75ef2520a9f449768f81486f59e253c4
-EBUILD gast-0.2.2.ebuild 473 BLAKE2B a3d7d00976abdf25cd3d7faf135c00009054d198e0bb2dd563ede51099e99f35202e31ce55050125dc4f1aa233ab32e2b51a060063bc8afa05240bc680da6ec4 SHA512 6a69fcfdf04e4fe68b15a27faef7d95d345863647af0da9dea2fb16e137765e02e02d12a04fd13836a2e7874156139ec4089ebd55c4583db6a78a6c5d2211982
+EBUILD gast-0.2.2.ebuild 471 BLAKE2B 771ce1bf9c7232df1bf9a52837144ba81ba633f3d8b9c6fc5c3605dfee2ae8c633eb69947770b0411bcb3b3cb71cde3f4634aa36265c5744539b48921b76f353 SHA512 755eb466c32495a9265160146d080e7f333d0607bd9f182926c0f394132dc02abdd80f2d2fbe53db3962a1e4d8260edac2c425555a4bf63c0a7366305f0be74d
 MISC metadata.xml 484 BLAKE2B d3b8be13b37bd1a2ef98b2f164c901cf21c8b73ef9b13914200c85ea26eb07dedaaca66b008dccde88dfa1bfcb733e25aac9920704625b87ce0a11a04e02b489 SHA512 5a3d09427a29d39047f396c91ad544a6cb5568f2af06216fcabc1aa12d9e4d34a71cda272d38667d8fb0114d54971626ad3de0c9d71a708cccd825ea1d7e2504
diff --git a/dev-python/gast/gast-0.2.0.ebuild b/dev-python/gast/gast-0.2.0.ebuild
deleted file mode 100644
index 5c7599fd30d8..000000000000
--- a/dev-python/gast/gast-0.2.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python{3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)"
-HOMEPAGE="https://pypi.org/project/gast/"
-SRC_URI="https://pypi.io/packages/source/g/gast/gast-0.2.0.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/gast/gast-0.2.2.ebuild b/dev-python/gast/gast-0.2.2.ebuild
index ee257e642860..b3b470284f93 100644
--- a/dev-python/gast/gast-0.2.2.ebuild
+++ b/dev-python/gast/gast-0.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/google-pasta/Manifest b/dev-python/google-pasta/Manifest
index d11c5a9558c1..1369ca831016 100644
--- a/dev-python/google-pasta/Manifest
+++ b/dev-python/google-pasta/Manifest
@@ -1,3 +1,3 @@
 DIST google-pasta-0.1.1.tar.gz 34476 BLAKE2B 04de1237eda9449e4648af0fc43b538d4c71f43b1205fbb531981c773266e404d9673adc9f7c3e74706b90993cae31d7a2c812c3ee5a02edce6ce669491f2823 SHA512 94a5016acbba72261ccd488f788b23934651149c7d763aed4f998018bdbf299261fe125accb1359f70d024c3bc3db0f1279e5e780e1e4b87b328f2c473a1b003
-EBUILD google-pasta-0.1.1.ebuild 497 BLAKE2B b8183fd2909429ca824cc798ddcfd861ffd82988453c744898eec77374048a1af1ffff0890950dd54e1da3e45083787b706704ff4859c9764c6a756ad37eca5e SHA512 ddab5bfb96f67ca15c478caf63691bfdce29be7fe926ef0b52208ceb29c2c46ea6828809af5bc1c6ba7241ef7b69ce3f10e8d36d9508c21a432e590c5d47d666
+EBUILD google-pasta-0.1.1.ebuild 495 BLAKE2B 4c39578ad68e1a41194519bb8b3603e83374026480d7912e2e7d32d67ec964ffe98ea33b3ebbb0a372620d67eb52f6384578e8c110f6dbd1f128e85b9f90d1e9 SHA512 c1fcabd29fd74e9b8419a9b92a30fdfab3859b4d848d1b137f302a562b37d8757cd6c7fcd9dd340ec7dd17482e6c662dd511bb057af4b75b312155976b6a57cc
 MISC metadata.xml 347 BLAKE2B d79fee4b6f6d09c97796965687666f353324ddc6e1f83b6a1f9138ff95ab07a77bd66049d5398d39220e7685412ef79111f89aaa11045efbebe55a7c915592fa SHA512 c0eb9737d40e4e982775ca900c962b676b1ad863c1a48c170163f42cf42ce385b44f2d7e2eb26fe955e146015fccaba6d25aa3318347fde65aa999baaa722f90
diff --git a/dev-python/google-pasta/google-pasta-0.1.1.ebuild b/dev-python/google-pasta/google-pasta-0.1.1.ebuild
index 6baf55a5779d..23b503560644 100644
--- a/dev-python/google-pasta/google-pasta-0.1.1.ebuild
+++ b/dev-python/google-pasta/google-pasta-0.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index 0137ebfb4af4..fe39712d99ab 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -2,8 +2,10 @@ DIST grpcio-testing-1.16.1.tar.gz 12262 BLAKE2B 06790ef800a256fcd3073e32df455f97
 DIST grpcio-testing-1.17.1.tar.gz 12422 BLAKE2B 015a756c04db0d6a67b954c36c7d725a58d1fcbb7529f5ed50dab7c291abd7f0ce0d18e617f496af161356167fb4b448a5cf431a5a0f6346f12a8dee83a4615a SHA512 3b2ef6c2f43fc8aba270bae72de217f063d987940c965ece6bcce1025c0ec9c181e90bb905a0a6ba675ca7f06b8795250c910945173c189486414770bb02b25f
 DIST grpcio-testing-1.18.0.tar.gz 16603 BLAKE2B 6f6170211701b56d5937947ef227cf9199ec1fc7c5fdfd140a222dbdee7db7d352e95fbe2d50be8e01895c19986b858c9dc2ee2ca4a6582e484cf05b148e0a6a SHA512 1f855129b7b939a1b70105e68c1ad78b3dc32efac66657a985d1f21a3945a2077d80c70fbe5bb0304fd8f85d69c1a75478b13b7a824c9e66a0563c1730c13f83
 DIST grpcio-testing-1.19.0.tar.gz 16355 BLAKE2B c4b88f4fdb358ca121593b1628faacf269e02ce1de8693401197883aed94005ae1903da9b92f77b77afa92f05a74ec6f65fbea22e6f16b7acaeba90283890b88 SHA512 82522447620ab0155cc3e4a159897942da15726ea7e29a0dccd76fa39e718539c8f05353b718729c87f77864873ae51f2b28487676ba6f26ccd9851a17f1973e
+DIST grpcio-testing-1.20.1.tar.gz 16553 BLAKE2B 5ea6a92238cc086a030c23666340f32bb00941518f0507a2db306feccc568263813be6819d4bcd593f7e52575f79b1ef29d3024e591227b530815a95211a2c73 SHA512 5cce728015466ae6f14c28258abc71e73ef0b195ba2a874999d3a18f9f8e45450b50a3b4d3ee72f07d8c306a324de60383bfb0e12e5331968fe28519e0f2cb08
 EBUILD grpcio-testing-1.16.1.ebuild 520 BLAKE2B faadbd2e92ec9eb144a3a5dae19e22dd2dc05b2dbb6d5e6de47017c2d8f7ce259ffab586a73dd7263fb939c8749f33789eb3d8292f2a1e75e6c68a5ca190fadd SHA512 d8e2fae154f4e69212278ac6a5a360ecb41b39311188afdf2e025e4f95a76feb8c6ec8d9391168bc68346b2d990094116eb871eee51a78eb046985156736bd9e
 EBUILD grpcio-testing-1.17.1.ebuild 520 BLAKE2B faadbd2e92ec9eb144a3a5dae19e22dd2dc05b2dbb6d5e6de47017c2d8f7ce259ffab586a73dd7263fb939c8749f33789eb3d8292f2a1e75e6c68a5ca190fadd SHA512 d8e2fae154f4e69212278ac6a5a360ecb41b39311188afdf2e025e4f95a76feb8c6ec8d9391168bc68346b2d990094116eb871eee51a78eb046985156736bd9e
 EBUILD grpcio-testing-1.18.0.ebuild 520 BLAKE2B faadbd2e92ec9eb144a3a5dae19e22dd2dc05b2dbb6d5e6de47017c2d8f7ce259ffab586a73dd7263fb939c8749f33789eb3d8292f2a1e75e6c68a5ca190fadd SHA512 d8e2fae154f4e69212278ac6a5a360ecb41b39311188afdf2e025e4f95a76feb8c6ec8d9391168bc68346b2d990094116eb871eee51a78eb046985156736bd9e
 EBUILD grpcio-testing-1.19.0.ebuild 522 BLAKE2B df149020fd4d3b66348cd08db83e3669cbfadb8c62110efb0e643af2737be7eb2576ed04217722936cff8eb6f11fac521edcdf22aebd46245f845ba0ffce6410 SHA512 90ad1fbbd670eb50c52d02a51963aec60287d8b803d99df335c84436fe7476a376c312ec1e1d68f285838ef7bcbf4719516879ca806283e1dc8d49a833ef4a7d
+EBUILD grpcio-testing-1.20.1.ebuild 522 BLAKE2B df149020fd4d3b66348cd08db83e3669cbfadb8c62110efb0e643af2737be7eb2576ed04217722936cff8eb6f11fac521edcdf22aebd46245f845ba0ffce6410 SHA512 90ad1fbbd670eb50c52d02a51963aec60287d8b803d99df335c84436fe7476a376c312ec1e1d68f285838ef7bcbf4719516879ca806283e1dc8d49a833ef4a7d
 MISC metadata.xml 462 BLAKE2B 159e29c960dba2f197de7e1b8eda84162039ecdb35777aeb00314f8af9a7bc0771071e63a1528c922519568594f06971b228036914500d2ce3d33b411ddf0685 SHA512 8326b0e1b98c2921b461ad44663711318f2c48e4e411380de4b4bb26fca11d726d627fe47ccd0d1149348b55aa9391d97d144f654d016a1fccb34791f5850487
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.20.1.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.20.1.ebuild
new file mode 100644
index 000000000000..ad6217a42d40
--- /dev/null
+++ b/dev-python/grpcio-testing/grpcio-testing-1.20.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Testing utilities for gRPC Python"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index e66f31d02f3f..01d3ce655818 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -2,8 +2,10 @@ DIST grpcio-tools-1.16.1.tar.gz 1887741 BLAKE2B 721746ff5febd743ca56f6e5265fa706
 DIST grpcio-tools-1.17.1.tar.gz 1900052 BLAKE2B f84f9b7f52eab6758321d50aeafc25cb31c100ff63176cedac16514d223192d1e38a8903c809f3e89c18485c1ce129ee50e2cd8ec751b98ad4b7ed3f19cb3080 SHA512 50412305314ae5ef284b01b1afa19778233cb97df755a9896c881730da45455c7dd1e82798ba88c63ffe8f478f93f326d06c7a8575d3ea4c4ac3d10467087ef7
 DIST grpcio-tools-1.18.0.tar.gz 1925482 BLAKE2B a8a97e3a6204593bcc0e96d392652d31d1b1d545c91922222b124dc250d020327ed81fcc1c5feb02115517da34141651a4b24a13df825fe352dfed7715724768 SHA512 5c581a41804eb5dbad34829c9dd32253849484dc6e92d0bbd43b816ec3b45b741b23bffeb9969bf2dc3b7183cb05135f6dcc20f5b260c07f7173b9688c9852c0
 DIST grpcio-tools-1.19.0.tar.gz 1920614 BLAKE2B 00d3a702071d33a51fe47aea6ef47d58e2901df6b55cee8fba1c382e45695fce32e2fc20e438d48b5024b7a80373bea76466f2981f58b106192016078f2df214 SHA512 f9832237a0ec3e1dc8550dce5c0b06bfe43d1bd164b251c1bf9b8075ee647f23c8da31f90c84cd7f047682832876616ec5c73b495cb4a1fa2d83982cf368eee2
+DIST grpcio-tools-1.20.1.tar.gz 2018570 BLAKE2B 9c2ba04b06df9883ac79726aafec6eb129c338be93c61d49cafea29d4849bd497bd45da106431b7e17ece281037cfb0a53ed33ca7078306b727812fbce9df9b4 SHA512 2888e5c3ec92733b43b6bd115bbbfc2bace99ffeeff513a8c1c98fb670853a4407de41a5449613f88d8586fc21809d5a0c6de953dc211f3108b32198964db2ee
 EBUILD grpcio-tools-1.16.1.ebuild 678 BLAKE2B 08cf87936b8367382223332522d1ef2f36d4bccfeb63ab9b57dcf45072aa0c8cb62fb3fcdadd8c57d0f84426e9c66988e5a25524222d40b553f5a1fd614e485d SHA512 3c6602867b69f2a6a99a467c5472076fa8bc1ec7ab6bd56418756fccf9f059559b130aaae82183456a6741a5d43f11c46f01634f2215ef8b4e3b9c379f903acc
 EBUILD grpcio-tools-1.17.1.ebuild 678 BLAKE2B 08cf87936b8367382223332522d1ef2f36d4bccfeb63ab9b57dcf45072aa0c8cb62fb3fcdadd8c57d0f84426e9c66988e5a25524222d40b553f5a1fd614e485d SHA512 3c6602867b69f2a6a99a467c5472076fa8bc1ec7ab6bd56418756fccf9f059559b130aaae82183456a6741a5d43f11c46f01634f2215ef8b4e3b9c379f903acc
 EBUILD grpcio-tools-1.18.0.ebuild 678 BLAKE2B 08cf87936b8367382223332522d1ef2f36d4bccfeb63ab9b57dcf45072aa0c8cb62fb3fcdadd8c57d0f84426e9c66988e5a25524222d40b553f5a1fd614e485d SHA512 3c6602867b69f2a6a99a467c5472076fa8bc1ec7ab6bd56418756fccf9f059559b130aaae82183456a6741a5d43f11c46f01634f2215ef8b4e3b9c379f903acc
 EBUILD grpcio-tools-1.19.0.ebuild 680 BLAKE2B ca230dad6f755802398deb9f463251c45694709fec8395ff44a569080b854bb7694feee7bc135e109c46f60f68c9e187357b7c844e8ae968d4df75b0ef72c67c SHA512 83b5a43614a9b3a50eb8721a83155f0793ad30fde88311da0757c0ae19c1b49a63bb297d3b86f01d58ab17f52569bb3e74f176ee354c3ff05bbd80d27a289704
+EBUILD grpcio-tools-1.20.1.ebuild 736 BLAKE2B d9c8fdb3ab2ec9eb1a3b67f975a3e282d55b1d8c0418c84dfa2bb0f8c2c6d8a158e00e5936c1a69dbd6cc21d89adb0a068c14d66301576a1c3d5d6641ce9303f SHA512 586cf63aa06b18f9645c67d393f41dd384d60f65ab768aa996126de79fb2c3af721afb65cd0915fd057e3e57b6df04fee02cab6cca91b6625f7b07b4dd0aa9e5
 MISC metadata.xml 476 BLAKE2B 62016e9a321f9c5b06d8a473d75b5efca8246df90ef9a67a33c02c416c58a8ee1be875cd54567d55bc9f10ef32082e11c01a9f1550293137aab8942e05dcf744 SHA512 cedbae8a8d9d7c6689c676c433aa6fea3c16d41911e0ee4a30929dbf2adb8ff72a2f0d81f996196a3b4090f8a5103a54eab4c651b359f9487d59955a6861152d
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.20.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.20.1.ebuild
new file mode 100644
index 000000000000..8e0ddeaf6a5c
--- /dev/null
+++ b/dev-python/grpcio-tools/grpcio-tools-1.20.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,7} )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Protobuf code generator for gRPC"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/cython[${PYTHON_USEDEP}]
+	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	!<net-libs/grpc-1.16.0[tools]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_configure_all() {
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index c7657ce1efb8..7b2b515b3f06 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -2,8 +2,10 @@ DIST grpcio-1.16.1.tar.gz 14514047 BLAKE2B e4fc7f196f3e377afb0a103aca60337dd63b3
 DIST grpcio-1.17.1.tar.gz 14563233 BLAKE2B 61ccfaa967ee348f02f5a201e4f36f25d4fa09a1af11c6b5a0f345d13bf86f0fb12c3aea125c5bc27925698e0a23a9592806fe5db92fa37360cdcaf88e596189 SHA512 bf8dc6b7ce2f4a0765377fbae085395caef9f0cd0a2b4a779b3bf1667c6aba5fff034168bff9539f96dea76b2c97d7586305715c850d10e54918337458a4ee95
 DIST grpcio-1.18.0.tar.gz 14601124 BLAKE2B 4dc57243759c573b960e841def6af335f490fc6aa285f88979b4c66365b104a84269688c589ed7ae797527b04124a9997937f5bf33b179978077b2b680e515f5 SHA512 da791a418e0f6f3a7be921e107586837edcd2020dc8dab1107712372ebd4896b6b94e00d7501ed957e4ab0d5f7d6a3f2b57477ff33c55eb5e4ad7828b2f21624
 DIST grpcio-1.19.0.tar.gz 14621509 BLAKE2B b756ba60d317baa089b8ee57c458bc68fb72e61a87150f1ef3366fea23456ca8d5bd443ba1579d1bef5d0049f249fc8c2c6e7c7cc0967eb58c102fb03d783103 SHA512 620459dd1a22cf60cb6bccb1b7dd64175f1efdfc098152cfa1889ad0a727b7a92b72f9de28b57e9a45cc8d2c22e2fc36307af8ab52ced454a91aedeaf7158273
+DIST grpcio-1.20.1.tar.gz 13882426 BLAKE2B 4211d9dedc7ba858a5124798f17b3b158f255d055f32f5947191fcb5fd45cca9c97aa3f8c4966e7195add5289ba3747a77b2f0c01a35762ffbeba6938c76046d SHA512 0ac126d8b2c25204bb03daccfc9b17016bc18dd31f89f6e208f2ae39d7e6fd17ae04a8178367a5334421d959b14fd3d31ac71a692b48a060d98f983553fcc3e2
 EBUILD grpcio-1.16.1.ebuild 921 BLAKE2B b6299a97f90c14a8fd60c148cbe6449a8025b391c69a7f3a9fa1201e06317a687982c873437b270ddceaa5470d5077cc840cc931c65a6e7cb442ad7342f75c8d SHA512 70b3fd83bc2bbbbd2e1cfd93624a5f6a18e2a126165ec5d2d1d946e5f77a672ecf2a2ddcc3f21e29d14e0d3e65e97edb89f98034b0b81644adf516ff3ae48259
 EBUILD grpcio-1.17.1.ebuild 970 BLAKE2B 7719d8051dabfccb56e3f2e05b61428cc05580660b7d59da877fbcb52e9de9f5e221f94d47c6a5afef49f845a748e8846d333651ecca9aa68165fcecfff888a5 SHA512 3f0fc368010d7b48496fd6bb7391694415faf2c1584a9dede25e1b1e47ff42b2041d8061e0c3ebbf2583a5a73fb0f1e57780ddab66598a9849611ae39c6b92ff
 EBUILD grpcio-1.18.0.ebuild 970 BLAKE2B 7719d8051dabfccb56e3f2e05b61428cc05580660b7d59da877fbcb52e9de9f5e221f94d47c6a5afef49f845a748e8846d333651ecca9aa68165fcecfff888a5 SHA512 3f0fc368010d7b48496fd6bb7391694415faf2c1584a9dede25e1b1e47ff42b2041d8061e0c3ebbf2583a5a73fb0f1e57780ddab66598a9849611ae39c6b92ff
 EBUILD grpcio-1.19.0.ebuild 1018 BLAKE2B 206bc81ee8340345f1e3fb592450245f34d09bdd6260b8483e4634b8b2bfe8308df19d70e518015d10c21a47b38d7cd4cb91e09c53b66be5d61bd92b4285c3b5 SHA512 0d039d3ca984b7dd321bdec6bc56d87633fd307d0b0f5c63c36a65d973a6bd3a71807cfcb1f40d8ac689135880896b8cba5d9ab3958af4fa9613d1f7597f13c4
+EBUILD grpcio-1.20.1.ebuild 1083 BLAKE2B e9b8fdc3dc7dfb6572c54ab859ad032f9f88883d7d2f5bd2d1804811680e3e49c08b0d9de4693bb4c468863b2a2611475813e511585361d42c4a468ea879253d SHA512 b205223e829d4b446c17a00e2c2db6b63b2a294ace95a3db3361543b467f9df2ef4b6a3f35f27b9bd56882c125f382d01e0abf059abd207e100798c8ffa2cfd7
 MISC metadata.xml 470 BLAKE2B ad01d702b7a0ffe570bd30f50d47bb4fed725fbdff6f838acc54ac767d0cee88bb28bb0642f804fb04858d36a63f8ff7e110e4ae1dd26b8eb539b0a5c77cf5d0 SHA512 bf26387089977138bcf6be78b469bb412988e96c6bf5b4a9897f452378ce71fab1012a7d9268fb55f2883bc9636b712b59abe5498ffdcf199417d97fb09cd90b
diff --git a/dev-python/grpcio/grpcio-1.20.1.ebuild b/dev-python/grpcio/grpcio-1.20.1.ebuild
new file mode 100644
index 000000000000..044f0b277cd3
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.20.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=( python2_7 python3_{5,6,7} )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="High-performance RPC framework (python libraries)"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	net-dns/c-ares:=
+	!<net-libs/grpc-1.16.0[python]
+	sys-libs/zlib:=
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_configure_all() {
+	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
+	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
+	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
new file mode 100644
index 000000000000..01c743e488be
--- /dev/null
+++ b/dev-python/hcloud-python/Manifest
@@ -0,0 +1,3 @@
+DIST hcloud-python-1.2.1.tar.gz 63592 BLAKE2B 9a6d2dae97ff405ebd9b92bc833c9d953c13840e68be4eb43fed375a60e55cf4bf9b4b742b26fb03401f631b7f7127815961861cb673adf4839c829141c8ed00 SHA512 cb70d190350457fc3c6e474bc6c943070102762595dac2f386041956f64255f390a928a2f2411be861645cd65b015ab9e0c931b36aeed0076b06d9f67ac72d1c
+EBUILD hcloud-python-1.2.1.ebuild 1057 BLAKE2B c8fda044b354b74e8a282868820a70160ff64ab607e0b0f3ef8da7a5c4e7257863bf125318e30579cf444dcfe85140ee5ce53e5b1f6650b27c10709b7f2108e9 SHA512 ae66456a47e8d72a8c6c5cd2e03ed333e5da3b66ead7aa42aefd4d4bc11c0534f9ab16fc0bd32934bfbf24ac3566470cc048452333993780f378460139250ddb
+MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/dev-python/hcloud-python/hcloud-python-1.2.1.ebuild b/dev-python/hcloud-python/hcloud-python-1.2.1.ebuild
new file mode 100644
index 000000000000..79c12ac6fa46
--- /dev/null
+++ b/dev-python/hcloud-python/hcloud-python-1.2.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( 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/v1.2.1.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}]"
+
+# it can be delete for the next release bump
+# https://github.com/hetznercloud/hcloud-python/pull/41
+python_prepare_all() {
+	rm -fr tests || die
+	distutils-r1_python_prepare_all
+}
+
+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/hcloud-python/metadata.xml b/dev-python/hcloud-python/metadata.xml
new file mode 100644
index 000000000000..4eceb317f22e
--- /dev/null
+++ b/dev-python/hcloud-python/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>ago@gentoo.org</email>
+		<name>Agostino Sarubbo</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/html5-parser/Manifest b/dev-python/html5-parser/Manifest
index c13292c1ec48..ba8a95d71dc6 100644
--- a/dev-python/html5-parser/Manifest
+++ b/dev-python/html5-parser/Manifest
@@ -1,5 +1,5 @@
 DIST html5-parser-0.4.4.tar.gz 267787 BLAKE2B 9fcaec9faa906914d43f2b19381fe3095d4cd009bfb534537d2eabb420195276b3690d760c1defc92ad00e4965b3eb34ce4700d54f4f0291dff88026d890c90d SHA512 3aaeb32f360d2c131ecbe11fa1dcd3dfcd62c9ca046fce7dd4ff8127d0e62216f666e83bb20c7809c6adc591e1fb2798e382e78a1cf6129b1f0a09a71377f8d4
 DIST html5-parser-0.4.5.tar.gz 275587 BLAKE2B e26db3b6c55d43e26eb08076c59012814c2dd8739d6cba591e34cf8e304aa78bdf3440405668875acece2c21425f26ed9a0edbc5bb1da55da09c17eb52fa74aa SHA512 3c0421dd228ba5f3544f188fde5391d6be0fe92b879cf1e7697b5e5612a9e5bf08863bcb76f4297a59bfbfc69010a95f5d97fff78a7e6d26c889e173b07e4ae5
 EBUILD html5-parser-0.4.4-r1.ebuild 776 BLAKE2B 62b026b9b79358198eb0b0450d4a22ef45ce36666a00f964fa0169533becb166a0481e77a93de5c3a197494249f19a163c4ff416d5061e50fcb3dcc6846cb756 SHA512 550c670b8b08c2824c8e6cbeecccee7608829655c934489844f65961d6dccbe1ebc0cc04fb8f7c5b646dbce435fc96c05d022252be2481d8273491561e9d6cbf
-EBUILD html5-parser-0.4.5.ebuild 865 BLAKE2B 147184a9c0b135b8fc88291bca9f6ea86e5d145c9d7937cff5d80a4b782a3f163cc522b5bba5cb8c63c60df4e9f812017edd3c6598ee40ed09d246cdb7376e6b SHA512 66a4a18342adf3f3e36bedd26c76f281c08a601b811e09f001f345b50a8c656eef719c4a62593aa1992ffaa72afa9bba8fea1327e315c679088c3e62d359388c
+EBUILD html5-parser-0.4.5.ebuild 867 BLAKE2B 48a11f287812ce48cdafc41d1d77cbcf361463bd03ccecf7934e94a6d19f62fbb8926601e16c8e131b89928982a7b50290797088d6876a8fe4f846111aea26f4 SHA512 a42cf59622a319aed35ec89c4a1dd40e5b893c41fa1e213606a07ffb1ecb5337abf19eb4c9c137c45e5bf4ae6da2924cf4433b8968519f0cb5b8b1d5b8acd4f5
 MISC metadata.xml 356 BLAKE2B 8e97cfc61c6249d06916c0c6464637f4d776d81ebb060409181ba40eb91a65485a3c067b50f18dc9d9c9bf29f5a98bd40dc6ff89a0c68b30bc00353917db4e08 SHA512 3452ea432c8187cf09b7ce3b70df1c951ae243c153300093583efc337d9f6c42c41082b34ff6a81c19337ef508c90cff4308d0da63a44f4976d11ff57779baca
diff --git a/dev-python/html5-parser/html5-parser-0.4.5.ebuild b/dev-python/html5-parser/html5-parser-0.4.5.ebuild
index 5421b34871ac..80cb6bad74b6 100644
--- a/dev-python/html5-parser/html5-parser-0.4.5.ebuild
+++ b/dev-python/html5-parser/html5-parser-0.4.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-python/hyperlink/Manifest b/dev-python/hyperlink/Manifest
index 54acec69996b..49392b52fc3f 100644
--- a/dev-python/hyperlink/Manifest
+++ b/dev-python/hyperlink/Manifest
@@ -3,5 +3,5 @@ DIST hyperlink-17.3.1.tar.gz 91359 BLAKE2B 46ca9ddf54b8e5cd68cd5dd821b7a0ea2b218
 DIST hyperlink-18.0.0.tar.gz 97625 BLAKE2B d189445c7375657614c38db9045d96789b78a2d4ebe67e23b897a450588fbe1e3916707bb67916eb893e93a716125e606ff8be27e63f3db4e63b8bda1436fa59 SHA512 21b5f88f7aaa3f2b0b60566fdb0fefdf6d42866060606dac181c8e3d357c76a5c23fa5dc982812af2b7d49dc1f9d623bd5bea89bf2cf31916c855bc4ae85589d
 EBUILD hyperlink-17.1.1.ebuild 751 BLAKE2B 75d916e3f219e4f22bf22beb036f66819f14cb701805975a278d718ab2e0616623c03fe649a52bbea7ef802a368d462008dd4cc262b0dcaa0d09e5589a4c4f96 SHA512 3a41f60aff8489ab2f8eccaaf60eeb059b0413b316882004a9d2a1629753ec6a0b8051b6dc21c54d84ab27d61d601ffa89ad7232ce1e0d599dbaa19796dec308
 EBUILD hyperlink-17.3.1.ebuild 775 BLAKE2B 024f3053f640d72207be5e49378f34999a33b9895100825593a336f5b232d73bfaf968dead1bd3d17462301766fbcae11d0a04ae79c14e5ad48716ee5b2c0348 SHA512 b9d28c8433845c743795138e4c4ee057dd473d2992d92d99d08ee568e230b109d6360904521b7d2ce849bacf39d93e7bd04086fa193656c3828d22b57e484d2e
-EBUILD hyperlink-18.0.0.ebuild 720 BLAKE2B 995a2ac6a9cb5c4452a18777dd78098760b743812126d802e66d79b42d32c262b0089b8066d532588524bc8abb23ed49427d69db7b31b2fe127f6f242a7e8166 SHA512 c4d2efa7a210a731c90488390ba1763dc1122b64ca0b759fad9c14720a96a23306008bf34027a645fa73d7136ab0b19aebffd86d9983af17556596853342f8d1
+EBUILD hyperlink-18.0.0.ebuild 727 BLAKE2B 4b30273a21885fb739b929bf954a8b508e074c39439c976c1dc08a030061502d820567e9efe8dfa1a27fd824d76256b8c502f6af8b1dfbfbc08b75adbdfa37ea SHA512 b573cb941ef52c224935c8e2987a4f11db94eab715e7d577bcf31f54991149cccbce597db43486344fc884a0b95070dffa720afee23b25f0ca147db2f7db42b9
 MISC metadata.xml 751 BLAKE2B b9e49354e3472ca16622fd269867df7f0c5f372afa5f93c36c2646f35e0fe1e1fcd6b25c66ef73e13e442019be449ea72b26fda807e3d220fa254c4d7a691f21 SHA512 7cd14daa771935591e7a130d9dbcd20630074d49ffd738d964b631798a0466392e0b669cc009f3c769614d704925699f2bc3239bd5e78ba0c2cd629dccd72591
diff --git a/dev-python/hyperlink/hyperlink-18.0.0.ebuild b/dev-python/hyperlink/hyperlink-18.0.0.ebuild
index 105223cccfe0..23dc4055ee0c 100644
--- a/dev-python/hyperlink/hyperlink-18.0.0.ebuild
+++ b/dev-python/hyperlink/hyperlink-18.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/ipaddress/Manifest b/dev-python/ipaddress/Manifest
index 8e57f0e8b081..208c10f54678 100644
--- a/dev-python/ipaddress/Manifest
+++ b/dev-python/ipaddress/Manifest
@@ -5,5 +5,5 @@ DIST ipaddress-1.0.22.tar.gz 33051 BLAKE2B ae9145a275d373f07ad3996b9c06007259cde
 EBUILD ipaddress-1.0.14.ebuild 617 BLAKE2B 77e3ecef32c54642bc2e5ffeea21ea424118a86eea0cff1256b2515e7781ce7cb0c619e462753dfc92160b55ae6ddcd30576cdca424176734774e0d20872b8ba SHA512 7b21d5cd33817248dcf66651222695cd198009682bda5ed82c0013593557fa85daf7677218c58c1a635e035f4adec9ee093dfc719389f7aa6d0517156b06f08e
 EBUILD ipaddress-1.0.18.ebuild 656 BLAKE2B 6391c57a20088a880d68452cdb1bdbcd81750328444b6383119f359a92ee3c9855965ed472d939c05772ab0e7599d507565d59b84be4a18f667ab6b74b340975 SHA512 78f7b945c912c19172352c9134f7fa9896e925803a3bd8d0145b51e90bf8a1600ebf8e0bbb9418538968b84f03cc909e58ce28c6787ab24ad5f87203f5145290
 EBUILD ipaddress-1.0.19.ebuild 669 BLAKE2B 5a2533360d461f56ead14f2ebe99684c27c4dbf359bb0fda9d3f3cddf1337b71d132ade9f27406c9243d393e85a0861ff6996fd3bee0e9a8f647d18de68d9d43 SHA512 ec4ee4f51587b10b024e345897f433c225bdf6e2da75a7f8ab63916b2bf02e44eedf9ece7bd4ddf643925aa56a4a5d84deae34ce4d836000e7ed50299277506a
-EBUILD ipaddress-1.0.22.ebuild 736 BLAKE2B c34f54fd6216c1de46df82285ca40337fe5285de265686b9188cb81315daa12f3a64348568ab0ebc670945e1611b370ebff50346dd403a7497079459bbdf28d4 SHA512 e449b9aef3aac8e2ce2dff7c06150838ce05d7443de1ab552e185ffda312baefdbe46b86733b4b1f899ee89a5e6d1987726b7e7934c2770a40c0497e934660ea
+EBUILD ipaddress-1.0.22.ebuild 735 BLAKE2B d824f6c5db19f4072bea3d824ec027668dd8c9855f3e65ee10f1524c152c2846601d6b916617d2dc6699cd78f9d161abfda9e06c8b2a9cb0b058d01d9fb853b5 SHA512 f90351e6b193cd7e8434ecd2c0539b940ee837b6f4a0c91cd5b89b7f8d37b8a42addc39a37984c20901a90e8dc761d96b01aebff367a921136a0cb3eea3cac1a
 MISC metadata.xml 501 BLAKE2B a1528e6bef6960599198e71c0bf4ef65b0feaf042d588e5a29970141703780892f907ac73aa247a94a14d00ac7e42d393ede430c39c9c322cc45403c22844182 SHA512 e3b1bcf46848fc0b6faf58d4b9df44df0d0dfb6649a6c7f3806d1ca148528ddccefb4323ebdb046ff4469c07f081a0ff0ef32d767b37d6539b77c356371ffd12
diff --git a/dev-python/ipaddress/ipaddress-1.0.22.ebuild b/dev-python/ipaddress/ipaddress-1.0.22.ebuild
index 3bd10ed5dcb2..4a4a24c0537c 100644
--- a/dev-python/ipaddress/ipaddress-1.0.22.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.22.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index bdd471a9bdb9..23abed736441 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,7 +1,7 @@
 DIST ipykernel-4.6.1.tar.gz 90591 BLAKE2B 9d66e569e416e30fa0af93e9442326a081638e55e004c751d38b3e995e2e1c6baeba5b61e125ae8484a31344ca541070035154e4453f9eda30f7a2ac436e7f1c SHA512 3124534a8a059056211ac573784c491ba18d6e936292523382a9604af10bc2c911b14f49f7625242e29189b46c673da25244f3c9dfa3148d460ba4e466eef001
 DIST ipykernel-4.8.2.tar.gz 94441 BLAKE2B cdcf08c114c6c53ce4ed9829f3c2e0d2184f5b89b54556f92df25ecefadcc38955f992572a6dfb9ee49477e9a2111304c9b4f636edc47c0c0a26209c5f616579 SHA512 6542b086ef14abe70f51393e585c1e02eac0967b863c2e3de2dfdcbcdc2f4c01597bd035990f09f07d76005628a3345be97d1b5e5ce7a772ce7074bb31b4d4df
 DIST ipykernel-5.1.0.tar.gz 101198 BLAKE2B cfe0593d7de3eebf9ad43dc80d13f53dab0bb599836ea43c8e1263b02e78f6689837bffcea3c275f2241e370d67afb50510980940aea5a2b29a6ce674509bdab SHA512 0792b7f86d81b178c46522c8d6cf5fd57b0e411dfff13832d4e3d38782bae743fac7390dd5f2e2e738db66ce1137ec26e74511896b47667c88e23a245606a698
-EBUILD ipykernel-4.6.1-r2.ebuild 1128 BLAKE2B cfe185facf67039ae933678d013e24ac219c6658314f5b130531ab2d4a4568e23004e8dc37e3c268caa0bc16d7051162d3619939e2bc84d60ac11bc38a05882a SHA512 93d9d61b7a91132eff73eabaa6be9bd53efc6a9c71611b86b5f8ab8a70c63f5018d513ecbb8e2146775c7f50cbb843ddce7e917cb8cc0c8a88e0a3839946ce8c
-EBUILD ipykernel-4.8.2.ebuild 1128 BLAKE2B 728d573211602a2da7d2759e6896890ea1a0bf51251c184e0841db22bc6c6c021b6174169c79156d82e86aae7c7ed508ec5bf66adf9f630bea6ac19f8b8b5acc SHA512 a867f7e4af871c31bdcf4124d1feb0a3de50113439e2a07e1e88b0f8a92e442dc50f986ef38437bfae6537ae161365ba06be251b01cbb06eab8a14d7a2f4fdfa
-EBUILD ipykernel-5.1.0.ebuild 1120 BLAKE2B d13bda6e0f996fefa8e7b1f4801fd86e1fc31c77e2d9cd8a7bfec396fe2530f13676c7f810a235ccccaa19a547767d6e0ec4b9272d21ebdb4661a4f79855323a SHA512 770ee4abc46bb54b92049c6cce1668e2c2f4a5a7143e23780d294bd6705799c6f3fea59aea87e84dd4d6f8b0cb038f8063de7d88c7e1f7f45db34ce58aa85f39
+EBUILD ipykernel-4.6.1-r2.ebuild 1046 BLAKE2B be57b9cf34c6b1055aefe0805685d1e06ff9c7ac9da515eb239b6ce30dec5425ba79b8362d4f6163a09cccbe544cc7f49b811fba91b0d1cca36879da82456712 SHA512 d913595f03f797c7154ae2966432fc946f6e314b454a10be7f1aba5acccb7014c372fe71a3789493d4df419cf5be738cf9d6491d73a67f050b36729e3dbdc8e8
+EBUILD ipykernel-4.8.2.ebuild 1046 BLAKE2B a32fcefdbb7287a3f29a7c9012e3fe1246e4df9fe3c9aac9c2dbf22c8b124015c011a011039469d5c227dce57918a3a8bd00d56caa54d658b9d1a0cd79292de5 SHA512 6dd96df3ad661c318ea7176c46e7c0ab7a722b788036d3f44d9c1f310d3247e17a27a25566ca4b9da9aca08ad25086168c67684c6df8fe546c8872240990ccd5
+EBUILD ipykernel-5.1.0.ebuild 1039 BLAKE2B 6e4fab324812423ecf230b84a6bdef69c3fa63e5cd54e4a69c4afabcae9a69ad36401d1c4e20b41466126bd0facd5c9ac08209a1c4ad5cb3ef5e8c3f485403db SHA512 d101365700452e0f204c19fc62f8a04809be4c739e275e7a270339f36760a22144ecd9390a1aec579c07a49873f4866b7ca4bb81a4504012a08bce88e5ad20f4
 MISC metadata.xml 493 BLAKE2B 46ff719452b5145a401147fef18fd62fc55542b2edc27017f2f8729d04f304339ccf5ad63de07efbd9c5419d663a498c76f9ce312f06869b3621a17fb72b14dc SHA512 f4176cf4bf94b2a2859ed74298ad8d1b7beb310d9a00f499c32528beb46014aebe7705d47f01bfcc6273729271360a404aa7cd03e046918418d80b8b6bb4f269
diff --git a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
index f9dcdf2e3666..e3f9e55a1ce3 100644
--- a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
@@ -18,8 +18,7 @@ KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
-	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
+	<dev-python/ipython-6[${PYTHON_USEDEP}]
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
 	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/ipykernel-4.8.2.ebuild b/dev-python/ipykernel/ipykernel-4.8.2.ebuild
index 4c4883c48216..200a48df5544 100644
--- a/dev-python/ipykernel/ipykernel-4.8.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.8.2.ebuild
@@ -18,8 +18,7 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
-	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
+	<dev-python/ipython-6[${PYTHON_USEDEP}]
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
 	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/ipykernel-5.1.0.ebuild b/dev-python/ipykernel/ipykernel-5.1.0.ebuild
index c796b2e57931..cf43e216a89b 100644
--- a/dev-python/ipykernel/ipykernel-5.1.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.1.0.ebuild
@@ -18,8 +18,7 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
-	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
+	>=dev-python/ipython-6[${PYTHON_USEDEP}]
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
 	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index 282ff8b35917..b80cda175dfe 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -1,3 +1,6 @@
+AUX ipyparallel-6.2.3-disable-broken-test.patch 1063 BLAKE2B a80674390818474fba63c0b86c822eab8238713b96b2d6713478909da57bc4ee1c5bd1fa5da9fd7baff8d84b3ffd313540ed8287bd1c19dbeb61dd69bfe53dbb SHA512 c45c51b5c3fc1512d6bbd7bd557a91de50a1ae172ad465bc4f5482d6036f287ad17cad20406fbd51d8740eabe11a50584040c362c32f1770db69f4cbd9984681
 DIST ipyparallel-6.0.2.tar.gz 2366627 BLAKE2B 333d6043c1e3635a37ebd464a5eb6bd0d21d0815abf106f8a7dd138128790d89ccb856dd981c281ce023cded589e6352fd6cd48efab61c8955abfbfea157eb35 SHA512 2dab781eac81bb3c2d4eedff9689448ed8d4317b47a1e8110a0b16147f986428f6fefe13acd12ee8604ec7775aee46a5f62c7d6a676bda7f8d3d39d95d90f28d
+DIST ipyparallel-6.2.3.tar.gz 2371030 BLAKE2B 73f96bbed280def33ae243e592ecf2e298afe92287cf3a7edb966859c38c6dcb1f1a43082ab83907aa00e06d571f4b750df28e6885a1c2d1fd1489fd4472a7fc SHA512 ddf479a7776c2ca9fd37aa5b7dd402c136ce62a479333f5f56dce413649f9b928daed56c173ad5325268eaa58667d611257b20c8269899cc06ae2829f973b4c1
 EBUILD ipyparallel-6.0.2-r1.ebuild 1690 BLAKE2B 4a1d86d18d2a3f800224c3056ab3eb3f58b5388e844ab32404542e3c9d754e8371ab770d4fe3ce91c050977b17d1657ddde5371f72cebab40f4fcdab04b70378 SHA512 b94806139d4e20ca891e0676ccdc1ce49b255d05f4f62b78e1146e254371e5cfec0893426ebeea6dd6d192e7c2a39e7cab0ec599df968a27b3370fbcffc9b9de
+EBUILD ipyparallel-6.2.3.ebuild 2043 BLAKE2B ca5b085c54baa2cdef6ba1ce6ed9f2edf3e62c12efb0d4ca61ab9a348b8881fa90f25ca76abd43b43e09fd3b169de61a1990cc3bc326663e31def13b1a494dfb SHA512 4141f329d3cce6c88f14297c01910d837e989c86edb8e772c8acf4dd8e1a3cd7a558bfdae50e34c70560e10c357fe0252b90d5a7d7a491c558aa567ab63fc5b0
 MISC metadata.xml 541 BLAKE2B 1864cc5953409eb51527e721ab298f8296453190f32fbd620da058a2907ffb3778ac1f6723b1f50cd86a27d967d62d882cc5d0cba2709f653b0bd7328288f69e SHA512 47be22e2e5c3d43e92a6e9fcdcfe936ac7690499b850920196fca218b326f708d2350ec23f3084b58d0c9630f8dba06b90414a2e325811467034ef9f35a07a9a
diff --git a/dev-python/ipyparallel/files/ipyparallel-6.2.3-disable-broken-test.patch b/dev-python/ipyparallel/files/ipyparallel-6.2.3-disable-broken-test.patch
new file mode 100644
index 000000000000..b578cd7f73e1
--- /dev/null
+++ b/dev-python/ipyparallel/files/ipyparallel-6.2.3-disable-broken-test.patch
@@ -0,0 +1,28 @@
+diff --git a/ipyparallel/tests/test_util.py b/ipyparallel/tests/test_util.py
+index 06fde46..e685a88 100644
+--- a/ipyparallel/tests/test_util.py
++++ b/ipyparallel/tests/test_util.py
+@@ -3,7 +3,8 @@ from ipyparallel import util
+ from jupyter_client.localinterfaces import localhost, public_ips
+ 
+ 
+-def test_disambiguate_ip():
++# This test is broken in gentoo's testing environment
++def xtest_disambiguate_ip():
+     # garbage in, garbage out
+     public_ip = public_ips()[0]
+     assert util.disambiguate_ip_address('garbage') == 'garbage'
+diff --git a/ipyparallel/tests/test_view.py b/ipyparallel/tests/test_view.py
+index 45cb669..dd335b1 100644
+--- a/ipyparallel/tests/test_view.py
++++ b/ipyparallel/tests/test_view.py
+@@ -823,7 +823,8 @@ class TestView(ClusterTestCase):
+         assert view.apply_sync(find_ipython)
+ 
+     @skip_without('cloudpickle')
+-    def test_use_cloudpickle(self):
++    # Broken on Gentoo
++    def xtest_use_cloudpickle(self):
+         view = self.client[:]
+         view['_a'] = 'engine'
+         sys.modules['__main__']._a = 'client'
diff --git a/dev-python/ipyparallel/ipyparallel-6.2.3.ebuild b/dev-python/ipyparallel/ipyparallel-6.2.3.ebuild
new file mode 100644
index 000000000000..2a43f855e588
--- /dev/null
+++ b/dev-python/ipyparallel/ipyparallel-6.2.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Interactive Parallel Computing with IPython"
+HOMEPAGE="https://ipyparallel.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+# About tests and tornado
+# Upstreams claims to work fine with tornado 5, and it's indeed possible to
+# launch a cluster with tornado 5 installed, but tests definitely don't run with
+# tornado 5 installed. Upstreams CI runs with tornado 4. This is why we limit
+# ourselves to <tornado-5 when running tests.
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2_7')
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/ipython[test]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+		<www-servers/tornado-5
+	)
+	"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.2.3-disable-broken-test.patch"
+)
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	pytest -vs ipyparallel/tests || die
+}
+
+pkg_postinst() {
+	optfeature "Jupyter Notebook integration" dev-python/notebook
+}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index c03f8b1a233a..5787383edd84 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,8 +1,8 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
 DIST ipython-5.4.1.tar.gz 4973571 BLAKE2B bbda7b5a172ea1e80a9867f036ef68d1d0ec0a7340d77d8b4bbce63c5db7d3aade106ee5a6d59fb7e2b773c37d8263e51e1eaaa81d582849a70de60e93b7205a SHA512 b37dae27a558585ec4f42fa22e86380ac81990207ec680fc7b0e6f97ac81c99d915cfe77488bc0b91a61c34e0c00b323df08aa06b142ce0fc88ce30203102907
 DIST ipython-5.8.0.tar.gz 4977824 BLAKE2B cfa0592e8b71f82d996e6e961c3ac478617132f569799916a8794f1af733f3e40649fea763595b58dd8a10f31869d280338b81d15c3d059707a66ff7dab889f5 SHA512 946afb8f1623c8a7564ba2d782e05f5c961577dfb1e4a0f27e4a10e2932d5d041035c12aea7eb3e1d61af87867fab85a29919499822f93f638634bc343084b3e
-DIST ipython-6.1.0.tar.gz 5066094 BLAKE2B 4f68776ba15f50b2f0fcc1503dd5c62ac464d9d0ace0801f572c9cdc1a0ddd7d840369a3df5940551c848376985cc74848002cef53869014adb2fd9714989acd SHA512 6b1d9713b5e8c3870ac8cd8bea9d3a6f0c0302e3983017516128ede9f0baba21372890873df29fbba3f9d2f47ba16bfadb1c611f9de23b71595c0ab8f917695b
+DIST ipython-7.5.0.tar.gz 5118610 BLAKE2B 3f89babc292ea55724c2333076a673ef7fcd0a7a468e972a50c962194a71a0bc3cc9bdea4f96db4c21fe475b4d79dc87c124bcde53e1bc3ae7066a3c0c136e0d SHA512 564027879e53b3716ebe8cb1ed4b516835c15f326c865fd664aa7a4e5f26e1a78a329ff8e19d4acf6249e2acf7382501114cd2258c38bba89f0f382f7dcda09b
 EBUILD ipython-5.4.1-r2.ebuild 3708 BLAKE2B ca51fda923be3b4165303f6828b786f1b30403a9333ef47a56184eaa5d2ba175050247e2c8cbc8a68793642e3f60afe9927141722e6d0e84c7b46399c3f52d1c SHA512 fd3b5f5bb71a40960725e467fa69de0671d14d4f946d2acd272fe140da9bede8499454a6b932760f334c89a86ac06bab28e8feeb5eae892fbaab6981ca4c8aba
 EBUILD ipython-5.8.0-r1.ebuild 3792 BLAKE2B bf4657c93f27d988da7af429cb7eede7d7e0e6717d358bfebcf3f8ae01b0b16ac9d55e8c0718478cc49153c604a32d652461f942262554eb183bb329aaca86d2 SHA512 0c0ce13cc6e73182d631ff29fa93803e8a5152b1ef44fbf6f50b38ded551944ce7c9c14f45a73ccd7b8dfe2136947cbd0f37f68aa6eba9880341bdca78836461
-EBUILD ipython-6.1.0-r2.ebuild 3441 BLAKE2B efb27e3cf1a926684fb366cf0310554d8a4333e59c88c101db58955241b811e412836602d7dda0b43806183411b9d9ea3fc5714829f22d20c1662f5de8cc7a02 SHA512 c5b585bfeeaa521c33abdfba89d143c17532653bb0eb143eacb7ff31da89c93cfb9b3432cfbbfbcd4190180a2acc31c39ef77152bbdbc66a900d1f8957686bb6
+EBUILD ipython-7.5.0.ebuild 4674 BLAKE2B 699809fee7070140e17c0bc04aaa01a0b73ea66589d1607e6aa7bcc3fea2f07da2031a34e34540f5a2295bc487ecfc8cd2410675cefa9a1df80bb9920e04c504 SHA512 5f5df0e61b71f0bca5632181cdea5d9fee26f7c98f455153a0bbd7ea8fb11dbcc36a657bfc7da29f55f57faf48f6fd37c48d63f7beefd7de14ed27b2b3853ef1
 MISC metadata.xml 2857 BLAKE2B 89f6ea04a550e2e590f9e041c435fe578691118e24265d0f3c2465480cb32cbf4f5ca4d6c8fb2a08a665061347e19e361160f73aea080b1f67a4c9c743f6c23c SHA512 6b28c7f0be77e23656df143940074658a71ea872ba12238d3dc206f25662ddd589e3ebee11d5ca06498cfbbc651ae0effc95235feed91e853616706c87ca5bc4
diff --git a/dev-python/ipython/ipython-6.1.0-r2.ebuild b/dev-python/ipython/ipython-7.5.0.ebuild
index 4122a9aa3323..2a20f1205ac3 100644
--- a/dev-python/ipython/ipython-6.1.0-r2.ebuild
+++ b/dev-python/ipython/ipython-7.5.0.ebuild
@@ -1,12 +1,12 @@
 # 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,7} )
 PYTHON_REQ_USE='readline,sqlite,threads(+)'
 
-inherit distutils-r1 eutils
+inherit distutils-r1 eutils virtualx
 
 DESCRIPTION="Advanced interactive shell for Python"
 HOMEPAGE="http://ipython.org/"
@@ -14,56 +14,72 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples matplotlib notebook nbconvert qt5 smp test"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+# About "-python_targets_python2_7":
+# The ipython stack is in a tricky transition to py3-only. It has many circular
+# dependencies which causes a chicken-and-egg problem because for Portage to
+# properly handle dependency resolution on a system with
+# python_targets_python2_7 all members of the circular dependency must go
+# py3-only at the same time. If they don't, the dependency that requires py2
+# will seek older ipython releases for resolution. This is why, for members
+# of the circular dependency, we force -python_targets_python2_7. This way, the
+# circle stays firmly in py3-only land. This only affects members of the
+# circular dependency. Other dependencies can be on py2 without problem.
+#
+# This situation also require us to explicitly depend on transitive dependencies
+# that are part of the circular dependecy so that we preserve "circle
+# integrity". It's a bit ugly, but temporary.
 
 CDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
 	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.10.0[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-1.0.4[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-2.1[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP},-python_targets_python2_7] )
 "
 
 RDEPEND="${CDEPEND}
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )
-"
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP},-python_targets_python2_7] )"
 
 DEPEND="${CDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
 	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP},-python_targets_python2_7]
 		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/testpath[${PYTHON_USEDEP}]
 	)
 	doc? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	)
-"
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+	)"
 
 PDEPEND="
 	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/notebook[${PYTHON_USEDEP},-python_targets_python2_7]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP},-python_targets_python2_7]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP},-python_targets_python2_7]
 	)
 	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )
-"
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP},-python_targets_python2_7]
+	)"
 
 PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
 
-#DISTUTILS_IN_SOURCE_BUILD=1
+DISTUTILS_IN_SOURCE_BUILD=1
 
 python_prepare_all() {
 	# Remove out of date insource files
@@ -74,6 +90,7 @@ python_prepare_all() {
 	if use doc; then
 		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
 	fi
+
 	distutils-r1_python_prepare_all
 }
 
@@ -84,6 +101,10 @@ python_compile_all() {
 	fi
 }
 
+src_test() {
+	virtx distutils-r1_src_test
+}
+
 python_test() {
 	distutils_install_for_testing
 	pushd "${TEST_DIR}" >/dev/null || die
@@ -105,6 +126,7 @@ python_install() {
 
 python_install_all() {
 	distutils-r1_python_install_all
+
 	if use examples; then
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
diff --git a/dev-python/jog/Manifest b/dev-python/jog/Manifest
new file mode 100644
index 000000000000..9faaa294b1d8
--- /dev/null
+++ b/dev-python/jog/Manifest
@@ -0,0 +1,3 @@
+DIST jog-0.1.1.tar.gz 5684 BLAKE2B 5c2955060db8bdbafeffc99ef39f5a4b39bdda3e1d681ce52f147859da2d1dfa335e13552c6b54e08800653f902b922b3f0d395c93f45787f2955de7ddc1fc78 SHA512 570c780611a15c1a8ed6db62f281e3ee8cb6a86b4fb926132aa16caaba66c079627de89cfa4308fff927d0bd969acc57bf4439f01c7e2bf4d6f12ea5c3efaddf
+EBUILD jog-0.1.1.ebuild 373 BLAKE2B 1c63ce6ca02d3e40ecc915e2772d68fe6e41e5c9457389489cea0f7ff2f55b7abd6a75b32b1c455f52279abb0257ff85d95a68155c4dde697b2e8d8060ee47f5 SHA512 db22b233e64cc3b5b25c8a2dbd538dd0ee37055789b9ca0d361e7652d3c3eac677ac6ba6533f853b868f718313fe9ddcd9c1f9b179084bd46218439850f30b98
+MISC metadata.xml 316 BLAKE2B 3dc76d751c1f47b3a83ae9b2a9446fc4b1a2055be3c7dca82e1f951d5e95e34f2a6987501338e8f6284468d3c9d8e214f4d8dbd5f104b6f63bbb91b4ade26a53 SHA512 825b8c35afaa305d0b038ea57a9f655e5b5ee14bb4fb6d21d8a5e3950b8344c5421b92a4309842281ae33aba92161970cb9b54564bf17f1117b2f72e75123fa3
diff --git a/dev-python/jog/jog-0.1.1.ebuild b/dev-python/jog/jog-0.1.1.ebuild
new file mode 100644
index 000000000000..31ca75410282
--- /dev/null
+++ b/dev-python/jog/jog-0.1.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 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="JSON Structured Logging for Python"
+HOMEPAGE="https://github.com/braedon/python-jog"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/statistics/metadata.xml b/dev-python/jog/metadata.xml
index 41bf24bdbdc8..eaa57b4227f5 100644
--- a/dev-python/statistics/metadata.xml
+++ b/dev-python/jog/metadata.xml
@@ -6,11 +6,6 @@
     <name>Python</name>
   </maintainer>
   <upstream>
-    <remote-id type="pypi">statistics</remote-id>
-    <maintainer status="unknown">
-      <email>stefano@digitalemagine.com</email>
-      <name>Stefano Crosta</name>
-    </maintainer>
-    <remote-id type="github">digitalemagine/py-statistics</remote-id>
+    <remote-id type="pypi">jog</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/loguru/Manifest b/dev-python/loguru/Manifest
new file mode 100644
index 000000000000..e68192881f89
--- /dev/null
+++ b/dev-python/loguru/Manifest
@@ -0,0 +1,3 @@
+DIST loguru-0.2.6_pre20190412.tar.gz 362315 BLAKE2B 8273fd42522396d4a17c405bebf01f8de272a56515e4a63766126494b4449333e7c25f5be5851bdbcf922d35affa9ee091ac7138482f9e2daf30f48093cee812 SHA512 49320c19f2bfdc55569290740b49889133003329dbf6cae2e993730a957d69e5200b41b75d255d2e19d937658778945ffe44350431661162eaa6141edfcfc499
+EBUILD loguru-0.2.6_pre20190412.ebuild 1125 BLAKE2B 442009acf68b49846ca90ffb5b5234e9e99e0fd6d1c25d11fbbe01c9b5b9bb34e5d968b4a9035846912c1313b165969d8e920e6b93298b20d868122c53892389 SHA512 fa0e737d2b3710e7dd1bca02d4e94d2136084a930a43955b6c8c462efd2993ad6bb0a6a69ec9e0e10884a76d3d81fb6692df04bb07ffe792068c3238d46ab94b
+MISC metadata.xml 683 BLAKE2B bd44db6c47f17a714eb8080d63d5002bbedf247787d568735f87f8aa01a13fc32d383f4eab2b92536a2f98f5b76b0ae01c407bf3c746b08c668ef562cf488ed0 SHA512 8a671ba69aa489f384c7074623f62c03905442b14b6b12bc9f306416a66390a334dcdadf84a5485936b47ff9992ac87e35ffbc8ae17d035b381f53f721b2369b
diff --git a/dev-python/loguru/loguru-0.2.6_pre20190412.ebuild b/dev-python/loguru/loguru-0.2.6_pre20190412.ebuild
new file mode 100644
index 000000000000..04098605437c
--- /dev/null
+++ b/dev-python/loguru/loguru-0.2.6_pre20190412.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+EGIT_COMMIT="6571879c37904e3a18567e694d70651c6886b860"
+
+DESCRIPTION="Python logging made (stupidly) simple"
+HOMEPAGE="https://github.com/Delgan/loguru"
+SRC_URI="https://github.com/Delgan/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	>=dev-python/ansimarkup-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.4[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/isort-4.3.4[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.9.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	pytest -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/loguru/metadata.xml b/dev-python/loguru/metadata.xml
new file mode 100644
index 000000000000..b72d659dc843
--- /dev/null
+++ b/dev-python/loguru/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		This library is intended to make Python logging less painful by adding a bunch of useful functionalities that solve caveats of the standard loggers.
+		Using logs in your application should be an automatism, Loguru tries to make it both pleasant and powerful.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">Delgan/loguru</remote-id>
+		<remote-id type="pypi">loguru</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 21f8f8b29b7e..27c8032169a3 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -8,5 +8,5 @@ EBUILD m2crypto-0.24.0.ebuild 931 BLAKE2B 1432ae4df72dea3159ae0944e1dcd53d7e8c65
 EBUILD m2crypto-0.27.0-r2.ebuild 1361 BLAKE2B 85800c96f50f5f080eee9aa96523dae8f6ace906568b6fbfb1d04bfceedce813bd24eb315364909c0bdae164a4856e369fa64dd4b01f2f2e65eda6e5696b0833 SHA512 777df5b5eddf9cf1e4db99c680b3bf08a3a99c3100b701dc41b1c7943fdc8f6da5b212a9668ae3e3cf820c39cab24b5e034d8546c0a360351a51cefc1b841320
 EBUILD m2crypto-0.27.0.ebuild 1298 BLAKE2B 97104e95a890d7dd30a9ccbbe4328e09e3d99ab86736aa68dbafb3e2334174e9f2a64964351f7cee426b2433bb008b5bd816a454c30714aafc9ef0d8bbd8cb6a SHA512 a4ed82f6f69fa6edb4ac6449c4472f76c7ffd438711376cfe616b0cb0b3a06639d7f1ea31dfbdceef8d17847982997b0ed722df3d53193ad2471553b2bb3bb7a
 EBUILD m2crypto-0.31.0-r1.ebuild 1343 BLAKE2B f4a692d894366a5c29e65dcfaa34f4e68c66a6d1ff789c1c645644848f0fea26fd90317d6857f3d026809b191c95051a07596f6860b71a34028c20f1cb76ae8a SHA512 d6b69e2c9d3365d826570ad79cc21073055abd033b0c794ae5c18f16169aa1cb5180542c15be1fb3e89312dc3b63ce18a72137225cda9a9ab37ace1bf393819a
-EBUILD m2crypto-0.31.0-r2.ebuild 1346 BLAKE2B f41cf5f11a5f929eab71fd68fdeccfde9bd227203ccd44f3b1788a541e298fa9f0e9d71313161588f3f8b0325f1d1f2ea0635ea92bc0c3431310124e1d895a05 SHA512 54c7fc6914beec60a00eb5e1e78f2194bdc6e770f88990fd4623803ea3c627305615bcf1353cef73400ea6f24b278aee554a1a246870e4fd4b98981abc623649
+EBUILD m2crypto-0.31.0-r2.ebuild 1352 BLAKE2B 93fed1fd0a2d67a10cc54957f82d4e0029e25ac7349d56114e310d6b52b1035aeb8d592fce51fbd78910499039bd8a6d35fb2d7c1cb6f2799f3794761df8604b SHA512 ef87960d482e8491135f5a871731e5e8af838d862016e6be3683954ca0956f144f937517529a206dfa5c116c8c0e4dc1168372e5739e5be9130381b5e993a5f7
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
index c128861939b9..17cac8b10d3a 100644
--- a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 IUSE="libressl"
 
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
index 85c8271e1e5a..387d863c212c 100644
--- a/dev-python/m2r/Manifest
+++ b/dev-python/m2r/Manifest
@@ -6,7 +6,7 @@ DIST m2r-0.1.14.tar.gz 15926 BLAKE2B 48d8961b6ebf66d494511f6bf755ae2d2de0740aa27
 DIST m2r-0.1.5.tar.gz 13202 BLAKE2B dcfc5ecdcb2c696c1eec8fe3eca4cd7e238f605c399b750286d9eb18ecbda9d80b608fb362a85959769253c5f5bca7e392ed5b61a7804b25cab5e7bfb5edf574 SHA512 78e9e8daa293b2466c95f0adad937fa0bbefaf0dd9663695bb916be13182633e0d462afa5331a595db424420485ef54bbfd4e0625962026fab4ce0c63104bc84
 DIST m2r-0.1.6.tar.gz 13615 BLAKE2B e0c98c059f5c569bf88a1f97bc1c8a912675f9c0e044175f4ecbf885b80019d62f5fe80579420af373ea3d62fffdcc62344d1035d901208719be1cfd56654a01 SHA512 3641cf4013f71fbd43d6cdad530cfd3e909c93709edfbd79d6a51e7121de68e279d3ec4eb7eed391a35902ffa467310bd6b020139b2024c3e80fa44e5f6cc4a7
 EBUILD m2r-0.1.12.ebuild 1218 BLAKE2B 557c674f096982aa69f048e5d85936737cb7856363ba83386c4dcd30ab5fc452e888ccf1d6bd7d737ade17415af3edb1b17018a286f0ae0f635c945333014c0a SHA512 c5d3a2bde7e5f3d3c6e7f36d01441f46c816e6d6f3a0897be6307d5f0f33eff8344e2d7f8c3e832f6f66c6efd91b9d1b8321a8c5557d99c7d9283ca7a189c8e6
-EBUILD m2r-0.1.14.ebuild 1280 BLAKE2B f8885f0ba2c0c4572cbcb6766ec548e93767bafe149bb91e877c9fd7b8806aab44ef3d01d7d3386caa0b3ff6aec39366dac8cbe2efd2133b087594e9b59b45b3 SHA512 a0aee83052d723eaa252748517001bb08b4844d6490bfffc7b1340f96ab3e9d7329bb9d3dcfe4f6708625feefe18ee9aaab5a3e741e0a79501f0bfd9c86d9d4a
+EBUILD m2r-0.1.14.ebuild 1287 BLAKE2B 3fbf73794b2e0125fad50d3df51b2c27b7640e3dc44faec8d82d72ed7b3c2ea6d28cba61731957329934a4906312d3a0260fb78673291f762d5e35ed3c60d41a SHA512 7fcf173cfa549f9deb4c4034cdd6f717fe8610e404913d517776e3aa1bd0799ddaa6c858809608cd18b72f2cbd97d6bd932af05a5cf01ad5cad9ef03224a2f33
 EBUILD m2r-0.1.5.ebuild 1271 BLAKE2B 21912af5451c48c9d6611e3f35c111a0f865c406695aece7fd8cfa6acfa280a5b333b37e645fd7a3f44f789c076cc8915f9bfe1483f3799017d66b608faa4b7a SHA512 1f9409bed0fddab84d52b68fd219ba5edbe867c5783df9c872ece636a5b3b7137eb87dc6cc1a5afc6f452041fc384a30fa2c114c93c1210cb0b8ebff821cfacf
 EBUILD m2r-0.1.6.ebuild 1271 BLAKE2B 21912af5451c48c9d6611e3f35c111a0f865c406695aece7fd8cfa6acfa280a5b333b37e645fd7a3f44f789c076cc8915f9bfe1483f3799017d66b608faa4b7a SHA512 1f9409bed0fddab84d52b68fd219ba5edbe867c5783df9c872ece636a5b3b7137eb87dc6cc1a5afc6f452041fc384a30fa2c114c93c1210cb0b8ebff821cfacf
 MISC metadata.xml 554 BLAKE2B d275cbf42dd1621fd0dce4fdb85cf0832e3160cf7468e729d39f33afae099b354ccb21e6de312888ddb6d2e97a487a02cd9d97dee033eee960d0ffbeda70c704 SHA512 ff9d0efa78e4931a4f0ed8097cfdb1d32fb1a99f825199fae42838ee534c045c30c440e9f8bdc41639adfa99efb672a587d11f84f1bc7215f8e59655e1dcaa49
diff --git a/dev-python/m2r/m2r-0.1.14.ebuild b/dev-python/m2r/m2r-0.1.14.ebuild
index 6d3e6a36dea2..d1ca28818631 100644
--- a/dev-python/m2r/m2r-0.1.14.ebuild
+++ b/dev-python/m2r/m2r-0.1.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index efe76a0d0ba6..67f70b0a1af2 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,5 +1,9 @@
 AUX matplotlib-2.2.2-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
+AUX matplotlib-2.2.4-doc-fix.patch 629 BLAKE2B 61549eac0d67275117750ad11a7b4aabe9d81783b0d603039266b88d6fe42edce4ca222df4666d83b9e4ff069a4a794b836ef40c748c921c0f092b6c01ff3b9b SHA512 ebf3cf7611a6f6f819546805443e9932a4cb3c77eb0eff507e94667ec32462ac5ee99be689d6523cf7111f16776d0837c14f469f674530a36e95343b2803581b
+AUX matplotlib-2.2.4-no-jqueryui-download.patch 708 BLAKE2B 8ad1b3cef23a5bf1dbaaff22367ecc09608945244852552bc22f86ae6350d4683821f4b2d7d9fd76c0e701724e17508c99fda0205d420ed21c35164533bd3dd6 SHA512 8d783f6978403737ea65741a71e0c4ca7e428297504c11351f38616d01ebf60428eb993585f27c5d39dc607bb76e146b4e642bc295fc18ce3008e868a9cc6b5a
 DIST matplotlib-2.2.2.tar.gz 37317332 BLAKE2B 4120265263c5b1e4ab57f7c0eb7a477b4071a5f219d1d6328d6ed51d44460217c7c4da82a4b7d13c6ba9f80308406a217f2dbcfa310f3137cbe8bc56a9ef0eef SHA512 1d21ef821190f22354098f8f0db6449f237acbf3c1419ab3815ecd4e9c6922fd3f00c4a8f60858e319b55b6fb2e8fe2922c0bf8e72b204e7edff0b409cf76320
+DIST matplotlib-2.2.4.tar.gz 36974286 BLAKE2B 9c4c69163a23ff02107ee155f72e142dcf31ba965f6a20f468b96f3f4b70b95ff6caade6b14bcbacd5b231848d2000ce6af9f113feefb41d6e186725349490d3 SHA512 968f5731b8a9a2c5575403c60d5b0a98a452b33094e520be44f4d901f892d082babc8fc1d73c519e1ff2baf756f3cb7652f4b796e166d66dfda31f7e50c58139
 EBUILD matplotlib-2.2.2-r1.ebuild 6346 BLAKE2B 89da0281cb6d4da020b94fe84ddd88a4d022ff634b1f97ea5e04f7a6be65cc7b72afcb16460ddf524a32012483db4b88d4fe0508e83cd7eb9819efd016a7b8c8 SHA512 c55b26b118a23752d2be977e59740169f14317a3239fda35c251190ff5e939cb62743f7d55ab1a3fd388758c84003eb0e7b9025d98b98243fd86bd592554bb83
+EBUILD matplotlib-2.2.4.ebuild 6397 BLAKE2B d8ca0bbd2ce161fcf469d39dbc3d134e2f7730669683aca718189751f802f54e5c0e4d152624f7f41a13ab99a72cb6e4d68e906c98c0176acba258b60b8da815 SHA512 497a6c7af99fc0aac6442f730dc1abe57637e9694310dcbe434d182b1c7abab5b9da0f66922c369f36b109acfe8612329cf96f5fdd6bad3487d7533a2dabf727
 EBUILD matplotlib-9999.ebuild 6299 BLAKE2B fc2b72ec9666b9c8c5e870c1b1de83ecf4af88477d2af2eaf8c3b4c6492c2893b90655e2053ade531c1105dc3d2545e9b57ca231a092a4715d3691e049951faf SHA512 daca034bc8d2cbce86d079cb6f07313752c45d247853c5f5720dbe298a0504a31f11208ca9e49fcf109044e56960fc617ddb791b499f36c33feea25384637ba2
 MISC metadata.xml 990 BLAKE2B c5e7256de7565d910a32ab9d48e39b49d3868d345e16cf893cf135dd114b20032c7794dfec3c832768172b7a8437e76e2807b7027bb2a9e392473054bfc7f000 SHA512 6c47f53ce41e4cae3f58f0abbe0a8b369670a0eefddf6eead266a530589398b7d212dab9627d6b8c6ec0970717d3220e09522f63f587cfdd2613113ac896aa7b
diff --git a/dev-python/matplotlib/files/matplotlib-2.2.4-doc-fix.patch b/dev-python/matplotlib/files/matplotlib-2.2.4-doc-fix.patch
new file mode 100644
index 000000000000..b6a01b097a61
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-2.2.4-doc-fix.patch
@@ -0,0 +1,18 @@
+diff --git a/doc/conf.py b/doc/conf.py
+index 017ce210e..5a397082b 100644
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -170,10 +170,10 @@ source_encoding = "utf-8"
+ master_doc = 'contents'
+ 
+ # General substitutions.
+-from matplotlib.compat.subprocess import check_output
+-SHA = check_output(['git', 'describe', '--dirty']).decode('utf-8').strip()
++#from matplotlib.compat.subprocess import check_output
++#SHA = check_output(['git', 'describe', '--dirty']).decode('utf-8').strip()
+ 
+-html_context = {'sha': SHA}
++#html_context = {'sha': SHA}
+ 
+ project = 'Matplotlib'
+ copyright = ('2002 - 2012 John Hunter, Darren Dale, Eric Firing, '
diff --git a/dev-python/matplotlib/files/matplotlib-2.2.4-no-jqueryui-download.patch b/dev-python/matplotlib/files/matplotlib-2.2.4-no-jqueryui-download.patch
new file mode 100644
index 000000000000..9d13adb8ab53
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-2.2.4-no-jqueryui-download.patch
@@ -0,0 +1,18 @@
+diff --git a/setup.py b/setup.py
+index 41037e95d..6a438fa99 100644
+--- a/setup.py
++++ b/setup.py
+@@ -178,9 +178,10 @@ class sdist_with_jquery(_orgin_sdist):
+ class install_lib_with_jquery(InstallLibCommand):
+     def run(self):
+         InstallLibCommand.run(self)
+-        _download_jquery_to(
+-            os.path.join(self.install_dir, "matplotlib/backends/web_backend/"))
+-
++        # Avoid downloading jquery ui during emerge: we already have it in
++        # pypi's tarball. use this!
++        name = "matplotlib/backends/web_backend/jquery-ui-1.12.1"
++        os.rename(os.path.join('lib', name), os.path.join(self.install_dir, name))
+ 
+ class develop_with_jquery(DevelopCommand):
+     def run(self):
diff --git a/dev-python/matplotlib/matplotlib-2.2.4.ebuild b/dev-python/matplotlib/matplotlib-2.2.4.ebuild
new file mode 100644
index 000000000000..8db934dba896
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-2.2.4.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="https://matplotlib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="cairo doc excel examples gtk2 gtk3 latex qt5 test tk wxwidgets"
+
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+	gtk2? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )
+	test? (
+		cairo latex qt5 tk wxwidgets
+		|| ( gtk2 gtk3 )
+		)"
+
+# #456704 -- a lot of py2-only deps
+PY2_USEDEP=$(python_gen_usedep python2_7)
+PY2_DEPEND="
+	$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/subprocess32[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)"
+COMMON_DEPEND="
+	dev-python/cycler[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013
+	>=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}]
+	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
+	gtk2? (
+		dev-libs/glib:2=
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		dev-python/pygtk[${PY2_USEDEP}] )
+	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+	${PY2_DEPEND}
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		app-text/dvipng
+		dev-python/colorspacious[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PY2_USEDEP}]
+		>=dev-python/numpydoc-0.8[${PYTHON_USEDEP}]
+		<dev-python/numpydoc-0.9
+		sci-libs/scipy[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.3.1[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		media-gfx/graphviz[cairo]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="${COMMON_DEPEND}
+	${PY2_DEPEND}
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection] )
+	latex? (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/dvipng
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-2.2.4-doc-fix.patch
+		"${FILESDIR}"/${PN}-2.2.4-no-jqueryui-download.patch
+	)
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	hprefixify setupext.py
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		pyside = False
+		pysideagg = False
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup qt5)
+		$(use_setup tk)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+
+	if python_is_python3; then
+		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
+			gtk = False
+			gtkagg = False
+			wx = False
+			wxagg = False
+		EOF
+	else
+		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
+			$(use_setup gtk2 gtk)
+			$(use_setup wxwidgets wx)
+		EOF
+	fi
+}
+
+wrap_setup() {
+	local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+	unset DISPLAY
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
+	fi
+}
+
+python_test() {
+	wrap_setup distutils_install_for_testing
+
+	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/mistune/Manifest b/dev-python/mistune/Manifest
index 510c9bb15944..4f69024ee862 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -1,3 +1,3 @@
 DIST mistune-0.8.3.tar.gz 58506 BLAKE2B a4b96162514ba1b82710c9264d9005f151943d525ff7e28a2fd4a92b16d4c90818715bf851573e25be203537a3059dbec1e86c75ec0ebd0a4b164303c06d7029 SHA512 fc0b6d53e7a62712b752bff77c2529750628e9e1eeec02603bd2c793f9b0a46efe31fe7a749c5d6aae3c591d74e43c45e450179650bfb57128fb0ec366de6aa3
-EBUILD mistune-0.8.3.ebuild 729 BLAKE2B ae26e24df775cc7c8f55463b131a2b2e1d17b50860c407009a689cf7aa9a8312beae091ef5b17b79721f4c7dd002d322245a018e27388a1c476311f3d6b24396 SHA512 fda92924d8c23b35180acf598db5a22cc8d7583da04b8ee5005592f18b397680089ace0aa30077ad20904c245af59e9bbdc8753cc007eacb34716da700b8632a
+EBUILD mistune-0.8.3.ebuild 736 BLAKE2B 5907335ec8c5eff0a8cc4c40630cc9f39b32b21232b5b2e568711531ce803d86931065263122bf18ffda87712d6c1e82e998a34074f581a846c73b8e7d398937 SHA512 044039ae9aeb4a1bfc70329b9c0fee188aec3ca256bf4f4b62a18c74da5c54417b296a7126c8865528ef3178b730e6aff5c6d8d98bcbdc481e1f6deb855b4f6b
 MISC metadata.xml 377 BLAKE2B 6c495d3d88811994e4baf0aabb5267343c09162239cc655b5fe4f9b8b63df4cb08dff0186cbe6b63018eac2cc2489a3f612f72d49885df3055591da74f5fa5a5 SHA512 3630e9ba514f3f3b1ecf532ca928c3bc89c05ab50a9113ab4b1d609edf07a6421796774ee4a71cf17ea3c2939acea24e22a74f33b66fe630706dcd6482cf817e
diff --git a/dev-python/mistune/mistune-0.8.3.ebuild b/dev-python/mistune/mistune-0.8.3.ebuild
index 7b1bd6aae1e5..3d14090cc740 100644
--- a/dev-python/mistune/mistune-0.8.3.ebuild
+++ b/dev-python/mistune/mistune-0.8.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/nevow/Manifest b/dev-python/nevow/Manifest
index 665f25412406..4e7a1d646d60 100644
--- a/dev-python/nevow/Manifest
+++ b/dev-python/nevow/Manifest
@@ -1,5 +1,5 @@
 DIST Nevow-0.11.1.tar.gz 563061 BLAKE2B 7763816e44a9b388edd0a77ad3e814514ff2ed2d28c156885bc6517860e17347a946c7b890c4d0688c4c08f60d76832403a772b4754d527c575aa4d8b4f7f3ed SHA512 a7e52fbf6915498e77a41fb100d4c688fcd0567deb56ec946adf1b1712bcfbec7b7a55c551e414606218146772d5274973af7851a78878635e900a4df5193a53
 DIST Nevow-0.14.3.tar.gz 548818 BLAKE2B 64b5bd46511a4c6c10bdd4335d1e2789e7dfe22e4e4bb014c03fd4949eb701f7f79095e8a239a974d89f0831399766e1b0fad0011f102c70af375d9460a7b63a SHA512 5488be9c771dc9d9b348ee705f8cb1f47400b4789ea574f5ed68c54ecb33e6cc2928d45193137921727f560256e16716adff66ca5179d2a79eb395e0d61c2f05
 EBUILD nevow-0.11.1.ebuild 1017 BLAKE2B ca230d7ab5def154b4514ebefe66377a3e155d8a9a164508769aaa3fd94d440a57ad12ebfad04344c4660672d2d4e0ecff27a60fdd4c42d73b43f787b71566d6 SHA512 3605a23ab8ce892362679158ba6503179c385bb2a0ccd4b74df9f806517306dd55255065aeb6d70b52d20952051fcb376c017267f10ef62f36baac5285ca7ead
-EBUILD nevow-0.14.3.ebuild 1253 BLAKE2B 3586d0ad732ed6cdd6d7da690ee350cbfe3f534723b70391461d55c13991ff43b1038abd4e22a9a994a84a419ee4d28d2f6d507753e47c38091836383ce64d1d SHA512 0b8f72cb524ee169629fa728970b29f66694b5813a59714111c838a42b083086486176c2028c81419b14c5cae303fd9f26287f0433b753fa345ae996ce932d4e
+EBUILD nevow-0.14.3.ebuild 1252 BLAKE2B 1bc80e517f06f18cd268b16a621a79aab8e3a165219ef47e2882ece1a4f86b93b7e54584f16c172dc3c6a7ae13f000581add2812650e0d92fdaa1c1ff08bf458 SHA512 b8127fbf56bb3f4974ad3254719e6792da739964344e509162c05d4a0edf83500b270c7d6a9f4b0c7664c54da1032702a9320a8b5abc00c9c695fb8d2288422d
 MISC metadata.xml 308 BLAKE2B b7948b5e8794cdbcc882fcec0ec0c4d754e44232dd1cb65932a8d92193b16751bcde6c0cc4ea6f79f93083d948b9b64dfa8ea116d085cc87f121cfb9a2c1160f SHA512 f6315f9350d7d43c1c2df8665f38e6373a1b24ff9950001472333ed45aceb10fd7dcf376492643e6af0a995f561f3fa171341303a4935bd55d97ce2fd6db9229
diff --git a/dev-python/nevow/nevow-0.14.3.ebuild b/dev-python/nevow/nevow-0.14.3.ebuild
index cae56fc29565..96f269c98555 100644
--- a/dev-python/nevow/nevow-0.14.3.ebuild
+++ b/dev-python/nevow/nevow-0.14.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index f25fa7364d02..2fd5a01283d6 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1,5 +1,7 @@
 DIST numpydoc-0.6.0.tar.gz 32464 BLAKE2B 3296da3630c20eb2b1e0aeac4c5c4c912f9011cdcec0f54145532759d0b3ea7bb68529e5b3f5a1d640f3bf2e574fc03c3e7bc29f6fe1afacdcc92aadc3766fb5 SHA512 aa86854cfba93f27540eee8a7937c81fe006e1d96b556b66ac643d9673b413fac357762068ca5675f265c7d2a80b0ba000416f5ddf3fbac2bfe4315fe0f48aa7
+DIST numpydoc-0.8.0.tar.gz 20488 BLAKE2B 8af3bd363e288a66dfe84c412ba3d2a1e4afb7021f665491496374b47e0bab4756fcb5d4196abfde0e64f0acec91c18a7eb6e5314767f88e4932bfd3086e18b6 SHA512 8302c7eb6518b46823655ff26776beae35011c9842b6ed61d1db3f7ffd1f34ec695ffde0f0be91152ad59510a5904445ed6dcd877f9b1fb520adc8d9f895635d
 DIST numpydoc-0.9.1.tar.gz 27583 BLAKE2B 91764f74b35a740790efa9faade69622d48777fe97a62824b91d78ebf62f806f8c5ec34b1e6c4a4afee6e87358edfa40ca0d316ea41f7ed8501733a51797611b SHA512 85a47ed86823baa3125dde4bb2760ce56f6fed9bb29dc64187dee4101f6344b5065146209f603d50a84a5d9cf0b7f4e5134fc0b495219e68100e05e028b61f2a
 EBUILD numpydoc-0.6.0.ebuild 723 BLAKE2B fdb432d54ae15d9bf49a27ffc84e8b86936f53bd8b87dbd5e7a89596bbc7c9e7f8ea8174b56f5dc6e4ca4ef1beb11fad9f5565be88c7211a17108bccbfc40557 SHA512 cc1954e3e2f8d4e31b77fa232ea2cdb5f61193fb2c9eecc42109c47771c3063e6743d561de1e04e31da509228c159b556e793609a58724dcea8617131859064f
+EBUILD numpydoc-0.8.0.ebuild 772 BLAKE2B 4b0ee7fd692b6100dce11a4fcfcafb0c79a41fefa54b6c2254ff2bda189d7928f99aaf138400630dcadb0ebc97dd62d18ffa0267809bcee147056a47b181c859 SHA512 a36828e0d3b7cc0e6447326a507ac58f64becc7e2c551bef27e30e6b7a5a91777fbc999418bf46b2597fdeb2bfb50ba301dd015a16152b8be9473d0615904122
 EBUILD numpydoc-0.9.1.ebuild 772 BLAKE2B 4b0ee7fd692b6100dce11a4fcfcafb0c79a41fefa54b6c2254ff2bda189d7928f99aaf138400630dcadb0ebc97dd62d18ffa0267809bcee147056a47b181c859 SHA512 a36828e0d3b7cc0e6447326a507ac58f64becc7e2c551bef27e30e6b7a5a91777fbc999418bf46b2597fdeb2bfb50ba301dd015a16152b8be9473d0615904122
 MISC metadata.xml 321 BLAKE2B bbd5917a97e564f5abc495cb2632e42ab36ac1e2441be7c0a375224af7be481b00e5b8e60b6762653401021104b0094903a62eabe9a221020390a74753fcc258 SHA512 51803da4bebb8d1ac7fcc0e33ec99234b4f497a2817361032712c35ea57e9e58591fd675c9273d7627f94c60e010878b9dd6a6e8708704f36c945344159880a2
diff --git a/dev-python/numpydoc/numpydoc-0.8.0.ebuild b/dev-python/numpydoc/numpydoc-0.8.0.ebuild
new file mode 100644
index 000000000000..570d35cad23f
--- /dev/null
+++ b/dev-python/numpydoc/numpydoc-0.8.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
+HOMEPAGE="https://pypi.org/project/numpydoc/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/matplotlib-1.4.0[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 5594af56914f..91ff5b11c1f3 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,5 +1,5 @@
 DIST olefile-0.44.tar.gz 57903 BLAKE2B 2df4078c147ff737b845fe4ca57b6520c39776efe6bac399b0b8acb4ca62f946a653f85ad0511f5fa42d8b544d539474d226fe144bc2604737f3b16e5edd5ff2 SHA512 92b6ad1bced5b2c8e5332a01e5a2e59527ec2303046d0babd665b0f02fe56966574eff56619de168c50f1ea40df2e61ce589ee61b634222146d049b129514c65
 DIST olefile-0.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
 EBUILD olefile-0.44.ebuild 671 BLAKE2B 77909af03a2ba6ef299fad02513404657ab95dbf2befeeacef276cd68d350977da3ffaeb1573a62690be5ff6a944d3fc19e8a544e73dbaaff6ec9f261c9525e4 SHA512 5ae0bc6bb1689eac5efd4484d91aea838ee40bcc7d29bbc49271f776e669ffd301aa3cdf82edf064fe40d9387d69f3d37543c7f6b3e841623788d45869b6e17b
-EBUILD olefile-0.46.ebuild 687 BLAKE2B 91e22b759152ba44baebccba43ff9920ac4447bc005f9877753761682130e5661bcb46c8df025d3da5df7b2e48d3905eef06ff4eb27e7f582b12f8b9c7468bde SHA512 4d1de31dae1ba16887e6d3a03c9f61ad5f6e9d4eab33f3f43a4b4e5b2bb330421a4ba974f1e00569cbe697f49a496da21018d4ce111c1c854e9f9a88a8a5cde3
+EBUILD olefile-0.46.ebuild 686 BLAKE2B b54e99e996a20a02dc5f126c0afa83243ee802a408e7522682f50ab9e2ca80efeb5a9346dc459a529c069a74867a807b864c46c32f9fd624cdc27e091141875b SHA512 78dcc9a9d717a5464307fca3202e377fb4c24539b590420b44d121be1a888907c9609648c5046fa9003b320e77490d9857823f45582b0d3313a8dc979582983a
 MISC metadata.xml 383 BLAKE2B 45351ea99d7f164ee4e5ad18fd067d96c23fd2b6496b7ab979242cd12261fa167afc521b684b424754b8888f1a843bd42c9d15f87fd4a3c7af60148174ce27fd SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f
diff --git a/dev-python/olefile/olefile-0.46.ebuild b/dev-python/olefile/olefile-0.46.ebuild
index 4743bdef248f..bbdd0c31fa95 100644
--- a/dev-python/olefile/olefile-0.46.ebuild
+++ b/dev-python/olefile/olefile-0.46.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-python/owslib/Manifest b/dev-python/owslib/Manifest
index 6b4e9441b2ae..a62ff88feb50 100644
--- a/dev-python/owslib/Manifest
+++ b/dev-python/owslib/Manifest
@@ -1,3 +1,5 @@
 DIST owslib-0.16.0.tar.gz 658145 BLAKE2B 8e32de48192579f10515771c1682b1d1319deb8195ff9c0f9168ea82bb30bbc8bcf7c457c794a79b1121d40f3f544624f0a9789b0f6f36632c6457f396fa78c9 SHA512 a468352dfdb62bea1e6189efcc198237cb909051e51782abb15093e328ca7d3d379e88d0466e42c39ce9bc201a3be828a779193666bf9befe8d501355aaddbf4
+DIST owslib-0.17.1.tar.gz 898961 BLAKE2B e48b10a0bd9dc1e85588b8007261c47f9f754af9eeb7292d4a3fd9ce017309efbe0fc9951a42470a6938194e5903b12ffe286b140d906e1d281f5a2f739540ce SHA512 0772f7698d1d5c6989419a455e8b6d97b0fc9f04a48275b1179f5bcc0fe782620721e840969281941b0f0a3616d8220916090256bb177eff1b2a4df0e02e2caa
 EBUILD owslib-0.16.0-r1.ebuild 982 BLAKE2B adf494c1fd7c61a8f524647466874942f0675bbe8d5fe2841bf771d8e731d363e7f05bb022a129d105970f144edbf97924b57d3e5445cce3d6c2d84fc3687c58 SHA512 559e8ee627cc9baf02c25bb46fad1247c75d041833de2e219c031cbc0b1073f141898edce419c3564fe827664f3d601aab1c3d8e60e8036ca0c86cfd6d8e7584
+EBUILD owslib-0.17.1.ebuild 984 BLAKE2B 327e0538d1b9b47d2b7d10c2bcb845d2b5747de463efe2dc8fc826659e2f7588c112a503fe31f3e7e742f1889923db0c0b883a4c23df9e8eb2a5e3147309d9c5 SHA512 eae71f875c65e515edf28857796b45174ad8e695a8f2e276c9d9d185fdef3bfab8ab310b1db07dd89c4481cc9e7ec61d904ce2f785250f2d2bd3f0cca21d80e0
 MISC metadata.xml 451 BLAKE2B 82a1e52487ebd5bc2a728a26c46f8e26a15d5736da20a50fd8be71fcddc088dacfbe178ca2cdb9841418723175c0631455393e5735b78767e58287c1542991dc SHA512 7c41ce77f3d6126a0fc61c39c953f044f94c39738b4fff7c7c38a9da9c972f16957c44d60df9de59d1c03e3c5384582efa3986e7ac31e546e28fb8ad5b1673f2
diff --git a/dev-python/owslib/owslib-0.17.1.ebuild b/dev-python/owslib/owslib-0.17.1.ebuild
new file mode 100644
index 000000000000..8fa38d39c553
--- /dev/null
+++ b/dev-python/owslib/owslib-0.17.1.ebuild
@@ -0,0 +1,42 @@
+# 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="Library for client programming with Open Geospatial Consortium web service"
+HOMEPAGE="https://geopython.github.io/OWSLib"
+SRC_URI="https://github.com/geopython/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pyproj[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	|| (
+		dev-python/elementtree[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+RESTRICT="test" # tests require WAN access
+
+S="${WORKDIR}/OWSLib-${PV}"
+
+python_test() {
+	"${EPYTHON}" "${S}/setup.py" test || die
+}
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index 9754ffb07ab2..f95ee933e1c9 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,3 +1,3 @@
 DIST pallets-sphinx-themes-1.1.2.tar.gz 17054 BLAKE2B 2c106be4a8ba68c6c270035ad6764bf87c65a20ca3515991f6287e3bd6a280d3ad0df121c6bad995fe8964425bee4c6ec4d229eef15489c3ae4e4e98eebe4d22 SHA512 0537f1e24b22612720909f1e19f2893b35622411d72298a407cb19318eaf33a0f7c97ee6f69874a172c135b65c9c16726115c1decd6d7a3d6cbda3e1dbdb50fb
-EBUILD pallets-sphinx-themes-1.1.2.ebuild 645 BLAKE2B ab8bf86f00deb620cafd221563566cfdfe9faa9de98599cc9c8ffc288e32d759214f9d162f02dc88a79a764ce8225bf4d044f12aff0f4c7d195dcf186abeebcb SHA512 0c253fdc61edf79ae74f63a6c6132f2c9d2f32b57cded9696155b142696623b9144823f07525ce5f74fa647255c4435e4d041f76ef61b4c5f1f081bba2833609
+EBUILD pallets-sphinx-themes-1.1.2.ebuild 652 BLAKE2B 368a7eea0e15bc1c732842790557eda0450b3c8871d06109f7d02d848250680eff4c8cb195e9cfc8fa74155477114f57706420b9b74c90e3791bcdfb111afe1c SHA512 28d01b954b201dce3366d7e3b9a8019f5af2c9d1bbace302ef93b8113f8d51ae0d00b82e829306a9a3b53f2a0da12905436c7b2a26aa153be52b839f3c03b994
 MISC metadata.xml 324 BLAKE2B 270575fc533cde85d524756cbbe22ce43375a25f5d2b83ec37423b8af4a54fea9c679ebb66433a3c3ee090150201551c8804ff86fefe12636a6e0a83da25f417 SHA512 dd0d1c39fbfdcae041c6cccee7855d5fb6eac3037be3ac79cae0d36122f3ff75ed86c7ad63aee8a5fcebd936cfd2a03bfde52cc009655aebb1f25db77a18e698
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
index 07aca35d9dba..bbe9e6d166e8 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index f0d2cb55d053..e4d1caba3ac3 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,13 +1,12 @@
 AUX pandas-0.19.1-gapi.patch 799 BLAKE2B 801d356d51de63091c6167677957349c3334105786a220252a6fad50e0242a67106fdb321f402e7d99b65c0ab8a0c5d312b98757100bef7cc02f7f43bc50fab9 SHA512 b1a4e7c5f480efadfaf70caaa3293cb3f16ebf36c4705597a22ecc06de7e5b2379ddb4061279d669d2c66d3ef149a74f300ec1127bd441ad1b9288cb9233c781
 AUX pandas-0.19.1-seqf.patch 14381 BLAKE2B 8acb677579d429a7d82712477f8e8202561198938f56cc08c38dc3766a695a69fd3d25a25c4fa165c3f3d02a16a46acea092194e3e71f23ec22a8b2aca5f1e13 SHA512 b5675c89e087d47b94cfb036047b396d5a94b74bc03e95c92d5152bfc5598feddba88a781b6a11e533c46ba638aa50f0814d383c20d95f4e091deaee480b6d3e
 AUX pandas-0.23.4-skip-broken-test.patch 1027 BLAKE2B cf6c1d8a2a99a04a30ba989fa814b88c27c1087fdbbffcb5866d5f73d7a9f2635a3a2c5920b7fe930d9255e0566b76d425559a91d73421c43bc39c66ce31f6e2 SHA512 23bb5887f5e7f34e4b303ca9d8b35a123a64301d35c36fa9fabbde3443a2c1b69f2fefff7f6cccc217f52f26c84c3acbfffdbf6243ee53b917e294d9e5cb4d3a
+AUX pandas-0.24.2-skip-broken-test.patch 644 BLAKE2B 8a879cb0cf3f9b2e7c80a649fe37730334a6c24d130578f0febb6aceb8857db375a38e136c498d3468f664bac0499fd60edeaa49c198ccc022a49fe11362476d SHA512 b3ac2e667b116ffca750bd0abb39408c696d6e8459b5a5a83417618bdcec1724a70a0ab3e15a3b314c25de4a1bccea73c226ca7df4dd80141b4befa204c392d4
 DIST pandas-0.19.1.tar.gz 8360233 BLAKE2B 82611ca1a3e3169ac2d084f4dcd9c4d4d74e9e9c9913a41acad48ae68a208a884dfd877445a7d658a7ff098ef383cedae7e79a4900baa8d56c032ce9aaad96eb SHA512 6451990a7fae8c6db8ab0b014a13b4f1828754d3998f13c17b111f891fb9fd23f8e09b907623096dfa55668c42298eee1373210a9fddb95f56dd7d552b964e6f
-DIST pandas-0.23.0.tar.gz 13092442 BLAKE2B e11ae088c9a4be481f516d83797b1b1d5e9c82f7d9fa98f1ea65e3405e33c99e1e1cf7a35f56a21d9dc922c1d0828b4947d9c6189a5f76ad5c1b28618293f9da SHA512 c9dc7bf843e3392b8b1b4d46c6aa6dd12435aa974abc875574a7a8794abe6ea531fa92d8a635153839fd3fef9059d96a4512831b86b1fb6fb69588c8b29a95d6
 DIST pandas-0.23.4.tar.gz 10490077 BLAKE2B 28a78860e0aa5de8def7bb529fc98b9121a516b7fd7620e31e000ae14217165e6677ce26b56da0b9c603930ab1304725c644426a135d8f9b2a84921b88f3d23d SHA512 0c89db820a49e0cfb9764e64589ff9af819f9a53c01bd0254cd1b6dbd1e9fd452b2ff7c7330ede7623c7576589113e831a19a57c735562b55f90506df15805b9
-DIST pandas-0.24.1.tar.gz 11832827 BLAKE2B fd30fb736be9ac1e1778d78963ffa33e492fa27a54767c93647cef826cc95459dc97d07a88836554586c9a2db038fb2d897caa8bd1413433f276cffbdb49b1cc SHA512 15f75308f4c437ad0096c3a3d768563b071b3d8e55e1850a5ee0f980f56a9d8d1b9fed9d7707ba43e80052e6c5fea313ac1ad2687935f0ab37a16a68bf64ae19
+DIST pandas-0.24.2.tar.gz 11837693 BLAKE2B 3762e94554a3ae3c803c9a412c5c551c15a9fbf15cb05633f7d1b0ccbfddc646f68f0306666e688a83a4495b0537cea2fec671157f5a63aaa5f9cad6b791261e SHA512 0795c6bb8a47a511853558ea59d371b4540ec175f213cfba4ad2361d6481fea5d3f7074bb4961c32f2f0080a72d7436a9b3706f5cc692074f98d83bfc587fd15
 EBUILD pandas-0.19.1.ebuild 5784 BLAKE2B 8bd07ab04a4bb2ebb7f54bdb5eb13440b5bbeb6e2199584b1169739cef479d1e9a3da9e569066e4d1e3414edfa1ab37ed1238ff562783d09caefb23d7030010a SHA512 50ffc34a62f5a56927cb80213255d8d3eebbff4c9f6cf86d01b4bb04e3fbb95ffa2a124d179a814e2de4b43927614e2b94e100867f999b4aa37eeec9d08dcce0
-EBUILD pandas-0.23.0.ebuild 5907 BLAKE2B 552a809a85a1ec3842c5e3ef7da41c32b07818f11a00121eed4fe4ff3131d8e90a3f56dba4f2f546fa226e23f29da8d3827bb17f676caf654b7c1293de294226 SHA512 e1b4cce520baea14cfaf7c46e7f4ac881b6871133b13c50828ed946482b4d4f3fca688db4508007a108fd7f94997f384f6ca14eb53667e9f28e697e8d8aba94e
 EBUILD pandas-0.23.4.ebuild 5778 BLAKE2B 1fd378e985e5794f331e45741b5f2fe7380b4f0f993ff727a34d4a0879cc7dfb3ffe6c0bfb119a59ddc73fee2ef5554e31790a638673d5ee652dd1e55c0e55a6 SHA512 999dde9816f75a305e223dfcbeac0a37bd5ec084a0af24547297cb8553a57d1ed33e10279fb6a1ed43e4295c6b9b7ab805cfb413e3833d540a7090e8fe25f071
-EBUILD pandas-0.24.1.ebuild 5780 BLAKE2B 4934cfbf4056232e8ba9b4a66f5c0b51e40f3dfb876886411b1196b43a78110a01a06c5faf513e19b11d38a6b954ad5114746052a976eb2c9251c4b1169d6c8c SHA512 86427bfc1c02adcf6e23daa3979f3771dc4f78d9fd41e58f20b4089aa0c3b624eefe8b153bbb72cd41761c044ace2feaa68f820078f2cb7ed2b4ac45e47e7b6e
+EBUILD pandas-0.24.2.ebuild 5421 BLAKE2B 999cb1cbe7eb0a951870002bbd83c595433c520c55fd226149afa81d38382cc058ce0a964b259ef856d6f3ef3faa39c8c0485ea4e86fa48df19391975e0c863e SHA512 53804c4698d64b48bb816aeda8601c81ae98844cb5cdd700585c4bd47d6c674fab7ee0372342c867386f7356244aa07c83a3d2d25e6a5ab01c41e383d185e930
 EBUILD pandas-9999.ebuild 5864 BLAKE2B 23df5dc740f518ce7c82cda5d351b248f8d8e0983b937be43200f2a2f5bc6d48ea71234203fc6776f94a9460dc6e6340dbfa0248b64205eb2792a7b633ee58a3 SHA512 80c4d885b9dc3872b3da9a9daa9f18e2e1b226d249b23eb2d8b3b3161458648ebd77a2c3b17d25e58d2f278d9a9fc2372a62b946acf24bdc441da882067fee67
 MISC metadata.xml 834 BLAKE2B b075b9c90c4f1be265117df2c47ace4c86dad3fec9945b5a483a11048211348ee10e433f378610de4a9b599031914b32992b9fad693b832cf0266b0f171b3e38 SHA512 85ad67a653f4ced5fb9331b778fb2906c253874cf8e522f1b67547ef8e2f49e084e84d9e055aee7e2a57c6e6e4e7f7791a4ce299fac7c74dd6448a94977e8f5e
diff --git a/dev-python/pandas/files/pandas-0.24.2-skip-broken-test.patch b/dev-python/pandas/files/pandas-0.24.2-skip-broken-test.patch
new file mode 100644
index 000000000000..dcc61dc0cfd2
--- /dev/null
+++ b/dev-python/pandas/files/pandas-0.24.2-skip-broken-test.patch
@@ -0,0 +1,15 @@
+diff --git a/pandas/tests/io/json/test_ujson.py b/pandas/tests/io/json/test_ujson.py
+index 63ba9bc0f..854afecab 100644
+--- a/pandas/tests/io/json/test_ujson.py
++++ b/pandas/tests/io/json/test_ujson.py
+@@ -841,7 +841,9 @@ class TestNumpyJSONTests(object):
+         arr_out = ujson.decode(ujson.encode(arr), numpy=True, dtype=dtype)
+         tm.assert_almost_equal(arr, arr_out)
+ 
+-    def test_0d_array(self):
++    # Segfaulting on gentoo, not sure why. TODO: find why.
++    # Clue: https://github.com/pandas-dev/pandas/issues/22718
++    def xtest_0d_array(self):
+         with pytest.raises(TypeError):
+             ujson.encode(np.array(1))
+ 
diff --git a/dev-python/pandas/pandas-0.23.0.ebuild b/dev-python/pandas/pandas-0.23.0.ebuild
deleted file mode 100644
index 3664e9b78fea..000000000000
--- a/dev-python/pandas/pandas-0.23.0.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-VIRTUALX_REQUIRED="manual"
-
-inherit distutils-r1 eutils flag-o-matic virtualx
-
-DESCRIPTION="Powerful data structures for data analysis and statistics"
-HOMEPAGE="http://pandas.pydata.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_/}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc full-support minimal test X"
-
-RECOMMENDED_DEPEND="
-	dev-python/bottleneck[${PYTHON_USEDEP}]
-	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
-"
-OPTIONAL_DEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/blosc[${PYTHON_USEDEP}]
-	dev-python/boto[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
-	|| (
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	|| (
-		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
-		dev-python/xlsxwriter[${PYTHON_USEDEP}]
-	)
-	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
-	dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
-	dev-python/rpy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/statsmodels[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
-	dev-python/xarray[${PYTHON_USEDEP}]
-	dev-python/xlrd[${PYTHON_USEDEP}]
-	dev-python/xlwt[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	X? (
-		|| (
-			dev-python/PyQt5[${PYTHON_USEDEP}]
-			dev-python/pygtk[$(python_gen_usedep python2_7)]
-		)
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-COMMON_DEPEND="
-	>dev-python/numpy-1.7[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.23[${PYTHON_USEDEP}]
-	doc? (
-		${VIRTUALX_DEPEND}
-		app-text/pandoc
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/nbsphinx[${PYTHON_USEDEP}]
-		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		dev-python/xlrd[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-		x11-misc/xclip
-	)
-	test? (
-		${VIRTUALX_DEPEND}
-		${RECOMMENDED_DEPEND}
-		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pymysql[${PYTHON_USEDEP}]
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-		x11-misc/xclip
-		x11-misc/xsel
-	)
-"
-# dev-python/statsmodels invokes a circular dep
-#  hence rm from doc? ( ), again
-RDEPEND="${COMMON_DEPEND}
-	!<dev-python/numexpr-2.1[${PYTHON_USEDEP}]
-	!~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]
-	!minimal? ( ${RECOMMENDED_DEPEND} )
-	full-support? ( ${OPTIONAL_DEPEND} )
-"
-
-S="${WORKDIR}/${P/_/}"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^              'sphinx.ext.intersphinx',/d" \
-		-i doc/source/conf.py || die
-
-	# https://github.com/pydata/pandas/issues/11299
-	sed -e 's:testOdArray:disable:g' \
-		-i pandas/tests/io/json/test_ujson.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# To build docs the need be located in $BUILD_DIR,
-	# else PYTHONPATH points to unusable modules.
-	if use doc; then
-		cd "${BUILD_DIR}"/lib || die
-		cp -ar "${S}"/doc . && cd doc || die
-		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html || die
-	fi
-}
-
-python_test() {
-	local test_pandas='not network and not disabled'
-	[[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
-	pushd  "${BUILD_DIR}"/lib > /dev/null
-	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
-	PYTHONPATH=. MPLCONFIGDIR=. \
-		virtx nosetests --verbosity=3 -A "${test_pandas}" pandas
-	popd > /dev/null
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
-		einfo "An initial build of docs is absent of references to statsmodels"
-		einfo "due to circular dependency. To have them included, emerge"
-		einfo "statsmodels next and re-emerge pandas with USE doc"
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
-	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
-	optfeature "for msgpack compression using blosc" dev-python/blosc
-	optfeature "necessary for Amazon S3 access" dev-python/boto
-	optfeature "needed for pandas.io.gbq" dev-python/httplib2 dev-python/setuptools dev-python/python-gflags ">=dev-python/google-api-python-client-1.2.0"
-	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
-	optfeature "Plotting support" dev-python/matplotlib
-	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
-	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
-	optfeature "R I/O support" dev-python/rpy
-	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
-	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
-	optfeature "miscellaneous statistical functions" sci-libs/scipy
-	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
-}
diff --git a/dev-python/pandas/pandas-0.24.1.ebuild b/dev-python/pandas/pandas-0.24.2.ebuild
index 2d91244e9f69..98cf5b1e2c5d 100644
--- a/dev-python/pandas/pandas-0.24.1.ebuild
+++ b/dev-python/pandas/pandas-0.24.2.ebuild
@@ -23,51 +23,46 @@ RECOMMENDED_DEPEND="
 	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
 	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
 "
+
+# TODO: add pandas-gbq to the tree
 OPTIONAL_DEPEND="
 	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 	dev-python/blosc[${PYTHON_USEDEP}]
-	dev-python/boto[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
 	|| (
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 	)
-	dev-python/httplib2[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	|| (
-		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		dev-python/openpyxl[${PYTHON_USEDEP}]
 		dev-python/xlsxwriter[${PYTHON_USEDEP}]
 	)
 	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
-	dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
-	dev-python/rpy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/s3fs[${PYTHON_USEDEP}]
 	dev-python/statsmodels[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
 	>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
-	dev-python/xlrd[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
 	dev-python/xlwt[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
 	X? (
 		|| (
 			dev-python/PyQt5[${PYTHON_USEDEP}]
 			dev-python/pygtk[$(python_gen_usedep python2_7)]
-		)
-		|| (
 			x11-misc/xclip
 			x11-misc/xsel
 		)
 	)
 "
 COMMON_DEPEND="
-	>dev-python/numpy-1.7[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+	>dev-python/numpy-1.13.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 "
 DEPEND="${COMMON_DEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.23[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
 	doc? (
 		${VIRTUALX_DEPEND}
 		app-text/pandoc
@@ -77,11 +72,12 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
 		dev-python/nbsphinx[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
 		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
 		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/rpy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/xlrd[${PYTHON_USEDEP}]
 		dev-python/xlwt[${PYTHON_USEDEP}]
 		sci-libs/scipy[${PYTHON_USEDEP}]
@@ -92,9 +88,11 @@ DEPEND="${COMMON_DEPEND}
 		${RECOMMENDED_DEPEND}
 		${OPTIONAL_DEPEND}
 		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pymysql[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/psycopg:2[${PYTHON_USEDEP}]
 		x11-misc/xclip
 		x11-misc/xsel
@@ -103,17 +101,15 @@ DEPEND="${COMMON_DEPEND}
 # dev-python/statsmodels invokes a circular dep
 #  hence rm from doc? ( ), again
 RDEPEND="${COMMON_DEPEND}
-	!<dev-python/numexpr-2.1[${PYTHON_USEDEP}]
-	!~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]
 	!minimal? ( ${RECOMMENDED_DEPEND} )
 	full-support? ( ${OPTIONAL_DEPEND} )
 "
 
 S="${WORKDIR}/${P/_/}"
 
-#PATCHES=(
-#	"${FILESDIR}/${PN}-0.23.4-skip-broken-test.patch"
-#)
+PATCHES=(
+	"${FILESDIR}/${PN}-0.24.2-skip-broken-test.patch"
+)
 
 python_prepare_all() {
 	# Prevent un-needed download during build
@@ -157,8 +153,7 @@ pkg_postinst() {
 	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
 	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
 	optfeature "for msgpack compression using blosc" dev-python/blosc
-	optfeature "necessary for Amazon S3 access" dev-python/boto
-	optfeature "needed for pandas.io.gbq" dev-python/httplib2 dev-python/setuptools dev-python/python-gflags ">=dev-python/google-api-python-client-1.2.0"
+	optfeature "necessary for Amazon S3 access" dev-python/s3fs
 	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
 	optfeature "Plotting support" dev-python/matplotlib
 	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index a42e16fa06a9..dca4c02becac 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -1,5 +1,5 @@
 DIST pexpect-4.2.1.tar.gz 143980 BLAKE2B b5cb9c7847eabdf8778bddc6b208520edb9b3611d7a981fae6e371fa6deafebe142ba8361e3a1d21187cd692576c91d732f3def75e19989296f50b2a9fb4d4c6 SHA512 796474c87559cb9f4e2dfe72564d70c75e1aac4f57c4f3e4033a56c8842a48380ae0d5fafdad7f1ea6718b25c272fe4a611a59db44e69afb1f2bbf7e00256261
 DIST pexpect-4.6.0.tar.gz 148966 BLAKE2B 0ed1a3c31133bf618e4c75ea099efaa9bda9e2b7f92f46c54ad553ecc56487e5415b750334376a95599ada53e17e91efe7d4b65ad80bb4f6a1cf9d655a3c9685 SHA512 9a2b1ef19d885e69cfd17ba0519581f782574019010043e66d8b68f98ac86b359f4a1ca42f8bb0059a5dfdd43275ad93531c076cc0ac2049e109408961b46bbd
 EBUILD pexpect-4.2.1.ebuild 1151 BLAKE2B 68d394222c897ff404e9d755b0324e05b9e25c5c385657ebc19b23151266e202f0bc4957c73f115e296a072ed072309be723e3679be80afad11658059554f6f0 SHA512 723a932f09ca1b9082a3fc0c1e6c393f32aba5d3c1875e434a23a71ae274303b80ec1a3a2aeaab0e0b84b05909815063e7be0fa80898c1597ab99f1247d8c7c7
-EBUILD pexpect-4.6.0.ebuild 1161 BLAKE2B 8224bb18c88def3b3b7c1ef3149cede727aebdb3231ad62e97b613c1bfbb852dc806dfc1a14ba197cad809a6022ec3c0dd11e2539c543d1d1bdcacc11ef48bdd SHA512 008d4b3d3114bf7c4b7c45f4204fbfe721dde47b05f9a8a2beb35f0c9bf4611fc2fa2041136b474d67d498d4c4dfaeebd2fbd2758657114697125bc678236a76
+EBUILD pexpect-4.6.0.ebuild 1164 BLAKE2B 6dfb7eabe320e7f32b0298d8d2d488201f14f3538086f7d5fda6838427ab328346d0a2c2d99dee4f235f74c6ccc03aa51a04f1efe8408f30e5f42c232d302401 SHA512 d0db5239cde3dc6aada5f2676018809df0f4fdb47c19fe3eef7afc50d5e021e3bd95e642c8a0ca332f7227466b0c988e7787c4c64c71d6e4f7ee54f4662431b7
 MISC metadata.xml 377 BLAKE2B 72c4b35c12a770df9344987af8c7a392c3aed05296a4876902987ef946239f8318ee833cc81a7f004719e954670a83e84a3813bcdaac48912efad885515de1ea SHA512 31e65b2ce9ec12e9d3e95ed651841b8aad6a24330fe20b4bfd6351267423ff5005ac3cb2e89dbb8f024cf60705d3f06a8a1309169a029eb5246ddc45a8d76464
diff --git a/dev-python/pexpect/pexpect-4.6.0.ebuild b/dev-python/pexpect/pexpect-4.6.0.ebuild
index 24350bf1a2ca..d5596edcb12c 100644
--- a/dev-python/pexpect/pexpect-4.6.0.ebuild
+++ b/dev-python/pexpect/pexpect-4.6.0.ebuild
@@ -27,7 +27,7 @@ python_compile_all() {
 }
 
 python_test() {
-	py.test tests || die "Tests fail with ${EPYTHON}"
+	pytest -vv tests || die "Tests fail with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index f01308ecb0b0..c79337e5fd26 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -8,6 +8,6 @@ DIST pillow-5.4.1.tar.gz 15799745 BLAKE2B d9e3851a80a1f94d7292852b9ab806d9a26870
 DIST pillow-6.0.0.tar.gz 29205509 BLAKE2B 83e2d1abeea468b7bf344ea5003940b14d6c69649e02a954c0b3810fc5d77288c361fb40747171176d29843848d802b783a2b0c0de15476462f17f15552298fa SHA512 c5fbe1432d576fe4a70a15fa7a70a446ccbcb247fbd4c3605917fa26a6345eb9319c0153dba7637d521c358963f2f06f525219aa1af1502da2565d54dceef4c5
 EBUILD pillow-3.4.2-r1.ebuild 2493 BLAKE2B 01326658c00545bcd6162167e735c4805b3b4ceb159a24f2b76c993edba56bfee27ea51b5bcd3db401f07f3ec794286042f603bc03e9a4c41934fd0073ddcd43 SHA512 88c6758dbd10f8c9e5ad8637c3bd14cabf8c66d9ea8fafa5e7d824d460c1eb4e2ca209832018acfc654c17550199df6fddbc14fc3b44c725dfe0690a70ed520f
 EBUILD pillow-5.2.0.ebuild 2730 BLAKE2B 66971c9af9b80aec5c5ae0350ff662f5713d0c710d157e002e717c9a40241c41480549f81c2a73490601003d95f9106e4131d940acfdf847dae6fc7066ddb4ab SHA512 7a7eb96105c19d993fc94c4f7fcbd1b514322ed5f360438c78a668483625bbbc0ebeabfbff74a44ba10646302f889807958075fb2d215a81b230fa4ecea5508f
-EBUILD pillow-5.4.1.ebuild 2773 BLAKE2B e28c68be045661b95d526782ac3c48f7d6b98d5c4bb4248c29b69821a0b281f532e3fd2ac6b56f8d0817e89b909c0e1805e104e734881f332c5b7c14fc1ff884 SHA512 67c3d3f69a1c31866d44c4c28bee9a8b1a4acde66d9318924cc6719f297fe9942e28fd105ee9748dbc4b281f03345f1e1ea4db9f1331505c667378c2fd82eb84
+EBUILD pillow-5.4.1.ebuild 2772 BLAKE2B 1d30c0e4ce03b07c85809a92ed4e38660269dc2bf3b0948fc90a1e914575c2e03deacdee8dc4f409e6afa5c91268184a1bf1f63a0c1b7066f9e99f4562fd7fde SHA512 82944ed9e754a04b8507e606b7bb7933d045f9f59eedf7129fadbdf9aa2933920105f9f733f28132a45d29aa751ac6c27d27b606fecd2ed7f463e64a9428b72f
 EBUILD pillow-6.0.0.ebuild 2774 BLAKE2B b8d9dbde95457718d05fa1ad8de4b4a73a076ae602730fa18f906f6cf63aa314ff350a8c7ad82e989ebfdd50fa1743a8b080907a460ea35cb901f4e7ce844f43 SHA512 c8b0b69c867fcb95b78abe510b257747805b0edae6f78c28858bc92d87c3b3496c9af8b1de9b81fa8055fe76816879530d47b8f189f07333533477b7bf357089
 MISC metadata.xml 590 BLAKE2B 085c6481058e0ccc50934eaef9ee5fe97666c067f847eef8f569af8d5f4f41fe5934d77cdcb0679f24a4ba411bf1885e03c74f365919080e86a4f8a434d2da8a SHA512 13e51fa5ba4ce8e0ed0f81b0a1d16ba8be875a24c9e93dcc87f08724a151c90ff40c8a9e09ee69143dc4400f067a7de90324ddd5a90c8d33b1d818a716194e9a
diff --git a/dev-python/pillow/pillow-5.4.1.ebuild b/dev-python/pillow/pillow-5.4.1.ebuild
index b0cdce4d7289..cb21964b2e22 100644
--- a/dev-python/pillow/pillow-5.4.1.ebuild
+++ b/dev-python/pillow/pillow-5.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+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 )"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 1b4b689ddbc4..079201697a35 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,15 +1,18 @@
 AUX pip-10.0.1-disable-system-install.patch 769 BLAKE2B 9e722c95f01a184bbc48df6979cde15d748311e5ee5d83e5d18659cffd7520145bb24af891ba0f760dcec4c17b17d31adf211f1a4f938598d1fec44be56e6891 SHA512 6b0d49d398940f2614b2a892be2169a6c2c2d26d7d700271df3819c71c284646cceac9dce4e907662690e17bc0ca372b6251e02f520bf3e60994b26725403029
 AUX pip-10.0.1-disable-version-check.patch 850 BLAKE2B 4ec0e8e0b172c51cdfa2df6ee934df8e25a03885ef7976c2f7cc844728e0359a1d5081296680576ea5780a15b639b3809063e663374ee11e252cd95bd9e876ae SHA512 b489eaf4fe17042807dd92ce77b016fcd032dd79bd5c766bdf9be38d2958e32400bdb5950ff2c400abac42d2a0a17803f5a2cfdc1161906c95c1d34a8bc83f8a
+AUX pip-19.1-disable-system-install.patch 795 BLAKE2B 03cf006ae4482d530a614d4e0b9b5420d924835c88118ea895bbd7db69faa07867d255585fe9b49ea6d81d9689324f1a4844bd2badf3a1304ad748db6c2d6aeb SHA512 fe6bd65e73ed389173b636e339c58de58a96ca6c6dece93e8e5c3178d0c1fcbe2aa5019efba34831b54b09aed956a186604f44da7a50026ec3bf5fad425eaf87
+AUX pip-19.1-disable-version-check.patch 782 BLAKE2B 3dbd3472396edd592d79b418c0c76a2d71cde8557e2c5598bc061c618a7f0028fb086afb7e28e5c051075b65abc65e3568d3ac0c85335d0f8a3db6ad44795ad2 SHA512 ad65449df3e68e406052e21b6349d897dd988a0a257f4ee92032b8c0607807a4427e04d22b32bbef12b3607364299f8521d3c5a6774e32886a665b315b0b6779
 AUX pip-6.0.2-disable-version-check.patch 465 BLAKE2B e3ae94267a8d0caf425d22968f6e640063eaca0d2c475d130d1d2f7281d6ef541c0c36c3871c67fd4947f54a4ca18cc9a9c0fa347a3960727483b3a3bcd46ed9 SHA512 fd3413fea4649aa6a34ff7a23e7442267dc07307aeb25398e4620d108ab144703db7431e2a158612d9ee67e448d1d66db7e8103364aa6635844672bea16c7d28
-AUX pip-7.1.2-unbundle.patch 1496 BLAKE2B f0bb71125270bbcfe1fe544b81130951c6ccdb97f676b3be5c7831efdedae5edbc47669836565b269af287910cd23cbc193037b39ac09dcaff5dceee542c32e7 SHA512 c0daf49d9a596a188fd54751b8ee7333f1c3187657b677a6f61ab9820483b388c3475b5fecb887115aaa34208070a15b56a8eb5e0a4639c3732840cf17a6f16a
 AUX pip-8.0.0-unbundle.patch 1985 BLAKE2B dca355b40941ef5f805a4b247d75dc9d2ad560c7fd9752be2ca1d428522e83a4c318d3d361d2960fce79051df2ea9180a48c23e4af3048fe31ac535cd0cb8db9 SHA512 3b5f96160623eb2fad9c5978fc6512b21d48d5b91cb09c9d43deaee6de3c843af137a5df11c83b0d8395625482162d8cf40748b072692b305d6ab1220f3fb0c6
 AUX pip-9.0.1-disable-version-check.patch 1031 BLAKE2B 148e528aab19de021f193ac56d758c803e0875b618ee32e948eb103eb6b05eb56e2ecf5ed4dbe39893f5c44ddee17122fdd686f433f5ce89044b2c02291e0ba1 SHA512 8b5764d3ecdbfc871bdf051b41d9610d5028bc3b95a4bf990db46325d10e5d559449ec97ab052686148d6ab6abfa630fb38101c726b6648d19fa94ac593b0a28
 AUX pip-disable-system-install.patch 1070 BLAKE2B 85bfd82888a169cf771467f4f811b9859fddc1cfd134ac21be42b9fd93d84118354fa23a2f4b0ec9c67024f571ba7035665302671420221b52f3fc89f24b1af3 SHA512 bb0a9a32b2eac0a12276c3f0527534226c03868300f54945d20eec16902ad51cbfdace9d79b0caa304bc641323194031a5ca9e5e784366a44527441bd0f3c231
 DIST pip-10.0.1.tar.gz 1246072 BLAKE2B e08607be43e1d7b9c7bbc12dff73bc3170953f48f8f7439a0b27b9d540f23eb3bca7873211a5f1448b5cedd6e8e12983af6fa4666bba3ac4700059d170036733 SHA512 983cce8375ff0304263209c69be16e5be7a58af340b8c3ffddd64fcea130b2f8f8a98305ab31e9c3eed9a0d039c73777c88bde3bf2ea1e184fa3e0a2faa97fd4
-DIST pip-7.1.2.tar.gz 1049170 BLAKE2B 1461abba4cb80a9a4e806675ca2d996dedeeb8fb38f05b618f98f400475405da018ea6e75663c21b7b7eb5091408d602a3127afeea9a4bd29f075e5eb8042ad0 SHA512 78082afe6b559bf87f91ae9b6d304cfbfce00206e09be42fdae9d449a55cd8d968df6873e834191d0b0e6baae29e72eb3eee42386ff7c5dc9c29b6c28b754449
+DIST pip-19.1.tar.gz 6320747 BLAKE2B 9b69fcdef751d6938a7c67f44692afa7088f660ab1e0ae113d21d0f48b4e29f43e0f0bcc137cf16ac0324ea3b500bd2a84234823f8d82556d6727f68139aab4b SHA512 0d2442c22c41133118353ba98f45260f0615a891725b2a069d8fbf26ec4033cc7297bb671944c3dcc1f68800b91e92e58fb407ca5a333382e20ac4bb5c9e0cb6
 DIST pip-9.0.1.tar.gz 1197370 BLAKE2B 3618161690d5e0a38d141f9b51baea4aaa3fdc225664ef180bbeecf6e2df95e9ea4f97c63fe3a68f84f4fb5ebcc74e316827253c7e07b03565e58113bbaa918a SHA512 ee59efb4b009ff6543b7afdea99b9cbbee1981ecc03af586acda76674024d3b66dab23049e68f3da9448734984619fc1eaba6e965c9dd3d731973376c8a42e25
+DIST setuptools-41.0.1-py2.py3-none-any.whl 575966 BLAKE2B 332986453a35e4ec36ab2bdb80a8b0a70ffe4fec1bb874f481b0d8e31016a26d53070f90d0eea9030b8c48a1f9bc21a54d8a5a2b70096e1f8db84d42449903e4 SHA512 c84ddf1d1ea90216b2c475f3e4879f4e6792a859adf61db70d67f49a35f2cb4df6fd6d93049881e6d2a8d914768edfcd091475206bb5da3ac66c41c4b9147102
+DIST wheel-0.33.1-py2.py3-none-any.whl 21496 BLAKE2B 41bb9ed91d43f94209a010c286d541da9d68b9e727ec8a339fe3c24fb806746b1de5b62c6cd26d2c2841be17406e1f99353b6d172f5258540faeba014945e9e8 SHA512 761ad8cb96557b146642871e1f8ce75849a9828193d992a19d072236b9f8452ab54907a3b82bc7441f75f036155ae21b7450120e0c4c19aa5100b58337945ac0
 EBUILD pip-10.0.1.ebuild 1370 BLAKE2B ce5cb9a267f445b689a017e22b69e8be077180110b45b4d32de6a2ac4c1a753f674d79a751e2d9c51aac20b085f1765cfab294d36ca384bf7cac8546e7c1fab0 SHA512 fb02b5083dffb94195e0f74bf782900f01a73de888d27f76ebb05093b337ae81418939c86062f78556785d6871dc7018c271387dfe36296d0a47701f1ca10828
-EBUILD pip-7.1.2.ebuild 1949 BLAKE2B 51fa70b84275208773cf9b396b5869ac3921c9c876680809181c64cece9803a5ef7ba188e9f43d1b2ee7d31a8dc97a771058dca5e5e37d27e0c5a54b0ceca603 SHA512 10284dfdce417a28d97e05d0a49d88188814df5c46be6f460de904769589e836400cb32aa8aace1e89d35d12bdef2c817c4f8798f5efb45bd4b1568fe1ed1716
+EBUILD pip-19.1.ebuild 3466 BLAKE2B bacb2d202d0243ec857bdb08ed34463b909c52317e01a85054df5503c4cb455eeff480b54d081ae42801a07534f1aa130c1d311da1ffa9b383fd22c6a5c769ae SHA512 1da575a34e7dd620f31853fcc9af4eea7c32626f5a3bd6b2fcb8cd421a6bb0168fe1df6b1f16f34dc39c9cec5a61a9eeddfe3dd0ea18dc661215d5c37d929550
 EBUILD pip-9.0.1-r1.ebuild 2331 BLAKE2B edca4ecfeac1bc3bffbb066b83fa87669304ccd59dcfe165fd4cb207f8155ba2836df80a2e15c954ae5513b060fc9bab1df1d5a15870815f199bf51e19781b50 SHA512 711042823b41c10c1db502afc046424c71f081c38dc173e5bc06d58de5ca57f2e3106d4ef24134f8e79e557228f63f49c91eee1e037a2416cdfdbb592fabe221
 EBUILD pip-9.0.1-r2.ebuild 2486 BLAKE2B 6603040dcac85d4ef25da1dc4c2d16ce95a596154cffc9e28dffa3599a6a63cbb2cf61acd6f21a02d41cb3c33cd296808613f274d562292504e319cea9983b14 SHA512 65c03aea96b4e5f76cb26b4fb0f1da824ec670a87c0cbc2965730ff0292b84874abaffc8aed84d469dd19d97c0816f2ae8550af04340f64885551b7a1c6223a7
 MISC metadata.xml 366 BLAKE2B 6cfb3fe9bd6fa72a5bc5aafb74d7f79eaa1fdf273cf45be4fb7989fd917ea8b1ad60a855770cc51944611e7590abeec450ed02c7c9ae8d850084c2b4f7c0d009 SHA512 43ccb12f2797cb70b59ff495d149c32c813e5145c65521eda9a86f675eac7756eefadeb9f4ca977e8e8c7019bae144b445240e6d7128da771eaf6d19559336f6
diff --git a/dev-python/pip/files/pip-19.1-disable-system-install.patch b/dev-python/pip/files/pip-19.1-disable-system-install.patch
new file mode 100644
index 000000000000..bc88ef715a2e
--- /dev/null
+++ b/dev-python/pip/files/pip-19.1-disable-system-install.patch
@@ -0,0 +1,17 @@
+install: Raise an error to avoid breaking python-exec
+
+Running pip without --target, --root, or --user will result in packages
+being installed systemwide. This has a tendency to break python-exec if
+setuptools gets installed or upgraded.
+
+--- pip-19.1/src/pip/_internal/commands/install.py
++++ pip-19.1/src/pip/_internal/commands/install.py
+@@ -246,6 +246,9 @@ class InstallCommand(RequirementCommand):
+         if options.upgrade:
+             upgrade_strategy = options.upgrade_strategy
+
++        if not options.use_user_site and not options.target_dir and not options.root_path:
++            raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec")
++
+         if options.build_dir:
+             options.build_dir = os.path.abspath(options.build_dir)
diff --git a/dev-python/pip/files/pip-19.1-disable-version-check.patch b/dev-python/pip/files/pip-19.1-disable-version-check.patch
new file mode 100644
index 000000000000..a46a47f0fc68
--- /dev/null
+++ b/dev-python/pip/files/pip-19.1-disable-version-check.patch
@@ -0,0 +1,19 @@
+Don't check for new versions of pip.
+
+--- pip-19.1/src/pip/_internal/cli/base_command.py
++++ pip-19.1/src/pip/_internal/cli/base_command.py
+@@ -213,12 +213,8 @@ class Command(object):
+ 
+             return UNKNOWN_ERROR
+         finally:
+-            allow_version_check = (
+-                # Does this command have the index_group options?
+-                hasattr(options, "no_index") and
+-                # Is this command allowed to perform this check?
+-                not (options.disable_pip_version_check or options.no_index)
+-            )
++            # Disabled on Gentoo
++            allow_version_check = False
+             # Check if we're using the latest version of pip available
+             if allow_version_check:
+                 session = self._build_session(
diff --git a/dev-python/pip/files/pip-7.1.2-unbundle.patch b/dev-python/pip/files/pip-7.1.2-unbundle.patch
deleted file mode 100644
index 70adc20ead53..000000000000
--- a/dev-python/pip/files/pip-7.1.2-unbundle.patch
+++ /dev/null
@@ -1,34 +0,0 @@
- pip/_vendor/__init__.py | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/pip/_vendor/__init__.py b/pip/_vendor/__init__.py
-index ef8851d..349d022 100644
---- a/pip/_vendor/__init__.py
-+++ b/pip/_vendor/__init__.py
-@@ -14,7 +14,7 @@ import sys
- # Downstream redistributors which have debundled our dependencies should also
- # patch this value to be true. This will trigger the additional patching
- # to cause things like "six" to be available as pip.
--DEBUNDLED = False
-+DEBUNDLED = True
- 
- # By default, look in this directory for a bunch of .whl files which we will
- # add to the beginning of sys.path before attempting to import anything. This
-@@ -29,13 +29,10 @@ WHEEL_DIR = os.path.abspath(os.path.dirname(__file__))
- def vendored(modulename):
-     vendored_name = "{0}.{1}".format(__name__, modulename)
- 
--    try:
--        __import__(vendored_name, globals(), locals(), level=0)
--    except ImportError:
--        __import__(modulename, globals(), locals(), level=0)
--        sys.modules[vendored_name] = sys.modules[modulename]
--        base, head = vendored_name.rsplit(".", 1)
--        setattr(sys.modules[base], head, sys.modules[modulename])
-+    __import__(modulename, globals(), locals(), level=0)
-+    sys.modules[vendored_name] = sys.modules[modulename]
-+    base, head = vendored_name.rsplit(".", 1)
-+    setattr(sys.modules[base], head, sys.modules[modulename])
- 
- 
- # If we're operating in a debundled setup, then we want to go ahead and trigger
diff --git a/dev-python/pip/pip-19.1.ebuild b/dev-python/pip/pip-19.1.ebuild
new file mode 100644
index 000000000000..643cf0978c13
--- /dev/null
+++ b/dev-python/pip/pip-19.1.ebuild
@@ -0,0 +1,97 @@
+# 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="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+SETUPTOOLS_PV="41.0.1"
+WHEEL_PV="0.33.1"
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/"
+SRC_URI="
+	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl
+		https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-${WHEEL_PV}-py2.py3-none-any.whl
+	)
+"
+# PyPI archive does not have tests, so we need to download from GitHub.
+# setuptools & wheel .whl files are required for testing, exact version is not very important.
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test -vanilla"
+
+# disable-system-install patch breaks tests
+RESTRICT="!vanilla? ( test )"
+
+RDEPEND="
+	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${DEPEND}
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		<dev-python/pytest-4[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		<dev-python/pytest-rerunfailures-7.0[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		<dev-python/pytest-xdist-1.28.0[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/scripttest[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-19.1-disable-version-check.patch"
+	)
+	if ! use vanilla; then
+		PATCHES+=( "${FILESDIR}/pip-19.1-disable-system-install.patch" )
+	fi
+	distutils-r1_python_prepare_all
+
+	if use test; then
+		mkdir tests/data/common_wheels/
+		cp "${DISTDIR}"/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl tests/data/common_wheels/ || die
+		cp "${DISTDIR}"/wheel-${WHEEL_PV}-py2.py3-none-any.whl tests/data/common_wheels/ || die
+	fi
+}
+
+python_test () {
+	# Exclude tests that fail for some reason. Some of these failures may be Gentoo-specific.
+	python -m pytest \
+		-n $(makeopts_jobs) \
+		--timeout 300 \
+		-k "not (svn or git or bazaar or mercurial or test_pep518_uses_build_env or test_install_package_with_root or test_install_editable_with_prefix or install_from_user or install_user_conflict or upgrade_user_conflict or build_env_isolation or config_file_venv_option or get_legacy_build_wheel or install_user_wheel or uninstall_non_local_distutils or install_from_current_directory_into_usersite or uninstall_editable_from_usersite)" \
+		-m "not network" \
+		|| die
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
+	distutils-r1_python_install_all
+
+	COMPLETION="${T}"/completion.tmp
+
+	# 'pip completion' command embeds full $0 into completion script, which confuses
+	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
+	# This trick sets correct $0 while still calling just installed pip.
+	local pipcmd='import sys; sys.argv[0] = "pip"; import pip.__main__; sys.exit(pip.__main__._main())'
+
+	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
+	newbashcomp "${COMPLETION}" ${PN}
+
+	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
+	insinto /usr/share/zsh/site-functions
+	newins "${COMPLETION}" _pip
+}
diff --git a/dev-python/pip/pip-7.1.2.ebuild b/dev-python/pip/pip-7.1.2.ebuild
deleted file mode 100644
index 00409bbbfcfd..000000000000
--- a/dev-python/pip/pip-7.1.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-# Check pip/_vendor/vendor.txt for this
-VENDOR_DEPEND="
-	>=dev-python/distlib-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-0.999999[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/CacheControl-0.11.5[${PYTHON_USEDEP}]
-	>=dev-python/lockfile-0.10.2[${PYTHON_USEDEP}]
-	>=dev-python/progress-1.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-15.3[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-"
-RDEPEND="${VENDOR_DEPEND}
-	>=dev-python/setuptools-18.2[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-# required test data isn't bundled with the tarball
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.2-disable-version-check.patch
-	"${FILESDIR}"/${P}-unbundle.patch
-	)
-
-python_prepare_all() {
-	mv pip/_vendor/__init__.py "${T}" || die
-	rm -r pip/_vendor/* || die
-	mv "${T}"/__init__.py pip/_vendor/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	"${PYTHON}" -m pip completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	"${PYTHON}" -m pip completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/plyvel/Manifest b/dev-python/plyvel/Manifest
index 8a5294fb4b50..068e4439d176 100644
--- a/dev-python/plyvel/Manifest
+++ b/dev-python/plyvel/Manifest
@@ -1,5 +1,5 @@
-DIST plyvel-1.0.4.tar.gz 338470 BLAKE2B dbc33ac9962ed3b74d83158e973ac956bd9fa81c7e1980c1d79187f6e629d0605d821debe4bfd4532120f343b87ee3acd825514884d78b471d3717364837ce42 SHA512 ee397d4f7e2dac4e7b382841559895184dc0356b84da4ff4ccdad43c32aebcb1dcc5020230a5564c875ed5d4401cc8b009438ca3b2e0b50e6467e384f0366171
 DIST plyvel-1.0.5.tar.gz 143728 BLAKE2B 2eac687e6901381b62df5278abe00684c8e5a9ac162596a1a1a0e620536155b5e5c0ba0ab9bb32c1d3a6467d997cfdf530e9275024f8caba3323728f3f3aba67 SHA512 d2a7fe9d49b377135ece03292f366423e9550d3440689a99246d8c5ddc38e474c2b05c709655c6bf74a1d04f742a23dfb8841b51698c2adb062418577b28c4b4
-EBUILD plyvel-1.0.4.ebuild 1221 BLAKE2B eddf934296dc3e6490496d2e810c08e86d328af30d0b12165e9bea4bc30df5f48f9c3d7ab0f8efb2e75c05717677017270221e020d28816102f6ad30693e5f70 SHA512 8d32214097c23dc5c55e71c1e4f7c6cbca61bf9c9cca8b8fa175591e7c52413ea6f0453e0bb83f6a6fe9a11b08ecb235ebfa501c02378b847a7100750e03df51
+DIST plyvel-1.1.0.tar.gz 143970 BLAKE2B 980c8117f39c704abaf1733bfabb6816aa84e5e449ed37368038a7d6cd4cbbbf832319bf149ec6ae7cca5074984427df08afc50e033451d3d97ddafd210d91e0 SHA512 4d9b20f7e047d75af14d530519b4360194a18aa423a57ac4596441e47528bbc9f8e3ff763dd91da4c115cb1e4a6f34f01bbd47f4be49be110b2f6e3c7b8bdb3a
 EBUILD plyvel-1.0.5.ebuild 1223 BLAKE2B 8f02c3d27461bdf1f9ddc6556416fbe0756889edc82e49e73185a9157640398cdeb1e3dfe3aa6f06fe481f839420c234cef49728d348ad3830064793795ac3ff SHA512 7db9aed0c3218d13ffab9cc3bd9785f83a0993fa20857c85de35a8fa977f518ab8ff3fd266c1a37c7aa2af6954eae202059aa89af0e68c0700a9e20415df9450
+EBUILD plyvel-1.1.0.ebuild 1226 BLAKE2B 2d534af7208c2815c5b2660a5cd11dda3464a8822489f762874c3647b65ee6260843a283b76d27628876f79b924bea3492bd9858dd410eab58cbca176f7bef2b SHA512 282af5668a4a3fe009e360f52fad176b1baaa4ad43fd1b0f6b13a39415f728bdd961ee281d324cf01d007f77e17e5fc785fee0cf939e2332019c0a0c63641a64
 MISC metadata.xml 432 BLAKE2B 5ff794b8cd6bb312ed6fc0a3ef74ab6a89be65b45d90fee726ec4350f702b45e46da69c35ac2fea606bdd2b7cc87a9d360ce03d101b4243950cbd54567a772d7 SHA512 fbd7143b819341c3d6686e6861b5c8642b6e18f3e0c73b0ab0221dae9f074fba26d7792f41a23a67074679594ed2739a9a6926124365c1fab88765e51915f288
diff --git a/dev-python/plyvel/plyvel-1.0.4.ebuild b/dev-python/plyvel/plyvel-1.1.0.ebuild
index c30bc2228a81..be42e6254e05 100644
--- a/dev-python/plyvel/plyvel-1.0.4.ebuild
+++ b/dev-python/plyvel/plyvel-1.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # Tests fail with PyPy: https://github.com/wbolster/plyvel/issues/38
-PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{5,6,7}} )
 
 inherit distutils-r1
 
@@ -44,6 +44,6 @@ python_test() {
 	# We need to copy the extension to the package folder
 	local ext="$(ls "${BUILD_DIR}/lib/${PN}/"*.so | head -n1 || die)"
 	ln -s "${ext}" "${PN}" || die
-	py.test || die "tests failed with ${EPYTHON}"
+	pytest -vv || die "tests failed with ${EPYTHON}"
 	rm "${PN}/$(basename "${ext}")" || die
 }
diff --git a/dev-python/polib/Manifest b/dev-python/polib/Manifest
index ae72fbec302c..c354764a939c 100644
--- a/dev-python/polib/Manifest
+++ b/dev-python/polib/Manifest
@@ -2,5 +2,6 @@ AUX polib-1.0.7-BE-test.patch 545 BLAKE2B 800372796d19d98f47dff73ed593dcbe8a60d5
 DIST polib-1.0.7.tar.gz 156282 BLAKE2B 4d4a9f9901fe7b7b7aa5fc54b9391e051b8d02d1749752e1c9a563d9285670db5d43d7c5015fe266f78c89d1ff7a334bd2afe2d7d8b68fb376df35f8902cb0ed SHA512 bfec3538f9ab499ff2149bb40e0685b4cb6d5f0bc7ce8dc33e1fc511a6169e01c1a317e652daed7b3bfd9bbfe6ee1d545b4d8913f54e91504c4debb5b1b94b6e
 DIST polib-1.1.0.tar.gz 158484 BLAKE2B 41766f00e3928eacf3c98406b6acce224f0d0cb44d79326c834db900ed8b91181911ab7e26845a737057dd07c067a784d0b06278952708c17888db42d8c1e303 SHA512 74681585b4d7252e107acd7d73f49f7e91c90adcd180722d39d35c40ec158434798af0124a16788cf564c73b84f52a040aefeb58355a1a3cd85848c3f6a5e67f
 EBUILD polib-1.0.7.ebuild 842 BLAKE2B 90516dc6a38bafe56cb80a778f8e352cead7af9039c65951ab2d0c4a1d909a08444ce1ac64c23e8e409a15f2e04aba4e26542512498ad30fa15e874c3a05febf SHA512 4d21d499a37b41ae378432b2954a238ef73cd163fe71472534521bc1b303dc0bf3269da2cb9b151f929a1f9dd7e563df5d8fb6bb0a210a6c75350ec58f80bba0
+EBUILD polib-1.1.0-r1.ebuild 859 BLAKE2B f78d819212e1643f5588bb3c0326061046ca448286fd03cd5bd1e119dd67434c51285eecda3715f78bed961df220949880440ea500fdd40ad17674012c1b4e29 SHA512 57ccd7e5ff75462ad47d2849f6c8b355508ba9742b0ba84aa96789f5dafa2830af386671b5ee3f6015b9ff5cd3b457b68b870e28d9bafbb3925ee04eb350c19a
 EBUILD polib-1.1.0.ebuild 857 BLAKE2B c47a55c248b5989065f58790204368a894249c9fc9db31053e49740a4108e9fb067f20e54ce9a8b02192968ca952021c83c5b3dbc7df2b1dd184302ed06884cb SHA512 4e80bb72788255b426b62b684289b75e9c09e3215913bf0ce188b65f3beaa7d27c002f2a9dfb4b0f2049a50c394cccebe42086d3872189c3ec95a9beced485df
 MISC metadata.xml 294 BLAKE2B 096af7abe45b2be00baf31d9a8eb7f9606c817c48e08fb457961b48c533b6c35c5acdba95420d7a193c5a216f3d46aa512ea54e0a2ff45f9173e76720689b99f SHA512 f5fe76b50e225e8e3f3e4d745c7e49b0056eac52b46c0a51cd552ffffbf915b5035d5edc2428c15e6497a054bd475eff39ea19a5c3e79eb2f087ee8ee0565099
diff --git a/dev-python/polib/polib-1.1.0-r1.ebuild b/dev-python/polib/polib-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..6873694edef0
--- /dev/null
+++ b/dev-python/polib/polib-1.1.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to manipulate gettext files (.po and .mo files)"
+HOMEPAGE="https://bitbucket.org/izi/polib/wiki/Home"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.7-BE-test.patch
+)
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" tests/tests.py || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGELOG README.rst )
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 0f4c1c4a96d9..b762ea678ca6 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -9,7 +9,7 @@ EBUILD psutil-5.4.1.ebuild 780 BLAKE2B a7f057f879d789cb729f832ca0116b0ce573d8a8d
 EBUILD psutil-5.4.3.ebuild 808 BLAKE2B 57449207dda0dee16d1adfe47de968ac0fa0ea950468472c1dc5bf2979f22fae055768b59c738b1f0a18eea84fdbe91e8dfb895712c44b0da3c9d435e74afe80 SHA512 e5a320d4c71c45a3428d1d3aa8ef13b06c06e99da5d637b9a48e2bf4c377f42f07a6bf8932c4705ecb202cf0d0797d9dcd391da0c0d9922831d595c1089c5c4e
 EBUILD psutil-5.4.7.ebuild 916 BLAKE2B 1222075bf9ddbcfcf2974d16febbeba61796fc5e328c684690484b8953f70b3605426f6981380561189fc63fef8f1a160eddaa544ab02f3535f4b5375773b9b9 SHA512 e1d7de9fd50a3f3e007eff5c8409b05024800f0bc27e1a40cb19d29b5df6b2bb06a8af638fb7c791975536cd204897f0739289ba18706527c693322945038e2e
 EBUILD psutil-5.4.8.ebuild 930 BLAKE2B 2f48bb0f662f1b7536b5ffd242d4c4d2e4ea9878d76aba0008125bd820e0c9dea28b01c4056c44afcf74a51a4d999b971d7a74d64d60d1ac36cd29ba28075fb4 SHA512 0fc2d19616f39b9aaf71a07b9a0ec203c33433bf74b7336bc48f2925715921a2ae4b3a84a3760c9e37fe5e3bf3f44551f1615d74e67c45098e66f662d9ce8792
-EBUILD psutil-5.5.0.ebuild 922 BLAKE2B a629a8d00c79137aad176a4898bf4a96ff3e7fc01c4adb2571069b1b5c8571ee8eac608ada9e405045fc8565905ee357e4d1e3b150e374c02035df509a1ef6a4 SHA512 c7a7dae5a39a472259d6d4ae3d268c94d19eb01ec736f34ce0e35f2b741a2887722a1323182a8e4365ce30cf1d50c7aa4d6d0a608caa0f8e26cc174418a1f81c
+EBUILD psutil-5.5.0.ebuild 921 BLAKE2B c5e9b2a67249d73c467bbb8bb61cccc18c6c06964082d6cce5996e0655031cba8481e382eb4d5eb312d5d73c6615f15c3d11f6ec364fc3e5f4e08150db85bb09 SHA512 6fe1ec7e79f32cc7f926dcffbc5229b54fb3eeeea9680367c180db2e785b4154626235f9aaffab55d06c34df6f1fbf16dda7f34f31258dd0913f4e750f6acb86
 EBUILD psutil-5.6.0.ebuild 929 BLAKE2B 6b560a26f0d6728e21ac5e24e9505dc7fac2adddfde1d7bcbd1f476d9da582dafdaecc935b2adb1b503c246d0ad766c88fab65c120367f231d60a3a4283dec42 SHA512 e07aea82d9e4e8eaa0bab475333df6e048d9faddef3640ba044db0a34f958c75b1f02f00c8168bf545877f92afa7423bf67582544296a2a01df02fadaf72ed8c
 EBUILD psutil-5.6.1.ebuild 929 BLAKE2B 6b560a26f0d6728e21ac5e24e9505dc7fac2adddfde1d7bcbd1f476d9da582dafdaecc935b2adb1b503c246d0ad766c88fab65c120367f231d60a3a4283dec42 SHA512 e07aea82d9e4e8eaa0bab475333df6e048d9faddef3640ba044db0a34f958c75b1f02f00c8168bf545877f92afa7423bf67582544296a2a01df02fadaf72ed8c
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.5.0.ebuild b/dev-python/psutil/psutil-5.5.0.ebuild
index a8359bdc76fe..6a0b56a9a154 100644
--- a/dev-python/psutil/psutil-5.5.0.ebuild
+++ b/dev-python/psutil/psutil-5.5.0.ebuild
@@ -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 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/ptyprocess/Manifest b/dev-python/ptyprocess/Manifest
index 97f5db94f761..d07d9a8bc93a 100644
--- a/dev-python/ptyprocess/Manifest
+++ b/dev-python/ptyprocess/Manifest
@@ -1,5 +1,5 @@
 DIST ptyprocess-0.5.1.tar.gz 68474 BLAKE2B 70dc7b33fecbbce753dad3363b99b0f6e3433a8e0c9c6bd97c6c9537b071266e5a24fd80e64b5dff804706449a40b810fa5e058e159862b112b89755a3577c1d SHA512 9e7481e8e3facde73086ef0728a57516a15b6bc2a5fb6bf6d6f892c396c9376d9d6334ee37737f3469929c4086d5678a2c5deaf44d70589d41644a98f2239dad
 DIST ptyprocess-0.5.2.tar.gz 69297 BLAKE2B 5b473d0549d18d17f27ba6ff89543b66b2a6781a73c849ab1e2225b73bc3485ae36ecbf50a660bfc0abcad472062502a484de55a9ea206dcf63724c2dd765ce9 SHA512 cb4e70855d388a6ff691e2a244c072a5a50cf39cdf727e3a4218817bf5ac722c4b49f0dbfd80204259998eba137492690759b8908bfea925842b9f7fc83ee553
 EBUILD ptyprocess-0.5.1.ebuild 598 BLAKE2B 8307bd6950d3a2cd20ce7858b7094189d5ceebd55240d99c5725a612843805a59fc1e95d9184b2a70d84d620097b9b926defda5654ba10ab1039ea53821163b0 SHA512 db94fbcfa8255d3ecfdc49310e816fb3a0f960ed5333fbf6bfcfe851f1efb9812c23f6b632a9ac6cd36dc5b95ea2a2f83d8a5235fefebbcd1a3ebae72dce824f
-EBUILD ptyprocess-0.5.2.ebuild 625 BLAKE2B 62a0cc5652533d35f18ac481369240f23e15d78fb7c343bb05060bbd2a3a3c2913531b1df25e157ab3f305d578939efba8ade71b023b8387e410639f7154815b SHA512 a99055bc8be366dc109c8056c39d79e4785ef27476f908960d047873cd24dfa350fbcacaf7d9de97de3eb6c983ab888aa9fc9a8c3a716fcf30fe7deaa60e7b4e
+EBUILD ptyprocess-0.5.2.ebuild 637 BLAKE2B a1a0d02ff947772ce490427a905765cd642d95862b173fb9889e78eaeca4732434aad640332153e48a07035310e9e0f140204b6b277c9c75b41762200aa44b7f SHA512 f2281b466b5217fc6f772cc65762babc69b70a893e4490c952c2cca68a783990686b49745ca09eeecfe6e375b4ef64aaabaf2b0283e8d4a6616c664787fcbd03
 MISC metadata.xml 383 BLAKE2B 03c99bb4daff695f738e75605fe765379ada90b822ded3015bd82e3e34fff7ff61699978e00dd615d2ca6684567b3d072316debbf66abb0c6f9413ff2e3ad724 SHA512 4355f5b56f756ee65c09bcc3647050e727abdd9abbee62a3f2fedf18fb97bbd523182c55ac8eb8456b0d8b7c0904372ee92cbfeed50765d6f2d608280655b05a
diff --git a/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild
index 2b61ee8cf770..e99ebec8e83f 100644
--- a/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/dev-python/pyTenable/Manifest b/dev-python/pyTenable/Manifest
index e7bac318c470..89f30041ed82 100644
--- a/dev-python/pyTenable/Manifest
+++ b/dev-python/pyTenable/Manifest
@@ -1,5 +1,7 @@
 DIST pyTenable-0.3.14.tar.gz 101836 BLAKE2B 276c35cddf1f1b7d96f2e5f7d1e16244d4884abbc5b84e3902db2c98edb906a5805354b5c9482ab24598c6ba83ba9e7ec4cb62bed2a76a38c749c229438ad43b SHA512 66c0217730b51733ce691efcb8f6750de810c2a256397cd445f6d1ddff36e3e32c0afd2860d0d2ef38b2c0b181555eac5d2c0eb8c22226b1c61ce3b31177984f
+DIST pyTenable-0.3.18.tar.gz 115304 BLAKE2B 5f25afc4de6a7ee59c0049b7f91a88b9bc6b2a9ae7fa83d64be0d62eab40898c4591fec9924d7425399cea0a36e6332da41567caeb4ac55129dea4fe32991d1f SHA512 7ce4b284a89dbb5d0c98fa2ee12038c2ac5b524b5bf76af4232966db79f3714417a4f1068e9831c16077d692a366fc6a7bd78cc9c47c3420c879ad376cb59015
 DIST pyTenable-0.3.7.tar.gz 76638 BLAKE2B 8ff586e4a77bc4005769e6565622756b798398aac9e8e2335653c1ccc5f9c0525ab9e1261b939c848126b1fa71dcca8ea7887d82972f1d881c7b21e5f61de0b5 SHA512 c1f5d7a916cc79a754160fd056b661bad15ec60d64ab08b91345c2646f0e8047ba629d73b39a4d70d87ad7b1c624d55744cbbe0eb78f6e9df32e50a5c85c38b4
 EBUILD pyTenable-0.3.14.ebuild 777 BLAKE2B ff72963111f05e8bc9bba409a4beaabfc7090d9f6e22b201123253f1dfdd7ceb1599faf9504a9e2601b9e9bae63d22e4d6115ead71274b0f3db09618ad06f996 SHA512 522d86e35bc7b38e179fbe839730472f5c4d53472365993cd4ca1dc619a5e69d99fdc7bf00ece88f2a92e8827462a5532b1bc5bc39d938acde443f87324e42b3
+EBUILD pyTenable-0.3.18.ebuild 777 BLAKE2B ff72963111f05e8bc9bba409a4beaabfc7090d9f6e22b201123253f1dfdd7ceb1599faf9504a9e2601b9e9bae63d22e4d6115ead71274b0f3db09618ad06f996 SHA512 522d86e35bc7b38e179fbe839730472f5c4d53472365993cd4ca1dc619a5e69d99fdc7bf00ece88f2a92e8827462a5532b1bc5bc39d938acde443f87324e42b3
 EBUILD pyTenable-0.3.7.ebuild 678 BLAKE2B 63274d27fa3aad1e82c8aca7fea64ae65acfe670c7546965717fbdec694511e96b789d4a5cd4aa06b23b09c960bb8ed87d859916e13e6378cdbfc294c2d448de SHA512 05c6d303474a25f30dd974616fc0e8977977a1ad498a1b6a9b010717864ef6c2def5c5ffeea05df41acaa5e75d476acbed3f1241913b3b63958dff49a3d9ec6a
 MISC metadata.xml 529 BLAKE2B eccd96c558e42e1d453f21c6ce85fdda19c47a9bebd5803cc1f789f311726ff02a41d6da592ad1202a6c970413745a5e272dafa7efb6c2abdbe5361c0d7544b0 SHA512 9c8094a71191ceda8919499eca6c8cebcbb3db0bc668b5d2cc414b1ed0798ad1431fa9e102358deee6eeadd5a11c610d2bd90ade8ace0d4451b4d87ac66a5ae1
diff --git a/dev-python/pyTenable/pyTenable-0.3.18.ebuild b/dev-python/pyTenable/pyTenable-0.3.18.ebuild
new file mode 100644
index 000000000000..6aa15ef4bd9c
--- /dev/null
+++ b/dev-python/pyTenable/pyTenable-0.3.18.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2018 Sony Interactive Entertainment Inc.
+# 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="Tenable API Library for Tenable.io and SecurityCenter"
+HOMEPAGE="https://github.com/tenable/pyTenable"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.19[${PYTHON_USEDEP}]
+	>=dev-python/requests_pkcs12-1.3[${PYTHON_USEDEP}]
+	>=dev-python/semver-2.8.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+# requires networking and API endpoint
+RESTRICT="test"
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index c59d5f3f5063..98e3e7061b71 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1,5 +1,5 @@
 DIST PyGreSQL-5.0.4.tar.gz 637569 BLAKE2B 3f7bddb8b5e455ca4f181d254d4d125b89a64d7aaa1440b9ab5d916c395b9d93fc9814269992c134b6fd8a81f436752dbe4d7c06125e683a5257361d428c6a6f SHA512 f177ca3b023c007dafe80369b86a1742ff334137e493c3c19ac8bda0181d2543cd2431b8ab8d2d43f30d681121324bc4f236a9ebbddf1e927b071db7c9b34ea6
 DIST PyGreSQL-5.0.6.tar.gz 648481 BLAKE2B 7e1d96b5c09a3d2f0e412504be27fcfa557804ace8a4c24d657f586a8e647f5001da943543d49f6d2bdec48a34017b7379305fb760436065ba7f36ce981d85c2 SHA512 fb42f462d749f824f52dd424464ecc3591e615e7e0d220a63a217797aeb3f05379fab071480946d09779dbdb9028351a596160989066589dde1be18f7d320ac8
 EBUILD pygresql-5.0.4.ebuild 714 BLAKE2B e7ae0bfee3dc195c6539be92e49fb4260700d0bd1302625be04f5ce3038d2251ef0191b7de08c1a9ca849b0b5b3287fb410c55ff5fe9ed8340d0616bf4cc2323 SHA512 eff953cf7c4725a8758c7ab94d2f913f41b2d4eb6eb276526c41848ca35a762ee258279147c9b93b08b90e1cb24eeb880644defb14da20e9ac57bd5270580350
-EBUILD pygresql-5.0.6.ebuild 681 BLAKE2B 29cf65bbedda6d8baa1519b10ee12b8cf21862bd33c0448eb3ab19af5af86dd2267e587f6b8bbdf092f55a98fca5d7135cced7a41f215525ca550cf4cdc955a7 SHA512 4fbaa675fb3b5bfc25a4a07bdbe0b5c6bd6703421d1004004be3c3fa9a02600b68133603b359275e35c2e33bceb307fd44fdbed2b525aa5ca15c2838fb78e7b6
+EBUILD pygresql-5.0.6.ebuild 680 BLAKE2B a252bea18db05222cefd87c0517e7998e3753f1de4347a619dc33a3149c3c25b12b0cf69ff889a9bd480e5eee274a01866ba957f94a3d017e99e40caf329ed7c SHA512 1d692dcac9b0f50b4737ca3a89745b964504f69b5464c170cb025712430c4c3e849a1766029ccfba0cf740851bbc6a22b33adadeff4606b36a4f0d6f9dd3ff5c
 MISC metadata.xml 452 BLAKE2B 8d60fd06e68e39b5d373f30fec25979a0a67c51eee216425e382b559b908ccd12e425c95995dfd28d8487fb306f03fa10d8a71320a4ff5ebd6349e887af624e9 SHA512 f6877e2fd8cb2b6606a29e421d0f0ab4fd66a5e7446a4307718d1c0435c2e8ab3c59db795ca1e18e58eb79d0474c57bf35a3d0544095d2d7d618cf25e96ff55f
diff --git a/dev-python/pygresql/pygresql-5.0.6.ebuild b/dev-python/pygresql/pygresql-5.0.6.ebuild
index f205352b517a..0027fca8c7ee 100644
--- a/dev-python/pygresql/pygresql-5.0.6.ebuild
+++ b/dev-python/pygresql/pygresql-5.0.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ppc ~sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ~sparc x86"
 IUSE=""
 
 DEPEND="${POSTGRES_DEP}"
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index dd5e16320d09..0a89ffd3fa22 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,5 +1,5 @@
 DIST PyHamcrest-1.9.0.gh.tar.gz 57650 BLAKE2B c497688f03ec3b072d8ab076fc096a442d5cbbd94493eae57779879ccb6f281477aeeb7f7a67e539442010e60194f9f04a6deddd1d2267e9743742b45433f124 SHA512 3a878637ed5138365416c170871a63640f089047b723c7ec8db893dd716c0b1cdad16a98584700405693b954af7d4868a8543d1a3fc58ded22b493c8c61661b4
 DIST PyHamcrest-1.9.0.tar.gz 376623 BLAKE2B 808c74aa4dff89467c126cbc0e18029a9504cb27bbf03662a90666f85c76d7d7617260f50d35acde3a8e9e437b846589423cbb3697f8ceb86d0b5b838c586ebd SHA512 3b8393d0079b619b208ec7f06ed5133c4ff9d9dba050f818adf56347fc2225fd1c85d60f3dc262b7b9722061f0b8e4966180b6b96245a371e578d0d51633b4b0
-EBUILD pyhamcrest-1.9.0-r1.ebuild 1322 BLAKE2B c28cdc019c0ea5187a46b4070b69662566f4b2ec64fdf4e73e96abfe43f9f78003d2269fb7de492a26a13c3fd45723e77d957e0a2402cd5aa9c4c45edcee335e SHA512 6dee2ec17bc5de8863cc46396517016c6192a9bd2e136bac080611493fd9bb50d7c16ef5120c4be24a97a88be31197caf80a1f97dd57a246a697e5fb3e97acfa
+EBUILD pyhamcrest-1.9.0-r1.ebuild 1329 BLAKE2B be51778288391731b9c6247bdaf0bfadd66b5356ca2d200c096823ad705e40a955e3b9959d9a55cb0cfbd4bd3b913f3018a413fb4b8205c7162af85bad45e741 SHA512 84448f687bcc05174ef8910a2e7d8df2e64ea7b0914510723b56595de2f6abc5323ea4e4263e111f748ce52c27989e77624fc64f6208052671ec1e3e64c1ab10
 EBUILD pyhamcrest-1.9.0.ebuild 1222 BLAKE2B 5b50d8b8823b1d399ae78ca675b6ec9eeb7235b6fc1c59c70057148d0ecfaa3a47bb907411ada7a965d1ba42672fac671379e129f5d035175d05d01816b6bd69 SHA512 eee23278b27afc96cefb11410a48a76fb23daf64b826d66c16756a949ee7cd2e18229950cfbea1778f3629eb46df837446127511cedea8c33c8c400fff707556
 MISC metadata.xml 271 BLAKE2B c9035b9fb7a0fca1355aeda317feceecac5790bb6723360063b236d6633a040a594eea8f304c3b5bc8e918b1781f0e5e887ec15225d51a021592391195b7e8ff SHA512 89f447b79dadbb441c4c51527f486fcf7110b67c0a86c9fe6413c563463be57089faa1ddb36701080c368ff0a8442532bc774602e0120cd5466a4d7fb6bb6e0d
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
index 60e864013be5..6824c3807675 100644
--- a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hamcrest/PyHamcrest/archive/V${PV}.tar.gz -> ${MY_PN
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~sh ~amd64-fbsd ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~sh ~amd64-fbsd ~amd64-linux"
 IUSE="doc examples test"
 
 RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index eaea25e57e02..73ed6bc6fae6 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -5,5 +5,5 @@ DIST pylint-1.8.4.tar.gz 512582 BLAKE2B 623e224ec71756cc2528346ac62b8e58ac4d5ef5
 DIST pylint-2.3.1.tar.gz 577767 BLAKE2B 2af206a9d9be04f369c2bbc39c5ddb80c29a5a39c20d75bfec84498882eab628a7cf5abcc5786933304ed99bd00ffa142b9a58abab348c947799f962b877bb30 SHA512 924d8adc95f04ba750b3b44fe79ac569151ea7c8f693cc9867bcda3878209ebc2202931702b98f80709d161d3781b6e181aea0ded35a3323c023497e2a749ea9
 EBUILD pylint-1.6.5-r1.ebuild 1799 BLAKE2B ff78bbf82455322649ef9d4aae6305af6964443ed2507106f32f74dccd4ee84d8cf741f38135a421943a8ba66c3829860b2b7c1b64f1312c3b4c124a59362883 SHA512 9d3ddb77ecd9978253eb51bedb7d3028c69c6bf90ef8a22991b7417ccf5994145b58e71ec075a61e6319d4c9991926f0cce0a5433e8ed79ebe8072f0766cbfe5
 EBUILD pylint-1.8.4.ebuild 2449 BLAKE2B 4ad77af21b32c06775c9b93b604da818086db54a26810525fa93b586e7a3c71f4652a2b8052bef03dc3dc468944d9a592797a46d93fd3dd2b0d38f395f9dca31 SHA512 a9d5728e9f4bd078f5158fc4c7c7ee959be9885de98d7289bd9ea5924389bceb1777ff6fbed9086250cb9f67f0fede1fae06aa632a5437edaf7bb108e08f3c10
-EBUILD pylint-2.3.1.ebuild 1621 BLAKE2B 82f83ee75305e90b0d9c52e99e63eefd1024bc709b851dadd43282361524ef8855797970b0de973bbf0f6330689d1f1be6489a2aa14005a137219f36b33d34e9 SHA512 ee86dec2c98cce123a33bf5d4bdc0e8b5c7458ca71580fefe5d4f99797c96c2426b9df441c31ea63d64eb08b0404dabada760280d98f6c6c2477582ed2c2e53d
+EBUILD pylint-2.3.1.ebuild 1626 BLAKE2B a37b4525b64244e91f98d50b98260e8d4e1e25e2ac4d8427a15186355fc058cd3ba4dfe00e45d5020bc5e39baaf1402f72fdc39bef6289a50e18ff3bbfdc1001 SHA512 1baef96e3cc9db0a640fd58361062e59f06fb0010568100cbb798194ca0cb5866fdb2b433b722972a0366200f5da1dc962c3901cb0631855448bc0fa54dbbd78
 MISC metadata.xml 1074 BLAKE2B 712009f2963542b06e481ae89b331e9ddeec4d2d340ba076f73f12e328906527daeb814a03df11e0c9f12ce5b19c6639f8686294d2673cfd2fcac96c94aef6df SHA512 83ad47c0dfcd143d058267fb1c5d250b9316124a91f431356a881937b4a527a0e23575cf353da8aa678645e6ec4a455b9114ac6ecfa0b36d88ac0623ca66ce57
diff --git a/dev-python/pylint/pylint-2.3.1.ebuild b/dev-python/pylint/pylint-2.3.1.ebuild
index a1e171bea188..3beeae54c445 100644
--- a/dev-python/pylint/pylint-2.3.1.ebuild
+++ b/dev-python/pylint/pylint-2.3.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pypax/Manifest b/dev-python/pypax/Manifest
index 56a0f3b65a3a..f20366d48dc1 100644
--- a/dev-python/pypax/Manifest
+++ b/dev-python/pypax/Manifest
@@ -5,6 +5,6 @@ DIST elfix-0.9.5.tar.gz 401722 BLAKE2B 184f8944c62412675819ca86f13bcf23039ebcf06
 EBUILD pypax-0.9.2.ebuild 1093 BLAKE2B edc30b3507a0ec1d074b0728d7b03eeb984f9116a20cb6628c7760e0a28af15c0a3f9943dc4eb5d558ab7e2a7ce4cd2f6e006f96ae72da316f42c6f9ed1fd26a SHA512 b3b58e205a537029380179d1bded45d8eb248adbf5d3df52bcda42e0b3e47d2df9c6116d2c57065729ab0cd7e09a7c6090cb46f6655deb97f9af2bd7b130a68f
 EBUILD pypax-0.9.3.ebuild 1097 BLAKE2B 015ff94c5122e918715eea10f161271e5b2a3e36b8dfec1482e0fe4d0236f563b324eb42b701a87521b06690d49b3e6e22828fed79d684b68723197941611ed5 SHA512 5b29aa8fdca22ea0b7d459df3256d711deff11fe75560e9eff10bc1aa373f4673e6055b0543e3c6dc495a09e3c273686a596df41c7f7aa40218d92c7e692db8e
 EBUILD pypax-0.9.4.ebuild 1092 BLAKE2B d893dad6067d2aee809c8f6c8121ca7f1557d564a66c9b116b6493d9e324a4ec368e9f9f69ac5eaf08ddac3678c881094e6e67bfae88877935fd2934a83274ef SHA512 597dc17378266e61ae28b0f26784c7e0b010b34e08a2ca0caefcd546d70febeb6cd0d8aefdcd01e9fa6bc989a9652fd4627037f571b330a813ec58bbe5484876
-EBUILD pypax-0.9.5.ebuild 1098 BLAKE2B 6a8c0c52c512dee1b536349671ee57dcd754c499e25859421be222047c11e2bebfd3763e2902855f7db50ea4ebde5b4d56ba5aff69916d5a4e6b9c721b2a8942 SHA512 364491a1bf2f8e4f368b9f3437f3bfc3d555962bb272aedab9e15795145e8776ccc28160ca26397eecf65da44135495bb2135ba5bad4ea14572c09769c932d01
+EBUILD pypax-0.9.5.ebuild 1094 BLAKE2B c080879e1a8c195d54c6d19b602b086766ae515056138d2297e7ffa889e7d0ec77929e8c441264b41c9293b22784c1fb37527cc287a07ec2f1ce07a01bd1b468 SHA512 ffcd9194e8ca1d09aa27c23af590372eda1db351661ad63c6df53d218480557b82cfdf02a5814bef4f351e897e4f6d3fa68c5447d516558b569d91fb6c85633a
 EBUILD pypax-9999.ebuild 1102 BLAKE2B 3602425ccf3b84cdeb301509b502ed4b699d1f8f1246d89b2504d377feb64f22c3c64c15ed19240dc114df2d9d2895c6b34b5524636511a5836ee936b8257ba7 SHA512 1ca8235f4e14576ec1299dadcdebbed2741236475340e2f771d42eec39754d18b3ef49b4247615e6f7dd3103561bb924a9644562c65e7844913649490180c6a2
 MISC metadata.xml 597 BLAKE2B e154315aac17c35f33adc8dd7e33a6427029a34629979d2a7cfa6f373a56a9dbb6add22bfb359ba4126a29b172557393b96cea123224551d88894e5c5f637bbf SHA512 d5820da1b741114d7ecaf7cb7f0b6f1c08d675e53992c8fbf87f562c3b949ff7336e093a3a502202e671be299310c14a2a38b8d54d3485e0d9064964eb1ed87b
diff --git a/dev-python/pypax/pypax-0.9.5.ebuild b/dev-python/pypax/pypax-0.9.5.ebuild
index 79371d8889a5..8f5d968539aa 100644
--- a/dev-python/pypax/pypax-0.9.5.ebuild
+++ b/dev-python/pypax/pypax-0.9.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 	S="${WORKDIR}/elfix-${PV}"
 fi
 
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index 4db56653c82e..e9a3b3865b79 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -3,5 +3,5 @@ DIST pyquery-1.2.13.tar.gz 44032 BLAKE2B df257c6116b3f8804627a0b4a6556445c644410
 DIST pyquery-1.4.0.tar.gz 45215 BLAKE2B cb748c09524f6cc6b22c9712370da754495c31b159a44f02e9b5f00e4e94295d7259d224e63066297e6efd74f0b43a508a56d1df4f4150727cd261b959402e9a SHA512 523bc058fc93332b13840a7249bce5a449b0029f6434043a739a2f24abdd89efb314da8795f1b2be2d7e4464a8e4bdf6b061d768b895d0dd1630f44ee341f37f
 EBUILD pyquery-1.2.13-r1.ebuild 1339 BLAKE2B c5492d641308e94af0b5dbfb6035341981f3cbdfa12e960557f9cc12acc6719b970fed6761ad06f328720fea3312c7f9c8b8d617997116d0953e86e4fa465db7 SHA512 e2725456271a1fb5d86d936042f0b154d1bafa2af8d73bc7969ce968530aa368091e9045ef45e61b3dd2be843389b89bf978e411c246bd03a7f20088a45de613
 EBUILD pyquery-1.2.13.ebuild 1325 BLAKE2B 1ea72a6a86acd207a7238719282d9ead17c3b39419f35befe5cfbc885ebc5e66215277fe17287aee8e0ee52841db59d70f99aa5d81741cbbf0bcdfb2df2932a2 SHA512 bb4259bf5eadcbe0c1a9f0e41b1ac6bceccab979ab9da2f8668630d9e257f01baa65e985fadcdd3d186ccdd4c2855c20990825cd18b155bce7f67f4c4360d66d
-EBUILD pyquery-1.4.0.ebuild 1196 BLAKE2B b66de0742bb91b251f7048210462e5c397a3a68413be31f58747a93b7a4a12229e70f793222637e1c872ff764cc13477984c1878845d9e09101651a318c15e80 SHA512 473ba8cff3426ba792beb474cc3a9c74096a8d456edacaac255e30ace7e7b9f5c9942ca8d30954598496e6ed4612260ea047c6ac61c7f88b832135928c5b2b48
+EBUILD pyquery-1.4.0.ebuild 1195 BLAKE2B 1bf7118a30402bf31ce84e469167c620ce382f86d33cd7f3ac3de834c38812b1fa6607f70636f5d2dfb337af77a3156665c20983dd1e5ba0176458c72aeecdb1 SHA512 fdb389aa487205fdaadcf850cba1d94e284c8de3e45deb8b724cc0907edec4261382a17757d453a805d4f68cc21778d1c54541b37a3d9d660b30959af728ba75
 MISC metadata.xml 375 BLAKE2B 6b09c68dc28585cedb0d7109e174b26cdd2ca11c3e8413550f3032a7b2cd11c7745cafc530d7e18692fab76c6c6717e6ba2d92111e2e1df0cae8be73a3e833bd SHA512 ebed84e50582171d8a99f7ee1031553a6afc558f5aa6914f2aa5eacccc7efd6c87b284eec803dd81fef3dd91426fd28f93ae21f6cab1e74c9e4541df3904956f
diff --git a/dev-python/pyquery/pyquery-1.4.0.ebuild b/dev-python/pyquery/pyquery-1.4.0.ebuild
index 37ef75ff860a..81bed23deccf 100644
--- a/dev-python/pyquery/pyquery-1.4.0.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.0.ebuild
@@ -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 ~ppc64 s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 s390 ~sh sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index eeb26a01e256..7b0ae7bfbf7d 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-rerunfailures-2.1.0.tar.gz 7687 BLAKE2B 1c5ba90ab2b67c6a7b58d0569ef46847594dd6dcd5224050537fe3d645d131c2b450aa14a032151a81c6ff2c8b56d4355d03dd33a0e0f998e31a5df94df44c3a SHA512 9c3da462df07f334dcab865bf7f828f75bc611c93dfeb2306a802f2e6ef973332ef502d97dc8d676e09330ad77c227bc6a20ae67ff31f1446a5fb1d608d638cc
-EBUILD pytest-rerunfailures-2.1.0.ebuild 540 BLAKE2B 1a92d23898fd4080f05a4218f7d543781ca67a3434cf67804657cd3007adb4f6d4ee341f96c217eca3266f8a361234bf2558e6217bbb46f290866d3ca0dea2d8 SHA512 b3938e5d970bcf85227aadfd856550582063474095163c43a2db20a75d6230aae78d7de624501c1b10aa8a1ba675dedf6012ec8a4daf18f068c75783dcac9c9c
+EBUILD pytest-rerunfailures-2.1.0.ebuild 542 BLAKE2B 311f196cb68a1148ec02c98518f80b6195b25b731237baf6a12c43b203864fb9b2ab014a9823519ce9d8f93175712967a937432bdbe2d6d733d7880c6681deb2 SHA512 9c1dcc6858905a36732ce2d09d8e6cc63aa3d1997dc5973c8c51064bfd18273921f92bcf3ea00ad3c0e891cb9afffd5f2f9ddfaf62448ecd2433b3d46e269b19
 MISC metadata.xml 333 BLAKE2B 73b35ed1679008982384ced1ded01ba9a61c4b82a6646f7f4a1ad318690d3ffdf3752d438a7ca4064e1a39855a353e3f928329f0759f7f7dfb8ba45b01667a40 SHA512 8b08014dec552b96d1e8d79c44404333b62960b2fce3ce3905077af02d1e3436c2cfbf5b6bbe9844df7d87c5bc5f44ad86f4359079ddb8e2e54f30ecc42369e6
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild
index 5778fcbd788f..e98660958fc8 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index 0e162f5b497a..3d12f3b39fff 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-timeout-1.2.0.tar.gz 13258 BLAKE2B 71c137fb0440c15cc8285b4bef51405a6b53deb850c109d1a892159e8758c712e9d1bae8f400adadf1b85cf399c0b87bd2cab51d959b4eb68023052f6c42788c SHA512 b86548843e9ff8c8f7d1c39735025cdfa98befe2860e2a8a5d422d08bd7f542032384f147125a2a2841268154cc3a3874ef0aa4765d454fd5390edb773b106ae
 DIST pytest-timeout-1.2.1.tar.gz 11498 BLAKE2B 65b50ed52409ed0031c7c9b07ef5b96c088cdf98c0155c1a6405e701fbddc2da1070a9f5a63e22428bd2d18e0ad4eec4050239f7d786fa854256c86eb6be0b1b SHA512 749a0dad83b82e93a97a8590900f2285679ec368612fdcfe3f5f7a5b64774ac85196dc31df111c6a99efda92dc03f751f17ec20862bed1f6aea7d7e4140a06bb
 EBUILD pytest-timeout-1.2.0.ebuild 549 BLAKE2B 9a64aa765063feb8a3f8d1f26cc34c146e4cc7ecb2e610d7b1f4eddc477d6db2d846eaf548ed6643e30d18cc9a2ba3bf7f6f78a2d6962639024a45939c27e0a7 SHA512 bb7bbc6944140406e64d514bc9ce1ac53f2d41a8c1d03369a7952a20ded3d17f241739a9457a87a6ed2498bc0ebacb07a5bd206d732e70704fc3a79c25569d31
-EBUILD pytest-timeout-1.2.1.ebuild 563 BLAKE2B 3d35c7c4ec76682f9adf43c234574fe78dadb58baa8c0545a34f9e89ef21738e96fa81d4b719274d505ef6153d0baa769c6f627f234c55e1b0038edcc1df84ff SHA512 1ea4de221603eaf9aac3d76c59146c5ab4afcc157404172032986b1a3821e0bde31e3da54672cd681466390a63f858a8dafa36c79c92c99b6c9d2fdd2407261c
+EBUILD pytest-timeout-1.2.1.ebuild 562 BLAKE2B ff1e18723c15b162c52123d7ee97fe61a9353bbdb77625b4fde56840e84ad746b942caa4391be0e35579653b012cd812cccfb727b8f50ffbb527b3c3b49344a5 SHA512 27399963f96a9fe8c0fe2bd81f19d101f8e5d6dd37780b4ec571222a81d93cc75ed46a92c2b3b8411802c65f2481920ab357b4fd575304ca4d8c141a3aac5307
 MISC metadata.xml 327 BLAKE2B 23dc2e5e6f023223ab4774206b2d94fd27fc0a6b2592c8e0c317e1c1a0e7c26ed4f8e23187c5499b7fc9c4acc0df601a056ab1dced8115a47a9e72697037fa32 SHA512 6040289d134f65896f2fb80538d9caa4ce628911c5ed21568a30087d1b0ffb14b9acbf874956720b1d9c56290c78bb965ac9299bc400fd89a258f3627180780a
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild
index e7a02de3673e..cd26fa3585d9 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 3bbcee24873a..f636ec59f38c 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -5,6 +5,6 @@ DIST pytest-3.4.2.tar.gz 812719 BLAKE2B 96623d6cdea4bd79778175c18c949938505f1862
 DIST pytest-4.4.1.tar.gz 931385 BLAKE2B 490b7e931282f35a5d0a83d0e34057bd30e2d2188748e1dad5a09261e27e043e59ae21af24ef39345a1d566f35dd30ef0f877dcb26a927da31a79cc88c52dbe5 SHA512 a4bc18fe7d8db5433d4d52c0ced38d3d0e6a785710bdc772e007fb1f0f516db2267e608845e075ce4d69a5e71a5e741cc6d84b04622e0a04bd2ad3b6576a1473
 EBUILD pytest-3.10.1.ebuild 2442 BLAKE2B 510febc15eb52b5e5c6b66c1849ae23911a88340172027a3c92dabe68de9e49bad4dd10265b9bfaace126b8ef61b9b9dfbe758c264d75c900ab5852dd30a9443 SHA512 ba012c44d8ec1981f36bd95c0ea17570bf64ed28ba51194be772be382adb2b1e239b2556a8549794deda4916ee94dbbe3cddd6aafc13f3d5607f2c8ba59bd5cf
 EBUILD pytest-3.2.2.ebuild 2110 BLAKE2B 4e12a4598401de0cd2cde344d5486a2bf7caf6ac248f7722dcc51c8a44f6a25b922d34b557bb938e93a26fe771318fad6b028feaba10dc38fccc1753a9feed69 SHA512 4d655f4c8e7ed79aa7c8d7820b06e74ee2509edde5ca1248021ee752a91abbe56a07ecb3c18fe1144af64ae3e5168f6210814d08b01825cba767e39627c6c3a4
-EBUILD pytest-3.4.2.ebuild 2519 BLAKE2B e848990cf13c4833c98a47cc974a976df1013d832449d8ddbe8e19ccac4e649dcadaf118c74a65a749b54766d491161427ba62a89e1529f14078167e8248ebd4 SHA512 82cc61075bf8cbd6c3f07059101b1f4737d475487f7a9b53297b97a8812b53739c18db7c239d3f706e2eda70be9b6fa8787621edac85708c9ced9cbd96d17871
+EBUILD pytest-3.4.2.ebuild 2521 BLAKE2B 7948419947d7d350f32457db8f35068f8aa1cd468a8009ce9079cb3141c78cf306cb3516dcdab00960d0507179503f45d3fac381acdbf306a8fcbb8edfc62d79 SHA512 a5ab31e0ba04e0ff0aba3c98ad1b961eb061e85092cc9b852569584b82a7d0cc9d3868f30904554abcf72f30515ce599ee9a396cc928abe2d14c9fb94df24f2b
 EBUILD pytest-4.4.1.ebuild 2111 BLAKE2B aa77e846b170a1202a912856025827fd01234be9f3faed1bac155335c9aabb5a912ba29356b3f7fdfccddb6d6b552b3e9297fafd197fb9d811d3fc368cd41f07 SHA512 37e71b9e38096cfa16003806a469cdb8cbe9e5d5031faca375089ae7851e4e7dd8737b50f43fb51313392359c3652b667751a29d4c59524c78b18101f41a2df6
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-3.4.2.ebuild b/dev-python/pytest/pytest-3.4.2.ebuild
index be294ac486b6..05a7c58b0902 100644
--- a/dev-python/pytest/pytest-3.4.2.ebuild
+++ b/dev-python/pytest/pytest-3.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/reverend/Manifest b/dev-python/reverend/Manifest
deleted file mode 100644
index 0851c42e3e30..000000000000
--- a/dev-python/reverend/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Reverend-0.4.tar.gz 12147 BLAKE2B 70b33150b7aa306af99fb45a5098f4442b7cfdc957fe6173f68595871ccf7939e7126edcbedad26317aa770fc7b06363c6fc1887b146d301de232d22bc904180 SHA512 6d61c61ccdcca5b8c79fd230f9cd825335c9bf873c3b512170261886d7194b719d9811d7318014d0e931383efc51d995579f3199295c1b545bfd8fa4550a2452
-EBUILD reverend-0.4-r1.ebuild 642 BLAKE2B 7f27cd6e8709aa34e74ea42423f4ad3daa4580893a8aeaf88478086b846ceeb9fb8af876290d9da8f062fdce7ca5c3e345a6a90150c5da3815e452fef58dcca1 SHA512 b5c1e16ec1655a68c552d8661e1cbad0d13f5161e90323b7543e653140981f14397b6d13cd2678066815ef3d4c55e4e657529d4b5113f6590985fce9d0721e04
-MISC metadata.xml 364 BLAKE2B 9b12fe71aeabd86610cd8355f0c2bb3c60fd23bd0c3bfa9f05aedbca0a5bb69fa1aa26e73c3f1faae40ee33bb77b244d2e13fbe606c962a7fdbf0931618b7ba0 SHA512 c3bf46a9043b4d1e0f9f932e8c79c8b90ff556d747123b55382f265fd44bfaf4cd149a71589d6c3fac61066f5b92197491afb5779a166a2a9a970e37fed061f1
diff --git a/dev-python/reverend/reverend-0.4-r1.ebuild b/dev-python/reverend/reverend-0.4-r1.ebuild
deleted file mode 100644
index 71de1b03a8f0..000000000000
--- a/dev-python/reverend/reverend-0.4-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Reverend"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Reverend - Simple Bayesian classifier"
-HOMEPAGE="https://pypi.org/project/Reverend/"
-SRC_URI="mirror://sourceforge/reverend/${MY_P}.tar.gz mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/scripttest/Manifest b/dev-python/scripttest/Manifest
index 9f3d88328596..06e7256f31d3 100644
--- a/dev-python/scripttest/Manifest
+++ b/dev-python/scripttest/Manifest
@@ -1,5 +1,5 @@
 DIST ScriptTest-1.2.tar.gz 7208 BLAKE2B 07e63e636ca88b47c0cb9129cf4fc02838287b4ea1cc6b2ae47eec1320ad200179d4a6b8f59860aaa24aac75edbe1d55e45da2de91ef222e621f74667ea79c49 SHA512 0dc09e6af5554f38aca6ee45b9afad2fa4c1c53a4d3c43edff95bbd6ea8d57e94bf6b7bdcfd26afff6bf2b10690795bd2816013801911f726c67e8171546cad2
 DIST scripttest-1.3.0.tar.gz 14885 BLAKE2B 1984bb175b49248bd369d2d2ed6f70051113285b6870bce67e0c2203d29b4c5b2735fa96dfef7ee11aa38db74e9beb026bbc946c8549b2810f6b90e896bcae0e SHA512 038bfb1726bff85b6e3675be51db829d3519b47665266f6ae1d3c5c6f4f06e7b16742262ca1ba240544e9bd39ae96c1be0bd5e8583736f72bb04241a1bb8acf6
 EBUILD scripttest-1.2-r1.ebuild 543 BLAKE2B f155cc6257076459eeb3ce5b4cffb30dd1035da6f987bfbfe49995d6d6d3b497d9fd603484ab98fb686be5450b1e4e14a6264b1bb581523314a11d088e6582f6 SHA512 33787bcc9603d6e0038912aef34bff3825f4c3e82da172b8cac72cb181c91fe8101c1bd2f7abe499d83292a3bc65631e5758ce4a171202f390ca9666530452bf
-EBUILD scripttest-1.3.0.ebuild 632 BLAKE2B f603a9c023a02e724145c4d8a6aab36045c7475c86bbcafc9a4de4792ade5558b71d57dc6337e441db011db1eede875fb4efbb890a2dae835af9626239a47b9b SHA512 5b5886965bf9320c2e694c2a49c2c3054c230828dec440580887c1be65fa876cacde8b2ccb25ec0ff62bfb8221aaca50cba806bd24639a3a70294f0a80d74a47
+EBUILD scripttest-1.3.0.ebuild 634 BLAKE2B 48127d198b62934e330babbefa22337f8347701d3ae2fb0d8982a311c3df1d1f571713309835bc2bd18e6afdc46500d5be05d9741aec8891dcc5637201537a9c SHA512 a875e45f45095205221924c179f68c4d859e2439209ced063710525cedab1155f7ef23f0d0e57e5a6c5cf284daee93a3221ae49734c44860549c10ba805cb5f8
 MISC metadata.xml 313 BLAKE2B 70bc88a2b745b46e0da17a41ef420dd6b0ae2fcb3f444ed6be3d6bcdea63a4b0019790e0dba51b46c3a5d82c93f667f25b116793623604edad4d01841af723f5 SHA512 ae1c2257d3367ea3bdba8e040c0efd98674fe833f7a025c1b554e8cae6e1a41de6867e63c3d792593fa2f4baab158b046d2efaa08d6c8376f8ec749cdc7d4ff9
diff --git a/dev-python/scripttest/scripttest-1.3.0.ebuild b/dev-python/scripttest/scripttest-1.3.0.ebuild
index c0969c79e492..d3f0b87aab1b 100644
--- a/dev-python/scripttest/scripttest-1.3.0.ebuild
+++ b/dev-python/scripttest/scripttest-1.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index a960f71c147d..d7b9f52c873c 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,6 +1,8 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 DIST sip-4.19.13.tar.gz 1038815 BLAKE2B 0b6f2941140a535cfdfb51db71cf9a55e5f65be85961e304496fded7781da42b0ab7d01045b8802468a3ce3b57e7f571851fc7713fd47a03c8344017982d6632 SHA512 eb456e1f7efa463f859047acc5301e19279e1627629d0bad3ac7a0a52b77575126bc3f2c64bb4278ae11d415c13d2731dfc8c816bba71307173d393a414aae98
 DIST sip-4.19.15.tar.gz 1053921 BLAKE2B afe0f1c2faf839305d21da05a667e649c37ab42c95df86d237bbd8f39a6b8bb7224da547467311bf82a85ce8f0fafd8bb6dd7cbf6050f2b157773339438d6277 SHA512 9518a5e90d54758b13dd8752669d4deb175cea8d8cdf810deaf554cd157d32ab7e394d23c774993fac3b7c02d56445b80962457d59f5cda543917a0251816422
+DIST sip-4.19.16.tar.gz 1055966 BLAKE2B 0c078c7d747c3b92e739227829233dddd3c9e7c86ff50f80cd428bc8717f4ba22741fbabfd76d8e263c18a09ad14e7dfbde3423e984d31cd9a5734b1eaa25c86 SHA512 6a4e3e8580e914544c9037db61ab9cf05e2460cf2dbdeb67d30c949aa150952d2bb337061f7c7a9222251b04f83a1db1554ff576c3e83b8f60851b442133befa
 EBUILD sip-4.19.13.ebuild 2891 BLAKE2B 799512a3976f954dcc293bdb0255522b101ee7cad9b1a9973d76cf1edb2671da8ad275490e86e2d3fa441191ddb7305d36deb8c14f23dcbec0fa80bf457fb75e SHA512 045a51bc5eb0ccc44fc6a1f232e0fcc32e02844f97faa69fe047262e811bfa4b10aa11925c53614cf8bdfa6f2d251348f6554ad5f30c12b583712b0b1d11b3c1
 EBUILD sip-4.19.15.ebuild 2452 BLAKE2B bab80aaddf65f0ac19e475fc8c6cfb919d6a2697032f7043e32876d651b88d42af8dba1c895c6b47d8bd56052171c56b89ee0d4787975c3939dbd10f7bc42258 SHA512 ba18690557373894f037d05f53da2d699166b46de4ed03a5e4e239d047b04ad8961cfe6ac2bfa7e86a62d5ac2892d2ad6dc6f22a3e374aa9b83f50e83c76c20b
+EBUILD sip-4.19.16.ebuild 2452 BLAKE2B bab80aaddf65f0ac19e475fc8c6cfb919d6a2697032f7043e32876d651b88d42af8dba1c895c6b47d8bd56052171c56b89ee0d4787975c3939dbd10f7bc42258 SHA512 ba18690557373894f037d05f53da2d699166b46de4ed03a5e4e239d047b04ad8961cfe6ac2bfa7e86a62d5ac2892d2ad6dc6f22a3e374aa9b83f50e83c76c20b
 MISC metadata.xml 648 BLAKE2B f49eaeae5e37d91c569b93fdadc4401e478c54a754290ce37dd51d1d03340ead54f4d0f52389d87b91801a2c1ad0040347e629068a6c0ffe79a9e3442498e4f6 SHA512 1a2a4fb4e7fb35fb6177d62d5c866a5c65c1915ff38de5815823864fb6d9a90beaa8897e28a65f79770a621ccdd83755c682df29a25bf00a76ffd51b215dcdf9
diff --git a/dev-python/sip/sip-4.19.16.ebuild b/dev-python/sip/sip-4.19.16.ebuild
new file mode 100644
index 000000000000..cbfa17402c9d
--- /dev/null
+++ b/dev-python/sip/sip-4.19.16.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit python-r1 toolchain-funcs
+
+DESCRIPTION="Python extension module generator for C and C++ libraries"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
+
+MY_PN=sip
+MY_P=${MY_PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
+SLOT="0/12"
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
+
+src_prepare() {
+	# Sub-slot sanity check
+	local sub_slot=${SLOT#*/}
+	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
+	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	default
+}
+
+src_configure() {
+	configuration() {
+		if ! python_is_python3; then
+			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		fi
+
+		local incdir=$(python_get_includedir)
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--sysroot="${ESYSROOT}/usr"
+			--bindir="${EPREFIX}/usr/bin"
+			--destdir="$(python_get_sitedir)"
+			--incdir="${incdir#${SYSROOT}}"
+			AR="$(tc-getAR) cqs"
+			CC="$(tc-getCC)"
+			CFLAGS="${CFLAGS}"
+			CFLAGS_RELEASE=
+			CXX="$(tc-getCXX)"
+			CXXFLAGS="${CXXFLAGS}"
+			CXXFLAGS_RELEASE=
+			LINK="$(tc-getCXX)"
+			LINK_SHLIB="$(tc-getCXX)"
+			LFLAGS="${LDFLAGS}"
+			LFLAGS_RELEASE=
+			RANLIB=
+			STRIP=
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake DESTDIR="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+	use doc && dodoc -r doc/html
+}
diff --git a/dev-python/sphinx-bootstrap-theme/Manifest b/dev-python/sphinx-bootstrap-theme/Manifest
index c11d83184085..2c0266698228 100644
--- a/dev-python/sphinx-bootstrap-theme/Manifest
+++ b/dev-python/sphinx-bootstrap-theme/Manifest
@@ -3,5 +3,5 @@ DIST sphinx-bootstrap-theme-0.6.0.tar.gz 1232454 BLAKE2B 90fed63a388f71f1d74cc31
 DIST sphinx-bootstrap-theme-0.6.5.tar.gz 1232943 BLAKE2B 76cd6f70cd485c552e9a76c559c8687129851fa40e03e206bdafc5fc0f948ed53d07ea8196908d2c17af1718eb721aaeb4fd1d65313e12a069a7186008a4f222 SHA512 30ef77364aa4c830000f1a2ee7f663740670124a6f433ed59af05ed408a59cb35643b66e3fea391edcb811cbd9ae3713eb174c76bf00bbad9801910935159bbe
 EBUILD sphinx-bootstrap-theme-0.4.9.ebuild 533 BLAKE2B 4870e3c391868e888db7725eea6dc5c8d8ac09d4dd6cf284f4fe15dd41ed31640ff59044f0e609f367928aeab372e0f7172c254a6ae4d2b386d67f43d70a6ceb SHA512 8b0bafb0d00551067f878c2677a42f4a875640c83d22b026d874950676debefe3f902cde6f469c62e9cbc84d6679deedebd86cefe3896aac4d22253144f4674f
 EBUILD sphinx-bootstrap-theme-0.6.0.ebuild 537 BLAKE2B 15e08479042fa90adb7bac190422bceda5b2748d0493af0b9d0d7d25eef272c0dd5d90ec84b92b4dfc471943f5ad557b62674869a0d9f8a95be87bad4d3e3bea SHA512 03568fed58e8c0eff6f4f7641d0948ddb36762ddb55c4c3901e5e7b606052bd948b81dac19d60502708d75559632dbc15b2c2136d55c4a46dc02e9b951f46c88
-EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 575 BLAKE2B 438621760212018020c85a656d61b06cb20b2510a3f64b343edb1e0cac00899367bb18e61178528252e0aae1b948e7979cecb4090bf8ee5515d0c1169d1c83de SHA512 8a767e52ecb9c775b0caaae82337c8b2a73e38c7a5a1a5a6fb71c0c40990cc782b4df9b48c4efde6ab63c4c8aadb1ddf08207c5e58243b3273880e0c4e50327c
+EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 579 BLAKE2B 6bfc01b01165d37f2be89bcc5a5b0415cc95c12ad63add6e2d7fab42af21091052bb603a3f31defd786e08a2ec2e039045eb68a4ea1339599ac5513c490da22a SHA512 3d478665a9c04a390840f59c288885044540f05f89d4ad20b4c287fc2ec2ab29534bcbf6ec9bccb226cff8e72219613c0a6c9413731fbb97939bb96337e10c5c
 MISC metadata.xml 495 BLAKE2B f1850c5403281533f2edf707dd9db4c1e339e56f4e5677d9189c51376b892f79c084bc987c0b1f28ae2fd09030daf5f249cb42681e8f22787df3b31c422b649f SHA512 c6011ce51a2c8f73d33eb80eb3adfcda50911dc535a1c6f18862eeec7c601245aa76acfdf7a9f6f80f4aed2793ad5ac244ae2e0a893723106a36539cd7d0651b
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
index 28b919c9002c..50c7dc8fb852 100644
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.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 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-gallery/Manifest b/dev-python/sphinx-gallery/Manifest
index 55df7bd18dd0..bf4ccb2be6e0 100644
--- a/dev-python/sphinx-gallery/Manifest
+++ b/dev-python/sphinx-gallery/Manifest
@@ -1,3 +1,5 @@
 DIST sphinx-gallery-0.1.12.tar.gz 68976 BLAKE2B c9f8f12f775df8cac0f0ad7d70b0dd099dacb3b005584d1bbc878437443144d7e2613ceecd25cd4b0c8941818c5596f6435c1fa223b1e5c5d5196827a69163fb SHA512 57e8fc3746c2f5c941ddc3e00c749a6bfa63fb5741b3e5551df02f798858c417acee05a6b35512506aa0c4866b14a093cb4269284501672c3bbbf2edfc1edc1d
+DIST sphinx-gallery-0.3.1.tar.gz 88807 BLAKE2B 79218a1f438e2b8607c52b14f098c0136cb4d5ce15a12d82bdb3caf0c7c1090e7c4f210437fc660d8d4d19bf87bbaa2ec3c208d2dc8a77ad9deea5b5cefa3c05 SHA512 c51eaaef63a7496e223a4541d0560f694420b6ac4b2cde3779c405f0ab92d34aef7a37e4c41da9e59bd8a050c8d3eed330df3799e76a60ae35cdbc6f7c9cb8c1
 EBUILD sphinx-gallery-0.1.12.ebuild 733 BLAKE2B 0f8cd47e017894f01752ee41baa318f634f88f08cc124af08fb1cc8a7c685048a9de1c329a59b3236f521d70a35c4c0cc53f1396d784f69a7be7a5d32e73e175 SHA512 cbd0232a27ebda6c892416584263c15fa46b3648854654bd9ad3aec2d62925865fcf4e606ca462781ab5a728962b6d3070af6303084a09052b435bb08d061e20
+EBUILD sphinx-gallery-0.3.1.ebuild 680 BLAKE2B 63f80723329bb24afc9c59b8ba39db351737d6efa0139cb2de714fe7ff60e44450cee82fb767263e53115663474b99065786b8b324ddc4b383a3ce39d153bcd4 SHA512 78c7bd2d208ceef98d6eafe8ba138c462ea53dcfd6c4c3280651c385d810fab30f052d35ffce6f0e9a694a7523296a4d2e18c9512f7880c5ea288d6b2b0d93de
 MISC metadata.xml 398 BLAKE2B 9ba3eb9dc8d9d9e16cb83963ab758bdcd11c6f7c8ff5ee6a9244b8c0e9c9db2162a22b855bdcd43148c0d23ef8c31c075e36bd4afdffa1a2eb5f30d08ce00747 SHA512 3b9762099b163b539d7de52602291433608ef33a9e60d3713e07bcf0b2b8345a52a0b162f6be52c9a88cfd419e5bc4e59307d07213f1d5aa3c4ca892d91f8b9b
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.3.1.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.3.1.ebuild
new file mode 100644
index 000000000000..4f1ae7b02a29
--- /dev/null
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.3.1.ebuild
@@ -0,0 +1,26 @@
+# 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="Sphinx extension to automatically generate an examples gallery"
+HOMEPAGE="http://sphinx-gallery.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# tests need extra files not distributed
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index e6e38aa4600f..84f0b0a44a35 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,28 +1,8 @@
 AUX sqlalchemy-0.7-logging.handlers.patch 466 BLAKE2B d29b41491882359d22219da4257593e904d0775fa533c338f207b64f7e8b8f5f1b725cdafd3093cdb0de5123b9315a502fdc9db355e6c025f8267b2b1e519cb0 SHA512 a09af91fdd6a1cc9f219c9b45fbe2fa5d9a675d2c2dc769545af52fda44ced40f673426975a09dd943e6ba5087cf0c0caa771c106e0eb755c3ed97c4ddc267fa
 DIST SQLAlchemy-0.7.10.tar.gz 3541639 BLAKE2B 641532caccb6fea333198ba0c5064f7714ff75348c00dc762da24211fe6ff210c9e335a5b31ad5429e14b26804bafde6d597203aacddbd98d949d1315851d348 SHA512 631bc4ffb419defa531a66d82449fe48f93c88371ba0b8ab4217d900a0d1d90efe9699d8a9048d5c2ed33948c6d2f7cae46452ee45d442914018f3361e804367
-DIST SQLAlchemy-0.9.8.tar.gz 4080098 BLAKE2B c21837cdcd92b844ce238456fa275c95cd7262232c41a60fbc04ebeea27c1a96189d0d03612ce5bd0c4aa3aef66af456c0138c77db3cb7bb99d85e4552f818b7 SHA512 3df7d7a64cdfe7b684be98e7e9d6836da54c391343bb047224a11df888041034bcc54cc30d15dc3d56b5d397b35e6aabe5732e7ca8fbf553bd8d98731c249ea5
-DIST SQLAlchemy-1.0.17.tar.gz 4787165 BLAKE2B b00ead35149cfd7eab3476e29aa2b2b79eafeac1ef1f8551b81b84ee2a5f39cce2a6574b68283361b9264562e4a56d01ee694e455e4be9177d19e5720d092879 SHA512 18fc00bd80d136a65d5ad6929dac97a67514e001baaeaa57e95b31243cfe11aab9ab62ba8f7e68a5e833fbf024507c4908f99277445c8c3c9a3314981567978c
-DIST SQLAlchemy-1.0.19.tar.gz 4788659 BLAKE2B 813bc2148fd080762ea7748d9878500afac4148dc186a34172321fd97333eb6c8632ae3b05b2e8b187a3660ae34a426062ade56297b693d367eeea2c3966b249 SHA512 57d51fecb40e349b05da027bf39375a81c1d98e6d47f4dd076b9c7e2e3c8b6bdf8317e7b3e88c015cbd0d7858324ba0499a21a8ac39568c9ec95326e02af97bb
-DIST SQLAlchemy-1.1.12.tar.gz 5178158 BLAKE2B 92455943f3e5ce8c87fc9dd21da7c5ea54a9292fe2a3a319a8a9c8d54cd103193935d567326b8632d2fcd94664ef91cd1a3d621008bec684ba35ff73691ff01e SHA512 f9d14b3d4eab049e9d7377008cf11678c1413e204baad898093282d1812d242a544bbb6606b4e9a83b37d5c17bcec3c115ffe402dda8b6a84d0d5186415645e3
-DIST SQLAlchemy-1.1.17.tar.gz 5285761 BLAKE2B 58367c05a8e87aaa0c497455abfbb6c286ebab5f935d3d123d17eb7860a90ec414f825ebab41f386e3c229752a796516aa6ef5601d35a916a561ee98e0bc825c SHA512 df8a8fc7523dab64f27a8a27398c2b72e6b93eaefc4d46247596772cfd6f65b7c07ae9b3f57d21297b287b52958c0f5a7ce61fd4eff9979b73338fbb4e438324
-DIST SQLAlchemy-1.1.18.tar.gz 5286357 BLAKE2B e414b48cb2756d32240d401aa37dbe0725da2325f8e8b1d553e84f354747ac1885bdda52b9dab8273bdcc2bdd92ee00fc5813578efcc2132c7d5be473a222a42 SHA512 cdc14e289f1fb65aec09d738aa7409aeac6499984167c45feb2dd829ca7897026d3032b3a28c8203a9a3573d04a8995c8300e4fee3c491fe41b1d6fd1e92dd1a
-DIST SQLAlchemy-1.2.0.tar.gz 5451303 BLAKE2B 273edad173583d47d6ebdb4d3efddddb6e8e6c1e333667d71a1befb0aabc7ff8231f926c18d5463e1d4b815d2b2f39b7c9bca03ab3bf0f91f039b7ea55071e28 SHA512 0d9e57147b022955ad20da5b280e8734ba4be9585301b6e8fb9b96797d87d8707f95cb58afbaf310ec8033defffc4d794bec1d5089ca016b8dd9497e292881e3
 DIST SQLAlchemy-1.2.18.tar.gz 5675143 BLAKE2B 2e0a54d16b64801cb60b619c39dfba64d3b1705ac43a89f6a3873c9fd1bb9af02d38d1026f309eb3d33ad20265da8b3731d7d7092bec8fa035e4d696d74f1d5f SHA512 a3074e0f7b9a307937f02ad030811413f3c92b7edcc4f1c6eda7c94c1178708f8c920840385a9b33c7952e224fe46dc73223aee00123e863abf6d1d446aebdb2
-DIST SQLAlchemy-1.2.2.tar.gz 5460157 BLAKE2B 60c5066a2993d9878f5d3abec1a6a9a4d0a3dc5878df71baee895e5278b95696b775e16000da0ba4c2c358b0a90e70faff0b5733a4f00255b0ec0d605cdd07c6 SHA512 060ce803b8b621d51aa69100c598c424c36f051bdce1e2df3f4d837815f91cb55c4e089db5375b01832ec28bf42332311009c51c1b5e7aae92aea001ee880db5
-DIST SQLAlchemy-1.2.4.tar.gz 5555033 BLAKE2B 5301d365cf6462b8a61deb3f01dcf86897c0070fe80f570b91f94a02e1830088b558004d915d17589dfaea1e5fd382fdf88c44020f3b3b94974db773b5ed2db6 SHA512 a12d17f222cc5fc4360c439e19cae67a013af07e2c22b1f55511c4862d718578249e6bf83151eefe35957e530dbf18a565b08cded3a5e45dd21103201f4d24e8
-DIST SQLAlchemy-1.2.7.tar.gz 5571719 BLAKE2B 995c977cd5bf22b464e5316d579a3bd5b15f2c2600230c729381f3dbecd1dd6a728ee08d5e8afa8e212bdc7e5272d8723706daed1db0ec353e3b56f5b9c614d7 SHA512 c592916dae177bcda7b3d7111af4269815d555273b548e35b58caaf518f7a5dc2256e5b98601cbbf0bbc95405fadd89f8e6b977e0d8104ce4e216d5c6924eda2
-DIST SQLAlchemy-1.2.9.tar.gz 5606090 BLAKE2B 7aade70c37a6e9afb1e459c88ea0d1ef927541d3ff8c64a634f81ba871fb9d0d14841e1c7a1ed28c12cb7a4d84d6ede6bf132f54d47019967fec8acd55757c33 SHA512 88ef57b9e456d7047bd7b5fd9607c87a473a9917d662960b0614fbfc40891002309eda55e66e42a6a280c6d6e7e8e6921349901a19c1caaedace2d532b32af22
+DIST SQLAlchemy-1.3.3.tar.gz 5864870 BLAKE2B d109e0daf0afdeaba946c4b18d14428c108ff15041876c9a35cf8e5783f9b9a1896e69760b249c53af35e4575e66f4b59c855b4a244d7f6569fadfb52c5a400d SHA512 f8e0f580ba5cc7eaed985e5a3af8cdcc2dddddcd64bdf02b247242eeab542b5666a93d46166b5edb4b28af3b89df44bccfa92d5bf94cc0e173dbcd369ae6487c
 EBUILD sqlalchemy-0.7.10.ebuild 1580 BLAKE2B 6860bdd76eef99dd397c69450f1fea1af0ec7b1c6b07088b35887342161dfe6a67052a2ff8514ae00f1f5e4323766a8235af2cdb1b4739967e32c8334845e219 SHA512 9c405ee96b959895ab7eb155352186ea5a49a263053a819369cc672f2c835dc64a06d6d41d2bf2ca5a245e986a788d9cc80b679674e4f6f16988e88d7bcab876
-EBUILD sqlalchemy-0.9.8.ebuild 2447 BLAKE2B 9fc6bed573e8626b8020b5806f0f2bd41bcf27c23b1de2e1b44868796332b74e54aa589aba0072a16d400e8a53e9af5b8e9f41a3670f8b8503b4d5fe46191326 SHA512 29a7b19376c61b0b8e1fe70a7214d0b8b70db7876a74f9f9236449a3d321064e9d211d1e6edad25d76b14ca63cf7c7b2c59cc7e2fac92f007254570c87b73a23
-EBUILD sqlalchemy-1.0.17.ebuild 2131 BLAKE2B e4d5027218557cfa4fc9773ce7194a5ddf90c72e19acabdd7b3debb00c12c5cd8ecbc83ab68f915e262cbc1128231fa02c01ad61a25e8e518adb6f0d4268ad8b SHA512 eb97ad1c43704c2a3ac9ef80bb2b1308f3414990b0b16f0d87013d787bb28cd356182f3ec3bac7d2ed1a659ada377d5fb3102486182cb1737dffd241d72ed033
-EBUILD sqlalchemy-1.0.19.ebuild 2133 BLAKE2B 33086dd874495ecd6ff2e9922ace2d247010920d2c8a4452c05017b748f583932a36cd1008eefd9d0a924e10dfc174fbdd681a725bb68a999b8d883da23e759b SHA512 832230e569131653c94835115d0a3900d01035f47eb9681f157d3da9559e5e7789abb09406de1808e09fb2f34bae43e8cea0670a905272efe92d254468165fc7
-EBUILD sqlalchemy-1.1.12.ebuild 2124 BLAKE2B a1826d772dbd4bd51588cf83ea576a327eba39450490c114bdb76eeb5b0dad1481b194a5084c144e54032f233412f18e4cc82211644ffcacb9d7b2ae70b87557 SHA512 3cf58aa50a83d6adc591f8166600d63a5bbc5140304023d43e5aff07b0c63baf6d51df17521a6dafb65bf27c19047d6c0aa5fbe2258cef5869b4fd1fec163947
-EBUILD sqlalchemy-1.1.17.ebuild 2176 BLAKE2B c69f5779bd112a010c65932041c19cedda888b9cfb1e2a50e0206b96cbf6df9f8ce9cb405aaacef42615a2466a4b53d78878bb87c4685e4a67d5601bf57fed7e SHA512 ac45b87de51507591d423842e6d37ec74dfb008e9d7de74d65ac0ac1f878cb7a6b23b5ac2a5cb3c2d246c67a41e1536d5cbaef5821488779aa49af0f3feb18f5
-EBUILD sqlalchemy-1.1.18.ebuild 2176 BLAKE2B c69f5779bd112a010c65932041c19cedda888b9cfb1e2a50e0206b96cbf6df9f8ce9cb405aaacef42615a2466a4b53d78878bb87c4685e4a67d5601bf57fed7e SHA512 ac45b87de51507591d423842e6d37ec74dfb008e9d7de74d65ac0ac1f878cb7a6b23b5ac2a5cb3c2d246c67a41e1536d5cbaef5821488779aa49af0f3feb18f5
-EBUILD sqlalchemy-1.2.0.ebuild 2150 BLAKE2B 636e4d7f3a0650b724d6f2db70c059d027065fa1c980dc715072641e87217fa9061dba566ee97425b178abd51eaa659f3cdfb2fda3c18c1cd3530bfa158c499c SHA512 89b252a3a2af1dc0c357b30ee5d09c6fa90f592cb87661624c05dd5f47c396bd9a7844a0502763b2ad84f39fcb19c71a4e817814f97d574605dddf68a746a1e5
 EBUILD sqlalchemy-1.2.18.ebuild 1801 BLAKE2B 6672f802ecd8d243ab6e8ce1426667ad2ca97a73f6b5903b4a599101fec127dfc65c9cf51ce8393c84879c16f4603bd1504acb39e3ae20ea4022eecb91657611 SHA512 4dd721d58adf5969dfa13b8e62be73ec3ab0e445a70f67602705399fcd6b3d3a96839616c14d5fdec966f2d29437e0a600c4438bdc9af53d46b7c333b40d34f7
-EBUILD sqlalchemy-1.2.2.ebuild 2167 BLAKE2B 4b03ed7d846090acb42aa02325e034ab22d9a7c368dca3c4d911d8b8aca40161dc337707dce1122ab2ff58608a319708491050d9fa1679d4c4bfc904adbd96b5 SHA512 a5a09af060f1beb1591740d39e5014f1ee4b8c0081fd71d921c80dc31760696db578aad79828ffbdfb1adbe65680d7777ccf0884cc5d75f5f7286f942eb947f1
-EBUILD sqlalchemy-1.2.4.ebuild 2200 BLAKE2B d642f481654e8d51152579a28300edc04098dfa6c3bf4137c4a13c7e93d7b6367789c70adede05e522ea64c9fb9a8e82ba2f48e5c5b7653ea38fe705cbfa5c00 SHA512 610e90929abd1bf8816d7a3ed4764c19f24f587e525c2497816be8d136af677b495dd0af04e4b8699345d01a31f3c3601bc25c9d2f878896539fb66dad8c2d2d
-EBUILD sqlalchemy-1.2.7.ebuild 2200 BLAKE2B d642f481654e8d51152579a28300edc04098dfa6c3bf4137c4a13c7e93d7b6367789c70adede05e522ea64c9fb9a8e82ba2f48e5c5b7653ea38fe705cbfa5c00 SHA512 610e90929abd1bf8816d7a3ed4764c19f24f587e525c2497816be8d136af677b495dd0af04e4b8699345d01a31f3c3601bc25c9d2f878896539fb66dad8c2d2d
-EBUILD sqlalchemy-1.2.9.ebuild 1752 BLAKE2B dd9fb06802982ec151d6dbc616c5b7ea5746a56581dbe8138b249d5b796d38e2132bea0ec9ade37a6c040c4b96d689b3863535c693efcb5f1a8d979f7f7d80b1 SHA512 1c70cfbbbde72815125ceeb7cac11ffde679db51ce3cacf66a4933c6d590abc536275705b2a1016f3a32a169d3b90bc04556677d74067b8daa238e47309640ff
+EBUILD sqlalchemy-1.3.3.ebuild 1640 BLAKE2B 08335acda9ca52f7988b466836a77bed6999564cc6b40a482e76302589fe949ddfae5d56e24cb3102978bf604dd2b3826e369ef6e3e71e81951e044402b2b7bf SHA512 ecfb9cb0a3773380bf1bc20361f58ca59892bf7a80d6858b2c357e8aebade51a53733a9e89e46d3325f32b6f217595eba88370367b62e6122e12dba452c8a6d8
 MISC metadata.xml 313 BLAKE2B 71212a9a3076b472b488bdb4e12fef98e16881a32a8383c5fa6a9008353d2e043dfe64cb536ecef145ba74ba77ef3a6c43d705d5072d1b56e11eacfadd1d0edd SHA512 ef6298f9e38312117a0d1ab1e63f2fb21ae51ff149053603c19437b90d954827858579ab8f021cb52919aff4474a27f5a598d8515a7e5a9f2e7e35aee53c5326
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.9.8.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.9.8.ebuild
deleted file mode 100644
index 55aa5a23ee7e..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-0.9.8.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples +sqlite test"
-REQUIRED_USE="test? ( sqlite )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? (	dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Create copies of necessary files in BUILD_DIR.
-	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
-	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null
-	if [[ "${EPYTHON}" == "python3.2" ]]; then
-		2to3 --no-diffs -w test
-	fi
-	# Recently upstream elected to make the testsuite also pytest capable
-	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
-	py.test test || die "Testsuite failed under ${EPYTHON}"
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if ! has_version dev-python/mysql-python; then
-		        elog "For MySQL support, install dev-python/mysql-python"
-		fi
-
-		if ! has_version dev-python/pymssql; then
-			elog "For mssql support, install dev-python/pymssql"
-		fi
-
-		if ! has_version dev-python/psycopg:2; then
-			elog "For postgresql support, install dev-python/psycopg:2"
-		fi
-	fi
-
-	elog "mysql backend support can be enabled by installing mysql-python for cpython py2.7 only,"
-	elog "or mysql-connector-python for support of cpythons 2.7 3.3 and 3.4"
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.0.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.0.17.ebuild
deleted file mode 100644
index f69c32fee2e2..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.0.17.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 eutils flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples +sqlite test"
-
-REQUIRED_USE="test? ( sqlite )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Create copies of necessary files in BUILD_DIR.
-	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
-	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null || die
-	if [[ "${EPYTHON}" == "python3.2" ]]; then
-		2to3 --no-diffs -w test || die
-	fi
-	# Recently upstream elected to make the testsuite also pytest capable
-	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
-	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.0.19.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.0.19.ebuild
deleted file mode 100644
index 980d020b130d..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.0.19.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 eutils flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples +sqlite test"
-
-REQUIRED_USE="test? ( sqlite )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Create copies of necessary files in BUILD_DIR.
-	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
-	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null || die
-	if [[ "${EPYTHON}" == "python3.2" ]]; then
-		2to3 --no-diffs -w test || die
-	fi
-	# Recently upstream elected to make the testsuite also pytest capable
-	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
-	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.1.12.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.1.12.ebuild
deleted file mode 100644
index 308c5123fad3..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.1.12.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 eutils flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples +sqlite test"
-
-REQUIRED_USE="test? ( sqlite )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Create copies of necessary files in BUILD_DIR.
-	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
-	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null || die
-	if [[ "${EPYTHON}" == "python3.2" ]]; then
-		2to3 --no-diffs -w test || die
-	fi
-	# Recently upstream elected to make the testsuite also pytest capable
-	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
-	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.1.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.1.17.ebuild
deleted file mode 100644
index 5f1fea0fc874..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.1.17.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 eutils flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples +sqlite test"
-
-REQUIRED_USE="test? ( sqlite )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		<dev-python/pluggy-0.7[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Create copies of necessary files in BUILD_DIR.
-	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
-	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null || die
-	if [[ "${EPYTHON}" == "python3.2" ]]; then
-		2to3 --no-diffs -w test || die
-	fi
-	# Recently upstream elected to make the testsuite also pytest capable
-	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
-	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.1.18.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.1.18.ebuild
deleted file mode 100644
index 5f1fea0fc874..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.1.18.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 eutils flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples +sqlite test"
-
-REQUIRED_USE="test? ( sqlite )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		<dev-python/pluggy-0.7[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Create copies of necessary files in BUILD_DIR.
-	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
-	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null || die
-	if [[ "${EPYTHON}" == "python3.2" ]]; then
-		2to3 --no-diffs -w test || die
-	fi
-	# Recently upstream elected to make the testsuite also pytest capable
-	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
-	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.2.0.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.2.0.ebuild
deleted file mode 100644
index f09d2c23711f..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.2.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 eutils flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="doc examples +sqlite test"
-
-REQUIRED_USE="test? ( sqlite )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Create copies of necessary files in BUILD_DIR.
-	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
-	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null || die
-	if [[ "${EPYTHON}" == "python3.2" ]]; then
-		2to3 --no-diffs -w test || die
-	fi
-	# Recently upstream elected to make the testsuite also pytest capable
-	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
-	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.2.2.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.2.2.ebuild
deleted file mode 100644
index 5097c22e2208..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.2.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 eutils flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~amd64-fbsd"
-IUSE="doc examples +sqlite test"
-
-REQUIRED_USE="test? ( sqlite )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Create copies of necessary files in BUILD_DIR.
-	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
-	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null || die
-	if [[ "${EPYTHON}" == "python3.2" ]]; then
-		2to3 --no-diffs -w test || die
-	fi
-	# Recently upstream elected to make the testsuite also pytest capable
-	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
-	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.2.4.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.2.4.ebuild
deleted file mode 100644
index 6c5efcc8426a..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.2.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 eutils flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="doc examples +sqlite test"
-
-REQUIRED_USE="test? ( sqlite )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	test? (
-		<dev-python/pluggy-0.7s[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Create copies of necessary files in BUILD_DIR.
-	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
-	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null || die
-	if [[ "${EPYTHON}" == "python3.2" ]]; then
-		2to3 --no-diffs -w test || die
-	fi
-	# Recently upstream elected to make the testsuite also pytest capable
-	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
-	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.2.7.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.2.7.ebuild
deleted file mode 100644
index 6c5efcc8426a..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.2.7.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 eutils flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="doc examples +sqlite test"
-
-REQUIRED_USE="test? ( sqlite )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	test? (
-		<dev-python/pluggy-0.7s[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Create copies of necessary files in BUILD_DIR.
-	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
-	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null || die
-	if [[ "${EPYTHON}" == "python3.2" ]]; then
-		2to3 --no-diffs -w test || die
-	fi
-	# Recently upstream elected to make the testsuite also pytest capable
-	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
-	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.2.9.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
index 52319a30fd7b..af1955278d61 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.2.9.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
 PYTHON_REQ_USE="sqlite?"
@@ -17,20 +17,16 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc examples +sqlite test"
 
 REQUIRED_USE="test? ( sqlite )"
 
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
 DEPEND="
-	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		<dev-python/pluggy-0.7s[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+		dev-python/mock[${PYTHON_USEDEP}]
 	)"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/statistics/Manifest b/dev-python/statistics/Manifest
deleted file mode 100644
index f808eab36911..000000000000
--- a/dev-python/statistics/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST statistics-1.0.3.5.tar.gz 8303 BLAKE2B bbefc6b9ea5fa00f2980072afced8810e9a33acba5ef07ffbaa6c6356a1dd66fe8062b98bf6d4273860d482aa352453395c16143220afca7050cee3546fad8ab SHA512 1d7fd2304a885dbd9ebc564323349f9c5ad1ea1ecea8182b52a1f42308963bd49f07c9dc9f0b87a35d2f6ed3c37429dbc38183c0b1bd65a527558e4504a9a3a0
-DIST statistics-3.4.0b3.tar.gz 12486 BLAKE2B d13c8fdba3a8788f1959a97fb3d11c53cdfa5d217751b0b1303d0be186e6f37a27ba5f641cf0cc90ecb96482527bdaa4b61778795a6c6a0fa19a93d881376d2a SHA512 d7bd7614fe3afe24e542eaebfedcd2147111ec567024e2533faaa379438c3f53138ce205c9b8fc71bed51bc13d5cb3d370b476f199a6250f4457adcba4be6522
-EBUILD statistics-1.0.3.5.ebuild 542 BLAKE2B 255a4da31e877440080714b88847ff8ec17f4f2b8908f5c361e0418f3679d6a6b6f610e96c13d9d7957261600fdb5337e0abca4399f63de0b1c3f22155681b24 SHA512 e91916bde6009344067d5234948ce0c869cd2c8f6802eb2384e54213daf631c08d864deff25ae7ecdfbe3a7b4cd728ca92d56e52816a7fa6047531cafa70cd05
-EBUILD statistics-3.4.0_beta3.ebuild 588 BLAKE2B 4f82b3951b8fa98a5c9017b827ece3a459980bd7ecb4e7141badb1d3827e772a71c52c15c379e1aa3ac8437f27fd34be1b8188fd45fa84ce775166b8e4459db5 SHA512 dc804c5d03d10c96ec83eaf162095d68c18ae6f958686362d7c31207d1d9562228014c2254eab4a3222379b4fd1e5898f5dbbff1049fe4fe3eb5ceb35faf0a1f
-MISC metadata.xml 527 BLAKE2B 6b5ae878e0f3364775f80e272491e8e6b618b4ea129544760a3f56b6a4db33efcb1f85a2af4f812d67def3430218205ff6637c427fe2ebb7a812c6ff9d573e8a SHA512 a8a996bf135883825f9857cbb3a8608a1f340bdb32393b7438fa863c617fea26ce0ef05e2985b2bd763a73aaed9a7c565a7b789e98bdc231831b1b315fca0251
diff --git a/dev-python/statistics/statistics-1.0.3.5.ebuild b/dev-python/statistics/statistics-1.0.3.5.ebuild
deleted file mode 100644
index 45d4800ffbe4..000000000000
--- a/dev-python/statistics/statistics-1.0.3.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python 2.* port of 3.4 Statistics Module"
-HOMEPAGE="https://github.com/digitalemagine/py-statistics
-	https://pypi.org/project/statistics/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/statistics/statistics-3.4.0_beta3.ebuild b/dev-python/statistics/statistics-3.4.0_beta3.ebuild
deleted file mode 100644
index 10ab210b6b9c..000000000000
--- a/dev-python/statistics/statistics-3.4.0_beta3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy pypy3 )
-
-inherit distutils-r1
-
-MY_P=${PN}-${PV/_beta/b}
-
-DESCRIPTION="A Python 2.* port of 3.4 Statistics Module"
-HOMEPAGE="https://github.com/digitalemagine/py-statistics
-	https://pypi.org/project/statistics/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/tblib/Manifest b/dev-python/tblib/Manifest
index fe7cea46c4b3..2ef29371c5ca 100644
--- a/dev-python/tblib/Manifest
+++ b/dev-python/tblib/Manifest
@@ -1,4 +1,4 @@
 DIST tblib-1.3.2.tar.gz 26958 BLAKE2B 5c50f6b63b45f34f35843d9e39f03493715e19304804d38e134cd63621d1b72116a84d1403e25a4681d84568dfb87cba2874eaa10fccff6054e121aea86f88cd SHA512 c04d204e8dc53c87fecdb484162488ca10b509341ad030e67300d9c3ac61d298888dd56c1cef8318bcf13d90ccd5633520d75ab45dd0aea8de29ba7317adacce
-EBUILD tblib-1.3.2-r1.ebuild 450 BLAKE2B 14d42eed9248d21f219db3a6f5ebb90f23b2ca3b433d4954baa120d494127cc82e09a6960d5b4f4c1174ac03f5005110898a57ff1a7fce64bef106477087e8f9 SHA512 5acb1d8e414d2793b8008a16a7d1c75e6e8ccd138798b4fd44a9e888db989358555f31565f235a3ed2a0a41fe23b5497bf1265e965da60715798c2d19a0b2021
+EBUILD tblib-1.3.2-r1.ebuild 468 BLAKE2B 3eb2f2d54233af110a20629a9c7c022ca218e1a49995b726a793a556680babf68a2af16825921250fe2d4b279148948af437e349c7e47a1229b857da5fff0b95 SHA512 a5da1c425e9b744c408cd586264240b65a697dda6db6e0a1d1909b1e85c5a35cd6495ae33aac88a7953a636b1ca21134e9fc3cf7bae3c8e4097786d21150f383
 EBUILD tblib-1.3.2.ebuild 437 BLAKE2B c81b05859ada19c3f5b5edf96e78c84bbf43d96805ab8c1dca818b2464382e9ea14044c4c1b39755c2983c59bbeda1da0fce64cf2bb6e463449801d43d6a54e9 SHA512 e6cbcfc3d6110eb8e9551af6d048173c4a2731e36debdd73cd77dfaf0a6c9b2630517e823994606e625ab5ca5e49b92b2746680733b01d5376268b758f67a653
 MISC metadata.xml 380 BLAKE2B 2d2d82601724f6960ddd56f2c45b5e85c30bf1366c6bcfb6b6810e885c87bf974c7dae1cf0a4d01a5bbfcfa9c5b2bb8aca6460047f549786527b5d1742b315c2 SHA512 649b0a9457aeb0b3e211e293305a8bd93f0ae1c91c5c31f2d7d1d94c55eabff5df4f7bda64c19d07b216778cbe7bb68dbdaac3a06d9a627a06b8f205fe818d40
diff --git a/dev-python/tblib/tblib-1.3.2-r1.ebuild b/dev-python/tblib/tblib-1.3.2-r1.ebuild
index 00d5230f3fdb..e25125f9130e 100644
--- a/dev-python/tblib/tblib-1.3.2-r1.ebuild
+++ b/dev-python/tblib/tblib-1.3.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index 612106525ddb..ebd4ec908484 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -3,5 +3,5 @@ DIST typed-ast-1.2.0.tar.gz 202702 BLAKE2B 79e919019763f4af0a2f24108cfa418693dc5
 DIST typed-ast-1.3.1.tar.gz 204285 BLAKE2B 209911e0dc7291ec4b48ce7c5163d738ccd0978027d2bb1b64004c0f08feb7567d83ba8f04dfe48975ecc2116ee365a903f455dddcaf1bc07cf5deb08572f92c SHA512 390547485878ccb7e3a168e24b8b63c1784888ecedfae980562c3c0c0073c73ebef27190feeac99745c205d18061ffe5e3eb0830068968176ef2a06fd3ae4b2a
 EBUILD typed-ast-1.1.0.ebuild 409 BLAKE2B 71cb7ab5568e37a8e72861e69a453289b21903bbc3441f5a72cdc47b127e65e7ddc78f1f2442d22f2cf8f05e918a7aacf96b4264987765b3ba0c6ad8aabbdc69 SHA512 aff63468afa0ea05f89c2704473c34eea72d80cdd8f9df76f9f89e49b47d36d0d9ff51aa5899cd5ea57b53a809b8df1e117e9d29e3b19d26bf277e36dcf5e76f
 EBUILD typed-ast-1.2.0.ebuild 451 BLAKE2B d2d3901d15afd51d55c47e4d532d11f5508d8319fc8ff8d5b17600dc8aa96388ce19e6383a3af890f5b48106024effe6c83fb47712b8bc4b461e9d80514777a9 SHA512 6d2629184ab9d972644c4f7c033aa5e73f7678e71f5851e13a28f68f9df9d31565e6eb46a1ad2ebda37b274453767576236af38910b038b7ba027fb029efaa4d
-EBUILD typed-ast-1.3.1.ebuild 465 BLAKE2B cf73645c24413f2741ed33712e592469c378a350bad7308c6cc2ec9a65a84e4c4f433dd2cf7a2fd61687011ede7e8e513a3591f51f06e166c89f62e21cd109f3 SHA512 79d317a8acf9b70564d68df170573ad135497c8769ead5ff28a6b5c17a32f91bb8231a0dc2cea864c6cd9630f3e8bcb4b36ddfb086b59078259c9004823d57eb
+EBUILD typed-ast-1.3.1.ebuild 470 BLAKE2B 1ab1e81bb5b52ce2a5e4ce032e34146ea01a736abb74c436f2f64a853b1f2d88ea771791952a67438435c744fa67a4153643af3da67b0dbda219f74cbda961db SHA512 fb249bf63ee8008cac8be6b5b3e5d8109bd223bcc5e20b95dd011d67b3511c5f69870c1f63a6d3d559a7463271bb61600e08092ec2b1e0a39adfb9748cb5bea8
 MISC metadata.xml 371 BLAKE2B 79a6eb0c3d333193154ed5bb5364c38afe787e0e0a845ed1c77e98e305c4d5f396c0ae10303e94a8bb6c407f937674fa48b9f8dc27c2c41cd36f74bbe05563f7 SHA512 28a6e9c5ac51f6b86cfbb1f5cf06a1dbe524326a74e69ca63ff2440b116a4780d87de84d9de4e070ad3669d0732be5e4ff87681570a57ff22e395d59e19a1c3a
diff --git a/dev-python/typed-ast/typed-ast-1.3.1.ebuild b/dev-python/typed-ast/typed-ast-1.3.1.ebuild
index 4ea5d3b98ce4..680a3a2fa802 100644
--- a/dev-python/typed-ast/typed-ast-1.3.1.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index 274b5196a66e..c7c619295536 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -1,6 +1,4 @@
 AUX uranium-3.3.0-fix-install-paths.patch 1716 BLAKE2B 13ea6150f1cfb1a07ac1886be8281110bbca5abd39b78807fe67317052579efa0498bc8a321d09fc953c9358dfb963ed210451549d14d6f58ac4a94cc3e9a5d1 SHA512 a7007c74a2e46e281dc0db6fcc45475e36f3a261445c2162fe0a548e577cd7cc344957e3284c52fffdd21cf223e91ab5b4fc1936b6893de614c4143cd1b40419
-DIST uranium-3.4.1.tar.gz 646742 BLAKE2B eb65d5a35b3c63cfb069f6c1077a91b7aa10517dd7fe6938b639f1229e61c5c6aa892447cd9d5851df46808f01f237820811b4358a235c50a89f2333df3418ef SHA512 59e0a605f3d898765bb670104cabb7fb1471061934900e63b54c1a07219970e07414a3983e96a577f5986302779b7acedc8e0ef0da3756dceefc0170ec80645b
 DIST uranium-3.6.0.tar.gz 668552 BLAKE2B 84ab1eed5474bf14aec5b7782b332e9846d14f589c0dfa7366c74ad682fdc0a8e5ef94a0b9576f0e80cf792b49132d3abb3f17341a2e8570d08bf898231deca6 SHA512 41779e9cf76dff8f74252f668d1cf909c93f4f1416f75d2ed263f89fcfccfbcebce5580d8202d8d1697491139db448bbfa76e2dbc761dd24cb98030b3241e80d
-EBUILD uranium-3.4.1.ebuild 1386 BLAKE2B edfd604861aadc381f2b921a80b73a637c619e951aea9002ab5e8cf42a3aa1e0ebc239cd697992ecc2f575484e5fd0ca2b2bae7848b791a93606fbc415f8d068 SHA512 1107c60e0eee9920beafe186f6a745b104fb0968c0dc80939901e5fcb51fe0487228c5f3b7b0e08491e5b75c6d1356381ad949889d961c906e1cad656c6f812a
 EBUILD uranium-3.6.0-r1.ebuild 1416 BLAKE2B 3ea73653aa36adc305b81759ded97af57a2a5bd901a73815a8d0372ebc8fd5d1565626016f5b4a9d7556817e376ff696cfc84049201a570cf58b6dffe383bf6b SHA512 2716709771e66c3d2de8912c5fe4c5ad8f5bcc453575a1045c9e44225e5cb52fdb06240457ef8bf1c193f5b141f76c8ed912393e7fbfb555c5a48c64f0970979
 MISC metadata.xml 975 BLAKE2B 42ea7df7c2ee42408ada0328335319d95edc41c92d8ae74d77fb178629e48c7ab7886e4ea07f058b9be9b67f04d29b795eb353e47de60370b7949158cb7798ca SHA512 6074599c0b62f2f527041621550ec183bfa26400eee212c3e9cd0ab9742917ddf762ef668a6bba4628cee8063a0f40104f21d25e260de1d164b61389c9544824
diff --git a/dev-python/uranium/uranium-3.4.1.ebuild b/dev-python/uranium/uranium-3.4.1.ebuild
deleted file mode 100644
index cd83c93f844d..000000000000
--- a/dev-python/uranium/uranium-3.4.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit cmake-utils python-single-r1
-
-MY_PN="Uranium"
-
-DESCRIPTION="A Python framework for building 3D printing related applications"
-HOMEPAGE="https://github.com/Ultimaker/Uranium"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}]
-	<dev-python/PyQt5-5.10[${PYTHON_USEDEP},declarative,network,svg]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtquickcontrols2:5"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-DOCS=( README.md )
-
-PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		cmake-utils_src_compile doc
-		DOCS+=( html )
-	fi
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" tests
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_optimize "${D}usr/$(get_libdir)"
-}
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index a0ee352dfbd6..f2a2ac8a4eb4 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -6,5 +6,5 @@ DIST urllib3-1.24.2.tar.gz 230699 BLAKE2B 9c2f2be8fa743f542493d75072c02423d1bd40
 EBUILD urllib3-1.22.ebuild 1750 BLAKE2B 053a1a4590e26d363c8a7b76fb2bc69f16a2d20e7532e44b5b6f15f0a1cb3e4594318ee1d3cc3f28014fd0f4f077d0a056448e720a6ca0f596412aa411436081 SHA512 a8cbb45a3aefbe76aa0119d2a67aed90ed95769c68e296da7aed7a2d85b53c42c4235c8439608351da6eeb03a2f97c25bd25ce1be78efa1aaf91c4fc4954ba38
 EBUILD urllib3-1.23.ebuild 1906 BLAKE2B d3e2981f3133db3ac25739a5740c278ccd238d6a926265be96da15b200341f50bf138cf685b0d28735bbdc9328d45b237a8a45dde63f920b2075f05db421b6e9 SHA512 a38a14962ac9ffd7e86397545974721aff6c745da4d25ef07a99d0c4effb670b9d95f74b3efbfb8fd7624cc118621d99c26de2d9fec691f8f2d4b6d92221df62
 EBUILD urllib3-1.24.1.ebuild 1819 BLAKE2B b1d16553a388611486ade62774bffbf471eeb3336e4a4c7d42b2e1721239081b2cca61c48eb91291a387d24619763b13bc8ed08faa8461b0e53a4e61309d51ea SHA512 8b7aec6288e77c410e4ce47c983f1033a120610478d4ea95e0f813c314ab8f917211ff77abe419bd9bff21b8c884b86963a17a77aeec407462c66c526b9c9158
-EBUILD urllib3-1.24.2.ebuild 1817 BLAKE2B 1c30cca7140f2ecf320f0db31e5f652cfa21c4ff5d2579460745560cdd807730f585b3f886e222a9c565c3c0e643ea923117ad4d1f514456336891b8ea6f1631 SHA512 b8fb461dd82f15976a14a0f5487a1739d3b1ba5a94f45f08d35c0d24e807ed2ff69e6819661d10dd936c5f1377da917e3e90b6d6c454e6c92a39aaf897de9f4f
+EBUILD urllib3-1.24.2.ebuild 1816 BLAKE2B 69318d1cde8471103d9d9a4116b39fb99593114b09496af5319808605b816e7b38a802293c219e091042df9595907469e05a4c6e123e9ff089d422db4052d19a SHA512 b10ef510ad19d1b74255f0cd1e504e4b017d19a7d95b54d47a1f538b89ebffebf889a19d91b7c21623ad96796b728c68cfa1e694261e431f4a96692e66338b86
 MISC metadata.xml 376 BLAKE2B 2e9ba1b23bd9ab2770d23ce9bdf21f4083f46184c22d1dc0bd449b6605c24a2ef0168e1503327b549ba55e81b7bb52fe5f73fa375f06f3c64fabfac6cf5a9d77 SHA512 97d216a4841d8c78655c923060a0040b75fbb2d19a42e51081fc63a4af80514db5abf09a02706cc52387ab7ac72e964f947f1ded50bcc7f8fae6d022d5353543
diff --git a/dev-python/urllib3/urllib3-1.24.2.ebuild b/dev-python/urllib3/urllib3-1.24.2.ebuild
index ffc0a49fee83..fdfc815c685f 100644
--- a/dev-python/urllib3/urllib3-1.24.2.ebuild
+++ b/dev-python/urllib3/urllib3-1.24.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 #RESTRICT="test"
author	V3n3RiX <venerix@redcorelinux.org>	2019-05-04 12:02:00 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-05-04 12:02:00 +0100
commit	eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch)
tree	ce35c6d01b5ff5de95c3a20fef853b9a6518ad2e /dev-python
parent	b7ebc951da8800f711142f69d9d958bde67a112d (diff)