gentoo resync : 03.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-03 13:42:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-03 13:42:34 +0000
commit: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch)
tree: 3cb05783d73b2c33589ba305144a31c718e123cd /dev-python
parent: 16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff)
226 files changed, 1399 insertions, 972 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 03c5b370ffd1..2729380b39d3 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/apptools/Manifest b/dev-python/apptools/Manifest
index 7186a9a1d891..dbb5af2943eb 100644
--- a/dev-python/apptools/Manifest
+++ b/dev-python/apptools/Manifest
@@ -1,5 +1,3 @@
-DIST apptools-4.2.1.tar.gz 274521 BLAKE2B 020159d52c07e83fca35ada2d73a027405a31d7b23526b57394390cddf3e5c51fc76566cea61443749c8c7651b2ef30abdfc58f35d8bb1c7eb28e1b6e882eca5 SHA512 03f89b431db496082ac404456f97792f68b580ee77451e6f003b5a2830cd2f698124487045b6cd5fc15b700fbf7467553a384d6e638a322627f8dad7c0b45fc6
 DIST apptools-4.3.0.tar.gz 291137 BLAKE2B e86ea970fae0c1e5b3961c6cc2cafccdd43d6135b9c524d533a09e1f631c78cbc4cec841ac1737695fe1fce957f19823232441d1ff3470f33f4e043e03f7c373 SHA512 ba3ad2c157bd1837522d8edbb834cded0dd6d9c2440ff54af0abfa0716f0485b3519edf79a74c64133d963b1afc769e743688a3bf60fd1d2fa384e8e3bc399cd
-EBUILD apptools-4.2.1.ebuild 1341 BLAKE2B d7424aa57e5c9daa82f172ed578fbdae7ebc77a73d63bce123ae141e2e2999dc31b7dd8f3f0037354285384422b8eca3bf22f8d932e892254af52b2d5bd1cef0 SHA512 9b5bb078a1b36d9c0bcdb92bb96f151eb85d017a7cba8ac553cd5195485759474eb32319659b8eb9e587d007d23c228c4cae5f99a805f5b6521527ca151d9a31
-EBUILD apptools-4.3.0.ebuild 1378 BLAKE2B 61ab4d581aebd16df83001de85e26697b39d3d1879798e5d33dbbe299ca68caa34000558ae8e9d70e030d647e4154307b14f59f1588c68354505b7aa4ee0410a SHA512 6c50ba13ba2fae2d468735536ec957d8b67f730c8923af0acbeafd8b8117c76095e173c4f586775253297b958af15b1cccc1d3f927a47d74f1f74733f5b328a1
+EBUILD apptools-4.3.0.ebuild 1377 BLAKE2B e542b0a8b8c257ea9462f1c40ae6622674bd56ad3c06b6103b75f0740d403ecace0ebc5d48d3d86cc396f5af17c79034ff88eec3ccebed3bd768ed08981ae443 SHA512 3f2d5b4bba1a89e91c5c642858d1294cc826981c7a82208425da260464802855c2a96e6e6aa4c19d8232a756172a7a6d2620bed24567ab53a32619e6c68fcd54
 MISC metadata.xml 524 BLAKE2B f83435085fc0ad0e0b88c38359c7d2fd3dc09e7b86b08dde22feabf21e524a296bcf037e683cbf5e3b53f6ff1cd151517eaf873f5d36ca36f949c07fea7c4e3e SHA512 5a3f6e40a6500043d2ceb95c723a2df155d17f1978490c1330bba584a514e51e71cb456dd98f6fcf8e701fbe0900e5d0e71f242bc863af88742dbdc7c73f4f84
diff --git a/dev-python/apptools/apptools-4.2.1.ebuild b/dev-python/apptools/apptools-4.2.1.ebuild
deleted file mode 100644
index dfa685967dc9..000000000000
--- a/dev-python/apptools/apptools-4.2.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Enthought Tool Suite: Application tools"
-HOMEPAGE="http://docs.enthought.com/apptools/
-	https://github.com/enthought/apptools
-	https://pypi.org/project/apptools/"
-SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RDEPEND="dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/traits-4[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		>=dev-python/pyface-4[${PYTHON_USEDEP}]
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-		sci-visualization/mayavi[${PYTHON_USEDEP}]
-		dev-python/traits[${PYTHON_USEDEP}]
-		dev-python/traitsui[${PYTHON_USEDEP}]
-	)"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Ignore test file that imports a long deprecated module of traits
-	VIRTUALX_COMMAND="nosetests -I test_state_pickler.py" virtualmake
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/apptools/apptools-4.3.0.ebuild b/dev-python/apptools/apptools-4.3.0.ebuild
index 6a4fd58b2c81..8f9bee2de9ef 100644
--- a/dev-python/apptools/apptools-4.3.0.ebuild
+++ b/dev-python/apptools/apptools-4.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/atomicwrites/Manifest b/dev-python/atomicwrites/Manifest
index 7a691921a262..c2b207250dd4 100644
--- a/dev-python/atomicwrites/Manifest
+++ b/dev-python/atomicwrites/Manifest
@@ -1,6 +1,6 @@
 DIST atomicwrites-1.1.5.tar.gz 18951 BLAKE2B b0932995aae3ca23c11aace182429f4888819ea542a12b59d5b7ed4621c4759285d0cba306437bd1ce35b1ba32eac8ae6afc6548f2bae61870dbf03927c4fe75 SHA512 4de8ab93dcb226c55e8ae1b0ef883c2e1eeae50ac6596afe036ca51dbf6b094c13dbf2d792972312d4c53551886aaa2713aac54bfab42b85abef4d1146e039ac
 DIST atomicwrites-1.2.1.tar.gz 11660 BLAKE2B 06b4ca25f39be0e7e8d8e8b46749d7dce052f912e82b1ccd39e308c8ed51ab0d4891f00c11d0e52ef50901c01566f20fcf1318cb472c9a1f3a08617fd1b56235 SHA512 4df7ee97e0817a80378b273ced310b8ad88eb6ced93a594a6e3dc38ad1e7208226fde01b6d282f85583c57a50859e82c85bacaae8a7c64fce55e6965f74b12c5
 EBUILD atomicwrites-1.1.5-r2.ebuild 578 BLAKE2B ad9188acc6f21a3352510d2efae465d010e763f21f45d6604979b4a48da0e77817746037f8472bc86bdd034163e0c75da40a56784eb0e979e856b5dc86d8eeb0 SHA512 1af57e581631a2cda8f7ee9de709bbd2abb1475d5f25331d9fa2683e5b75892f897e68f092f96b5ffe522a5d2b1966aca0a81a37fe80c38f08b9599d63d2b715
-EBUILD atomicwrites-1.1.5-r3.ebuild 969 BLAKE2B 96de4cffff6aecd97c72315f1b3ea2caab06746c7bbd69f2c5b731b05044c7dac2daceed4d2f66963d92238d6ab2f8c9ecc4faf03cb30644684dee547f53bb18 SHA512 31c9e479f62a3874321e013447041c72e724de5a52bd3e9aa089a65c143c3b120045c5c713e0bf5fe1e342587c025d3082c9b54699c342451d05304072b5c31a
+EBUILD atomicwrites-1.1.5-r3.ebuild 964 BLAKE2B b07c9c8dbed934abf84f2429c6d7ae68c978f34e5a7144c0620fecac05e1782266998cecad0566042ed174d5203601e28732348b3a9083f145b3abd6c4fca54f SHA512 e972abc8d699ab444cea2177068baf4a5ea415885617ad9cef3b781b7d7410f71af8cef58eac3119e11b35b8377d2dbd2df30668f146ee80e7744871469d6793
 EBUILD atomicwrites-1.2.1.ebuild 1008 BLAKE2B ebab5c6fa20d6b453ef5b01c4b9b885f11bc2a7cf9892078b9ded53969e9fd287bc47c63be61dd0a9a175ca11bcd8d4c633859601adb155af733d5a5bf4cf92a SHA512 44573d3cc94242e138d389f7b3bb57e9a56eb851a1215a29c7231870e2a807bda4f2f049025595dbd56dcaa791a51649d386381743f118c99edb41f023b6a51c
 MISC metadata.xml 438 BLAKE2B c2a138ede668039b703fdc3e2ca8e1a7a07546e01540fdc502d79a48a8ddfae8dc7a79ed371373d95054731fcb25af67daf75ef5a1c08fafe9976f7a2c30525d SHA512 f38332e752b8bb660d8d8291b897fc96865a134108198e01df2dc4365c0c6e87c6039a907da38080a4d07d7c57750f8a32c6d6c3653b57f5aa193ca5b5b53449
diff --git a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
index dcbd0799a85b..aed19583b1fd 100644
--- a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 412df7d3a69c..c3c03345b18d 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -6,5 +6,5 @@ DIST attrs-18.2.0.tar.gz 116817 BLAKE2B 79d50c9b49956bbc1e04084eed36a5f65f2dda8e
 EBUILD attrs-16.3.0-r1.ebuild 870 BLAKE2B e7b23da8eb4bf32594bd5bc17924231a4c42a40efc80963522a32361b2315aba095d6058d27351d772a91de029ad61ceff9a3418c4969919abe43264f8053cb9 SHA512 7c346b07cc557a999fc224cab21f3807bc10bb1e8b051eaec7905f4fb95f5c87e71a3081bd2893d8e371c08f43541226810590d5b43f801d1bc69f8f764951fe
 EBUILD attrs-17.4.0.ebuild 885 BLAKE2B d2e70f4ca7c9b7e1f96d671c757ff14b56132f139458996ee473f3271844c2c0c257443ae26d48d600d666de4a35a763d0d92acf67cb0df3c57acd01cd23570a SHA512 28f39a5c0e0caab4603757f7169e0159cd8aae2182b0a8c5b417125a14e28a31e6873076e1e4bd09588f818304faf549a14199e93910da8c3c88967944d77f15
 EBUILD attrs-18.1.0.ebuild 943 BLAKE2B 7effcb9ee8d91b80cb1b93aeae9d5172f7ac99a68c48aef064dbd3f18cd444009594644db3c0580002c674c37672560f145d9d76ef3dda567599b0c06ce4935a SHA512 d435a70b52455fabf7b67ef48351f52c2d3a05e66c6048f4d94ff46868915730474141b89680ab15f4b608fc88f8c7e6d9fb7b1d08cd202f718d38ec69704c99
-EBUILD attrs-18.2.0.ebuild 935 BLAKE2B 43325202963df00b4ee224dc554e097260d536f41ec4ea9c36dbeb513c63da510956137259dabb534884bb88c52e9bfee7b9fb70c6890ef1df94c45119febc21 SHA512 cc9e9c6caf2a5523d1a932412c1586129f77a63355866cc3b30c615dd23978cb6fadb2d23186b733794872aadc71297374cc2d86c34e831ec792294091a468de
+EBUILD attrs-18.2.0.ebuild 934 BLAKE2B 1b1747b443b7308e0381c83c2c07049304f33038eb92d1c41e6d15171a56455a0c49f54948e60b574d6cf0e9f99fa3026b8ab7a92d2a45f79ead9e85bf796fee SHA512 188c0a9d599b02a331d554928f9c7e22aefab9c66c5126fb17aaf7c81c629899bcd5c22d1560dcdfeb0ddd7cd36afbb47f51e616465d3c3891a13693b1edd67a
 MISC metadata.xml 488 BLAKE2B 808447388863096af88f90f97c58025508d5b4cd1ecd760c59dd8af1fa664e16756029e3d5d6b233578b9c0d7be9c8469761c9a89f222ae9f47556b6ee983fc0 SHA512 d8336a60cb0b2b8d51a9833c0ba3d47acb29ec4942b2f03b750d407bcbb65461d867470226bee962a8e585cfd4ff11bfff67b66ed2270f9efbf35d3c46bbdda1
diff --git a/dev-python/attrs/attrs-18.2.0.ebuild b/dev-python/attrs/attrs-18.2.0.ebuild
index 501e922e7186..6fb12785e63d 100644
--- a/dev-python/attrs/attrs-18.2.0.ebuild
+++ b/dev-python/attrs/attrs-18.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index c6334da08fe3..be2899e959e5 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -1,7 +1,7 @@
 DIST Automat-0.5.0.tar.gz 32599 BLAKE2B 951da8840c2334fe3cd86804b39beedaad0d344d66742e8bb72e2d2ace2029b037acac8ffccc5643fd37f81020a567374a25ed42f7bc386770a30956464f52eb SHA512 7b4fc64e1b3cc514e3513c4be7387309a9e0c6d59ef091131404642b517a324b4a0eb677bee99da038664bd6713f2d2078c621f056e98b35966caf324741eeeb
 DIST Automat-0.6.0.tar.gz 31767 BLAKE2B 28baa9d6cc7497f9c0a4b7f4050b197d3dff871b91f5f3e29bdc47ace443af8de0fbeacf1657dc6565b3ab824365362a42204d6d89a8dfc82eaa6cd92d4e2308 SHA512 94f2fa06b0e0e1c0538bcf4bd9046ea40600a018bdd1da2d5bed479877807ad56e448c4f1d7ec87341f80013ae6c35b01201cbe3c4ecae1105419038ed43024d
 DIST Automat-0.7.0.tar.gz 61461 BLAKE2B dd09ce090c7333ee17b701bde2c78e01dacf40cefee847061a2019bb27f0982091e7628737211421ada351937caf9c6734cb445ee6462ce84b381030b013bd05 SHA512 a6f307d312a3ceb721071b5212297c73d2306894b5fafd39265578041a2859bd6f041ac43a654bdda4175a70a4e90e0db1ee35cd43fa620cd5c594b5d1988a74
-EBUILD automat-0.5.0.ebuild 1217 BLAKE2B 5b7feee89f96fadb7cfdaf227851f149d8c8466b272147c3966fe624ce697cc0150fded545ecd9267911d87cda5a6f6fc8255eef48df1a23650923f12b6245ee SHA512 eac5e670d9227e2bd4f78bb4c0ff986e2dcdafcd79919dab1b7273be18a47d146a5630e119f450f2115ffd8303f40d57758c4c4558555290d0094e94da029c8f
-EBUILD automat-0.6.0.ebuild 1235 BLAKE2B 1ba6654e880bb8e13246a98feeb08ec8f75c49d4490c782a3efa7be379a71a2256d3374b0ed121f84cd3b6dee9c5260b68298a34a9150d2288c6f7a6c224040b SHA512 e24ad712828ac8e950f5791c60c49fb5f1b322b70cb726b5fbb10092795d2d8bfe08767103da2cf2255113b8a31072e61e7ecfd71f5540323e35eeaedcf0321e
-EBUILD automat-0.7.0.ebuild 1434 BLAKE2B 9ac79d8c834574745c28d69b4d49fb9c5a7be982b703dd54962bea1f27588129eced904c71dd48ede8b662078d2c31a57b14e015f23d9d289b0c4e520d543677 SHA512 b311bb03bf77e6503fb7d14a960f6ec85f21b2962c601d7293b56fa21133b8134f21a490bbbbaa46c987e3f48d2454e0eb72165a992eaa66cdcdd31d9ada2fd2
+EBUILD automat-0.5.0.ebuild 1220 BLAKE2B b4d3ccecec979fd015d59acef3a304cb17e2d5400578536d7a8c25f5699104ef6670a4e582f8feb8d04a7df255b95d830b8a1c3477f1a8622a7cff340c71b225 SHA512 88099c32c2730c19717a0a2a5020d7be29c51bd3581138b4a0d67b4563e9e6c921cefd828a3443039dd28874ff9fa85d19d4f8f3ac9bc9df6e3fdd9478c38897
+EBUILD automat-0.6.0.ebuild 1238 BLAKE2B 7cc573a302a0701e9bb40aa39dd17d04ae681b8eb7f13e2fdab5bbe8039c8e6bc6f5fc664d82ff5008df01848eec852e3d2da5178e9a7c7f4e7507b8c5644e01 SHA512 c5ba1ec51df7b90b5d9b9a69670194c91090583687309c81ed14a7eb47556747ed3a91fef6dde183bdd4d8e3662b1dd660f51971220a4e4edc2fd172863394cf
+EBUILD automat-0.7.0.ebuild 1440 BLAKE2B 599de0092fc4a004b9c7ddf47511a3b7c9ca4e85770dd347cca3d70b4b711b715488f58012f6eaa40ad43124f0d51df995d78b80bd03856ab480e451824c0cee SHA512 7e6479cb62370918228fdb9a3386485457eebb338b56ebea9961b37c1eb9fcb4036e6a35b7332bc930046e4d2f9d9d8f1f8d26c5079b822a90a542d320349733
 MISC metadata.xml 622 BLAKE2B 10fa7f62095186a07a588b374c55dc084a483ff8848caff3322822964d57175a729e82948f984f4348a1cd0e5d7bc08c1d548ef674fb93aa08bd55343c53ba63 SHA512 f9feb6bd4b545a707d0539d42d20a0371eeb8a9e0984e922b3a0416a0dda97b6783c21cf1ec63868c200535d9a46e80b820424a1d7199074419780b3e7328333
diff --git a/dev-python/automat/automat-0.5.0.ebuild b/dev-python/automat/automat-0.5.0.ebuild
index cb55da3ea120..1b620cdd0868 100644
--- a/dev-python/automat/automat-0.5.0.ebuild
+++ b/dev-python/automat/automat-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="examples test"
 
 RDEPEND="
diff --git a/dev-python/automat/automat-0.6.0.ebuild b/dev-python/automat/automat-0.6.0.ebuild
index f7b1b84730d2..16bac9898e65 100644
--- a/dev-python/automat/automat-0.6.0.ebuild
+++ b/dev-python/automat/automat-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="examples test"
 
 RDEPEND="
diff --git a/dev-python/automat/automat-0.7.0.ebuild b/dev-python/automat/automat-0.7.0.ebuild
index 9136e18be1c8..31c408a3704c 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 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
 IUSE="examples test"
 
 RDEPEND="
diff --git a/dev-python/beagle/Manifest b/dev-python/beagle/Manifest
index d638912013bc..e518a9dbebff 100644
--- a/dev-python/beagle/Manifest
+++ b/dev-python/beagle/Manifest
@@ -1,3 +1,3 @@
 DIST beagle-0.2.1.tar.gz 12628 BLAKE2B f1d68134065a5d71f6662770b0a6a7c201a3019b57c12c3200cb59db00e664b5bba27b8a4029c0515e8095ac3c7153058b22d43e3245c3012e52e2ca734ce2bd SHA512 4cd58c05764dcca8959b2137f5bcfe627d83b576878eb77ae28ae38cd5d2cef16d045ed5d186fdf7eda6be821abe4d2eeee106fc505a5e59f027f59ab82ce653
-EBUILD beagle-0.2.1.ebuild 690 BLAKE2B 794c5d4f51878278e070b51d6bea20c81c289def1480342177b1ec42417049a64ead8b5a68b7239f604d1800071b6075aa191bdebbd5e06b7c91ed9fc6a89e6d SHA512 243c5402e9bc089231a0b38d48a76e22206d2e86ab30995256c2f8c7b20d46aa47ba5947640758ec01a79b5048b0d0496072fe878c348cbbf7be59f71c27c6fe
+EBUILD beagle-0.2.1.ebuild 676 BLAKE2B dd206f452250397fbdeaa07ccee44b1ec00942c718ddac32d4c4c4c8e2384d3b3271f5d5ada278600766d1d3b1d8366c788b1c079b7a08353b6e8376cf093472 SHA512 627a477376a12649f19fa468ff812bebb918dfaaf144323aad242c7e9b8cdf3d696e1d9d39378cb0dcb03ce633f7dd87035ee0d0d9e2a40887c4f871f2d7c1ba
 MISC metadata.xml 574 BLAKE2B fdf6ea50667c20fd2eb8a0f7d1810b4828b99b482bafb5a0fa013818ebdddbdaaa1fbc0c3582d8b95403c305e2605a7b9737de50a02d0b2665217f525cfb4c0a SHA512 0698273824072d90953026383d2e1fff8cb1631104097cafdb4e4d853c25cb4c4db54f7870a8dab15026d8faa06399983220e93da846202a4885a876b94635ca
diff --git a/dev-python/beagle/beagle-0.2.1.ebuild b/dev-python/beagle/beagle-0.2.1.ebuild
index b74d95088cb9..d6bc30ce80c6 100644
--- a/dev-python/beagle/beagle-0.2.1.ebuild
+++ b/dev-python/beagle/beagle-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 PYTHON_COMPAT=( python3_5 python3_6 )
 inherit distutils-r1
 
-DESCRIPTION="Beagle is a command line client for Hound, the code search tool."
-HOMEPAGE="http://beagle-hound.readthedocs.io/en/latest/
+DESCRIPTION="Command line client for Hound, the code search tool."
+HOMEPAGE="https://beagle-hound.readthedocs.io/en/latest/
 	https://github.com/dhellmann/beagle"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index a9536a9e4e18..c73027102d71 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,7 +1,5 @@
-DIST cachetools-2.1.0.tar.gz 20051 BLAKE2B 87c0839352a82fa2e531c6e4fe4da3ea7038ab9f09ce0b537f16deebf63de36a49ffd563790d42a1f07962841cf07431f1287de114f9e8d148c1413eedf1ff42 SHA512 6536afae48bad99465709860fd57c8c66d3b203ecf79a922e117a2c004a33b7ab2ac895f87596cbf4be377f6655d1deddc80b6500daa4d529eef7c1ca0adbd8d
 DIST cachetools-3.0.0.tar.gz 20513 BLAKE2B e6fdfe2aff22a9ae35d19acb7a678410c5c06d3147cfc3d57725d942c3e4ce00d5aa8bfce7f8ee80960751643bc655d5d2226382e82c1c5c1eda746cb34a556a SHA512 7211e4d1525b94f5a74a89571a1a3696719d1cb15246f4b8158408082cc59ef03935ba82ddd78a34dbb31b271c234dab6cd82839c13b23159b80264bd552bc51
 DIST cachetools-3.1.0.tar.gz 20664 BLAKE2B acb9ecdc1a9ca4bfdea7b9f593aedd6c8db9f96c703b71fb3007ec6e255d4d99d53c22f6b61ba25d53ac9a3bdee8de7303d18ba05115017bd6ee63c2bacf1fca SHA512 1d03cf42b56857ccc1203a658a8c70fa3c0a3be2ecfa3b9501c14ba674463d4ffccf8a8a9daee13084545a5072ecd7757174a4b074d33b0619020f7ec89515bc
-EBUILD cachetools-2.1.0.ebuild 609 BLAKE2B b33430c1f7562dbef7dcf04fd96b2ef44ad29a0429c5e6b7d3c7225d3c48c464deb0da00806cba7756faa4aaac76de0b9c07adf6f97d8cd8851136ff1ddbee6f SHA512 16c1431358f652a92fe2954bfc69871a5fb5945b4ce58b3f6776be7b622006732bb1cba119e2cb97681f1aff8ea5f99b9ac8a5c2d4773f6413065bc6319a9d47
 EBUILD cachetools-3.0.0.ebuild 606 BLAKE2B 264140e446bcce64ee64573d0cef8992ccb99db98ccda31be12ee34176d36d47dc3e3102bd01cadcfb3fa4f86b3e9bccbf3f322e17bb43a7c45e3178494b97a0 SHA512 0cf35e2780c2430cdaecf91f24f03f9aacfef994061d8d34e469d8b73ce6937aabc8d48fa86808ae511cef5824ad29052840d6b3ce848076ea385ffb46fe74e0
-EBUILD cachetools-3.1.0.ebuild 610 BLAKE2B a48e57a3b45be58620d5018229251aba1f32dd92acf9cc6ca9addb04501ccf5077135caf67c932b5f13944de0b394c32de392b77306c257e869c1a27fbebe321 SHA512 ce93a5ea946c0496480425243f25ea2f78abf4e28953685dcfdd954ebd1fead6c7e7509400e7b54662d35023cca225a7fdae7d79100dbcd0e662a8ba17c138b0
+EBUILD cachetools-3.1.0.ebuild 608 BLAKE2B 94b69c6db6c00a5d92ff4d52b236b4ffc59453190d58a3bf691459b79f137f25d521d502cbdddeedc6f0a189f88535d81d5a5e96b961f647fcbd56010aac08c3 SHA512 0e1f797db59f52874738f9e307ba64639777a41c0d431e1cb5207149a7c25a02fd932f88e4ec9f8b21fcfcb576e5b6249c428f29852251d627a1f95bee253f17
 MISC metadata.xml 327 BLAKE2B 13db1dbf3081379704678e984732303e85da30996b4ba48e58d3145ffcf3dcebce27b26a140ce121a4303980ce0c41c7b164c9d0e141f4c208d74ce27f262987 SHA512 7eb94b86c09ed93f498beb76dbdf7217a1bcf48ac817c44ae197e20285b18a336f7cae113ab48a52900eb214be133cde6b52760386d10b75ad8810921a127a7c
diff --git a/dev-python/cachetools/cachetools-2.1.0.ebuild b/dev-python/cachetools/cachetools-2.1.0.ebuild
deleted file mode 100644
index 43782bae2530..000000000000
--- a/dev-python/cachetools/cachetools-2.1.0.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 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="https://pypi.org/project/cachetools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/cachetools/cachetools-3.1.0.ebuild b/dev-python/cachetools/cachetools-3.1.0.ebuild
index 1c9f5b206796..fd9bc3426e5b 100644
--- a/dev-python/cachetools/cachetools-3.1.0.ebuild
+++ b/dev-python/cachetools/cachetools-3.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/cement/Manifest b/dev-python/cement/Manifest
index 7e30acea4b2d..b476635bf39c 100644
--- a/dev-python/cement/Manifest
+++ b/dev-python/cement/Manifest
@@ -1,7 +1,7 @@
 AUX cement-2.6.2-exmples.patch 518 BLAKE2B deb3d8c6c0a182f00070388cc4dc30c768f5cc840227a087e085aa44c53572ef57fa00ef5d909c08abf44d833140ac9403361030c5b99526d75c6972da89216c SHA512 3a1fc644346dc8cf5001be298e73734b729b31c8e0bff57b131247e768b9e6b91c4bb8b9206d94e211599796916732af105a0b5aedadbd8087e2e5eae80e2a4a
 AUX tests-installation.patch 595 BLAKE2B 5db6b1d97f0e07d630468421f69ed85892d455d03a8ded427d60e370fa96e5c7a25bbe0b3e77c417c4669f19cb74e0aca4504de950966237c66af516b59ce455 SHA512 3f6273a5843c19873ea05f8f61afb00d43281210d523b2260f5e3bf8e84c64c9a8193c1ddfbb09662352e5a92cb291441b3e2bc8e92c1d6d8ade13cdc3c496ff
-DIST cement-2.0.2.tar.gz 81009 BLAKE2B 85e3c59e697ad09674d6524158006eb2270219135c14a22478e146979d713c95c53eeca8d277da083f69606faf9e63092f0f94ae5f879e1edf788b8667966c3d SHA512 5df35bdaa714a9b11d5b0154658333ea28a8e50e8910ee7d900cc7342dda8ce547d5400990240b89b6c808bb91c72b785f66c31c057cf7b782d16efd0c21a4b9
-DIST cement-2.10.0.tar.gz 179564 BLAKE2B 8494442ffeaec4534b58e8be1b769ba7d51bcf58c1e70b373b3fa34aab8be4ee72022c402cc82cbdd08512b5c367b159776e155b5a6cd70e370565136fe2837a SHA512 99fc93fd67d85763a57b551553f7046d8b6c0a1a37623a6f8e761adb15f598dce20a61ab86f98f1b3ce35c2a295e0087a5493b385d4ac2fd89eed2b2174b7628
-EBUILD cement-2.0.2.ebuild 1044 BLAKE2B dad7eb39a77a183c3d5d315298b9dbc164ad78d786eb05e43e83b28e560edc1c15803b935c97445f38826f02920946bd439fe379fed46df37483330569d5dab4 SHA512 345d5d2aa047a55f611ef16a72ef40e4018d234d9b13551f0ab60b605bd333390de6cc5c47a4adb4ceae8ca138f6e4d336e0f46a57a9edbd5cd4350a8059c3ce
-EBUILD cement-2.10.0.ebuild 1383 BLAKE2B 26bcacf3b0cb4ab33bb4bc77f00773e981b5f9ccb7c779b4ecf2cdae362df3c59dfe94a27af694539f36b5cb979eccaa51bb2aa522eecfdbf0a0e73d56ee153e SHA512 eb9c8a705d7a702bfc5877da61d5f43ac405228688af23be5483afceaf4b739ffeed345338a3aa4f778fed8ee1e7fac409509cbf4995cee1d615f0e103330324
+DIST cement-2.0.2.tar.gz 81009 BLAKE2B 634dc2f1bde45e60b6936399db8928e4adedc1ef1f5fc2b1dc38022a7dffdde6e7c70ccef9ec81542a29572b4368d963ad48b3d8f1bf51164f13807d15bcd0a1 SHA512 d5fb1e31c72440fb74c1f75084599ab569c669443ff4d80b76929159b80870b19ba895a35f7f8125a8ffe74453be2927f048fedd2cbd422f4bb4d7946f334906
+DIST cement-2.10.0.tar.gz 179447 BLAKE2B 146e942b177be011a96b7cce91f87d5079fd37503ccbae26164114846c6e01964722c9c6ea4238a808e2320b05d103e3f9f9646af0ba6a35bbb420e229fa5f05 SHA512 3a4e2be833628181fe0d6b8ff5b00b7003e05486eafffe29a2c31825a69e74c609965453a2e66d009444cc43361d7c0c14662215ea46957b87a043ed4f0a0848
+EBUILD cement-2.0.2.ebuild 985 BLAKE2B 9af424b46b4ca56ce43c03a8db65900bed9528405cfa3a308def2696c4d8b92968af6b8d01f2e31b94e93192988f7c17109307f31fe9af84db790fd99ad7ea18 SHA512 abe5f967a81c23b5ee458b16849dc3d30cc936171dc0f6e10654510d16f9ac5635d0cb81a0e45483fe8aaad1c5444662e1608110bbd4f324f2a8ab6357331239
+EBUILD cement-2.10.0.ebuild 1324 BLAKE2B ec1dca71f5657cf05fe31a9fe0fff5134d13507e3228753bcac98d808c6a6d2dbe4e8130123f27ba235875edc5ffeb6e493336f254d828be4ccfc97c05d70a73 SHA512 f0c76a031d9409dd287d008bdba377dc50ec4b50dc22e65f71fbec0770abc4eb5d48441898e8621e5f1c2959a6f5428771cc1ece4ba0df7ebfc14eac814ce9fb
 MISC metadata.xml 540 BLAKE2B 5fc8b22211e7b2b6434c45fc55b3a8980470d630859564524189715d608af9b6c4779b2825d67e8d67e342e84c2f88fe04eee355efed399221ac355a815ea3b7 SHA512 58b32c0757712b4e28667d921159e847285bd63c712fee382fa1c83e890a183fea8ffae22bdf088eed936dec152013e8c2bfa63ccfb05a601ed5e43ccfdab4ab
diff --git a/dev-python/cement/cement-2.0.2.ebuild b/dev-python/cement/cement-2.0.2.ebuild
index c43f43fc72c1..d4a495d01907 100644
--- a/dev-python/cement/cement-2.0.2.ebuild
+++ b/dev-python/cement/cement-2.0.2.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 versionator
-
-PV_MAJOR_MINOR=$(get_version_component_range 1-2)
+inherit distutils-r1
 
 DESCRIPTION="CLI Application Framework for Python"
-HOMEPAGE="http://builtoncement.com/"
-SRC_URI="http://builtoncement.com/${PN}/${PV_MAJOR_MINOR}/source/${P}.tar.gz"
+HOMEPAGE="https://builtoncement.com/"
+SRC_URI="https://github.com/datafolklabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/cement/cement-2.10.0.ebuild b/dev-python/cement/cement-2.10.0.ebuild
index 3184a3a458ad..f5f4a24d2263 100644
--- a/dev-python/cement/cement-2.10.0.ebuild
+++ b/dev-python/cement/cement-2.10.0.ebuild
@@ -1,17 +1,15 @@
-# 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 )
 
-inherit distutils-r1 versionator
-
-PV_MAJOR_MINOR=$(get_version_component_range 1-2)
+inherit distutils-r1
 
 DESCRIPTION="CLI Application Framework for Python"
-HOMEPAGE="http://builtoncement.com/"
-SRC_URI="http://builtoncement.com/${PN}/${PV_MAJOR_MINOR}/source/${P}.tar.gz"
+HOMEPAGE="https://builtoncement.com/"
+SRC_URI="https://github.com/datafolklabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 049a3831f30d..1487cf9a86d9 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -3,12 +3,14 @@ DIST cfe-5.0.2.src.tar.xz 11459216 BLAKE2B 80d9b2ab70b00c0dfd5c5386a44e0c15d8252
 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
 DIST cfe-7.0.1.src.tar.xz 12488668 BLAKE2B b80247b5caf81661dfa715d9bf454b8023221bd27ce49b6bd8cd66f40ffe01448e40fb828fbcc64e49f059af7a7c5a95a0737b0b998454ac5c1dd39388150fa6 SHA512 df2f38153ebdc261bcfa6a569567f759bbb1a803192882a9d4eca55a47878166ac9057151a94ad341dc1281136547e4faa783a68070dfde2307b48cacd4b9194
 DIST cfe-8.0.0rc2.src.tar.xz 12861448 BLAKE2B b4f671b6597b46cb84b241bf602d7e1b12c896b9d3d5857c61a731c9ea0d94dc850c79cbbcb4a56cf2b54f2ffbc81e04f2062c59d4c5b800841e60eccd0dcfe9 SHA512 2bf1e39f5fc7842039b8e20913b3c71fea46b541825c703ce329f3fa01e45cf66c2cd39d9a0f92cf2c38eeb856e42023b087da0765baa0377226534a554c0d9a
+DIST cfe-8.0.0rc3.src.tar.xz 12863708 BLAKE2B 1a05ee86b305de0d1e2cda1f89f22405e3c7826214e83b2275d14682374c31d72fd984a2b5d8da7fc906fb95003aee6a00e6e1700f7938f3042df2229fee9c50 SHA512 afc9d7bce817a9d8faf12efb273934539b18471fb4ece8fed56249628b17a302427c4e7ecbfa096287547e01f3823b9b7a1be4bf18417cc1c942776057b90db1
 EBUILD clang-python-4.0.1.ebuild 864 BLAKE2B 40d3452c9f28d5c154a51258a764bc380addf20f8fb71e8f5e3d9a0fb60822d805df009f58f24457b834870a07abe365bcb6d3ed6557713282129992c1ae1d84 SHA512 d2900dfa55a69965e146800f097f8be256d022aca8d85f54db205f75b30cf72015d27c4e8f4981725d50c7a1c2a14c15454f009b2d8a3636103d6d133b0a2324
 EBUILD clang-python-5.0.2.ebuild 1079 BLAKE2B deb802fba226c098e138775a71fb5a492625ddb681b920b4ecc0aec30306087136ea5ab2f8d7bc36cc4c8474f44e67bfd637f90cd78ae7e1c85719f1a14be5aa SHA512 bf34b1c9b9b43fcda7d3a350e8d664355056b634b65f7741538d8f1eabe7556a46063df7340706f4fe2e0708b0cb4a34c85ce609149ab4f15d64478964622176
 EBUILD clang-python-6.0.1.ebuild 1097 BLAKE2B c1af92b85dbe2d5060fea49d3352c8151058b8f86c478c347842a1e46255f313a4ad0985b13543e34bba2214f0b17fde35a449779cccf41367a2b1776b6ed130 SHA512 d88877fc98ee9c631d7139e734a87d0a3f998963951602d5e1717b6158b2caaf79fcac4fa699a35131aa58885c3d01a8eb9106183118fc9a4783164e3be1be49
 EBUILD clang-python-7.0.1.ebuild 1103 BLAKE2B 880675335893e206636b121e60d025df935a8ac0c08d77c2b9d399f1152e8067f7fa4a95a06487aa51bc5ca53254ec8d661ebaa68c03286e19f1eaa2f26cb6e8 SHA512 a12d2a01febd8cab4e04350e897aeb59865f2a4a891a7aaddfe38f7bb2556595d6e367a9463bd4478b3aa691e41c031e8323c0bc36130c4d96449c0a84999e5c
 EBUILD clang-python-7.0.9999.ebuild 1059 BLAKE2B 1ab0d9234fbebea281bf2235f870e6cd468063f2ec5c20f7af3b797e6135aa6730ccea8cbde5ae5993394da1563897f5b45adba1d644257f6bc300b6da5500f9 SHA512 23882089855c9485ccf23129542f3b6a5e891776cf422c9b16a0e534e4084f59d5bfe4526d2510cc094ce8cab311ec141dc76ee45cbee7d43665aaef58c9fec2
 EBUILD clang-python-8.0.0_rc2.ebuild 1106 BLAKE2B a02a1b4e88343f276c1b5efef16ff11963cc9c3a6b27b25506e3bcc60225991e93fa56728c11f059957881c062d133166b63ae1fdcf725d0dc565ce9b981aa31 SHA512 ea05b647ee32b17b215f2039e3ad93f76202fc80277421e8a616ab044c8179b879327d3221a628a4634754271d8d430177b10208a88b271f0b5ecf3d213d9f81
+EBUILD clang-python-8.0.0_rc3.ebuild 1106 BLAKE2B a02a1b4e88343f276c1b5efef16ff11963cc9c3a6b27b25506e3bcc60225991e93fa56728c11f059957881c062d133166b63ae1fdcf725d0dc565ce9b981aa31 SHA512 ea05b647ee32b17b215f2039e3ad93f76202fc80277421e8a616ab044c8179b879327d3221a628a4634754271d8d430177b10208a88b271f0b5ecf3d213d9f81
 EBUILD clang-python-8.0.9999.ebuild 1056 BLAKE2B 9f18a22421c36ba3796b6fe759e05d5ee5b8ca449e292145c7eda6733c614ffe012f40d0e12ce336ef496a9889463f090fb96180c146975052adc73d8cacd690 SHA512 39239de81290208b734fcd8035a9b8dbc75a0ae9a9cbcfbb7432be5f83b71f2254389ddd139b1c0c9ad59eda86269932a720a02f6dc277ee15178298fbf49a1d
 EBUILD clang-python-9999.ebuild 1034 BLAKE2B 3a56c0e391daf98889ba3959f8aa5c944c9930ac482c8beca5f814978507f9869a213384224c6965ade96a3f0b17f83aff9924f07d5ad2d03ed7df8660a54df6 SHA512 bff0eee11762f352ab6616086b19506a2ea0530284f50da24538eb8078d2c04af1d1aa2a8616adecb6bdeab8853728b2f4b5c3133fa15810f00a64855182c486
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-8.0.0_rc3.ebuild b/dev-python/clang-python/clang-python-8.0.0_rc3.ebuild
new file mode 100644
index 000000000000..ba2878b26983
--- /dev/null
+++ b/dev-python/clang-python/clang-python-8.0.0_rc3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+inherit python-r1
+
+MY_P=cfe-${PV/_/}.src
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}/bindings/python
+
+src_unpack() {
+	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
+	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/bindings/python" || die
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/commonmark/Manifest b/dev-python/commonmark/Manifest
index 8becf879c504..2370c81a4d7a 100644
--- a/dev-python/commonmark/Manifest
+++ b/dev-python/commonmark/Manifest
@@ -3,5 +3,5 @@ DIST CommonMark-0.7.5.tar.gz 88702 BLAKE2B fc80d9e739d27f7e5dbf539b624c2fc2e700e
 DIST commonmark-0.8.1.tar.gz 90795 BLAKE2B 718c2b1af035672d74e2c6b6f89ea0cd23f45d7b0e47b6dadeef742d772f5458e08ec5f69fd4f34df9ab2c491d9d7add4c4acc7018c4048649aa0d8244d7db91 SHA512 dbab51d45c1973a8d0906148d785fb8ddc2b52177dfe0e69fe79bef2a5eb05a5a7ab8693852f4aaa8545af19d741569d04a24f06ea65171e6e80d9f66af47fdf
 EBUILD commonmark-0.5.4.ebuild 816 BLAKE2B 4623bcdc238c125819bf1abdc13d5784fa38002ff745d295b8570008bb265d60f5958de44ec7afa324af5bb3676fae2288881f1592863fb15a5f994916dbec84 SHA512 53d96ed5ab173d09aafc4a5001704f1bd29d5c3b9d20f8df9712a570504ccf24bdc75526c9f1b988bd7d5b46e7bf936838efecbb92d50c6e132ed1b033ce7879
 EBUILD commonmark-0.7.5.ebuild 1072 BLAKE2B 663fb0549b8dc91e3324db235612c655f28d0edcb50a9af1bb5e0bd8ddb34b3772cd0aa1901efe564cb1175f444a1f2a47c1f529f8af84cae8f5da8c21accd4a SHA512 68857c0969b7be6e7ae489cf63abdc77063b5368760b6aca4149733bf69bc2a3507664ad55642bf13203a0a79346f0a2745505d7eca901a8723b11c9a4be6b12
-EBUILD commonmark-0.8.1.ebuild 1038 BLAKE2B cb4b394c27fbed16fb7e9e3d29b3ac08fb035fae2abc63564e2e80c328bd14bf41da5aad6d5397a558891289941c6d38d12b4d0131de23e0bd121e379dcaa67c SHA512 f55ed04642b54be080dc05bd6c282882f9a7e7707a22fcd2936242a180c795c1546ae7116bae721ba31426c625b2c0cdde1eb079b3698f5b7f0757842e29cbfe
+EBUILD commonmark-0.8.1.ebuild 1036 BLAKE2B e10e0951a877569b0580af5d1aad468b9813066e86d8d14dc81b31d60f1e459d5f595a555690c7fbeeebd1594bee4d6ae355151b16cca0051a4aa8ab85a85b81 SHA512 d3527ebefce9113283f282e5d3088b6faa8fcb88f3ac99948cd5e41039b3d473880ed7e511eb8af6555223b4f0abb1d7bdb96e99b5694e3ffe7d388bbc259228
 MISC metadata.xml 756 BLAKE2B b169766e4e9850c3586f1359fb0103bfeb27d494c3d20c2a502618a20a397ff9ba7e9f0d13d07829e59c1350e5ced938d58b726704d00d0499b3ac1c614952d6 SHA512 1a28755c041abef9cb797c8d9ea448a62a500a915ae9c4002a22f85886fbae62c2574675926e80e5ffdcacf3a3257fc9065a14d6495574c556288b334274b03c
diff --git a/dev-python/commonmark/commonmark-0.8.1.ebuild b/dev-python/commonmark/commonmark-0.8.1.ebuild
index 7f3a3f2647ed..8fc22e417000 100644
--- a/dev-python/commonmark/commonmark-0.8.1.ebuild
+++ b/dev-python/commonmark/commonmark-0.8.1.ebuild
@@ -12,7 +12,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 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index 80a1a211c02c..0e3a731bf768 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -1,9 +1,7 @@
-DIST curtsies-0.2.10.tar.gz 46320 BLAKE2B 672b10969d6b8d71c00ef048f23284d62858fbba0ab639339a30ebe5713382be2f231742f95f581be8cfb221f24c02efc0a85dd961d6d3f22dd6c2b2aafe5c10 SHA512 0e4349e460dd9d8ec5c900d1b3dd98ede7c7462f9842cb4bb22e1f1a2a0048090593af2c1cddf26a1239db00060429b27785e05de84ff9b4199fe3b8d4973fc3
+AUX curtsies-typing.patch 330 BLAKE2B caee67d514f926271fcbe498a06cb811ce48035317b23e03e160405e0d4209a95579e70c7bbf1d4d5926af6d24e2016dd51aabfeacc796f9e32649b65c269cee SHA512 6f13aab4de020c39bbbe531e9fbbb24b419d7dfd8a982d04748ee067254a52087ffb04189e05428abfe6e8f163a25541bd5f0681c660bb550ccc84865d03f6c0
 DIST curtsies-0.2.11.tar.gz 46740 BLAKE2B 103355b8467617ac4890ca0d2c444336963d91934539c79314f4319b9fe273973c6464247cf2f5d07ae2ec5fcf45f302c80fdc94cd159715cd204d12870a54f1 SHA512 1fd71d9bc4125a427a5990c6fcef4f73f6e677096eda8d29f7dfee7fe6fc3a350fc66c4383d5e9370a3ed19dfa211285f8b99c425b154e22d3cb4718e1f1d05e
-DIST curtsies-0.2.12.tar.gz 45039 BLAKE2B 21cbf76ca62e4f833a5f5e6c89ef288e12dc1bad106ee90cd43a100ecf87d4f55040049915ed57c1f6817047770a8f37975d7409b209ffbc00c8356930cdfff0 SHA512 228c02daed58ca38790ce349b8e5725a9c43d831dd6871aa0a5de10238e2822d36a9ff036a40a6a79ca1b838a7a01b5159944a39664ca3df0d8a6fb26ae2a518
 DIST curtsies-0.3.0.tar.gz 47120 BLAKE2B 51d6bf5686c275690c6b906e7eba642aebd54dccb106463a9b1733e2174fa26a30b8365a17d6cfa18244fb74693364a3aa5184a17f2460425a57fb8912d6bcaf SHA512 b1fc09a4e9aefe09b878a5c710ef86c90f93895a8ed40b40a3c13b24a2dfc1fe771ace11c20e3fed4fcdd0bed8b9615ee3c2bcf200fa34fbfb895a4a7b57b14c
-EBUILD curtsies-0.2.10.ebuild 809 BLAKE2B fbed77666939a9aed6ec7602c02c41e8d8af7fcabba100b4da5165115694bc5c94528b68b58f69a496f709771837a7eb1041bc5c48b61ccf6b8146bd2c39dc3a SHA512 34ab6cc55fd9fabbc744408b9e28c650bbec769f488df5851e8d2f226366ce65c6ac44886922f94683fc9b224f5c80951e7f53becb13f1eeef90ac54260ac8b8
 EBUILD curtsies-0.2.11.ebuild 811 BLAKE2B af43ed770c79d81b365fb99c57aedefa2b76917dfbcc692b87c3e4e8f661ca128518af275c69a7abcebb741deab0277d5562307ac7335aed6238bf045c0f2a07 SHA512 e147f44ca548af38f2b12638d3c79be5763f09f1f684bb67da08fd03322155b6b560e096b6499be906cab32e42b84b09d6beafb0425a48ddd4add943aa87468f
-EBUILD curtsies-0.2.12.ebuild 813 BLAKE2B 82a61b80ae0050ff4ee92de7dbc6a28bc67bb6e71c87201d84bcef8b1fd638d008b519583228e3af20592a78cff40e736872ae6e313fef44cfb4fd447405507f SHA512 2e90c1b2b073aae72efb869af2bc96d15cf612de8a46bf4c9a0daf82252a2c12d279c7ca99bf417904f9c061e72ac03c34fc5ccb08eaa446ec2a64a91b39bbf1
+EBUILD curtsies-0.3.0-r1.ebuild 971 BLAKE2B 66817e56558163f7b71e76d9afe95d792248f54e1c7e7620cde4bab99916e8cbe477e542f227adce579fa081d6fa2fd639ba8109c27bb0e5f66d68472121ca2a SHA512 9fc2f463fb42e5a653ca5ced30a3f2b4f65a724453c03c15e352818fc1540853e3c8fc5c99c1de4229d30120c41a691bc9325514e6cab65ad1558c0612436bd2
 EBUILD curtsies-0.3.0.ebuild 813 BLAKE2B 82a61b80ae0050ff4ee92de7dbc6a28bc67bb6e71c87201d84bcef8b1fd638d008b519583228e3af20592a78cff40e736872ae6e313fef44cfb4fd447405507f SHA512 2e90c1b2b073aae72efb869af2bc96d15cf612de8a46bf4c9a0daf82252a2c12d279c7ca99bf417904f9c061e72ac03c34fc5ccb08eaa446ec2a64a91b39bbf1
 MISC metadata.xml 387 BLAKE2B bdddb5521d99066f5585c1180d4cab02d11d48f1118f2548bd0d4889d83d9c59a4fde4d018950b34c4e930c33b034439d500fe21f861ee139a8e5d997cce73a8 SHA512 c5e6232c1d85452c22de8bb1b112abe47881e3d0c4fcdda8b7e22ac7544222b63b48becaa225d40ce2a3025966474a0f9bae126f0348b1ada65c1447921dc714
diff --git a/dev-python/curtsies/curtsies-0.2.10.ebuild b/dev-python/curtsies/curtsies-0.2.10.ebuild
deleted file mode 100644
index b2c7e2fb6434..000000000000
--- a/dev-python/curtsies/curtsies-0.2.10.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Curses-like terminal wrapper, with colored strings"
-HOMEPAGE="https://github.com/thomasballinger/curtsies"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
-	dev-python/pyte[${PYTHON_USEDEP}]
-	>=dev-python/wcwidth-0.1.4[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyte[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests --verbose tests || die
-}
diff --git a/dev-python/curtsies/curtsies-0.2.12.ebuild b/dev-python/curtsies/curtsies-0.3.0-r1.ebuild
index 00adb8bc3103..b12c3e7ffddb 100644
--- a/dev-python/curtsies/curtsies-0.2.12.ebuild
+++ b/dev-python/curtsies/curtsies-0.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,8 +18,9 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
-	dev-python/pyte[${PYTHON_USEDEP}]
 	>=dev-python/wcwidth-0.1.4[${PYTHON_USEDEP}]
+	python_targets_python2_7? ( dev-python/typing[python_targets_python2_7] )
+	python_targets_python3_4? ( dev-python/typing[python_targets_python3_4] )
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -30,6 +31,8 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-typing.patch )
+
 python_test() {
 	nosetests --verbose tests || die
 }
diff --git a/dev-python/curtsies/files/curtsies-typing.patch b/dev-python/curtsies/files/curtsies-typing.patch
new file mode 100644
index 000000000000..28ab09f89fe9
--- /dev/null
+++ b/dev-python/curtsies/files/curtsies-typing.patch
@@ -0,0 +1,9 @@
+diff -r -U2 curtsies-0.3.0.orig/setup.py curtsies-0.3.0/setup.py
+--- curtsies-0.3.0.orig/setup.py	2018-02-14 05:54:06.000000000 +0700
++++ curtsies-0.3.0/setup.py	2019-02-26 17:10:07.076471372 +0700
+@@ -42,5 +42,4 @@
+           'blessings>=1.5',
+           'wcwidth>=0.1.4',
+-          'typing',
+       ],
+       tests_require = [
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 3231605985b5..ab9c05596959 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -5,9 +5,9 @@ DIST Cython-0.26.1.tar.gz 1725133 BLAKE2B b2c0433e8154ad76d921677608cae42a793326
 DIST Cython-0.28.4.tar.gz 1880943 BLAKE2B a97314147294c95fa0bd6d3fa1a1315d81f8abb46a1f2196009c1ef6f0dd7f47f81a7b31ab81d1fd00e8de37878a18a22d225055181ee74ffe4cc8105d84cd75 SHA512 67d2da2d776fc02193cfe98c8942e93905ec5e30bf4e0f9d5c965d930a034936d4c29c8248fccefff5db6d4dee054ec854994bea63fa3f64ff65df7550997c29
 DIST Cython-0.29.4.tar.gz 2044382 BLAKE2B b36d27706a3270805f66190a4cf2735eaf20b1b932365b324a433c0e58e63e860ce1500333233c3539ae697886ac0adc361a2c158d5d064a3ea05843debc3f26 SHA512 8f115e36975aaf64eda4df8b0a85378d0c80b3292dbd162be826b939def03bdc9f3eb937676e2367003c2944b570d97f50d7880becfdb2fdc5144077b4a722dc
 DIST Cython-0.29.5.tar.gz 2045488 BLAKE2B ca809728115865b7d28100943b358d8f5236382e5ae5a43d557620c3bd856407a9f52b756fc910564a6c041d64b1439d60776c90c6970614f74ee2d03f94665f SHA512 4bbf54b248b9a08b9118d751a6bb5dbb81ae7a8238c8a3124d94bf7be67f15b68820e6ce5470903fb5d5ff5c3c213e1580f1c57a8cda33b356263f9ab46e8851
-EBUILD cython-0.25.2.ebuild 2140 BLAKE2B 98f31b72d1c298218c5b368a430ed0acd65b69919c833340dea4182abf949dbf3733bb1cd322be2d20fd23daee19ca68db377572e73f6a35e6f1dd16b1b6c821 SHA512 2e21871838aa75a31826ccc93402199427db7681ca3f6de8c44906212e64730d3e9a16fd39fabff97b358281a28a5a743308962f0dbe492c4bc27007e0a8479d
-EBUILD cython-0.26.1.ebuild 2084 BLAKE2B 94de0e3e0c221894148cda42d5a664e4036ecb929308185ae62c2a40e03ceb34d39a738ec22f17e1fe787ef99f4b5bebf33cfc6d6a5abc1064223c90eb3c6a54 SHA512 3cd6fe405a37f5c7174d2067c231dbb3dfeb634c161a90aa3e7b7c5ce2757642c2b71a9a0491b8c2d2c13eddfff6157e7e21b3c0f8ca66d2e509793c354ab10a
-EBUILD cython-0.28.4.ebuild 2200 BLAKE2B 44e32fde8923b06bf65875f462de4eca5dc8d175663c0cd005dc3ce150d179bec8e56eef7cef6cd7539ea8b4ee18e853fac5082dccefeed2ff8eee2f9cc31169 SHA512 9065cd45c542e4eaa96cb027fd1940a2ab1abf5af31c4138cc319d74c5c658048fc7d550bd67d026dd6b474e42ab3f6d41e56203ffc921410df745c76e845408
-EBUILD cython-0.29.4.ebuild 2172 BLAKE2B 10a605f4a51e5330194206b47f151bb9f4a962508b47bc7e554ae11e98c7b1d5a67c958b72db3c43058205d324c3c232ad24286ceee4703546a5ba1e3f24fcc1 SHA512 c41d16fb0734167f1127472e4aa99f575521c5477983b4bf9e56fe9be00169cbd2df53e2f13a46ef102a062d21e8e107629e4052fb1b41b954adbee369a923e9
-EBUILD cython-0.29.5.ebuild 2198 BLAKE2B 859c3f6a33e6fa14af63c47b89210a0898a8ca603fc9e856d4aa8592be54966070fecfe087ede9848aed175d5c079a8e4b53a11615b58b4d3924acf2d3003a0c SHA512 72ddd5358d4887293c44d38cba04ed006f5062d0706c995240f4ea616415a39439052f38572d68d8f2efe59010ccc986dbb3ad32ba0db0b70cb6a253a4d3b662
+EBUILD cython-0.25.2.ebuild 2138 BLAKE2B d0f2bfad42937f8f45350f00feacb1915c2798cc2428e107e15b56c8cbee1a08d3c2e79202da663f1d9cce49b3f2077464ac07eff84b711fcd6d01b4ac9dc1af SHA512 5c6f1c85b9aeb85704c244bc0a69c66c11ac8343b54237218e681ad2ae1c0ed909d7a8679b93527c2bd42cede174421bf5174eed178d0a62f8ee4d59890ff3ad
+EBUILD cython-0.26.1.ebuild 2082 BLAKE2B b50ba96014c9b76e73aa34cc58ed8a7fb742ed0ad3d84cfd0ed07488c00b82b225630d0ca53be521baab970e30590754b764127d499784e0ea03f77c670132a8 SHA512 6962d88fef50a0304f23b154b5f260f2955aeda126921ab698f16fd29db253e8edc9ce09bec848cc32dbaafb8810741f9a25ad1ad00c2063c45f7d57db01213c
+EBUILD cython-0.28.4.ebuild 2198 BLAKE2B 4324cb905f22c94b9dff3f96584f68ce4eda9e3d5856f8cb9f03113d4db515a291003aca014c8de40d994c6c09fbf243ab98928fcf7bc0fcf6ac712832a5750c SHA512 c8a0965141f6121126591cfdbb9b7d38b42e4fce7a661c7dceb18e8598664718b7c2a854daabab571de54343c9df78bb9e5830d8647c88840dedf0879f8b1b5d
+EBUILD cython-0.29.4.ebuild 2173 BLAKE2B 0ffccc85e30508b942baef245fe484c193a6d4f23663f0b6e4bfc14cc7827ca3b42dbba9b0d6cf83d7b48b613d1d464e3f00a816c5f90120447c62c50f6d8617 SHA512 30de6f135469453cd47af06c4d8fff341b3dc146168099f765b82b0f8d767fc8c9714f4963ccbd9d3af415c4361979e03efc501c84ea0bc062489069f25031af
+EBUILD cython-0.29.5.ebuild 2211 BLAKE2B 97ea664bbaa85c91e395e864b5cd749e0e3b5bad83a90885f5d40507bcb4e6c99710617e534abd5a3d35643a1bf879caff46f5fd9ceb934c8c29007e41d3fb8f SHA512 c6ad9e2a75f2b4d113c0e62ae37d21fb637bc559978fcffa9779c198071105769e90440e6d190007b35b88f19e855bf167985368fcd443b97e2f3e4d6b455441
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.25.2.ebuild b/dev-python/cython/cython-0.25.2.ebuild
index a7431480936c..8d5e0e8dd5df 100644
--- a/dev-python/cython/cython-0.25.2.ebuild
+++ b/dev-python/cython/cython-0.25.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ MY_PN="Cython"
 MY_P="${MY_PN}-${PV/_/}"
 
 DESCRIPTION="A Python to C compiler"
-HOMEPAGE="http://cython.org https://pypi.org/project/Cython/"
+HOMEPAGE="https://cython.org https://pypi.org/project/Cython/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/cython/cython-0.26.1.ebuild b/dev-python/cython/cython-0.26.1.ebuild
index a60e11c5fd03..944d239393be 100644
--- a/dev-python/cython/cython-0.26.1.ebuild
+++ b/dev-python/cython/cython-0.26.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ MY_PN="Cython"
 MY_P="${MY_PN}-${PV/_/}"
 
 DESCRIPTION="A Python to C compiler"
-HOMEPAGE="http://cython.org https://pypi.org/project/Cython/"
+HOMEPAGE="https://cython.org https://pypi.org/project/Cython/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/cython/cython-0.28.4.ebuild b/dev-python/cython/cython-0.28.4.ebuild
index 1b86fc1a6375..8354853e5dd5 100644
--- a/dev-python/cython/cython-0.28.4.ebuild
+++ b/dev-python/cython/cython-0.28.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ MY_PN="Cython"
 MY_P="${MY_PN}-${PV/_/}"
 
 DESCRIPTION="A Python to C compiler"
-HOMEPAGE="http://cython.org https://pypi.org/project/Cython/"
+HOMEPAGE="https://cython.org https://pypi.org/project/Cython/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/cython/cython-0.29.4.ebuild b/dev-python/cython/cython-0.29.4.ebuild
index dac33af59699..2100a3aa5737 100644
--- a/dev-python/cython/cython-0.29.4.ebuild
+++ b/dev-python/cython/cython-0.29.4.ebuild
@@ -12,7 +12,7 @@ MY_PN="Cython"
 MY_P="${MY_PN}-${PV/_/}"
 
 DESCRIPTION="A Python to C compiler"
-HOMEPAGE="http://cython.org https://pypi.org/project/Cython/"
+HOMEPAGE="https://cython.org https://pypi.org/project/Cython/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/cython/cython-0.29.5.ebuild b/dev-python/cython/cython-0.29.5.ebuild
index 8cd14394ba5a..09a50cfbb740 100644
--- a/dev-python/cython/cython-0.29.5.ebuild
+++ b/dev-python/cython/cython-0.29.5.ebuild
@@ -12,12 +12,12 @@ MY_PN="Cython"
 MY_P="${MY_PN}-${PV/_/}"
 
 DESCRIPTION="A Python to C compiler"
-HOMEPAGE="http://cython.org https://pypi.org/project/Cython/"
+HOMEPAGE="https://cython.org https://pypi.org/project/Cython/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index 89c9d3d359e3..8463c3a3b594 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1,5 +1,8 @@
 AUX 0.16.9-disable-style-tests.patch 502 BLAKE2B bc082ee45ac39a3457457d2d7d92809765ef27eb5d160e44546036223a511ce799e6be8abcfa5b7444619dc62188ab0b30f4b23a23b608e93c9054cd93253223 SHA512 1d9f957a74b767db9355380437233167e1c2e6957dd993843ad7eaac3f0cfb9fad739b9238207d60db203bf6daed6f1b5ce9373ef1a4085431845e8f8f9b6147
 AUX 0.16.9-replace-dbus-launch.patch 2851 BLAKE2B ddbfe3ffb7a5b55af448e5312340a83587ec7aa7613111caad4c9c54df4d2c05f6b0efb755262044e749d1d0c6ed2a289b02103f81518bd6ea24da7181bc71e0 SHA512 43fc52f453b086b59f854677eafda955ddd1e6a448579ac60de7288f6f1c8e8e029f5af12486ef6c14ba01f41fd10785c7bb076dcf4968349811be47c0b56073
+AUX 0.18.2-disable-polkitd-tests.patch 372 BLAKE2B bb9b33df485c635a080c41d4bea5360cf6a128a2f569782a51525c1ac9e6972bd03188f9777b1685f04900d48f2e554507db7c8b755de02c0a07de8defa26f05 SHA512 a105bb67702ef10d578e4df723452f060248287e9fc394754257c036ba0c6b186f90f5849a37e32e57cd70f16bbb73d0b8f84d9d153e1649d3ec5ab147dd6183
 DIST dbusmock-0.16.9.tar.gz 71014 BLAKE2B d1c0853cfd06848f1d10afdd8de764814054a44080b44e1ac2ef3a1658a538f1e4c7f5936d65658c16da33ccbc2e94f35d2746f200fc6791f645e1eccc55f6fd SHA512 3aa91f6ede054ed3d3a69f68f3886094e881d266a8f09c7d08a34d10b080a77facde8aae01e75232472c2e643574fe897dae2c3588f5ad9ecf4ec4e67f404f54
+DIST dbusmock-0.18.2.tar.gz 72031 BLAKE2B 44b46f05e48f1178fe95e44c83899bbef5bc64dcee856be1b332890893a5b901a03c236ad9a8cc6cf2ece83efbf5ec798551320a098736ff95c13951333ffaa3 SHA512 2421cea872e1d84db639cae0d6cc10c4b80ccf64903b7b3f437cb58ad8e3d957c30c871f9666a7a7774808b4b56d6116959ea03fdc8b575ed98023b77b61c8a0
 EBUILD dbusmock-0.16.9.ebuild 1071 BLAKE2B c4d16f3429b4316ff7fe95b6eeba4159632caf8bd37673a5c66ed9ad56d4076e855384c3c95b753af84ed2993602014c4587aa9134495e7b567ecde3d710f71a SHA512 23eb543d8313ae846b78bdd405e3e5a5a2bc827b6cc76d14cd626c3807aba798646f946e339e16dbcf6112e42674f12557d8d7b7660a26792c5695bc9e9f6255
+EBUILD dbusmock-0.18.2.ebuild 1053 BLAKE2B b744900e2b7b81b7e1741901bf93d4cdfe04abd174ee93fc585b408c60dad3deaf3daf92d34f10945976f0f903d84c92790fe9cfc4f77b14e4767e250cdcd231 SHA512 56a821d3e865674a8b9cfa13c47579bffdc108d958bc7137e58addf5af32b9f57d54d0d45d96883368791ad5886febaf261779e330c97ea9e7f70dfc45dec958
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/dbusmock/dbusmock-0.18.2.ebuild b/dev-python/dbusmock/dbusmock-0.18.2.ebuild
new file mode 100644
index 000000000000..8a4c34721766
--- /dev/null
+++ b/dev-python/dbusmock/dbusmock-0.18.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+MY_PN="python-${PN}"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Easily create mock objects on D-Bus for software testing"
+HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
+SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/0.18.2-disable-polkitd-tests.patch
+)
+
+python_test() {
+	nosetests --verbose || die "tests fail under ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( NEWS README.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dbusmock/files/0.18.2-disable-polkitd-tests.patch b/dev-python/dbusmock/files/0.18.2-disable-polkitd-tests.patch
new file mode 100644
index 000000000000..2f17c233a3f7
--- /dev/null
+++ b/dev-python/dbusmock/files/0.18.2-disable-polkitd-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/test_polkitd.py b/tests/test_polkitd.py
+index f47fdfa..975878b 100644
+--- a/tests/test_polkitd.py
++++ b/tests/test_polkitd.py
+@@ -25,7 +25,7 @@ p.communicate()
+ have_pkcheck = (p.returncode == 0)
+ 
+ 
+-@unittest.skipUnless(have_pkcheck, 'pkcheck not installed')
++@unittest.skip
+ class TestPolkit(dbusmock.DBusTestCase):
+     '''Test mocking polkitd'''
+ 
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 94702b6b2013..d81f6bee77c8 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -6,5 +6,5 @@ DIST docutils-0.14.tar.gz 1727105 BLAKE2B d8880918e04ae19ec17ec8aeeaeb44d198a15d
 EBUILD docutils-0.11.ebuild 1865 BLAKE2B ab64496926dfa4984d2c43aa079e8674288ccfe46aa177bba9526737dd87e6c0c608bc79326fab385da3e1cdc049b1afe27d4916ea832db005efcc917c3b97fe SHA512 5e2853a6ca36e893eb6df7392745091970c8a2008b39fa3ab9a5599c2100c889fe2ea1bf9e66cb28023214896c2d84403160fa0b9f4913caf80b962f07148c17
 EBUILD docutils-0.12.ebuild 1812 BLAKE2B 69fbd3323beffc4f47358bed59b1cbe1047a999173c244de9e1847eb1c7d7246b75f089426fc9b05c0f7be9e7cc02f99dce8a3ef2cca7fe76f1cd5764af4d0b1 SHA512 551c27aadc5132f4d0d1d38c900b711cd5e1bec371bd0f7a588a885409f11500ce4d7386982643af2a095cccc6655311ae06cf8901e506be428049bc5ec67468
 EBUILD docutils-0.13.1.ebuild 1826 BLAKE2B 7ce8a58e17edf3ae4fba6a8adf45b7e5f407f4aff58b82d62a0fd40285f17f83cc7824268e18dc3e6640478d51c433f708482ee40f2fea469a6806577b1f7c4e SHA512 82b9ad9c28a2f9ffccbb5025eddd339d6fe2366c32a95c819e06bef6a480635ecd4fea5c1aa7857386c83c36c046bbd046535a21132e802158084c5b2dba99ea
-EBUILD docutils-0.14.ebuild 1831 BLAKE2B ed4fd90b160e98cdb5f41b1ff8885e3b726a74cfbd680959e6315f4323926783bb7595e5f28f2745752a9329e7f2399bb2a5a1ef5d937c774ff6e7a9b4d8d29b SHA512 3647ea0cafe6ff3d61dd01972c0fcbf7386830d465c12453301a1792206e66484aff24ec3b586b213536a53b376fa7b6f86c57d2a57c23f4b2df89d458c943e2
+EBUILD docutils-0.14.ebuild 1829 BLAKE2B f9024102fb34d40f25aea36eaac36543c49ae1212f6aef877eaab77b33b63a1efff878600197fdaa91173760755f015494e55ac46ec13983d5cfac042348bcd1 SHA512 7b474fd874db0fe94177f8150fb6d97d1c4c7da4844c9f3927aed0442336cf924f15b1f651566ecb7c9577f64880be85ed774bbcef9027a6d32de75d666dce56
 MISC metadata.xml 318 BLAKE2B 396ae24ba924fbaed55e84016c94fdef294c87d791c3fa911f16ffe04b452980d112b27112b58b0092d1730cce7db36efae2851d150102046a3379b65d347de2 SHA512 3cf09c6d943288ec0fd9fa92d4475ac184a87b47b7bc8df80fc24a712d8bf0363d4c2a08efb2ace4d94adcd59fdd6f82ae9fd9bbe58561ead5715f7daf84a96f
diff --git a/dev-python/docutils/docutils-0.14.ebuild b/dev-python/docutils/docutils-0.14.ebuild
index 570e3a4fc876..10a9039831e4 100644
--- a/dev-python/docutils/docutils-0.14.ebuild
+++ b/dev-python/docutils/docutils-0.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/fabric/Manifest b/dev-python/fabric/Manifest
index c3668dd8ded4..1541bf91d893 100644
--- a/dev-python/fabric/Manifest
+++ b/dev-python/fabric/Manifest
@@ -1,7 +1,7 @@
 DIST Fabric-1.14.0.tar.gz 219294 BLAKE2B e4f8512fd5f84dacccdafbde51ed109fd7128954635ea67ed7461f686769c107cfa6bf0181921aea5db214ffb9fb52c7f0de88c5edbbdd63258e8c280e37c70d SHA512 3bb90597356ac033e5a9bba668ec8b080ee10cac31f54b1e89b6e2e21550ba5f2341e774ed9ff52c3a4ecbc3bae3206d155c6bfe6678576caca8e439c7810ed9
 DIST fabric-1.14.0-completion.bash 4266 BLAKE2B b691b34d3a62ab8a70d184fe89150d50a0817df0619cfcb4a82dcda485b0a77bb33b5f7e548b1c50ddf8c9c9ae48721c9621e0ca6ed4396dea2f9a0e1ae61931 SHA512 2303e3b6a71ac8f6a61ce3bd464f3c950db8374b61a6375ccc6fbb2dc815a4a44509a034788862bd361ace7c0f401533cd5cee0fb6fca8d9ff7e0ffd143706a3
 DIST fabric-2.3.1.tar.gz 148829 BLAKE2B 65df8856d7d7ae61ad045ee7710c1aa0517b3be63751380d349c27c4ca4667a9179ae4e7f14612d7fec71cf90de5c98d7c7867508e56717235703c688c54a4e2 SHA512 8341869004b9ec2ac4459245af30b06f8f693f696339ec08aa83a9d56069379390a89f6e04f66ea3f064436d9184de0435a8fb283db8ec5a815471684889dad9
-EBUILD fabric-1.14.0-r1.ebuild 2162 BLAKE2B 36a3d0a6e660e7ef850eb87d8ff4b2b858a3db08095bc69487003e8db1976d9faa95f03365786a0353b014b0b9222447ea70394568cd9580520c98581b496a73 SHA512 d2f83cbbdc340d04e3f08809616f3e5021db7f28681ff2a27e1946c4eb2b4a4e7ff6f6c5c252e909e93d572a63a2d49497873181368231ed3001fbc6a305444f
-EBUILD fabric-1.14.0.ebuild 2163 BLAKE2B 98ef182b8a84056f297ef881a07a4062b4b0fd7c601e58de9103d4383af31ef346c6ca242cfe2677c1d0fbe2492009a3921430eec3df74373565350600d99977 SHA512 dcd699a6e9ae08cea481b354a4c1327bf1738815761fb6f856a84684e99f81cf553c31d2e7f64f906456aa4b687b11435fd93dc094dc9db45459819154a56c76
-EBUILD fabric-2.3.1.ebuild 1446 BLAKE2B 748326c0280233cad9754a73132740d3a7f7114e87ae85f8cd68d2376cf8d928a93be3e4f2bd5494cdcfc60ea8cf683d6fdd605477defa93df1491d2e61b921a SHA512 3e368e90971234abc533a975dddfa98e10099df542edfb3c4853fcb3378e822cb49aa04a2e0be73354855707ae870678f34e7666926642d0b317ee136d0e75ab
+EBUILD fabric-1.14.0-r1.ebuild 2164 BLAKE2B ec127746fc664b2b2c2912d24d6d00c05726b767c75842c4232fefc8bc305c4e03add32b4fe02aa9b5991d416df3ba0e4596a30540e952377fa4d51389e88618 SHA512 61b3db0b304068865b19ec7d947c31f026fdb8acf12beb53e9ada569e66170a3331867cf2826dc23523a8f86c140618fafde26c3d0bab11dda783d0648fa29b1
+EBUILD fabric-1.14.0.ebuild 2165 BLAKE2B d46bb79f45d25acab384cda763452c6f966bd8bef3a1a6bb4d8fdef45e6eda79a7d34dcf2b6333ed57125f5c23b600a67ed53fdd5c603acecfeef2c93a711fdd SHA512 caf771a5a4ae4f3af317dc62dc7062db24958e92b801d0fe7ae4426098c261cc3c5d2aede6ae5e6f12e5775d17a437fa019b429cf96f132ecf2409da98bebc65
+EBUILD fabric-2.3.1.ebuild 1448 BLAKE2B 1017cc5fc22d58be15f076ba1d7e5a618a8cfb385048153b22c081a5837b1c7eb4fb43d3f19514cd2b883a11899fd9fee6d103f6632d234f0ec72ebe176fcc8e SHA512 9be318a3441500b5bb3b6010db6a9529181c08cbb13c84eeced35144a4304fd239b9de702aba6a4c07cbe25e1744a22c9cbe64d871389109ba7ddadab2ec6b8e
 MISC metadata.xml 524 BLAKE2B 9df10f0b4cbe8197f27e7b5fc67fee9d46d881ab29cd29f2255aca693b3439c49edd1145ec2442cc6d49fcb173998aef3bbd2a3f2017e1cb83fcc79f1c50c59e SHA512 1a7a207ebf6d760a6f8e150806addbc9ca6c207b0f93c13bf5525ab2868d95a2b33acee846dee25eb70af0163cb2e05323de1ac2b74155046de962a44c470413
diff --git a/dev-python/fabric/fabric-1.14.0-r1.ebuild b/dev-python/fabric/fabric-1.14.0-r1.ebuild
index f3da6f17450b..7d9586840713 100644
--- a/dev-python/fabric/fabric-1.14.0-r1.ebuild
+++ b/dev-python/fabric/fabric-1.14.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
 COMP_HASH="83d303e9fb352deaf4885b6db0781b3d9115e9c6"
 
 DESCRIPTION="A simple pythonic tool for remote execution and deployment"
-HOMEPAGE="http://fabfile.org https://pypi.org/project/Fabric/"
+HOMEPAGE="https://www.fabfile.org https://pypi.org/project/Fabric/"
 SRC_URI="
 	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
 	https://raw.githubusercontent.com/kbakulin/fabric-completion/${COMP_HASH}/fabric-completion.bash -> ${P}-completion.bash"
diff --git a/dev-python/fabric/fabric-1.14.0.ebuild b/dev-python/fabric/fabric-1.14.0.ebuild
index 460458e98acb..bbebaa950394 100644
--- a/dev-python/fabric/fabric-1.14.0.ebuild
+++ b/dev-python/fabric/fabric-1.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
 COMP_HASH="83d303e9fb352deaf4885b6db0781b3d9115e9c6"
 
 DESCRIPTION="A simple pythonic tool for remote execution and deployment"
-HOMEPAGE="http://fabfile.org https://pypi.org/project/Fabric/"
+HOMEPAGE="https://www.fabfile.org https://pypi.org/project/Fabric/"
 SRC_URI="
 	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
 	https://raw.githubusercontent.com/kbakulin/fabric-completion/${COMP_HASH}/fabric-completion.bash -> ${P}-completion.bash"
diff --git a/dev-python/fabric/fabric-2.3.1.ebuild b/dev-python/fabric/fabric-2.3.1.ebuild
index 2ce31a9dd305..e24a928cbea9 100644
--- a/dev-python/fabric/fabric-2.3.1.ebuild
+++ b/dev-python/fabric/fabric-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A simple pythonic tool for remote execution and deployment"
-HOMEPAGE="http://fabfile.org https://pypi.org/project/Fabric/"
+HOMEPAGE="https://www.fabfile.org https://pypi.org/project/Fabric/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/flaky/Manifest b/dev-python/flaky/Manifest
index a270e5e42265..3eb76e442d2c 100644
--- a/dev-python/flaky/Manifest
+++ b/dev-python/flaky/Manifest
@@ -1,5 +1,7 @@
 DIST flaky-3.1.1.tar.gz 29136 BLAKE2B fe2f47356e0279885cc294f22bc4588b502c7ada1d3f7a3728b1e3127f011f5900187669bb4e0755e706a1bd77e1804c42986a07c6d3dc58fe085967adb6957c SHA512 039ad115a52b8b3a31bba045874e1860f1e04ea9cf878316226fb22af3c715b3893570c2f7380cf8467107f1a83a4ff69d0e9135daeb2dbea4b8f873a192815c
 DIST flaky-3.4.0.tar.gz 29197 BLAKE2B 8f551a414cb06f5259d37785eb769a77105b1039398462288eeaeeb6acea8456c30cc7da6cf515cd99be2adb19a77282d2d0d3abe795761985f45ffd062de508 SHA512 14fda6312e4eb8260a8190204622a7dd274d0c946dda07ec8aa65e8c341f7f4a701c704c807f50eacf77589231b37c3bb06eec18d60a718f24e9b0182f7e8cb5
+DIST flaky-3.5.3.tar.gz 29320 BLAKE2B 6bd2095cd481fdd8311e08c3e8aaff78fe22bfefd8463ea3b8190a469d8f909039267256afa876a22a57eae9e390af8235b10211509fe8549d000ed7e9331baa SHA512 9ecb80ab1ec2e0db96b7a7a5856a147434c22d29a603e76d3db3f8d94ddea06ecab799943179910bc1d9d8d5dc1c7bcc94156628352479d67e2dcaaf5cbabf27
 EBUILD flaky-3.1.1.ebuild 1388 BLAKE2B 058e0db9e1c5345bff3d535b695ec9c367dadd2cdddfc9e01cf5bc7804c2000f9049e5b88dbc7edce1f3ef29dbd47cb24bd0858d083fded692039df42bc4e26f SHA512 4e788de38ad4cfd9141983e33aa9c0e60aac16958f6f410cdf23afb5bc7838b50b631b8a55a37272381f211782c5084a732db8fdb2155c9cf88d79a2625b4b1c
 EBUILD flaky-3.4.0.ebuild 1467 BLAKE2B 7f67f007889ef7c559c0fba0256319a79346a8186db576db9eba6ad05f6c5c52b008188245848dcc950f493e96da0acc00fd2c451b73a219c6a25c104945978f SHA512 0fe0a76cdf49f63716f30f6a3bf32f984490ddfe9f8af6ef85fdd6e863df4372024fa5e0715c915cd97e4697a26f5a551361f771e8df3f67c249fe7f5dd6cc68
+EBUILD flaky-3.5.3.ebuild 1467 BLAKE2B 17b642e76b2aa9455d2efa83de370fcf5f5214f3aa1828e36f21b5bd45747e526a3c9312154da7ce9d4c6e853230a53087e7891a3e5ea6f0f2a51abb4a316ff1 SHA512 d6d61a09254d22e84d81bd8c45a31f872f2078de3f487cae97999bef133a44a44ca4b3b54cc0d6c32da8e6439f0669828152f8305c15a6baf94f10cf7329eb4f
 MISC metadata.xml 369 BLAKE2B ffa607acfbc98fc2e539492f87b55cedb039b39b3cdb7ce07cf9dcebe1a1559296284b27d06fc6262f362c0ea8577e23f4bef07ffd01a94c4d981fa060384d5a SHA512 da1597d14b2e3f9bc56e48064718a2a52bc1615d982d679d8c971f1fb1b9c25169d5412f99542f808fa42f958e1bb589e7615a13077a7d1b0574acbec1d4b1dd
diff --git a/dev-python/flaky/flaky-3.5.3.ebuild b/dev-python/flaky/flaky-3.5.3.ebuild
new file mode 100644
index 000000000000..92528305918e
--- /dev/null
+++ b/dev-python/flaky/flaky-3.5.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Plugin for nose or py.test that automatically reruns flaky tests"
+HOMEPAGE="https://pypi.org/project/flaky/ https://github.com/box/flaky"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/genty[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+python_prepare_all() {
+	cat >> test/__init__.py <<- EOF
+	# coding: utf-8
+
+	from __future__ import unicode_literals
+	EOF
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --with-flaky --exclude="test_nose_options_example" test/test_nose/ || die
+	py.test -k 'example and not options' --doctest-modules test/test_pytest/ || die
+	py.test -p no:flaky test/test_pytest/test_flaky_pytest_plugin.py || die
+	nosetests --with-flaky --force-flaky --max-runs 2 test/test_nose/test_nose_options_example.py || die
+	py.test --force-flaky --max-runs 2  test/test_pytest/test_pytest_options_example.py || die
+}
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 35ab323ad76a..b44f91af14b1 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -10,6 +10,6 @@ EBUILD fonttools-3.20.1.ebuild 801 BLAKE2B 111c4345dc971f388aacfafb8fe10e57ac2cc
 EBUILD fonttools-3.21.1.ebuild 813 BLAKE2B 7d50f4981fec9c2b725ae11989cb808f7b8ec2b0d5f93a67181cf7196f0c90e08582088e6e8a5ddd77fd1ee396a09e368cadbde5f6d6d47a871f0da3794c203e SHA512 97978de7990b309cea4026e22b5ac2731b4240e66c6fb358ef4a66326a31d691314c269bba341896fca8c621cc49d9042e5f1e126c44e5ee8379babec3564607
 EBUILD fonttools-3.24.0.ebuild 813 BLAKE2B 7d50f4981fec9c2b725ae11989cb808f7b8ec2b0d5f93a67181cf7196f0c90e08582088e6e8a5ddd77fd1ee396a09e368cadbde5f6d6d47a871f0da3794c203e SHA512 97978de7990b309cea4026e22b5ac2731b4240e66c6fb358ef4a66326a31d691314c269bba341896fca8c621cc49d9042e5f1e126c44e5ee8379babec3564607
 EBUILD fonttools-3.24.1.ebuild 819 BLAKE2B 3327bdd4ab04453596301759775fd0c67d4eb7b05369f3d285f37ae27b31563dbee1dc95fd435d94c9e2e0d214ca814f9caf08e0af5e19e1686ac453c70348f3 SHA512 07a3a4c6ed81a66923e1b7dc60cdd71d9350d910efeb8b60b0ac905899d5904336d7a16196239b94dcf3b8398e93da1f1953750f0256bbf69dec7963b62c62e0
-EBUILD fonttools-3.24.2.ebuild 812 BLAKE2B 0191a387b1aa786fa43ffa453fee7cb8ef05afa58111086db93bb2421c85b5a0a6b83ee4dbbfcf10b38a78b97db11c531b6650f4673ee094d24edc8d8e9b463d SHA512 44892752e39d2f5059cd39935ae9b1d1ecd2984cc83dcebee81dd562a9cb3dbb6712033878f253c98554e366fd338c45b05c978b55b1339ef7e6a97ce42d3620
+EBUILD fonttools-3.24.2.ebuild 811 BLAKE2B e4c5dfc73ba8a96129286a18c87df17487796fb96428b1065ce0635810dc54f6f72929716889f9d54d7550dafd539384411f5f9991a80b473f1002bd68cb8851 SHA512 0f35d9ed391a07526d3ae7cd5472327f9f174d8f013198caf61e85c493cf5e281c12b20f178eb3a3ae7a73a65b19213778bb3265c3a646b2ae1e990859a72a3b
 EBUILD fonttools-3.28.0.ebuild 913 BLAKE2B a142a5199cfe3d2d7e37cb543be1e87f45300a14b34291230db3cd0123c4628eba4cdbd62f9c798a214527c01afe25ac8a8731ccc29665352a144ba18c778daa SHA512 56a731db469587f1b48be4f7e812dba389000ef0daccef18e9618e7d55d835d2ffc2c350787d83a92be83dd581c2bf2f2e5d5918e09badc3bd0ab508164f1798
 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 9c2b45b1c331..cf0cb84a05f4 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/fusil/Manifest b/dev-python/fusil/Manifest
deleted file mode 100644
index b064ba0fb9de..000000000000
--- a/dev-python/fusil/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST fusil-1.5.tar.gz 138910 BLAKE2B b3f1d07e40116aadfd3aa008366f9598015e741bd5caa364050e26d6a8d9d9c4fe8bb021431737f58ea54bbfb79808fa1ae99568afadad3ae509937910578f90 SHA512 0d84bfd2d9b8e509989723de26b30c3ec2824612dbdcc097ff3e998fd4efa6b1293cb78743e098ad5012d4981b8e8036f3ad3f9c6acf2dc30e3ff1f707c7d1c0
-EBUILD fusil-1.5-r1.ebuild 850 BLAKE2B 2d367af89aeb7c8cb247a391f2ca1ddce76532e7f309cafd1b4e62d308b9d8304b546a62a6dc5d9843ff6422bd66475edb7824aa968f7923c8ad7091459e7b52 SHA512 03a5a1accb1000924e72363488945e67b418cb94c37df52d81ad8c07b5051ac9045efbaa23f437e45057174b48954012b14c160de2f5897d9c65a9ad89e2173d
-EBUILD fusil-1.5.ebuild 938 BLAKE2B 722e16983849025973421510668a700ad92e75f929ea7a8158c31d3e9a0d084f920a25d605e32904135b79a452a5c76ba8c7fadf23ddd06b8c21a8fd649b161f SHA512 64de057453435a35afcfb71b23bf4d4e9a2f53ec77d045e498e121bbd855344e18b8a5bf6ae030f288f8b6f1afe840cd8520bce48ecf1cb8e628dad7282bc128
-MISC metadata.xml 374 BLAKE2B 7580e8059db1c7decc3688c34c4da02af104576b257904129929e9619cd94384a10db1514dbd64b638b3e2b44e19b9e051af0bc325c1505628cda806d8f5e213 SHA512 98947683cbc807385f692511afa4402ed11644fbece4ecad9888cb8beb90d4154f9ddad104210ab2e7fc0641cadb654a826786a57ffb6fbae158eb3aefe0bdba
diff --git a/dev-python/fusil/fusil-1.5-r1.ebuild b/dev-python/fusil/fusil-1.5-r1.ebuild
deleted file mode 100644
index e7a28cd94155..000000000000
--- a/dev-python/fusil/fusil-1.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-
-inherit distutils-r1 user
-
-DESCRIPTION="Python library to write fuzzing programs"
-HOMEPAGE="https://bitbucket.org/haypo/fusil/wiki/Home https://pypi.org/project/fusil/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND="doc? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/python-ptrace-0.7[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	use doc && emake -C doc RST2HTML="rst2html.py"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 -1 -1 "${PN}"
-}
diff --git a/dev-python/fusil/fusil-1.5.ebuild b/dev-python/fusil/fusil-1.5.ebuild
deleted file mode 100644
index 4a13a9f1b432..000000000000
--- a/dev-python/fusil/fusil-1.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-
-inherit distutils-r1 user
-
-DESCRIPTION="Fusil the fuzzer is a Python library used to write fuzzing programs"
-HOMEPAGE="https://bitbucket.org/haypo/fusil/wiki/Home https://pypi.org/project/fusil/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-DEPEND="doc? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/python-ptrace-0.7[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	if use doc; then
-		emake -C doc RST2HTML="rst2html.py" || die "Generation of documentation failed"
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	enewgroup fusil
-	enewuser fusil -1 -1 -1 "fusil"
-}
diff --git a/dev-python/fusil/metadata.xml b/dev-python/fusil/metadata.xml
deleted file mode 100644
index 030b6dace8fe..000000000000
--- a/dev-python/fusil/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">fusil</remote-id>
-    <remote-id type="bitbucket">haypo/fusil</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index 422bdf68e084..689a63bf4e18 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -7,5 +7,5 @@ DIST future-0.17.0.tar.gz 827812 BLAKE2B 14bfce4927386b157da91e6bbad547e21bb622f
 EBUILD future-0.15.2.ebuild 495 BLAKE2B 6796334fd8cb1a1e2c90a4a55c4262bbfba55eab6defad0deb788466ed93790887b38f1e3d63f41baa0b586d7cab5e5731c08cbc4f958ae9799ef7c085ed4b8d SHA512 39de67be4877db5f248267e72642090763473ea15935e69ec069a726a5d4836c1de9efc46626e422d4bb18299b5ddcb5e42514781020417fdfdd6038350ea2b3
 EBUILD future-0.16.0-r1.ebuild 1277 BLAKE2B 1fa567c5e96dcd183accb7f30d3c52bfc3fe74b35c534d4261e7545724f9158ccfa850d303a4483b1d8e50dd1d26aba06f8e0ad83990b611ed1e534f1b2c0bdc SHA512 f99a558be25f3b8c2df29fffae08a681d88dd53b2cb240bf8852ea0274f286cbe3207022b3fff8d715635014e3d46a2ac416a9fccd26fea59fbb18361fa8a081
 EBUILD future-0.16.0.ebuild 610 BLAKE2B 62777ba338901883572fd237a80f2e1ef2f9c5fac6770ec2e9ebc879fb64339d691a00404f256290120a377669b709ec860b5125030f449fe1cf4bae1bf29c68 SHA512 a8da9953ad31e8dfbd5dfe406e3f3091a7688931ccc7a6131617b39b3d716e07c4629f4abf3215cf18d1652437f3cd0985bc5fce2f4f52bbc191ed8e8748771c
-EBUILD future-0.17.0.ebuild 1049 BLAKE2B 9f474b608a2fe0ef46014db8d9867041739a2f2f3d272fa341d455b04eff94430d1d31aaf0c81dff6e4b557cf766a04b641e82b44d59800f92d77245001534d7 SHA512 dd1705db48ecb931c718adaeafc134f49661d74ca63b6703042d8cd3791b51af9122baa2f5790f2abb7f7d555257bd4a8b2194b8dbcf90da5ca829f728555a02
+EBUILD future-0.17.0.ebuild 1046 BLAKE2B 8f4273d0217337c73cb380fb82fd9c13eabff1e73ccc6e68d30994e445cf07561968a41be7726412d4d1058766aa1bab0f5d38f4055dab4422957853717af714 SHA512 66bfa168e27742f19a7e84460e1b468057faf85548ba047612ea4cbd0ba7cd80957bc9e1b22d3dc06ae8c83a69c788167bdca27c139aef6bc841131557292f70
 MISC metadata.xml 309 BLAKE2B ac0715185226cea8e3c38698ed3e494b6464d86dad0211e4d0583e3ceb6634c2b1ec230d9dff659d5ef47208b6f3358c701a0c42e49848816ae99703cab82f46 SHA512 e01e3b2733211e1eb6aaef4da19265c7165411a46fde4c2156118700c315bc2ad52cd87de1b90355741de77d91aa22eed5f9e5847d45186bf7138d246cd775e4
diff --git a/dev-python/future/future-0.17.0.ebuild b/dev-python/future/future-0.17.0.ebuild
index 860a64b830c0..cdf881a1c1a5 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index b2f60fe8fd03..6a3a579cca4a 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -1,7 +1,9 @@
 DIST grpcio-testing-1.16.1.tar.gz 12262 BLAKE2B 06790ef800a256fcd3073e32df455f97ff2528a6a10b661527b3a306adad3828e835c903c0fb4abf4e829ccfb4481b5334c87d021fb83d12a0f308dfc09d39da SHA512 2e1026569b694e555cc84bcbf0389e50d35955bade2ca5614289de0994cbf9d128b649ecd1813e45f8ab79ee4efd77382ed669cba5bcfe8317aa9f774e0e54b2
 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
 EBUILD grpcio-testing-1.16.1.ebuild 522 BLAKE2B 51f1840a6f3dfa39f6c35768c0254967f949be53ff37dd7284cd6fa5f7de3ff95a6719b6faada3d6cf914d4298b63c725c76c666527d2e4301c2e116ca76632a SHA512 5bb33b143942af94a486ab9562889f3e9bad576ed1d137e870fd692665bdf739b56ccf2fb77a84a8dcbddf973b59fcb6cdddcf940ac2a64d9710ed48d1527e4d
 EBUILD grpcio-testing-1.17.1.ebuild 522 BLAKE2B 51f1840a6f3dfa39f6c35768c0254967f949be53ff37dd7284cd6fa5f7de3ff95a6719b6faada3d6cf914d4298b63c725c76c666527d2e4301c2e116ca76632a SHA512 5bb33b143942af94a486ab9562889f3e9bad576ed1d137e870fd692665bdf739b56ccf2fb77a84a8dcbddf973b59fcb6cdddcf940ac2a64d9710ed48d1527e4d
 EBUILD grpcio-testing-1.18.0.ebuild 522 BLAKE2B 18f946c906732d3d0c41592a933cc9d3403c9c5d42df8c6fee1c456a96a2eae11b3aac9ee405c18802cc74fd6a890266778f2f8c4817ae375ea6c4400a23a925 SHA512 3ad59fdbd4a10c42c1eb3cd2e26c2f52362611255c8308867e6d1d5a5a8de831d1edce90133ee8e06bb75c717a8977d865de570c496e8d0fb5951bea28e87846
+EBUILD grpcio-testing-1.19.0.ebuild 524 BLAKE2B 4c4612aa3a4b5c06dfd0685edaa75708302d52bd7499fad2c6c5c52c889ebc574e0346d750dd8b18b6df1b35ba55813b4a86df6b4c2820a027b73af88cb164c1 SHA512 d52062a7e567c4ebf7f3f0e1fdc83c71ddec6ecdfd567738e1ba331f107c2a566ecaa570bef4ac59d7f566f56db5ce14b33731006ae471e8ed57bb7a6588b83a
 MISC metadata.xml 462 BLAKE2B 159e29c960dba2f197de7e1b8eda84162039ecdb35777aeb00314f8af9a7bc0771071e63a1528c922519568594f06971b228036914500d2ce3d33b411ddf0685 SHA512 8326b0e1b98c2921b461ad44663711318f2c48e4e411380de4b4bb26fca11d726d627fe47ccd0d1149348b55aa9391d97d144f654d016a1fccb34791f5850487
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.19.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.19.0.ebuild
new file mode 100644
index 000000000000..7d3c43242f13
--- /dev/null
+++ b/dev-python/grpcio-testing/grpcio-testing-1.19.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,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 98a312c3eb4b..52bfa5ebad31 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1,7 +1,9 @@
 DIST grpcio-tools-1.16.1.tar.gz 1887741 BLAKE2B 721746ff5febd743ca56f6e5265fa7066ca1c940ec7b73f2978b2360bc3f4076a72b4bea44fd808e59713d06879beeb43ae38e176ceeee204e0159ef2540324f SHA512 73652b3b317f216a1b3e6d94499888ba9410dcf44ed11771b359fc363eef6878f466385800cfb856fdf956b275a5356f4984e68a16a7ce8b29ea5c278f17d9fc
 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
 EBUILD grpcio-tools-1.16.1.ebuild 680 BLAKE2B 9123e2777429525db1d75e702d606e8fb514f0ebbef64c249e3e9e3806fd9b434a57eb0f8095f09761b7ee2f2187ecc42fde178655419351a05f4f62383e3f3b SHA512 c6e093fa343fbc8df84193aa860ae33b30d42a3853819bf0b28976cad4b793ca4d1e1968d539b3f36941fab8da9e403b441b750f6b649067b7fe4ba248a4072a
 EBUILD grpcio-tools-1.17.1.ebuild 680 BLAKE2B 9123e2777429525db1d75e702d606e8fb514f0ebbef64c249e3e9e3806fd9b434a57eb0f8095f09761b7ee2f2187ecc42fde178655419351a05f4f62383e3f3b SHA512 c6e093fa343fbc8df84193aa860ae33b30d42a3853819bf0b28976cad4b793ca4d1e1968d539b3f36941fab8da9e403b441b750f6b649067b7fe4ba248a4072a
 EBUILD grpcio-tools-1.18.0.ebuild 680 BLAKE2B 3cb48101cb3a56be7579c9ff655040444d99a78c8e1a456a593d6e54b398d54d0d93569f856d0b774728f0981557e59c92e72f9983755b13468cc48a834f1e3f SHA512 0282d49be45af744d1ddc7579ace48cfe88f959f7bfe07c54d7639fac813d9d7f9a10c69ef76ceb90aa7df9a8e4b6cbcde39be72a7404db36ec84f41ee73ef0b
+EBUILD grpcio-tools-1.19.0.ebuild 682 BLAKE2B 0155554f18bc0931bb4cc5dca55255c59eb5722373ae1bbd5e82257f075014e9db27a06a0a860e51f294d3242c82ed99fef65d79a1a11e42e74988e41e6040c7 SHA512 05d77c6afe49cffcaf0a469b88747ef99f9ad7a129e1faf532e51a94fdd927f07bff74695246ebb95a703690ba94662a91eb708aa70dfd174c8b0e07295f012a
 MISC metadata.xml 476 BLAKE2B 62016e9a321f9c5b06d8a473d75b5efca8246df90ef9a67a33c02c416c58a8ee1be875cd54567d55bc9f10ef32082e11c01a9f1550293137aab8942e05dcf744 SHA512 cedbae8a8d9d7c6689c676c433aa6fea3c16d41911e0ee4a30929dbf2adb8ff72a2f0d81f996196a3b4090f8a5103a54eab4c651b359f9487d59955a6861152d
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.19.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.19.0.ebuild
new file mode 100644
index 000000000000..d820491c352d
--- /dev/null
+++ b/dev-python/grpcio-tools/grpcio-tools-1.19.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+inherit distutils-r1
+
+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_compile() {
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	distutils-r1_python_compile
+}
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index fe1671f3a6ec..a98a30d96c89 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,7 +1,9 @@
 DIST grpcio-1.16.1.tar.gz 14514047 BLAKE2B e4fc7f196f3e377afb0a103aca60337dd63b3b0f84846e7e2a4622a0102d4300782f08367e1429e1fd021dd90b151f17dd927a25a749f35724c7d2a41a6943a6 SHA512 efd7fb36a61e2ee872c0807a8198cabe8f1f9003bd5bce7cd46c75541752c0f745db02bbfe3f37f572531e15df60913f2b08b678545f176fe683f3e64e22124f
 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
 EBUILD grpcio-1.16.1.ebuild 923 BLAKE2B c1958ba9f6c2071dff53d33799edc6dfca1ea0a493ead17508ca8c3d4863bdaaa6b4ac8954cac203759f2060b7ac5f4e791ce7043e40119dfc82fc9c4847d121 SHA512 3013e475948cbcca3e37c06aa7c06b326574a32cf8231d4785a7bbd66066de336daa23b432eb5dd210b32b8f4786f5b86c50a94df7df8af4a0f3535022ea8677
 EBUILD grpcio-1.17.1.ebuild 972 BLAKE2B 67f25fa6beb4d2da362b74bd914f692a19b252324065fde5150b74fb150faa11cebcc55fc7dfa241611125d61097dba60f1d9b068c3efb42f13a06d11a675197 SHA512 2542aee7268e2bf44f6133e34538ada3d2b65a0b86d7728bb0b05456ae7df4e95f6c0d1443168fc88d5a717dc5ce4fea4ccb5a841789b52353e9e1a368da937e
 EBUILD grpcio-1.18.0.ebuild 972 BLAKE2B d0ea4552a6c5698375e4dbd6b2712810cc2e735f36cd7e399a7e657924af06de80073bf19b45b8b88daa694391c0a8c2187c10ca8e06a52423712094e693b664 SHA512 5d6a2646fc98f82394c35833efddc896cb2dcb4a4df2ebfbb3278b4d72d4569027f3af9ba1b70225bf52d253b5bb935cede245c214b5a45eb9f4e29cc0b37415
+EBUILD grpcio-1.19.0.ebuild 1020 BLAKE2B 0e35db19f785f096dfe1196f0964c4a5715ef037c54e7cfb5fb203e02280463b1fc70ade7a108974a4d4fed891713446f3686778692287a7889b5e35dd84ebdf SHA512 d2d149ec97289ce2ecf84fdbf8c014dd6ee45804c2be52fdde04f0f861bfb0a738d038aa39d4de318ac579052874b2b8b1a9cc76cdd6adb0475f61f37a1f9a40
 MISC metadata.xml 470 BLAKE2B ad01d702b7a0ffe570bd30f50d47bb4fed725fbdff6f838acc54ac767d0cee88bb28bb0642f804fb04858d36a63f8ff7e110e4ae1dd26b8eb539b0a5c77cf5d0 SHA512 bf26387089977138bcf6be78b469bb412988e96c6bf5b4a9897f452378ce71fab1012a7d9268fb55f2883bc9636b712b59abe5498ffdcf199417d97fb09cd90b
diff --git a/dev-python/grpcio/grpcio-1.19.0.ebuild b/dev-python/grpcio/grpcio-1.19.0.ebuild
new file mode 100644
index 000000000000..63c7aaebcf49
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.19.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+inherit distutils-r1
+
+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[${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_compile() {
+	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
+	distutils-r1_python_compile
+}
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index a5c5a3000f8e..9ec95d247a53 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,6 +1,6 @@
 DIST guessit-2.1.4.tar.gz 102907 BLAKE2B 3b3652f331498bbb365debf18c74f789b5c9e9c1f711481b0a392c73e9fbfa6628ec58f45ae482ee74cbd4c3d26662f2f1776d9b5fe19f35dec02e438c8b0901 SHA512 c6465c32a68d40698b75addb343d765e47b867dd7f9b8c912f70532a9e9ca54d0e40f70a393880347eea64535a65df5f79d83ea99dc996cd126ba91ca130a879
 DIST guessit-3.0.0.tar.gz 133379 BLAKE2B c9d7c2def91dc301944b951bfa32810b9efd2348fa9a016015dd75c03b407bf3e17cc5cb93baa1d4cc5b6fcb76790972f2bf7c14af2c0cad419f6a98bdda3d6c SHA512 87f19dc1c6b4f46fa1f2682f7c3bab91cf094df06904b8d9771159f346612b9d0adef4aef55315dd00d07787319d17008e936b125941abba5b869df6a91cb1c6
 EBUILD guessit-2.1.4.ebuild 1263 BLAKE2B 4e97e3a23fa354c6a1eda061752953af4a5d1b2c84175c7c2daddcea6ea17b8b29a1aec73454307afc56e02a50e8b2430ffb0f95773985223b0033ae1994d6d4 SHA512 4e8e53fd9a80e64fcf8b4ed8f3c808969528097991de33d2dc0988cbb239f98666d5173a9ccf5696009b70746124dc61c5570832e672ec3a2767c8040901658f
-EBUILD guessit-3.0.0.ebuild 1214 BLAKE2B f479ea14b41b37c039a8437fbfd92b890a7362034b13cbdcae20e868a91b1c844c265e977657920b5a6193a698c160aeac5664949ed9deca9c0ad498e566ec91 SHA512 cd8257edc6278823930110618136fcf0a7e8305c0bcd6ec3bb4bb3f54decc8a8a300bd5943ff9650cfece5c82b43d52ac7e0cdfd54700b419de53e6c897cec49
+EBUILD guessit-3.0.0.ebuild 1209 BLAKE2B 860e2760bec3e4f092d9e5415fd4b689562f5d394fd0fdadca07fdc8691d0fcc5aac888d2705c1c8163b5e69bc46a21f21c08ec405750ddab886b84aa4ef72e0 SHA512 deb0f0d9135c9ee695b3a9c95f203018c4800e6340ce62634acc76be5530a74d786d5a7e037efe53ada3e28e71c58a9afe741e9dd65cd32304e0ad1ad2acb1ea
 EBUILD guessit-9999.ebuild 1238 BLAKE2B 0ffee02de3f2723219230071cbd1a13b744babb33677b483f20aea408a7b16a131278a38c20e8ae692550026e942035b04c8960b96539c7f84f46e81cc2089b2 SHA512 e94962f740147db5a73136799a63ead2fc3281a90373593e1d398398e41b4e1cc0a7e09f7d1d4cc371c68a7bf5d64677c616657d33ccc283acd9fb6002a52ec7
 MISC metadata.xml 494 BLAKE2B 1263ff6357d817ed0e3fa8939860c0c2718f0f9d6d15dfcc0a7980d6040a56075c79c4e580c92a59a10a9f26fb0e0579592fb3e94272751b4f071e3d738eccbf SHA512 7a9448f171bf023c39ca5bdeb3f3c079ad64ecfb07a15d8d3708e00365ed9cb9dd547e404197fca308fab1e52f8c7f3669bb952b370c8ca707ff24d6067a1c32
diff --git a/dev-python/guessit/guessit-3.0.0.ebuild b/dev-python/guessit/guessit-3.0.0.ebuild
index a0c510a842eb..31fcc2694ff3 100644
--- a/dev-python/guessit/guessit-3.0.0.ebuild
+++ b/dev-python/guessit/guessit-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/hacking/Manifest b/dev-python/hacking/Manifest
index 7101d5148fca..73d88f9f0445 100644
--- a/dev-python/hacking/Manifest
+++ b/dev-python/hacking/Manifest
@@ -2,8 +2,8 @@ DIST hacking-0.10.3.tar.gz 41119 BLAKE2B fe43b31f356c9469925bf43ff381c1e24d69769
 DIST hacking-0.9.2.tar.gz 43956 BLAKE2B f4bad9ca0ffaaaf05d9f0b8536ccc72c51de4547de8d38ea31f9bae1ebbb52362d75fc286075b13631362fa00e3a7081db6a128584067896bf4daf7b32f4bfeb SHA512 76aa59b4cdfb8036d6471e35cba43d502de3a72edc3883a05822063cbb92eaa072cef3144d21ee82ac763c3385c65bc9dec4b66fda5a5a2090191ba5b6388d41
 DIST hacking-0.9.6.tar.gz 43287 BLAKE2B e67090fe103849fd9cb4cd4ea36065d49500448cc291ffa2c36273095a2de4a704af2f3a926aef0ffe4aa4689ef7f810f317f0ed46e9c7143039ab776b04bfe5 SHA512 e4225754a85ff474b724130a0c3d6a6b9c480a953ea35a18833378cf2a5df4687819f510b50a95f42890cc69836033a8af933bc0a5a4e330ae94532bcee189b4
 DIST hacking-1.1.0.tar.gz 55620 BLAKE2B 6a6f30ef8a1eef3aa1b1b630dd43e1d2e9adff1623d8db19a545f186f60ce367e4b820582893e6444b7d58573b4a70a47a30cdc8d2ce1202666cf6e1b0e7456f SHA512 d326995976c04469c9d164ff31d02471346af715730d97fee23261988100156c4598ea8968cb483e8f386ee3f94a6bdffb5f67d8a7dfc238f4607fb7fe09e128
-EBUILD hacking-0.10.3.ebuild 2115 BLAKE2B 58a5bdc96cde6a5d5fc63847dec869a6056103047d0b7d3d4b7cd2e78d2278e086afa945d1ffcd95302d387c2b35e3de54b7908916a925319bbac9202338df49 SHA512 42602898d7935c5127c28529a241f4a319b74c6c3b59d51e904ea5738dad573d16a027958a9cb290f3f7901cb4bcfad3e479d4d581552b54e227b0a688d848aa
+EBUILD hacking-0.10.3.ebuild 2118 BLAKE2B 74cac3aa67ab7a3adc9900e70ba906336a68edabf79d820eb6ccb2930a72f4911baf0eb8c3c46b6acd017bdb8acb628c935c27ea6aaf6765bc6ddd71df46bcfd SHA512 1955e46f055d52415e2585197a6f96fa0d8e3dc13a4779158c0ad5a04432a1212f85792c49cd48d6d12d32e067166be38b1b7cd198c61338961a3c86c0e3840d
 EBUILD hacking-0.9.2.ebuild 1942 BLAKE2B 453052e1370d760467797a57e0bdc11c72039a41c6f0f59153405a548f20b7e128ac563a5ae2a9d327a3cb2182a60d4e97b02111d105e5a58c83d84e1f2856a3 SHA512 f9d49566d6b2ac6489b9d0e163960733222e929feaa12d6701c54cac354299214deb979db2a6c1b466cc0df3d6146bbacc4b4a2534e24648c9162ff59834a49a
-EBUILD hacking-0.9.6.ebuild 1927 BLAKE2B 7ed3b24c466e37c7526e14ea7376317e7582da8c7eb40f027dc59d97641bea859974bda082e9d1edd9f68718c0523d438bb8f44de22d6fec73e1240641208818 SHA512 05e14f7072171567a0bc9cfdf430846b34404bcd1e5dd3d8ae0070203fe4b29d88b9360dd59222162bdb4411651d210bb443c0f386433284bec1b31cea918513
-EBUILD hacking-1.1.0.ebuild 1729 BLAKE2B fc96859c2c40835cb749f0a76965fa83e82ad408553e257128bcf05c3758de7a42762537f8409f254911a09028c9ebe97a9530fd38022688159f1d98de5111a4 SHA512 39dafe85e40143c615f337fa78144418bb0f68b62d897ab0ef9abbccc80d63c3089554f325cd438d58179e8cf69c2b59f8f2501edb0fde4084c04804de673852
+EBUILD hacking-0.9.6.ebuild 1930 BLAKE2B 4ab7ffd9ab76b83a60ec55d87d4961339495affea46d7390741c0df649c2976b5306da9a92eb80e1945819887ba40a702ea7dd72ca61732c34f9f3aaea5618d0 SHA512 4e622e5a90bb9dc0fc6133b42d40cfc7842245f9dace382a15f0e8f29ffa72747e65caae51b02ceb8222e0078329089fd6e938a60f3f120acfe8c6a649760dce
+EBUILD hacking-1.1.0.ebuild 1735 BLAKE2B ef4600da72a394b07ca99ee9fc8728eebc870e2fb051e7596d70e474f8e98cddb43ebe9c137333eaa5b1f98aeb43ec47e32524bc7f35a6f6bc1c822b846dd1ee SHA512 6e5b7816ef1958f9f61cd496698e50a0e62b1ee1c989ee7619743c3649a91de8f1f5b5403ad54395c0f625d3418aa811d063145957e8f1dae9aaca14130b2e61
 MISC metadata.xml 749 BLAKE2B 29b4d37179a1c8f36f3c66ec80d0c2044f3457542114dd8753b1c50303e3dc5fe499ff52d4554f434a89026c4aee544ccb5049d0b2a8e2ea98042228234de01a SHA512 723ea94c939f789ba8112fc54d2de3abea87795407ce15ea8982140ce3bd446cdca885c2680471fbb70551e275b426fdab219f1f0394b581bd495fd643f5e0c2
diff --git a/dev-python/hacking/hacking-0.10.3.ebuild b/dev-python/hacking/hacking-0.10.3.ebuild
index 6cae6f552ad0..39cb1b2b5751 100644
--- a/dev-python/hacking/hacking-0.10.3.ebuild
+++ b/dev-python/hacking/hacking-0.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/hacking/hacking-0.9.6.ebuild b/dev-python/hacking/hacking-0.9.6.ebuild
index 305cf9d9ca20..566c2e935c4a 100644
--- a/dev-python/hacking/hacking-0.9.6.ebuild
+++ b/dev-python/hacking/hacking-0.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="~dev-python/pep8-1.5.6[${PYTHON_USEDEP}]
diff --git a/dev-python/hacking/hacking-1.1.0.ebuild b/dev-python/hacking/hacking-1.1.0.ebuild
index 6b5bc774fe4d..f4ec21626b65 100644
--- a/dev-python/hacking/hacking-1.1.0.ebuild
+++ b/dev-python/hacking/hacking-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/http-parser/Manifest b/dev-python/http-parser/Manifest
index c7bebcfc8fde..db1195720caa 100644
--- a/dev-python/http-parser/Manifest
+++ b/dev-python/http-parser/Manifest
@@ -1,3 +1,3 @@
 DIST http-parser-0.8.3.tar.gz 83040 BLAKE2B 8ccfd15154e34756229159576340536e447a1b76375df7c3f56b96c79957a3b28569fd4a4e77303fd1d254aa5652478f7e319e7556150de563f5b12c58482de4 SHA512 aca583d976dcf172244179cc4199336f296dbb2e2838dded23e64d55f23298fe600f9c24ba6cb6d1d5faad3022710154949fd39adecaef763f7589a58d03fbd1
-EBUILD http-parser-0.8.3.ebuild 913 BLAKE2B 57c1c9ab68e6a908b33f34f09fc356098e5c691db8e4a39ef171b5560db845245867467bcba3afe0d59e140a1ee476991e1fc6767664d66922674560afe5f8c4 SHA512 d032b1e2d32fd074600230a4f5ec99729feaf204923bdb66e5fc227088a25aeb7a8f972884767e0c14bb324aa5bc897a8f7be52dcf47d675b963344241bfcf4a
+EBUILD http-parser-0.8.3.ebuild 909 BLAKE2B fe72aa4df582673cabb022c5e922821203f245ed85f59b6a4c0268f0a1eb5e202ae30657ad8d988e2989dfb62681609a3726eaca0c7d9afb94f5354485f8a8cf SHA512 76477fde6c206daf1dea595cc4ae39f1e18093fed000d2b86e0d9808e7ce60b3923f24d56e486985cb2f0110cf622ed92cf4082db91a97b4a439674b33e37a84
 MISC metadata.xml 385 BLAKE2B 16371b248416d43a094b0038919816277b3dbced190f2684cbc6d0ff9cff6007cb7e5e44d867eff942f46173edf5018a4b15383454344fcfe003544aa3e64fba SHA512 5b4b7b992bf4036ee076a2714bd0b91540b071fac6194ade8327e71062d7dfc5597f68934c275d72756c5ebb25e334059df4112946a1a84ab20ca0710ee16760
diff --git a/dev-python/http-parser/http-parser-0.8.3.ebuild b/dev-python/http-parser/http-parser-0.8.3.ebuild
index 11ee13c191f8..385c02b4deb7 100644
--- a/dev-python/http-parser/http-parser-0.8.3.ebuild
+++ b/dev-python/http-parser/http-parser-0.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 ~sparc x86 ~x86-fbsd"
 IUSE="examples"
 
 RDEPEND=""
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index abef1856a50c..bb6c64d692fc 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -2,8 +2,8 @@ DIST jaraco.packaging-4.1.tar.gz 8820 BLAKE2B 43c14e12439d161f9a42005dcaed4d6945
 DIST jaraco.packaging-5.1.1.tar.gz 11056 BLAKE2B 6dcca468be3d960674c7de73af48ef78d96c80896a5f09aa99dad35c7dacb90700ce3cd74f59f4a437e26190091e12fb82f3285f30f99a83550a52424cfdebe9 SHA512 96ab954c7fe23632284c0493f749c5fda1368df0a5b60f5dc852aa4c47dadd1743a26772c783f0ec46109f166c9e26811324e2beeadb3e0cfdf9808091107032
 DIST jaraco.packaging-5.1.tar.gz 10393 BLAKE2B ddef0ea4006b1a114d81238d5182c03cc50186452b326ef9a02f1a2e745bc731fc6969475a306b25a22d6daec5951e8d11cacd61d519e82cb461140e5003813d SHA512 d86cf6fce8037a9a5f2dfe29c7df810376127b3e02d270bfbc11e16bd43c10e0ab76f2739e5cdf904a9e54ca8d7fc3559e51d089ee39b4486c84902b23be530c
 DIST jaraco.packaging-5.2.tar.gz 11573 BLAKE2B a119fe4e4de636ef5483cc8d16ca0076533c1cb86c8ec7061c0800aed84532a8689613401530223c0048ccd31d1ead974cc8ba37161b1e5601eb659453962e17 SHA512 5199caccf11952ac68f42462652730afec1aaa907495d65dcf9eb7d5ebcde3ebc8d1f2bf7d51543a764222f09606247a28bfedd9fa987d39934724bf7001c459
-EBUILD jaraco-packaging-4.1.ebuild 1197 BLAKE2B 61042c2611ad0bd9d2514468653b8bb168023c215d1ca4a19363b8b9fdb54a0fba00bf8d22ed93f791ff3c2ec45bd26f5a7aec88550ee309399dc0c315bf3b26 SHA512 d2b7932112d762cef53e6e89d91dbae5a81fb4f70f53b887082d3464eb1da86c661f774c583ebc592d306d65642e6f67019597a3a23ad7ec4031201eeb1391e5
+EBUILD jaraco-packaging-4.1.ebuild 1199 BLAKE2B 323e61eebed8a6a25964b57f9a243ee14d4abf72526e55c8335a885dc0704468008dd01c2664c925c089944c614586aa0f31ba5591d305a830d9eca7359e1976 SHA512 fc729696d46c22e75b4a695fdd4f58bc80cfa0c5a8839912c3f620039da028cb2fa6870534f29b6cce82f066f91b40f87f2c97cc1ade8f57b9ef5ad813d4f4d2
 EBUILD jaraco-packaging-5.1.1.ebuild 1416 BLAKE2B 79f8de70973943aa46b009dff3f2751bac902da9e9f0c096b83440d565dc931394d7ea83f086c775d95397b5bcb6299272a278fb1823587ec2c3765861d62bb6 SHA512 2ca8b3bc5accca45f20c2d7efc20a304f4c6a3b3e7f59652496b5ef9313e1e3ef240f5410a345752d6a39d8ca54239314b75e9db71749d9af8de39b48c6d8404
-EBUILD jaraco-packaging-5.1.ebuild 1323 BLAKE2B 0802a20fc6bc08e3c0ba667b615f693533f69a78941c90a157b66d5f9bd4581d2d0c2d77f5d79cc6bdaca3f8f822b6be49a6842f0d186522d1207b6cce1d6f0a SHA512 26998bd60f1b8e9ec20b51897e7b3916446f7a493fe36b5b2f8df65f7ae0077ff01e50989eef21e356282bf810c5772e56e725c14076b5040ccf95cf0cc79e47
+EBUILD jaraco-packaging-5.1.ebuild 1321 BLAKE2B d195b767cd4d0e7ef5d2df7909385e6ce3628fa5a52dbc9a3233be63ef2da09296cecd002d45b5241c2acba68cd46457336b0c50854ccb56b4103904e8209e7e SHA512 7ae63348b09eae8fcc5ed694d85c6192f952c73a576df494a6ca28348d92dfb306dd2dfc10db5ad140b1a3ba967dd89b888e4ffb2f66b9d43c72721e29996bf6
 EBUILD jaraco-packaging-5.2.ebuild 1419 BLAKE2B 363aec504785cb8e77a56dc4dca728be3eac4867657f11fbd29c9f67a9ef73b3092ebaf383f0b3fc9303870a95d33dcbb35a4aef1e9454c9205916ee5b1c647f SHA512 4c836e5bced7f5591eaef6effe90ba0ac56399b7398650b376eb518878fb8d800866a934137e34cabe9adca1ef5fd8b37b549c8577067ff0c7aca56c0216bf83
 MISC metadata.xml 651 BLAKE2B 145a05709cfd4b85e623982b7defaf588eb0d68ed3fcbb52655a5a8cd10fcb2cfb269b9179e81e5409be0485f4c71565ecbdc4019d9f07f322d2cfbc3731c2d0 SHA512 d8f857056e0a73cb34903a7001cda6f543eeec0182a87ee2bd660631ab9e855d1214166546c179b9711ec8ed9a5063b14d9362001e67203a7132694112ebf086
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild
index 08b7e103e441..fcd90dd05a8a 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
 IUSE="doc test"
 
 RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild
index 637bf4e49f09..c0c8debccb64 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/jupyter/Manifest b/dev-python/jupyter/Manifest
index 7dd04b1bfede..02c91a6f6f62 100644
--- a/dev-python/jupyter/Manifest
+++ b/dev-python/jupyter/Manifest
@@ -1,5 +1,5 @@
 DIST jupyter-1.0.0-file-colision.patch 1727 BLAKE2B 59bf5e567e6da9e9f3d84178942993072e1697c1c4c06e06d606dce7bdc76d296d10c30cdef2865bce7b4c26136a1b0a2860f009f1530c1815b48b3300401501 SHA512 a6b4cc6b91bb9941f029963cc3e3b7f415192f64788a34dde7828d450497987f92c25655c5ca183a7408fb1fb439917ba0f0a1ef1db3fe3bec1fc46d9ad2cf4d
 DIST jupyter-1.0.0.tar.gz 12916 BLAKE2B 36476eaf0119613ba6d9f153aab1658f43951dc3879cb6a9e90d8fba14cc1247305e18fda2251127faac4e68867efd3ef57129675bbe89a17a6469255efcade2 SHA512 1f0bc83f7a127c98ccf4b3868814116aa272ea5d0baac52d7a022305af7e2da28ca2b90fa3554ff085d8df3eb6d8b8cde80bf02b8e66064c59900b926d73c520
-EBUILD jupyter-1.0.0-r1.ebuild 1302 BLAKE2B c5de62ebdabd854364285235f929d7c32b49fa5755863a8988b5972add1bc373384ce42f5ea4fa7a1f09115081c7b2415a4b3d946fdd369c5ca405d308d2cd51 SHA512 164aaa9f420731c17be819ec56cc034d7280084311da45fd56fa7cac1b979071e95a85f1a1e034b4315022473d7b0e92134cfd00fc4852ac56af3863abc194b9
-EBUILD jupyter-1.0.0.ebuild 1075 BLAKE2B 16b68c1425bd92d14bc4bab2814c369c5543b923f88b85c5cfc3d94f15172b8ae72cee74b175a24ed03a5e5ade29394a4b110d0e52a1af2aaa955dbd61bfbde6 SHA512 34ff80f3d9f05e1798c83b17e756682ed8142ca0180fba8401fddbb7d0ed3c1b57c92addaf35f81e41623fd0df3621168ab9acadf5dfce3ee7e544b9547f9797
+EBUILD jupyter-1.0.0-r1.ebuild 1300 BLAKE2B f81b0e91686bd306b4af3f711442539c3923841058238d0966b7eb31853513608b99c2fe13b96be8785bc9ff058c6af2f26aa4331b2670e96bf3521d4660f133 SHA512 65d04d66283aeab5e1ab25ade646c587e1ee6368628d225de1b9b3fa7cd0b25d02b6f63908d41db8fdc570548664ba15167bcf11d65b4ef3206a96e20e10187c
+EBUILD jupyter-1.0.0.ebuild 1073 BLAKE2B fa9658df4a2ad41f850a7b6c87a101a9c5d48f2d6cb598f08356a102fc646786db8a24243c6aec83c3eedfa12d5403c3ebd414cdd9bd4394a7b6a1e76183b189 SHA512 a4f10b87b3d1c75a9f5a8c2be0685c73be611f3231e5511ccaf080f6a1c2de181668d7e23bef96b2b15ed118ce836d009a0d9158acc07f38c392743791ee8228
 MISC metadata.xml 518 BLAKE2B 9698e2cc9423ef542d9cfb8b19be99b925a4098fa1350ad0806c384c495aca26852cedac070d7b83db27444413f72e201f7daac1ce30d05bffc09ac8270b2d7e SHA512 3838bb1bd86e45821a6793faa2afcffa0a887876e35fd36a2b21e6e6312256f94ab79026232197752c922ad51208dbc04a30c43e0bd0ab8d7945ee4fe2947999
diff --git a/dev-python/jupyter/jupyter-1.0.0-r1.ebuild b/dev-python/jupyter/jupyter-1.0.0-r1.ebuild
index 0c440411087f..7542d91834c3 100644
--- a/dev-python/jupyter/jupyter-1.0.0-r1.ebuild
+++ b/dev-python/jupyter/jupyter-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Jupyter metapackage. Install all the Jupyter components in one go"
-HOMEPAGE="http://jupyter.org"
+HOMEPAGE="https://jupyter.org"
 SRC_URI="
 	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 	https://patch-diff.githubusercontent.com/raw/jupyter/jupyter/pull/198.patch -> ${P}-file-colision.patch
diff --git a/dev-python/jupyter/jupyter-1.0.0.ebuild b/dev-python/jupyter/jupyter-1.0.0.ebuild
index 2d9cc0f1408f..b3e6c9bb47b4 100644
--- a/dev-python/jupyter/jupyter-1.0.0.ebuild
+++ b/dev-python/jupyter/jupyter-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="Jupyter metapackage. Install all the Jupyter components in one go"
-HOMEPAGE="http://jupyter.org"
+HOMEPAGE="https://jupyter.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index e1b19e0d62e8..7e4bfcac68e8 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,6 +1,6 @@
 AUX jupyter_client-5.1.0-setuptools.patch 1062 BLAKE2B 1d01f2b7382d19f63c8bff813d6fbba21db25453e73366681d2b1a361f9842002ce7d5f535aca5e49e4073e36e708c28ce91aa59037daafe1b4da7627a47616e SHA512 b373c4bd3278484252430bf463d873249895aa6e5b041274352866d73de9fe3196dd64a73385aed8878b44a33e742e64623427d6a2d68706fcbdd70d4a539109
 DIST jupyter_client-5.1.0.tar.gz 265233 BLAKE2B 1f4533e1c6578e61b1a7591889805d5e324a3cd368cb3998131f2047056c87984ae26d83c9de0277aa6f19b61db4c4d9b39083b795e0891ef7d5394949b5fa44 SHA512 eca7adab1f8aae05743c341a257d4ca4338b0838cc3441939dda48229cdfa13b267bdc338b951bc4e6e139d03d26b40a1294140218f84ab800d211f7e0d8bfc7
 DIST jupyter_client-5.2.3.tar.gz 271787 BLAKE2B 36761e53050874c141c38f545f8f6fb53c144c30f686b3706594d124a65e410c205379b7ecbeed12f1520f0f568c7db3c802223f6fdb8f76407074beacc21918 SHA512 89b980ecc281bc1512e1fc4ba35862cc6e541f825ee07a1382d300c8088f24611225ab415d6a7c1e4209c47a74c113ec95f863e8fb0b33c6db9eb9c3521fc0ae
-EBUILD jupyter_client-5.1.0-r1.ebuild 1005 BLAKE2B 02a999cad4bd0ad8a7e785099c3cb8b94e4dc3d9d7653b8287817dfb568f6308f09f7cb4e9b41d00da4133b65187f283775dd5ade3bddcf01e300eede6360a8d SHA512 19556140e92ef8a4ddac5c4274eb26ceb1d480883dd4426b269cb0c8def10c6b4446fa0be7780a1279a2c2ffdb8d5cbcd3e1e385aa75524082fc54bc9a0e633b
-EBUILD jupyter_client-5.2.3.ebuild 951 BLAKE2B 8354ba2b1950d6a98c7feaf41ff4bc7edbc42edc1f824ad47a97d6309d112730a5f571e5b1b20e8e6c8d110a6af833df87ee8c2f5149c1ddd6416e0d3cb4fac2 SHA512 87be54757dfe6c18e6a8025d8d8d9f4dc7eef84376aa3c839b86c35845f5738fcec9afc4a5067ea670c62d6453ce0207192bfb86c289720b187e149c6a290671
+EBUILD jupyter_client-5.1.0-r1.ebuild 1006 BLAKE2B abf54d8d86226446ca729b9d3bb59a34374a877e0eb8de6094c8a5a8ab5506183b04a0fc2cdbdb06b5fdf36d13d830a7be66fb0605b01e6846907b49df784405 SHA512 657471aac216ef1fd3da36c05283b60d98a1591e4939e8f01f45585803679115f155b968f494ccf6dbbcfb66bf781ddcec4e0619ffb5d0d538ef3c89167b34fa
+EBUILD jupyter_client-5.2.3.ebuild 952 BLAKE2B dda2b60e37d7d7bac7db54d1e1473177f3167bffb1aa947acd71676eb0beb3df98f7109d103b564473fd881e3809f96dd0769dd28cef0eb9d65c093216db9750 SHA512 6658584aea7ebc083ec6ba91eea46a1583b8e5723adc690111df36184ad377efb3b945b6b3255bd590e86d3904deb848c2f58877af26ec378af2c6722a2e9dc3
 MISC metadata.xml 647 BLAKE2B 39c5be4c32d971bf1aacf3d384b370fdcaec2d77fc675a71065bd5b124559b174b3e4b7f1ef8bbdae4fd3f9b873822f4a2af68b1a9e5c05425c67cd67b226ccd SHA512 ffa9ecee1da3f5856daefeedbee972936ede17b2a828acd2ae1f80a82badc834afa2cdfef6f4a2dd70d29babdead8de8f5f60b888f0ff5e72b6b3993142177c5
diff --git a/dev-python/jupyter_client/jupyter_client-5.1.0-r1.ebuild b/dev-python/jupyter_client/jupyter_client-5.1.0-r1.ebuild
index 09bba7902305..0db2a10b6dba 100644
--- a/dev-python/jupyter_client/jupyter_client-5.1.0-r1.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-5.1.0-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="http://jupyter.org"
+HOMEPAGE="https://jupyter.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/jupyter_client/jupyter_client-5.2.3.ebuild b/dev-python/jupyter_client/jupyter_client-5.2.3.ebuild
index e8954466c964..b55d71f52dcf 100644
--- a/dev-python/jupyter_client/jupyter_client-5.2.3.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-5.2.3.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="http://jupyter.org"
+HOMEPAGE="https://jupyter.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index ddae981fc5bd..1b804485af0e 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -3,9 +3,9 @@ DIST jupyter_console-4.1.1.tar.gz 23391 BLAKE2B c22ebebaca3f009f1952d6e2af6c2f55
 DIST jupyter_console-5.0.0.tar.gz 26119 BLAKE2B 3961a3da26ad9e873a873556115aa4430b24bdd22d9ebab88c3c7b8d72ecfb90926e0b690b23d9bff0bc68f15dd0623cb1e6f1f56ba47b7afe964542a5f8c3b1 SHA512 e31afa5960200feea125b939124b108a0b9dcc914fe2e21b86cd1dc409789cb25a72918a7eb5fcc7bd35c26bfabb71b6426a2cb7b45a8cab58f1d8e4b9bc89de
 DIST jupyter_console-5.1.0.tar.gz 26661 BLAKE2B 075035d02fee640ccf9a2a7bd22e5872727380bd54b1fed48bd53f6bee12da8ff3dc5f4ff258d0c03f7260e2b495d8cb313a4b4f49e4eb644f0b15988fe41577 SHA512 208a31886eb58c64541048e1f7ed75fccc888d34177f86dfaf10fb7dcd603130a8b3ecbe23cf4d80a75287b847128425f853715c494d2a7e4b4eed8a31058b5c
 DIST jupyter_console-6.0.0.tar.gz 27780 BLAKE2B da2b58461caa987bea0b323cedbc79ff24f31cb928602b8ae6dce1ed615008a8227d7a1bab47364e6d182cfd3bd6f548e355430efc505e7183a391ef26c08375 SHA512 27b333f439733c33062d3baa8b49ff673b10e22cb8c28c688ba604799838e899f93372bd2eaf4a94c97260d6dec043d6aef4421388d77e625b1ec43a3dedfa3f
-EBUILD jupyter_console-4.0.3.ebuild 1261 BLAKE2B c2adf832a3f8daccc255054f6ae467bfaa72ca19502cdc624a09ca8cc3bf9e865e70f06603780aa209822800491079fdf93c5cbefec302b12ad31e54aed94b05 SHA512 e2502da12e494a94a8ef4c1b05682a9893915115bf8bb2f4eebbe5baff357b3c8f73170a3e2aed6079b1544c67c168f03a6c06dd85b1ac3f4058daf4925989c0
-EBUILD jupyter_console-4.1.1.ebuild 1187 BLAKE2B d739cfef55fd99586fd02cf90c24695c355e548114564e2a5955341bff5937d330d24d339d60c46ea0b9a9b63723ef9afed1beb52da69fe626808e6b0a09bc0d SHA512 4e1efbca95dab43a888b043e34895ea5ec17d68279c775fb00db20458fb26e4317fef67a11f4ce6ff416c2e3d6eb3084590c19b0c4267a432a189327e025ba33
-EBUILD jupyter_console-5.0.0.ebuild 1313 BLAKE2B ec3de645ffece566f97acebac01f05f0deed2ce00316fda94cb5ac49c762815ffb8c2f9c5d7dd8df5f38b6fdb246eae7698b3aafb1a7a58d1f1e65555b102574 SHA512 7cdb1158f412ce0db69e22994d2702020ba0193476d0d12d14f1350187bf0a8f42169f4a7bd1b1b2e936a6e3df1ae1e5fe1213c7c40e14ddfc4cecd7615e2c5f
-EBUILD jupyter_console-5.1.0.ebuild 1259 BLAKE2B 6876b3d94c3479940b627b097040612fff2dee867f9fbb9761f73af60ec689e2bd05bc804158f3be6e16c8fdf71349026ec04c16df9f8022d40e183bb914264f SHA512 43dacbdb66e96f49a65f3236a870cb7202146b98cf09ee9e616ba3bf50f123880dbd7656e11db5566125210d299d72c734a540e3859e2139491672fc805930c1
-EBUILD jupyter_console-6.0.0.ebuild 1244 BLAKE2B 1cea3845b563a91bb40922dcc80cac4b75bc4bb56dd6ffa7b54e77594c657fb47b3bb04433d45dba2b2fa438f48dcc023c53d1170521de33b2f35be01fd9f201 SHA512 3b0662d5e3643b077f8fbd7533e04d98b9b8bc6b19941e27615d216b36db6d164f2be3c9323802a42ede44ba5cf5fbd3862548208318ccf54f13f5bda13a6cf3
+EBUILD jupyter_console-4.0.3.ebuild 1259 BLAKE2B eeefe83cdd76af74eec756f81a8411b20ceba871489937153a8d64c6a72c43d00942790cecc7f30af58239c3a4b8b0671672371e547f26a6f54d93305d1379c2 SHA512 d4ea4ed88f2064e6f8984d20de585dbed0fc4def33f982ba10c0e00ec88ec766033646f6d9a98f6d77d6fc504402577418301e01836ad63807d9f04ae3ab7ddf
+EBUILD jupyter_console-4.1.1.ebuild 1185 BLAKE2B 6809822b03edb411066b4954dea8cfb6fa339b69af8441c8a9cbe185e5dbde99278050dc6398e16d245123a445caf6f059795caf38f33f3216d91fb361e98bd7 SHA512 aa95983948ee606c3b9af5d054941c992e08f75f08fd6c9df12780f0cd77f19c11873487fd4e44e3e841715c03066fecdec3410087150c517b9b2d71af3ff775
+EBUILD jupyter_console-5.0.0.ebuild 1311 BLAKE2B 70ec2d6f5d72b54711ab11e53072dfb20f8d99d3cb6c151ba089720df3f630db15d2415fee270317ff059ad2a3a1bbf65e6b3f79e8854e6ad56e8076567a8b02 SHA512 dfa19568b097b8e746f9ac086ad5803cfa9bbb592ea8323eee6b0aeadd3bdc87187e5f4e29a1f0442f0f873c84b93faf3c8218642b9f48d4cf8a9e0bcc495c12
+EBUILD jupyter_console-5.1.0.ebuild 1257 BLAKE2B 0074bc7cece70faea65e6751f66dda46d04ba9d7d129da5a9d80d2955d98a0cab6715ef798eece4d5044b1758b11b8cf32a8dddb08dbecd9a57a8dc92ef4208b SHA512 d6a09ab3820c3728594c8650cceeae8b2cb195962cd3a0de6ca650417ae3d01427f477dcf7970fb2a35898a63257ea45183109c1e91fe08aa890d02d7b0ef98d
+EBUILD jupyter_console-6.0.0.ebuild 1245 BLAKE2B c98b7bdbb14977ecb9cd67c5f45a3f1b0af06362a9093758551c5aa3a94dd63b57279463d508dabb89e8fddc0bb5253ce5cdd8f9ebd91e40d2d8ed0260db3f77 SHA512 4f6ed450c0effb3f944eb4c290c9dd75988fb4d3563bceb37ffa59c96793636299994f4721bed9fa39b14fcc01e390a561e6b60328b5320a2ef0590ae8f6c86f
 MISC metadata.xml 569 BLAKE2B 2f205ddc11fc56ac1b708a0d4e786d1e04051faa47af17970d4ed0a2088c4159a1b3199f2581794884463a83fc33926a053c55b4e6b265bdd90539a6d700d977 SHA512 dd29f7ff9dcca2afaa4caf814f4792391560a33b485d9a6de539a36c75df7b63e59d3eabf7bcb020b48ad30a7de0ac28137f54d96023fbc435e3a6378cc79b10
diff --git a/dev-python/jupyter_console/jupyter_console-4.0.3.ebuild b/dev-python/jupyter_console/jupyter_console-4.0.3.ebuild
index 590cd9b43950..83f7588677d1 100644
--- a/dev-python/jupyter_console/jupyter_console-4.0.3.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-4.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
-HOMEPAGE="http://jupyter.org"
+HOMEPAGE="https://jupyter.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/jupyter_console/jupyter_console-4.1.1.ebuild b/dev-python/jupyter_console/jupyter_console-4.1.1.ebuild
index e442872c62d5..087bc15d7c9a 100644
--- a/dev-python/jupyter_console/jupyter_console-4.1.1.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-4.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
-HOMEPAGE="http://jupyter.org"
+HOMEPAGE="https://jupyter.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/jupyter_console/jupyter_console-5.0.0.ebuild b/dev-python/jupyter_console/jupyter_console-5.0.0.ebuild
index 321559e078bc..7557a2afee9a 100644
--- a/dev-python/jupyter_console/jupyter_console-5.0.0.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-5.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
-HOMEPAGE="http://jupyter.org"
+HOMEPAGE="https://jupyter.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/jupyter_console/jupyter_console-5.1.0.ebuild b/dev-python/jupyter_console/jupyter_console-5.1.0.ebuild
index 7447119fbadb..7ce9de89bbdf 100644
--- a/dev-python/jupyter_console/jupyter_console-5.1.0.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
-HOMEPAGE="http://jupyter.org"
+HOMEPAGE="https://jupyter.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild
index 9024d1bd9947..aa887586323f 100644
--- a/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
-HOMEPAGE="http://jupyter.org"
+HOMEPAGE="https://jupyter.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index bd3ec98609ae..317eb84482f5 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_core-4.4.0.tar.gz 63613 BLAKE2B 90b5d6c855786beff0ab780e7a894e1b24f6d6d1c26be6ae8da73e82a87f966f1155498c581314d37db845e293be7bc4d085e03991cdc7adfbba36409541cd5b SHA512 387f7f98f640b85ff0a24f11e1beae5a851d7eb3ba4a423be028940cb018c0d0ddf42ae8a1c397e3e4cafa560d3a5385b39bb8794448c7c010be7f0ddcba8a9e
-EBUILD jupyter_core-4.4.0.ebuild 1249 BLAKE2B efde634f9bc7233dc7f5bd4814b5b8f6f6622e9ecdfa56076603f909761ef788030265e8a52887af0cc88e3d42da657c2af40b4b5a03338ea1e7b57b8cfe6d7b SHA512 9ed3c6c701dc4415b78d6718310da69733ef24509edb14cddfd9b4768380aa5c54fb42373d9c5c8ee06c4b1ea54b59313addd3fb02f9c2b20fc750ef58783947
+EBUILD jupyter_core-4.4.0.ebuild 1250 BLAKE2B f03c76c39086482e7ab65a9711d18e02ace1552ff3bde6a8d8a160af6e5b85d7ecd2787c147c8d5d403b36a99dd1dfa393c0f60320cd235dc291df4ef03cc21f SHA512 d0ab25ec4268e3554156f80534f3ae5f2ba650872ec3de7f9fdd83a100bb5fefb701959b29b616043cc53e2da50c562bf9b76f0fb3b90599786580f1598c6261
 MISC metadata.xml 626 BLAKE2B d12f30014d60ed759b3d618b4fdb38bdf6d2d28738bc8c910d427d72e43cf792164cfa4811dd8c5717ecfc9d4705f6b4fce682be6d841b7185adc2942a62942f SHA512 bdac450a0bc297c925ea6431253eede78d61623feb30e1901f51a9e31722642741d5bc009162e09eb5b0fd9ca094e2eff54846b2612e99116239d764abb05533
diff --git a/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild b/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild
index 946ba98cbfbf..fb0750e86de4 100644
--- a/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Core common functionality of Jupyter projects"
-HOMEPAGE="http://jupyter.org"
+HOMEPAGE="https://jupyter.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 5a1f64d0195d..389ce450370c 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -4,6 +4,7 @@ DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.0.1.src.tar.xz 28311056 BLAKE2B 737aa6144a415e41a4ff2c8bd5a727d6f14d7b1810c62cbefa5a25fe642c98cddf8a28e35c7e9783373aa3b96f5c0943229e229ad1b43e56e9ed6db0f27ab128 SHA512 ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
 DIST llvm-8.0.0rc2.src.tar.xz 30492444 BLAKE2B e7afd3b66e3eb204e07348f0bc77f0ae03d8e9581de4c94cba7c0b43b53f36ecd891c1272ce43ea6c78999fd404a7db105266a2eaca22975133571e1152961af SHA512 9d93197848e9472cc2fef2477897e4f4d74a79b17a164fd43446b0ffb327e7f484cf64f0c294d9a99707c0b46282eb0d16e6ceb5d2d568f25e4235f70ae3c5e7
+DIST llvm-8.0.0rc3.src.tar.xz 30507604 BLAKE2B c9baaca537d292af9f12368df86090750508113eb7db393fe44c1ba7579df947f0a7092e6ddd4403bda9f9ed75fe8c049f3baf6d8671faa0c91e3267c584893a SHA512 82199841c2084cffe4e86b4f2d5ebe404059196f1f6d000ee69cfddba05d78c4500ad7499615fa67e9774ead6cba5a23db484dd85f752c8d08e8067f7d7b98ca
 EBUILD lit-3.9.0.ebuild 790 BLAKE2B 13015298e24920449372388bc9a0fe5b5c705b49bbc50cc6114c8b18f9861acca1d394d08de4ee87db70ee9d363309a3cf8f3ac1bbff865a0c6c6f5c14aaac6b SHA512 57854f8499794d42e9c312b006f54454bbac7679c166c603872ebffe01c47411bff083f7fce0eb817151056ecdd72562224e383de96bdd5c46487f895e33a6e2
 EBUILD lit-4.0.1.ebuild 811 BLAKE2B 6a11590228ab794a2da32f75b8d72edd64a6a394640230a0d524b5784b21caf710fe6085fc913f48671e1812365d9665ae2dca3dca8697636b5149f69f6163a1 SHA512 583bb3c1a0fc61aa0e8fe1ba2beea9c4910f7af699b782b038ecce78e509cc2ffd219f8b63b8c83edd475eeee54c46c4cca4dbe602c6e833859fd784649d0820
 EBUILD lit-5.0.2.ebuild 904 BLAKE2B 74ccf4ce59c6aba63fec1f0dfed1e49bf751abf8cf61626f95534f46ecaece80b793481d7cf8115193007c9c13139018f28b6e4c86566d8481614229a84be5c6 SHA512 13a3ea3609045b3cba077e931b5ae52837c4510640bd5b6df7df6819166e069f3d4eef85ecd5dc1043868d7889539383f64c9f0655de0d88129e6b0d7a4f8986
@@ -11,6 +12,7 @@ EBUILD lit-6.0.1.ebuild 1014 BLAKE2B 549c00ba1da9265ef26ea04d574d139f1fbab99f79e
 EBUILD lit-7.0.1.ebuild 1017 BLAKE2B f901810a470fdf95f71bb19e6be4a1321e7abe84054bb529541750dea272ffb33c4eda1e131d2b9984225f25d28036876b56d8bb0c9a76a623f7d678098b4932 SHA512 ddb2c555b404d838b4717506a3bdbd40fe5a8d1490175ff65c12601ab1805882b48eb585a1ea1ed761638469145d1e5ecd0696bb01c4ff3d83c5e817a99d5c9f
 EBUILD lit-7.0.9999.ebuild 963 BLAKE2B afea4754348b5b93f93ef1723974f218ccf92bcceb342ba5f453e8d82399358689b4bb30d04e65e63de761ccc92bd2c776d6233c618a12abaf4fda1a770974ff SHA512 dab5c3d116a590f677a9d3773d5652e7a676d26a4477ed10a4f8248f93297881ec1bd9cd6fbca6c06546d0926bdd5aedc9f478736550114bdb777c61ccaf5bca
 EBUILD lit-8.0.0_rc2.ebuild 1020 BLAKE2B 7c3cd9a7fa0682dfc62ae3be51e04bd65c2f38e1027b14eb452d8f7d73afda2b878e64097ed982a707a40d85979abea1747187d503c0567a18b30571b5321336 SHA512 af4806c74ee9f8cbfe0ac97f1f7bfa3fc8c78b283ab72f88c438dae96c010d9fd34b32a36cb09d325c9fdbd13fe8a87a0026926d606affec8c9e16557784bbc8
+EBUILD lit-8.0.0_rc3.ebuild 1020 BLAKE2B 7c3cd9a7fa0682dfc62ae3be51e04bd65c2f38e1027b14eb452d8f7d73afda2b878e64097ed982a707a40d85979abea1747187d503c0567a18b30571b5321336 SHA512 af4806c74ee9f8cbfe0ac97f1f7bfa3fc8c78b283ab72f88c438dae96c010d9fd34b32a36cb09d325c9fdbd13fe8a87a0026926d606affec8c9e16557784bbc8
 EBUILD lit-8.0.9999.ebuild 960 BLAKE2B 3c1be7024e1f32c6c1c73e03f6a909d1f16cbc0750a4dec454806dc39c2fadf32f006045cbf71272a0a35c471a68daa142e96683610573627d82b81fdbc7751c SHA512 d1d2099ef259dc024f91074b5fe5cc6f9d1fa834f8922823dad0b67c8cb92f454e9694aee0b325762ad6aac2ca1b47c497e25027c1c82a186bf937b56c2d95cf
 EBUILD lit-9999.ebuild 938 BLAKE2B fb5fe20c62d06e44e847f6e9f16429e9814d2872281295eb12ea25baf2448be889ec3bac37ec4350971b44c6785aafe9795fd68cbfda1b2cb299f41f28a254fd SHA512 a21a7a2935e8d8c82f319bf65e1b01e135448c2d342baea28b05451f4f9de938b52d3a8e63d544ec35cf4e7ae7bc9bf432eea3f4a44d044631c9ae7ea6fbfdcf
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-8.0.0_rc3.ebuild b/dev-python/lit/lit-8.0.0_rc3.ebuild
new file mode 100644
index 000000000000..2252897106f8
--- /dev/null
+++ b/dev-python/lit/lit-8.0.0_rc3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+inherit distutils-r1 multiprocessing
+
+MY_P=llvm-${PV/_/}.src
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${MY_P}/utils/lit
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_unpack() {
+	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
+	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/lit" || die
+}
+
+python_test() {
+	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
+		-vv tests || die
+}
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 8d0b66f464e0..2350d15975b8 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,8 +1,6 @@
 AUX lxml-3.5.0-cross-compile.patch 1518 BLAKE2B 70907747332021789933759d3e2620d7b70a223664608680663472b648e2da103362bcbba6ee025375579cc2699432a44fc9b44169ba9c830ad546ebd3abd451 SHA512 b53925979e554552e72e58e06df579d2eb0190cadc304d13766852eaaeec78641deb1ef10700a0b52aebbdc998979830413a76a56cf221bce2e9a24926e1680b
 DIST lxml-4.2.5.tar.gz 4414081 BLAKE2B c1c75a0a0c33011e2becb729de2c15dd786dd12bddeba4f2f26032d0d17104f258b471f5f961cbf96340df66cbce3e874d7a16c59731af280a309132b669d1b9 SHA512 4cf336d3e1471e8a26492760a143881517d12eb1c2dad82f8786540471bfabd68f8c795d97b7362166418c2be3c7996816638fdbd5a594536b9981478b90fdfe
-DIST lxml-4.3.0.tar.gz 2483162 BLAKE2B 3f3646a47a0344af22bfb567a0985a27e8a46051850e99b5e82d0bc59c94c0e9b19ca93cf6d5d790599e81c9513686c3462ad6544ad658d0efd77ad431b07014 SHA512 49d122c8a6dafe50195bc8cfb3ea52780054a57762132c000cd976fdbdbabaab6bc8b95b77d124ae144f33c24d71793a2debbebf789d5ca866734a984edac8bb
-DIST lxml-4.3.1.tar.gz 4380082 BLAKE2B 112b75dc05fa11e1506bd07f717bb7bf4ca73d587fb7f36ea49ce734251504c42ebb62c3b86bcf620e9a0fe5e03e6c47bd7c69024ce4aa3bb8af82b8d44ddd28 SHA512 ab82bb5af330cbb15da73184b7a24f55be9271751bd1dfdff26f75c5e0c92a771c5de0e935bc9675513d4c871fe199071137cdafac3ecd7da6a896ede02093b0
+DIST lxml-4.3.2.tar.gz 4380761 BLAKE2B f65cdf49d5b9b9eb2add5c1ae6d83f583212b038315d43483fec015fa91a45ee705131f11a9e418ed8e490da4e71c70ccdbb16b4f53554c068235fa9eee607c5 SHA512 9536e0dd58f43c3760b57d8e2f2ec7e365e6c27f3bc7276fac4877f7665ffd19a4f9613c9e55d6b295c3045a89cc7f62f35c4dcd6a7b61f46f85d14d1a4f0283
 EBUILD lxml-4.2.5.ebuild 2350 BLAKE2B 9dae62d57ba95ad0ddc7358552fe2160fcfc70292b0a91d98d7b75fe4bd72b7638ce9febdf64bf504ff4709241f4054052792f05d90a969730ddc02739a8a811 SHA512 f8320c3324b14db07b442074734363744239b3f69e555b2d6a7cf6beb50349fda22992353923d5e142f04e00e6b5f257d1d9f84999fc5d1e6fe649414e2c6d7b
-EBUILD lxml-4.3.0.ebuild 2444 BLAKE2B 63e3cee7de3363d948a5bd34e50a0d90d771b94895e18a7249c66ed60b19ffa4703af30d0390bf21bd9f6af581db463d617e0477959f7c6a5115d6b2bc538062 SHA512 0c0fef86e16ec497f4a42f7aac2e53979ea5098131eee87912788f64716d118267baf8e29096df27096ae412c098128e2a9c629866c607f8d089ae9b207705bf
-EBUILD lxml-4.3.1.ebuild 2444 BLAKE2B 63e3cee7de3363d948a5bd34e50a0d90d771b94895e18a7249c66ed60b19ffa4703af30d0390bf21bd9f6af581db463d617e0477959f7c6a5115d6b2bc538062 SHA512 0c0fef86e16ec497f4a42f7aac2e53979ea5098131eee87912788f64716d118267baf8e29096df27096ae412c098128e2a9c629866c607f8d089ae9b207705bf
+EBUILD lxml-4.3.2.ebuild 2444 BLAKE2B 63e3cee7de3363d948a5bd34e50a0d90d771b94895e18a7249c66ed60b19ffa4703af30d0390bf21bd9f6af581db463d617e0477959f7c6a5115d6b2bc538062 SHA512 0c0fef86e16ec497f4a42f7aac2e53979ea5098131eee87912788f64716d118267baf8e29096df27096ae412c098128e2a9c629866c607f8d089ae9b207705bf
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/lxml-4.3.1.ebuild b/dev-python/lxml/lxml-4.3.1.ebuild
deleted file mode 100644
index 38415295fbb3..000000000000
--- a/dev-python/lxml/lxml-4.3.1.ebuild
+++ /dev/null
@@ -1,83 +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_{4,5,6,7} pypy )
-
-inherit distutils-r1 eutils toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples +threads test"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND="
-	>=dev-libs/libxml2-2.9.5
-	>=dev-libs/libxslt-1.1.28"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	$(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*')
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
-	"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5.0-cross-compile.patch
-)
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	# apparently logs have changed with libxslt upgrade
-	# https://bugs.launchpad.net/lxml/+bug/1782078
-	sed -i -e '/assertEqual(4, len(log)/d' src/lxml/tests/test_threading.py || die
-
-	# don't use some random SDK on Darwin
-	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
-		setupinfo.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	tc-export PKG_CONFIG
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( README.rst *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	if use examples; then
-		dodoc -r samples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-}
diff --git a/dev-python/lxml/lxml-4.3.0.ebuild b/dev-python/lxml/lxml-4.3.2.ebuild
index 38415295fbb3..38415295fbb3 100644
--- a/dev-python/lxml/lxml-4.3.0.ebuild
+++ b/dev-python/lxml/lxml-4.3.2.ebuild
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 5e9f139fb87d..a3dd6dab532a 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,7 +1,7 @@
 DIST more-itertools-4.2.0.tar.gz 56871 BLAKE2B 48cdba3eebea94483c5cfd9530d4bd2cacd02e893b87482a01ff1fdf10336f3c2a40d32fbb935d38320c9c47a1fd1942a48ea12ff07ae56793ecc5870fef2452 SHA512 7e205a575fb1d17ed3be9225c5c60139db41cc4b866f6d6732c955536b1d606bb7ccd92ad77e41159965abbddec3a85761d3649c28f06d52afa8476160d70e77
 DIST more-itertools-5.0.0.tar.gz 67359 BLAKE2B a2448b218eea4442cc4739a4df414ba69e0530cd6206a13c5c017a13daa297d00c08a94cec8aec0639d8b03663f4b698702f5e700ae118ae9fb5854a6d105b36 SHA512 f72c8d6c75799c39708443ba75862801ddd3fc0382c9eee7ed24ecf04cbc7d9ff6a8e35b6fff1eaccf45ddd470c2cc8959532eca32c2ff50b0a12588727c68b4
 DIST more-itertools-6.0.0.tar.gz 68178 BLAKE2B 64a389cfd3449c4711228fcd3092f6d7f62968aeaf0574fcce4bc3223da8b7633d0cbdd727cf4d56f536aa925dbcf78b6b8c3a2a3ba3ef8a0b677811367d087a SHA512 68ac1829a1a27d3f1de1f95c33a9c3f236fe80f597b9183707de0d9cd193ca5a662080e64c54c376ae59fd0a3a224ac62a9d39be4d0ba425103c4fd6e93e61ac
-EBUILD more-itertools-4.2.0-r1.ebuild 1060 BLAKE2B 10360bca9acf96e9635f98f4aba1dd49b65b607cefcfd6eca8102069972093b638a46a4224c6b68420eb45d6a687f1e66fc8688a5857c72945186d826e23255f SHA512 cfcd1e13aea98418912ae9937a8edf3f7a10988ceb836dd0e251c0d274a8eee2826dafc53ec5d09eae089f0ae8cc852f5b7c64c9184654e89d2e365a0c014864
+EBUILD more-itertools-4.2.0-r1.ebuild 1057 BLAKE2B 99bbf1f318ab3a24f6541b1629ef0accc936cf168f6693fd89c8ccf5bdcc75264866e87fd5957317b7d83d6f75bc965d76fbe8e0cf5a21a1bb2e5a23a9a9baa8 SHA512 eda567e1dc6104a357bc1b332f6b135c2d97128503b2e1c2c3bbcff823eb2a3bb95aaf48960e97c764e4edbb70f29ebdb0d5b1ea2b19b8deee14465c49018a28
 EBUILD more-itertools-5.0.0.ebuild 986 BLAKE2B ac405deb88b19349ec602cfff8a1cefbf4b06e3ad83ead10b11e3ba86919969eee2eb903228c07f197b42e30fc0bf9e117e379f151c824c2a11b5c54da6a5988 SHA512 eb79b70d2a551641fca10756514edd1b895b0572dd43272c674b0fca2a8148d63c89fdb93a16bd391dca9eb21781d0c5e9d157dcf14171fbff2ae0b4c8082ca9
 EBUILD more-itertools-6.0.0.ebuild 913 BLAKE2B 28b63906e3b8f643a4b527d854f4b27419916a58faa2386599e1a64089b078d350855f87b51affeaa43360ce490ee8c65915e92aeaa26d9ea07ed0249db5e269 SHA512 34473c3d501aa19f0a2abe45dabcaa8c4bb927be1b69b18ade98999eb4ffad82ae515a091cd3647747503fd8000f2476d3ecd30cc8a2751348795330b6a9c5c4
 MISC metadata.xml 451 BLAKE2B 22dc3c0fcc0e1061f4060b8456e7f8686f40d100af79b6bef394eb1e9111aaa9b7b5762c94bb3b27464739328388dd56f02cb9813860acf23067148f03ef2f66 SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf
diff --git a/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild b/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
index e49acdd1320f..ffdb6615d35e 100644
--- a/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
+++ b/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd"
 IUSE="doc test"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 13d2bfc77626..994cfc8a8306 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -2,12 +2,18 @@ DIST mypy-0.570.tar.gz 1050041 BLAKE2B 034d49627242ad67283689a653d416e956ae0b782
 DIST mypy-0.590.tar.gz 1081426 BLAKE2B 396083f81a1bf6f8230abe3e3e48b9fcf0288edfa6ae2bbcb7b6bd8f50f4e8dd093cacc326d561f5f10fce0bfd213e559d98e32a35a712bd022d8d0682f239d2 SHA512 129356a4326e80e292645e3b44b673ab463b1ad9b6388396680ca15a4c9aad6da2a3734a3da5d4ab005fb0572fd08863b20ba80e71af2e87d11546abc7fd78c0
 DIST mypy-0.600.tar.gz 1097269 BLAKE2B ee3327cdd7383a93f319335017815bb3341d1b91e3620f7bdc69d1c401e3c8aaa3157cfd8d4657fe072ad90b672017fc2b948ad4ff217d5e4ab91b8946d4569e SHA512 8e89bcbb53d385bbc3bf72de123d4a99230ee5154e1af19adccff7133f86495aa366058e04092356a80036214113ac90ecddcf5e30da59ae2a7c6f3d320b07ef
 DIST mypy-0.630.tar.gz 1172089 BLAKE2B 672f05f5fa45b922ddebb5ea802358f8a63eecf2671540e9fd53419e9bf04f9513815bdb9cca546b4f9483443ea0d4b55bca259d972f124a33f3a77c4b853e17 SHA512 42e2874c2334d04a08a4ac95ea3adae6e910a7811abc9f8a480ae7b87b3034fa8096c12b4dba1d3a9722a2857da8bb76813dd1d858b828934273c1147bc7387d
+DIST mypy-0.660.tar.gz 1274856 BLAKE2B da59dbae31df1c2c8530fddf44f02d608cc9019c9294919e015ef7e62ac8680162a044a98d109e5aa7cdb1f1a611b09659f828c2366ce5a850c23d5f68a11047 SHA512 4d18fb8e04ba2e4d290582ecc2af660ca26c4ef3ccf5ee5455f4be9fe9dabddafe644ce6463a8079dbfb04c463b759283af23014065f290edfa0255879bd0076
+DIST mypy-0.670.tar.gz 1376917 BLAKE2B 1c7de26e48d91a1dd8b007607e6e8989e6b622eb62ad98b3c575faef1373ba510acba546977d26984689c5cd245ea341022ae68209d498d8bac78b01760daa24 SHA512 1fb994410acb3ae3ef6c4380f1b76d2f65790fa7822067dfd75eb34d0336547f85810e475563c797dca268de35b1594217cb3edfe32033eb012d121a3a2e6406
 DIST mypy-typeshed-0.570.tar.gz 413076 BLAKE2B 774a6d07308228c379a5deec2ee36a498863a1386181b47ceb8783537afdb75bc0fb4893b07cf8cf7bf5bfe977babbdc44a6420784e2cba6ce94346175858573 SHA512 e9afb2fe841fa82ed264a73a1ce6c1c0fede42008042a34cf21f1e39aabaa8f1cd945861aa9e80a86f61f1dd6a362892b25a1c5469915fbca95406e72740ba6d
 DIST mypy-typeshed-0.590.tar.gz 413076 BLAKE2B 774a6d07308228c379a5deec2ee36a498863a1386181b47ceb8783537afdb75bc0fb4893b07cf8cf7bf5bfe977babbdc44a6420784e2cba6ce94346175858573 SHA512 e9afb2fe841fa82ed264a73a1ce6c1c0fede42008042a34cf21f1e39aabaa8f1cd945861aa9e80a86f61f1dd6a362892b25a1c5469915fbca95406e72740ba6d
 DIST mypy-typeshed-0.600-2dc7d39.tar.gz 425045 BLAKE2B e2ef63f2ed988f77f52e2a01c158ff8e3fbdec118c1f613ffe6c57d025da8d5bcf6dc0e6bcbc1bb8655fbf340a0f358535d7e1ed214a5a1af8e3188f2dde5459 SHA512 9c960c2dcb2cd5ed36d77efa47a5632698e841b685386f8d5a31200c61235b68d627fc450d070955ab14962d6a70a2d538929e2dc845512e83161c0299d91807
 DIST mypy-typeshed-0.630-8ed0159.tar.gz 451750 BLAKE2B 8d59204bf71fadc36788d93e817fe22cd498dfee08709f4c72ba67bca34d0db4792ea1a01f5632b5b52e94298c183e804357c9bb043e28e0628d82320d20852c SHA512 6c5a03853da452f6540b8411bd702ec59e70aae8ca6f923c16959bdba1ee97a619704c5825faa9e428151898b648f0436f9c9dd0c5ef20f5022598e3b88afcb3
+DIST mypy-typeshed-0.660-f343150.tar.gz 456324 BLAKE2B b7a0f7e3da84b4be8c4cfdb43a62887ab433c22395af2ecee558440b15b9ffadf824c1eb3e8084d8c74ec61301a14f73a7e1ed4802522481e3545872be3f1010 SHA512 c64dd1aa2eb1bb6a0bebe819f7f9ee1b81fb6f6f1da5a2246f5b60aea97a16d86051dcef176b673afe9788bf16f5378d03c5b071f72b9aea727737ddb5adbaca
+DIST mypy-typeshed-0.670-3eb66ba.tar.gz 462981 BLAKE2B 9e321e71637edf6b7b08bdad3ffe76798aec2ad9ff7be0d1649e29ae7543536a6a6d413d9bd9bc4b15e164500e95ee3ba2ad58abc8f984499493c4753dd39337 SHA512 2b3d59451caaf4779c6543cee70461afd9a95b809ba5db7b0fc43e02711d8c4b28c98f680d9ddb9f0c01dcfb5011b6626fe746187c47e737d87689245da9344a
 EBUILD mypy-0.570.ebuild 1563 BLAKE2B 63d388c767582831259a05e2f5d602d708e3a69b5a7c15ee1215298168817c1a7408b9058c573aa6a79a3e59efab4c480ec233e8d90b72df176d1db60634b2e7 SHA512 1dc8d4fcdefe9d78bb9eca659a4f7e31c48b3ef9f7ca477daf08bf0ad3a18a62db1f68f0a84f6f76a18f1fc6c493fb508ec96ac24f827f671abe285dd63412e5
 EBUILD mypy-0.590.ebuild 1563 BLAKE2B 63d388c767582831259a05e2f5d602d708e3a69b5a7c15ee1215298168817c1a7408b9058c573aa6a79a3e59efab4c480ec233e8d90b72df176d1db60634b2e7 SHA512 1dc8d4fcdefe9d78bb9eca659a4f7e31c48b3ef9f7ca477daf08bf0ad3a18a62db1f68f0a84f6f76a18f1fc6c493fb508ec96ac24f827f671abe285dd63412e5
 EBUILD mypy-0.600.ebuild 1582 BLAKE2B 0385941aaf081377960c898b49222a79048e76203de3827b4a20fd8856eadb046ff6841dba3ed7362752355a56d880d9bb208749af15848fbc3317edd890f654 SHA512 543de4441dd2efd08fc5088592ee19a7da95193c06a05cdbfcfb0732380a2be0022b17622e33b80f51f522a64435e88efb21c332722e30743d6cb9a97f8e9cbf
 EBUILD mypy-0.630.ebuild 1591 BLAKE2B 7b2d320a099f1dbd441952aeb2622a7f98133b7e04643574dea58b20a69967614dce2f0df205bd894bdb185986bbbdce1a7b0464b4c3bc69ac37d6a1fa66f634 SHA512 08709bdcbcf8413357417a37c5adc2136aa6dd685e5ad13bf36efd651b685b9e40ab0076df3cf4d6be969de26871a0fa7d6b72ef5ec2efaf04b4a3ba9c6079c5
-MISC metadata.xml 318 BLAKE2B eabbbb1b58582001a0158157e589abcca61c0de824b24eb03c9a905037de8cd1e26427f9a76a8b4836e78701caa073a0ca1d5114600421dc38e5e0de0f0f4cab SHA512 fc38c17a1e934579acb13def5f6c4649c9c20f1141c8506d89cb7f3e560222da570e713fcc10a97c66c19da3832b7d106f5c9ea3045cc961c43b48e726a5a80e
+EBUILD mypy-0.660.ebuild 1823 BLAKE2B 3f82e348c8f6179a40cc49468d9a1c59e2c98a6526d081674d1e0463e7f6045ee9c926630d8df24b34c366742f4772d4eb8498b0f122417dc934de9bed86c797 SHA512 a4364d89c52536f6542b39bfd45417ce0f7328432a5c468a14a41ed0c8a5fdb8bf2f8cab2d239005548e630ffe9e3adc3ec2340c279be2415056cf9ded07a2cb
+EBUILD mypy-0.670.ebuild 1823 BLAKE2B 037ba694acb544fff2f5f6c602e302d2e4348fad705acc19ebd0b8ca1dd6c326c686a86a403182afb3e8ab19f0d2eeca64244fb2ee2d69e194bd8ca87abccc5c SHA512 7f44a70ec9e0b4a4a97bd8a657aa7fa9a2e5d15c71bca119c09f129adb04ef02173697a12efa38da7442eed9a222c84621610d96dc2691d505f84a5948419bce
+MISC metadata.xml 318 BLAKE2B 26aeab57c568a3ebc431f846d61405428034bf9cf8333e5f52f43ec68d51fbbc2cb71deef622c07291312f63f46f29007ba4b02c21e90b4af3db039a43fda4ed SHA512 9e3c8432730d94d7ad9c65ccd1a48d7afc1b43662097f0844048ad107e81ba30e03bea99f64ee8a4171ff0504f1ff04d8d9a84407f414ff228cecadcb80c7c43
diff --git a/dev-python/mypy/metadata.xml b/dev-python/mypy/metadata.xml
index 637a04f97e2d..22d8582c9dcf 100644
--- a/dev-python/mypy/metadata.xml
+++ b/dev-python/mypy/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Mike Auty</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">JukkaL/mypy</remote-id>
+		<remote-id type="github">python/mypy</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/mypy/mypy-0.660.ebuild b/dev-python/mypy/mypy-0.660.ebuild
new file mode 100644
index 000000000000..3058178afb61
--- /dev/null
+++ b/dev-python/mypy/mypy-0.660.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+if [ "${PV}" == "9999" ]; then
+	inherit distutils-r1 git-r3
+	EGIT_REPO_URI="https://github.com/python/${PN}"
+	SRC_URI=""
+else
+	inherit distutils-r1
+	TYPESHED_COMMIT="f343150"
+	SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+			https://api.github.com/repos/python/typeshed/tarball/${TYPESHED_COMMIT} -> mypy-typeshed-${PV}-${TYPESHED_COMMIT}.tar.gz"
+fi
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/flake8[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+CDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-5.4.0[${PYTHON_USEDEP}]
+	<dev-python/psutil-5.5.0[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/typed-ast-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.0[${PYTHON_USEDEP}]
+	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
+	"
+
+RDEPEND="${CDEPEND}"
+
+src_unpack() {
+	if [ "${PV}" == "9999" ]; then
+		git-r3_src_unpack
+	else
+		unpack ${A}
+		rmdir "${S}/mypy/typeshed"
+		mv "${WORKDIR}/python-typeshed-${TYPESHED_COMMIT}" "${S}/mypy/typeshed"
+	fi
+}
+
+src_prepare() {
+	sed -i -e 's/mypy_extensions >= 0.4.0, < 0.5.0/mypy_extensions >= 0.4.0, < 0.6.0/' "${S}/setup.py"
+	default
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	local PYTHONPATH="$(pwd)"
+
+	"${PYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mypy/mypy-0.670.ebuild b/dev-python/mypy/mypy-0.670.ebuild
new file mode 100644
index 000000000000..f163167fb712
--- /dev/null
+++ b/dev-python/mypy/mypy-0.670.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+if [ "${PV}" == "9999" ]; then
+	inherit distutils-r1 git-r3
+	EGIT_REPO_URI="https://github.com/python/${PN}"
+	SRC_URI=""
+else
+	inherit distutils-r1
+	TYPESHED_COMMIT="3eb66ba"
+	SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+			https://api.github.com/repos/python/typeshed/tarball/${TYPESHED_COMMIT} -> mypy-typeshed-${PV}-${TYPESHED_COMMIT}.tar.gz"
+fi
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/flake8[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+CDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-5.4.0[${PYTHON_USEDEP}]
+	<dev-python/psutil-5.5.0[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.3.1[${PYTHON_USEDEP}]
+	<dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.0[${PYTHON_USEDEP}]
+	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
+	"
+
+RDEPEND="${CDEPEND}"
+
+src_unpack() {
+	if [ "${PV}" == "9999" ]; then
+		git-r3_src_unpack
+	else
+		unpack ${A}
+		rmdir "${S}/mypy/typeshed"
+		mv "${WORKDIR}/python-typeshed-${TYPESHED_COMMIT}" "${S}/mypy/typeshed"
+	fi
+}
+
+src_prepare() {
+	sed -i -e 's/mypy_extensions >= 0.4.0, < 0.5.0/mypy_extensions >= 0.4.0, < 0.6.0/' "${S}/setup.py"
+	default
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	local PYTHONPATH="$(pwd)"
+
+	"${PYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mypy_extensions/Manifest b/dev-python/mypy_extensions/Manifest
new file mode 100644
index 000000000000..65f6f81bb41a
--- /dev/null
+++ b/dev-python/mypy_extensions/Manifest
@@ -0,0 +1,3 @@
+DIST mypy_extensions-0.4.1.tar.gz 3548 BLAKE2B 48ded2fefa384242f7feaabe8be840afa623ec89b53c91c51d403684fdae8c6a25e4f88cc9f30c31537958df551a5da42fdb13b49881266da62006843824cc84 SHA512 e862a17b07d2c922b460012798d27d925cdeed4b8dbe9a1e38cb125df5546ca87039ebf32ad4151820d3444ba729fb0eb01c59576084724eb4ca19c5c2a52ac9
+EBUILD mypy_extensions-0.4.1.ebuild 1013 BLAKE2B fe1b71b4ffbfc2aa873f6e7e545c4c14ed0805639650824b359e93b747231e87536ae28b8954159f1658be988f104c8bdf24b1e3729ca58d950592f2f9b675ce SHA512 9d38ec7ab04f82a649fed8479d8cb3b2b808c630d01ebcb7248ddb460ae736a8a786a1fe1ef1fb9e59528ace99b6c7dc482141b5863c8406167ca2e1c909bc69
+MISC metadata.xml 418 BLAKE2B a413884e5865ee7a5ef3fc286911cb613b197aff249a7779d9bcf5c38499faa4b27590534639c4bf57a11c80748d33bf12348e020b1090a3b7c07e773f11c6fc SHA512 dd73868a30b6a1de998c0636037a431ecd9fae5b767be78e4103e2aa8fd2a5dc6c6679a8e082a20508537060f56751616fd53842974b0935817b2b9126ddaf0b
diff --git a/dev-python/mypy_extensions/metadata.xml b/dev-python/mypy_extensions/metadata.xml
new file mode 100644
index 000000000000..e51d00229eb9
--- /dev/null
+++ b/dev-python/mypy_extensions/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ikelos@gentoo.org</email>
+		<name>Mike Auty</name>
+	</maintainer>
+	<longdescription lang="en">Extensions for the mypy static type checker</longdescription>
+	<upstream>
+		<remote-id type="github">python/mypy_extesions</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.1.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.1.ebuild
new file mode 100644
index 000000000000..349d05e0d4db
--- /dev/null
+++ b/dev-python/mypy_extensions/mypy_extensions-0.4.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+SRC_URI="https://github.com/python/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+if [ "${PV}" == "9999" ]; then
+inherit git-r3
+EGIT_REPO_URI="https://github.com/python/${PN}"
+EGIT_COMMIT="master"
+else
+EGIT_REPO_URI="${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	test? ( dev-python/flake8[${PYTHON_USEDEP}] )
+	${RDEPEND}
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	local PYTHONPATH="$(pwd)"
+
+	"${PYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index 12a42dfc27dd..1cd4cf02b316 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,12 +1,6 @@
-DIST mysqlclient-1.3.13.tar.gz 90368 BLAKE2B 34e6aad0d53f93017120334b09b901530a84cc5a5dd806381dcc3f12742764bda6f42699fef226b22274efd8f61304af0d1366abdf44607cd9827e9718ecc285 SHA512 e8e385490bfb2d926a94695089c9532981d1e3fcf1fb89a4dbabe98f0bbb25beed1cce8004b71a11fdf0161824e86826565cdb1ba5f2162450847b6b467f362e
 DIST mysqlclient-1.3.14.tar.gz 91391 BLAKE2B 06a781f21f608246ec2da8a591d7bf5e430d96bc4069e589d6466a2deb4e53ab8a51db0015e4db73a748d6cbdba9c8c550e888e415cf9390afe5f0d7f0620156 SHA512 2623130f67b989f981bec37d19fffd400ba1b144657ff25575d055d19297d0f94c0a70eac980d90a76ef2b0455a56ca033ad92bc54c9456b2c57d5a84475ae50
-DIST mysqlclient-1.4.1.tar.gz 85332 BLAKE2B d5a19a440ef2187f59e54f97100b9b10ddbe9357791b546f13330b5b9fcf4aa7931e453ef5f6b8445295a5241eef73f05c1fea2c0eca3a6dc02055b2433699ca SHA512 d1606c19bb0d05f69eeeb7699ac131405e06f386a0d752c4f9a5ea28f90a2c26cc5eda44bcda2bb934a88276f6685efa21fe1680e2904578a295da8827af4f9f
 DIST mysqlclient-1.4.2-r2.tar.gz 85662 BLAKE2B 5e375c142d392d79ca3b119d52625c3c65a074fb90e71eabd2791823738995d390de90c50c20dced9df91e071d74d7a318cf09779c44387eb4103845486b48ad SHA512 d42969bc37b5148fed14b815280890f07058f75ef99390674f6ba3921f5dbaddc3ab2344f41e3b6d36f35229feffbc419a2ad31e2268e70165b1973356ec9c32
-DIST mysqlclient-1.4.2.tar.gz 85634 BLAKE2B 76c6de6e40a76b1629da4854ac3fbbbf77c58b2dfa3d2c9b815dcc840e62798094c6260e745727043c7e20f136f1a8015feb78e6d6232f917bef3f823fb4bb77 SHA512 1d5a62fbf70d59fa5674c733229f50f60524d2e6d6355e7c9d99186f2a8ad5566f830161996128f5a681b3601687754d8e581b3231b666bb70464fbb9cf4f94f
-EBUILD mysqlclient-1.3.13.ebuild 832 BLAKE2B 2db089a19b09d41d950d4b083a740a177fa256fdc5b7d6b34bb71e1c8c4201ad6afc23f56fc5027a8dee8b9460780d478e1153c2b97cfa0af36900d3ecd3319d SHA512 834a8db1152aeebfcffa0bc71b0da3add6eae1f60661396768a2938b6829ec7f7e650d213b43ce4162bb4140326f2e98399bbb1d648d729fcc624ceacc429cb5
 EBUILD mysqlclient-1.3.14-r1.ebuild 848 BLAKE2B 6e7086d364ecec6314fb1cfe51de1d9472ae5ae4722f2c018932b225f884f0666c077356f80e8637ea779950e5fd97986f9d7597f9082722bb2c2562a33b05ba SHA512 e8f0fd3ea1d7bfbfd0e8824cc61e6ba5c51ac7e274284692abed3cff6424f7809773d90d1b9e653b2801f814dc93ce8d1d1f0ba58762f5dedbdb6432e863f549
 EBUILD mysqlclient-1.3.14.ebuild 832 BLAKE2B 71d30ed916d8f5ce442d26aa7f0ca559c083fdd2e81c8fbb64fa9e42d6c7b4d5d31cc11ae6bfb21769ec19f2aea827b75e655269d90741686ef1b4a14e3b23de SHA512 6339636e0fbf4b2b5ac9731e01153abd9ecd17a4e444c6bd10b7d603d03e77201fbc9d6f8fb02e27da1e0d9920b84c78cdbb97290fe07b6d4ea84ff3469e9991
-EBUILD mysqlclient-1.4.1-r1.ebuild 848 BLAKE2B 6e7086d364ecec6314fb1cfe51de1d9472ae5ae4722f2c018932b225f884f0666c077356f80e8637ea779950e5fd97986f9d7597f9082722bb2c2562a33b05ba SHA512 e8f0fd3ea1d7bfbfd0e8824cc61e6ba5c51ac7e274284692abed3cff6424f7809773d90d1b9e653b2801f814dc93ce8d1d1f0ba58762f5dedbdb6432e863f549
-EBUILD mysqlclient-1.4.2-r1.ebuild 848 BLAKE2B 6e7086d364ecec6314fb1cfe51de1d9472ae5ae4722f2c018932b225f884f0666c077356f80e8637ea779950e5fd97986f9d7597f9082722bb2c2562a33b05ba SHA512 e8f0fd3ea1d7bfbfd0e8824cc61e6ba5c51ac7e274284692abed3cff6424f7809773d90d1b9e653b2801f814dc93ce8d1d1f0ba58762f5dedbdb6432e863f549
-EBUILD mysqlclient-1.4.2-r2.ebuild 896 BLAKE2B c809d5b9246de0350899e68b1287e89a7f99e30a18f3f5ea1e301ac8863b64166395b1b1e18c3ffd1fd486ae675a1397eae08a2bf63eeb930a92ff0929f3377e SHA512 97dee89a0cd935fe95244757d3e6d55499d21bc3a68b3bcf5fcad60fd678ace94d75703fd25ff3e773a437aae425f00eb44c4367b71c6ce503228fa54d127658
+EBUILD mysqlclient-1.4.2-r2.ebuild 894 BLAKE2B df8426525f3a0e0f80ba2ac546101eec1f53c931173a5d9de7e8da6365657284def11858115bd22d1a2a5d8ce32651a718130e588d7144c2c923bed49d2c2357 SHA512 210ae8e17ac9606ca13207c6d71d13de3970284019596cc56bb73f925bb553448ad8193628f91a840f5b542a1f097a5783d3e291da740f64e007de7ae99edfca
 MISC metadata.xml 513 BLAKE2B a65aef9c59557dd33af579ee376553bd46fbd53158d0a02585b2403d6ee45acb281599ec593d5d75d69cc8bafd509a0851ab25764b5a79f3501a7cdad91faa40 SHA512 4a2756c3bde70c4fc73ba347e9648b356983662146cce5c1161f5d0c8333f795bc27d0aebe6019dcfe6402a51611dddfd87609c329a3c2fa6aa20808cee46b38
diff --git a/dev-python/mysqlclient/mysqlclient-1.3.13.ebuild b/dev-python/mysqlclient/mysqlclient-1.3.13.ebuild
deleted file mode 100644
index 592ba7d4a9a8..000000000000
--- a/dev-python/mysqlclient/mysqlclient-1.3.13.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of MySQL-python"
-HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	!dev-python/mysql-python
-	virtual/mysql"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-DOCS=( README.md doc/{FAQ,MySQLdb}.rst )
-
-python_compile_all() {
-	use doc && sphinx-build -b html doc doc/_build/
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.1-r1.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.1-r1.ebuild
deleted file mode 100644
index 32c8bf147197..000000000000
--- a/dev-python/mysqlclient/mysqlclient-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of MySQL-python"
-HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	!dev-python/mysql-python
-	dev-db/mysql-connector-c:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-DOCS=( README.md doc/{FAQ,MySQLdb}.rst )
-
-python_compile_all() {
-	use doc && sphinx-build -b html doc doc/_build/
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.2-r1.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.2-r1.ebuild
deleted file mode 100644
index 32c8bf147197..000000000000
--- a/dev-python/mysqlclient/mysqlclient-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of MySQL-python"
-HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	!dev-python/mysql-python
-	dev-db/mysql-connector-c:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-DOCS=( README.md doc/{FAQ,MySQLdb}.rst )
-
-python_compile_all() {
-	use doc && sphinx-build -b html doc doc/_build/
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.2-r2.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.2-r2.ebuild
index f12d017053f9..9ebe3d4a6b57 100644
--- a/dev-python/mysqlclient/mysqlclient-1.4.2-r2.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.4.2-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}.post1"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/namespace-zope/Manifest b/dev-python/namespace-zope/Manifest
index a9c286f3bde9..a6d3c828b292 100644
--- a/dev-python/namespace-zope/Manifest
+++ b/dev-python/namespace-zope/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-zope-1.ebuild 934 BLAKE2B eb64633a44c30f3358d13582cbb755812e488e7975d5b1475efe65ef86c029620dc5be3d662088a7f491e4a3d56321a5c9ed7c0febd10c72b4093e4f0de31a6d SHA512 a64a45a39fbca11d397445585d7463808d8bc036a79e447535678b37e4e10feaff66c5f4da1c3f85d8e723d303f7619e89ad4c0bfef584847875f1de4473d3f1
+EBUILD namespace-zope-1.ebuild 930 BLAKE2B 32ff96bb3ae39776b91039c03d0875b8c5ab5aa89551ec65f74700622feb56752cd2f00cd06fbcb2426e593261277bea2d27dd6b8fb59e5a7cd2adfb8a0ce798 SHA512 f91a7b5a709b1b793e5d4f71f59595366db555ce0be9100b4db24069cf1d1b0b150e01993df4b10666fcbf1d6afe6c4965a02d4fa6d48b1b56141c7fd3f359b6
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-zope/namespace-zope-1.ebuild b/dev-python/namespace-zope/namespace-zope-1.ebuild
index 4544d424b89d..b12ab49fa9f8 100644
--- a/dev-python/namespace-zope/namespace-zope-1.ebuild
+++ b/dev-python/namespace-zope/namespace-zope-1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 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 ~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=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/nevow/Manifest b/dev-python/nevow/Manifest
index a22758b67b2e..4fe38a37fd45 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 1262 BLAKE2B b42bb4d48d553b9f97f1b16b459b298e12ed679c4219707df9770ef534c03cafd22c51d85ee874316f8f6e285e7fe70ca834941f50ecd8e8dfc6fac5b8467dd9 SHA512 c62b067ab9d0bef10762d1f2d6e25592dc856fbb42ca320aab45824efcf845a95207406752883bc9ba5ea4e325a8afc6f462851b24e6c814066a73d0534016ff
+EBUILD nevow-0.14.3.ebuild 1254 BLAKE2B 444930437e3fdf16c64c3c39578732719b85f19f1e2e017553e2b89c25ec8aa3dc7bd5d12175f52a934b2665b53c4f6c8897d7b2581ccb281ac311ed5db1e9be SHA512 3e43632ecb280823afde973065537bca28316e91995dad959088c3e59665ec923548e116c372fee416df8eecf1dd759d2f6942d0642553452785ef0a357a4385
 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 91f8d3cffa5f..8c2415676eae 100644
--- a/dev-python/nevow/nevow-0.14.3.ebuild
+++ b/dev-python/nevow/nevow-0.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -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/nltk/Manifest b/dev-python/nltk/Manifest
index 5bb558723539..6f758b955ae9 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -1,5 +1,5 @@
 DIST nltk-3.2.3.tar.gz 1166282 BLAKE2B 803dc1a8ec80a17538c2164d5ee0eca201be2307bbf3e08093a55cee93e9a539d8b48ea42c8ad84b540922355bf0b151ae04338d8505378a89173159d7464b76 SHA512 2e5c0899c29f61166b2e161e62e81fd35e045bda979fbfa662bf9ad1349be4aae6aabe4b9de34905e2abbc05b06a096480829fd66638efa35cd5c866f76c62e8
 DIST nltk-3.2.5.tar.gz 1188856 BLAKE2B 316e5955d2f90c351673ee9d3f0cc159babbcae08104518db62e796b422dcbf51668001b06b5d5dc399613d4db0ed39ff7dd15ad15d6f6c64e10c73a4d53bc06 SHA512 967b209ce3dde5296dafac16b91bff3894ff1a3f073c76974fd9193912597c82d2d1c50d4419052da77ab66f798f230f725b83f31368a95cacf94d46e45055de
-EBUILD nltk-3.2.3.ebuild 828 BLAKE2B 744fda1f9c31b67668244d273fb45f3e65545150ebe2eb258025c8a41e5746cfc6022f5181342a089a8bce72cc1e15b6a3b04c45483a8781bb3e0454c67d1cc2 SHA512 1f12ec98511728139858cb1c8a5519630ae85e070178cb756751a87711d0843ee91ce9551509a9812072b06125adc17a694fb8cf456f936d0173ff4e1ceeef8c
-EBUILD nltk-3.2.5.ebuild 830 BLAKE2B 592fb72c60a801700fc4a1710caca9ecaf6e3b5c70ba9e71935aff06507f43cfe15c71c4855122357524d04fe389db0457459819864c4b83a0ef6188e1a0fba7 SHA512 c25333641e987f8df21265efc97f50d0d7c6abb350352be31fb72339994cb0d0e68040d1b6ba856f54dad2888b44a71a63956b0c89b2e475cc998f128611f55e
+EBUILD nltk-3.2.3.ebuild 830 BLAKE2B e9a08050abef1b429ef09c6ce0311d737747d4e33420ac90a2c66f197d98f053023fc6d9a249b5ebb513084f755218d875d8c5cf55587ad1524325335e7a3ca7 SHA512 44b36c3dde690512905643c4e8d7b9ebee84f16afce0358a118251288870a6acbf90830d93ce8befdd5da5a5e84ff92c7c3f60c3c5da65423fdf65ed04e3c528
+EBUILD nltk-3.2.5.ebuild 832 BLAKE2B 36021ee003783c9c1e0626c210a8e90c5396967383106ae4620b6c9e2d8c5b9dde89659da29c61f2435b4eb75e58c059828d1f88518b630c2b0dc79ea89c810e SHA512 549795072ccb108f5705d6bafef5d0ccea385d3861e34105517782576ea57ee3d69f47ddf00ac1a13e570ab6c46fcd9c52a2206974c92d6d6ba1cbc9a5e8ca43
 MISC metadata.xml 455 BLAKE2B f7f64dd6f4755438db233c712dbde5cc3aae6f2cd154c207bbef0196569b458a8d26c35b92601e8e79af4cfee7f4f57029d9a892677c477a86bbd8c78fa1da16 SHA512 315f7c1822be51c6fc541323f0b977dc0bb60e129a6bd907cd47ac1247c88e906b3452f2ded4d2071c142fd1d710c674039c95036124177744ad68ecc5ca4bd8
diff --git a/dev-python/nltk/nltk-3.2.3.ebuild b/dev-python/nltk/nltk-3.2.3.ebuild
index 7c9c2a8c4acc..1859132711e7 100644
--- a/dev-python/nltk/nltk-3.2.3.ebuild
+++ b/dev-python/nltk/nltk-3.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Natural Language Toolkit"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://nltk.org/"
+HOMEPAGE="https://www.nltk.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/nltk/nltk-3.2.5.ebuild b/dev-python/nltk/nltk-3.2.5.ebuild
index 00df16dee538..f38f2204264a 100644
--- a/dev-python/nltk/nltk-3.2.5.ebuild
+++ b/dev-python/nltk/nltk-3.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Natural Language Toolkit"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://nltk.org/"
+HOMEPAGE="https://www.nltk.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index 3908d27fcddc..a67c79add516 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,7 +1,5 @@
-DIST numexpr-2.6.1.tar.gz 90819 BLAKE2B 833402388e184bd38c449bcda866f68858f486d5cf30aec29dc5e9827a34a40cb166128a8fb217f0ed1614e0b759cf2164e31cb2a16198ea3e6a216c9fe01853 SHA512 07c88b1788ecad2c59260e7a6a15dfc21d486462a8866091d157286e5ce3b5b77f5fdab401fd30e2a5e4880398af53641d557003497c7d3658421bfcff38c31c
-DIST numexpr-2.6.2.tar.gz 90970 BLAKE2B 85034d7d36bd921df289f817451e7b30071b9d448dc050e4f25afd13315921e3c10d61a41983cf106606e4efd91504e94ca7d8f01d80b230a9f717f41eb687ee SHA512 730e19e61987ecb00bfc3a65db043c88a1311046f2ea5f0a48c93d6a8d7576dbaa166b0b9b0f547e344b21b5c269be1b5aa2097e88aaac55219884c7ece55261
 DIST numexpr-2.6.8.tar.gz 94517 BLAKE2B b41593183d69cd98f81107da5abc3eb59b35c6e61c0dde213c9a201c2776e4684d8af4b1a88c59ca464a7755941de9baf2157af64e8662c4219ae8ece635aefb SHA512 e610a2e3891f12b3a9fd7acb14a0362e0f03084035aa274827ec5e7d2584f2c599493afaf406d8720d915c7ed834dca11b1fbf28c0645077eb63223a2bf52cf9
-EBUILD numexpr-2.6.1.ebuild 1385 BLAKE2B 1331948ae46b9d20c3122e5d779bc00db85bd11dfca73f63ca80d1fdf27f43c6fe2297dc0556d0bc0b0275516052608f07ebd6f323b95e89c40ae8781f63078d SHA512 dba9ff2f89c309efd420ef478a1fb8bd75036eeeb66d758c008ca5e8dc33d43f95886fb8883feeec7861108b8173f54b764852f1c5993e19f30d8cff9213e50a
-EBUILD numexpr-2.6.2.ebuild 1386 BLAKE2B 2f3ce14437912a42c9ad770eda3f731f087e6eef4b6ede44a043bc9021ed04357550c25cd2bfd4f330e3ffbade391b8cacbc66516cbbd89a8d084b7c47cd70ae SHA512 4abad8046ecb5c969258e37b7884c990ea5e833250e377c9a35d493a85315eefef50d2feddd236161ad8c5142d04480509b3651356be3d881422e9bbff53b064
+DIST numexpr-2.6.9.tar.gz 94419 BLAKE2B 22492c1c59306fbd93174b5bab2ffaa32628c52cc570871bd6192a4589b65b6f679a77c8ec6f37b0a2ac09f004364a2ba87ecc26f459cb2d4b3b2705196b9fdc SHA512 d43845fb63c1e7b645b282d251f7f112784dbc04b61af1ffcbb9646cbe2e3a9f5d38aaa000f7d49880abe44c25205a6ef1e284577d36868220a197cdc0e55166
 EBUILD numexpr-2.6.8.ebuild 1389 BLAKE2B b67c872736890b18124bd50e41ec2dc8645a12a246bd3e6eaaea0969abd5e8e88d68b4dde023db11425fbba50c36dba8c695b68665bb44c40ce28ec4e318e98b SHA512 736d27ff162abf6ca4a3ea4e97a28e4e613ed61d9d5ed46697f4e3fd9d9c431df106c8da77ef26026cac873dff409ae8774f71d49b85bdcdd8af278d1c68949e
+EBUILD numexpr-2.6.9.ebuild 1400 BLAKE2B 738827dc6d6f5d699356709a86cfea4cb817c07d869fa81eb721059af4571ac8317992e1cbd41b8f46921f603173d5dbe77cfce3c2fbc82b4d98b7769f9ce937 SHA512 18303b7a41c64d8712e2d147789ec9fe803240f9bfbf60e89858d52b27864990a41a33a4ab23a54fff4f90b906047e048d46c473617b0a51a5750d0d90230a58
 MISC metadata.xml 1086 BLAKE2B 5ead7194bab4b637946cc095ba6ae07eb461a20d4f8621f8be75c916e8d414a309b1679b928389e9e61f2ff4795a8f149b9a402f12bc21965d25df1251f6c4e3 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824
diff --git a/dev-python/numexpr/numexpr-2.6.1.ebuild b/dev-python/numexpr/numexpr-2.6.1.ebuild
deleted file mode 100644
index 453de3de466f..000000000000
--- a/dev-python/numexpr/numexpr-2.6.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
-HOMEPAGE="https://github.com/pydata/numexpr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="mkl"
-
-RDEPEND="
-	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
-	mkl? ( sci-libs/mkl )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# TODO: mkl can be used but it fails for me
-	# only works with mkl in tree. newer mkl will use pkgconfig
-	if use mkl; then
-		use amd64 && local ext="_lp64"
-		cat > site.cfg <<- _EOF_ || die
-		[mkl]
-		library_dirs = ${MKLROOT}/lib/em64t
-		include_dirs = ${MKLROOT}/include
-		mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
-		mkl_intel_thread, mkl_core, iomp5
-		_EOF_
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS}"
-		append-cflags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" \
-		-c "import sys;import numexpr;sys.exit(0 if numexpr.test() else 1)" \
-		|| die
-	pushd >/dev/null || die
-}
diff --git a/dev-python/numexpr/numexpr-2.6.2.ebuild b/dev-python/numexpr/numexpr-2.6.9.ebuild
index 93836f5e9c2b..6e0eb002483f 100644
--- a/dev-python/numexpr/numexpr-2.6.2.ebuild
+++ b/dev-python/numexpr/numexpr-2.6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,11 +29,11 @@ python_prepare_all() {
 	if use mkl; then
 		use amd64 && local ext="_lp64"
 		cat > site.cfg <<- _EOF_ || die
-		[mkl]
-		library_dirs = ${MKLROOT}/lib/em64t
-		include_dirs = ${MKLROOT}/include
-		mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
-		mkl_intel_thread, mkl_core, iomp5
+			[mkl]
+			library_dirs = ${MKLROOT}/lib/em64t
+			include_dirs = ${MKLROOT}/include
+			mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
+			mkl_intel_thread, mkl_core, iomp5
 		_EOF_
 	fi
 
@@ -52,7 +52,7 @@ python_compile() {
 python_test() {
 	pushd "${BUILD_DIR}"/lib >/dev/null || die
 	"${EPYTHON}" \
-		-c "import sys;import numexpr;sys.exit(0 if numexpr.test() else 1)" \
+		-c "import sys,numexpr;sys.exit(0 if numexpr.test().wasSuccessful() else 1)" \
 		|| die
 	pushd >/dev/null || die
 }
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 38f6f4c77d83..c2df998b5cbd 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -9,31 +9,36 @@ DIST numpy-1.10.4.tar.gz 4069996 BLAKE2B 9f315d1fca4415b148d4b3bff6f223930bab3d0
 DIST numpy-1.13.3.zip 5021189 BLAKE2B 5a2890a8e08425a2d537667cb2c621a57e1d442951d0b06aee2a9a153bf76652e9c4cbaa11716697a85c580e1f30043d5eef10fc24245074e6431a873ff80c34 SHA512 b77969372c8463879b452dc54830afabb719e6814a2bb1ee0062b463155ac709d1cd48839b28b74aacaee8aced7ee35870ba43d59293ff54f90bc0f717ca7737
 DIST numpy-1.14.5.zip 4904624 BLAKE2B 14d266bf1139b9539e39d08a6537e2b772e80bf46a0769cbb06b63ba54858c9284f6d0e8a19627a4d99f2c2638e9a4031bf4d4aaf773eaf34b7203d131636dc0 SHA512 e131f9fa815084e334b59c5d9abd8de0088ad1dfefecf8615ad7deca0b54b0dfa0446c8de99c90670ea9fcabea9980bd171618a5b9032c1937b597a5ce363c5b
 DIST numpy-1.15.4.zip 4473522 BLAKE2B c030ef4a06c84091eec11b6602422468bd0674489a2c7fea1230132cd3a3ca1b10ec87eeb6788f2f263943f9ac43026dc1e7f0f5f1d52e9d1cc6934a5d361090 SHA512 9e0516da04368f0353fb7e3cc2c72e1ec936042908309732a298405bd7111e712899627b82f3674295b611e0ebfd74ef91d693f065fe9cb03dc7de23d1e72676
+DIST numpy-1.16.1.zip 5070040 BLAKE2B 0429d27d88ec97e207822c9c7fa759453bbef97d1d5fdf3e68dab21ca098a6321e2e57d85561dd99084d190b8ed6fce20f00b421c8d14a249fc45dc1ea09569e SHA512 e4adce4f40a3cb6ac482f82db9fcd079179b03b0e878920cfc7d98b9f622adab997c68af892b209f417d5f31b4123a1c5ff5c07cf5b0aaa496d8be6c8354bde8
 DIST numpy-1.8.2.tar.gz 3792998 BLAKE2B 00d22c72ab6f919626d3fba0edc477fb9c19f9c299f78cff6102e1860e3d1baec8f3b17aa23be797e9a34630428174de3f3b630c3f05c5340024dc6314fad8cd SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c
 DIST numpy-1.9.2.tar.gz 3986067 BLAKE2B e5ae6717badac01186a5b0f36729c1c01dda1fb4238978858c778f08f17512c5d1f3902d551cb0c67a77c1246ce238e588556188e7e6466c27ebdde09879782d SHA512 70470ebb9afef5dfd0c83ceb7a9d5f1b7a072b1a9b54b04f04f5ed50fbaedd5b4906bd500472268d478f94df9e749a88698b1ff30f2d80258e7f3fec040617d9
 DIST numpy-html-1.10.1.zip 9663942 BLAKE2B 436ab4185212f8eeaa3d61e29c2c547c9f24bf0869984cc674e66a7360177e999cc70a6573316711e478db62057d5cee90f85b978d095c6b47f1dc3832ffbdf7 SHA512 9d1f3619b801c88604a0495290da4ae8cfb4800257d549214363c554c1dc09a736425d594ed88f492afee6ae7c68fe5c166b9b3a8f24637ea41d67fd23b9d9f9
 DIST numpy-html-1.13.0.zip 10324817 BLAKE2B e16357e615b30249a4c41582b46b194e2c3113996260f0ff60e5b64ce9b344a05a5f372095a9f1187e8474bda4078f41ad8372c801637278d3478176de455eaa SHA512 2dd769ec0d4967ba1797339170b0f9bf694a0a304cffb8482a037ba043a3bd3a9207e63a1ffed2d7ae96205d3a1a72fa1b15eeac4bd2e565544363dd9742f542
 DIST numpy-html-1.14.5.zip 11197881 BLAKE2B 00cac3c5be07f644328acd9ed155a6fc07ed7d7380584732bb3ac03562c8705cd152612f461d5dc251dabe0be4ba45593165a961496e351110e1aa7598c37370 SHA512 578d31660de4e1f57310b3a2137cefea17228f40046eef1689fb6d9302f0fe0fda5aaf473c3b8c69ae781049950022321593ec891a5640e3c36c886ab3bf4383
 DIST numpy-html-1.15.4.zip 11158615 BLAKE2B eb264cd51fd61b389e858300d96be63f8e2eeaa0b7346beac571b62d96867d6820c19d5043a6f81088dc52b1e4d7f3f295e02ff5ff90351b0feccf657ce90001 SHA512 1cad60013f374f456bbb1fb6161545a94e252205c28054f9b33cde65330772ab243339289517a8825957a21e210455d33bcc0b9c588052c49c88257b1b04facb
+DIST numpy-html-1.16.1.zip 12132467 BLAKE2B 050a8cba160e36a4c547f1b67b8ab2b9220c9841a9f8343dce6f3221313505530a1687efa2116384a03d3bc9172a0298b4ea5ece2f423841d595e45f565ccbc2 SHA512 5af356313363e00f05db560902cc7578162c7d2ab9c1ef0f3713854682b63d76297d55eb9aac0dfc7f4b687ccea93a53462e2082ef1270e29e19680e1222b34d
 DIST numpy-html-1.8.1.zip 9703711 BLAKE2B 1f9d9cb4e65fc2f03d07da9bc34de9c8c4f93f5267689abccb0e2383b23babfed52ae6c3969738e78eeca7b32f49c90f9f7bb92dd432a6b87e082b67c1f214a5 SHA512 1d52c657931f4eebb5325159444aedd969b201f5098855058f1ef632dc8677372d632291154ebc3db9869cdb8abf7eb820eade1a9edba2d6be1ae918cb38c071
 DIST numpy-html-1.9.1.zip 9839137 BLAKE2B 84b4c15ee20d8a1e6514baf47b96ac770690357278ff22b48c427509534c41df9e14165483f625955a7c6c087b0b5e13e68bf3d06951352a8511d6e03cc65d9f SHA512 647a6be9f93995aca14185e283a2b412678c6e8080fe4f14e7cc9ee63c28eebb64dea6bbe28f30ef6850a5565dd1e06928fd660ac762e9a91454d309eff96ed4
 DIST numpy-ref-1.10.1.pdf 5382006 BLAKE2B c360d40c6ac3d2975a760dcf32ed312f30e9ee6b096020e0513bb22af600de62f5f72309603414b3bbcaf02a1aacd79e84545a6e5d50611bfdabafa9f6441a10 SHA512 25085eb7cb80343abffe04ee01ea93603427913ba4443fbfdaa1ef1ad07a8642c47259d0bb1cb91a9059f786c03395bba76f608c6f0a2fd26d1afec4847d885c
 DIST numpy-ref-1.13.0.pdf 5047809 BLAKE2B c7e2734311918c6faa46b008c4802bb090a728ca22337695755e885a7d7d341ba76d5e489c9c56cf89a9d0545bc9b24787e193c4bc1af2631a368b812fe74083 SHA512 0fe28be029602f8b8dc12987da273581b42f123a9d605321084d4c05233cd31ccff0efb17b99c3e8cbfec5f8de11252a99c1ee5c43d37aa5fa57d712f4bb4aca
 DIST numpy-ref-1.14.5.pdf 4855150 BLAKE2B aa924542346bd06b1aa8b11ceb8eb5de936cfdccc10a8339720a297e27b5b34961044eb8db8dd7b9a19ba93b3cbf76ec278a9a50724653aafd2b9d57a00007f2 SHA512 717f58fcb1aa66ecc5f5d4c11c9923d2beb21a1b1a0ca1e46f3622c69f1122fd0547b7f7abaf6de008e2aa988b2453af3c2590877f5596fb6642479ece651746
 DIST numpy-ref-1.15.4.pdf 4843444 BLAKE2B 26154930a8c881f49e7eb7d9540d1deba27baed1acb15dbacd42a659c05f50605cd44b63b2474e66d1d22851145cc65b3e3f26302f8966e141cbd2afc666c654 SHA512 aebff74389e785bd588ccc287329aea4dbc3ef51b46fbffdf088853342fea724f79f712733e453877949e756a52e89de3b257e5feba86e830df84ed8f9bb0e30
+DIST numpy-ref-1.16.1.pdf 5175448 BLAKE2B 5cd692a0fc825216560dbbf48738a49b794973d4539bd778f0f9a2f7f72b32d3061675f9a76db4cbfbb38eec0793c70046180fcb07e23ffc6177dee76b16bb92 SHA512 6cad03e30d7c2204fb899f4e4d1167fefade60d20dedf0ea87ac15c70139fbcca8789cdf17af5a2d221ba06eb78e9376b4b542621f9d78772041c83ab2405d1a
 DIST numpy-ref-1.8.1.pdf 5348248 BLAKE2B f087fbbd3c789adebd2902db0a2acc8a8748ccbb5a1e7e064effdc91e92c7dcf087ae36436fc52d7afa12a12ca2fc0f5f5617177bcd8b9745a7155acd10d71fc SHA512 340dd8f47430f24fea81bb3a8674e1a58f4290a9d1c5d64bac96d50b31a94a770e78381e42daf8b0a6a90cefe5cafe86b0c89f7cc7635a042a7e85eb74bdbdf5
 DIST numpy-ref-1.9.1.pdf 5318122 BLAKE2B a893be075c823ab1a6ad3b2e38e8c05aad20cc2abf9307af9dac87b12f029fe07b535b1f385a4315bcc9590fedb79e25bc5e1659885ad61cf010d2f45ae6edf5 SHA512 5171bb22588117a53e0eac355520581f7817a7e7a099ae83bb73f2ac8248a60e139ae9719dc543b44f25ccf8319c9f149fec1bf5aa55d943fad06a8e6da0d9ba
 DIST numpy-user-1.10.1.pdf 406114 BLAKE2B 88d43e87071eb88223c84720001671677c6f8c1e745b4434331434a9c48cee4591e67740ef102e49e839e4b2aa690798a5415fa25eaa79d823dbcfa29780fa85 SHA512 998bce3777944e7b366c619e968ac4b6cc4351cd2819d6ecba7f422e20b6cd4d7332a8dede4036cd12e85b24c4c3d973bd9ef2d407610369c2591fce990fa8f4
 DIST numpy-user-1.13.0.pdf 580593 BLAKE2B dcf86d0a87ceb7062b8fb339d37bfe3c3fd5e166f3079a079d50f6afb51bde9754d050c97b3e4aec237aaf797d70a2458fe0f26beeeeaf1594330e08c07e181a SHA512 d3891d449b72c2d97af28182e0bcb12559abc114f8dbf0e0c68362c1af50e6aeab565b31b4aa44ab079e8d47f550081a79a4066c37fc52a1c70c05be45eb5c11
 DIST numpy-user-1.14.5.pdf 574418 BLAKE2B 80738f1760932fa74b07334d1a355ba3ce319e0b03fe1428d0b3497466fa1164ccbad84969cb7bc8daebb5525094f0d0c7710e1d661b1c6bbaca0669bfcbf875 SHA512 fb00305408c56ee203ed71ac042474592e7e933f14a639f6dce0f6dc80206c13b844c2425a919f9072a114c7af2c2f9f85b78a07ba3874259e5d173290e51a13
 DIST numpy-user-1.15.4.pdf 596191 BLAKE2B 1387b7aac9cccba4b7ce259391f56372959db35c4ddce111afb9949347ebcf3290e7d3fb5b1b2d2e7850911259cddb07edfe104c1396ae8e31a58a81e9293f16 SHA512 2089753b48412f094b279c378be1d221ec9b171957171a4e26b4589d594e00b4f66b6f8a88a7eb665e8c3fa3e6ed505d63da80d4d01ced041544b97ea56fe212
+DIST numpy-user-1.16.1.pdf 592508 BLAKE2B 88ef7aac2998fd8eeebc3ab92df9ad9ba139b67ab0442cd4ed91cdc7b1cd72acf7905468118df25634640b709106758455c7d316539b941d7760010b8135fafa SHA512 d089b4c663f92c38aa075c37974df757bdc457f75980737477a4477f67311d28149bc4c20f5d1cd0877221a78e5a9ff10702b1ebcc8ab062d328cdda4087d0f7
 DIST numpy-user-1.8.1.pdf 408305 BLAKE2B 2956e42ebad45b021f72c7e71d357d953ea8a26639b4c6e81dbe1718052304ac5ce1a7f96646d94ad48bf737ddc6962fcbc304e31dfce32b85cb8165b0ada6e0 SHA512 9e646e89e7e67834fa596e43082b43842d1c59287d22fd8d20c9f0a1d3d56a518a08cc2c036de4972ad0d6d9d3c2f56e2210f76e7244d3f7547b5204d84d3c7c
 DIST numpy-user-1.9.1.pdf 418111 BLAKE2B 683ed35ca9e123387a08a88047ad0cfd8bf3698efee7c17c3b57941f57f86297798787f13b142a1bf806f775e70bc116109decb281ab82959c08932c06aa1f3d SHA512 724302468a8e93daf70d379bb1ee7369953e297c40ea260f080b7aca3c9c81e619a81705bdfb2ea214da5b5325ec2b48e953eceeaa1d60c07593b00c35989f45
 EBUILD numpy-1.10.4.ebuild 4094 BLAKE2B a20c04c9445b3b13d30706b2fa26633541722175c4f2797777cd90c5c5d1a7af5079009bbdee026b0b437e6e82ece7efa60f16d59a09e7c39b2139162c76bd86 SHA512 f0817e879689c05b76cfb921db376828227f947fec740126e59969bf75933d5b0bd969f5dd836c7060a4bcf079ab7174db33e0388629d8f323585d7e31ce9d18
 EBUILD numpy-1.13.3.ebuild 4646 BLAKE2B 717d5acd1683ef3f5d7ea07475b7d3a5555991aa2240c5cade1170f01092e12e315ba99d408f2f04e8e998d5c0820bbc2034ef177375d729d19280e6940c6f66 SHA512 2eccdcda9e51aeda860a1cc02538708709687a202a8d0ed9cba6ab6fa45ce80153b118bda265944235040027d7b15f36c281d130e2e6a59a66d9ecec046240b8
-EBUILD numpy-1.14.5.ebuild 4064 BLAKE2B dc8888375a4176f5541490dc3c483d485b39305486cc2471da9359488080b52344dec51fc91ed27bc1fb6426873428883e6d3848585ee3b8ca181b24ccac05e3 SHA512 ea9c1014d72ae5ec5bbf3876eba5ad760a42215fdf0c48b06e18f1013d30edf10efde3ef8fe21ba681b652be469f6518737e784986298dffd529037196600168
-EBUILD numpy-1.15.4.ebuild 3869 BLAKE2B a981651423bbbb775f934a98f45d0d2a73262c6a5e5c5771cec7e7b58bd8bb2f272d608fe95f5d1f3668247b83db755fa10b5110515389d1a3a9112e722ec39e SHA512 a7091bed3e2fe526dbc42ef02340567835fe94c9b8325f123c82de2172364f7ea96931f602ebc72bde01dcb3e5af9f8c9a3fc3cd1b868da8efa38d4a6d6d040e
+EBUILD numpy-1.14.5.ebuild 4028 BLAKE2B 57e3d665220af532f6f21fb2f4cd2137081fed08b1d2091221226f1a3cf496d395e6061204eb7394d4f4bc11ace8bfe9c218e7ad81267beedbd43b5083de1c36 SHA512 81452d1ac52199a35e7628f571221e75cde09ec41a0e99a8b0f6f361313e818ed97c7825484026b98285d48e3b16fe0705d242a58120305c4b31910f56816780
+EBUILD numpy-1.15.4.ebuild 3833 BLAKE2B f0950440fb2a62bd44769e890fcf04c40de5c8570cb804e4cf7a210a5384dea770bcfb1767999a32c12955b97b8e7ed9766d4ba496c1da05ab6733f81f4f9947 SHA512 9dbf1d7b1062b2b02aced0b528eecb72122d6a1153a806b41d1a7e1a91d1461643f17746da810cd865d8e972fc5c7e1e666700d3048bc62f16ebbb7a433d0d85
+EBUILD numpy-1.16.1.ebuild 3853 BLAKE2B 3db18c0f22461366b91c4539813024f8f4cd5a5b734ed8d73cfb0564ce73cc3af37710a824f1f59b19935cd39a4f36c758401ae739545c9fa74a034a656a4882 SHA512 9c7a452cb82a70cb919c2f3115afcc70c106c6339bfa10ae7fd124db0de6c5cab6d2f01bf2961d6d57895dfea703e7ff6e0f0bb73314a3a93eaca0ff18fd3daf
 EBUILD numpy-1.8.2.ebuild 3945 BLAKE2B dd27488a9771219b8df7c8546067ec710168d39a7675c963846197aac6959907d402269efdee44d9e2a42edcfe6a3f27e9e360604df77d620f8f39f96427201e SHA512 3086b989bd9ac6f8b07839afaabcd8f683888ac5f0b2e1fdeb951ac49c79af4585be7984775af8d3a03b89957792ffeb065b54c624d00050bb389aac67f0fed6
 EBUILD numpy-1.9.2.ebuild 3958 BLAKE2B e05e749e5f0c4b3f0346cf0dc78531421ab081bcea12ecef30219d0504a77c0f99ccacfaf355bbf008c2af07434d7989e4b2c4417e91ad48e70407535a23a1be SHA512 04f442c6a363caad3313418f681e264a7e680c19d235aa132b27f2d0caac8495bcda7c75ea9904ad0096e844beda1ccb15dd2f4562e632a1576918279569cfe4
-EBUILD numpy-9999.ebuild 3340 BLAKE2B b0a52f63d54bc0cfb926dc42a64d08fe36112a7080f84a37dbb08d8723bfb84c9cf6d676fe9d440a0f22fe1fef25ef43cfe5dedca8d214a6fb81425485cba06a SHA512 4175996a62f791e1893d5e56b469c4db365f613b051a0bb08be679cb26515a96364e0a4922631db4417eda7137d218e169563aa23f5d575983f6a9e08a5d032a
+EBUILD numpy-9999.ebuild 3304 BLAKE2B 7116eb42938465987800caba2d457576bc9ec83bdd4e1766a16e3b6b22cc31a5fc929ba220678892d09fc9b03ed27c77ab22fe4b0017a707a122367bbfb5c5c5 SHA512 a16f321fff5b0765d0393d9cab65853ad2b4f8d988de5bcae73241abf640e15469ad4eaa92a58bf1c17ac76135aa28676440a5a14fa001486fb3e3b70fec536d
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.14.5.ebuild b/dev-python/numpy/numpy-1.14.5.ebuild
index dc3d6dfd540a..630b5d21ec69 100644
--- a/dev-python/numpy/numpy-1.14.5.ebuild
+++ b/dev-python/numpy/numpy-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -114,8 +114,6 @@ python_prepare_all() {
 }
 
 python_compile() {
-	export MAKEOPTS=-j1 # bug #660754
-
 	local python_makeopts_jobs=""
 	python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
 	distutils-r1_python_compile \
diff --git a/dev-python/numpy/numpy-1.15.4.ebuild b/dev-python/numpy/numpy-1.15.4.ebuild
index f25c715339bd..321b3a2e6722 100644
--- a/dev-python/numpy/numpy-1.15.4.ebuild
+++ b/dev-python/numpy/numpy-1.15.4.ebuild
@@ -109,8 +109,6 @@ python_prepare_all() {
 }
 
 python_compile() {
-	export MAKEOPTS=-j1 # bug #660754
-
 	local python_makeopts_jobs=""
 	python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
 	distutils-r1_python_compile \
diff --git a/dev-python/numpy/numpy-1.16.1.ebuild b/dev-python/numpy/numpy-1.16.1.ebuild
new file mode 100644
index 000000000000..bf2f0cc9d3b7
--- /dev/null
+++ b/dev-python/numpy/numpy-1.16.1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
+
+DOC_PV="${PV}"
+DOC_P="${PN}-${DOC_PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="https://www.numpy.org"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
+	doc? (
+		https://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
+		https://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
+		https://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
+	)"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="lapack? (
+		virtual/cblas
+		virtual/lapack
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/pkgconfig )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.15.4-no-hardcode-blas.patch
+)
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = $(pc_incdir cblas)
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local python_makeopts_jobs=""
+	python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
+	distutils-r1_python_compile \
+		${python_makeopts_jobs} \
+		${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing --single-version-externally-managed --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+
+	${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+	local DOCS=( THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numpy/numpy-9999.ebuild b/dev-python/numpy/numpy-9999.ebuild
index b2a2c5ad27e4..baa28ab58893 100644
--- a/dev-python/numpy/numpy-9999.ebuild
+++ b/dev-python/numpy/numpy-9999.ebuild
@@ -104,8 +104,6 @@ python_prepare_all() {
 }
 
 python_compile() {
-	export MAKEOPTS=-j1 # bug #660754
-
 	distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG}
 }
 
diff --git a/dev-python/pathlib/Manifest b/dev-python/pathlib/Manifest
index b761227734d4..22aa72e4cab5 100644
--- a/dev-python/pathlib/Manifest
+++ b/dev-python/pathlib/Manifest
@@ -1,3 +1,3 @@
 DIST pathlib-1.0.1.tar.gz 49298 BLAKE2B 918b363ebd4101fce50927dd83200cf94b44d820e9f422489be8b06cb5dfe732aa9373b936606a07efbfe0c624b685d1c9efe8851ba74aa60df9f45c08cd33be SHA512 d85e45dfcc85ce75a7e7b609163dc8c75c688f279c1833510185f280af5501e473376dc09bddc6a804d1fcc3177a939db85af37b7b8d5b183b9bc2b85b3b0f8b
-EBUILD pathlib-1.0.1-r1.ebuild 512 BLAKE2B a7843ab6489be271988fe1e4eaa96bbb5c1fdc44c060625e8c9b9994c0bc26e88edf35692115a7d5c9e7906fc71aca6fb89de080f9c87461fc857434446a2d6a SHA512 f9a6b1b61bede61363666b07d673e18ab530e2a8e332eed857676b0afcf833a0840ef16c8a19f9a6dd8fed1c741684fdd4cb99af2b9d834f342dc47998f43163
+EBUILD pathlib-1.0.1-r1.ebuild 515 BLAKE2B 89480cbaf34d9f7822198841f974c0c58de2676c05402f7e1d7fe3c6d9be3f639a1f111fdddce804f176d436fd6c50d67f3314271c726acf446085737c8ba4b5 SHA512 e19e4327966ab93e448a5b108ee3c3145dd05d3eea776bd66f6255d38cd62090652c4f8209d87279a20f352ab466c18252dcf2f3f8f6b8d2784ac8e8dbfd0f5d
 MISC metadata.xml 310 BLAKE2B dfac529133f0a3fe4c0fc865d7f7cc9d70a7b37dd2d8fcd4f1c87a44ec6f9ade254454e01cfd4dbd57a04f9643f079bdbc358d84cfcb0c09cb416d3ecad2db99 SHA512 462b029410c6c013f274599ee749a79541f9a40a1819b168963421d0b8bfbeedae5590a460c7295f0e9a249fa9298e7526b0cace165a29f82383d8943bd9842f
diff --git a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
index 53b77d2f7343..76c5d4e59714 100644
--- a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
+++ b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/p/pathlib/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ia64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ia64 ~mips ~ppc ppc64 x86"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/pathlib2/Manifest b/dev-python/pathlib2/Manifest
index 9acc10b2dbc9..50033f15146f 100644
--- a/dev-python/pathlib2/Manifest
+++ b/dev-python/pathlib2/Manifest
@@ -1,5 +1,5 @@
 DIST pathlib2-2.3.0.tar.gz 34291 BLAKE2B ef1768f8a9cc9b28f85ef84c0dfdbfce0b0087c1ffb6718e2b13eb007ea3e0ab0eebe946a1bcc2683fed7db46867f415ad2b52abedcdc87fb67bd45d5998aea5 SHA512 715fbd981d42767862dcaf2cc0fee31b9ec5050915ef7d909d14587609a7a5939e32b39736b586a890e7625443bb163832896fcf138b5c2863c451b71c36a124
 DIST pathlib2-2.3.2.tar.gz 33764 BLAKE2B c652069d60f489e482c6d75c0a201c5ac67c6b18b4acd6c8b00f7f12832f7165a45293d93ca7f6c45f1451c842e59931b6b8c45608de1bac91ad822cc3536105 SHA512 46ba0cc8b26006bc4cb914118b7c453dc49cc8a80147ea7a4b3d5a17e97d5538c5d73a3029bd7e5b59f42f256baba30ea273382e57468df1a459ac6f7c237ddc
 EBUILD pathlib2-2.3.0.ebuild 1060 BLAKE2B 936400ce062dae53fed477ce5f201b60e2bc255bed945a8e3bdb9f56d8a91a4e7fc7a53ba8a391ec9e294bdfd3f22732a05e8fdcb937e693ceffcafd53b264e4 SHA512 7d39226f0942a6e513d7053ce397b4e67e73f82621e356a83ca0234906bd93ca82e058ba4d72acdb8abb1b12db29a97ccecf47eda96e8d942ec9e9cd1dfc2fe2
-EBUILD pathlib2-2.3.2.ebuild 943 BLAKE2B ab65460240784cdc7c2a061eb408b95fe1663929ca1dda8e0609d4e4ea44a78b20029df01866525f4da075e355a2ff55fb6f6e90016ca0f971fec0fc7143a9d9 SHA512 028df92db0ed3e05d350a0330f15573f3ba1d95dcb9009f43cf6fa23713f17f5b7a119de85ce8914538f2356b9fa854d1d4770a3e7a45171cb4fc2f8d2e0ddc9
+EBUILD pathlib2-2.3.2.ebuild 938 BLAKE2B 595a0a3441acca12ad805d2246d17867f1233e8f53de259f1e37402475e49242f69486ebff2a679728df4bad4a0d0c6331623efb4053247b49f902e78baf2044 SHA512 8fb004b1e4f7c8d799ad8feaede11acb7876429eaee7c4cc479c418e13b5c70dc5bdfdfe7b8c5d5ff7d3d1f7b2b456c61c62d3ac761514ade9518cfc82c5a415
 MISC metadata.xml 439 BLAKE2B a6ff80028323e5e3a48832388ab9d88a6633815784b079543d2fae49a43a5c6aa25ac15453f4d564e570558fb62ce387cd5b3450d552c009e153002e5b43398b SHA512 e1912b7e9c099ac259aed03a38b7bdf27bc817e188901d79b89500bf1d2ddca1881ff55f06310758f6cf6d0fe581cf5ac28f14f64972060fa1d620699cfcbaca
diff --git a/dev-python/pathlib2/pathlib2-2.3.2.ebuild b/dev-python/pathlib2/pathlib2-2.3.2.ebuild
index 40e2f89825a9..874664f69537 100644
--- a/dev-python/pathlib2/pathlib2-2.3.2.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.2.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 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest
index c4a8d7e8a4ec..82dd2727d53d 100644
--- a/dev-python/pep8/Manifest
+++ b/dev-python/pep8/Manifest
@@ -2,8 +2,8 @@ DIST pep8-1.5.6.tar.gz 66944 BLAKE2B 5875895eb21c771d21cb1c415dc9f85737ae18ab10c
 DIST pep8-1.5.7.tar.gz 67302 BLAKE2B 714ecb7f21c457aca1a2465319c3f202d13b5cfe067418eb2e3e6f21b25dffbab891a05f5b145264e484c180b67e1fc8c4ad1cf47f1413ebeaff2bb858f9858e SHA512 ae5cc6cc47d71e90059fec0c89f5e8e7b71b08d185c95b0c8cf0aa9acaee4841d0cfc617fb1ca6d7af7f4721480a1992b6178dc845d80dfe87fe3792d515a3eb
 DIST pep8-1.7.0.tar.gz 79704 BLAKE2B f2e3585bdb3732f9be7f77b1cbf065c0938c1847a5caeb493e3cd62e6a5e19713779a087ffdc9c627481fb10e13d3ed53b3bc368182c2442f24ad57d1d2e96d3 SHA512 0077dac97846fe3a5fc654cd3ce8578845cf3b93ee097a3ae6ff2db4ae0797ad5766c69f036d6a5add786eb929a9beb6d657ab693227b8df2ba46ec0f9284b0a
 DIST pep8-1.7.1.tar.gz 80334 BLAKE2B 71a038c8fbcbd7c94ff713d1eb8fa248106d283fb520f97fe35819b14382eff6e55683b739acd933cfe22001ed262f76a9b6f3f55661938b3b199ec1f4c35745 SHA512 d20d6a6f91bc865580e3d39c50e26f9c6be81fd8e80a1b9a029d7ea9c906748e46080b841dc5507004089e5ee0d0cb3f70a74bb35131c58113ff5571153af4da
-EBUILD pep8-1.5.6.ebuild 908 BLAKE2B eeda92db0bd488f491c9fbe448b65c9ca190dcdfec5c047180cce204bb60f61c4d810dc10fdb4bdb87a13fb204cd049abd7bf122172d77b89b83f2fc9eb5cd67 SHA512 58cd06ce19da3eb1d4aabaf3d464dd50f0f1ad5fabb49ec004d43b66e10f9ea58b7f164e334e0dac6375f73be23474445e23b13f392f9e84c8ea0ffe7e71acd9
-EBUILD pep8-1.5.7.ebuild 918 BLAKE2B 6f5d7b424309bcfae81d4bd38b66ea6a15a98ff83c6d5d48354b90333b535f90c17b38e9735868b72b788a1859b3de859162119920b41e34679ef0125b54222d SHA512 35dedd1331978c86db6ad816b0d2bbfc8aecebab42153bd4c222c9cafdef1ead08e30560003fa9ef70709f3f38294e70c891008bef9b202d80c392d9784ac383
-EBUILD pep8-1.7.0.ebuild 1090 BLAKE2B 48f938a05763e10eeb6755aaceb9ed33a053cfc607e1a3cd5869dcf391870d6ea76b08565c17b54e56494a22953361a3b8e21cef8b745b9adbab5b74013fed9b SHA512 c888ee2fedae429c57c2067edec087df94ea8a25f8fc4f1bfe981687a3bb551168d516a208e9238e2e7f10c10992ddab6976ef51700088ebff4d729a0b232fe0
-EBUILD pep8-1.7.1.ebuild 1093 BLAKE2B dd6e60aec036f9e607cd9109b99e53138ce28bca025b39f0ee915d1779282700b4a725908c8d86b03301bbfacee706f6d45b202635cb1dd9f3bc875e36675350 SHA512 be2b3919b83f337b995aa15c728e704a7e2d572ca8158dc3f6bad01cf9e588c9bb2f31b0a07ccf3e1408b5b8a4921662644e89b46cccc8a52a22609e9c779304
+EBUILD pep8-1.5.6.ebuild 911 BLAKE2B b5d3b0deb03dfdea2ebb7719101c0ea94376d21ead1ba4d85ad316bba68bd88ecca1c7268ea7b4b6658616471d6f554806da5132fe43c6031f99c0b6b2e12c4e SHA512 8835ff5174039423a5a9686235ef5675314eb001afd17accd1a87bdd8842d4de5a7136820654fa62d4b57ca0dd98d9d8f163d2f86f7415b84ac0ef06c094ac6b
+EBUILD pep8-1.5.7.ebuild 921 BLAKE2B 56723fa33931fc9936754d6f7675a656ae42e3d763664a829ed45311ee2971536dd3040162d444c1a616a31995b43f691c78e57a0f9c2fe7670e39edbe107e70 SHA512 29e7ac9f1b9468c99f591221710b798bd10405570b83b83b85e17294a29e5961f405f143e05839a134236b99c8c65626e4b1f43eef5f5dead597998e8988e5a2
+EBUILD pep8-1.7.0.ebuild 1096 BLAKE2B 1fa817a381117c4900615a1e805cc018d9fc336bc81e8182dc0886060cb544888406015f7382cf711a3212cd03c89ec27cf3771afc1185fa6f2fdb7276608673 SHA512 cdb41c5f4d774db5b2d7991691d258a6b59e898f623b95a90c63d74c1a5349f9b0ba697736a9eb4ef8ce62a587027f6b19ca11974508b40e9bb7cea6534db85c
+EBUILD pep8-1.7.1.ebuild 1099 BLAKE2B f6a98c3e2eda4a2f87b15dd1d6cd0d023c13a4d6e979eba721a78a15a0e2ec921bb4fd4b89d05fc4775e7d46dbd22255fe190d9b6e72afa09695d81214c703b8 SHA512 37b4e55373155428ab093410a987ff53c1dbdb12ee9b4a8a61a32d8319ccf1e49755e4ae58c21664bddb0b245a5debe55d01a66f4f679630167eb57023a9456f
 MISC metadata.xml 373 BLAKE2B c13332bbd6ab86ea6a6c9d6cd0dadde195528493cc7984e31416b833906e692cbadd18f4185b6cdfce0e2847750ce05a12f70d29d4fa98d3932654b73aeaa9ca SHA512 0c3ea303192c4b56bd910168dbac81284231291053b5fbca4a5a0700cb40ae8646f1b201fddc76dfeab52979c4c5944a67a2b0c62cfdf5c020c23e09e034056c
diff --git a/dev-python/pep8/pep8-1.5.6.ebuild b/dev-python/pep8/pep8-1.5.6.ebuild
index 82b0b924852a..426c944e44c7 100644
--- a/dev-python/pep8/pep8-1.5.6.ebuild
+++ b/dev-python/pep8/pep8-1.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -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 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pep8/pep8-1.5.7.ebuild b/dev-python/pep8/pep8-1.5.7.ebuild
index 5eec74d76bb5..105d51cbb5c7 100644
--- a/dev-python/pep8/pep8-1.5.7.ebuild
+++ b/dev-python/pep8/pep8-1.5.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -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-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pep8/pep8-1.7.0.ebuild b/dev-python/pep8/pep8-1.7.0.ebuild
index b8c12b905541..9bf32c58ef02 100644
--- a/dev-python/pep8/pep8-1.7.0.ebuild
+++ b/dev-python/pep8/pep8-1.7.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 ~ppc ~ppc64 x86 ~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 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pep8/pep8-1.7.1.ebuild b/dev-python/pep8/pep8-1.7.1.ebuild
index 6466dc21e306..b1520218e83d 100644
--- a/dev-python/pep8/pep8-1.7.1.ebuild
+++ b/dev-python/pep8/pep8-1.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~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 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index 2980e8aa5bf1..550c42ac2451 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -2,9 +2,9 @@ AUX pluggy-0.7.1-disable-broken-tests.patch 506 BLAKE2B 9f01f31d9b78254c662e15e2
 DIST pluggy-0.5.2.tar.gz 18935 BLAKE2B 8e5bbab9ed0c78a0c6da076ad03618e66780f9ff209f4d08223e7a381eb4d7573727793f4543799e0e557991d4edcdbfd22c0565b69814379806912a4631abf3 SHA512 850b1a7b9e55d46d5deb16b8bc71e3f9d6c26b78fe34379b295a9780f3da8abb3c44f524f175d0392b61fc2d36d66d156db3f499a3c1666e2ff3e3c6344153cb
 DIST pluggy-0.6.0.tar.gz 19678 BLAKE2B 79db59c5f0ce0dd157630d039ec50643f615789b6b993d84e9ab1bdc9ce04b32df336d88df13f13a16a1f0bd4acb7b900208e98c84f007bdc3654f9a1d5f19a2 SHA512 dd58dabe2e65eee64d62c8748c2bbd99457288e99b819eb12312f2acdb0740ac46fd08f83522bc992297b9f14eec14c216c2c9688580f68393bf6fc609e65812
 DIST pluggy-0.7.1.tar.gz 47784 BLAKE2B 49eb28779717ead8963e14101cdfb830feeecff756a59f080e79e70465d48dbbc6e6100305e8b32031cefb0ba06bb10494f29bc8ddd38d4296016ecebaafccc1 SHA512 e19f6c1b3f2e711df1c8b075a2b802751afd218f1b692f08b2434c01d71c402331ff8c937550fbdfece2098f6d6856422d485f193e188916b365ded2e4087697
-DIST pluggy-0.8.1.tar.gz 53375 BLAKE2B ca9b3e3930a193de9adc5ac4f755ce2a17e3b166d1ce71502ac744c6c175901f75e910fa51a888b5ae1b16a63b5afe77b77fdd6b5b2a584a08f985d6d34881a6 SHA512 ee7a83f7c62e4366bc7c3c2ad822c788e5cae7ac900c3d41d84ef8b8d9c4cab7c4327df86c134c19f2faaa86a049913984550dd06db9b465ad58a83566cda150
+DIST pluggy-0.9.0.tar.gz 54035 BLAKE2B 8977072d264d50b2d47df88066aa8b0eeb79c02ccb8706c7bc1eaf91f0ed29f1534582fdaed8b446b92239ee6f87f676574df3a9d5dd0fc4eebe2ce2f2f83b5c SHA512 377d201393b11afbbe7dcce6053a4200782e4d2017252a4dee3859a5cf3eb21534ebd6ac7c9fd518b5eff441009b1b5791c8fc86e59385b7eddfc9dbc103eb33
 EBUILD pluggy-0.5.2.ebuild 745 BLAKE2B aa43219d6e90d1705dbdcbd11b7ee7a2a1c186ed08d4832b9f9fc041e74c5bcae34d30c83584e77c020aa50db404788eb1f36c091f24573ecc45eb47ddcff162 SHA512 bd9af6d41e67f3c15204c41b4ec9bdad66a820bd463dfb28cfd6a96d47530f8bd942e31f707b56781e2da61643a9067b3463ef347ed78a1a35f3daa6cd8af651
 EBUILD pluggy-0.6.0.ebuild 764 BLAKE2B 065f0c1910c845e4de6bcf9460002a7472d0c9d5942ed24401f4f598663226a6a9eacabcd9fdec926a1d3ce467885628779acd78bad6c8367db75f7d690125f0 SHA512 c24f563a5ccee000a379c767f4e58e670c2d41ab6c0585eebebfd80cce9f93a2e51fcc2a4e17ddf0c63b3e74d392202996b0516b1c501a653d8afdbfc77a44fb
-EBUILD pluggy-0.7.1.ebuild 918 BLAKE2B 6948358051fdc7704f0a4e0939c26f6f2c4c2d94d668d68acdafb9a9cbf32764993219e290118a5af3401505b1b9ffb4834291bc635892ed445fae6792c66c14 SHA512 5f890c7d72ca2ab0f517ede75417530d1841a8f5fd8a17bd6b38e4d5c2c971d4b76ca55f8eefe5e250dfcefc64aecea881ceeb6ffa2093bb7d4ef874ff8b7f19
-EBUILD pluggy-0.8.1.ebuild 919 BLAKE2B dd33f30ef3791d197959efb168e954b9be0cae27f146eab4a3dc27152e993cf44e90d7221b0e867ca808feea6fe9eaefe5edd0ff93cdb9ec4050783789768a2b SHA512 2d83873488385e497008ba3cd35be5416aa21ac1aa517f9aadffc43348075e39d29791590cf0805c92aff96db45e30bbbb05b7a69aae351ff615223f7b21aedb
+EBUILD pluggy-0.7.1.ebuild 913 BLAKE2B 9458bbe4077fcf97f85730304d3d8335e4bd268b41bc3d080f35e52238647cf7abe0ec5f07bb31d497a394e730f8965eb1b07d52e2b40534ae9e51b74f1a9265 SHA512 c558b4efbd412658e6241be49f9569202416c2dd0dd90b571e9e5a15b581aa6a4b91bb454d3544eb77534139761fba035d83929261c1a82b4ad69c70b0b15669
+EBUILD pluggy-0.9.0.ebuild 852 BLAKE2B 9cf3a9e32b91fd073be9bb288e144535892c8a9f68c82971ba838f0e67f097dadf99cc56b7521aee38ed35c5f3f0b237123b684207417e88aac44243b5627422 SHA512 99abddbee29b906162070bfd70626923ce7d21caec812ef651433f6181ef82b543baf047ffc7e3c19f868ff824fa99dfa73d6a17b6a4ef2fcbdbfd8d6854fcec
 MISC metadata.xml 444 BLAKE2B 9b0b62a0670449bdfade395d9766e192088182f724deebd2a2ace8800ac5c0ff6f37da7174186434f727aa3bee08b9416e6dafae443cd01e01baaae741c899cb SHA512 2ecb5fb612627c44f3499080fcde9241daf2f25a974a8e24fe8190b7d5f8baa6a457b7a902e788f98fe9ed1fdb2cd0f46770337e8f836e430b0aa6f0d323ad50
diff --git a/dev-python/pluggy/pluggy-0.7.1.ebuild b/dev-python/pluggy/pluggy-0.7.1.ebuild
index 11db915546af..98355b86a047 100644
--- a/dev-python/pluggy/pluggy-0.7.1.ebuild
+++ b/dev-python/pluggy/pluggy-0.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/pluggy/pluggy-0.8.1.ebuild b/dev-python/pluggy/pluggy-0.9.0.ebuild
index dd9526ce4e72..19cee3c8354f 100644
--- a/dev-python/pluggy/pluggy-0.8.1.ebuild
+++ b/dev-python/pluggy/pluggy-0.9.0.ebuild
@@ -23,10 +23,6 @@ DEPEND="${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-0.7.1-disable-broken-tests.patch"
-)
-
 python_test() {
 	PYTHONPATH="${BUILD_DIR}/lib" pytest -v || die "tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index b92f5a152c64..25af0d70e392 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,7 +1,7 @@
 DIST pocketlint-0.17.tar.gz 22612 BLAKE2B 3245f80c486a4d16389262d5795be32b784af1b99dadc26009d0cff250e8dab9f6ac4ce9ac7e37466bcb01fb3b697740e14a0d391bcc3abcc4186d72d7243c84 SHA512 7d564aca89fd479d2dc773db2723567cfff42cceacdc5a55a87c65d6b80691e6254750c52043e3bebf55488335795b541d5a838eb592747db628af567e24dc43
 DIST pocketlint-0.18.tar.gz 22848 BLAKE2B a5a9abc3543026b1cffa66dcf6204342c5d1ee20219423174daf725688a381a5d58a403b963e95bd6eede629824ccb72bd93161def56778fcaca9ea115e2b6a5 SHA512 02453af8465598053b9591a95d9e62d2cb8e2a218e04ec6903ed166959b7e1eebb5d226b9eeed77c7b94a254808124ec9d2078e102a0bbe9487e0f328a2d3e86
 DIST pocketlint-0.19.tar.gz 23118 BLAKE2B 2e622ba1de20d2043d55261b79b8f78b2c5bbebb2d739da2766b56fc379a6433c56f7184d832356fefbb231fb271782d4a884739b55ab52ffd64ef3efc5c2ea4 SHA512 409ebe916b1c83e128ebb1cd12b7f1d695a999d8ada1555cf6710acbfbde241535f2a929d06ebddfffed66ea7db9f20ca6606e9dd9f1505914ae3c6480cdfb52
-EBUILD pocketlint-0.17.ebuild 481 BLAKE2B 68269f6ab5338db0d4ebd5134b65d5dd2387936cda8860afa09a7ecc9f4c792112fd231779f750aa75f30400217bfae14ca0be68b097d49779838c5120475c32 SHA512 51d8e634438f3908b7a5658643ea2916a52c64d611e180e2a9de50e545c6c5af7bad890960025fe494263f94b39d7a739924529d52fcc5ec0fe6a19b5a34c82a
+EBUILD pocketlint-0.17.ebuild 480 BLAKE2B b2381a085f49efdb3672f330a0db203034dbf4aa60ec9beb0869ca02168c9e2e64692a965bb329661bbbf174449ed5b21c574085d3d17c4a5493a52677439c42 SHA512 f171d93323a9a5e33902967c51ca305f09a0f41bd601bd4039c2d26769af25db9c1041ea80b3f2e6b85b65758afb5c42faea0acfab676b73188ebc96f6adcf3d
 EBUILD pocketlint-0.18.ebuild 489 BLAKE2B a67e8b0a84e9b00694516d2e1258053936faa0a68e67a380e8abae68a3cd028abc31c512063952df43b9c328b70bcc718e98700b52042e3d2597831005084093 SHA512 b006f2bb67cac803b24c12814c49e675e462953200361cbfd8ca522ace6908d18d3808eec8fab5a3627854496cb1ee8d4378d675b7390c2c131e8d451390f08a
 EBUILD pocketlint-0.19.ebuild 489 BLAKE2B a67e8b0a84e9b00694516d2e1258053936faa0a68e67a380e8abae68a3cd028abc31c512063952df43b9c328b70bcc718e98700b52042e3d2597831005084093 SHA512 b006f2bb67cac803b24c12814c49e675e462953200361cbfd8ca522ace6908d18d3808eec8fab5a3627854496cb1ee8d4378d675b7390c2c131e8d451390f08a
 MISC metadata.xml 348 BLAKE2B 832ec69373391ee6c884d446b58ccfb07de61b7519b34be09e3e592ea061c0cf0a10203a5c69bd05e2400366891fc9c74a7b1d74f4a7f268839aeaeb5781602b SHA512 925fd532aab036f7bb18011abfdf98daae08e648aa8b64853d721396dedc431254f54ae2168e5572e2e1f101c6e5ffde2b08a26e423407d84e0e849bd7d4d38e
diff --git a/dev-python/pocketlint/pocketlint-0.17.ebuild b/dev-python/pocketlint/pocketlint-0.17.ebuild
index 4dffc31ee5f9..42c6966c528f 100644
--- a/dev-python/pocketlint/pocketlint-0.17.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.17.ebuild
@@ -13,5 +13,5 @@ SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index 2999839e3d56..0fe2eb0f98f1 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,5 +1,5 @@
-DIST prometheus_client-0.4.2.tar.gz 57664 BLAKE2B e98e5c91db13a9f06c2df532e7742545a14cb223e04eba27accc3bdcaf2df949eed2a778194b38e1b4b93908de1636a3cc92a18950db54b5b8f0aceda2d4d2cf SHA512 5e0fee9f9fb4376dcf2959e8285b57a9156d3cf8b9d9118c7b95d2ff63f4dd925bc8cea817bf2fc1ba660e6f5c6dd8f4cf494125cf2a3673443abe0f3a4657c4
 DIST prometheus_client-0.5.0.tar.gz 60184 BLAKE2B cc44537b051c053860520d412664d57aaa6d35dd491409de0da72b9859743cc355d67eb260c2381347ad3313df9efa498535ff130df317b103d8c815f34f28eb SHA512 6e6e6c0f859b7b9d593e1059b71fde8eed15ccd95e54c245b4e0e8edb748a4761f0929f2d6c06f1c4656eb81f26959c5cec6a58f4d725a587b433ffbb4582127
-EBUILD prometheus_client-0.4.2.ebuild 728 BLAKE2B 649159476744cb1d435a816301fd430ae7cb5d4264b5ca19510f9b1c91c260fed55fe53dba4e77b529ceedad6450cb94ef878ffecd474759f3ecb8d3eb2c6e9f SHA512 6364a9e014f377d895cbbbf32abf01eead9657f93ca128bb457d55d4cc3f853924891ba27f48c31fbe328254cb6ba678b3ae28b5ed573cad439d3dba74e2c20a
-EBUILD prometheus_client-0.5.0.ebuild 729 BLAKE2B 41ee638b5d85c164acc5f9d76a4430a286acfa3cb5848ea2e96045e415086790a77ecc61c6eaaf572bf339b1a024ab1da0990f7d7b86db311da7a3e4c1c90e37 SHA512 43d6b6845993d02bc7fc8767e2e10f39c77a5c6c4acb20e0e3f34daf4e7ec7845935531c66bee8a03c7408b85c42ab498e7179b8307ea5b200c207bd59a8bb5d
+DIST prometheus_client-0.6.0.tar.gz 60790 BLAKE2B fa8eaddfedb9598394fec0c6464499ed5bcace9969e843126422414e397d31985a44a626be0257a235f6d5f685fd8d6bb55fc0d92928f0b9729ab9f097f1958b SHA512 a2b92683f939961c567c266a54699de6f37088cd4e61c9d9a5f4451228b4c3bfa4c517e4a5187867f5463d726a8dc6e7fdae30973c1e9aa9aa1a03247b2e99cd
+EBUILD prometheus_client-0.5.0.ebuild 728 BLAKE2B 649159476744cb1d435a816301fd430ae7cb5d4264b5ca19510f9b1c91c260fed55fe53dba4e77b529ceedad6450cb94ef878ffecd474759f3ecb8d3eb2c6e9f SHA512 6364a9e014f377d895cbbbf32abf01eead9657f93ca128bb457d55d4cc3f853924891ba27f48c31fbe328254cb6ba678b3ae28b5ed573cad439d3dba74e2c20a
+EBUILD prometheus_client-0.6.0.ebuild 729 BLAKE2B 41ee638b5d85c164acc5f9d76a4430a286acfa3cb5848ea2e96045e415086790a77ecc61c6eaaf572bf339b1a024ab1da0990f7d7b86db311da7a3e4c1c90e37 SHA512 43d6b6845993d02bc7fc8767e2e10f39c77a5c6c4acb20e0e3f34daf4e7ec7845935531c66bee8a03c7408b85c42ab498e7179b8307ea5b200c207bd59a8bb5d
 MISC metadata.xml 451 BLAKE2B 1596b7eb0ca176a5a00d44356c15f35268c3170f90bd13ffaceae39f56511c33f78724ab2cf3748efc1b3b10c71a1d1361ced3192c4c71a6dab5f616fea3051f SHA512 fec61f65143e869244b519455a7214884de5e72c75cf7e500e5aa156c41eb1e644ece46c402cb4722ec294e876078f9332654901b06f2a6f5ab8449f0181532f
diff --git a/dev-python/prometheus_client/prometheus_client-0.5.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.5.0.ebuild
index 9e70c4e5396d..852bd88e42af 100644
--- a/dev-python/prometheus_client/prometheus_client-0.5.0.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 
 S=${WORKDIR}/client_python-${PV}
diff --git a/dev-python/prometheus_client/prometheus_client-0.4.2.ebuild b/dev-python/prometheus_client/prometheus_client-0.6.0.ebuild
index 852bd88e42af..9e70c4e5396d 100644
--- a/dev-python/prometheus_client/prometheus_client-0.4.2.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="test"
 
 S=${WORKDIR}/client_python-${PV}
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 67b40ca9ae66..11209f95b684 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -12,6 +12,6 @@ EBUILD protobuf-python-3.5.2-r1.ebuild 1333 BLAKE2B 9c4dc72f815cd109bf397f4c5ac2
 EBUILD protobuf-python-3.6.0.1.ebuild 1345 BLAKE2B 33781333a986e3212e68b01b0858eaf1c814559ddcc32793ef525199cfc4166de4238b1f488a3db6a4c3766d2873f0fd38a1e4ea6e602d25c3b790e616059ad2 SHA512 ccc326eccb38f08ef9f7f314ce0ab62cc6e00019a1869e7f9bc65fcf68bea23ccbc9adfec838f2bbef5daead1811a607903272e367900dfd0cb99c4024e53281
 EBUILD protobuf-python-3.6.1.1.ebuild 1404 BLAKE2B eef41482d661ba0138c8f018d4f7842c2e3af4d6828eb5d2bdff239d1f4a6c0059ee0fc389ee7b31b0d111afbb9772e5f3e88a990545d480780018e4e7530d48 SHA512 4634e1f3d5245f074072060b49138317bba1921d6bd3605cd2cb28cecde99a4eb200da73a7d0045693551863b5265761ffeea825c5475028530fd9db95e02f79
 EBUILD protobuf-python-3.6.1.2.ebuild 1349 BLAKE2B 9b958bd64c4fe14ba9966fc05aac9febf4d10a24e0961df49309bbf9c92fb763a2a0d56ca57e965793f40c8058e7ac8697157e67563af0544666044bc31dce9d SHA512 d1bae7a3ea3b4571d06d4071e2179a2dc47ab32c9d2f24c6abbd029d4b83c5eb310f7b5c7da19b12c71beb9f63f667d0fb078634a9264b28e696e4e90c4ced56
-EBUILD protobuf-python-3.6.1.3.ebuild 1349 BLAKE2B 9b958bd64c4fe14ba9966fc05aac9febf4d10a24e0961df49309bbf9c92fb763a2a0d56ca57e965793f40c8058e7ac8697157e67563af0544666044bc31dce9d SHA512 d1bae7a3ea3b4571d06d4071e2179a2dc47ab32c9d2f24c6abbd029d4b83c5eb310f7b5c7da19b12c71beb9f63f667d0fb078634a9264b28e696e4e90c4ced56
+EBUILD protobuf-python-3.6.1.3.ebuild 1342 BLAKE2B 6873ba7a8413806b41cbad820f2afbc98b1367c9ab9270ac18184e645000409db0d17aab187e5b8823229140fc25d8ae7050b3d7434704a2750cf41292d6fbf7 SHA512 58597b5ef71b48b513cec7f661a7cdb0c43e01b073dbb6c7d883a817438e5a77f7e71aa4c8192f2e4308003293e759af396a328deb7c40233fd6931da49127af
 EBUILD protobuf-python-3.6.1.ebuild 1397 BLAKE2B b620084c9edb501efde568755fa561c14a50485c628228dbf8541e9302471c6acafa77e69f9c7e12e8bb3d00e3f93eb0ab8a23bad7dbae9546ae22676cdad5b9 SHA512 958f35f2291a205375f2b4070efa392b9c632b3cee158f3dbb677dfcffdca540052714a221fb17e0ba6201a2e78b1242278c69fe32b5cd38bd7a2dcd8c3cda97
 MISC metadata.xml 656 BLAKE2B e63db63e247b105b51b506a404d8edc821cc0ccc276a3f813df3b06951184218e736e57b577ad2f64880250c55ef09c50a9fe04428f7cec02fb04293c337175a SHA512 5d747585e025672d423690fa2d8df09380a1714c2e0adad5838a41f099e3984b70c7f80c5873ea296101898cd92dea70edee964bf01b9d86acb9a1d0140169fd
diff --git a/dev-python/protobuf-python/protobuf-python-3.6.1.3.ebuild b/dev-python/protobuf-python/protobuf-python-3.6.1.3.ebuild
index e6f11fbf5349..505c7345a6b4 100644
--- a/dev-python/protobuf-python/protobuf-python-3.6.1.3.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.6.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2018 Gentoo Authors
+# Copyright 2008-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> pr
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index 39f1fd438437..a1888919d497 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -9,5 +9,5 @@ EBUILD py-1.4.30.ebuild 1274 BLAKE2B d1caf17f0e92b002bc8626b9aef00a0b6e60c9172b6
 EBUILD py-1.4.34.ebuild 1342 BLAKE2B a10c42e96d96e05c966e438d4c34d1ee1958e4f1480762b4046a56da6838a11787b6600198967adadafd0a88d1d7cf5d07b8d42a38741320ac074b9c4a3dbafa SHA512 2ec30f5f6b4db6abedd335511154dde8f57a3530628bf515e18c0e9f12e0de91cd2efab6a6a25065c4694e649c6551d38df00e7fa1f4f510952533bc6c6ad4ac
 EBUILD py-1.5.2.ebuild 1347 BLAKE2B 1ae248e72c3a599004712f0dc6f91553d5fd22b9d0e62f79459a2dd0ca557fd1aef853c7c3c56f10cfe5761e6d9d99bff9a00d4983e125f34f96cb7394311dff SHA512 be0354d8358ed8f05725c475426c9c94772e089d293c88c541b8403c754a9b8942b189b5b51836711a8ef235fab79e38103bb61b422fb4d000ee5f41f9c18df7
 EBUILD py-1.5.3.ebuild 1356 BLAKE2B 3c8ec2d4c181f2a09e56e3bb2d31a95b79bf2ecfb7f173ea20627224b4409175ecaaace93e9d126083e83a1136e32cf74d9774682e012296dcc19b4884b71f42 SHA512 9ee8c305b5b36781d2ac28456cc7cc24949ace90901cac9b04b087c78a414db662b623a16c9893f70ce9553a91560d01a52b6fd11f9f0ac11fd29bf5dc4fae79
-EBUILD py-1.5.4.ebuild 1447 BLAKE2B f43cecf11260768017c425d0bf589a9358b1a7cbe8248affa307691e60829b58733eeca62b7b5a078856ea61e74c52c968652031ae1d6afdcc9c392456859590 SHA512 d94f53b9c52701d42d3c8ba73a9a621dce4af722c0022e1d48d8eed076dfcdd6b69bcdc2f318793c7c8ffa58939247ea1526677e2f3e0438ae9922ef9e36ab66
+EBUILD py-1.5.4.ebuild 1445 BLAKE2B a75f2bef4862670a1295691bcc3a27ef1758179cc9f536b50a1c0e6401c27b15204094cbc33d7a30a9b968a0ad7b0aa90c3a6531273cdc807fc9cef126a7badd SHA512 2e34c164aab84d066d9dc7503eb29a9f24b917b5b7d344c0031ee616be05749aae5a03a75f754c9aefd3852b8a71dc627f5bfd48e754be1f57181e212924a5b2
 MISC metadata.xml 315 BLAKE2B 3154c92be7826e4b562d5172b792f652ede8fff96b3fd3abebea5d6107eca432718bd0c8be7934a9f90a34891ce6e9b74d02c82881976cc86ed9635a0457b2da SHA512 e2ede56189d791c18b64d1db6615249e6ae5a3afd31f17b9ae6d23e9123d4c68a22bc61b7935deb284d2fa7e6732679e2286a271854dc818e7f651e9daa54fbe
diff --git a/dev-python/py/py-1.5.4.ebuild b/dev-python/py/py-1.5.4.ebuild
index 1f27267853b9..fbcafbd8de36 100644
--- a/dev-python/py/py-1.5.4.ebuild
+++ b/dev-python/py/py-1.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 s390 ~sh sparc x86 ~amd64-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="doc test"
 
 RDEPEND=""
diff --git a/dev-python/pyamg/Manifest b/dev-python/pyamg/Manifest
index 87a18c5803ae..3061bb172d57 100644
--- a/dev-python/pyamg/Manifest
+++ b/dev-python/pyamg/Manifest
@@ -2,8 +2,8 @@ DIST pyamg-2.1.0.tar.gz 752632 BLAKE2B 21fe8a2547d7d47c61c37d5968fd5d8a07d4e6721
 DIST pyamg-2.2.1.tar.gz 753299 BLAKE2B aeca4105bca1525a4c86f110c135c5505c6aa78aff04283a3b43de75c8b639ae5800b5ca9022436d40ca045700daef8a3ca6bb98edb12b223b7b10f8047cfb81 SHA512 b784626fbdfcfa338560763a38bc5ddde07ace5213225d4c876b09be93019e81e641630e88952aab20a6c4f859bf6260730459d247c35d531433df4ecd209248
 DIST pyamg-3.0.2.tar.gz 759301 BLAKE2B 35209f238540604e8a9c013df47f85a5f9dc86eb5372975e8b518352ffe0247f1ac65aaa0822ceff435d20bec87ac8b87d650c00b6b53056c6d5417fa99b0edb SHA512 3075e4e8f042e320c53fed5de7a5ccc7d9698e60cb2f830661468eabc9ba4ebbfff2b2d3254c72c5c376f0e45a59abce7b70a50f6f3a869a75096c33982d1313
 DIST pyamg-3.2.1.tar.gz 765723 BLAKE2B 72c59c0fe93363f73d8ba4c6297920dd1ca8406b048cf0357baec5f2390bdb524421a35ef65e790be45b543e9e162067ee8f8f09327b464a4bc5c9cec368b003 SHA512 6be0dd068417389934ce97813321367920abf6f9f5e94ce2df8bd796edc797cedd492c9153b62466f7d68055a05821447dcf21578ccdfe3294766a49a9ac220e
-EBUILD pyamg-2.1.0.ebuild 690 BLAKE2B 5526185481c446433cb154524854ea133da0efbd8fad4e4dcff37f66ebff7dd12b446b933128b04173f801a81addb8d969b8f33bb7d84d7907ba3c60937296ad SHA512 fa60126d07bc00bc69f9cb8b0e80abe64c794bf5a804169e19807dacbc2f9c2e762a1e79390ba53b949c80f9fc67ccb42aa1e0856d6ffdf06e3acca4a4c14eb0
-EBUILD pyamg-2.2.1.ebuild 721 BLAKE2B 85ab620ad9d1cfeae60037217b64c0bfdee32b35b65f0cd07b63f1abfc2f1fea68d1bc55e0c8a3e26e8b1ec5dd15ef870c150880ece5842b391bd324ad225d42 SHA512 2d67dd767c1c1cb76f53c48d7ce682a31428ddf11bdf666713c73567867c425542c9ba0dbd6a15ce3f8fa124bc196d87472a26264e1f4b7403345cb240807bdc
-EBUILD pyamg-3.0.2.ebuild 678 BLAKE2B cb0a461b981daa12894e9d247a69244865728ad199c85faee23f4e7162422d2cd7eb88c5bdeb4baf5b75cf6bb87738a0ac0a3966d9d1f04b0bf936824504640c SHA512 34f6f62b30f82c4a6b348a15965f75825c9d5ef26df96286efc89de1e00f6677a2fb744e2025c7dc8f2311406696fe5d1842554f7de5fd92a4bf7a9ccb6a13d6
-EBUILD pyamg-3.2.1.ebuild 682 BLAKE2B 264579548fdda200124b404719ac1a54e876b89db5f9e7630389bc7310e39ba5980245727c918685cb01c4063dbd80ba14e7a05ba78f1e1712b4f7491ccc46d7 SHA512 4fde71568f3775d557967e3b0d76e607733225c5a33832fe70eb277920aa90607bff14fc2ea20b1ca4a87d3d9f75dd21dd1c182ebc8d056e48470abbe7d98520
+EBUILD pyamg-2.1.0.ebuild 688 BLAKE2B f4fc07c33ad4ead47321333a6b8b1db6862b35c39d90102d28ac51d98ee36ad4bee8ba8a34aae2328284c73015847dcafccd38d8e40cf86a4f9f768b7ee5f7c3 SHA512 fa5d25e562af118578cc8ef1abe0c7fdb6c187cfbb6454e799c7159fb129d6c7435f31da1dd7570915b1b5a29c6733c48e672d901b490c81ff991568dd31c3c4
+EBUILD pyamg-2.2.1.ebuild 719 BLAKE2B ad62b9f85a55df7f7dfb89d3d02c7fff63925716da46d1d357803c35b7046df3bfa9e322c3775ad130f252fe1075410c3c649733e1159ef7ee810c5d6ea95b88 SHA512 c8fda892f1fbfb9cc78506773d1a1154be9873288e28e10cb07db94949d509d85a3526b7f7cf84361be92111d10338269ffd9da94f7836ee6e7c222391d147d6
+EBUILD pyamg-3.0.2.ebuild 676 BLAKE2B d8d1a6dfa79186edf6d51263ac58ac746f7528eb21052c478bac97050e1692285c3846cfae644d44a80805b16820953fe25870cda28ad4a40008dca06030f9a3 SHA512 2514d0a0a3f90a379cb8b4a77054f6461de48c80776d1ae650ae7265989ae4d9612d4570070f9e434781dcaff1febd87820d682a1d41baaa5bc528fb64578ea3
+EBUILD pyamg-3.2.1.ebuild 680 BLAKE2B cb51c6af0e1b6098eab3e36a51cd2a6b79ad165912719696c36a8cd34b84f9c214d121972fa4b385c0a5dc0731917c61b4862a278988d919cdccedf81beac691 SHA512 43222dc9014eaa9599c15bbe4b2d9e19db8a7a46e6044e999a0cab30e93ae0c7989af84990696e846e3d038bd0f3b10518276ff0336f5d7f33aaaa13e27ba6bb
 MISC metadata.xml 660 BLAKE2B 09f5ba733b9e679cd6435afe0e71a2382498ed2417563031c24dbb9d8630f1ea9ece9d10c2851afb411dec9694b773e495aac10e9cfe4398980f2d0c26efa370 SHA512 9900180bd0de0c9cb26205d2de5674f02405499778124c3fc21a3d3be6e7bd6602f4f619b0b983e95e30ff3f8f37e15ebfc66535db144f92e8f0c6d579e5e6f1
diff --git a/dev-python/pyamg/pyamg-2.1.0.ebuild b/dev-python/pyamg/pyamg-2.1.0.ebuild
index a7c66a91398c..e1b891e27372 100644
--- a/dev-python/pyamg/pyamg-2.1.0.ebuild
+++ b/dev-python/pyamg/pyamg-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Algebraic multigrid solvers in Python"
-HOMEPAGE="http://pyamg.github.io/"
+HOMEPAGE="https://pyamg.github.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pyamg/pyamg-2.2.1.ebuild b/dev-python/pyamg/pyamg-2.2.1.ebuild
index d2c1e5159ab2..92b765a346d5 100644
--- a/dev-python/pyamg/pyamg-2.2.1.ebuild
+++ b/dev-python/pyamg/pyamg-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Algebraic multigrid solvers in Python"
-HOMEPAGE="http://pyamg.github.io/ https://github.com/pyamg/pyamg"
+HOMEPAGE="https://pyamg.github.io/ https://github.com/pyamg/pyamg"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pyamg/pyamg-3.0.2.ebuild b/dev-python/pyamg/pyamg-3.0.2.ebuild
index c3d77fab2019..97b62fa66c15 100644
--- a/dev-python/pyamg/pyamg-3.0.2.ebuild
+++ b/dev-python/pyamg/pyamg-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Algebraic multigrid solvers in Python"
-HOMEPAGE="http://pyamg.org"
+HOMEPAGE="https://pyamg.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pyamg/pyamg-3.2.1.ebuild b/dev-python/pyamg/pyamg-3.2.1.ebuild
index 14b7f193c6af..6814e2d44df6 100644
--- a/dev-python/pyamg/pyamg-3.2.1.ebuild
+++ b/dev-python/pyamg/pyamg-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Algebraic multigrid solvers in Python"
-HOMEPAGE="http://pyamg.org"
+HOMEPAGE="https://pyamg.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pybloomfiltermmap/Manifest b/dev-python/pybloomfiltermmap/Manifest
index 617813346cae..7e81dff77804 100644
--- a/dev-python/pybloomfiltermmap/Manifest
+++ b/dev-python/pybloomfiltermmap/Manifest
@@ -1,7 +1,3 @@
-DIST pybloomfiltermmap-0.3.11.tar.gz 435754 BLAKE2B 37f22ccaedc099c966b924f6c07e8096ffe1e9b6da578260a84323ae37a64d392c16be37be64bd1b1183f9a328e221eb441ac847fe9fd108eb693902ece3154c SHA512 cce4218ee23382a8633ba9f846e11344a65bc3e04b1e2e6770c017ac3b078a87288e63020f9455eaa34b8920d71ccfdad169261d428a43b32a7ca76664fd3bd8
-DIST pybloomfiltermmap-0.3.14.tar.gz 446760 BLAKE2B 05a70819374af7e5cebfb9f05def0bae98bd675895764f5ff79d628ead33ad04a9bac560644b62af940f5796d2d768916831212152441bc0523638e9b62e34e3 SHA512 c2b7414464ffd7feb31b74ad576716554b79ebe59675cb61cd241c270628ce821d97ddef1be7fea9f0b5f2019a7fa009d21e9f14e7f7e514aa6446ca23702cb3
 DIST pybloomfiltermmap-0.3.15.tar.gz 448288 BLAKE2B ed140f43d80f438e82c6659dac1c7e234872b0b1c620db3fbfdacdfa9476bf36e8508549a5cbdab88aa76c5db26ca958c45494c699c2080e17b7cdc07cd2d051 SHA512 36ceff5860e97686387932945d6ee2f342e07dd45b4320b09e8153987c5aa7da678db86179759528c5a4c0d8fbc1e1a98b549c55e17a6d66f1c83c0f1ee46ed1
-EBUILD pybloomfiltermmap-0.3.11-r1.ebuild 395 BLAKE2B 18961cd14ec564d84fb6d086bb6472f58843d93d257864168da5ce75cda83b242a878dbb4ddd11c9db07037e19c463079f22e6d16f8ee3866dfc9e1fd83b5e4d SHA512 cd4f75708c592c04083d710af363ffec5cac3aac99816b99337184cb4d3ef671affa5a3a23372a401120dd54da661db37e49adef19a099ecba6c0b1f30de49c2
-EBUILD pybloomfiltermmap-0.3.14.ebuild 629 BLAKE2B eb510bf1080f83ef2e3880d604588bc1754e3d403f6b6b36c479afc207ca3643a8e6a3fa4d68fe75ccf8e5238048bc131410d45bf15f0f9e36507415e496884a SHA512 ccb49fceed31481a76dd6e67fcb7a7248ff792813f0cc695a00c649a9420616899e72c7d26d1aa8b98fc47ffffe31dacad968008c8d2c68a56d35b0372e0a985
-EBUILD pybloomfiltermmap-0.3.15.ebuild 625 BLAKE2B e3747350668d2939298d2e9878b715485309639bedf6785834173737294407698f4d06af9d2f1ee21b536ab9ff9827a9791ca3d6d384e46f00b76480ad1c087c SHA512 57329c25dc147ce21f5f42da1594f53b049f7c8d37db67f6cb6c26384c01ef1cf8f5dbe55934dc27f82bb1383694ac4a522a0420eb41ab3b0934e2f02e317a3e
+EBUILD pybloomfiltermmap-0.3.15.ebuild 624 BLAKE2B afed9dd680920d8d7f50379bb5560b22843d770b6a7a4e63b3cf844354d69cf2405c67b26508e9d23fe3609202c08f6bf845dafeb8f5a5f54289a3ee2d549f27 SHA512 96a95cc80be8a34796e57ae32c4ddade3b7716fb82edc1ec91cc24f55d95beb686b6c0992343f0fa8a188f5db255e7c6d164a66583b7352ff5a825a398d9337f
 MISC metadata.xml 248 BLAKE2B a94be11b599bc6cbb04189c01022a88c58b8edaaeff79568edabe3fea49173f82537d3d495982343cf0deac5b6551c480f4bafd0dc629057328e96285730bbd9 SHA512 e83bde93e79baa95018fa49df49461ea3c84313095099040492ed43c9eb5136fdd173564123ac69a8cd9bf6f591267a405a01ffb11eb46b7f04bca8da78bf6f6
diff --git a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.11-r1.ebuild b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.11-r1.ebuild
deleted file mode 100644
index 65443b8ab46a..000000000000
--- a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.11-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Bloom filter (bloomfilter) for Python built on mmap"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://pypi.org/project/pybloomfiltermmap/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.14.ebuild b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.14.ebuild
deleted file mode 100644
index 3a6a6175ca97..000000000000
--- a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.14.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A Bloom filter (bloomfilter) for Python built on mmap"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://pypi.org/project/pybloomfiltermmap/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	# Failures X 2 by pypy are harmless; written for py2, reflect only how pypy handles exceptions
-	"${PYTHON}" -m unittest tests.test_all || die "Tests failed"
-}
diff --git a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.ebuild b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.ebuild
index 72aadb37665d..e64646f5d03f 100644
--- a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.ebuild
+++ b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pypi.org/project/pybloomfiltermmap/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index c04f78453921..7c17f81d2b49 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,5 +1,7 @@
 DIST pyOpenSSL-17.5.0.tar.gz 170870 BLAKE2B e8b8986a7c5475ac3898df4877a8be86db359af79e1718bad85149440cff543c501ee23eb369270d2c539a9e3f4e13165ea87b858ef6916ee79ca6e49f6e5370 SHA512 f194662b5842f1e3a4fcb910b9f2e6482d1dcdf834f306acc3dd6d9723f65038f7bff550248fa6268d90c839c9d9e8248bb6c7d399495fe6aed25291b93ece86
 DIST pyOpenSSL-18.0.0.tar.gz 167296 BLAKE2B 3a9c8db02e92858353389508d9791d2ff0b07b54150d27a513b4c26ef62899167d184702cd8ac3a9fb5be120a92e31259ce265a400513de4622c30b1269ecd9f SHA512 7106d4116243a164c1f458ad495564c2cf3a46b4b0fbb1d452b4174ead4409bc9c783c3a4674231ed3c26ecf588077b01dadbdefe033d5e7251a61531c6f6c15
+DIST pyOpenSSL-19.0.0.tar.gz 168551 BLAKE2B 762d3358b3cc4f1e088e9464ac079e5212c537d25691e51edb3255a192c42276506c758ecf16eff999082bfd05aeb92a37741338d92036d2149b87c95008db05 SHA512 a7e12bf5be725ccebd1223d567a9b9e8bd35f79cbf3a0409108fa6f00e10ab137dd6876369e9dede02b2abc7d700786cc905532ca5c31b6e246f6df8b24e2818
 EBUILD pyopenssl-17.5.0.ebuild 1712 BLAKE2B 62870546779662329060ce67ac451909b54191bc844054dd9c9a7e29a5bd77b95164bf894fc657a3f8a765ef29c03f4a6f79fad0076d1d94138dcbb67b7aa8ba SHA512 cea3a766cfcc93739fa2344e870978615bf34aa31d5cca1c043d7ff64817509f2fd88b149a673df832653bd7f2839f68f7028ba48f5e5136233c6c963064cbf1
 EBUILD pyopenssl-18.0.0.ebuild 1726 BLAKE2B 74e3338b662ba17b6ed7edab14096e46c45fc3ecda9e2244155c5e71e4eb0063df3dec9bd4e65cada9ce40c794df53b7ce912477325f74e4bfdb01e03c7d67fb SHA512 e198074650a89311a455268628914100f10c8b436b4a07df73e27aa5c0cf714bd009cf6fd1e1820a16211f256dc66fa5f149798e74af80bfa874c0f316527eac
+EBUILD pyopenssl-19.0.0.ebuild 1724 BLAKE2B 47c669171919fc85cc44776839d6661e62384b2bd4fd938d51b3275ff81139b136791b8a9e171d53e8bbfa5096bdf59497e058fec7f4460a97c03d159d7b38fd SHA512 b607786f9ea4b55fba671b8cd8001dea1d1684eb46ccea2267aa6429ca7bfb822e7740294056e617ca24c3f3b2a723221f14bcb373b5cff390755e1a0c758cc8
 MISC metadata.xml 418 BLAKE2B 69f135bab3b0cffa47cc8e807e1f537f7fa0bd599bf3309ab92ddf41f894c21ab0e3f793ea4caa65d272043d2dc0352fc54c7160b31fccabbeb165775a895d97 SHA512 5cd4b0381e79245626500a2a38b9f7bedcc8e4742445ac16f12a96133f1291ec49592f2259294f153d5f1b27969cd6f7f364d49f32d0793b12b2ad38b824f441
diff --git a/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
new file mode 100644
index 000000000000..5d219b6ce81f
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=pyOpenSSL
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="
+	http://pyopenssl.sourceforge.net/
+	https://launchpad.net/pyopenssl
+	https://pypi.org/project/pyOpenSSL/
+"
+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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}]
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	# Requires network access
+	sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	TZ=UTC py.test -v || die "Testing failed with ${EPYTHON}" # Fixes bug #627530
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index c3398408c46e..5d47e382dbda 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 1329 BLAKE2B 882e49a5d1b0c4438ce4973c63b81822e8c203d7784a65922e36a82dea1189f57d7b130a01c7035ae14ae616ae4ae9f7f4cb101add854e6a4d44a8f34230d4c6 SHA512 329f2551e85d766853f98c3027377138ddf15c8a14f612bb29396f0cbfcdc0be908358361bf5a0ca946c7d21d7ccb5be49866eba50af8f2a0a67fd9acf0f31ff
-EBUILD pyquery-1.4.0.ebuild 1202 BLAKE2B ce2506c468af93ac02073c85c893315026e95dd23a18722ee4e544963f599d7b36ef09776f799635d3c60fdbe6e7b589436ec3d1b8a696bf073b14861f37f9f4 SHA512 e0b797a1ce0aadfdef7573e05aba95a81a32d23a3bd34c8a1408c89d567ebbd373406fd328a644cfabab5827108114c1c325f6c4a01df0bbaecc7dfa81753600
+EBUILD pyquery-1.4.0.ebuild 1200 BLAKE2B 0af034912bbc740599af3e943498e18526c288388891c9ce72668cd8a699e72f4d15e1f0c27be37de5090a2733bd2dd1f4e1d69559b3e68953dd9cd35f275093 SHA512 03b05c2db70c1fec1d52e57e37d0bebdde52a52b2cb2e91f0dec87f3c69fa1b6f209c652d646d56f8a6fe7612b3432072e80c0cadf60db8146f8d47185808865
 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 9bf1439e941c..ec28a49fefa5 100644
--- a/dev-python/pyquery/pyquery-1.4.0.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/pysvg/Manifest b/dev-python/pysvg/Manifest
index e052e7558357..ccaf1aff6057 100644
--- a/dev-python/pysvg/Manifest
+++ b/dev-python/pysvg/Manifest
@@ -1,3 +1,3 @@
 DIST pysvg-0.2.2.zip 623804 BLAKE2B c3fbbc6b62e80087059331f5af84b4da57a71aced8ee23764b5eb4d43e3c38dbba9b5df14294ff6b6c4af4f679dec5307295d1887fcfa64730d1979d1b4fcf48 SHA512 f0e39903f4290a0615ca7531ccc242b27086b639b2940b53ae185ff354843e56b184c1d1dbf63f0df4f9f9700c4224e878810354a0f0c77bcbb9efd1b4ac2f17
-EBUILD pysvg-0.2.2.ebuild 389 BLAKE2B 8675828f8232245d36d9ccea9608342af0cb4f767e2d4f5055163ae3fd2db00f98dbcb4ac818b9a23c4f54eac4a32d23ce00b2319442e00e4b26c90e107ce571 SHA512 5493ec21e8f3cb3a18383fbe539a467009175190377b26bc6b4534cc0ca84862b0de382db40d0632873de28ade24007b9331bc59d3d5d1e56d8afb70bb5a4535
+EBUILD pysvg-0.2.2.ebuild 368 BLAKE2B cd6c52f6e6467fdc353e3e69a43f17c34d1658bff9d91a07707d9fdf9b1d823e8506ab4e954c0e8e5555fc1d11fc4cc6663aae8dfc697ac32895d903dad5f873 SHA512 10ed09eb98e9c16423c2d6c852f75a9553da484602de1ac0a6a572b1f8f6793d3e0af9938eb6110601739a6ab5103c241f35e5ac0e08ab261ebf3931759cdbe9
 MISC metadata.xml 308 BLAKE2B 107f767338608c203b62917bbe549b8081ecaaea88e8593a437edb2a3f86fb6534e7ee703b47e83ff74ec6e36d06c94640523bd8333984404245990f689c4b51 SHA512 e00b4980b34a2dc446229a3fb4ca928540edac0eb7d338a00cf986dadbff135a0e9d3c1ad2af4a37717916cde9241b3350565ad029391ba0f30cb5c4059c36f1
diff --git a/dev-python/pysvg/pysvg-0.2.2.ebuild b/dev-python/pysvg/pysvg-0.2.2.ebuild
index 1313278326f5..afbdeb656caf 100644
--- a/dev-python/pysvg/pysvg-0.2.2.ebuild
+++ b/dev-python/pysvg/pysvg-0.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,13 +7,11 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Python SVG document creation library"
-HOMEPAGE="http://codeboje.de/pysvg/"
+HOMEPAGE="https://codeboje.de/pysvg/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 DEPEND="app-arch/unzip"
-RDEPEND=""
diff --git a/dev-python/pytest-helpers-namespace/Manifest b/dev-python/pytest-helpers-namespace/Manifest
new file mode 100644
index 000000000000..d1bdb13d0e2a
--- /dev/null
+++ b/dev-python/pytest-helpers-namespace/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-helpers-namespace-2019.1.8.tar.gz 5487 BLAKE2B 201e2e34f60baf95ce33f8cb5d3d8ce5465b4140e68c16f4802ba5225e28c4506c608dfc6ff4a36fddde30c7972a8c175ead976a11a731e2bfbc33e4b06cc04e SHA512 47b7f7c6638f4f3f0248722d4134b73357acb091f02cc1302d32894223d5ec06fd5382db207ae524f62749f2ebc53cf32d27eb8890d12baf250cd29dc6378a55
+EBUILD pytest-helpers-namespace-2019.1.8.ebuild 471 BLAKE2B 0dd35e853ac864934107bec66bc88257aab7f1cbe4edcbb628ce3bb29795444bb7a69b38be8c82f54efb5a505d93e036ae4b826180071e0104fef33208db68af SHA512 f7392d63ef5ca7dfb3556bb6f5102ecf674f0ab3e41a6ea79ebbc4bb4e6a26209216db9038c07b6946158c37d2b3018c29c055c72ba9a769d0d768f8910d16f9
+MISC metadata.xml 328 BLAKE2B fab884918d24353a3281a69d6ce042faa916c0fa3b8e33d6acac90e85b487f31d97388d64ab59257b0e9cb1aaa8891c7934f87e4b5a2f36a5f0cb621e937f264 SHA512 7cbdc338820fd09b283ef5686c59a1a7138a3b1e0b315daa0d6e4e4e0cf1f87b1802128ab03939ce24fa1b97954de7fd34096f9d734bf20e1ee8e99276e95941
diff --git a/dev-python/pytest-helpers-namespace/metadata.xml b/dev-python/pytest-helpers-namespace/metadata.xml
new file mode 100644
index 000000000000..366c2631e760
--- /dev/null
+++ b/dev-python/pytest-helpers-namespace/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8.ebuild b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8.ebuild
new file mode 100644
index 000000000000..d4be277a5446
--- /dev/null
+++ b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides a helpers pytest namespace"
+HOMEPAGE="https://github.com/saltstack/pytest-helpers-namespace"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/pytest-salt/Manifest b/dev-python/pytest-salt/Manifest
index e3b32a8466ac..4512511daef7 100644
--- a/dev-python/pytest-salt/Manifest
+++ b/dev-python/pytest-salt/Manifest
@@ -1,3 +1,3 @@
-DIST pytest-salt-0.1_pre20170731.tar.xz 30084 BLAKE2B a86159900aa4710d261e117aa745010ac2d977d852cd97ee366e2871d4c6a3e12c9769481d1de697d8df10f4c8b1f3366b93807de05257ffec590b5028ab2dcb SHA512 700072c9afef3c78ea4fc5cdbc54e28fb9d0635744cea07fa187cf21665f211eda05318d6a945c1dd6cc7a944bdf608ae2d8f78448d0667cba4984fc2fa2c75e
-EBUILD pytest-salt-0.1_pre20170731.ebuild 429 BLAKE2B 417d4a8f0e2301081a2100758c40e23ae402ac013f13596bf28a23eb1a5606060719b8183d6876906ac61c1a6f9cd3f2cb50c053876592e488063735e05ea486 SHA512 9ebfba1d505366c8af3bea215ec4c25d3d630553c4fdefb0d5569c3c6a861cef177831ef6f0a3630472504a8ae4d94f6df3f19f5c8cb763d3120c02b24ac540f
+DIST pytest-salt-2019.2.1.post1.tar.gz 63824 BLAKE2B 684e1dee6df8f7459bfa1747ea017973d72bc69b87d22c65509ecada47469a94ce410034004a5df1396d5ed05557ddec90e34cb18792235babb5e0cf6d72d776 SHA512 7b9939c3bd1cbcb6d6d0b086c39e02deadd8b3c6fcc359924af7fa5afc2e443b927269b82aa5575413e4e6bbc052f4035fb17ab68dac59ea309320c0a647d36d
+EBUILD pytest-salt-2019.2.1_p1.ebuild 592 BLAKE2B 5a8fad4cc0b4011a1f595de8c773a6aaa4781e04bdbb0083f6692e2865369d4c68afb311569affcd55cc1f93cf476980f428cadf8b6071e20d5b8258f9a3ec35 SHA512 bd7c15e268d2cc7ea50a85a40b619f468a5f680fc03a57a682e22f0c61604a54c7a646f090027db4487d9ecb30bf1df56a35703487f823ff639a326c69cb0684
 MISC metadata.xml 328 BLAKE2B fab884918d24353a3281a69d6ce042faa916c0fa3b8e33d6acac90e85b487f31d97388d64ab59257b0e9cb1aaa8891c7934f87e4b5a2f36a5f0cb621e937f264 SHA512 7cbdc338820fd09b283ef5686c59a1a7138a3b1e0b315daa0d6e4e4e0cf1f87b1802128ab03939ce24fa1b97954de7fd34096f9d734bf20e1ee8e99276e95941
diff --git a/dev-python/pytest-salt/pytest-salt-0.1_pre20170731.ebuild b/dev-python/pytest-salt/pytest-salt-0.1_pre20170731.ebuild
deleted file mode 100644
index 6e5e664f9a1b..000000000000
--- a/dev-python/pytest-salt/pytest-salt-0.1_pre20170731.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit distutils-r1
-
-DESCRIPTION="PyTest Salt Plugin"
-HOMEPAGE="https://github.com/saltstack/pytest-salt"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/pytest-salt/pytest-salt-2019.2.1_p1.ebuild b/dev-python/pytest-salt/pytest-salt-2019.2.1_p1.ebuild
new file mode 100644
index 000000000000..9b2fd5530cb6
--- /dev/null
+++ b/dev-python/pytest-salt/pytest-salt-2019.2.1_p1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+MY_PV="${PV/_p/.post}"
+inherit distutils-r1
+
+DESCRIPTION="PyTest Salt Plugin"
+HOMEPAGE="https://github.com/saltstack/pytest-salt"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/psutil-4.2.0[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 80d4356e6fd0..92f856072279 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -3,8 +3,10 @@ DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4
 DIST pytest-3.2.2.tar.gz 786396 BLAKE2B e669da930890e902b0323ec3a6685080ddd889e74655f7b4cb08ec421651f987597021a31471aab5a32d637b99620ce7792cbdf8f85561db3bb10ff06a446ba1 SHA512 6df3a50e7d1efeaf7a283920b16d1daf800798f422bc851b0aacd2bbd5cb0a88c95f9057fae49943b9dfe6527ed552cdf8d983b944ab91d0af252ee4f6eb82db
 DIST pytest-3.4.2.tar.gz 812719 BLAKE2B 96623d6cdea4bd79778175c18c949938505f1862010f700f9a8cb85f445910381af391a5b69e664fbbfc254bf46502c798c72026772070236a0a3bca7aeeb3d6 SHA512 787065ab76d4482799bb2da9f024c9c383e68cc1cc01f3b80f6ed9444ca6383d20953615696ed4dd01668777b094cf5002b23c4ce51828879dcf8ebf2170c71b
 DIST pytest-4.2.1.tar.gz 913065 BLAKE2B cde085627872d601df1c6d91d9620fbb97789b6e176fe104bc991faa800268e5e61651e211a8840743b21f8cd9b57dcee8685143e2f4d56d197afae35a577aed SHA512 e41bf7c685cacd62261df6d356911297a65ba85e13a50f8aed23d382d257c4c1cd3213971a3970fec210b8e97b72bd0034c0c1f87be7f306286d541c5ea57097
-EBUILD pytest-3.10.1.ebuild 2223 BLAKE2B d6bf6267602a7e9f94d28ca14846284ec9834dce2036b2313e999aec57d38c30e18b117e60431babadfe96e955e9c3758dd16ac4e660fc9d2d9db782a11ec7b0 SHA512 aa782c5dc1a4920a036da3ef4d3b7f3706ec0774d840b12539e1bcd16372bedea3b5520b42d75589defcb288efcbea778e00adaf6517b11c16a06a6fca82817f
+DIST pytest-4.3.0.tar.gz 915820 BLAKE2B ee8c55bb3a6e79d4897b218f372f8b0ceb524ea627f2e803484d83791ebe979da760695d3f6d7d85bc6494bdee1079f71aaf2418f1bd9e2318aba7471445413e SHA512 67894dc6c7001290e3372b5015227cf800c02d40ff28f76fad1249bd866f25c2368d8f0895d7c97a6b3318608f88e44db0bff723e7aeef79e380227cd7ec147e
+EBUILD pytest-3.10.1.ebuild 2218 BLAKE2B e946219d1c7f5e9ae8cd5cc3dfaad225cb2e22009b30cddfe06a4bb5b1ab1ef42edc0fd9d76b66c17b0b1c70671529a8a59016ec6fae7806f289e0375ddf7a3c SHA512 61b31c1d9f791420255595ddc0c8a5ebbe13b340863889602de89f00d1746e3b65464f259232e237a1e559df185a4707cebb7a03a75e877b59c84d0f392d96d8
 EBUILD pytest-3.2.2.ebuild 2112 BLAKE2B 5d60971f4ac0e85e21bba987a80e4124b99ddcb2fa92249127f379f1f6c6c9e1b5e59ac5bc6252eaf2fb286a2674e9deb25cb032e4ab3138be7ef9f990d29899 SHA512 b8c78dcb725d879ab6f6b7e3a24dc1305acc2569a2b02169f77b018d68806fe410c6094ae025bab43312ba79447fa1fe9ff6f6c1fdf7354b63fd6cfd9ecd84a7
-EBUILD pytest-3.4.2.ebuild 2523 BLAKE2B a3856f909c3cb062c4e8b7488930a4fb0ddbe2c46ed6510c9df0616aa1712aea3e5472d6806273b3fc38d8b20c7fad0dc0be485825b28f73bdb46806b54ffa2c SHA512 fae25af4b7455e4c1c8338c2d5514d1c1794cae5351e64a3a9b76165c3c7562a6572b1545b48a51b23c2d72373e77f96efaedbb26249f50f0ead02481ae6972f
+EBUILD pytest-3.4.2.ebuild 2522 BLAKE2B b0489f8e20d9fe101fd5c58a27aba40acfaad325c076c31ce84bd0a9603513c342f8aa2d61ff771556390c5d4c5728c1a2c662bc0f42e229af8c0890e5d193d3 SHA512 5b17d631f81591a4d02c8c34d3e06b2f12ca1f54f62d6cdb8b47fa7b67578d0cc46d76724739bc991743cba88909e6ccc1c549f301661cfe531eaebb6f958533
 EBUILD pytest-4.2.1.ebuild 2143 BLAKE2B e7463180feebbf298729a59f3dee445e066e10cad50e48a2c6a972cda537cd8b2078299a7c8b5f13e4611d122276095840afde9c19e4f3a2e04d000704fd601e SHA512 ce095f5399acdb7e05ef3f80959ad858e49004dd58bce5ce46ce6f61cf49830f9c01a9935ab2763066b86e91898dc9a697ee8078eadff47e8bba4b3482151c1b
+EBUILD pytest-4.3.0.ebuild 2143 BLAKE2B e7463180feebbf298729a59f3dee445e066e10cad50e48a2c6a972cda537cd8b2078299a7c8b5f13e4611d122276095840afde9c19e4f3a2e04d000704fd601e SHA512 ce095f5399acdb7e05ef3f80959ad858e49004dd58bce5ce46ce6f61cf49830f9c01a9935ab2763066b86e91898dc9a697ee8078eadff47e8bba4b3482151c1b
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-3.10.1.ebuild b/dev-python/pytest/pytest-3.10.1.ebuild
index 7846463ccb39..6b8a1f1fd8d8 100644
--- a/dev-python/pytest/pytest-3.10.1.ebuild
+++ b/dev-python/pytest/pytest-3.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 # When bumping, please check setup.py for the proper py version
diff --git a/dev-python/pytest/pytest-3.4.2.ebuild b/dev-python/pytest/pytest-3.4.2.ebuild
index 906a6a786643..021146937930 100644
--- a/dev-python/pytest/pytest-3.4.2.ebuild
+++ b/dev-python/pytest/pytest-3.4.2.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"
 
 # When bumping, please check setup.py for the proper py version
diff --git a/dev-python/pytest/pytest-4.3.0.ebuild b/dev-python/pytest/pytest-4.3.0.ebuild
new file mode 100644
index 000000000000..ab4d81909734
--- /dev/null
+++ b/dev-python/pytest/pytest-4.3.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.5.0"
+
+# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
+# support, which only came in py3.6.
+RDEPEND="
+	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_{4,5} )
+	>=dev-python/pluggy-0.7[${PYTHON_USEDEP}]
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-40[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+
+# flake & pytest-capturelog cause a number of tests to fail
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
+		dev-python/requests[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+		!!dev-python/pytest-capturelog
+		!!<dev-python/pytest-xdist-1.22
+	)"
+
+python_prepare_all() {
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# Something in the ebuild environment causes this to hang/error.
+	# https://bugs.gentoo.org/598442
+	rm testing/test_pdb.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# In v4.1.1, pytest started being picky about its own verbosity options.
+	# running pytest on itself with -vv made 3 tests fail. This is why we don't
+	# have it below.
+	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-bibtex/Manifest b/dev-python/python-bibtex/Manifest
index 5b3921d9d008..d4c72d073cb3 100644
--- a/dev-python/python-bibtex/Manifest
+++ b/dev-python/python-bibtex/Manifest
@@ -1,3 +1,4 @@
 DIST python-bibtex-1.2.7.tar.gz 60894 BLAKE2B dae5162e9d4b6893a4d411ffd1926f7f989940440609737b5c307af574d6e2794b850d6e4cb60bf33ba96eb36b3a0143fbc8fee907fc96c0c7d980514fe8db5d SHA512 6739824fcdad91e2abb333d9e17a31bd222e6100630b8e4f65a9e718d36eb451600fdc7380cb63b89c4a33a7554b79dd1c52448d19c3359f21deee2134242e6b
-EBUILD python-bibtex-1.2.7-r1.ebuild 662 BLAKE2B d9274d810a7005b47f159f623d2eef3ea16915437db8433cf4152a29a57f8a5bfb1ccea92c12b367ec4879c091f96eea5d1abfa2f22b11664bd75585b195d2ad SHA512 8d9f512e261cf292b8b75db0b7c5cefa9ffb6b54162bca9a5b2360d0c788564d6618de1c88c7f77468c9d9fff6feeb5048306697e09864e98f55af65a9b777d5
+EBUILD python-bibtex-1.2.7-r1.ebuild 660 BLAKE2B 9c297392aac260bad35872bcf2465f17cf07cbe9f33c36e2eae030e4fe3f7a8c114a38902328ab900a70a47e6c881d3cd4868f7242611fa5f556eb716c3eed23 SHA512 a1774b82df4f7697c67d2c6b3a6ffa04f31d319eb0bf6c3bcea1065627da571482a13ce63b4cef08b5a68fe9466fffd2750d199e0ab38146c4dfe3d33b39dd54
+EBUILD python-bibtex-1.2.7-r2.ebuild 664 BLAKE2B 571865f98b8f4e3b1322625576b3d9993dc4de4e6bb1044e5872cf4cde2be3fa06f8a5fd086983af43dd69c5ebb86ed50dd13adee4af73de86ec1b7037878875 SHA512 9f4c7836a2cd020be6694c6b474e4dece8fba67ba49eec7760eb32c23fe80f029755df85f423c682787177d4ce16ce7fa533ed9dca451e0beba0d3a4f51e347c
 MISC metadata.xml 433 BLAKE2B 7d50fbbf95bffeecb213069d61af760c468d50ffcfe3c7dbbcf504cf496b944dc83671122400662fc4247bba54fef57eb085f86039c6e7600139b1e0b51398c8 SHA512 2f628ff97966f5175f2a5deab9a04f09c7350b2a74a99ad37930cbeee9881d8911d821af89c92eb832560e58cfcb7efd8af0c8f51ab3bac4ab1fbdd94e1639cc
diff --git a/dev-python/python-bibtex/python-bibtex-1.2.7-r1.ebuild b/dev-python/python-bibtex/python-bibtex-1.2.7-r1.ebuild
index 6b44d83e3241..d318ec5b9636 100644
--- a/dev-python/python-bibtex/python-bibtex-1.2.7-r1.ebuild
+++ b/dev-python/python-bibtex/python-bibtex-1.2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 eutils
 
 DESCRIPTION="A Python extension to parse BibTeX files"
-HOMEPAGE="http://pybliographer.org/"
+HOMEPAGE="https://pybliographer.org/"
 SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-python/python-bibtex/python-bibtex-1.2.7-r2.ebuild b/dev-python/python-bibtex/python-bibtex-1.2.7-r2.ebuild
new file mode 100644
index 000000000000..d514f638cca1
--- /dev/null
+++ b/dev-python/python-bibtex/python-bibtex-1.2.7-r2.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 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python extension to parse BibTeX files"
+HOMEPAGE="https://pybliographer.org/"
+SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	>=app-text/recode-3.6-r1"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+python_prepare_all() {
+	# Disable tests during installation.
+	sed -e "/self.run_command ('check')/d" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py check
+}
diff --git a/dev-python/python-evdev/Manifest b/dev-python/python-evdev/Manifest
index 030d60fcc4b9..b6ad7363884e 100644
--- a/dev-python/python-evdev/Manifest
+++ b/dev-python/python-evdev/Manifest
@@ -1,3 +1,3 @@
 DIST python-evdev-1.1.2.tar.gz 83067 BLAKE2B 6434d5c62e4a072928d555bfc92e94e7f63ef98ebbf9cd95795a92d6ccdf7b5d4b0f3133a4b3f2524083b842f78ccc305a5da13af59052be3724d83ea4039328 SHA512 054b2e5af532079dc52919d90791d12d7caf75cade07d18b94ea519869659413ea059570b16ebb236a715c541b17016db380bea4e3c1cd21f96824c6303b45d6
-EBUILD python-evdev-1.1.2.ebuild 642 BLAKE2B 67b7f8265d7f1707926ff711b89e005667376e79bccc3e0f80a811c89abca41be7c6f6d6955e500f1ccabdc39373fc9b918dfa1ed2070290facc1d1e37b47869 SHA512 a74bf46bfe085d1fb41891aa196e17b1788e89ad9464ec11cb5bdc784e8e9844d3e12b39d5d31a9b3c0a729971b8dbafe5fa980f3bb12cc557681939c4561b16
+EBUILD python-evdev-1.1.2-r1.ebuild 642 BLAKE2B 90d5252c4568c5e706c1d4c4112f73c093ea455c6345c68172cfad07407b3c7db08d436c82de6c4c23513a9774d4dc5a11f9dacd0103539e0e46299a6703a030 SHA512 a035b9486ed0309901211d786ea34141d68ceef42092800ce436e25f26eadb727ab7bd7b3c6345a12057fef17b7dcb7d98723f058f69f3612727f3abedc639ec
 MISC metadata.xml 257 BLAKE2B 5c2ca1a3b14d55f8b7d0dd09b0811de8e397c4f748a58c4133f02e86e9084da2b2afabee2c7fb38f38d97d1a301c6de2dc6c4cf8ad4f91fe55c35b8580e6ff0f SHA512 2214f84571910c807983e21889732fb6b9619cd62bafc51a3743786f42b2c6248f1717ec5936685e767a70a052ec725a7a62c602b9c95fbb8e45838472146304
diff --git a/dev-python/python-evdev/python-evdev-1.1.2.ebuild b/dev-python/python-evdev/python-evdev-1.1.2-r1.ebuild
index 69f32c6049cd..da0ce1d37770 100644
--- a/dev-python/python-evdev/python-evdev-1.1.2.ebuild
+++ b/dev-python/python-evdev/python-evdev-1.1.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-pluginloader/Manifest b/dev-python/python-pluginloader/Manifest
new file mode 100644
index 000000000000..cc73ad59cca6
--- /dev/null
+++ b/dev-python/python-pluginloader/Manifest
@@ -0,0 +1,3 @@
+DIST python-pluginloader-1.0.0.tar.gz 4625 BLAKE2B 6da2fe78d09943e56df8331c3c0ca399f6e29d10c38c1408d49954cf2f272fa0876391f27b5553a0183541ee642570a47af97c17f441b4f964721dd2fecc1b10 SHA512 879ff3eb1ff9280a4a580f24903b4f449910ec34b7e3b08215c86cc81e9c65ec48279143ac0ed8564478d1c013074c8165f6a85b43bf08760c83dda78a19f246
+EBUILD python-pluginloader-1.0.0.ebuild 444 BLAKE2B c01efcb22ad8c8fc854782fe686ae4e9917391a363d5d76521595e69f34ad603d4811229c7c9034c58d45719e11e4b71d1314e1a4e96771d777c59e4df7aa65e SHA512 b85f217ab990d39e7fd4f0cfbdca4e4f4360334b18af5565f91f58b7d2c56a49e2e815e8f79a3d362b5bedf26915143d00166fea5cd42b0bda654dbc4faef088
+MISC metadata.xml 331 BLAKE2B b3da4653d8bd6617ad3d8b91ebab4d324de3d753f59b2b8cd84bfa92c26fbc5e2662f316f19254e9bf8edba4111a4c575b3b8145760bb4cf98cb1e64fa12de93 SHA512 339d7ec309d557c0775177f7da3940218c56c2f9b09797a9398471fd07f23096e062febcc66292e713d4c62e36061c11532e3fc268e097e143cfbeb6b1edca62
diff --git a/dev-python/python-pluginloader/metadata.xml b/dev-python/python-pluginloader/metadata.xml
new file mode 100644
index 000000000000..6b761d971220
--- /dev/null
+++ b/dev-python/python-pluginloader/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">magmax/python-pluginloader</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-pluginloader/python-pluginloader-1.0.0.ebuild b/dev-python/python-pluginloader/python-pluginloader-1.0.0.ebuild
new file mode 100644
index 000000000000..6bc0182da5b4
--- /dev/null
+++ b/dev-python/python-pluginloader/python-pluginloader-1.0.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to manage python plugins/extensions"
+HOMEPAGE="https://github.com/magmax/python-pluginloader"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-social-auth/Manifest b/dev-python/python-social-auth/Manifest
deleted file mode 100644
index a0395d56b9c4..000000000000
--- a/dev-python/python-social-auth/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST python-social-auth-0.1.26.tar.gz 247579 BLAKE2B 647299350462d707d054df6b64438fd71f2ec28c047a0dda21432a3488d26e1adec86ffe7a1cd09d2a7bc658e661e065df9a06e3058da3c16dfe22b5b85402bb SHA512 c3637f9a269f2c8465b1896840a5ca0f70bb6c45c93f7d9c08c54434037984538ba95442a164841c069cb5b1fd251d0f3f62baa1dc2754a542baceb2f325bd8b
-DIST python-social-auth-0.2.10.tar.gz 297210 BLAKE2B b312211ad11d4d1d1d12dcb607e87064b4bd2cf929c71b513a665839365510e0768151de4b3e56dd9a05fe9d8e4fe7368bc7f234c01f20e3d2898c709102ae29 SHA512 af5247cee0b77f36d1bfdd7457708c2f2053bc779bae8eae0cfe79f0f9236c37882afcbd325863255282eb7559d8f84715b3e983f94d55bd3e7815c5469f150d
-EBUILD python-social-auth-0.1.26.ebuild 1475 BLAKE2B 1774b17aaa99e1ed4e87182df8f38098bb6cd0ff65fe5a3e7475438a58fca5f214fdd8bebdc646741b3c44343d17e1e664aed8b65a5bafb3eab503a3aa2d3b2a SHA512 6418a043c6b63db4fe80d72b8cfeec6612c6dced724d722fbe173bbf8574acf233dab768188887085f79ea8ee0a0bf7ca657c9bede3286092f73170fc1545cc2
-EBUILD python-social-auth-0.2.10.ebuild 1527 BLAKE2B 4edd6648caaf97ecbad96c7df1d89023715a3d2872d2df5b92a8ec9318d3257f1445ef3b60ad821a4bba082b6fdf9a77ffa7544f04976cf35af39d3c1f8fc40a SHA512 c69db0fa4e38f0fcc70221b8bb9a31b8b8a751d084ff8399ab441a2be32c504ba54405eacbeacb58bcdb59f3b231490d2e6bef9ae1c29cf2f059d518d134fd13
-MISC metadata.xml 338 BLAKE2B 3ca07987fa6ffe23b4dcb728f803fdf0a32add0ed9f7605de53a11e365b7e1ed1a83eb1f39780702af3bcc98345e85330233c1d622ad3b61773f57acb4bb27ff SHA512 368ff17c8b2533952749b5d757fdfde6932977a00ca3278ffd5e403b22aa6c51471c413f6311c05ca3001f077735826cec63ac30c4b1926925e91d74bc50060a
diff --git a/dev-python/python-social-auth/metadata.xml b/dev-python/python-social-auth/metadata.xml
deleted file mode 100644
index 2f61c1adb476..000000000000
--- a/dev-python/python-social-auth/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">omab/python-social-auth</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/python-social-auth/python-social-auth-0.1.26.ebuild b/dev-python/python-social-auth/python-social-auth-0.1.26.ebuild
deleted file mode 100644
index 7c1e44660d9d..000000000000
--- a/dev-python/python-social-auth/python-social-auth-0.1.26.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy to setup social auth mechanism with support for several frameworks and auth providers"
-HOMEPAGE="http://psa.matiasaguirre.net/"
-SRC_URI="https://github.com/omab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc examples test"
-
-RDEPEND="
-	$(python_gen_cond_dep \
-	    'dev-python/python-openid[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep \
-		'dev-python/python3-openid[${PYTHON_USEDEP}]' 'python3*')
-	>=dev-python/oauthlib-0.3.8[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-	>=dev-python/six-1.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-# tests require internet
-#"
-#	test? (
-#		dev-python/coverage[${PYTHON_USEDEP}]
-#		dev-python/httpretty[${PYTHON_USEDEP}]
-#		dev-python/mock[${PYTHON_USEDEP}]
-#		dev-python/nose[${PYTHON_USEDEP}]
-#		dev-python/sure[${PYTHON_USEDEP}]
-#	)
-#"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
-
-#python_test() {
-#	"${S}"/social/tests/run_tests.sh || die "Tests failed on ${EPYTHON}"
-#}
diff --git a/dev-python/python-social-auth/python-social-auth-0.2.10.ebuild b/dev-python/python-social-auth/python-social-auth-0.2.10.ebuild
deleted file mode 100644
index 8c8f3c7a876e..000000000000
--- a/dev-python/python-social-auth/python-social-auth-0.2.10.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy to setup social auth mechanism with support for several frameworks and auth providers"
-HOMEPAGE="http://psa.matiasaguirre.net/"
-SRC_URI="https://github.com/omab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc examples test"
-
-RDEPEND="
-	$(python_gen_cond_dep \
-	    'dev-python/python-openid[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep \
-		'dev-python/python3-openid[${PYTHON_USEDEP}]' 'python3*')
-	>=dev-python/oauthlib-0.3.8[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-1.2.0[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-	>=dev-python/six-1.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-# tests require internet
-#"
-#	test? (
-#		dev-python/coverage[${PYTHON_USEDEP}]
-#		dev-python/httpretty[${PYTHON_USEDEP}]
-#		dev-python/mock[${PYTHON_USEDEP}]
-#		dev-python/nose[${PYTHON_USEDEP}]
-#		dev-python/sure[${PYTHON_USEDEP}]
-#	)
-#"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
-
-#python_test() {
-#	"${S}"/social/tests/run_tests.sh || die "Tests failed on ${EPYTHON}"
-#}
diff --git a/dev-python/python3-openid/Manifest b/dev-python/python3-openid/Manifest
deleted file mode 100644
index 2f3d8435adf1..000000000000
--- a/dev-python/python3-openid/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python3-openid-3.1.0.tar.gz 299326 BLAKE2B 809e38cb20be9dcbb520a17a99758554f33f6f94b98b3deee4507eac0d8724c370a48c7b267f473e3b31e90593b1ef7702eb5d8adfc908c532ba624139da0b23 SHA512 9c96efd16191ddb6ddb12c4885a2cce523244d04e70f9418144d0124ef142fd7b6578cd2a01e949995d7dedf0b96cbb3b17d1d3a29db5da8934f7fa875ad8e9c
-EBUILD python3-openid-3.1.0.ebuild 694 BLAKE2B 32d84d5fc02283a3e6769ce779bfdcd874f2fa068799850c0c9bdd1bfa7a94392a0b86fd71597e5cc9bd6ad4508b554abe1209708f89c09ceb235cb0b12a05e6 SHA512 4b8f624d6c08b7cc20a02c29d3dc832e7a960fc7a31c4bc133b2d5c9bbc6c4fb9df4381063d9dfd666e931d7327568aa5296548d730ab01994db80a5443f543c
-MISC metadata.xml 337 BLAKE2B fd9b6c6e99251249623c019892e1962b2212f8781efb18935a9e9f6da8ac836e114b84758d43529a51e3260981621f8d5c5c17f8ffec7e8b1c34d2c2e335e531 SHA512 099dc2e5cd089e1638ad20bc476cd8d9e6d173b22611f48b34b9945f92886550f53d86ca672882bd570cd6515c33a2d8b4acb87fbd35abfbc55bd592b570459c
diff --git a/dev-python/python3-openid/metadata.xml b/dev-python/python3-openid/metadata.xml
deleted file mode 100644
index 5e866c63a84e..000000000000
--- a/dev-python/python3-openid/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">necaris/python3-openid</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/python3-openid/python3-openid-3.1.0.ebuild b/dev-python/python3-openid/python3-openid-3.1.0.ebuild
deleted file mode 100644
index c584951cc4a9..000000000000
--- a/dev-python/python3-openid/python3-openid-3.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 3 port of the python-openid library"
-HOMEPAGE="https://github.com/necaris/python3-openid https://pypi.org/project/python3-openid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/defusedxml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	${EPYTHON} -m unittest -v openid.test.test_suite || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pywinrm/Manifest b/dev-python/pywinrm/Manifest
new file mode 100644
index 000000000000..3fbccf70cdd3
--- /dev/null
+++ b/dev-python/pywinrm/Manifest
@@ -0,0 +1,3 @@
+DIST pywinrm-0.3.0.tar.gz 25175 BLAKE2B bf020a2343dd317234d52600425930c9e8a798d07443f33279950d011c23ecffef97eb10042f4453ca8062d163c75c694d04b1e1f9facc3a6fe1da8d6840671d SHA512 4a6ec3e5cc4b9030275454d846fa4356f444481fe798f013f2be4dbfd4974f11ab2ccaabbc749f6e64fda985324ce6ffb1af906cdca02d2e2cb606d10bb94d02
+EBUILD pywinrm-0.3.0.ebuild 698 BLAKE2B 31a8957923e870a8e8231536ff53f42035cc3d1d2dc0abf02c80566c2cbbdb14515c09e1c79e7d8e143ff357ecc2c69dd0357c283188cc695576384e65944f8e SHA512 5c93817548faa0e225b2c3c56b68a20732ef1692927347baacc95947fad7abd7f7d7d985e1d14f266e45374c267bcb5c56e7d6dbe20c6ce46cadd26b35f6833d
+MISC metadata.xml 316 BLAKE2B 303bc2b58c8edb651c2dde7610eb874282223fa0b786208f488b9f1f82fd6fd63ead38e561cd46d65ab9ad189e261ae226a0ea8f0e99cded18d08dfa32bf37d0 SHA512 8d18f71c55b50755a61086ce593cb81f1095b35ee6e423da418f0e652e1842c6025bed1af48115c2847808deea4d1137d0bd70dfbb4c4f1c9fd720c14a54a415
diff --git a/dev-python/pywinrm/metadata.xml b/dev-python/pywinrm/metadata.xml
new file mode 100644
index 000000000000..4091bd7dda62
--- /dev/null
+++ b/dev-python/pywinrm/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
+
+	<upstream>
+		<remote-id type="pypi">pywinrm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pywinrm/pywinrm-0.3.0.ebuild b/dev-python/pywinrm/pywinrm-0.3.0.ebuild
new file mode 100644
index 000000000000..7fc926f49b0c
--- /dev/null
+++ b/dev-python/pywinrm/pywinrm-0.3.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Windows Remote Management through Python"
+HOMEPAGE="https://pypi.org/project/pywinrm/"
+SRC_URI="mirror://pypi/p/pywinrm/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-credssp[${PYTHON_USEDEP}]
+	dev-python/requests-kerberos[${PYTHON_USEDEP}]
+	dev-python/requests-ntlm[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/recommonmark/Manifest b/dev-python/recommonmark/Manifest
index c63eb5550ab5..f2d601a4f5b7 100644
--- a/dev-python/recommonmark/Manifest
+++ b/dev-python/recommonmark/Manifest
@@ -3,6 +3,6 @@ DIST recommonmark-33b5c2a4ec50d18d3f659aa119d3bd11452327da.tar.gz 22085 BLAKE2B
 DIST recommonmark-fdeeda5f6fe3ed8905deb7a067cc5951a477d091.tar.gz 22249 BLAKE2B 7466fc1448b54c2fd6969fa06e10c11e7bf1f2d772d96d749de9023d60570387a5472c74d660e8bd0722d294dd2ac1dec8d7d6fc49b281eea14b1f9ce423cf94 SHA512 67fa0b13d49d1f6b08e2fa28cf127c6dadb6454329a35e1e1217ff3bc93aff1a1a040740478cfdcab1b72acd939e0a81d7d8638e7ecdcc76e2791ddc33b8f0ac
 EBUILD recommonmark-0.4.0.ebuild 551 BLAKE2B 555de72463a0749dc830a6726750f8697e9e8bbb87adca2cb9c6877964107ede4628fc0fc04943cb47326a49f6c94c680bfc5be7b5863125d959cd85a37d9537 SHA512 65c1bcd475acae52ed68c897c5c6ef0daf9c054591c4e48ed5377474673e8ff3b7ec64354899f495ca2e1532e2007efb571f88e246208f1b30b583cbe329d20d
 EBUILD recommonmark-0.5.0_pre20180907.ebuild 989 BLAKE2B 3984d521869c36ffd02144177c6fc4f2763bbe37731ab38e3c02cbd938d5e29d5febf8b9379f96736cbc72c4f40c5cd07d9e079c5c734818d21be9ee2aada269 SHA512 eb0092326e1c3f7759703b65147d683dcf09b1526701d8a677c4c8744d4f1804cf36fa58b569fb4e54561c0a060323cdb363db6f09a0b2327686ed90f9e6deb6
-EBUILD recommonmark-0.5.0_pre20181012-r1.ebuild 982 BLAKE2B 7114a82ae21591efada3c3ca75be7839570685f53aedd282a6a0993b5147085293be693eb5d3d8e97a4159096c98e3acc51174233668145b7c62ecd99171a655 SHA512 2227ee36142b8c7beba76da7472e0399ee70eba49f57c77172822c0ba5eccf0dd7df7cfd4750819ded5b62dce66464ac5c290d4f33f9db0c331841ef678c4def
+EBUILD recommonmark-0.5.0_pre20181012-r1.ebuild 980 BLAKE2B 066074fd3dc752dee77c42b993c518f46f7c2945532173b90e2b8b83b566e8d5112eacad2f8d0f85ac957c8aaac7c98f945c327923d14327804efd49f7e088a0 SHA512 d786b923bdea4661028766354c53209baa5d1087f3158460f3c88b56ca7f02eaae586f2ab70eb51235e1c3958c71b12f1fd99d0aed255c58bfc8eace88a09fe4
 EBUILD recommonmark-0.5.0_pre20181012.ebuild 968 BLAKE2B 39e5821284b5c7eaa23f467f2531e42026961fc8b40f9a5565689ae314b2a47cf9aaf5064ad231b326ef4d3ce3668518ec8874a58cd41a39c44be2bbd85ccc80 SHA512 43bc3f86870bd993b0a250644b3cc8960e20cbdf546c0fd50164fe008c7794d10ef4943724a7026c147df34b7f7965942adbfaeace0a1cdc85793df4e164c951
 MISC metadata.xml 519 BLAKE2B 8ea8a1e90a05ccb7f78d0de5213fb0ab447a8e8d9ebef7011eb4cb237c909d8bac77319282a76e3db32f58ec0dc6d76f6dfbe3c29c4c71c7f93398d91afffc0c SHA512 83dde1b703e097ce74627ad0139fe6cb97de26cd080bf0b191effe61ff8bd6593bf02a98be1e27ee142520142adebb48c4cb13066cb8d2109ecd642785b78c9e
diff --git a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012-r1.ebuild b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012-r1.ebuild
index 1a8cc5b1b150..3948dfd4498e 100644
--- a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012-r1.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rtfd/recommonmark/archive/${EGIT_COMMIT}.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 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/requests-credssp/Manifest b/dev-python/requests-credssp/Manifest
new file mode 100644
index 000000000000..6a320f78d7cc
--- /dev/null
+++ b/dev-python/requests-credssp/Manifest
@@ -0,0 +1,3 @@
+DIST requests-credssp-1.0.2.tar.gz 21813 BLAKE2B 4626b31e9933e7fe5abdcba59834bedbc14afdd32b21d90124bbb458407213ba8cb92e98394f980f43aacd61de6c0e56e835cf47489ea55338a3dcdd171099e4 SHA512 8a076fc53eee73e24b08f6283b02a48519b9df076222b2e37c145c1d4c1756c29ccc41f0016c5a8ee7f5f7bf76c95fa158016f2cddd42b45a5ab2182939ffae0
+EBUILD requests-credssp-1.0.2.ebuild 711 BLAKE2B 22db5715c5e0f8e32a4cc7cb55680c279bdb17c7ffb86b2c09076dbd40c68fb94dc4e2a8fced6068af873f1ffab42ceabe91e0adf005ab57419644bf14f7efa9 SHA512 e72a54c7a88d631527b04070f515527acdb5e90a27fdf2b5124e0b731c49450231dfa774eace6fb8fc550d71c79760d5e282c2f5acfaf0cd1dcd6489356b2c68
+MISC metadata.xml 325 BLAKE2B 29ae1049a0331156fbe1f955fe60417f1d9c5a9b78d0248dd919077c9a6938843faa37f6a56fc50d60d5193f6f3593d2845ef5f371f4bea5d69bc03a9111977c SHA512 738d9d27265c68d240b23837c3c527f60067e1ca70630ed610845a3b2796905f236d90fb3b812958dfd202d3c91e958a9976dd3395a9ceda59ad06d6f1a67893
diff --git a/dev-python/requests-credssp/metadata.xml b/dev-python/requests-credssp/metadata.xml
new file mode 100644
index 000000000000..5619a58605f2
--- /dev/null
+++ b/dev-python/requests-credssp/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
+
+	<upstream>
+		<remote-id type="pypi">requests-credssp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/requests-credssp/requests-credssp-1.0.2.ebuild b/dev-python/requests-credssp/requests-credssp-1.0.2.ebuild
new file mode 100644
index 000000000000..be0662bf8c94
--- /dev/null
+++ b/dev-python/requests-credssp/requests-credssp-1.0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="HTTPS CredSSP authentication with the requests library"
+HOMEPAGE="https://pypi.org/project/requests-credssp/"
+SRC_URI="mirror://pypi/r/requests-credssp/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/ntlm-auth[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/requests-kerberos/Manifest b/dev-python/requests-kerberos/Manifest
index 4af500a968fb..40acb2cf6a7c 100644
--- a/dev-python/requests-kerberos/Manifest
+++ b/dev-python/requests-kerberos/Manifest
@@ -1,3 +1,5 @@
 DIST requests-kerberos-0.11.0.tar.gz 10742 BLAKE2B eaf764ae8f5c897db43cbb931952062d4aaf33c04dfa0bbae2cfd3b44326240f80435d0b69c7f8bfa3567d0d16532796d009f0436f3ff5956a87998b825f98a3 SHA512 8700a7a305e0e42823bbc87c95ecfd404a76807459ab8a87f3105e817ebd9954fd41d7a2bab421bb5e21c0ec1b62a589c93cccb1f926a3ba66d6adbffe5db265
+DIST requests-kerberos-0.12.0.tar.gz 21579 BLAKE2B 297cbecb0fc3508f5f62440c5860dcd94eeb077e68757c0646e7e3bec65cd34e19212b9992dad491ce0adeb91234db533528936f740599e42ff439f78af103ba SHA512 b925b5f9f6753e87368dce451927df09568d0d6126d4ae8514bbd99a794d983e32298b92b6239be9f95595483e2682259cf165c6997d17d9cea64a81d4af1a06
 EBUILD requests-kerberos-0.11.0.ebuild 610 BLAKE2B c2f3d903a70e805d1a0c64c5dd15b5557980db34ba83f945fb614b0a123e27023ec919879af6212a53c92b6c37d1410c1972297f2e7202341f2a541c167cbe6b SHA512 822cdae582b82c7d6f6000df06d3b2995fd96cc13de9996839455db502fb361d497114581b8a2b1d850602f4c5c3de2457ea76a81f1a23c20b42d2c1cea49655
+EBUILD requests-kerberos-0.12.0.ebuild 769 BLAKE2B eb81d68253081f2a7a0271d647e864ecebf8f6214d86caf0dffbb710b000e831ee8d3beb2e85f71a4f0f3f948e9f1b3f60eb9dd74f7ef918ea8cbd4afc9a8b61 SHA512 60de4f12a5bdc664fed5670eacd8b0d55e7d6bb8c4d2de8eec69a0a33be24e2deb44ae152f7271a2f8dd6317f0244521a0628384c9191fdba4f08f74932f7ba4
 MISC metadata.xml 320 BLAKE2B c58268e9df73385438694b43f3784a58d11f003adcebc306d70ddeea26789cfa22f709484a99902326074d16072563011c07f09eb071a9c141e4ee6ded7dbd56 SHA512 a33854d5f3c9a4d077d51a4254d18045a4fb0a50c223e809ea0a7415c869152e30122c3d7e005b25c7e07bd660678db5613449688c086582c172a77d19a9e540
diff --git a/dev-python/requests-kerberos/requests-kerberos-0.12.0.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.12.0.ebuild
new file mode 100644
index 000000000000..96c2cb6c27f9
--- /dev/null
+++ b/dev-python/requests-kerberos/requests-kerberos-0.12.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+HOMEPAGE="https://github.com/requests/requests-kerberos/"
+DESCRIPTION="A Kerberos authentication handler for python-requests"
+SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/requests-1.1.0[${PYTHON_USEDEP}]
+	|| ( >=dev-python/pykerberos-1.1.8[${PYTHON_USEDEP}] <dev-python/pykerberos-2[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+python_test() {
+	${PYTHON} tests/test_requests_kerberos.py || die
+}
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 682cdb8f150a..b99d719f83f2 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,5 +1,5 @@
 DIST requests-2.18.4.tar.gz 126224 BLAKE2B 98ab1fe39832673ea7900029da275e031fc85811d6ddb0f37609ec50b18e17d8a04b6cef397bc626ba13da32e16ffa961626879106941d327694d8763dc1efb6 SHA512 5c59bed82ac1094194f04a973b299f7d783264d372abd7a5229295bccc6b2f7a9f082ee4b0dff348e9c22cf68ddbd7cb67f60fd0b7d9eda41c02e40d075e9472
 DIST requests-2.21.0.tar.gz 111528 BLAKE2B 7b40f9f572a8efde41c177fb5d1e1eaf29ca60cad0661fa28ac0085f3700348380d619f68c0082f24044d1af82b16d6b1e7d5dd2c2a2329f85fcee7141b1fbf6 SHA512 385e1d80993a21c09e7c4682500ca8c24155962ba41ecd8e73612722b2ff6618b736e827fc48ad1683b0d2bc7a420cfe680f5107860aca52656ef777f1d60104
 EBUILD requests-2.18.4-r1.ebuild 1410 BLAKE2B fcb5b635943e9a458e75a7fbb67c20eaf25eb2b26b5ab184b5d9ef928e5ee4b99b1e968fbcd6cc1597b0ca5ba9153e75ca0e1e42560ea42251b10e223ee10273 SHA512 87896952b23e4c151a00f5e636a1260dce944b1a67b00a7cf8bc285869608e399eb3a4aad842a79f44ceb5aa095f3cab26679dfec66efca99963a78347dba1e4
-EBUILD requests-2.21.0-r1.ebuild 1456 BLAKE2B d2ab5e5dbaa95527ae331323b8c25ebd21f5c3833c26b64f3dd9021eef8fcfb5f45150fa5262184d318dec5e78bae81837111298069ec0aba6bfbd4e3483e153 SHA512 1da379c9e725ea6e797f7f521f6dd1d55df31939635088a2794b34e10e0c39d4d55a6428d6802336508f115f639af29865a1753d4521222dc8faa9a49ce4ab84
+EBUILD requests-2.21.0-r1.ebuild 1452 BLAKE2B 74ced893bcae067b8f02640c832ab59b06a9e49652787e801473f67375d68aafea820dced0ce7acfb39d4f1cd35985b48eadcbfbf1c390df79c202853c55c80e SHA512 38978c94b54762ad70fff0fdb09dced40e1516933fd456084855c1c84914a1b8a66be3cf5545171a58b38e6a84fe3c05a2962379f1b9c220d3358697633ab689
 MISC metadata.xml 674 BLAKE2B 8670395eb334921eeaa21367eaf1c7d3770c11a166dc680bcb9b99a05da91d797baec8ef3c0596c40143f732e427c322a75ea75da1a2e7d99e56426be077b35e SHA512 7aa5c27d949a076b09b4c2b9e905124047d9ececc40d9c3fd225c6405aa084db96cab585956db9885b115cd24c6c153ae853187872e77e7d44ae5790c323bac9
diff --git a/dev-python/requests/requests-2.21.0-r1.ebuild b/dev-python/requests/requests-2.21.0-r1.ebuild
index 0202cb06770a..7009406d7c44 100644
--- a/dev-python/requests/requests-2.21.0-r1.ebuild
+++ b/dev-python/requests/requests-2.21.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-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 ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="socks5 +ssl"
 
 RDEPEND="
diff --git a/dev-python/robotframework/Manifest b/dev-python/robotframework/Manifest
index ce26a77bfaff..df2174515841 100644
--- a/dev-python/robotframework/Manifest
+++ b/dev-python/robotframework/Manifest
@@ -1,5 +1,5 @@
 DIST robotframework-3.0.2.tar.gz 440465 BLAKE2B 912aef05655fc02b0ecc41fb435f97f473638301eb5c8b84e20833a5d33ffc7928c02d07cda0cc7d0854545d6b22025e5eb2ab7d550ce9a86d3ed18cbb468847 SHA512 b03fb3db627fd6b598615989c09e213cf79cbc7dbe7a08087c483dcc688f45782d54b9f1fa45206fc5adc43db9f2d862ac8f96c0b5f209ada1e09e5506171b4a
 DIST robotframework-3.0.4.tar.gz 443354 BLAKE2B 1b9b048cc0e5ce9d13a7bbe54e659f5010236a84771f391ad4ff7f9c98d5ffa9d6e6f4974572b901a1804d8c12f5c2b135f03b2d1ae3a4e840103ee2f39e411e SHA512 be975099e54e265131b94431347d093a5b844bcbd24ecde7d4af4ccc97b51184e4b60572d8a1187691eacd73e8e566fda56a200ad30c7438a557752414524bbc
-EBUILD robotframework-3.0.2.ebuild 450 BLAKE2B c8004b184af96944632e25dcd2215dd691aad4ac32689cc46cb71d2296dded52ee4d051c4620903084ff37a0b981cf7eef7bba92d6dd8d37b49031922eac9501 SHA512 4f84c7cb6b603bcb38d5786de5e2b906add9a727fda03d120410c5687198d5790a760f7de0dc11826393e491c8a171addfe04d15035eb0e2b39e3a4b6e251c53
-EBUILD robotframework-3.0.4.ebuild 450 BLAKE2B c8004b184af96944632e25dcd2215dd691aad4ac32689cc46cb71d2296dded52ee4d051c4620903084ff37a0b981cf7eef7bba92d6dd8d37b49031922eac9501 SHA512 4f84c7cb6b603bcb38d5786de5e2b906add9a727fda03d120410c5687198d5790a760f7de0dc11826393e491c8a171addfe04d15035eb0e2b39e3a4b6e251c53
+EBUILD robotframework-3.0.2.ebuild 448 BLAKE2B dd8f23de11c5c55b9f4a16f7f4110adbb6a3547b1795263bdfbd8f043771e1d30fbd28503feafec1a065b3b25212483b34df4397352aa99d10aeaf7551c6eed8 SHA512 cf112734b9b7f161ca3273d978f0efc5184c7d2a0e9fa4e535da10dedfe1af3344b70c00632c51e46a875e6a9865c45d5f19c071ea2a8fbb89156c77c70d57b9
+EBUILD robotframework-3.0.4.ebuild 448 BLAKE2B dd8f23de11c5c55b9f4a16f7f4110adbb6a3547b1795263bdfbd8f043771e1d30fbd28503feafec1a065b3b25212483b34df4397352aa99d10aeaf7551c6eed8 SHA512 cf112734b9b7f161ca3273d978f0efc5184c7d2a0e9fa4e535da10dedfe1af3344b70c00632c51e46a875e6a9865c45d5f19c071ea2a8fbb89156c77c70d57b9
 MISC metadata.xml 398 BLAKE2B a5783e7341b4070040d6e6861126c20af2e3ddfc0a3dfddb537fad607ac469341cd30376e3ac7a236ea85987c36fd375566643fb65c9f59d2d19e486f1abd8a4 SHA512 dda41087fdeca9037dc39e9ad88a5b7e4ac8472d029a295fa5bab73a189a05ce70b0334d56fd1b45d45d1120fee2af16114c1bf5721b891df53d2a13d470d9d0
diff --git a/dev-python/robotframework/robotframework-3.0.2.ebuild b/dev-python/robotframework/robotframework-3.0.2.ebuild
index 20a491ce597b..e07519e4dfe5 100644
--- a/dev-python/robotframework/robotframework-3.0.2.ebuild
+++ b/dev-python/robotframework/robotframework-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Test automation framework for acceptance testing & test-driven development"
-HOMEPAGE="http://robotframework.org/ https://pypi.org/project/robotframework/"
+HOMEPAGE="https://robotframework.org/ https://pypi.org/project/robotframework/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/robotframework/robotframework-3.0.4.ebuild b/dev-python/robotframework/robotframework-3.0.4.ebuild
index 20a491ce597b..e07519e4dfe5 100644
--- a/dev-python/robotframework/robotframework-3.0.4.ebuild
+++ b/dev-python/robotframework/robotframework-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Test automation framework for acceptance testing & test-driven development"
-HOMEPAGE="http://robotframework.org/ https://pypi.org/project/robotframework/"
+HOMEPAGE="https://robotframework.org/ https://pypi.org/project/robotframework/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/s3fs/Manifest b/dev-python/s3fs/Manifest
index b8e06c71f285..ee448c0b3fed 100644
--- a/dev-python/s3fs/Manifest
+++ b/dev-python/s3fs/Manifest
@@ -1,5 +1,5 @@
 DIST s3fs-0.1.2.tar.gz 24574 BLAKE2B 2b62202d8ceec078ca93c6da895a81648c83e0fbd764dbcf4cb1a0ce2c2a8a7cd16a3cc5162d095ec1272b52c9da743d8c8d21f5b351e6a4f3d63cbd77d9b43c SHA512 52be23ccb2dd8c63675287895d00fda94adf010ac878ca12e5c8eefa25c7076c000b53bb4d2bb7886550cdd0d226cdf51aeee12f2ad7bac46537f190ba72ec2f
 DIST s3fs-0.1.5.tar.gz 27215 BLAKE2B 84f059eafe14a4faf8945c355763d31a49f38c3ae6cb05170dbff0e7ad435f9ea79617fc538d237b565d20a0b11603ea44d9e71339fd40c1ad16ad0af903bbd5 SHA512 5285da6d82de1e68c4cb0fad5a93eeb59fdffba663691d79cafd1b428b60e17fa21e0ff3a50df701cad7f351017cdc538954b0516782e5ddcf6c3d5910f71144
-EBUILD s3fs-0.1.2.ebuild 643 BLAKE2B 4ce4203792d09869c8ecebae5315d4055ac8debf442ddcf8208ab78c4ced6b9bae989c6bfa4e760b71d9da1e2648168cec30cd734e047a2ee5455b94d1063ef1 SHA512 c73aa52b2f5648444e0c741f94dfe8863176d6932c00e21752a7e4941c5f242b0694dac51dfc2dbca69f3f708ee21425215175baacb659f12c05a367206c6cc4
-EBUILD s3fs-0.1.5.ebuild 649 BLAKE2B aee9f59864a1306cc697c8d29598839ea6ceaffec299d94314a88ad95c5d32c322eddbf92c348d6fe0ba714012f400f6aa5f1d25eb5703b1ef3206ee215320ef SHA512 97cb2c458426aaac34968a677173722b498d09ca50592991bd216b0e4c95be9ff1872d9b0bd507259c0ad6107ddbf05a2967346b98c65c0ad9cfe876ccef0b9a
+EBUILD s3fs-0.1.2.ebuild 641 BLAKE2B 0aabf4d2a57f63e07508b6070bab9f33b31cf9f2d50e80041a04ab3ecd36ac49336344003a77079928a40777bd53509d96cc926d903e852c35bb0975091a6c51 SHA512 1b38390b56081b2fa9371d8f47da6f15adf7369f761a318c2e028daab84f62641aa3644f46b13543f588c5facae05b915d18acaeba82758475c604ee8b0707d1
+EBUILD s3fs-0.1.5.ebuild 647 BLAKE2B 600bb2dfc2362c4f476a0d719333a9d7f214a9269ed2894f4534407125d9ce50e14365a35e345d99e28135aea6488fa31b6caba9a532bd7cd1b1306c542ccd7f SHA512 f870dd1abba291c4684bdf4d4b7db2be1ba75527f847f4b02b17f2cd8ece07c7f3898387cdd84d1cd86feeb0b72959b2e303eaa01570a03a505e44a2508176e1
 MISC metadata.xml 519 BLAKE2B c4ab17bb17c687ac00bf13ae441685f6484334dc588f65138dc616f7cd8a49debe0eac5ec11c2d7485eb48855238ffcb25612d687b75ca52d58a921b311e455d SHA512 f8c6696ea3f62243be9f39ea56dafe0bdf137b49aaa3ac2bd793301c043645d2ce63c6cd7cc1a476a8f554317ce518f501ce0775f89f8bebb66e3d3d806f4926
diff --git a/dev-python/s3fs/s3fs-0.1.2.ebuild b/dev-python/s3fs/s3fs-0.1.2.ebuild
index e4fd7d8ab7ed..d76d755a6bab 100644
--- a/dev-python/s3fs/s3fs-0.1.2.ebuild
+++ b/dev-python/s3fs/s3fs-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Pythonic file interface to S3"
-HOMEPAGE="http://s3fs.readthedocs.io/en/latest/"
+HOMEPAGE="https://s3fs.readthedocs.io/en/latest/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/s3fs/s3fs-0.1.5.ebuild b/dev-python/s3fs/s3fs-0.1.5.ebuild
index ffec642e474f..7d5331d9706e 100644
--- a/dev-python/s3fs/s3fs-0.1.5.ebuild
+++ b/dev-python/s3fs/s3fs-0.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Pythonic file interface to S3"
-HOMEPAGE="http://s3fs.readthedocs.io/en/latest/"
+HOMEPAGE="https://s3fs.readthedocs.io/en/latest/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
index 0d97c03793f1..ad811a716dae 100644
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@@ -3,5 +3,5 @@ DIST scandir-1.8.tar.gz 33065 BLAKE2B 020789b939f347de49dba6eb35cf53733a34b283a4
 DIST scandir-1.9.0.tar.gz 33315 BLAKE2B 70c0cb0819f205b3cee37f471f84be2bddb565cd7341e5a28b9f1263f3176450cd5f2edacd63130e4f3f38940d0d3e1a01239f4729ac05e5cf5fd0005e712f8d SHA512 41dacf42734ac9a53bb5bd5d783023236d68bb4883c853fb2ee34224206c577a4a277d4a8cf8f9be6fd5a8b59d9b4fe4568a0c815a62ec84ce99ded933961ec3
 EBUILD scandir-1.7.ebuild 565 BLAKE2B 9d08fb18c8277903a9d1f2e38a2d5da42c095ff3c9c4e9919fd23c408d64156651188feed20df5cc03569419e8c1372f0e3653fac168e5b3de85ab0cb572ce28 SHA512 f46a08f4858fdabcdf8b0221b956aa589bffe1c0c82d16540ca1efccb4dd2925abbb3ef57a5a5a53f551023cca7abb8d17d3b630a1c61d1467de0b1cb7cdd528
 EBUILD scandir-1.8.ebuild 571 BLAKE2B 528c6b3487876b93305bcb3fd631ac0bf7cc469b35b72c5b74865a1b6faf5c4aa65f0cda1e422bb94ef6a8cc90081ea969d63720bece9fbb1b1b9d882df7b8d3 SHA512 86ce0e8898cd439682ac0e2eba784c50eea56cb9ea5266b6243dca2ec3b7ccea00abed36813d8f50e508872d7bbf721fa97771dbcae33a16d68877b6c570cae4
-EBUILD scandir-1.9.0.ebuild 669 BLAKE2B fc8e79afca076d51577a9c5b1b342bfe9648080a4b1f1b7340b6b412fe91ded2d8447ea6fb58c77303a1e7bf0d3520f6c3b70372111e1f3733886da3a686a016 SHA512 42e6aabd0347ababb3a6de8a8a356756937ac139ef560fdd0ac36efd6b86972e0a7bac62282028c1b35344421fbce274dca869625880b07b69e302ecc7d9df8a
+EBUILD scandir-1.9.0.ebuild 670 BLAKE2B 37015374479f40eea4fbc5375e2476d1c4baae333dcd8476911dbfd175f428338c627379b86647ed0a4ec05237908502c86f500776c35fb12cc7a0d114fce71e SHA512 c6081457a1bf4152e2fea399e540b1854bf64cfed5500c8308abe44b15a8f45a5f787adf46c3043f2ae2b59fa18ae28834dbf2dc997be52e42220f28d85f8874
 MISC metadata.xml 495 BLAKE2B 7137cdfc395a1e80576885adb3c870ba25034a657c342b3819328f276d55ebf6d7756e57644a6ff4d45ca07cdb561078dbb1deb1b993816c7088850dee45c3bb SHA512 e762fa761b5b00288870eac3af8aed0d05efba207d83138adc873da902a7e197b710caeb87a3083e5f23436f4a2c799996fe07201195de065bd430b9c35183ee
diff --git a/dev-python/scandir/scandir-1.9.0.ebuild b/dev-python/scandir/scandir-1.9.0.ebuild
index a4acf3d55607..e03af6f3db8a 100644
--- a/dev-python/scandir/scandir-1.9.0.ebuild
+++ b/dev-python/scandir/scandir-1.9.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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index b7263e54adbb..ef43edc5d5fe 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -3,7 +3,7 @@ DIST setuptools-40.6.3.zip 839328 BLAKE2B ddc87213439ce2ad96ba54218bd5b3e41a7c31
 DIST setuptools-40.7.3.zip 842920 BLAKE2B 53b5845f157d088fa0848384770f185b2daf8f1bc0304e8d5ab3eb5cae44a42133e7cf2f655e95be351733760ed401d55e3717c4a1257c77644796c08cbe67f6 SHA512 fb61e4d7ae620684b128bd60112938a4a9721a82ed3aa4daa774837a2db60e989d608ce2ba7f51393f412b78244d6f4c8f1025416b137d8ce01a2c0375ffec65
 DIST setuptools-40.8.0.zip 845071 BLAKE2B a76b92a7e3a5cd87d74f3ff5f49fe4c6b2a1f0c5cc3b04219f6f773585be479ec5d092185129ada1fe5c5ef62714687beb3a316a6d50b559e9224aed468aef24 SHA512 f14976a76bff74b7494d44fcfffa511de0d142b4d308fcbf87b34c31c51491102e152acc11a383c5f6b693d1b18eb119c5186ca23deb12b2bbf186794b062868
 EBUILD setuptools-36.7.2.ebuild 1923 BLAKE2B b7f55129aaef27eee778fdfb97ef06f6f70e558402fe503dd73c7a23502e6454f8c1f0e8182770d9c3334ebe3c1a21eb19e3ee8a0bc26ed99a819e7484b040ef SHA512 98b9465fb954575ed3a4a0b3b5be1c8a4c30d60112d4d222e95786a5a221a5a13799c4055bf7cd074476bd7d65ee7cd5c9a4fcad2a571ba83583e67751bb8376
-EBUILD setuptools-40.6.3.ebuild 2055 BLAKE2B 8458f8cce4cdcaf3b3c38518f3a9f63773a482954dfb078546cfa5c84db1c50fb0b53f0cc2064c5a231e82b325d9290ba1b3819ad39f40502807c973828a406e SHA512 8eb1e1bfc30dbad6476163c47153789cc6a4fd74f076651dce67fa39d197fb7977c52648819f5932f3d87ff96d99e0dca0940519577bb622571aadf5f2445869
+EBUILD setuptools-40.6.3.ebuild 2050 BLAKE2B 2b5aa7cfc64d6d9bca4e6a05e61c443ea4323cafa558756a240b3b04ab56d1304609be3e84f782fe5bad91063f899aed7d629ba6b8bdf9d05bb13297616153e6 SHA512 cb1caf4278307d71ef23c324acf9f0234da6a2b69932ccd418cdcb26ac82f782fefb104aa0755a7fe62a8f4373b2c76f16ccf0141dd96087cfecb972277e9c3f
 EBUILD setuptools-40.7.3.ebuild 1993 BLAKE2B ae75fde0a8d0c778463f4ac50634b4b9f93b5ac15e5e8bf1c7ea9951fb8fc65c7d3ac8b11d57de1516b3d47e99a2756b492b10ce3b91eb401402d14da0d511d5 SHA512 06945865143b937fb74b601f1f0c598c93a6b3418432ab7963ebe44c6debf5d8823d5b0875d80ff15cce97e52dfb0ffab28914414ae8ea8ab530cb4efb0e6d19
 EBUILD setuptools-40.8.0.ebuild 2020 BLAKE2B f0ddf37f540afaf0bce258603b0d453abfa25b2616a8efc9c8144b16eeceda29b992bdeac4ef628e72fc073066293bfc30c8089944f5e24f191ee3f481d4e8e4 SHA512 269167eb6045429c55096d9daa3b752552dff68317506ba3dede93d4a84d056c72bcbad562bd94ec1d8d1e33e7fc1e8454d172d6a3357ddcb2dc634f739678cc
 EBUILD setuptools-9999.ebuild 2020 BLAKE2B f0ddf37f540afaf0bce258603b0d453abfa25b2616a8efc9c8144b16eeceda29b992bdeac4ef628e72fc073066293bfc30c8089944f5e24f191ee3f481d4e8e4 SHA512 269167eb6045429c55096d9daa3b752552dff68317506ba3dede93d4a84d056c72bcbad562bd94ec1d8d1e33e7fc1e8454d172d6a3357ddcb2dc634f739678cc
diff --git a/dev-python/setuptools/setuptools-40.6.3.ebuild b/dev-python/setuptools/setuptools-40.6.3.ebuild
index 1cf98a28380c..31c75522435d 100644
--- a/dev-python/setuptools/setuptools-40.6.3.ebuild
+++ b/dev-python/setuptools/setuptools-40.6.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~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 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index c50d2d8303f4..5856691f6041 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1,4 +1,6 @@
 DIST slixmpp-1.4.0.tar.gz 862826 BLAKE2B 940c6c66f7f98574c88da6fbfaadf7103c4469cd198e096fbad57978f5e206c53b86933a930a24a8b891415b961c4a255d4c9c25885a8bd630f5d6185486fb6e SHA512 586fa5156641d786f9e45df8e6a1a20b8cb2dc2b9baef2a0713daa9ab8a3321202fd4b31d5753cf2659cc9311a4842bee9991a7fc295e62dfd78a869d8619d20
+DIST slixmpp-1.4.2.tar.gz 864608 BLAKE2B 9689b274a9c787174248c094329ea33783627a45ef39708a611013454953de4fa8799ca5a35950a3f3ed49bebf5c56f6f2bea079bcc2a3dce7d2648bfd812371 SHA512 3b3356352af8d7ec8cca15210c0524ce0bb5e313d8c5455bec13e82aec261f6d094a99df9f08642418a0e4abea4ee1ff607e42e1c166b9be1c26534b690c330b
 EBUILD slixmpp-1.4.0.ebuild 743 BLAKE2B f36566965aa8ed05c1f7d545ee212988563e02b07a885e2ffe48c92f417761d35bcc239b789d7d6811d812d87c69f26beb929dc7d352ea5849b9c0a481a5d995 SHA512 1ffc207ac454b9dcaf57c3c2f2a329096ffd0809bfaa9c617c39fe36e06798a4a3ebef0db4a1750799f19f9cddeba52c6948d19ef8072491722ba728174d8b31
-EBUILD slixmpp-9999.ebuild 743 BLAKE2B f36566965aa8ed05c1f7d545ee212988563e02b07a885e2ffe48c92f417761d35bcc239b789d7d6811d812d87c69f26beb929dc7d352ea5849b9c0a481a5d995 SHA512 1ffc207ac454b9dcaf57c3c2f2a329096ffd0809bfaa9c617c39fe36e06798a4a3ebef0db4a1750799f19f9cddeba52c6948d19ef8072491722ba728174d8b31
+EBUILD slixmpp-1.4.2.ebuild 771 BLAKE2B 8c508f4a1f66e065896f391db831c8984fee8226eb59a4a4400c4ad54cd538991e4a411615321d812ee9b067c5e65a638d36577f879ba26d508b7d9329e617af SHA512 44547cd0b3b90551673daf234cdbfd2c95f212b74849f196714338049641ef528ac080b18928a3dd966f301f8d38229492ab441e191d0f6f86231e052258a966
+EBUILD slixmpp-9999.ebuild 771 BLAKE2B 8c508f4a1f66e065896f391db831c8984fee8226eb59a4a4400c4ad54cd538991e4a411615321d812ee9b067c5e65a638d36577f879ba26d508b7d9329e617af SHA512 44547cd0b3b90551673daf234cdbfd2c95f212b74849f196714338049641ef528ac080b18928a3dd966f301f8d38229492ab441e191d0f6f86231e052258a966
 MISC metadata.xml 321 BLAKE2B 263ceaeeaf4eb1405ad1fa44a5a064ad778b1759e9b4f72dd4e110b28c4bc904897029441ea4c5b1d577472f13dc1baebd2bca0dd11ec7f624708eefed6d4db6 SHA512 1d3070cf4fbf0feaf8473e8f9e354f401c64cbd526f94bf42721528fa94852146084219beee4c344138a1d1241783b12a47e6a4fd9de95cb330dd82baaab92e5
diff --git a/dev-python/slixmpp/slixmpp-1.4.2.ebuild b/dev-python/slixmpp/slixmpp-1.4.2.ebuild
new file mode 100644
index 000000000000..aebd4d6f2603
--- /dev/null
+++ b/dev-python/slixmpp/slixmpp-1.4.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 3 library for XMPP"
+HOMEPAGE="https://dev.louiz.org/projects/slixmpp"
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://lab.louiz.org/poezio/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+RDEPEND="
+	dev-python/aiodns[${PYTHON_USEDEP}]
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	net-dns/libidn
+	test? ( $RDEPEND )
+"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/slixmpp/slixmpp-9999.ebuild b/dev-python/slixmpp/slixmpp-9999.ebuild
index be8cfcfecb51..aebd4d6f2603 100644
--- a/dev-python/slixmpp/slixmpp-9999.ebuild
+++ b/dev-python/slixmpp/slixmpp-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 PYTHON_COMPAT=( python3_{5,6} )
 
-inherit eutils distutils-r1
+inherit distutils-r1
 
 DESCRIPTION="Python 3 library for XMPP"
 HOMEPAGE="https://dev.louiz.org/projects/slixmpp"
@@ -22,6 +22,7 @@ fi
 
 RDEPEND="
 	dev-python/aiodns[${PYTHON_USEDEP}]
+	dev-python/aiohttp[${PYTHON_USEDEP}]
 	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
 	dev-python/pyasn1[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/soappy/Manifest b/dev-python/soappy/Manifest
index d188cdfee7f3..3258ccbdb0af 100644
--- a/dev-python/soappy/Manifest
+++ b/dev-python/soappy/Manifest
@@ -1,3 +1,3 @@
 DIST SOAPpy-0.12.22.zip 172855 BLAKE2B 119232713da3474c58c925a2652f5739f70903ce8204a3f999bc511df9387cfc33d9d812ea3735d04b37e7ce45d6c0f5a5a11c79849406c2d60fa6ca91afe61d SHA512 d75d0bf8e88c8ecae57f51a201f9ab6f24fc41856ee2093e7e2e73e5d8618c9a766a69140df28a24b6d8493b53555c09502684c6d2fd78e90a3c53bba52f388b
-EBUILD soappy-0.12.22.ebuild 1004 BLAKE2B 8c0f0e0ad5b2f843b7c1bb04617b584863a07771ee474fe0c55a4bcfcbc7ced74fe7e4911824c39120d1e55215d6cb6c058df2211c8fc0de6cc954d39ecdeb9c SHA512 8d2afe4cb265cbcd67e60500b97cf40ea87889237d6a31fccdcc486619f68b78dc4de632225826e41ae3b7a92b61b5d6ca918ec025a916741432455f9ac9b1e4
+EBUILD soappy-0.12.22.ebuild 1000 BLAKE2B 54863e9ba17c0991e30397ac5a7ae83c14a02799ee588eb52582d1867d85e3bc0a5cc799a7d04f93980d986b1854cdfa6747f87bdc92d1ae55899775d5cd50bf SHA512 7f5e6d78fd6c64267436e9a735cec4c2db9bdbb08af7dfe81e3bb448d5ccffb2ae8f5fea30f960362f7d322da9a63b9b127c551d92b6270e8be21f5a8fce2945
 MISC metadata.xml 363 BLAKE2B ef3fe590c0ee03d9316b5f70d2c4eef13be725830b11d2c5071c3678efe724b4572a52cf967844c5b194064ea464e40d6f4faec5fef804e07bf98ef9bc695711 SHA512 09455c1710a40712fec6cbe5680091f3186d755fbcc2c64ae4fe4c9dd50bcbcab681a2e9aefd6390c12c775b76bc76aa7a04a78a8ac23b281efc908d14285742
diff --git a/dev-python/soappy/soappy-0.12.22.ebuild b/dev-python/soappy/soappy-0.12.22.ebuild
index f4a70b92d297..40ab700736b4 100644
--- a/dev-python/soappy/soappy-0.12.22.ebuild
+++ b/dev-python/soappy/soappy-0.12.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
 
 IUSE="examples ssl"
 
diff --git a/dev-python/socketpool/Manifest b/dev-python/socketpool/Manifest
index d63f4aa75f5c..8a67e0c1f932 100644
--- a/dev-python/socketpool/Manifest
+++ b/dev-python/socketpool/Manifest
@@ -1,5 +1,5 @@
 AUX socketpool-0.5.2-locale.patch 615 BLAKE2B eecb66a15dff1ca068da3147b7e27618f49cb414e34a27b10949565dfac46f5b714bd00bcfc152c9d3b98b59ae4282fa5431aff61295086abcf0e5367f45954c SHA512 df27a0b1cc8ef2475ad8c68e3f77153ccf5397e962bfae2f6116dd37d1ad3a1a45cfa0912ee4d4597560004b8875b609bb8b0a6298861651ff23ff2e70955dce
 DIST socketpool-0.5.3.tar.gz 9793 BLAKE2B 89b7b71d9f05f7f5e560eb3cb5e7cd4d2254ff971066d236b98903d790dd96f6c580333e9fafeab7314c50f499c9617df706a20efa1c52de069c583b6dabd928 SHA512 6d16a18927672157703fb5a29f4332241f9ddf743dfee8f2606d600dbb75d547f2e0dcc0398febe55df3319829a80b3f537b5877679e4f674569ef55de78c1b7
 EBUILD socketpool-0.5.3-r1.ebuild 950 BLAKE2B 0aece636ab58ffad1d4a24d3850c0bbd53b5ef23aa94c68421cd547ba8a524d4a2b416cc48eee50c0d69fc53ceb2a8c4ab0c7b5d793a0236e0f5b23b757b8919 SHA512 b497be8c22c5aff675ad25f66f629035fc8e2a2aaf7dee90b3631c1275978f8e6ba8c48168d9f20a7f447c0476855a49d6b8aad0413cf17205fb9c2a2e54c8ad
-EBUILD socketpool-0.5.3.ebuild 943 BLAKE2B 6f7a8bc86c731583aab2170c45989c99400a4a6045457e08b6c613a798780d951a71d051680cdbd7162642b2faafbafac0f2c57a94c009a9afd8080f1907a920 SHA512 da84c454d5ac42ef4174d448b26db22be480a80bcbf6b083c3e70430964da5b55ab51849df5fbb0f7102bdde127fd0757e302f9b7892dd7768ece34497207436
+EBUILD socketpool-0.5.3.ebuild 939 BLAKE2B bb084d9f4ebeccbb8d1efe4e99df6c80578deda2de77cdd585d4478953eb35473f242dffe8344c18b72c24da102f8b4de4f54cbdd6053dddca76ad61be840083 SHA512 7fa2749d24ebbbadc67810df7b8a3bdade7e70da3e3d655ad3b24e24ad40384668590f9fc152efe30f19c4d5e85d23f6fe394016faf0be5007cb09cd61a80cc3
 MISC metadata.xml 383 BLAKE2B bd4f1eccf7f3fdd7c416bfea5e96ff6b1b28b4bc5e703e1e236be4932e20bdbb8d9bdf6712f0bfd8845b49fe0a7ebc032f21bfadfe419554ce54c2b790cf73ce SHA512 3051b0487ab4dcdf440c36b12829a30c03db7256c99eef6623497b8223ebf6cf188a9ae054342c468771b2a38f8b3508ff0f49aa19398f3aec0a25a7bc1e9248
diff --git a/dev-python/socketpool/socketpool-0.5.3.ebuild b/dev-python/socketpool/socketpool-0.5.3.ebuild
index e73308b6f454..0075244a1b53 100644
--- a/dev-python/socketpool/socketpool-0.5.3.ebuild
+++ b/dev-python/socketpool/socketpool-0.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ DESCRIPTION="A simple Python socket pool"
 HOMEPAGE="https://github.com/benoitc/socketpool/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~s390 ~sh x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 s390 ~sh x86"
 IUSE="examples test"
 LICENSE="|| ( MIT public-domain )"
 SLOT="0"
diff --git a/dev-python/sphinx-bootstrap-theme/Manifest b/dev-python/sphinx-bootstrap-theme/Manifest
index 64d997bb36e2..d7b53f547276 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 538 BLAKE2B 5dd5b20e7f382157d748baf695592c48643e97af2ed8557f565b799578b11356a1785e32cdd98b2dd1a6c29c4468c2111770d8262b84ecd5dd7f7501fde7b415 SHA512 deb99fd8023fe6c8a13f694735828654fd22977b8cd31a427f6b791a45ad6e53d0685761051111e8809547f24eb8ec403bfc5d6b403e2ec0a09795ef021798c1
 EBUILD sphinx-bootstrap-theme-0.6.0.ebuild 542 BLAKE2B 865fd5d6a280bb83e979d8f761541e0d4062a7a53aa97ffb62a8cd2c8484bb161874a44ef21b3b3646bf643cbe2b2714eee1b308c0323bb36609d0a02cbfe7fa SHA512 e20fd1c014a31d6fcb66ae67570f173fcb037a8ab28ff486b37f65f33e859fd5b96d887489d0473c48872ab8a8517dc6f28f2699c774ff59f01f28e311a032a8
-EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 561 BLAKE2B 5d450a2f04dfbc6d721970c092ebfd4e3ebf41b8ff043b9c95b7729ee818402d6b842d769c10901e1d19039726c93ceb0cc0f8f64116384bc783483169a20923 SHA512 79f58680dfa5c0d6f86a3923fccf2d2502b39fd77f34d9d728935ab72b25eeec9dd863ad1d83674bc30295413e9e03d1e37f662eab7e45a9449b6cfff3ff63cf
+EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 565 BLAKE2B 318cddfc2c3fe6aa09e9e144ff5f2feb43eb33c51d5c52e17592bdf5fec3a51f98007997d1e2cac52c0030f468c2cb9a5813ca4faf4c31ef85bdd9f837e5e249 SHA512 762b2cc8981af9ae60fbf681ee15ee1e23b0b0dffc0814854a90dd7c3c1abecabec085b0939e6a7de58a798c8b1497024ac67b3787bfef249b88491fa6417d42
 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 1d7f4856ab90..83f25017a9bc 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index e5682b51a675..e7c85c9180d8 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,5 +1,5 @@
 DIST sphinx_rtd_theme-0.1.9.tar.gz 698461 BLAKE2B 77cbf582412c4c800d18979165f501a684c1c4bdfd2e488b75ab10aee86e5696481751b7f146fe9b259ecbd94b7d456ec86f24ec2d4ef2333e79991c1846151f SHA512 e793a4da6209c26acb261efd03e6591561d7fbad97b3d7ab0a105e125a15a035d2066a1b1572a95954304d361abec39d9e1e401cd7200c6206cc8c89ad134d0f
 DIST sphinx_rtd_theme-0.2.4.tar.gz 1392456 BLAKE2B daf2365d74823465a73ea37352f0a8e85f196ac9c89006e79610a2981b1a266e523865c3b6f7866fa9e77a856c5a6fe001a2eb114dcb252920b19231eade9709 SHA512 865b09febc1c289d47a8be3f3d7caa9d2a4715b350e2e2d058855831321a6f870e8339b2ef22eafc2b9fe72ad48f96b8d2fda4bc032c5f8dcdf23f314869cfbb
 EBUILD sphinx_rtd_theme-0.1.9.ebuild 535 BLAKE2B c3826e00c2b5031a4a62e6610ffef29d874171c42ad1cb3d1e85f42b66b37d54728bce53849beebb4b4a4f07af638d093ed96474da22056be86e2e854242f4d8 SHA512 d2319f60ce16e54a0128181dd514ee15834650698bd92ee0c5e8a11f3c698effa7f2fd282e0def285e9a8a0a2d688ae8caa4d83953c9cc9548d135844902b87a
-EBUILD sphinx_rtd_theme-0.2.4.ebuild 563 BLAKE2B 6081b9c76a90c8999af37ab2cb996fbcbc34de1b3c71acde8991fc1c1690e113d46a0cb1b8430da3c313c4b565997688f5a90f51318a1c42058a4bf74dc41b58 SHA512 2758700735c219cc778ba82d066c9c86ae2b901808a851a803485a1dcd28974f08f1d7019df12bb1ded2c49fa4d8cf42fe8e5801d5482dc632caab2b290044a7
+EBUILD sphinx_rtd_theme-0.2.4.ebuild 561 BLAKE2B d5e8a746434d6dedc76175e42c39bef6f1a679c9dcaadec628070331bc134a6cf3be5ef61d58183cb8a1bcfad1f732e863f5394f36cb1b73d85b2562dbff4c72 SHA512 1e63c836bdf881ab65cd51a3bdb670388a80ae909114f3b325eba418a8a922dc431c15b4b9aeded1b463044b953a2385d21e126013304bb0bf8e87f9d68cf6eb
 MISC metadata.xml 393 BLAKE2B 0964b64f29bebc684900cd181b7947897d10f617c091d6936ccbfb27f91356d83de2ad0172a95245b363cf6005fe2defe8e80aab2bbcec5f292bc79fdad7b7d8 SHA512 f3ccf901c6d0a891880bf06e1708a1e19225cf1ba60c3cad1e8bf5dfb665274fac7de87b4363734f8f299a9af589e3de64b9e38ca14a405fe33e4c63321e4572
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
index 69445921a796..7dfc02c2706d 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sunpy/Manifest b/dev-python/sunpy/Manifest
index 52429a42b3c9..ea1f129c6f12 100644
--- a/dev-python/sunpy/Manifest
+++ b/dev-python/sunpy/Manifest
@@ -1,3 +1,3 @@
 DIST sunpy-0.8.0.tar.gz 6336169 BLAKE2B 554e64c27bb2c9c68629401bef83da3248a841c728d040fbda77465f04bd2c6a2cfb48f3a5df2bb0b15a306d6664f635aac7342e1135cf3bc61e1436a4db934a SHA512 7996fdcb47e4143159253180b2250ea7ac4aa8fecf8d3f1eae930da018d39ce4e663c843b4b0532e900f97d2bc9fadfd7c17837f4f045634820059a5af802eda
-EBUILD sunpy-0.8.0.ebuild 1418 BLAKE2B 9d091c41e5a78713f4ad9c1492e9b1bdea9630e57c034bc3e9f9bdd2397fdaaf4c8d450a28e5ea1d544d8b90296ab9bec91d17108dfba88f401aeb1091df2c76 SHA512 55b878b6b781450079f921c183346d955767e15a27c8dfee7f736a9d3c0971c1e01e2b2609094e4d054f8026c876304b53fea7ad0314fb8a99fc7ed433c1fcc2
+EBUILD sunpy-0.8.0.ebuild 1416 BLAKE2B b30768d3dc5b04856eb8311e03e8a46747d5e57c674863e82df923f6ba42e7e5cf9672551aaf3484a237836d80d9f1bf7c5261ada678af39c52bc3528148d988 SHA512 4d64d48c80f6aa229833a961b2ffcb98f78bfe8e0fb73aa22ab3ca58ff5627b1076e3344ab2b4a0e800cd8f041787ea5dce35053d0fcfcf3d6096528f5c39590
 MISC metadata.xml 746 BLAKE2B 6e29c441458f02b55f3daffb617f9fb6d6df165999ca690403a3e563448e21a08a3648dbf110c25f29f4590b4831593c9404277471c89d716ddc9c8f03781a51 SHA512 73242a446a71a5f670e1993dd20ed2a66f06a3f3751e351edd9f24a2e77989f0aafde489b348d51264c0e4b1eca5fe34552b7378dc0bd19a8c351294adeb2b26
diff --git a/dev-python/sunpy/sunpy-0.8.0.ebuild b/dev-python/sunpy/sunpy-0.8.0.ebuild
index 4aa502509e14..dc3748abcd35 100644
--- a/dev-python/sunpy/sunpy-0.8.0.ebuild
+++ b/dev-python/sunpy/sunpy-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Software library for solar physics based on Python"
-HOMEPAGE="http://sunpy.org/"
+HOMEPAGE="https://sunpy.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 89a6dcd601ed..67bcde194313 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -2,7 +2,7 @@ AUX tox-3.7.0-skip-broken-tests.patch 1607 BLAKE2B e25c18c9706914a8e7e209a7a9eaa
 DIST tox-2.9.1.tar.gz 1855982 BLAKE2B 3e2f5fd3d3e45e54f96b0a6fc8f9e98bfba3b48540cc2922a897e016b5aabc9974772c9b897e0fab7b38b00f99478a063ad988ffa8b65fa53f684997334e492c SHA512 ff19b2bb7ac963379f1cccd4973ad9eb4dabfbda976cde7caba50ad010d8fa57c1cba91d63e3e0512e44cc7d350bc9270fbd9b30db1bd55f7d9c239e7623d066
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
 DIST tox-3.7.0.tar.gz 267854 BLAKE2B 9b32e6010f47d00e5ad81b31a8b9e809162ec9438c8a98df3e86c37692a3040bc0158d106f5698cdb6e240be54db80ce8b3c4c8710732f85d9eedfe1a0814852 SHA512 7e12f3407c1ad51ae5839bdd7907c7b05654f3a145270573326fbe3903d22c6e63a930c242ecaf1eae746043da090703e48ead7e27973294711f45077217ed37
-EBUILD tox-2.9.1.ebuild 1307 BLAKE2B 1250817a04c4eccd2471adb950ce316092b95b0d8c015a606dac2f0854ee48e32de220a5171b36e56c240a67766e6e929d8e8052a069be3651fff04d0d0ca014 SHA512 672f5fb09123ca77fc4ff93da6c00a82b02e1119ea9dcf5858792ca01b07a17ff5d0137174dbce0ffbe75b15e5c2aaf26811f412a258da6c0c22b9101202c077
-EBUILD tox-3.2.1.ebuild 1940 BLAKE2B a8998a74cd660ccbe8ef03d079dc54c0126aad2451cad7403c4848c32d0ba80db99bffbbe66bab215b10b7165db82b7c4d4a50159cd8c0adc6b7adc99d922958 SHA512 3eb02da7e9481434cb64c3b4218037bc58d4c1b15177f37d7ff236b9daf0f097ee94e6f6bcbc0c6f9ad03f1a31d8c8c4a090003b9b1cd789ca5b3d8ff6c48c18
+EBUILD tox-2.9.1.ebuild 1309 BLAKE2B 1a81ba37f30ec36ec7722d46f45c033412e82888d8896da872da33da6ed0da09279b6c714df6fa3b02f3c46d70e1fb418ae6d5231b2b042596f84b75cda319f4 SHA512 56abeaf81103f32af21f1c823585e35ae322d6ca75911a309da71cfb7cb735e780f7ebc92ac066e8317dc44133e4bd9aa7823a8d68fb69b8d6884a46b9bd66cc
+EBUILD tox-3.2.1.ebuild 1946 BLAKE2B 5ddd0be84bce5de699780a1a5de2229ac6d214f3a3820d52ed8b67c21b9eb17f3139509e3b9b9ba31fda8e4cc06d1561009c369607f50bca2211eb36366d50e9 SHA512 105146abe269f4f85c35a73a1d3840d0582a17bc3929a1fd9a33618560232d0a124ec5706a263923c5f635fedf1a2d75e4263819b460d81bc3722ac3f866d822
 EBUILD tox-3.7.0.ebuild 1270 BLAKE2B af455ec8766bbb88af6eb36be75cc287d9b7ef977e91076ec1df07c75cbd686df6a6043c5445e8531f0e0dbaa30b5bd953589d17ad53d8fb2d22c5467a5130a3 SHA512 b4089abe7796147979f7c3709af0b07a89df482988d6d3a90a0fd3a1416fc7d265e809a9c09bdfe5cdd114b68da4e075645ec86aaf31dbc67fd7423984249ae1
 MISC metadata.xml 465 BLAKE2B eba47520bf4a2f615fbfad7c26ac19af51d6b9c0ef8dff0212a6723376b34a0d17386f05b3f4dd3ab715b9af867fabc038c300fa8df357c648dedb03efbeed88 SHA512 9bcd58c451d7196c9870a04b76a504090ec217c7c88f47f17e141c5c9519fc41d24dfc83d97eb48b935d90b621a0ada1ed664fafffd7880e91627e56259b3c76
diff --git a/dev-python/tox/tox-2.9.1.ebuild b/dev-python/tox/tox-2.9.1.ebuild
index 9a3650e727ee..6238e8a7eb4a 100644
--- a/dev-python/tox/tox-2.9.1.ebuild
+++ b/dev-python/tox/tox-2.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 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"
 
diff --git a/dev-python/tox/tox-3.2.1.ebuild b/dev-python/tox/tox-3.2.1.ebuild
index 50ce564c0619..955aad49484f 100644
--- a/dev-python/tox/tox-3.2.1.ebuild
+++ b/dev-python/tox/tox-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc test"
 
diff --git a/dev-python/twitter/Manifest b/dev-python/twitter/Manifest
index df287bcb463e..675aa4b04a06 100644
--- a/dev-python/twitter/Manifest
+++ b/dev-python/twitter/Manifest
@@ -1,3 +1,3 @@
 DIST twitter-1.18.0.tar.gz 47695 BLAKE2B 2604370a303c479d371dd0c5b6c1855b990c38cf0d9ef710c740ae69740d0cfddb2a18d465deaca2146e43debea0175f9e444c0a7bb5931a95f9124d80237ae6 SHA512 dda752b194efe88df88a2c9e2279cd3045a36c466f05493727a73aaaa74ca99873c1dc1742491f2f4092eff5afb9ad7680a779f16041d9c3dae7c6eea013ea48
-EBUILD twitter-1.18.0.ebuild 444 BLAKE2B cdc27ddbbd9383018b63039376575482f90caef5b456268dcdacfb15cca4dfc4f3b2c7dcab844bb77c33a8013bebc3d83792cc2ff80b0154f05e96367685a2f1 SHA512 cd5161315e144b632ffbf287b6747482bc138a3682be481f3ca3f3c067db439dae41e949463f555226c72d42c14294c843f7ec72901f6f044904ecd692536505
+EBUILD twitter-1.18.0.ebuild 445 BLAKE2B 88546a1dbd161d1c86a3e8f8a9505a8e3edcbfda9cff6467b4892623a23f0c7b0a63d310baca12f4bef206ca155c0172ae6702b7cbd98e26422661a725d55b3e SHA512 4810d67c5af49f56f4b393050f7e0a0c8e802e742b7cd0ad1f2ccaf8b78b4ddaf9197cb4072e4501f564aea05a7cc168403980d09d8d97b72b65a225bb1dc45c
 MISC metadata.xml 430 BLAKE2B 2e81a109681748c54ff8adabf59b7505651b87fd1e7bb41c0582eef0633dac9276961d833b8bdb3117683eab4483c17e06b61b82e82a44770c9ce408e8241850 SHA512 a09ea3d4855ee4999f5cd2b182066044cc578abf5a68bf6dc5c0c6fb2e3913aae825d2a5a174501957dbcd1fc92d047f4997ae067fbea6d2f674ed1f785f820a
diff --git a/dev-python/twitter/twitter-1.18.0.ebuild b/dev-python/twitter/twitter-1.18.0.ebuild
index 171b7cde139b..4a99f711a26c 100644
--- a/dev-python/twitter/twitter-1.18.0.ebuild
+++ b/dev-python/twitter/twitter-1.18.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="An API and command-line toolset for Twitter (twitter.com)"
-HOMEPAGE="http://mike.verdone.ca/twitter/"
+HOMEPAGE="https://mike.verdone.ca/twitter/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index 4789ad555d30..2ccc948a86bc 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1,5 +1,7 @@
 DIST typed-ast-1.1.0.tar.gz 200587 BLAKE2B 09dd6d65513a37a57ecb6df2a505100f5fc08a49a244f1cb83af363d20d9b1b76f127ec5da6ef115a56ae6dc560ab40dcaae4740385fdd9e305bfd2ec26fdbaf SHA512 439e949082ee5cb9434fec99021c08401a46ec2ad16d96296c6440aa1fd8158f6605efbdfa55e536c3fddd4018bb0f4c5ee4d5a4a32954242b7902b9ce3463f2
 DIST typed-ast-1.2.0.tar.gz 202702 BLAKE2B 79e919019763f4af0a2f24108cfa418693dc5a1d791a0045a49fb128d715f91ec5bcca6d4bb6812e19b7a5438bcb27d239f2aba7de8b859d4e8e73027c59665f SHA512 801f59cdce48f7be3045c44d207a5a269bc1cd5ca9f0536d3d16f10ce82794a7e5cd5d3c83982927cebc52e1b1dbd47532140bcedca0ca4ace45b726aa0343ee
+DIST typed-ast-1.3.1.tar.gz 204285 BLAKE2B 209911e0dc7291ec4b48ce7c5163d738ccd0978027d2bb1b64004c0f08feb7567d83ba8f04dfe48975ecc2116ee365a903f455dddcaf1bc07cf5deb08572f92c SHA512 390547485878ccb7e3a168e24b8b63c1784888ecedfae980562c3c0c0073c73ebef27190feeac99745c205d18061ffe5e3eb0830068968176ef2a06fd3ae4b2a
 EBUILD typed-ast-1.1.0.ebuild 414 BLAKE2B cc41628646ebce7f0ffeb31d99674796854de0a5917ac2df205a38c949930e2d54834419d5c519a899b12670d8027f7fe2105b124ec5a3936f45e28c05c561b1 SHA512 1a3d8f8740b940536c35d173f2faa8ed555efbf018360fc2ee5f1bad5066892e84962c73ff689f0807becbac53d3b16483e34db144c7669a3dbcc9092cc3c8c1
 EBUILD typed-ast-1.2.0.ebuild 453 BLAKE2B 39f41610b7521ff2024a3837ebf0f4e6e15e310081d201b84a40d2b9e857461353d2e1f6715ae64c57fbc4e739c22b3a0c1619e5287b66e39ae33aae9574c2b1 SHA512 abd67289ba301dd8fc832ae538d10d071e17238d7360c104dd81de422cb8704ac100810f82fd9fa3e1b328e96ff9d090545ec56429d1a8d330d00f265b2251ac
+EBUILD typed-ast-1.3.1.ebuild 453 BLAKE2B 39f41610b7521ff2024a3837ebf0f4e6e15e310081d201b84a40d2b9e857461353d2e1f6715ae64c57fbc4e739c22b3a0c1619e5287b66e39ae33aae9574c2b1 SHA512 abd67289ba301dd8fc832ae538d10d071e17238d7360c104dd81de422cb8704ac100810f82fd9fa3e1b328e96ff9d090545ec56429d1a8d330d00f265b2251ac
 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
new file mode 100644
index 000000000000..cdd9b6b66a78
--- /dev/null
+++ b/dev-python/typed-ast/typed-ast-1.3.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Python typed-ast backported"
+HOMEPAGE="https://pypi.org/project/typed-ast/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
index 945cc0a2da52..e9ca4f0d7e9a 100644
--- a/dev-python/versioneer/Manifest
+++ b/dev-python/versioneer/Manifest
@@ -1,3 +1,5 @@
 DIST versioneer-0.16.tar.gz 37736 BLAKE2B df66304770ca0ad85cde13ed1870df5901bb5526935b3a17a28dcbb267db3a8a822c1f43b16643c7f7237225c27b50db94cc0d4c3e87dd58a004475fcd64bc54 SHA512 90604d69351c822dd5a1e8eaddbe6af2e77895c7e29148a75306833f04c59e18ae8ab6c928860ce3b8c7ac46245f2ed856485fdcffd790f436e689c408ddeca3
+DIST versioneer-0.18.tar.gz 40552 BLAKE2B 640c010958a0178ec5ec5f06c986d83e3bc2f49df95583c4c90d3058449dcca5c7b5421ee5f2f56905b1d949bfe3bfbd87fb23ebc868ede591d078d811ccc2b3 SHA512 8d4522932b1f6aa1c13211008a57a572d54ea677cbdecd7d563ef8f77c76ed5d59f58f2e3be38a01e8cd102c264baf5c8949e9c17ea98d686ac497f8ad8b0011
 EBUILD versioneer-0.16.ebuild 811 BLAKE2B 9e300d0aa903e9e7a4a168d48c3f07e5b11679832400c997d6a5783fd9065895c9bd900eeb52043e7cf6f96c56bef0d323c32d3ab392e66ac020cfa2683676c9 SHA512 13bdae5189ecd827f825c9ae9fbde5fe1e96686afe98c9563a80d0f79ac9c8c26657c31f0619864ae2c9d095f7852d3aadf667f6938b1bcc989c3321260f6fb0
+EBUILD versioneer-0.18.ebuild 814 BLAKE2B 07b421f2612acd9289cf9383b437cf82764062a7abe4cfd65421f7585fb84ce9d6363b225f1ef20863c6d6cd7e1cde5568079cc04a74f929b7f266a384745243 SHA512 d33bc381b126973d7fd7a59ce21eaedcca535fb5bfeb12d363efc81e1f2bfd9f51f6614c621a14cb3a24de2518cd0fc84c4e21382b99293ca2ca3fd792bb2cda
 MISC metadata.xml 389 BLAKE2B 44aa4001cf007b381c8b974b3cead34f1b403b0b604ae5bbc09fa40d7ee152e2f102e8ec3e52a2ea186404ab6758f4e4ed5dcdc74335d464255d5796144303a9 SHA512 56007f4ca5e05201b08750acf76d0f83a017b54b4d2533084615f2a74ed288cc0d82e6824d2da31684dd3027a3a53f8b261cb5e2371a089544f8edafce595ffc
diff --git a/dev-python/versioneer/versioneer-0.18.ebuild b/dev-python/versioneer/versioneer-0.18.ebuild
new file mode 100644
index 000000000000..613a3acdc023
--- /dev/null
+++ b/dev-python/versioneer/versioneer-0.18.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy VCS-based management of project version strings"
+HOMEPAGE="https://pypi.org/project/versioneer/ https://github.com/warner/python-versioneer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py make_versioneer
+	git config --global user.email "you@example.com"
+	git config --global user.name "Your Name"
+
+	${PYTHON} test/git/test_git.py -v || die
+}
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index 23e5f4e10648..cd8edf50115f 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -2,6 +2,6 @@ AUX weasyprint-43-skip-failing-test.patch 517 BLAKE2B 27f574095d9dde6ac9cb99f64e
 AUX weasyprint-43-skip-useless-deps.patch 559 BLAKE2B c11b646137f26ad9a3398678534c2f8999ccdbd1baaecaf72eecdbcbf9870f168a51ee91482a3ca8aa8e0372e11c350204c14556e58b60839df571216a103492 SHA512 0d0be1d5234549d98a6c6ae43255a1dfd2ac543d72f85b9e54da4e864e961859100201de447bf88b428a66bc4a3762f4f1cc2e09465051058fd4563e3093a4f1
 DIST WeasyPrint-0.41.tar.gz 393866 BLAKE2B 895624ee547a9ed91157db6a7a72890a56f270d2ea00a508c42899e42922e51867782b1dff3ab55f98df0a130b727a7db13aaf3553a90c4405b75b6813c95ab9 SHA512 44b2d9e0a186c5767cd01d6e66495241d088908467e0fa28cee114a9c480bfcb4ef393236e9304653603f3917c73c452c05a38286932e0a271946860120d9a1f
 DIST WeasyPrint-43.tar.gz 315365 BLAKE2B af643f6a6d09d09d89802dd3823e43e9f05873738b14e4f853a324850ffc12902cb791c3f187f6b550dded40669d376cf3d2e4d7d83e9747e87795a4d57e9014 SHA512 fc4c4decb298d4f9caf244433566c9b675b23db2508093d8c43c6e361119c5fe8298213075f550bebc72fe4156cfc516f04c8d7a2c6215fcd5add14360821f40
-EBUILD weasyprint-0.41.ebuild 1322 BLAKE2B 909faf1d09fb85b1fe167fff0995d5b96750ed9eb6022eea65b9cc841f0a87d8bf3713b78f3c0898ced55ac624d6dd4b0dcf95279a321c0915b7a21ec185d0fb SHA512 98623e08b261959388e1de4dfc0285fe5f54b5584039122b2f30d81b6173c3dc6a3a356642e5c392bab1fa6c9f95085c52aa1a7049434652e418cea0a8713eb2
-EBUILD weasyprint-43.ebuild 1374 BLAKE2B fcbd23418925b890827b9d9c2a7e7a20bdb9036e1c93a1afd1c53a3daf56e24590abb3c7e2309e03187f315e1d55b8c6293495e5edd2040dd2ac0f29f24b480b SHA512 e51e941af915240dbd1982261a93a72e5c84027fd05f834c64eb7422bd12182aa9f63fe3ea9bb8e4bc8613cb5b04ad0158e1d53e4590c454e92743d5ec87958d
+EBUILD weasyprint-0.41.ebuild 1323 BLAKE2B c7c09140127c8fb911bf8937b2248d7d586432ac9c4ab8a974123574b15a9f702d509febf2efdfab85b4cc3e6d80d99f435c80589a652557c3fe9464a7ae1909 SHA512 5ea198c23823263e090dacbda3ab404ab37b10bbab767882c2eca1d2ad4722e382f1a98ee37682efce0ddcdaa70601eea49798bfb2c0dfaa4a734bffd87573ca
+EBUILD weasyprint-43.ebuild 1375 BLAKE2B 4fa1595c333af42566d7f1b2fb44ce2176af5705e51fbcb71733a06cf0bcee77d6125ba108d1f0ca7abd29e93b4d1cb6e5c99988a707e6586fa5987ae3195978 SHA512 4680ae07a63f85362cda496a04cac74170b208a63a8b7f976e28c06b02b2797bf47cb65a47572f59251fe5666fe337702af665ed563aae85c164065cd0260726
 MISC metadata.xml 381 BLAKE2B 422f89ba40bf25e47d53fa91f51ed8b12c5f37a7befd16a2cc2d78335b0dc472180c5e46c6bf890e7a30fc7936e672737e931867097e21a781819fd7ee644e94 SHA512 92ccf545a50a97d2f2cf6f85a6986525ea787d6534682b5fbdd1f0395ed7e938c4e341f5897a663b185d2b2755d4123132b8ec36866b44f2615f08d607a14398
diff --git a/dev-python/weasyprint/weasyprint-0.41.ebuild b/dev-python/weasyprint/weasyprint-0.41.ebuild
index ba921c850bc0..28624674a05b 100644
--- a/dev-python/weasyprint/weasyprint-0.41.ebuild
+++ b/dev-python/weasyprint/weasyprint-0.41.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
 MY_PN="WeasyPrint"
 MY_P="${MY_PN}-${PV}"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://weasyprint.org https://github.com/Kozea/WeasyPrint"
+HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/weasyprint/weasyprint-43.ebuild b/dev-python/weasyprint/weasyprint-43.ebuild
index d18200b1057c..8c3cd18ba99e 100644
--- a/dev-python/weasyprint/weasyprint-43.ebuild
+++ b/dev-python/weasyprint/weasyprint-43.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
 MY_PN="WeasyPrint"
 MY_P="${MY_PN}-${PV}"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://weasyprint.org https://github.com/Kozea/WeasyPrint"
+HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
 
 LICENSE="BSD"
 SLOT="0"
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-03 13:42:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-03 13:42:34 +0000
commit	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch)
tree	3cb05783d73b2c33589ba305144a31c718e123cd /dev-python
parent	16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff)