gentoo resync : 22.01.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-01-22 10:09:44 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-01-22 10:09:44 +0000
commit: 09351e78166b5e864197c4456ebae3f89dd0bed9 (patch)
tree: 41a96399f56ed3aa399006871bfce4430db84aa2 /dev-python
parent: c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (diff)
149 files changed, 996 insertions, 922 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 88c63f519281..3b43fda0cb4a 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiohttp-socks/Manifest b/dev-python/aiohttp-socks/Manifest
new file mode 100644
index 000000000000..eeabff486e2f
--- /dev/null
+++ b/dev-python/aiohttp-socks/Manifest
@@ -0,0 +1,3 @@
+DIST aiohttp-socks-0.2.2.tar.gz 1351798 BLAKE2B 40c9e033de523cad365e95051d48dee5fbd3d964e7b3864393c54d23394a5cfcfcb46cb9d78f25a6101bc97034c77c5a75aef94cfb962054c29bd804e387b0a9 SHA512 218c262cb3eab74166686614ab5a720c31d1ce886cfd655f296c930f648b1d94e909724346769a46b600b8f1bc8ddbc498ee75cd5854e409566a8ead6a7efdab
+EBUILD aiohttp-socks-0.2.2.ebuild 493 BLAKE2B 326b5fff1fa5847e6f08bf0e249e777f78268bd1a0487383c81c9c7a9b0be6ec795b99a8883a44636a48b28d88bfb3674326021e9ac7fa5d37497aad858a4dc9 SHA512 bc723371a1a9e7e53b5b8e1400c76dcd9f7b21d618758e25ef98da3784a5968bd78af1dc8f78845357b1bffbae65d2753a086e3734b3ff7ecf62b1829770f09d
+MISC metadata.xml 391 BLAKE2B b2c143f0bebedd76ce3992254b7c068b9707bcc75c552cf994239fbcd32ecb39c981a1a61bd351c29627fc4a65124fb54b5c8533fba5f8638d17b253893e50b5 SHA512 4519a8f883d724ea786cb00023c8e0efae8d343d40c0988154efd27a2bdce7b73e6884f3f406109fabef54b9e2d62e8c07cda7e7d876b148cff0090ba38c2104
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.2.2.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.2.2.ebuild
new file mode 100644
index 000000000000..7e449920dc7f
--- /dev/null
+++ b/dev-python/aiohttp-socks/aiohttp-socks-0.2.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="SOCKS proxy connector for aiohttp"
+HOMEPAGE="https://pypi.org/project/aiohttp-socks/"
+SRC_URI="https://github.com/romis2012/aiohttp-socks/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/aiohttp-2.3.2[${PYTHON_USEDEP}]
+"
+
+DOCS=( README.md )
diff --git a/dev-python/aiohttp-socks/metadata.xml b/dev-python/aiohttp-socks/metadata.xml
new file mode 100644
index 000000000000..829f4a58e8e5
--- /dev/null
+++ b/dev-python/aiohttp-socks/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">aiohttp-socks</remote-id>
+    <remote-id type="github">romis2012/aiohttp-socks</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/aiorpcX/Manifest b/dev-python/aiorpcX/Manifest
new file mode 100644
index 000000000000..e57497194636
--- /dev/null
+++ b/dev-python/aiorpcX/Manifest
@@ -0,0 +1,3 @@
+DIST aiorpcX-0.10.2.tar.gz 23312 BLAKE2B 62d04099ae272369f29dea3a34a13b4b5cd6052764f2efee1f4a461b8ab52616e0cf69dde47a6f48c60827b3580d35bc39c87371d581a4a95147f5a5691e5111 SHA512 ebdc312c1c8d27382ca02ba6de5a316332b09bfba19399f9a4c3ef603a5d96becdfbed5c360d73aa64b41ecc5b0c3638822b0a5e49fd54c339b601c20add44ea
+EBUILD aiorpcX-0.10.2.ebuild 528 BLAKE2B 41a71518c80d25053a5d708e4ce79c0dce74bcb63b00d8c9dca73a1e454ebebfa2bec7c2e18bdc18dee4e053679f387a64f41f6f99e962ff49a95c7850f37b80 SHA512 5cb8e7d18f6a0c921c3c8dd973a63e58dc3db8e5fe2dd01fe9a7f3b89639f4b4e6095fd9fee2fa4dd1fb77e5835b399a79e005653cca4b2bec57da6dee8a5f38
+MISC metadata.xml 380 BLAKE2B c1355cf2d901123fa14fadb4f4bf084d385dfd870baa0a2189c68d05cd3bed57ae4f1caaa668211b74b6e2491e3263b99ba8b99446c0e4f5336ea06577dc540f SHA512 b025f50be4d5ba7e95f7ae7b91099498b76b75c7faa28df52f0bb64dbe55b494107f011d42bc4cd6f5c9e5786b2dc1eb8ffc8561334326dff9c99f7877576364
diff --git a/dev-python/aiorpcX/aiorpcX-0.10.2.ebuild b/dev-python/aiorpcX/aiorpcX-0.10.2.ebuild
new file mode 100644
index 000000000000..d39a2a5b5358
--- /dev/null
+++ b/dev-python/aiorpcX/aiorpcX-0.10.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Generic async RPC implementation, including JSON-RPC"
+HOMEPAGE="https://pypi.org/project/aiorpcX/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+DOCS=( README.rst )
diff --git a/dev-python/aiorpcX/metadata.xml b/dev-python/aiorpcX/metadata.xml
new file mode 100644
index 000000000000..92df4ff80f74
--- /dev/null
+++ b/dev-python/aiorpcX/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">aiorpcX</remote-id>
+    <remote-id type="github">kyuupichan/aiorpcX</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index ac733f0666f2..aa35e943e369 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 943 BLAKE2B 7effcb9ee8d91b80cb1b93aeae9d5172f7ac99a68c48aef064dbd3f18cd444009594644db3c0580002c674c37672560f145d9d76ef3dda567599b0c06ce4935a SHA512 d435a70b52455fabf7b67ef48351f52c2d3a05e66c6048f4d94ff46868915730474141b89680ab15f4b608fc88f8c7e6d9fb7b1d08cd202f718d38ec69704c99
+EBUILD attrs-18.2.0.ebuild 940 BLAKE2B 3d94e04053202e27d6dca54d8420185f566e5ae3d9c3937b6bcc238f645e061084946538121cece1f9660f107d4f1e99b657caf316e778206709e2df18504938 SHA512 3f45f206dfc805245664cfe9604a274692d5c64f9fa2dc8a50f03b9a3d02ce18f75d322d73d62445d8306e8398ebe0001c0cf14b013df7685fb2f14c732d0d13
 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 e555a598278c..35aef82ff0b8 100644
--- a/dev-python/attrs/attrs-18.2.0.ebuild
+++ b/dev-python/attrs/attrs-18.2.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
@@ -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 d8cc8146bf16..c6334da08fe3 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -3,5 +3,5 @@ DIST Automat-0.6.0.tar.gz 31767 BLAKE2B 28baa9d6cc7497f9c0a4b7f4050b197d3dff871b
 DIST Automat-0.7.0.tar.gz 61461 BLAKE2B dd09ce090c7333ee17b701bde2c78e01dacf40cefee847061a2019bb27f0982091e7628737211421ada351937caf9c6734cb445ee6462ce84b381030b013bd05 SHA512 a6f307d312a3ceb721071b5212297c73d2306894b5fafd39265578041a2859bd6f041ac43a654bdda4175a70a4e90e0db1ee35cd43fa620cd5c594b5d1988a74
 EBUILD automat-0.5.0.ebuild 1217 BLAKE2B 5b7feee89f96fadb7cfdaf227851f149d8c8466b272147c3966fe624ce697cc0150fded545ecd9267911d87cda5a6f6fc8255eef48df1a23650923f12b6245ee SHA512 eac5e670d9227e2bd4f78bb4c0ff986e2dcdafcd79919dab1b7273be18a47d146a5630e119f450f2115ffd8303f40d57758c4c4558555290d0094e94da029c8f
 EBUILD automat-0.6.0.ebuild 1235 BLAKE2B 1ba6654e880bb8e13246a98feeb08ec8f75c49d4490c782a3efa7be379a71a2256d3374b0ed121f84cd3b6dee9c5260b68298a34a9150d2288c6f7a6c224040b SHA512 e24ad712828ac8e950f5791c60c49fb5f1b322b70cb726b5fbb10092795d2d8bfe08767103da2cf2255113b8a31072e61e7ecfd71f5540323e35eeaedcf0321e
-EBUILD automat-0.7.0.ebuild 1433 BLAKE2B ff3a4d3f9e18c13a1ba420ee0e0d7dd565e5a1f6005808460803dad9910c093c9aacaf3b4614aef9b66aa48f0029bd81fa4400cbe6df85787b34585fdbf5caf0 SHA512 6aea5cbfb8bf3ea6fbf04f4cfba6f90a8c734639d0fb61830bf7413ca2aeadb603e3deaeea940ea6ab39ad7cc3bc218847a8763a1833996ac33b45f6d626667a
+EBUILD automat-0.7.0.ebuild 1434 BLAKE2B 9ac79d8c834574745c28d69b4d49fb9c5a7be982b703dd54962bea1f27588129eced904c71dd48ede8b662078d2c31a57b14e015f23d9d289b0c4e520d543677 SHA512 b311bb03bf77e6503fb7d14a960f6ec85f21b2962c601d7293b56fa21133b8134f21a490bbbbaa46c987e3f48d2454e0eb72165a992eaa66cdcdd31d9ada2fd2
 MISC metadata.xml 622 BLAKE2B 10fa7f62095186a07a588b374c55dc084a483ff8848caff3322822964d57175a729e82948f984f4348a1cd0e5d7bc08c1d548ef674fb93aa08bd55343c53ba63 SHA512 f9feb6bd4b545a707d0539d42d20a0371eeb8a9e0984e922b3a0416a0dda97b6783c21cf1ec63868c200535d9a46e80b820424a1d7199074419780b3e7328333
diff --git a/dev-python/automat/automat-0.7.0.ebuild b/dev-python/automat/automat-0.7.0.ebuild
index 3da75c199ec7..9136e18be1c8 100644
--- a/dev-python/automat/automat-0.7.0.ebuild
+++ b/dev-python/automat/automat-0.7.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 ~sh ~sparc ~x86 ~amd64-fbsd"
 IUSE="examples test"
 
 RDEPEND="
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index 751931ad0702..74a17ae09632 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -2,8 +2,10 @@ DIST awscli-1.16.59.tar.gz 1147247 BLAKE2B f8571f2397735b4aad17543e25cd2764731b2
 DIST awscli-1.16.62.tar.gz 1147749 BLAKE2B d0a578478f5aa6e08c8de3c0e5e85b99e09a8519931b35f5fa724f922b35e2981464ba2fc5fc842350dfe1cd5740104ee293caf13b2154c5140caa9f762c976c SHA512 b7b0247c7c28fe3195cb6e2ec81fa15e8d6e9a8120d124d4cc84e827f8f9c904fb7feaa00d28173e0739066eb5ca77fc7f2af8b1f2b083605b23a4cc1c38fd1d
 DIST awscli-1.16.72.tar.gz 1169697 BLAKE2B 3ae37ee02bb821dc5e5578ff9937d6fb313bd369e9f57c276d3e3fb722743b5f07536ed60ffd98ffbb779e0ad3882f9345d0ccbed3572c2e7332c2a339320f49 SHA512 88914546c10e14749b6811a31ff664cd464ab424d2140f1218b03128fb8a7e4fcfb33feaa29cac534ea3902f1d4e0565c7578b61989bb6b8f8edbefa2d992355
 DIST awscli-1.16.81.tar.gz 1171490 BLAKE2B 343e5ba75f8cb3b058e15346627b0d9c5d6e294147843be0608ccd2a92e643d05c5b6995771608af602e565a860d4088e1f7988c567343396054cec813ed660c SHA512 44176ae796972571d07923ba13ac5a245af7b0c74488bd03a6fb5077f204f175f7ddfa9c4d592eb93d3dce14d9406b04c92ec2d1d9ce58c3a092a0b998efd2c7
+DIST awscli-1.16.91.tar.gz 1172430 BLAKE2B 158f7420299c56f2e40883bbf1ad01cb7a747d04047b47aaf8c931c8aad02ad9b39cfe9fd69b86fcdbd76d02d652d68f33d707326307c600772fab97b93f7b60 SHA512 ad489cfc1225703b9bae26f31a94c7d9c143b8e355f4e1a2f1d7e3685b7ee9a6dbd0938db512cac83775292a1347fe72a9ae192717b1c73a21ac07bea4c9fede
 EBUILD awscli-1.16.59.ebuild 1024 BLAKE2B bdd6f7f25949aa2366f7e70bded817ec214c77e0863030faa1ac06ab43256964dbfaee886643a48a5ebf522dad2590485946c87ffa2667db51f0cadf4591fd7f SHA512 33570db8155986bf66b8b4ca1505ee2eaca9cb17651ffc91bcdb1e9eb5e0d5b38a723ae7878892d84c3e66c3335c857851dccd9f4f6a359c29792ffe3c944296
 EBUILD awscli-1.16.62.ebuild 1024 BLAKE2B bdd6f7f25949aa2366f7e70bded817ec214c77e0863030faa1ac06ab43256964dbfaee886643a48a5ebf522dad2590485946c87ffa2667db51f0cadf4591fd7f SHA512 33570db8155986bf66b8b4ca1505ee2eaca9cb17651ffc91bcdb1e9eb5e0d5b38a723ae7878892d84c3e66c3335c857851dccd9f4f6a359c29792ffe3c944296
 EBUILD awscli-1.16.72.ebuild 1024 BLAKE2B bdd6f7f25949aa2366f7e70bded817ec214c77e0863030faa1ac06ab43256964dbfaee886643a48a5ebf522dad2590485946c87ffa2667db51f0cadf4591fd7f SHA512 33570db8155986bf66b8b4ca1505ee2eaca9cb17651ffc91bcdb1e9eb5e0d5b38a723ae7878892d84c3e66c3335c857851dccd9f4f6a359c29792ffe3c944296
 EBUILD awscli-1.16.81.ebuild 1024 BLAKE2B bdd6f7f25949aa2366f7e70bded817ec214c77e0863030faa1ac06ab43256964dbfaee886643a48a5ebf522dad2590485946c87ffa2667db51f0cadf4591fd7f SHA512 33570db8155986bf66b8b4ca1505ee2eaca9cb17651ffc91bcdb1e9eb5e0d5b38a723ae7878892d84c3e66c3335c857851dccd9f4f6a359c29792ffe3c944296
+EBUILD awscli-1.16.91.ebuild 1301 BLAKE2B 69b240b729c26b7493f36f39c793e22d09363c36d7ca18beecd46485fafdb47c9bc2b49a676c0d32787518c980404c9c033a60d329b3eeb3b14d85e22bb1702e SHA512 4f8532e8c0281923e7728b6d3d483235bea2361dce3b9079cd0aca9d39ef0f2f5543d46cfaf38d0b24e69e8d93258b9683568e379633a4f8ad6c2b56fe01bc82
 MISC metadata.xml 316 BLAKE2B 29c8ad67f4e7c5db4439aeae00deda8b57bb36bea7bd6490ae60efaa30cd2db1f7b2cff5b21558cdadea05f9caa8a9f4ee580fe2ea80959fe6ef7ef6f740c550 SHA512 86b3359e64e41ac4f2216e5bbcee6468100df3cd6e9c25595527d6819a2c27ce327797163a3a43bab11516a4826cff47825449cb797d7fe845794700a3a2bed0
diff --git a/dev-python/awscli/awscli-1.16.91.ebuild b/dev-python/awscli/awscli-1.16.91.ebuild
new file mode 100644
index 000000000000..dcda38a7f874
--- /dev/null
+++ b/dev-python/awscli/awscli-1.16.91.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# requires network access
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/botocore-1.12[${PYTHON_USEDEP}]
+	<=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.12[${PYTHON_USEDEP}]
+	<=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/aws-cli-${PV}"
+
+python_test() {
+	nosetests -vv || die
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED%/}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/dev-python/betamax/Manifest b/dev-python/betamax/Manifest
index be409d821329..90dafb357e5d 100644
--- a/dev-python/betamax/Manifest
+++ b/dev-python/betamax/Manifest
@@ -1,3 +1,3 @@
 DIST betamax-0.8.0.tar.gz 78398 BLAKE2B cc9546eb028343621ef47a9cb7992f1d3eef4a2b6837cc8b670ff7d0313020def203ff06bf1e21c2d4ef26932df65e71562110b14bf27fc5c1a6ca3ba9023f54 SHA512 52b330747b6add52390b50dd63c05851adc01ccd238fdb5c3401efdfc26be363a3f61145dc0e1f3cc43ff520e1457e33fa47952d2929c7c3e12c3e2612621f95
-EBUILD betamax-0.8.0.ebuild 762 BLAKE2B 8ead9b55cfca551bcd9990d93b698904f48896f6bc17f7888199a09a6faaac679dbe4fdc9795eff4798976d370518d7c8d8304da7b3f7d671e22f4aa0e820a14 SHA512 e38f1783a7a5defd207544343f700912fe6b325aaa98ee54d608acb0032ea756b7d401787f0c27e54957eb27c1b4bc8ab1bc2e44c8cfc7d1efab02a5a3db7459
+EBUILD betamax-0.8.0.ebuild 769 BLAKE2B 6e4716d5e0de9229bad87a0759825a15d6d770f32855f596e406e52524db13b759d949ab4eaf2ba05c377ddc0cd057e557ad9c029890856695579d9955211369 SHA512 6eb5018d0aa6e1143ee9fa4636e0b179e2a74e13cb07e2cc6ea3575ec0889386c2d13cb722585c51f83fa2d64cf79063128bb772f191beb98f635bb764fd0362
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/betamax/betamax-0.8.0.ebuild b/dev-python/betamax/betamax-0.8.0.ebuild
index e5be7c43646c..df4c736cceb9 100644
--- a/dev-python/betamax/betamax-0.8.0.ebuild
+++ b/dev-python/betamax/betamax-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index fddf89876182..335153201cf3 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,7 +1,7 @@
-DIST bleach-1.5.0.tar.gz 36502 BLAKE2B a56eb875a5becd21f7ff71a29db8178a7536a7aadfe81fe178360ba61ba599df9d4d9a782bbf72eb186b61a0b2e3f99058c483cc0d194e735a787319697c7327 SHA512 572a089691af61f096716d96517a96755fe674cc471bdbcff80615ae903eaeff72c47b918ee28a1db60ee5c0253c0c52ba02544f8535ae4f283a3a87a3061124
 DIST bleach-2.1.3.tar.gz 60141 BLAKE2B 5c04269266007e31e1a01540198177afb6b13362b89815073b7cd68668da26725f2631defdb26d124ae6c74743de0d31b2975a0d19f58e032ac2332e3ea46a75 SHA512 ff74fb3646709f20c79ea02e6d0fb93e2f204d3151a05f259b703050c10d410859af76acb470405f6fb7b55c8fb64595e6f0fcf8e9cb8fd3fc3722fa30a47de5
 DIST bleach-3.0.2.tar.gz 165682 BLAKE2B 26dfca08732af9eb11a27e1913ad1ed76454950d902d8f0dfd4a816dfe972d2280a29fcb7ba6c021938863f92d20d6ee3bb5ea64ee0b1f52e62cdbe12aebe009 SHA512 f5a6537c5b048a23b7834f27e30413517f82082f2abc4ad26c16a3aa4486545beec5394d2b759e82022f4cb8915e4034d8cd3383e41a3772a73f3858c283c155
-EBUILD bleach-1.5.0.ebuild 775 BLAKE2B bed91ab21bdf8e1b71222caa391619e46c8f4020af72502ad08a733291ff0be11cc91f40e7461797a9d014c63a7543a3bee72e3616497e9ff243f14490e497ad SHA512 81f7a5f0fdf45d61f4879debe3f3fbdb09d0fd69dc9a40bd672555437a66e1517bf621e7b1d5722337d8a57bc5d318df5603daecdf6eb8454b03e4f35a6b1155
-EBUILD bleach-2.1.3.ebuild 792 BLAKE2B c5ae1e13eb60de6325e0499601ea186247e144e023f0dc42c321a17fb5871b90e79a64c72e0cd21083efb2274bce941d884b8ece553252ab24a68af2422e00bc SHA512 a7897976905624bea8b5b6d55953260b1d57d2cf0b602ff445b884e261ce71942e8681fdfad15eeecf2f74174c30d713621eddae606f338154799cf2721599b1
-EBUILD bleach-3.0.2.ebuild 776 BLAKE2B ad751be4cb06af64969d08cb7bf6111fa87483637731a5d2987ca55f8af701083bf670ecfb2459703ba108c65b4cd367ed7847d5f1cf17e7042f42ec1005af3e SHA512 5a44eb59a6c8c7aa09417622c7d2ae0c2f01e4ac9d6f6f2b0c545cdd2d01d89de8cf6991d3a8d194ccb0badb15c87ab80d1e8dcba6a636e6bfecf530793867ef
+DIST bleach-3.1.0.tar.gz 167814 BLAKE2B 386d483ec9554d0436eeda70a5f558ca2191914ed90ddbfa00ae887e682505d1b84f511d21be7eceb8c98422a4dbb25ee32af49edc4b811e3816aaf9161fa4c4 SHA512 8db3a54b68fa66a07a3b4b90481557aac06e7783f9c72035a6f037909017354718b67b64153e1cd50cb2c821174b8282837c4c3e667878041a68703b141b2969
+EBUILD bleach-2.1.3.ebuild 796 BLAKE2B 84f777274e563e86919a67248c9492362cd1697f7df61b355f96746694ff57e06365064616805d048485c525b82ff0413c4cc1dfec996df97b07088baa54a9a6 SHA512 a8a5ea0f4d6f8e5c241ab38cb3aa00fefe0121f7fd20b9294b81712361baf80b700b633c5b3a9e79aebb9b42a52e1a6679b673eb2b89066db66f3366374845ed
+EBUILD bleach-3.0.2.ebuild 770 BLAKE2B d67f6af4e918890e2cda903e949efa0315b6767ba9a282bf0fee12a3d32c088f610499a3b0581fd2685d0860b953bb85151f219b0f7883526b9c866e18d617e5 SHA512 1898a9a72bac4180a1f68984539e4e5e4b8de973e626a4e617db27750ce07c27726501ab646213ed4d2c343cf61b50bd2d8a703ee201b935450970eda3d80266
+EBUILD bleach-3.1.0.ebuild 776 BLAKE2B 1e9c547c067ca046d657cb77dc247812cf57abac1818bdd56b16f724a31a7648319e3d44ebd7b7c0aa65211f04a36e0180a0536b23fd70c70d8372014fc616ed SHA512 6f60c04ffb344b2ada594a7721c1812e9bb83b1b3209f8880c65848f988e24e84f7808d1b4e902e2108572c0435d852db1ea4f036d0a3bd1ef1bc726ec79c4a6
 MISC metadata.xml 375 BLAKE2B eb46fe64fd2800b8222ce88a2ef34be12f68a5a014417ebbfcf3466beda9c64f6a6d1ef4431d83b4948c1513de81840d1f5c65961d851213f928fcc6a66045e5 SHA512 9f8329e1fe0a9a7a6268dee15c098bdd7893da00a3c4f4dcab207586dccc5f6b471754be0eacb21fbd7fcce5e3130a631fbf1fe60a27ea525552d7ef2d9c173a
diff --git a/dev-python/bleach/bleach-2.1.3.ebuild b/dev-python/bleach/bleach-2.1.3.ebuild
index b397e3a658b1..9de8b738582e 100644
--- a/dev-python/bleach/bleach-2.1.3.ebuild
+++ b/dev-python/bleach/bleach-2.1.3.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/bleach/bleach-3.0.2.ebuild b/dev-python/bleach/bleach-3.0.2.ebuild
index 3ae4009d0bb5..5f76613c2eb4 100644
--- a/dev-python/bleach/bleach-3.0.2.ebuild
+++ b/dev-python/bleach/bleach-3.0.2.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="Apache-2.0"
 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/bleach/bleach-1.5.0.ebuild b/dev-python/bleach/bleach-3.1.0.ebuild
index fc1dbd3b26d9..70494f99846f 100644
--- a/dev-python/bleach/bleach-1.5.0.ebuild
+++ b/dev-python/bleach/bleach-3.1.0.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=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
@@ -12,18 +12,16 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
-	>=dev-python/html5lib-0.999[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
+	dev-python/webencodings[${PYTHON_USEDEP}]"
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-3.0.3[${PYTHON_USEDEP}] )
-"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 python_test() {
-	py.test -v || die "tests failed under ${EPYTHON}"
+	pytest -v || die "tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index f19a15d80693..cd1bb35d3a62 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,9 +2,11 @@ AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e3
 DIST botocore-1.10.19.tar.gz 4372030 BLAKE2B cf4782e603c3483583edc2bd0a310781a00678524b4966b504e34db24b0f177d2d63cc76a5b2f1efa2d831c8ca3bc93f6bbbb628344da944a59b784cbd2e3062 SHA512 450f66d182f0262ae5fe040fc45c640c13fc2b9b1e4331e3be18ebd7b52b0008cb39f7293e243b101797a84b390399c09952f82880d925ebc076672282334577
 DIST botocore-1.10.35.tar.gz 4451806 BLAKE2B 1161e5dc23a2a540b9fa237eb5c3029c6822bf76cc833be44366385482617ed64458a04ecd67ea9884d8b8a5b74e4b2a6232fb2f8d960118fba70860526fb4f0 SHA512 ea9e4bba6be53696fc4e3cf68e67f9e6eeaeda813c48d725e20f7170228f1cf8b55a023dd5fdb020290f5d6ecd10f75217e9327c928edacf8723dbd4050188d5
 DIST botocore-1.12.4.tar.gz 4800384 BLAKE2B 121019d3c33872fdd874ddba36ecc8612a6354068ce7b759cbe7f35a9787e84c34d3a71ef3fdd2d721d3c3973a7600e4398cb7cd2a3ba698464c15137845bdf3 SHA512 8d196984f5623df403a8a23a9b7e7061e59c0ca56103f89d749d6ad7d92168ccae267f85312f2949cee322776d7948f1ecfda3d9d2783e8ba92fde7a178e8cac
+DIST botocore-1.12.81.tar.gz 5383717 BLAKE2B 0bafd6038cf4a5d1fa4f0597024b09eca48ab95d071cccd09b1910ccf839719114166fab7d78bd2b30dec4b4993a0751d9504260636174df5f76f02495e79960 SHA512 d3be22af53a8c6dd55be3fa0b84a55cdce22d30d6e6f04b0bb69539b8107c86de6b5494079e3af40f9b5285ef10c21e69c85295e5cd7c6dc5ab5be91718a2ea9
 EBUILD botocore-1.10.19.ebuild 1454 BLAKE2B 5db9c134b89b9e494a97a73d615cb49198be13a18f29a016b67ef764887cbe51da8714249e7144eaa7c905edf554de6688f51e723370378c28c5e35b5662b7e3 SHA512 778b1031180cec26b341cf18560d77a816efd5eec0a89552affd3d686d8fd2b0acde1acbc8cba10a50fd4f659df169148c187133e662f5c9ca09684e957f4a21
 EBUILD botocore-1.10.35.ebuild 1456 BLAKE2B 27d13171ffeb862a0412c1d46d25312b7f0eef4525c2caeccbe4f2f5bbc003f99e0caa49adb33b3c35a5f3ece93f8b55d6917c9535be6eece68ee33e389dee79 SHA512 3d97c0cdfa7565e563603568500a14a71f0581b5cc965e9bf83888cd3f34e664c244130866a675a0f26b693923cba7bc6e16025ead0ea3633966c7cd765d1e00
 EBUILD botocore-1.12.4-r1.ebuild 1499 BLAKE2B e98eb7a5dad4a72079a7cfce071daddfcd9c9d211a2eb95fa53e9ccb912fe1cc46b9da2bc73a2cd6b7c132e883748a160bdf43c954b1817fea6d98b6a2b146a9 SHA512 2d6a8a434e28c0a9c375cf6f3326044cb450bc57149fc53a72a8b9f77dd9ef41aa699f38ac6d7c0f0ad2a2fce8360c1a838851d63ba5200d1247b1d1c747f5f2
 EBUILD botocore-1.12.4.ebuild 1494 BLAKE2B 36263e1b3bc056f6a5fc0034e3373d30920976a8e54113bb6f7b3fdc238f6acd6acb76f4026cd5f8302aa6d4ba50191d72883896282f1a2f0b55312cd389ce4c SHA512 ead62975b9cc2ef72e396994d62eb2a3e1c807d6d6a69b82cd07ea7db6b31bb5e88ea4af1fc9e4306c8f5fe84c2469501cf04e790c85ea5067940715049def57
+EBUILD botocore-1.12.81.ebuild 1501 BLAKE2B 7b47013920069e64ec32bfcf2c15308d42971e4ab2a1af054cc4f48eaf24ae0246141f5a4849f3326513b9b05e67bfdc1901a7c6c53c1660c018a363541aab6b SHA512 1c3cbb251517ec70e380d1be890486ff67e40d30ff4ca747eb32ae3e52f29e379934c659619318ad7eed5d2037d6c232819adfb3fc7d24a95f5b633fd393cb22
 EBUILD botocore-9999.ebuild 1504 BLAKE2B 7b62171c506bd723e08802eca7dffe53c5998597ba816f3c40bcd5bfa0a25b4d5c018db587e93983277f04e0a1ff733b3be8553d700517dec52753293bfa6b88 SHA512 dfa0ecdce69ab3958a17aafa59d12c0ca67feefe4af29b5baa3cb587f4ab05a460031d77837c43f77e4aa2b7352e61ac0f3e711934811206b274f8d7373c9d90
 MISC metadata.xml 375 BLAKE2B 562696aff0128b74dc4c2c0767fe03d53ae116cbc4fdb3a8649e36a8c689dcbd2a90bb5f46dcfa6a3cd71c9150f923281100ec098fe2212dfffa96d74e472d3f SHA512 c369567feea497a744245642a9a307b2a2ec06035fffc3b9b72d9f7ee9fe2f342d62cd1d06a668b47ac1b3187fc28845bcf3c220d942cfb2ac89f72809fc4a86
diff --git a/dev-python/botocore/botocore-1.12.81.ebuild b/dev-python/botocore/botocore-1.12.81.ebuild
new file mode 100644
index 000000000000..ecf278301165
--- /dev/null
+++ b/dev-python/botocore/botocore-1.12.81.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional 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/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index a93b27cab41b..c15cbda65dd6 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -1,12 +1,9 @@
-AUX argparse.patch 408 BLAKE2B f0c41a7e581082e0ca8ed4dc0a0e08643dc2d144c63bfcfe4a27b1044e589e72db37d5731b236d7eb2bc2d7dc682c0b64792d2a8b22ad0d7f88d5cafb2757f3d SHA512 c5a5067d3f7477935d775f5c9c39f9b5c9636e97ab567c6b7a5d34cb06f5fac58a4dff94868f2d856d792c270bc6d727fe3ec60cf8825b7ae2b4519aed999b90
 AUX catkin_prefix2.patch 1620 BLAKE2B 7c6824c35ac840429646e1804e417ea09971be6a497ba6e45daccd453aaf0a6e17608ddabdfbc681d5d83f0bf42496425aaf4c0fbc3c3f282fb62a4639bf0a0a SHA512 2750d043373d5a7ae0761feaf5210847fad08bbef96804cf6c4931fa751918241e0517bc538b1db12ae981d6a3a89afb53cfce8b2dfd7d80b849a6de203edb13
 AUX infinite_loop3.patch 1236 BLAKE2B f236f05623b5ee4414fe3da7efebf61d62ed8617d47a659e980907aafabe3c0f4a0fc41779c73872235a186c7457ece6991433c67acace597fe86f5088ab9cca SHA512 4d07d04cfe1a10531129494000be11fe6b2598c077658b212f888b24d3de997fa6730641055caa181a5a071585f41f82cd4783c46b314cf66fe1f34b70f538cf
 AUX ros_packages.patch 622 BLAKE2B d155ddb5cf084b660914028b89f061be243ff15ca934a0513afa10f64ae31adbf25acdb294e6fcff441fe598f2210f31f91733038519ce01765cf51b0cf5ba02 SHA512 6675a4a1396b5f8ad0f62b6a2d1c59511950685c85f820f3b2c34f3c701052e2e678aa9d5c6f6e6dca72ed8b94372cd3f442dd1634c53981166efb8ec1f30164
-DIST catkin_pkg-0.4.7-gh.tar.gz 60765 BLAKE2B 905de7f4f013f8e7d6472b5159cb0e9ac82bb06dfca0308a7a5f8881402a721d987a016f7980f7a435a7122c4771311f82f56f460949370ecd93057ef8a8bb25 SHA512 1e947c09aa4789d414de74bed7b1aa3d5f5d16d22a8a4609f656b47e51b7318fdd21e003f8bf65355728abaf54a016ce2d78b79cc4ab8bd7c3e048b66c0c0f6e
-DIST catkin_pkg-0.4.8-gh.tar.gz 60811 BLAKE2B f7bcdb121844837701e203bfefd3ad9b454362d0d9f5b912a1df542dbb50ea402f1556b4f4031afa13dfdeb852f955d175f80344b773fa959fecf522ceb06fb6 SHA512 b697d177164d681e94f19f7f0ec768cb91ba5bf31cd3dfd41a24bc3347957b30f97bf1cc3e3fadb7c3c4f48a5d0306835a9496a9e4ab7b36784f7bbaf4268b6a
+DIST catkin_pkg-0.4.10-gh.tar.gz 61272 BLAKE2B e4246d602fd8b8a8b8dda4f412aac4f88ae3328bf2602268566a0f761fa7c435412ae36f563e8082a2e0497c92ca302ea7505dfb32802d3ff00fe4323cd361b1 SHA512 55c2a03c922f647f25e74dce33486d09070c3089dfe2ae26d0673752298d6bb55652b9079b32694c9d80f52ae55fef2fac9f853b6d0b9d6121e6e8c233dc3530
 DIST catkin_pkg-0.4.9-gh.tar.gz 60919 BLAKE2B e7d4987022359fa7306df77ede2e07b2371bfa16b9787e513dd096ffe3988f9b7e6cbf61b96e00992334dadc6052811c20e0b7ea6c9198db332c1eac545c5031 SHA512 53e8440c0768b221526d134c5609c3088dd02e214150253469fe5883665936472486792db2d69c05fd352949f2350bda5960e71cd54e3f1d9164e0915c963295
-EBUILD catkin_pkg-0.4.7.ebuild 1237 BLAKE2B 062a0893ed878654c8add72f78814916e33e4e63cc8e78e17b1b30a6869d228f89d55e654294f0668ba4bc4b485c08987108bdeb4ff99b1a86e413512075e771 SHA512 0a4ad10184b23eb326a78fe8b411cda68ed65aade565832f0ec30d0d1fbfe37e2841430bf71eafab99db059903685fa3876998be7cb98172f62572a9abee552e
-EBUILD catkin_pkg-0.4.8.ebuild 1271 BLAKE2B 0babb723a5bb32a5ef1b5febd3881cd9a25dd5606ecc571453f2ab53a697d8f477b1b56d1ed281169131ade92210b31b51c4cd72ee81e13d0661c9b1fb129aea SHA512 321c96ff1b0d0ff7abb8435fd4b3b98d708ea59f0abeb33513765070a8d16c1c69291833e1452b17c1810a9aa278b237a1cf5d2063394bcd984d8c0f2ad69c45
+EBUILD catkin_pkg-0.4.10.ebuild 1238 BLAKE2B 25da1a65307a5996bcd4e0238e047a75b828c160cb744cc7d28513bb4cabf0b1687415056a5250006945f6bb023f2d959de66d6641bb8a86590b26a72f9d947e SHA512 7985668462bdd48d691aa59138f5dc0dc34dcc584237e89b06b1b9c2fce68a23f37017c7c8993ad60f03352b0d665ed9f1906eef97a8c593a2c177a27340cbad
 EBUILD catkin_pkg-0.4.9.ebuild 1238 BLAKE2B 9df803c1a3bd3e05f6cdb400ef295c6da374308f8606d00653a25e4b2c2879e2e88fc29a93b9300cbb5d476d2e24cefcc98a744c897bb73a2faef58a6b227cd2 SHA512 775ddefe47f8a014699133ab6a00cf5dde64e7ebac568148536af5643c23d0da7cb20f39e57fd7b5a970cb8405b8b7ea46f3d4ef3f40335618182a98f73f2fa0
 EBUILD catkin_pkg-9999.ebuild 1238 BLAKE2B 9df803c1a3bd3e05f6cdb400ef295c6da374308f8606d00653a25e4b2c2879e2e88fc29a93b9300cbb5d476d2e24cefcc98a744c897bb73a2faef58a6b227cd2 SHA512 775ddefe47f8a014699133ab6a00cf5dde64e7ebac568148536af5643c23d0da7cb20f39e57fd7b5a970cb8405b8b7ea46f3d4ef3f40335618182a98f73f2fa0
 MISC metadata.xml 343 BLAKE2B 54c183cdd942eaeec77723ae80d09a3cdd6e40270a3974e80a811fb050289e6f86b8d722fcefb1f37f7c2b8ad1ead3e00f04d49c2a029884daa7c2c33869ef87 SHA512 3ca5d78edb7c7dd2283944af93b7a8b6b3bb176ffa9e0df31881c8b5d66a4abc7e080e11f25f285e0b8735b16ed1598cf032a37d62b7fbb0b5adb3296e9b5862
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.8.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.10.ebuild
index f4dc76b3fa34..34cb49f2197a 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.8.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.10.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
@@ -46,7 +46,6 @@ RDEPEND="${RDEPEND}
 	!<dev-util/catkin-0.7.14"
 PATCHES=(
 	"${FILESDIR}/catkin_prefix2.patch"
-	"${FILESDIR}/argparse.patch"
 	"${FILESDIR}/ros_packages.patch"
 	"${FILESDIR}/infinite_loop3.patch"
 )
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.7.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.7.ebuild
deleted file mode 100644
index 46f2913d41f1..000000000000
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 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{,3} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the catkin package system"
-HOMEPAGE="http://wiki.ros.org/catkin_pkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${RDEPEND}
-	!<dev-util/catkin-0.7.14"
-PATCHES=(
-	"${FILESDIR}/catkin_prefix2.patch"
-	"${FILESDIR}/argparse.patch"
-	"${FILESDIR}/ros_packages.patch"
-	"${FILESDIR}/infinite_loop3.patch"
-)
-
-python_test() {
-	nosetests -s --tests test || die
-}
diff --git a/dev-python/catkin_pkg/files/argparse.patch b/dev-python/catkin_pkg/files/argparse.patch
deleted file mode 100644
index f39df4a40565..000000000000
--- a/dev-python/catkin_pkg/files/argparse.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: catkin_pkg-0.3.1/setup.py
-===================================================================
---- catkin_pkg-0.3.1.orig/setup.py
-+++ catkin_pkg-0.3.1/setup.py
-@@ -31,7 +31,6 @@ kwargs = {
-     'long_description': 'Library for retrieving information about catkin packages.',
-     'license': 'BSD',
-     'install_requires': [
--        'argparse',
-         'docutils',
-         'python-dateutil'
-     ],
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index f42246764106..6ff1e49c65eb 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -7,5 +7,6 @@ EBUILD clang-python-5.0.2.ebuild 1079 BLAKE2B deb802fba226c098e138775a71fb5a4926
 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.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.9999.ebuild b/dev-python/clang-python/clang-python-8.0.9999.ebuild
new file mode 100644
index 000000000000..180856dc03bb
--- /dev/null
+++ b/dev-python/clang-python/clang-python-8.0.9999.ebuild
@@ -0,0 +1,49 @@
+# 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 git-r3 python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/clang.git
+	https://github.com/llvm-mirror/clang.git"
+EGIT_BRANCH="release_80"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+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}/${P}/bindings/python
+
+src_unpack() {
+	git-r3_fetch
+	git-r3_checkout '' '' '' bindings/python
+}
+
+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/constantly/Manifest b/dev-python/constantly/Manifest
index 7602084e779d..97b0b1975a07 100644
--- a/dev-python/constantly/Manifest
+++ b/dev-python/constantly/Manifest
@@ -1,5 +1,5 @@
 DIST constantly-15.1.0.gh.tar.gz 40635 BLAKE2B d400336901f7df7b1535a0e46fe092a2542546964ea144014210e8be3807aabfe8e8370e94f426061a0c3a6257ee66a6ceb963b159717def7e047405368d910e SHA512 eeaa74552fe8e01c40566ac3c8b3d41085f800863ac516e30fe1242f40d3401e4e872279149776f29d3ba78a7a16337a794ad26230efab4dd1847d42bffa81ce
 DIST constantly-15.1.0.tar.gz 21465 BLAKE2B fc3781e521f3a9988567c437e456e2f8215b8d61115e076d4f9fc52926125540f59bad457413105422d31184506bf7fd3fa38711dae8a8057b38941f2c5584bb SHA512 ccc6f41b0bd552d2bb5346cc9d64cd7b91a59dd30e0cf66b01e82f7e0e079c01c34bc6c66b69c5fee9d2eed35ae5455258d309e66278d708d5f576ddf2e00ac3
-EBUILD constantly-15.1.0-r1.ebuild 689 BLAKE2B ed4753f8c0a8bc5406792b945f32385b5e04633c85a6c5e5d45eca8bfb8c0659747141782417273d8b1ab0ddeb055bb6f83c6fdf8beb818f42bf30495778ec8d SHA512 42837e8179d33b86bd0b87fdc577b8fe1e4280f81afd59008ee03b7c4f5ad2c9ef19679155777bb24c764c5a045ac67dfc872159368c88a12bedef5e3f8b3512
+EBUILD constantly-15.1.0-r1.ebuild 693 BLAKE2B b6279a1ceb6cdfc3e592cdd5b5d7c2d5d6f6792a4b328015e04c7cda66ced2af026b8c04e8c9f20d6f10f7e9452962ec2c0db1ab3a5df389715bcc5f4ab0d66a SHA512 938d08f68f32da5a8c25692345e73adab4a5404dc8ba38643e1ab290fca4ad1ba8f984bd24f0bb723bcfae959d9703c5c431841535a2c64550b1a0dda5030455
 EBUILD constantly-15.1.0.ebuild 566 BLAKE2B 4f01bc98dee8711bacdccc142d6e3fd9d93d003c1615107d434fcb0038176f24b2295af83d5a1cb79ed908f76d75200efa9abc53d695a4a4a20c2601b65cf69d SHA512 13ce8cc80e673a10fdb4a37c9a8f1477178aeac8920ef194e993970efeff715598e0a3df52bb4faeb726fe5a8ea75a00c6518860c6ce3bc14089aa014f9e4392
 MISC metadata.xml 714 BLAKE2B 696bd5218dd217515c0b9d6ac7afc0da90ac2ed404120221de9b35a84621533cf1aa8d55878c722f55a59c2a36a4216a092c88efa0936e94dc980a1ed577c990 SHA512 850ed41a1f806475ac8a877f78d4c4df161a81ea47fe08df8e0fd9161f6823ca401519b8c007f06f5db182924e906ffc9ca912b72b4f2f9e66a5ad80d8f67f66
diff --git a/dev-python/constantly/constantly-15.1.0-r1.ebuild b/dev-python/constantly/constantly-15.1.0-r1.ebuild
index a92656c9b26e..07d7abb44261 100644
--- a/dev-python/constantly/constantly-15.1.0-r1.ebuild
+++ b/dev-python/constantly/constantly-15.1.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=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/twisted/constantly/archive/${PV}.tar.gz -> ${P}.gh.t
 
 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 ~sh ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 262e780a1883..309d4accc4a2 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -3,13 +3,11 @@ AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca
 DIST Cython-0.25.2.tar.gz 1703315 BLAKE2B e458604d0843afa128c6019244220bd6b3dd6653013698aa67ee2f71555f09813a8136ef92d6dc51ca38fe085e7bedc5e01d1a32bbd0885e62bd91c2e482bebd SHA512 1974b9374aeedb030307dc95aa6560ce9d5e1652783cd4552e96ef11663c73dd263e3521b68e7712abbb31628011e2e66320c5ee2577968684e2679eb80726e1
 DIST Cython-0.26.1.tar.gz 1725133 BLAKE2B b2c0433e8154ad76d921677608cae42a793326015ff320d8cd61818e5eb5fb4daf73ad4e72760d84f4cdaa2386b87d719cf9cd41584b781d4e2021e377a58422 SHA512 cdf31afaba78209c37a224345471c5c822b78c6d26c51583c46669b6b2b57b4952b33a839a51d06c3330fdff889345ac611fbaa2b2f17498cb02f3b5675f7948
 DIST Cython-0.28.4.tar.gz 1880943 BLAKE2B a97314147294c95fa0bd6d3fa1a1315d81f8abb46a1f2196009c1ef6f0dd7f47f81a7b31ab81d1fd00e8de37878a18a22d225055181ee74ffe4cc8105d84cd75 SHA512 67d2da2d776fc02193cfe98c8942e93905ec5e30bf4e0f9d5c965d930a034936d4c29c8248fccefff5db6d4dee054ec854994bea63fa3f64ff65df7550997c29
-DIST Cython-0.29.1.tar.gz 2040434 BLAKE2B b6f30f8263d6130efaf9bbbdf0008725161e5182730aa072ab3d16bc830dd2bfdb24fb89c95a113b65efab52ade47572d80d007f900d2ddf5415c69582d618e4 SHA512 f5b97fed6f4f1131cf43504df797d2e87c343f17d49b661747f26040eb171603b29444beb04043b1e61aa347a8a8a2e8d53c2e2c6d8a8108866f153bc7d51b6b
 DIST Cython-0.29.2.tar.gz 2041500 BLAKE2B 9edf4297e55b5de438fb79bdbfb4b1468af8b72e5556b38b9349b84fd9b917a56bc295b11e2c8938984fbd47099d4938450fac225c94687c1b3dab2749f72232 SHA512 d553dbb35b0841ca64d03fae3157e3a46248f16f14a1b75bbae979ca74a5fa89f85fa254a442a34314fe385d0aef7afa8c75b7f82662b37f7eeccd82e1404603
-DIST Cython-0.29.tar.gz 2037177 BLAKE2B 30c08f257caf8f1b8ac2cec7dd0a50250f614397979ddd8920b022ed8f34d38a32d4640b3c1fc8524f16dfbadb31ffdd6d216367bbf0a15b9dd69baa62c8f072 SHA512 f90249c12bb9c1f5b9bcecd66624516d6e255a8d321a5dada2ba4eda360c12623c64b391177e061eac7a37b24ec53f8098fc0e1b46065e69eb0766585f739ab6
+DIST Cython-0.29.3.tar.gz 2042466 BLAKE2B 6ea5b59d99875c65afb041b8ea091d7d5b191504bcbe247eb770d5696607b69df6c3565235fdb523824629011058eec22417ea0c0a1031c30876170559add4d7 SHA512 b23a8a1a05f40ad69c740b93d5372e920ab69f586d5109b119d9c4d72a3d95fa4f9ecb13a4f18bc93b474d385b5c8db002dd1ffe03e5b040612958556283a940
 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.1.ebuild 2175 BLAKE2B 5733082f054b447a02d1bb08d2db922e412f022026952c015259f80edda0e5b91cfbbd6dc60f6918fe3240933b0ea3e43dd3c643dcc10eb2beecb365b4decfff SHA512 67c591c43fda93dffd4dc15596cda396c2c17494476328d2b72ff6399d6da31f7faa92e55e1268bb9811cfff5c933e6451accc5b344ad2bb6bbc80961b4b047c
 EBUILD cython-0.29.2.ebuild 2175 BLAKE2B 5733082f054b447a02d1bb08d2db922e412f022026952c015259f80edda0e5b91cfbbd6dc60f6918fe3240933b0ea3e43dd3c643dcc10eb2beecb365b4decfff SHA512 67c591c43fda93dffd4dc15596cda396c2c17494476328d2b72ff6399d6da31f7faa92e55e1268bb9811cfff5c933e6451accc5b344ad2bb6bbc80961b4b047c
-EBUILD cython-0.29.ebuild 2175 BLAKE2B 5733082f054b447a02d1bb08d2db922e412f022026952c015259f80edda0e5b91cfbbd6dc60f6918fe3240933b0ea3e43dd3c643dcc10eb2beecb365b4decfff SHA512 67c591c43fda93dffd4dc15596cda396c2c17494476328d2b72ff6399d6da31f7faa92e55e1268bb9811cfff5c933e6451accc5b344ad2bb6bbc80961b4b047c
+EBUILD cython-0.29.3.ebuild 2172 BLAKE2B 10a605f4a51e5330194206b47f151bb9f4a962508b47bc7e554ae11e98c7b1d5a67c958b72db3c43058205d324c3c232ad24286ceee4703546a5ba1e3f24fcc1 SHA512 c41d16fb0734167f1127472e4aa99f575521c5477983b4bf9e56fe9be00169cbd2df53e2f13a46ef102a062d21e8e107629e4052fb1b41b954adbee369a923e9
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.1.ebuild b/dev-python/cython/cython-0.29.3.ebuild
index 930ba91157b7..dac33af59699 100644
--- a/dev-python/cython/cython-0.29.1.ebuild
+++ b/dev-python/cython/cython-0.29.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=7
diff --git a/dev-python/cython/cython-0.29.ebuild b/dev-python/cython/cython-0.29.ebuild
deleted file mode 100644
index 930ba91157b7..000000000000
--- a/dev-python/cython/cython-0.29.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="http://cython.org https://pypi.org/project/Cython/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="doc emacs test"
-
-RDEPEND="
-	emacs? ( virtual/emacs )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
-
-SITEFILE=50cython-gentoo.el
-S="${WORKDIR}/${MY_PN}-${PV%_*}"
-
-python_prepare_all() {
-	# tests behavior that is illegal in Python 3.7+
-	# https://github.com/cython/cython/issues/2454
-	sed -i -e '/with_outer_raising/,/return/d' tests/run/generators_py.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-
-	use doc && emake -C docs html
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index a2d060f4db3d..bf829c217e7e 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -6,5 +6,5 @@ EBUILD dbus-python-1.2.0-r1.ebuild 2210 BLAKE2B 0f475f5ebe65b9880a5a9807f01914f3
 EBUILD dbus-python-1.2.4.ebuild 2228 BLAKE2B 16447af268331e0666b0cb10bf0f9137e466f5bcc53cdeebbcc5cf3ac2f7e80996f124ca724cc775482a98ade16e5b85177233402897cbb4f21116e31faeb702 SHA512 ff39e5618cc8a6704c7e393949370a6fef2d6aacc22172410db6976ab76071220a5b16ebeb901be66f604cdc0440bc9ea1982126ae66730853464b46d8bb1f85
 EBUILD dbus-python-1.2.6-r1.ebuild 2354 BLAKE2B a84ae880849eacd33ac774d3aa9f0b99a1a4a827304e806da5d0508f0850abf0eb79e61a8dff2d36a561a3bf09061d660d24ec45aa8e6a3196482a7019bcb765 SHA512 ca739a3a0a63ef25a260eb62adc4efec39181dadaac3a5feb1cb4887f3620ef45bc7175ac3677f3502e7b2ca695bcf2861694acba94784205e2521a751f6d477
 EBUILD dbus-python-1.2.6-r2.ebuild 1895 BLAKE2B b868d0892812a869f10461bc4317af6d32fe910b304b6cb04e1162f167570819224b6fe70de33b238f9c6780f0048016c06a16de8b27602078981f8bb545068c SHA512 fd4e509aeee20ad804bedc0db431acd8db7402ee57afe53d532a55362113258c57f000710478be9aa3205c30c7e53b6fd1596b7c9dffd092a90f3888b0988baa
-EBUILD dbus-python-1.2.8.ebuild 1677 BLAKE2B 3ca5e38f6ec4132c500fa3c743233b10d1fd2c5d858815c7a04c6dcc05296488c0a6791a4c3205ac2e0092cbbd58860874114951a33a980b717784d4d73415fd SHA512 e70b4e1f38e30653b8426cab004615b8255ce29e6ac11e63fff9ac5d64f665e2c9bbdefeff15c039354ba7fab9ebd0432871fe02b519e66be5063580e3532c7a
+EBUILD dbus-python-1.2.8.ebuild 1683 BLAKE2B 056f770bf60f6be49b27d430772f6b7bf683a0616b364bc12fa08b9333f9eb2100b310f246870772be663ae9a38aacde8f6f82c3f4df176ac2a38b3585a72c09 SHA512 3fd5217e93bdffd0db070502c5b0045350f71be5f51b5de09a96221829615ee7a64b21663c97ce7a29ff0265a554868b72dc0d36c54cdef25d65c2c3427258f1
 MISC metadata.xml 337 BLAKE2B 96d3f5d7c37edb1a63791e013c39cf5b10c94d621ad851f9975d9d5e36519da135bf963f2a0e38c2c098fa48c2056bf210bdfcebc12bb10a88c9e9f85c55eb2a SHA512 633761250e946af99fcbcbf813b70fa0b1e03a0d89102faa3f324c418f0e749371aa931d253dc5a6f69369c25acc2d50a0f5e2155bd727766bc70f4bc3933d65
diff --git a/dev-python/dbus-python/dbus-python-1.2.8.ebuild b/dev-python/dbus-python/dbus-python-1.2.8.ebuild
index 9db1531cfbed..ecfc97896786 100644
--- a/dev-python/dbus-python/dbus-python-1.2.8.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.8.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
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="doc examples test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 294f1d32adb5..b8e6b0e09fc2 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,15 +1,9 @@
 AUX django-1.9-bashcomp.patch 1734 BLAKE2B d65bc505e4096fd8d23619f3d76b76d66fc3e68f408906c30a1a8e97a5ef5c0c9c1b352f8c4f4acd1588c639f7b0a489a53e1dbc9763b395ce2488c463e6d5b4 SHA512 d3caa9b77d6c336e131b706411080aa129df83ac60293a2612eb268d08a6c40096b322715766801e16a641134762174ecefcf2b93698f47b022fc31421597403
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
-DIST Django-1.11.17.tar.gz 7853439 BLAKE2B f6218ee690e505921d229193540b4166771465213aee3a3b239da6a88c1a7e166d182750192f984be7369e82c3ae172a9d858d7d30e9eb7cff4a467b543372e2 SHA512 ecf798ce8037d79dbbe673ad583e6414c9a24b807442feb967927b78cacb467f7f5c20e938116829d9b0df0563ee110a8d07294fd40b99dbd6356c8bae151bd6
 DIST Django-1.11.18.tar.gz 7847617 BLAKE2B e5c97a370c47caba2aea53245fdd8d11218c91d8fba230f2e2e9ab8068fbb7ebce6c7a969016d62a08a8226e13664b54202073b7726b7d6091d1f45dccde9ca1 SHA512 35c885e835c5e85257774c65c11bf851e710c745df3366487159f21f90e092236dd8d2cee86e8165945e57fc710989b0ea2747682fa4ce37d5e93d4f664b76c1
 DIST Django-2.0.10.tar.gz 7992290 BLAKE2B af4ee0841e01911c987128f70c0a3570951fc57cbd75165c8b81a4b6847a29fdff7de4f17f5f80e2f4e6b8e87aee017b256f45380fbea931e257f2a999175d78 SHA512 aee171bc10387b2685930887ed9e86564fba273210cd9d7929b7a97eb913ab537408a779bd06c37be63b3b9ecd3e48398e92de33e1a634521872dadf9a3e16f6
-DIST Django-2.0.9.tar.gz 7992507 BLAKE2B c6f1d79401007d2c83553e885d5e32c7890b3f1ed53c948ea4c55cc2a0272c06d0b7fdafef7be5042ab26b3f8c3ffef64f6f01f49d6e615503f8bfad99b66c3a SHA512 7a766ce0240b19a18dc5a9a4682630c4ce90fa6ed0d02a97303088a990d09e097b609220f4e2806854585724f483cb2ae7e4f29bfd1898f3a0d6e758c2f4ea4a
-DIST Django-2.1.4.tar.gz 8611886 BLAKE2B 1deedd3c13c65a7f6ae2262ef1e894046e3151dc7bcd6da274d6e87e60db326cc28a51c62627d00c6feee3807ff8dd13823edf8b4494f0d1499272998f350748 SHA512 a2dc6fb7514f8d79aff98aeb0bd0edb1ede36ed2368e553fded8b58765092d6a2efcf2e9429bb9c7d2c16d466e46a9ff18aaf5911a7dd868f42569c1e82831aa
 DIST Django-2.1.5.tar.gz 8612384 BLAKE2B 71396905dd4524f4ec8112d6c36967fcb381514eba6231b02bedf0f0a7cf9a164bb5d7df30bb4ae0dd8e77c4acd34ecd83d237713fbf58ca8b0db32446986044 SHA512 0a8c72e131867787d475feb0ccd7896fe2aefbbda60d85450fc5ce336eb1f1b7c77d7a17ba0a89e4bac84b7fc87f6c22d7afa356443958e30e958eeec7d3ee6d
-EBUILD django-1.11.17.ebuild 3225 BLAKE2B a47970628dd96cb4001881c57f061752f0484cd6c74cb0800c1eb405d09e0d5e723b609fcd32e702a107d2eefc17877f898f3d049b3933384752e37589938311 SHA512 a0b5e1141cc0f66f9936183a03201cb66e5e76899e255a74dd655ff8a1df9a42a17dfcb963ad3326d9398e94462226f0b5c3ac328590784008be39dbf7aa5e7f
-EBUILD django-1.11.18.ebuild 3227 BLAKE2B 18eb4aad39840e8f36acb32d2c0329d83b741f940b9c41b91571c365b2ec91355651b942741d8056c5e2936478f770d6e2210d3d69acdab98772e6f5f1015db1 SHA512 c4691add4998e9b144cc086d9908d76e354d51a1445ca91c311e05784c59c84e05a80dd34ed91e694ae5195cecc5d04de9ba68982d1ecafeb31db4ffbe17f90b
-EBUILD django-2.0.10.ebuild 3056 BLAKE2B aa41de26e621ab1d328877d2ed1a4c96826d829f96b6a382b376641c6a2154765b8d733a50822e98dfe76f2ebf9814e74c6ac97cea60965f1592c9368ded379e SHA512 d8acbef54ed9bd97ce85c0ca1b94307ecfe6a55522debb19605fd017dba9999685c3ac376d4220d19d12d11a10b88c5f25b0b6b086f7da6e4c75b8de8cd086fc
-EBUILD django-2.0.9.ebuild 3054 BLAKE2B df9058fcbf257e52709db580b2000fe5189432745582c782574ad562993c2848f33a7d15fcaf79487281509c6c20a1e903acdded0b7bd4e2aef0061759532b46 SHA512 0367e645c71e7dfc51308b3c7a9e4d211f8591bd82557a5fa61715219ab5573e804a046b212d7c89d3848a574823c1de16d7d08bbc77264d4bcfc967ae4e95fc
-EBUILD django-2.1.4.ebuild 2481 BLAKE2B 12716c330cc37493aa852f18930e7fb825b3c672cb4257d001b2e6886bca863b6fccde4435b86967b0acea56f2a0c9af2c9859677730e4cc017467a91a617e82 SHA512 efc649f1bf67e8376c6cee59b7c4ef16219df9d835e36ee7f070fad5e6502c413b56fbdd1095ae0d702cdad0b93196252e3801ee6d8d57d92698897ada81b7dc
-EBUILD django-2.1.5.ebuild 2483 BLAKE2B 22bb56f9fc8637973dbe0b59348df886100af5d9f6b99b36bbedd3e3a9b2f1ee35f777ac07e4cc53ad14ac60481416e65f910447d70f6b1c15a600f942798e43 SHA512 e6521060728d533a6548fd4a0747764340e71c01b8449707ae61a0721d310c92bd85a6e38809100687a7b303dd6518d7db86126f4172d5788b254b99e3226534
+EBUILD django-1.11.18.ebuild 3225 BLAKE2B 680a455b510afd47a56289169e22fcd160543408f6d28b22423fe461ebb952695d6764c22cf1a7f3ff0c75820b774411eb31b3fe3de8fc0384ac05ebc1abbb65 SHA512 62aa91d0b0c41d46735ca622b56ee29de303d018ce5cf3f48abc0bc277c81af66320f90c6390c0b51e9c04f37f83112f4d4017ca7588abd4667a9fe4562ea5a6
+EBUILD django-2.0.10.ebuild 3054 BLAKE2B 5604ab5ecda09fe388695b010bdca03eb5e35b1695e067a6344461ff414afb9816ecc43578465215416df637816fa8dc99ec456984f6fa966a511e1d784d6981 SHA512 1d093fc15a04482b7f94e340eeb2fdc2bb152c2bb4d50089b1ceb0e906866d78b26847810a3fbfc41e6381e5d61d35cc3927593d8c0ab8433436bcb9487a3326
+EBUILD django-2.1.5.ebuild 2481 BLAKE2B 25ae3441ef0e80a1b9a16df1a315180cdb9cb475231e6328457be807dfa0e5d944dd20d80da6de742dc4d4f91bf779ef63944bae2720203214e409cc4910d2cf SHA512 83b8407d681a9eecad1b6e70db357029024d059133ebd48d9e35488e2895ee4f298baecca2e5b4f683a74258b4844ebec9fb2a342325ffc6f98d17dc28fbcddf
 MISC metadata.xml 488 BLAKE2B b3ffa7cc6bced74a890b71be2bfb3805bb51a523f485079a7da0cb2698f3fa0ee1746922813859ac95df41b3ef3249c413f1692f3635427fa965874287b83d88 SHA512 9091a2e41a992542b38251b12623c0b1ac737cf01a4f46ce63096568bcde4e3d8546705bdb10c14c128b4cb6564e38dbb6d1803611c5197923b847304aa69cdb
diff --git a/dev-python/django/django-1.11.17.ebuild b/dev-python/django/django-1.11.17.ebuild
deleted file mode 100644
index 507ad31d67cd..000000000000
--- a/dev-python/django/django-1.11.17.ebuild
+++ /dev/null
@@ -1,112 +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 )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-WEBAPP_NO_AUTO_INSTALL="yes"
-
-inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
-	"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/numpy[$(python_gen_usedep 'python*')]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-		)"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9-bashcomp.patch
-)
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-python_prepare_all() {
-	# Prevent d'loading in the doc build
-	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 --parallel 1 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	if use doc; then
-		rm -fr docs/_build/html/_sources || die
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r django/contrib/admin/static/admin/.
-	distutils-r1_python_install_all
-}
-
-src_install() {
-	distutils-r1_src_install
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
-	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" sci-libs/gdal[geos]
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-	echo ""
-	elog "A copy of the admin media is available to webapp-config for installation in a"
-	elog "webroot, as well as the traditional location in python's site-packages dir"
-	elog "for easy development."
-	webapp_pkg_postinst
-}
diff --git a/dev-python/django/django-1.11.18.ebuild b/dev-python/django/django-1.11.18.ebuild
index e6b8db11ff63..1e83b5e3fb57 100644
--- a/dev-python/django/django-1.11.18.ebuild
+++ b/dev-python/django/django-1.11.18.ebuild
@@ -25,7 +25,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 
 RDEPEND=""
diff --git a/dev-python/django/django-2.0.10.ebuild b/dev-python/django/django-2.0.10.ebuild
index 0761bad51346..b9fce6b2cb61 100644
--- a/dev-python/django/django-2.0.10.ebuild
+++ b/dev-python/django/django-2.0.10.ebuild
@@ -25,7 +25,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 
 RDEPEND=""
diff --git a/dev-python/django/django-2.0.9.ebuild b/dev-python/django/django-2.0.9.ebuild
deleted file mode 100644
index a0aa696920d4..000000000000
--- a/dev-python/django/django-2.0.9.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-WEBAPP_NO_AUTO_INSTALL="yes"
-
-inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
-	"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
-)
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-python_prepare_all() {
-	# Prevent d'loading in the doc build
-	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 --parallel 1 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	if use doc; then
-		rm -fr docs/_build/html/_sources || die
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r django/contrib/admin/static/admin/.
-	distutils-r1_python_install_all
-}
-
-src_install() {
-	distutils-r1_src_install
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" sci-libs/gdal[geos]
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-	echo ""
-	elog "A copy of the admin media is available to webapp-config for installation in a"
-	elog "webroot, as well as the traditional location in python's site-packages dir"
-	elog "for easy development."
-	webapp_pkg_postinst
-}
diff --git a/dev-python/django/django-2.1.4.ebuild b/dev-python/django/django-2.1.4.ebuild
deleted file mode 100644
index 4f8d934327ff..000000000000
--- a/dev-python/django/django-2.1.4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 eutils
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
-)
-
-python_prepare_all() {
-	# Prevent d'loading in the doc build
-	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	if use doc; then
-		rm -fr docs/_build/html/_sources || die
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" sci-libs/gdal[geos]
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-2.1.5.ebuild b/dev-python/django/django-2.1.5.ebuild
index fa8668065c0d..c10d4a68d826 100644
--- a/dev-python/django/django-2.1.5.ebuild
+++ b/dev-python/django/django-2.1.5.ebuild
@@ -21,7 +21,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest
index a96a544ebf52..51b9230b1553 100644
--- a/dev-python/freezegun/Manifest
+++ b/dev-python/freezegun/Manifest
@@ -1,6 +1,6 @@
 AUX freezegun-0.3.10-py37.patch 2157 BLAKE2B 9d7815473f512a36431872664aae95d9aba815380ec08ed6bd54d764a3e65347c9214fbc7ede39b94964105f8fca2a3127e1eddb9b4385d30788b3bceb2f975d SHA512 1664ce2e1947a6b9b37beb3191ab83f3e7e257f500aa512c0d0d085af34b150fb964b18875faba976f0d094b80681e778a7b06b5251eaa1e811cfb2eaf9a2fb3
 DIST freezegun-0.3.10.tar.gz 20398 BLAKE2B 971f4f3de565878b8a1e4671160f41cc7c558f5c848f5c79dfc48e3f3e3cb71ff9c71090705167d4252edbfee040ef52a7eafd33073011c07337311a7e0ec366 SHA512 64364459dc72484e2124a20a0a84d2b88617efd0578fba687adb51635d578a1e36a00cb119998082610c608e7b6c3589bff5424e38845bad026e85449c8065a5
-DIST freezegun-0.3.9.tar.gz 18118 BLAKE2B 7382646acf0ca8100680cd44d22de3263541031686e05f7957023eaf22f2a1dea370c98f8b6af89a5075aa5636c304e6e7d5a1c64285aa221a73c732bfc5e0c6 SHA512 1aba8ffacc8b9ebdf810253181418bacb75c04222dc59a5e1e526a9f2d97573944926b1b9fcb6c6e6971a7958acaf9b7522c5582190ae6be448c043b6f908c17
+DIST freezegun-0.3.11.tar.gz 23382 BLAKE2B 759cc0355c8600fc46124dfb73b46a771de5cae4e66f5826c175295da96190920d7ff45b6457a061276c0c698bd448e294f29f3b89a0ed8fe76db58e1180b080 SHA512 e8b392176641d52f6ed795c9af5fbc0a62892aeedf32b42375b56ab44a9ad7a5ecd3bb81363ed0ae65204aff2ef894cd7f2e17f42be72f31d3409b2bffa59ab8
 EBUILD freezegun-0.3.10.ebuild 952 BLAKE2B db7ed588e3cc99b3d055261ef1a54eaddb590c44eeec79b4aa637de7b2b3b4a96be9ce33c53989a38025b3ec6256caccc49192b7a8e21c0c0adab7bb6c897868 SHA512 0a356d367545425d2239277d9c9438955442b4f2042f57a6eaf0cf73935e79de589c2637407d3090508e2d38d6f49a10fa6f54615e86a95fc77361a69d915350
-EBUILD freezegun-0.3.9.ebuild 654 BLAKE2B a48e34dd3278053d7eb42f73e0e6c226f2c28d0075dfd7457bae59a6913631b0389334eaa1ccfef4535ffca72f3370f0a255f362a26c54c9f19ce37317384f30 SHA512 0060d7b5a703225eae1dc91cf3d5568cbb48926e1f60bc7ee4ae9936a62a7286f974d9887b91af19cc3269779ab9e68a334ab6208f239e5aebf9342a75c47510
+EBUILD freezegun-0.3.11.ebuild 907 BLAKE2B b41b31c953adc43fce021224c7f9e67cd82bd1ce5b3c80cc2af6323386566491929928e2101591e5efee6e7e9fa8afe35724df630ced3f64274725a8d817f06c SHA512 9bdb7dd4771f72e18fc68042e21ad6b0d3cb08450846be50beddd30c06d21745e0f15f1afce78692acc64a97b36d9c8ebce3790909651e21adf467e446f4ff02
 MISC metadata.xml 392 BLAKE2B 574f859b6be3de78801f9214b561b366ddb87357be71a6891084da1f3de2e6481692d5da7ca6d5008d3ae963cc1e36ead4aae6115f0008d63d65a089cf70115f SHA512 b39f8a45d62f0c220fb915ad64c6a17e9f9619aa8c358694c3a3a83464eb5fcf50ed658430d9aabfb76e8310d4ab3baf059a8de78ebe46a59d6af187735489ed
diff --git a/dev-python/freezegun/freezegun-0.3.11.ebuild b/dev-python/freezegun/freezegun-0.3.11.ebuild
new file mode 100644
index 000000000000..63af9ec00a5f
--- /dev/null
+++ b/dev-python/freezegun/freezegun-0.3.11.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=( python{2_7,3_4,3_5,3_6,3_7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Let your Python tests travel through time"
+HOMEPAGE="https://github.com/spulec/freezegun"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="
+	>dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/freezegun/freezegun-0.3.9.ebuild b/dev-python/freezegun/freezegun-0.3.9.ebuild
deleted file mode 100644
index 7ff68e9e66d8..000000000000
--- a/dev-python/freezegun/freezegun-0.3.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 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{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Let your Python tests travel through time"
-HOMEPAGE="https://github.com/spulec/freezegun"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="test"
-
-RDEPEND=">dev-python/python-dateutil-2.0
-	dev-python/six"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests -v || die
-}
diff --git a/dev-python/geoip-python/Manifest b/dev-python/geoip-python/Manifest
index 3ee1a2f67300..23d5fd3c85ba 100644
--- a/dev-python/geoip-python/Manifest
+++ b/dev-python/geoip-python/Manifest
@@ -1,4 +1,3 @@
 DIST geoip-api-python-1.3.2.tar.gz 35674 BLAKE2B c6c4469164347c8c1a8a5231be25370e806768d7f155832cf759469320d8adbd5efcd002d14d1d95522e8bcb4db12668b28b437b45af669bb336024662908498 SHA512 284209a6894d55ef95844c5c4c7aafff99ebcb13996e5ff64a0c31b38677e13c11d51fd8b0250d0fa097f15805c27b572d5aa12c2b217a839afe3cdd0851c414
 EBUILD geoip-python-1.3.2-r1.ebuild 905 BLAKE2B 084676c55820b3d704aea1ff935d11dc558dc42d09e92a80fe08e0a426ad59931ad9aedaa838b6c84a974208d503d6b8ed00e1971372448701b6df1f78c19c64 SHA512 e71a1c2b572ad444c388997ae11c37c78661f4cc4a25eff1fdb5f33285c6e9823d82d435616e5bf60417a4df13b05df1be436eecca5b5bb89308fa04d165ab09
-EBUILD geoip-python-1.3.2.ebuild 972 BLAKE2B a975ea9b9e62215a95ff915e20a73c566799fc2453bacf427269a6db152d4129b88f2703a0d36a1e63d6130f2e8b71d328a89c71334827fe013e042a6603043b SHA512 6a058db575e1370c2b2d261e83cc0632c86cb3df41324555699bfbc5824bcd61b72810a423f25e1b5c868bdf022ac8d0913973fee474eace182339247a717923
 MISC metadata.xml 372 BLAKE2B a64a0eafc20c11334ab112844de60a58eeaec62d2bb88ceb0e72efba9fae4cfd0bb02a169f4913299534cf3243d740a6f0f96fee1448a55bb8d9bffe3ccf3597 SHA512 dfcd2454bac4830995eda03b9fc585ea4f19f3e5fc90c00b57ee75d8d9596dc5dda9294f770481df7b9c6e27dea45f7fcf1f8d6094703121b0eab62f2fb055a0
diff --git a/dev-python/geoip-python/geoip-python-1.3.2.ebuild b/dev-python/geoip-python/geoip-python-1.3.2.ebuild
deleted file mode 100644
index 16ee2baa878a..000000000000
--- a/dev-python/geoip-python/geoip-python-1.3.2.ebuild
+++ /dev/null
@@ -1,43 +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} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="geoip-api-python"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python bindings for GeoIP"
-HOMEPAGE="https://github.com/maxmind/geoip-api-python"
-SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~sparc x86 ~x86-fbsd"
-IUSE="examples test"
-
-RDEPEND=">=dev-libs/geoip-1.4.8"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( README.rst ChangeLog.md )
-
-python_compile() {
-	if [[ python_is_python3 || "$EPYTHON}" == 'pypy3' ]]; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index 5e50fcc908d2..260a33e65805 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -1,4 +1,4 @@
 AUX gmpy-2.0.8-fix-mpir-types.patch 636 BLAKE2B 3f9a73390cab39ac02c9cdbf6c78381a14e861b15c4e0194e9727b3e801817111b6ece399a2479c0880f84d542816b2e388ad15e8f9786e2ab63b5e893f31cc1 SHA512 701e985b1d8f1d3ed0efa48a9ee225bfb9a06f5a19f53a8a1ec6c525e74fb2b6fd006f1bba28188926f77faec6cbc456985b810b7c774aef1699a0ab2c07896d
 DIST gmpy2-2.0.8.zip 280551 BLAKE2B b73c48b739ae6972231672ad28598c09e00db6348cd281d190c6dfcf49b0e977563baabe84825658d78bf1e2ac4927ad1882787b6d4efd19f28a4f7fd6a061b4 SHA512 090f449641f378c73eb166831b1d956c6cee3da83e42fde8741f18aa0fa687e37927fc3b045d4b35e3a3b75570e6b1074150d8bc29d16119ab5c717bcfcf9fb4
-EBUILD gmpy-2.0.8.ebuild 1557 BLAKE2B 73a5cdc48ef31ea5bb6c102b60f6992ec9378325046ba9d6798345dcb59ce576608f14e844c7dc908ef1ab687c1a5def32b0d2255d9663d157da1392627dd341 SHA512 0dc27bdbd8580f2b5cd853b837faae7266bdc2fb6d2621f659ad808c7b3039f288d6967aa6af501109ca7a4180e19a681c2462ec4dbc6d8a976238f7f1e1b85a
+EBUILD gmpy-2.0.8.ebuild 1561 BLAKE2B 903499fe4a91079b7d608457d0848f116ca5c3fdb4f9f914f2233bf8dbaf447e16fed9c581f5777fafdad5842db5e2d5f9d7a6151f7edbe388e740f4f9aebc45 SHA512 18149588c1d3170eeab0af627a6b9cd6a846db6dcbdc97ca8e87321db61ce53117942d520a86de53af4f8df3d3f053578bf6fa6a2bf80b0b4032c0947c8a0c65
 MISC metadata.xml 795 BLAKE2B df987c466b2666db915c405dea507c17f90181c2e2948885292a6de44ba0c4bec640fe25bea3b8b8105d035c3ff999750b747cfd7f4caaab561f459056823eb5 SHA512 e7f8324cdacceed22f28e27a224668f59955fb5a639d26376da037b0d21437ef57708c7c325e00c771df9e11050be8dc423a3d4b631599da2cc1ef3f97cf3795
diff --git a/dev-python/gmpy/gmpy-2.0.8.ebuild b/dev-python/gmpy/gmpy-2.0.8.ebuild
index 8eb3d9b151e9..196451ce49c5 100644
--- a/dev-python/gmpy/gmpy-2.0.8.ebuild
+++ b/dev-python/gmpy/gmpy-2.0.8.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=5
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc mpir"
 
 RDEPEND="
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index 6ce166e3a6bc..b2f60fe8fd03 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -1,9 +1,7 @@
-DIST grpcio-testing-1.16.0.tar.gz 12533 BLAKE2B 98238dc7aee745b210356e999c6048b028ceed8ee2f356557808b4567fc4cf2f90a111e6cce36122cf3294fa5f4b3be1c5ac6659ad6fa97d26e1bfecf4d9b5e6 SHA512 88d33629ccd6c4d4865a9d643c44f074246d01c0c84d57b06bc011e22d4d735261e4a959720512ca03e699a6e1d26eb0c19997a65f52b5cdd199b22072c2d020
 DIST grpcio-testing-1.16.1.tar.gz 12262 BLAKE2B 06790ef800a256fcd3073e32df455f97ff2528a6a10b661527b3a306adad3828e835c903c0fb4abf4e829ccfb4481b5334c87d021fb83d12a0f308dfc09d39da SHA512 2e1026569b694e555cc84bcbf0389e50d35955bade2ca5614289de0994cbf9d128b649ecd1813e45f8ab79ee4efd77382ed669cba5bcfe8317aa9f774e0e54b2
-DIST grpcio-testing-1.17.0.tar.gz 12317 BLAKE2B 47a7e6c9db330e9450119c1d9d118c7b20100292feb0f9d072400a765e89aaa7a14ef82802a35325d92e03c97cc8d6302be824d8f3ac6cf29821aa4c714bb4ca SHA512 585546f3bb78ac5399073426c65053581fff7abafef16e4e5e17afde17ca751702e6d6c1cdfe8aa8075c55291bfbb93630005cdaae5525a14ab915437d6e41f5
 DIST grpcio-testing-1.17.1.tar.gz 12422 BLAKE2B 015a756c04db0d6a67b954c36c7d725a58d1fcbb7529f5ed50dab7c291abd7f0ce0d18e617f496af161356167fb4b448a5cf431a5a0f6346f12a8dee83a4615a SHA512 3b2ef6c2f43fc8aba270bae72de217f063d987940c965ece6bcce1025c0ec9c181e90bb905a0a6ba675ca7f06b8795250c910945173c189486414770bb02b25f
-EBUILD grpcio-testing-1.16.0.ebuild 515 BLAKE2B bc5660b9b881543b45138e3d0803c96bd37787f8defece62ede3bba2d93490ed0e77a9df59d2a881523af96e57cdd72f96be18197c0fc0f026f8806125c15cf4 SHA512 2eb83dd4a73f6f51708bcaddafb702c580d20c674fbccc8c8bc959f7f2b530a67bf4700a4e2545c94ba405f5e0b3a07ffd97a9eedf876988e6c26c14a16f94ea
+DIST grpcio-testing-1.18.0.tar.gz 16603 BLAKE2B 6f6170211701b56d5937947ef227cf9199ec1fc7c5fdfd140a222dbdee7db7d352e95fbe2d50be8e01895c19986b858c9dc2ee2ca4a6582e484cf05b148e0a6a SHA512 1f855129b7b939a1b70105e68c1ad78b3dc32efac66657a985d1f21a3945a2077d80c70fbe5bb0304fd8f85d69c1a75478b13b7a824c9e66a0563c1730c13f83
 EBUILD grpcio-testing-1.16.1.ebuild 522 BLAKE2B 51f1840a6f3dfa39f6c35768c0254967f949be53ff37dd7284cd6fa5f7de3ff95a6719b6faada3d6cf914d4298b63c725c76c666527d2e4301c2e116ca76632a SHA512 5bb33b143942af94a486ab9562889f3e9bad576ed1d137e870fd692665bdf739b56ccf2fb77a84a8dcbddf973b59fcb6cdddcf940ac2a64d9710ed48d1527e4d
-EBUILD grpcio-testing-1.17.0.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
 MISC metadata.xml 462 BLAKE2B 159e29c960dba2f197de7e1b8eda84162039ecdb35777aeb00314f8af9a7bc0771071e63a1528c922519568594f06971b228036914500d2ce3d33b411ddf0685 SHA512 8326b0e1b98c2921b461ad44663711318f2c48e4e411380de4b4bb26fca11d726d627fe47ccd0d1149348b55aa9391d97d144f654d016a1fccb34791f5850487
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.16.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.16.0.ebuild
deleted file mode 100644
index 03c920504ce2..000000000000
--- a/dev-python/grpcio-testing/grpcio-testing-1.16.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 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="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[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.17.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.18.0.ebuild
index 85f8ae2dfefd..5f8e0f83fb5b 100644
--- a/dev-python/grpcio-testing/grpcio-testing-1.17.0.ebuild
+++ b/dev-python/grpcio-testing/grpcio-testing-1.18.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
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index 236e7c02cd23..98a312c3eb4b 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1,9 +1,7 @@
-DIST grpcio-tools-1.16.0.tar.gz 1893006 BLAKE2B 01224d6af05a87e23609d47e5fefeb4784b0ac63cc1198e9f81de03b0b0fed5b2e2d706a486627c1d0e770ba66fe7be00dd98b866fb98e1d14299302a080e3b7 SHA512 86b66242d17d52d08ebb0861d08bcda4dc90fc142d2777bf99d0e4bce72049f88edd5d2ea52c2b33b9a77d94ca8961d877a97ed614766a3061528d41c96e6e96
 DIST grpcio-tools-1.16.1.tar.gz 1887741 BLAKE2B 721746ff5febd743ca56f6e5265fa7066ca1c940ec7b73f2978b2360bc3f4076a72b4bea44fd808e59713d06879beeb43ae38e176ceeee204e0159ef2540324f SHA512 73652b3b317f216a1b3e6d94499888ba9410dcf44ed11771b359fc363eef6878f466385800cfb856fdf956b275a5356f4984e68a16a7ce8b29ea5c278f17d9fc
-DIST grpcio-tools-1.17.0.tar.gz 1902697 BLAKE2B 35aa9134dd9ad929925b32f8c1215564d59cf4cfd81762b59413b9fc25d150956997c0e0edf80b0c7323a830331d1ad5c24a4374c03ae3f682511e3f76a1a8b4 SHA512 49042e085f0f961ad4f0d5c017cb57d6d54b1ba9baf990be09130cf08c67088f528d0c9a761bcfaf36eb14a0e1dceaebda15b03b4f6b519ceb076626c6e0cc4a
 DIST grpcio-tools-1.17.1.tar.gz 1900052 BLAKE2B f84f9b7f52eab6758321d50aeafc25cb31c100ff63176cedac16514d223192d1e38a8903c809f3e89c18485c1ce129ee50e2cd8ec751b98ad4b7ed3f19cb3080 SHA512 50412305314ae5ef284b01b1afa19778233cb97df755a9896c881730da45455c7dd1e82798ba88c63ffe8f478f93f326d06c7a8575d3ea4c4ac3d10467087ef7
-EBUILD grpcio-tools-1.16.0.ebuild 673 BLAKE2B e78528704ddd3ee06b2ba4db44e77aad89d55110078ee6e02d337262e1fc74f59f8eeaa22ef0c9404f7131db8d42491ceb35d9fb7c35ee16bc714724b5ab63f0 SHA512 53072ae2af6fa9e63a827a4e580678ccc7de489d7cded9ba3980440abb8a148d4e55941b295d7b9a5bdba591367956fcf50241467a5f3b54f2c7f86226a43191
+DIST grpcio-tools-1.18.0.tar.gz 1925482 BLAKE2B a8a97e3a6204593bcc0e96d392652d31d1b1d545c91922222b124dc250d020327ed81fcc1c5feb02115517da34141651a4b24a13df825fe352dfed7715724768 SHA512 5c581a41804eb5dbad34829c9dd32253849484dc6e92d0bbd43b816ec3b45b741b23bffeb9969bf2dc3b7183cb05135f6dcc20f5b260c07f7173b9688c9852c0
 EBUILD grpcio-tools-1.16.1.ebuild 680 BLAKE2B 9123e2777429525db1d75e702d606e8fb514f0ebbef64c249e3e9e3806fd9b434a57eb0f8095f09761b7ee2f2187ecc42fde178655419351a05f4f62383e3f3b SHA512 c6e093fa343fbc8df84193aa860ae33b30d42a3853819bf0b28976cad4b793ca4d1e1968d539b3f36941fab8da9e403b441b750f6b649067b7fe4ba248a4072a
-EBUILD grpcio-tools-1.17.0.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
 MISC metadata.xml 476 BLAKE2B 62016e9a321f9c5b06d8a473d75b5efca8246df90ef9a67a33c02c416c58a8ee1be875cd54567d55bc9f10ef32082e11c01a9f1550293137aab8942e05dcf744 SHA512 cedbae8a8d9d7c6689c676c433aa6fea3c16d41911e0ee4a30929dbf2adb8ff72a2f0d81f996196a3b4090f8a5103a54eab4c651b359f9487d59955a6861152d
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.16.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.16.0.ebuild
deleted file mode 100644
index 1cc3d8eb6721..000000000000
--- a/dev-python/grpcio-tools/grpcio-tools-1.16.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 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="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[${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-tools/grpcio-tools-1.17.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.18.0.ebuild
index e7664411391f..d3f16543dd32 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.17.0.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.18.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
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index b08ed2c36cc1..fe1671f3a6ec 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,9 +1,7 @@
-DIST grpcio-1.16.0.tar.gz 14519470 BLAKE2B 872ef15a7994303ce7ac0a573e49c94260eb8480d8ee94e25471ec9395827fafd3f5e3bd6f4793eb15091827e6d780b8dd6d01f38eef85db80fb234a710f370b SHA512 37d5940f1543cebdabf2b1340a042f98e5f321c42d92d05c88631c0eae42d94d3fe86893a21704a22b70c1fbd70bf091c1af2b51cd5c1d316dd8f0a586fb0eb7
 DIST grpcio-1.16.1.tar.gz 14514047 BLAKE2B e4fc7f196f3e377afb0a103aca60337dd63b3b0f84846e7e2a4622a0102d4300782f08367e1429e1fd021dd90b151f17dd927a25a749f35724c7d2a41a6943a6 SHA512 efd7fb36a61e2ee872c0807a8198cabe8f1f9003bd5bce7cd46c75541752c0f745db02bbfe3f37f572531e15df60913f2b08b678545f176fe683f3e64e22124f
-DIST grpcio-1.17.0.tar.gz 14563132 BLAKE2B fd9b4f1f0ce4b42c56edcda35e1865627ded48de74c828020547340cb2417df576705187cb4495668a10b603f13f0b2fdaa030aeccdfa8cd2a6e0b4e7574bcf9 SHA512 2af696639bd995e8df905bdec88f8d4c9d1973282438181474c9662cb9e72916cd5fa843ba61ecb90d834e5d7d70c063c4b81aae889be1bf9d3f0ce804440305
 DIST grpcio-1.17.1.tar.gz 14563233 BLAKE2B 61ccfaa967ee348f02f5a201e4f36f25d4fa09a1af11c6b5a0f345d13bf86f0fb12c3aea125c5bc27925698e0a23a9592806fe5db92fa37360cdcaf88e596189 SHA512 bf8dc6b7ce2f4a0765377fbae085395caef9f0cd0a2b4a779b3bf1667c6aba5fff034168bff9539f96dea76b2c97d7586305715c850d10e54918337458a4ee95
-EBUILD grpcio-1.16.0.ebuild 923 BLAKE2B c1958ba9f6c2071dff53d33799edc6dfca1ea0a493ead17508ca8c3d4863bdaaa6b4ac8954cac203759f2060b7ac5f4e791ce7043e40119dfc82fc9c4847d121 SHA512 3013e475948cbcca3e37c06aa7c06b326574a32cf8231d4785a7bbd66066de336daa23b432eb5dd210b32b8f4786f5b86c50a94df7df8af4a0f3535022ea8677
+DIST grpcio-1.18.0.tar.gz 14601124 BLAKE2B 4dc57243759c573b960e841def6af335f490fc6aa285f88979b4c66365b104a84269688c589ed7ae797527b04124a9997937f5bf33b179978077b2b680e515f5 SHA512 da791a418e0f6f3a7be921e107586837edcd2020dc8dab1107712372ebd4896b6b94e00d7501ed957e4ab0d5f7d6a3f2b57477ff33c55eb5e4ad7828b2f21624
 EBUILD grpcio-1.16.1.ebuild 923 BLAKE2B c1958ba9f6c2071dff53d33799edc6dfca1ea0a493ead17508ca8c3d4863bdaaa6b4ac8954cac203759f2060b7ac5f4e791ce7043e40119dfc82fc9c4847d121 SHA512 3013e475948cbcca3e37c06aa7c06b326574a32cf8231d4785a7bbd66066de336daa23b432eb5dd210b32b8f4786f5b86c50a94df7df8af4a0f3535022ea8677
-EBUILD grpcio-1.17.0.ebuild 972 BLAKE2B 67f25fa6beb4d2da362b74bd914f692a19b252324065fde5150b74fb150faa11cebcc55fc7dfa241611125d61097dba60f1d9b068c3efb42f13a06d11a675197 SHA512 2542aee7268e2bf44f6133e34538ada3d2b65a0b86d7728bb0b05456ae7df4e95f6c0d1443168fc88d5a717dc5ce4fea4ccb5a841789b52353e9e1a368da937e
 EBUILD grpcio-1.17.1.ebuild 972 BLAKE2B 67f25fa6beb4d2da362b74bd914f692a19b252324065fde5150b74fb150faa11cebcc55fc7dfa241611125d61097dba60f1d9b068c3efb42f13a06d11a675197 SHA512 2542aee7268e2bf44f6133e34538ada3d2b65a0b86d7728bb0b05456ae7df4e95f6c0d1443168fc88d5a717dc5ce4fea4ccb5a841789b52353e9e1a368da937e
+EBUILD grpcio-1.18.0.ebuild 972 BLAKE2B d0ea4552a6c5698375e4dbd6b2712810cc2e735f36cd7e399a7e657924af06de80073bf19b45b8b88daa694391c0a8c2187c10ca8e06a52423712094e693b664 SHA512 5d6a2646fc98f82394c35833efddc896cb2dcb4a4df2ebfbb3278b4d72d4569027f3af9ba1b70225bf52d253b5bb935cede245c214b5a45eb9f4e29cc0b37415
 MISC metadata.xml 470 BLAKE2B ad01d702b7a0ffe570bd30f50d47bb4fed725fbdff6f838acc54ac767d0cee88bb28bb0642f804fb04858d36a63f8ff7e110e4ae1dd26b8eb539b0a5c77cf5d0 SHA512 bf26387089977138bcf6be78b469bb412988e96c6bf5b4a9897f452378ce71fab1012a7d9268fb55f2883bc9636b712b59abe5498ffdcf199417d97fb09cd90b
diff --git a/dev-python/grpcio/grpcio-1.16.0.ebuild b/dev-python/grpcio/grpcio-1.16.0.ebuild
deleted file mode 100644
index 312146bd5e1a..000000000000
--- a/dev-python/grpcio/grpcio-1.16.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 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="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/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_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/grpcio/grpcio-1.17.0.ebuild b/dev-python/grpcio/grpcio-1.18.0.ebuild
index ef464d3ecc68..8b3fc6a1b2a6 100644
--- a/dev-python/grpcio/grpcio-1.17.0.ebuild
+++ b/dev-python/grpcio/grpcio-1.18.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
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index bde2864a6045..22f922493477 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -1,5 +1,5 @@
 DIST hpack-2.3.0.tar.gz 41610 BLAKE2B 65fe4f07f64dddff5b24b3a84f7e49de32e358fa59bb1b21e619135ef33d282d4cd24283e93c71bb71c89d7b5b2a3f8ed36f6d406751c54247472a75192bf50b SHA512 a3d13da105482bb258ee3a2314b2629215028777f84127f71359f08819c96af088a3952bb0a74435472035d10ee6e3943cdad689a28f04cbc12cddcc4af9a8a7
 DIST hpack-3.0.0.tar.gz 5305971 BLAKE2B d1df8a1b2a1ce8b91e63cab475d3957f937fb74c0bec343d342971be1bb7cfbc929c53cf041845df2965cef0cfb098345bf0612acabc7ef3e5e23f6f0aa44f2f SHA512 7b9cf5e643dff2a6454bfe419b797c8ed1a0fe6ec3b725d2696da5a820ab96fe87a64e600b1831c7024bd82616b155a0aa058301acb32172155b6538ba0a73c6
 EBUILD hpack-2.3.0-r1.ebuild 1037 BLAKE2B 192cca26649bb8e66e5cc4b6da74d6a9a3360f2ef3e817882807d3f506a66d5a39abaa0b6ea0e5b112067844a3b183412a7a5fb661326c1b64888869ac79078d SHA512 62b0198a3e60209a460733e74c54fc48b0a1f777a9ad705eb0aca1ce13f88d54f83045762c5e28a073ed0ce767e43a0f3d8186c3cfb0db7eea7d065088a186ac
-EBUILD hpack-3.0.0.ebuild 1072 BLAKE2B 6cfc73b17dfe212a786fc1703ad9541d43632b66c522d55dcd9287dacf8c855defa2e09a4fe2f4dd30019346c788bea5ae67c3836313c807aec4d6d200cc3755 SHA512 a63f986eb54be14f41643ab1688fe8e892712ad5b46f18eeda11f950871f38febf3cfa7a0c57eb74d20220ceb8903bf8630bf63584219cfab9b6407ed8742e7c
+EBUILD hpack-3.0.0.ebuild 1073 BLAKE2B 9af85fd6e1c154c42756251b26f5bcc64b42bc74fa96b4ba258a93a933e988036db75455164fa7037a3929ad84404c73be0a0fe8c760e6530ac42a54f6662918 SHA512 2b4d950e9162abfae8a974be8fdd4fa244f13b51c95603dd6f2b017e946de65fe54cbb3d7317632dbe08f2fc7e79eba874450547f20c1c9240e4f938e9b7e2a7
 MISC metadata.xml 755 BLAKE2B 07d55adb82a465399ac181c0bc57d6e884acc171eaf00ae4b32b1c7df02082a80e1904cca1755f755fdf3d7dee3028dfba951d7799485f43657c0141bc12c002 SHA512 0941a33f24de0db1f466447ba36585cd3d5dfa70eade8d076089cbe2309a7ac5498b77a712dc237f335a27c954b7b57be7c951c5a3c052b648499dbb545375be
diff --git a/dev-python/hpack/hpack-3.0.0.ebuild b/dev-python/hpack/hpack-3.0.0.ebuild
index ee4d15d69a51..812dcbc63546 100644
--- a/dev-python/hpack/hpack-3.0.0.ebuild
+++ b/dev-python/hpack/hpack-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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 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 ~sh ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
index 18ccd72c668a..fa7c4d30f063 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/hyper-h2/Manifest
@@ -1,5 +1,5 @@
 DIST hyper-h2-2.5.1.tar.gz 92713 BLAKE2B d00baea98dfab43c2d6157f4dec3b04b2a42d0ad280980cb8b7d03d1c6f75de59e188745e7cc29fb36fd8c0799f9d5cb50a94282c70f045289daccfdcc12dabd SHA512 e82a7e6b592b43d74defbd4c729ad287ed019881f6ddf0d2dff9d3eb4fdba29cab8d988848ec64b693da77df5cbcacb06eecf1ecd77843c66c9eea8808fc949c
 DIST hyper-h2-3.0.1.tar.gz 2198911 BLAKE2B 453ce1bf8e6216e2852f49c5a22ec5cfa487a744a818e82929dd0c4f03280953c1f742890d74f771080987e2f70d9430e4d66481501357f0d4c5ec490fc5fbf7 SHA512 5d98b4fb654c20f6b9e6918bb71b88a42a3027bae795f31c32c2b5cc4428774457c44a194f9c819f99b9cfd01753a6e6d8edb6c162020ff463602452d8e9057c
 EBUILD hyper-h2-2.5.1.ebuild 966 BLAKE2B 0e6c9b0bbbb39d8fd5e67ce234a1d9acda92dd02ab197a279d35f125ca60a352d800ed6ac633c1b83d78747895c93bd9ae7fc4ece430ed4d80e24b97b5f25508 SHA512 9f606b3d46b933e5aabd05c019966981707b143b49865840228ff9a6f83bc2bb487f4ae916e1a2786d2bb022b082bf5facaa51422e9209927f7df51614b5b8e6
-EBUILD hyper-h2-3.0.1.ebuild 1115 BLAKE2B ca9cd9d364135d3741307b13d4a76025b30558b2c49af446c7a95e08f68a95adb050d392fd677bc87dcd24af04987cef76ed95eb8cb174922284aa1e97bd9a5b SHA512 c9c9fe90b1846e8667b44d7674a1c893a0654fb10b88789f45c7fbc182afd3d13bd41d323379a7e6e0ee75801174d6967e815134f9b95e10a101c0e62e02f58f
+EBUILD hyper-h2-3.0.1.ebuild 1119 BLAKE2B a46dd7795bf06735970c904b959754d8fcaeca25338bb4be875c13816055b332163de8b4896851a35b0ebbf39af9e38f3f0488e645810155d2e94d1d8fadb509 SHA512 6b5ee03831d4b0325d349ee296436ce0e0f9c2c50d32d61a11cf16a3426fe166d62fcc5195f08125350965cd8b0e338ef202df17ecde12696e0a3729ecd53b48
 MISC metadata.xml 747 BLAKE2B ca9107ee5025360a343d9ec92424ac6be517d1e45ffb2dab10f0c37c82ee30db30a0fa9eaf7bbd0066f0e772e47a09bb11e954afe3904bfad2f672961bb608f0 SHA512 5efdebf70cf061471f14af5941c609b31c75208bc4f632b05bf017e493d4a8091a3fba335c95efacb0a1271aaae6a54589032dfa393d2844053cb859fd6b0d38
diff --git a/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild b/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
index 122a4bb6961f..a93f141dd2e1 100644
--- a/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-3.0.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=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 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 ~sh ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hyperframe/Manifest b/dev-python/hyperframe/Manifest
index cfd42044ef4d..8a9b728d3030 100644
--- a/dev-python/hyperframe/Manifest
+++ b/dev-python/hyperframe/Manifest
@@ -1,5 +1,5 @@
 DIST hyperframe-4.0.1.tar.gz 16110 BLAKE2B 44e99247a818c1f7b7b31b5170b72aed08511aef2af2d3a55a4aa7609f86c067d14821b510b0ca1433a9de9213be6a0048f2e1eef4e25676807815aff7c14e27 SHA512 0970faf8711b12b4be2cb4a41b4be6d067eea57c40ee063e2ea0c15b148f1eed0214b29c9e8a4341ed453edd8679b55f290c3818157d66f247dc4ab8e3d369b9
 DIST hyperframe-5.1.0.tar.gz 17851 BLAKE2B f9c938b74699029bd39e2b1541f18111fea5ac760d9047fd09341e199948da13795d786f5a0eb8e85d698f90d07ffd02776fb82638ec1f1eb564059401291253 SHA512 5326f1b3362086a905e9c9ec63767707547428311b3ccee28d4bbf2ce729869bdc6d30a21617984ec3ac7ebef5919708fc1f2edc08d22b99a7820789408e281b
 EBUILD hyperframe-4.0.1.ebuild 495 BLAKE2B 4fde18e35e0d7fe8b29bd6be5b57e1be307f3c2b4b407be7ef12360fafa73faf7f13a8dedc13635c9b0298f3b22c8068d8a9f0a7af35d29bfe35ba9e673e018f SHA512 53a0d42f712a8fd89909e66dd5d91b8e4584278f273debf5d9f63487fb18f30988d5193b1f82c001276bf39c91d3690796f61008b26fe48d1f2461e5e530fae6
-EBUILD hyperframe-5.1.0.ebuild 666 BLAKE2B c57a300f628f3df8ca2ae7c73221491c13acf88c75390eee825d17fcce7cd4ed800b2880d7070fe53336b526664677e7f8495d406a7c0428e671b9f56be85e2a SHA512 01e4aa5d7a649e18cb4388f91c061d9b41669aae3cb675e38f2cbb080be97aadd53dd138d13c975ee2bb50e7ebfa1b2d588d5fbd525672800f1a6650458ca450
+EBUILD hyperframe-5.1.0.ebuild 670 BLAKE2B a20b3964b0edb19079e5908b2d18237150f1b50324df4167c66a9691df0cb4ab9ac5177f00289ad807a39959dcc8be193eea6e596da650693c61bdee7e50a704 SHA512 3f200d79ecf34b2851ec2841268de438648d98e6af494005434dadd8d99ee07602efa460c9ec96ee9cd2c4f9e32c87bafd3a88119947bc19934c19f495577b2e
 MISC metadata.xml 702 BLAKE2B 36daaf246eae4068fb2729e91e95865e831d1449f78f2c37061adff7530225c1dc7c68e245170acabc91178fc679116d5639d4779587f05a599566507b5da5a9 SHA512 4539720057ccf3c78a94dffea4f59f628a68e9f1d0dfd6ab987dd991f2b1b5e6d1b7b46c04fe1faf2249cdb481309b8a176c1947fc99801130a4c94f6a9a0032
diff --git a/dev-python/hyperframe/hyperframe-5.1.0.ebuild b/dev-python/hyperframe/hyperframe-5.1.0.ebuild
index 2720b56d114e..d860e5b2d695 100644
--- a/dev-python/hyperframe/hyperframe-5.1.0.ebuild
+++ b/dev-python/hyperframe/hyperframe-5.1.0.ebuild
@@ -12,7 +12,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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hyperlink/Manifest b/dev-python/hyperlink/Manifest
index 28fff6becdd2..c035cba4f86f 100644
--- a/dev-python/hyperlink/Manifest
+++ b/dev-python/hyperlink/Manifest
@@ -3,5 +3,5 @@ DIST hyperlink-17.3.1.tar.gz 91359 BLAKE2B 46ca9ddf54b8e5cd68cd5dd821b7a0ea2b218
 DIST hyperlink-18.0.0.tar.gz 97625 BLAKE2B d189445c7375657614c38db9045d96789b78a2d4ebe67e23b897a450588fbe1e3916707bb67916eb893e93a716125e606ff8be27e63f3db4e63b8bda1436fa59 SHA512 21b5f88f7aaa3f2b0b60566fdb0fefdf6d42866060606dac181c8e3d357c76a5c23fa5dc982812af2b7d49dc1f9d623bd5bea89bf2cf31916c855bc4ae85589d
 EBUILD hyperlink-17.1.1.ebuild 750 BLAKE2B 28e596497a229d3939e08be7a20b553abba25dd5fdbf13b5bc625105638c84766267be03b92c04d6963fc3f109a2fae5c25973ac125ed9a3722de9b5aab1e66c SHA512 bcfa4f179f4a37e05e3e9e28720847e0bffc2f384d950026ece4526590555582248ab2a41fe64cb810dbe000e4bf74747452de90ace91daa08df60b7d524e38f
 EBUILD hyperlink-17.3.1.ebuild 774 BLAKE2B 6c87c7db5fc0877cf222ed2a0479e8cc174a324cf8bc57e53e90a5c3a7726bfe8d15967ff414c3776ca3f8fc3c8bea86a62a36e91e7c295f0b2f8f4571a6317a SHA512 129da86ef743fa68c780b221cb0d24b9c27da4466420e40b5ad9f90627dbb361d656a55a5d1ddee2e6b346b8885f395a9c5532ac37a0ca4b5a4fc603f8360ac4
-EBUILD hyperlink-18.0.0.ebuild 702 BLAKE2B 2e9137f4fafcfab67286f29152442b02739b0e453f435c69d82e791170f7ee63e9860115e32fdeb0bb0e7db54790bc22a8fb6e3fda97ebc0440a8857a9a1f6cd SHA512 a88da7c500026fde7c628912219ac435d8b3d8e028c71674fca32cce26fabcebea48853d47ecdb1e99995c1ee82298679d2c1635be5df997c1731c008aaeb8b4
+EBUILD hyperlink-18.0.0.ebuild 703 BLAKE2B d1637b5fa9d31dfd8cd19bd499116c273880a9fb180c645565696e3cd322c679c4fe225ceef7d85502ac8a64b4c5883c138ee98f6874d12bee56b3de4d069a59 SHA512 2de4b157537075e5e844fc630fe1650440d7cbd95c9253081b546b15c9debf0953c2c4daae3c510e0072100f70a325fb1179e52be9c0ca2264f12ac6d86e1a90
 MISC metadata.xml 751 BLAKE2B b9e49354e3472ca16622fd269867df7f0c5f372afa5f93c36c2646f35e0fe1e1fcd6b25c66ef73e13e442019be449ea72b26fda807e3d220fa254c4d7a691f21 SHA512 7cd14daa771935591e7a130d9dbcd20630074d49ffd738d964b631798a0466392e0b669cc009f3c769614d704925699f2bc3239bd5e78ba0c2cd629dccd72591
diff --git a/dev-python/hyperlink/hyperlink-18.0.0.ebuild b/dev-python/hyperlink/hyperlink-18.0.0.ebuild
index 95b3122be4d8..2d159e486d47 100644
--- a/dev-python/hyperlink/hyperlink-18.0.0.ebuild
+++ b/dev-python/hyperlink/hyperlink-18.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/incremental/Manifest b/dev-python/incremental/Manifest
index 30e125c531b0..f85cad75ef03 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -1,5 +1,5 @@
 DIST incremental-16.10.1.tar.gz 16066 BLAKE2B 86bd85f9ea1ffe92a572b1744588f34f21e4bddc4aa80373dba47a59961183a77a338212500829440d216582ce15ab1412e9994f89486861297407f22eb989fa SHA512 b60ebc41c32f27da5a489ebd76c7fa1707a5a38c32097bfab20f355a86b490ce21acc7be157d0309a30c63b85d79f72f850587d1449110bd1a8075ca3586db5e
 DIST incremental-17.5.0.tar.gz 15527 BLAKE2B a967ba891b69e91768db213a9692da10eb9987bf962bdbc3b6fe70e337322686d58901878b72934a5abc8d9b0c9884d6e03de5b8912067f07b7562427bcba38a SHA512 91443205f7c92ec8f6502f38379c5ac2fe441435ff9490af01e5420d6bb05bb1c666dd612fc45204199a34afd533fd3de1390ca482bb554dfec7d3a22958a4bc
 EBUILD incremental-16.10.1.ebuild 603 BLAKE2B 33e9d1714f0e9cdea94740a63c297cd889edd71bbc3353849298f4f2e6a82e522447931515c5ebfe2e3e179d2eedc3893edfa3918a61f8bbb146daa78579e4cc SHA512 19295dfb2b253ab2f233952c6eb38eabdd8b1d6d3cfb83953c1f21e1e306ced19050bf43a5ebff5b117b9965008f9320fb6840ee573056825201f59f97c2ca49
-EBUILD incremental-17.5.0.ebuild 627 BLAKE2B d3a5727ae0a16360f95ded8ddd4c873526dccdbc608c2634e01d8e72cdabf7c14ffe73c8825736322b96121ab8009041fd191e09c6c464bcd4e5475984cf9bd9 SHA512 8ed48e1623614a2ce247bc6769f3bd19dcef1c2a459f052a03f2bc1f7f44405bb7ced9ab5605f5926b57395b3a496c83da571588a183519865e768c44d312215
+EBUILD incremental-17.5.0.ebuild 631 BLAKE2B cf590c1d95010156b8f5b6612069ddfdfa826d67ba40f38a7a7713c12c22c4bdc1344268dca7d78c1ddc79e72e2f5e9bd28d6d56623c212e284853f1fd55490c SHA512 5846257bccdb6ab0d23120bca9645a2dd45583be46d79e6efce02ebff3de0663183eccb30da79e581c658cb6657628b6d8e58a181ebe792cf3064e70151d04f9
 MISC metadata.xml 554 BLAKE2B ab26ba9e5a69a853b0c0a167dfad54de819a17ad44a47a9987e8cb632bf1551151a208500f37c96543d7f577e99d6d47b4157c97b71d7ae60e88cc086a1ef1ba SHA512 a3bd82ee309e301f175da663ecda74af803631324b0d1097082ad04e6bd9e2537208fea8ebf753f38341429b1d2bfffc887ced6b707655ec862541ff93e83c6b
diff --git a/dev-python/incremental/incremental-17.5.0.ebuild b/dev-python/incremental/incremental-17.5.0.ebuild
index 4a31d57a1c64..b3d2eaf2b65e 100644
--- a/dev-python/incremental/incremental-17.5.0.ebuild
+++ b/dev-python/incremental/incremental-17.5.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
@@ -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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index e7bb0ffdd08c..322b14266144 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,5 +1,5 @@
 DIST josepy-1.0.1.tar.gz 50251 BLAKE2B eb75e05dec890c92043357740829edf96f49f0c77b85211b9a9077ef39bfe59df2ee5952c1569559a07b6505870d796b3aa9e2b0fdba6943860b035f09a004b2 SHA512 51f0e1286a05ebc42f388d13e47e7bd2d1eb11ba1cf06f4d52d627d4a3c2d01f73f1ce9c9ff23ed7dd78ba18142af23e3de4277a63dc69b433bbc3e7aedfd6eb
 DIST josepy-1.1.0.tar.gz 51286 BLAKE2B 57da7c74308b7698e84e19307283f9c09e61ee4f99ffcc98f02f50c24a96efd485540b878d5d52248a51f81356ab406654c6016614e32a1810cc1ff46b49ba39 SHA512 eee886565b1cb92e6d7a42f1e3666a158c162fb891f90de844118ac32b24f6deccf2eee5990ba100827109203f7da99c2b55735fb7bda05fd7a447dca39d6362
 EBUILD josepy-1.0.1.ebuild 660 BLAKE2B 13e70eee5acef28b88c4feceb314f651aeedb0a6985e7f3550f39905f783ccd331ad9fed8fdc5e4a2c9c53e34d76e8d0e7dd10e822a8ca996083456396699b8e SHA512 f154c240412fc4918954d2eef909a04b94953cb51e4b6461374b91cb851375294dd17ef6f8e4fc72329237ecd26573a66f7aadbacf84a73b7fcaa5d189e273ab
-EBUILD josepy-1.1.0.ebuild 660 BLAKE2B 13e70eee5acef28b88c4feceb314f651aeedb0a6985e7f3550f39905f783ccd331ad9fed8fdc5e4a2c9c53e34d76e8d0e7dd10e822a8ca996083456396699b8e SHA512 f154c240412fc4918954d2eef909a04b94953cb51e4b6461374b91cb851375294dd17ef6f8e4fc72329237ecd26573a66f7aadbacf84a73b7fcaa5d189e273ab
+EBUILD josepy-1.1.0.ebuild 667 BLAKE2B 9a292448d95f389e0f431a9085b20f600ff185676f790a64b1046022979f818c0c420b921a2e0197bcf6a3ed9f52cf10bc8156c8b72206197205cd8a2c77794e SHA512 2bdcc0953029f45d0d3a5ed6505794cfe09c414768af48dfc29be5c9fe6494414b208a1f503116b4984d66d7c4368438aa669ccca57fab9843ded8a7cf3d4933
 MISC metadata.xml 510 BLAKE2B dd45e914009523f3f80abf257ab42238c0e033978f344e9d4dc7cf28293f39dc0e5b195129ef065fbdcc979a48166fdacf3c81b1fcc808017625595a5674170d SHA512 0742fcd82de64649d12f10a2c7b20baf1a928943f4ecadd4995f23e13471d584f17ec188b0b98aa1f675f9b44d7d8446dd4525b2b7617ec6b547c0074d6c9139
diff --git a/dev-python/josepy/josepy-1.1.0.ebuild b/dev-python/josepy/josepy-1.1.0.ebuild
index 664114b42e13..41a9b9819d53 100644
--- a/dev-python/josepy/josepy-1.1.0.ebuild
+++ b/dev-python/josepy/josepy-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 9f7cde337b98..dfc86e3b42f6 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -9,5 +9,6 @@ EBUILD lit-5.0.2.ebuild 904 BLAKE2B 74ccf4ce59c6aba63fec1f0dfed1e49bf751abf8cf61
 EBUILD lit-6.0.1.ebuild 1014 BLAKE2B 549c00ba1da9265ef26ea04d574d139f1fbab99f79ed60f270ff960f940df4507376fe31d48776241ecf4a4cb84f134abec61c000a27756ba057083527cd6607 SHA512 729a2b96a49758b18e59ec9df38ddff9890953283185cbae0abeef1cf4f11c2680485f26ffa70a85b326a389a3230e459700366b06f6bcee5a4be9854afeef62
 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.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.9999.ebuild b/dev-python/lit/lit-8.0.9999.ebuild
new file mode 100644
index 000000000000..27b4c0f19d5c
--- /dev/null
+++ b/dev-python/lit/lit-8.0.9999.ebuild
@@ -0,0 +1,41 @@
+# 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 git-r3 multiprocessing
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
+	https://github.com/llvm-mirror/llvm.git"
+EGIT_BRANCH="release_80"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${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() {
+	git-r3_fetch
+	git-r3_checkout '' '' '' utils/lit
+}
+
+python_test() {
+	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
+		-vv tests || die
+}
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index 1bd9543b3cd3..5803913b044a 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -5,6 +5,6 @@ DIST llvmlite-0.26.0.gh.tar.gz 175536 BLAKE2B 6736e94c13974bb79bcda08ef58dd6d1e6
 DIST llvmlite-0.27.0.gh.tar.gz 186891 BLAKE2B c7175beeb5c45b6fda62b78b23352d1c22111a37e7fdb89897409c6ab245dab23aa4f799fd5add1bf2199e8f6783d6094101aa29c4afefa2a3dbd48d735b418a SHA512 6c3230f23fec53ddff077c885bc0da4a773049d0226817142e2b7ded9fe6a665dd5cf8c6468101b342ef8e3b394bf2078cf93fc513e46fe451cd75755111448b
 EBUILD llvmlite-0.20.0.ebuild 1286 BLAKE2B ba74befabce5dbf8a93148349e230788702f1372788f99f388c827700a2209c77b7a0ff80a0c728da14f11e6170658b0d87b6ed5ce28a1500c33f8a42adc8af5 SHA512 afeeea625207aaa2ed0a60ac07fb8546e513c21bd8f864d5b0e29570016b5a7431b21d4ba4beb23822cc6be38bce5d5c34604e544b900edba1b6b1cf57f7d600
 EBUILD llvmlite-0.22.0.ebuild 1360 BLAKE2B 267e9ef9f11755fee54add20f9dcea37d9fc3b3379452fb8dc7a79175c6c17a2e138746c4383abd364e76f41c9cf3a2a1648a1e9647ee3a1e56b1c34552f1af9 SHA512 dba7536de56e1e34999c65045d1262eeff964b618653c17b12824e24a3bbe149b602ba4a6dbe442caffe6f671aee0a804fa160c21cc90beef4fdb911af5b20d3
-EBUILD llvmlite-0.26.0.ebuild 1506 BLAKE2B 4fc3bf27064dcceac8a4dfae158b118b6b1f2dd9411623ad816ab8b2abff1ec19803609bf6d55d7b5a6d093a82cd1d3f46003de571ad3c9a0c41f27123cbf0a3 SHA512 a7c059112f4e5163ec14dd7bbe869fb8d4506403bc301d60916f47b735d0cefe24a8fcbd774831d26ceb75b84386764e82d9a17962f4570fbd206977d75101a6
+EBUILD llvmlite-0.26.0.ebuild 1505 BLAKE2B 098673ad3476bb0b6e043eeff7ecc18c861ae5c8ef0d92dee454060439281c06042eb2763be7602eaff4d55156ea22022904f3076cf4e049a561c07a5feb98e8 SHA512 02511938aa16c8fc9ee2b170a832bc1fb76bf535dd41d71ff81b641b9bc0e5c56a834e2feb593992b68da025dc2735c9d4d67165f0ae8ab9695395203d0055b7
 EBUILD llvmlite-0.27.0.ebuild 1499 BLAKE2B 27f526b82a252e633065f0279a25f713ec90b1ebbc8c45ba205ce3e53dec7a0ff3e088c5f7503d3ca8e3952405d4e5074866edb61a3c218daae5d5ee6d9d7c08 SHA512 12a2bdeffff59475ef70bd27c12dedacb15defdae84a7aeff562de96d9a71451c5e9a47239e3398c43bc3176cbc6eb508a4822ebd3342caa455c16c9347d1844
 MISC metadata.xml 792 BLAKE2B 8247c0ac546df47bc70b8e525d776dd391fa553d75d7bb0507986ac2f7efe1d023db7259f8938c13b383ef719a10acb3e1357bca4dc398a42b68ba756c0c351a SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a
diff --git a/dev-python/llvmlite/llvmlite-0.26.0.ebuild b/dev-python/llvmlite/llvmlite-0.26.0.ebuild
index 3cacb2fe2d63..a9fa88ea3844 100644
--- a/dev-python/llvmlite/llvmlite-0.26.0.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.26.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/numba/llvmlite/archive/v${PV/_/}.tar.gz -> ${P/_/}.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 LLVM_MAX_SLOT=6
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
index 3f672d5480f8..f9e62b8c9137 100644
--- a/dev-python/m2r/Manifest
+++ b/dev-python/m2r/Manifest
@@ -6,7 +6,7 @@ DIST m2r-0.1.14.tar.gz 15926 BLAKE2B 48d8961b6ebf66d494511f6bf755ae2d2de0740aa27
 DIST m2r-0.1.5.tar.gz 13202 BLAKE2B dcfc5ecdcb2c696c1eec8fe3eca4cd7e238f605c399b750286d9eb18ecbda9d80b608fb362a85959769253c5f5bca7e392ed5b61a7804b25cab5e7bfb5edf574 SHA512 78e9e8daa293b2466c95f0adad937fa0bbefaf0dd9663695bb916be13182633e0d462afa5331a595db424420485ef54bbfd4e0625962026fab4ce0c63104bc84
 DIST m2r-0.1.6.tar.gz 13615 BLAKE2B e0c98c059f5c569bf88a1f97bc1c8a912675f9c0e044175f4ecbf885b80019d62f5fe80579420af373ea3d62fffdcc62344d1035d901208719be1cfd56654a01 SHA512 3641cf4013f71fbd43d6cdad530cfd3e909c93709edfbd79d6a51e7121de68e279d3ec4eb7eed391a35902ffa467310bd6b020139b2024c3e80fa44e5f6cc4a7
 EBUILD m2r-0.1.12.ebuild 1217 BLAKE2B 0a6da4c33c53373b70812432a66913de1c9ace0be460bf4d0494c4f60f7805735f910de7a8f7a743a67f1bfbd1fa9f16fcc9ad33bd343286da4f546bb35161cb SHA512 7e10284f97312290ac583fecdfaefc6fe775d8aac6ac1729120bfc4cb0e13d2532f1ef6e7f0a5428fbf339ae3d1e2325668ff3e8590fa81f4398167bc370d20b
-EBUILD m2r-0.1.14.ebuild 1262 BLAKE2B 0df69e11be5cb2871dd54067fc66174dc2ecc142973b60d1967e6a9fbc053e8b383f8258688d3898dd90d499c62a88849d077d7794b30aa3bb55f3b632428051 SHA512 07065bfabb29dc1a86d90a29141940bddaebf61a4850a74fff9462625748acf728aabcd6c4ed73a36b5a537f9b2e8b4620d9a527c51ef45eb43474fd6a0347ea
+EBUILD m2r-0.1.14.ebuild 1263 BLAKE2B 527235dafa6259bdfbac07329ba9e67fa7b7c78adc8f28b39cd4a51dc3e19e8eda97a81b24c83e7c65826a97fc85feb72094c35242331d2be2e58a9d3a8f454e SHA512 bf3a7093558a7dbb46a5c77d7697060e0fab29d5f4b3bf4d9b5a070062f1ea0501f182e348865f0a1328d46eddf3e128f15b36cc8de23e2af0276617f60fc963
 EBUILD m2r-0.1.5.ebuild 1270 BLAKE2B e51f48528c81f598c5894c963a17fb71bb2df2c2d11b1bf01a36f35845685542493a9ab92602e5420c592d1c23822584d42e99b62131790606ee27ff3af0ec98 SHA512 7d85e5d432f2f0bec6c976812ce9362f7a7974e9a2866454286e96b704865732d9d1e124583d41de09ce0f7ba664306bbda53b62721796a6fccc2437496f96e8
 EBUILD m2r-0.1.6.ebuild 1270 BLAKE2B e51f48528c81f598c5894c963a17fb71bb2df2c2d11b1bf01a36f35845685542493a9ab92602e5420c592d1c23822584d42e99b62131790606ee27ff3af0ec98 SHA512 7d85e5d432f2f0bec6c976812ce9362f7a7974e9a2866454286e96b704865732d9d1e124583d41de09ce0f7ba664306bbda53b62721796a6fccc2437496f96e8
 MISC metadata.xml 554 BLAKE2B d275cbf42dd1621fd0dce4fdb85cf0832e3160cf7468e729d39f33afae099b354ccb21e6de312888ddb6d2e97a487a02cd9d97dee033eee960d0ffbeda70c704 SHA512 ff9d0efa78e4931a4f0ed8097cfdb1d32fb1a99f825199fae42838ee534c045c30c440e9f8bdc41639adfa99efb672a587d11f84f1bc7215f8e59655e1dcaa49
diff --git a/dev-python/m2r/m2r-0.1.14.ebuild b/dev-python/m2r/m2r-0.1.14.ebuild
index 2f613adae559..8cfefd3ec055 100644
--- a/dev-python/m2r/m2r-0.1.14.ebuild
+++ b/dev-python/m2r/m2r-0.1.14.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="mirror://pypi/${PN:0:1}/${PN}/${P}.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 ~sh ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/mistune/Manifest b/dev-python/mistune/Manifest
index 14dd59b3e960..5bec95b168e0 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -1,3 +1,3 @@
 DIST mistune-0.8.3.tar.gz 58506 BLAKE2B a4b96162514ba1b82710c9264d9005f151943d525ff7e28a2fd4a92b16d4c90818715bf851573e25be203537a3059dbec1e86c75ec0ebd0a4b164303c06d7029 SHA512 fc0b6d53e7a62712b752bff77c2529750628e9e1eeec02603bd2c793f9b0a46efe31fe7a749c5d6aae3c591d74e43c45e450179650bfb57128fb0ec366de6aa3
-EBUILD mistune-0.8.3.ebuild 724 BLAKE2B b2ffa822e41b8278ee4ff83da6e6641d5b9b3bc142aee8804af1b52e88b2a9d398637e679de80f8e64224433f93297666dc6f6d996a7ca1b0751f5ebba2e57a5 SHA512 66e11fd5343544c3a7712d8d043fcab9f87271d50df29ef773466e68df744a402f908434a1b927a9bdab71c63b44cd4a01ba079a67d8a3c1f6a1c64c994efa26
+EBUILD mistune-0.8.3.ebuild 725 BLAKE2B e7ea4035a9e0c3a2ceffcb897be69f76108fcec10cdc078b90942d7799a98a9ad56e8a9388a7ff51e4b87349a570659b4de776b389bbd7746254cb047418ed5d SHA512 a1459dc1746fb2fe36fc1e4d6c3ba52fc822eb807b8a2fb418487431c7957d12866884a5a93f4ede4139a9d4616f90f6c6d3464855497fca1c005dea556c801e
 MISC metadata.xml 377 BLAKE2B 6c495d3d88811994e4baf0aabb5267343c09162239cc655b5fe4f9b8b63df4cb08dff0186cbe6b63018eac2cc2489a3f612f72d49885df3055591da74f5fa5a5 SHA512 3630e9ba514f3f3b1ecf532ca928c3bc89c05ab50a9113ab4b1d609edf07a6421796774ee4a71cf17ea3c2939acea24e22a74f33b66fe630706dcd6482cf817e
diff --git a/dev-python/mistune/mistune-0.8.3.ebuild b/dev-python/mistune/mistune-0.8.3.ebuild
index 967bf9e068d7..b562715115ce 100644
--- a/dev-python/mistune/mistune-0.8.3.ebuild
+++ b/dev-python/mistune/mistune-0.8.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=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index a943fb9aa02c..a73b341f13d1 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD mysqlclient-1.3.13.ebuild 832 BLAKE2B 2db089a19b09d41d950d4b083a740a177fa256fdc5b7d6b34bb71e1c8c4201ad6afc23f56fc5027a8dee8b9460780d478e1153c2b97cfa0af36900d3ecd3319d SHA512 834a8db1152aeebfcffa0bc71b0da3add6eae1f60661396768a2938b6829ec7f7e650d213b43ce4162bb4140326f2e98399bbb1d648d729fcc624ceacc429cb5
 EBUILD mysqlclient-1.3.14.ebuild 832 BLAKE2B 71d30ed916d8f5ce442d26aa7f0ca559c083fdd2e81c8fbb64fa9e42d6c7b4d5d31cc11ae6bfb21769ec19f2aea827b75e655269d90741686ef1b4a14e3b23de SHA512 6339636e0fbf4b2b5ac9731e01153abd9ecd17a4e444c6bd10b7d603d03e77201fbc9d6f8fb02e27da1e0d9920b84c78cdbb97290fe07b6d4ea84ff3469e9991
+EBUILD mysqlclient-1.4.1.ebuild 834 BLAKE2B 083392f523353dbc8fac057b0e20aed7000f62986c6c9a757159a27f6ad35a27dc0f2747ad44140107ef1f5424b9b2d6134255324b39068aa4ba702232d75a8c SHA512 310fad0be34dd9913dd5565231ee709d9fe934c2649b919de7bf8941b9460b0df34e983e6b660144ab2dba85617b34ed026e488a6ed17a2d7d6edbb7d8e465e3
 MISC metadata.xml 513 BLAKE2B a65aef9c59557dd33af579ee376553bd46fbd53158d0a02585b2403d6ee45acb281599ec593d5d75d69cc8bafd509a0851ab25764b5a79f3501a7cdad91faa40 SHA512 4a2756c3bde70c4fc73ba347e9648b356983662146cce5c1161f5d0c8333f795bc27d0aebe6019dcfe6402a51611dddfd87609c329a3c2fa6aa20808cee46b38
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.1.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.1.ebuild
new file mode 100644
index 000000000000..e39a11aecb9f
--- /dev/null
+++ b/dev-python/mysqlclient/mysqlclient-1.4.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{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/nuitka/Manifest b/dev-python/nuitka/Manifest
index 5ed371c6e7c3..4dd362e1b5b3 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,3 +1,5 @@
 DIST Nuitka-0.6.0.4.tar.gz 2010373 BLAKE2B 96d31fde6d087bea81051bfcc208d52466b9c45785c2167c61721440fe930906958ee840bb98258c7c1b98c067302049afd63bbf5cfd422a69c1994675c29c70 SHA512 f9a30ad578b80679c0313be84150adff83a90b35c758487fc9f5240d527cf0a905b6257a0dfdf2a2c8c7322688108a6673c56238480344adce123d67416eb197
+DIST Nuitka-0.6.0.6.tar.gz 2011509 BLAKE2B 1a5d37acd50bbb7d1a380306aa18d68ab6559fe3d90b988032cd36458e5ec663c2ba1597f50da89c6b2360f35cd576a2219860b0d74bb3d835db9525d10f22bf SHA512 d893e49a2f91d310b4a86ddd1566990b66ae202bde642af8b7e45554ed6b2abf4b6b694bb03d020b15d9b748c0dd31ac1a79c77fcc9d15468ce37faf475e8beb
 EBUILD nuitka-0.6.0.4.ebuild 630 BLAKE2B 5526f072dba96751c9fa057829fedbe82dcf2a032ae2f6df815e54783a216d6d2a363b49f0e4b0f0b1627299e4f94ca79198b46e69830b3a0ef2a90afc2ec9ca SHA512 764095edacfea35fe8eed86c5588821895f49d3e2d7c7ca244661c7910e9e7796e1ebcef6ca31d1759c0ccdf433fece6944a5d003b644b1e0c88a55272ed9837
+EBUILD nuitka-0.6.0.6.ebuild 630 BLAKE2B d3bb6daa3a87b32053a2d1714e987444eb9affaf3aabaecd04ec86252917442c7fe0030c410d1aa382ed1ddf62fb1845c078dcf300b7cdf481e9c8b06a84ae1b SHA512 93869f9df917064bf0fc50cab19fbb092bb7cc5b8eb163b321ae9733a534a08375871c4a0b664a59042302c8a869ca2fbb036d8b3e64f898ad1029ad4ca7b909
 MISC metadata.xml 750 BLAKE2B 56bff65b936301e2d0347e553a1ea85b89c4c991697f665b47b01dfd7e40b94726fca15c67e4387fb79ec19f77851e275bb80c48ded3f76e6cf4cb81d10ba90f SHA512 01ed4ef871d9d43ccb30b60e5051f513b56d7ab3eb46ad64b76e6ee8f53f0088c4a3d75227a0870e82664476954d6603f70614232735f107bb24a06702c014ab
diff --git a/dev-python/nuitka/nuitka-0.6.0.6.ebuild b/dev-python/nuitka/nuitka-0.6.0.6.ebuild
new file mode 100644
index 000000000000..0d55ac76041d
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.6.0.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 python3_6)
+inherit distutils-r1
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="http://www.nuitka.net"
+SRC_URI="http://nuitka.net/releases/${P^}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="${DEPEND}
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-util/scons[${PYTHON_USEDEP}]
+	"
+
+S="${WORKDIR}/${P^}"
+
+pkg_postinst() {
+	elog "nuitka needs app-admin/chrpath for building"
+	elog "stand-alone executables"
+}
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index 4aebac21a9a7..3908d27fcddc 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -3,5 +3,5 @@ DIST numexpr-2.6.2.tar.gz 90970 BLAKE2B 85034d7d36bd921df289f817451e7b30071b9d44
 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
-EBUILD numexpr-2.6.8.ebuild 1390 BLAKE2B 44497e8a30e809f87596b749928cf5b25ce8576e56a6b4da8b45dd97bc00c38cd1d23af28a5fc340f7583838e6f4bf7503e4b11c39752086710e733f12ece707 SHA512 6c279d5848f4b67539470a77f76f541e65121741997049b5a7b3b4e8d4497c9ad7d4792def8dc0ff3424dfdb88fd0f1e018e4523ebae3a36ce913651338128d4
+EBUILD numexpr-2.6.8.ebuild 1389 BLAKE2B b67c872736890b18124bd50e41ec2dc8645a12a246bd3e6eaaea0969abd5e8e88d68b4dde023db11425fbba50c36dba8c695b68665bb44c40ce28ec4e318e98b SHA512 736d27ff162abf6ca4a3ea4e97a28e4e613ed61d9d5ed46697f4e3fd9d9c431df106c8da77ef26026cac873dff409ae8774f71d49b85bdcdd8af278d1c68949e
 MISC metadata.xml 1086 BLAKE2B 5ead7194bab4b637946cc095ba6ae07eb461a20d4f8621f8be75c916e8d414a309b1679b928389e9e61f2ff4795a8f149b9a402f12bc21965d25df1251f6c4e3 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824
diff --git a/dev-python/numexpr/numexpr-2.6.8.ebuild b/dev-python/numexpr/numexpr-2.6.8.ebuild
index ae288b7bd6b0..7f2606c705a3 100644
--- a/dev-python/numexpr/numexpr-2.6.8.ebuild
+++ b/dev-python/numexpr/numexpr-2.6.8.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="mkl"
 
 RDEPEND="
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 2a72cb4f7fc1..e7ec9d648e61 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -32,7 +32,7 @@ DIST numpy-user-1.9.1.pdf 418111 BLAKE2B 683ed35ca9e123387a08a88047ad0cfd8bf3698
 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 4065 BLAKE2B 42f9c13392d122e0aa3fa01d2a55d370b4d37a1f932cb860b1f9d81c551632f3778a4ab94fa911f7a9db6a9686d1541d54f450cd9e78fc9168b2cb00bf9c15a2 SHA512 915326a6ccbf196e98e3061a4abc8817246cd6b46cdeaafb7d93dc577358da626334563398def155de38fd090a75c3c9e4b45753c231851ffe6774755e5e74d5
-EBUILD numpy-1.15.4.ebuild 3870 BLAKE2B 037ed926b7d3c12a494c7f18fdc2ac4d58ddee86419b29b189ec3009d418bc3bf821b78e4cfe55edda602b804d0b6516acb7e81961a530466d4ab327f77b19da SHA512 19ecefb564f0e6b787d37f591f373800eb30328e90740c8c29964f8d0331fa8cbfcab8c0fca427a2dbb5beb239eba21e3955c7830e633760ad97fd829d72eecb
+EBUILD numpy-1.15.4.ebuild 3869 BLAKE2B a981651423bbbb775f934a98f45d0d2a73262c6a5e5c5771cec7e7b58bd8bb2f272d608fe95f5d1f3668247b83db755fa10b5110515389d1a3a9112e722ec39e SHA512 a7091bed3e2fe526dbc42ef02340567835fe94c9b8325f123c82de2172364f7ea96931f602ebc72bde01dcb3e5af9f8c9a3fc3cd1b868da8efa38d4a6d6d040e
 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
diff --git a/dev-python/numpy/numpy-1.15.4.ebuild b/dev-python/numpy/numpy-1.15.4.ebuild
index 9bc29bd049be..f25c715339bd 100644
--- a/dev-python/numpy/numpy-1.15.4.ebuild
+++ b/dev-python/numpy/numpy-1.15.4.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack test"
 
 RDEPEND="lapack? ( virtual/cblas virtual/lapack )"
diff --git a/dev-python/os-brick/Manifest b/dev-python/os-brick/Manifest
index 569ea304b346..fe179dfe5e25 100644
--- a/dev-python/os-brick/Manifest
+++ b/dev-python/os-brick/Manifest
@@ -2,8 +2,10 @@ DIST os-brick-1.15.5.tar.gz 161371 BLAKE2B 0fdfb5978cb1d1ca635d64f98b75210b03353
 DIST os-brick-2.3.1.tar.gz 166518 BLAKE2B d58acd3ffffa6a5ca328eda9f74f4e9897846b047fc96777fb438c5e5a2fbef642e1672bd7f216acddef29138543627ef79fb6e6fc01e9e7cb34ee59663bedd8 SHA512 243d574289a95a07c43b112f9c00372a8b95560628f1d86f3ea750755b4026ef9426864a216a459c159b7275218a08df585aaf0f4f3c973d63af5a59083a6b2b
 DIST os-brick-2.3.3.tar.gz 166088 BLAKE2B d5bdb748f8cb00ceef7649198470be3beb58bc9824ce74d8781c65ad87125b5480dc22fa978817fb89842ed347fbe7f0d1a3b5c94642ca418b7c6a694423d56d SHA512 8373641ee102eb7e522da400dcd960672341828ce252610bc65b042e5d0e614ec8af29d8fc87564a29b62615d71aa8b1074b4155c8f70cf35232fb2b37105f94
 DIST os-brick-2.5.3.tar.gz 172125 BLAKE2B 3809301fad05883bd81510452189506a05561bdd1d95706df9690a5d0bcd3165ed9c55b06cbe4b3f24a4ee62877c784209b38348f224e6c82e5683133cc13d73 SHA512 b2f0b75f90ce973569c25ea18fd3b1372209a4f49572644fe1b99bf295edf8e1346624ce95eaebaa37653b7753169b42a054e5f9ea4763c35ade5003b8ef47b2
+DIST os-brick-2.5.4.tar.gz 173675 BLAKE2B 9e1906f718b79ed3b0b332864fc6263af7d3c9ef0da2d93b2b099e48faf805a0250c525589280b9416897d3751d01d0331867c10ee971ccd849b60f34ac2cea5 SHA512 bf6a696ee48591e49ff6e1eea7d74eb4acd0457257c7733ae649059f307170f4f7bd4154ada3498a801c4e54675c802eb9df096d44063b018a2628bc654ae17f
 EBUILD os-brick-1.15.5.ebuild 1636 BLAKE2B efa6611d1e5a4aff93de21ac1620ae1197cb4f279c364d3f0fc0f7938fa5039b460eafa99894003d49a82dafd75fd0bcfe34ad7f2f412e67fd78278ae8fb2151 SHA512 f2f08b712035ef08499f19d4ee4526d6549faa0a0826d9398a8ea67985cca6d570c84d2ac667a279bb411301f33e1082180fa19e71c2c65c7aee2cb0ce0daeb5
 EBUILD os-brick-2.3.1.ebuild 1473 BLAKE2B 6ec89785e32cd5a19ef533cf6400444025c7bf3804057bc9b96ab60ebd3e5983a43c32d669027cd711ef0534f963228d3dea7922952056cfd4f687ca6152c64f SHA512 4b768d5f4a052c409b48298d3a832bfae5540bf7ab814353b67ec1697e089e929c8f8048b225363881c58b799c00bad6992ac214b05433b592fd9174b4ad4a0f
 EBUILD os-brick-2.3.3.ebuild 1475 BLAKE2B 481cc3d60132a46dbfd27ab84799ee954a9ef79bde0ad972fc3e0691e65667520ca662e6b8590894530d9e08629262e696d974d2593c13a89383791f51a613b5 SHA512 aa6d2bf01e0386c73ba64a1b344ede2127da0bb115252301bded3d799255783ab50e205ad7e8682d727a57e8e81b12c117123313712610836774e17a4a59848b
 EBUILD os-brick-2.5.3.ebuild 1473 BLAKE2B a352ffdc7033f6f941764fe47a7e8aa03b8850ac4de2c1dd512191f8f9ff8de60e2d23fd37bc58fad1bab71976e523205bcd9368f872272a595b2f0d6502970a SHA512 0b93bc60af329f9bb25e52134f50c34210b1996a2f4217b6a921813d0720193476485f769f336621d62787c3e2637323e9122547d5d0fa39af60966658bbd52c
+EBUILD os-brick-2.5.4.ebuild 1472 BLAKE2B 86d05a04e24382895c43b44dba2f0763b9b4aa135e08050a974cccbf066558fe280c528fe6f4dfe126b27ee68448bae9ad7284950b904dca0f0f39b67e92927b SHA512 a08588a63e9515bcaa03056e82a3289b07b54cfd41d0e334c5edfd1aa41a34cd898ab85966180110ac85aeab5888afd76017973fbc1c3111be33bc1ad7c442a7
 MISC metadata.xml 381 BLAKE2B 6d5a168e81b27c1e9a5ada920a182616c150d5f5ca204e334067f4bcce2878b19152810391d0506b9e4bf1dd287bc56fda035d576c5fee64a9ff2fecfb7b39c3 SHA512 b3cdc328f38ade8cd2ebb44c533ec0c79fbd1c187999bcf6c9c04104ba7c29136f0a0d6d57016aa6c7b607e66bfc511eaeff90c6d1a9708c494f4358b324f3b9
diff --git a/dev-python/os-brick/os-brick-2.5.4.ebuild b/dev-python/os-brick/os-brick-2.5.4.ebuild
new file mode 100644
index 000000000000..0229d3350c19
--- /dev/null
+++ b/dev-python/os-brick/os-brick-2.5.4.ebuild
@@ -0,0 +1,44 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
+HOMEPAGE="https://github.com/openstack/cinder"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest
index e9dd3189ffc7..002866209cc7 100644
--- a/dev-python/oslo-cache/Manifest
+++ b/dev-python/oslo-cache/Manifest
@@ -1,3 +1,5 @@
 DIST oslo-cache-1.28.0.tar.gz 52015 BLAKE2B 897e54008ea99f367f373291d874736287dfd3d480046bdee0ab2b54969e8681144677713794ff32682b1ef65547618d5fcf403e9ae24b57768905daf7ae7f5e SHA512 44deabf9dbe3c24afd04d09f91f95d902221995130559e7895045eed98356ed9e085f5ee9b7e2bd0b4581df563a67707121b7571b0b7f822f0bb5a55b6dedafe
+DIST oslo-cache-1.30.1.tar.gz 53406 BLAKE2B 1b518c7f7af4b95fc71f76567f8742de7c7ab520cf4a1943fc7ed7bd9f3dcfd4150f83774e507d4135c7b567e53c3beb79a0cf6295c23e23d88a49d9ce63d2ed SHA512 8ee8ef32d07e8112aa7280f541446d13b3bba90fc7314eee60972180b0382a413e02cfcffbdd5bf4313aa394a25265665579f43f702a4b3754dc00f50441ca38
 EBUILD oslo-cache-1.28.0.ebuild 1045 BLAKE2B 5a476016a4a20177ffdafa93bd970a2da0e87fa07a50b7ee493f5a3292f66a727849f33fbae9dbc2d5b36d6b2bf8727d8d75e7be82e25cf331d7349cf1fe0746 SHA512 6b2078d289a99f5fd9db6c7c658064ebcea2cceff76ffe6572e1a44fbe31873378b99450274f431b162e5de8bb5c329707036aef50f3fff871b2a05cc7210495
+EBUILD oslo-cache-1.30.1.ebuild 1044 BLAKE2B 79d39645f2b468e0d1329808882ae4b62acea6eb3fcf7aa2ba205d6892c25c8cc0aae7117bda7798d06d036e5047a0025c38a518769e2c3592b09b328b9d8e4c SHA512 d0a630a8c4426db273533583efeff4590fb8eea5339075484002418d2c85b71f02a0caa21e1af7e1071c279400eaf34184a6f95705dd4c1c8fa02c902533edc5
 MISC metadata.xml 457 BLAKE2B 09e44ecf9952f5bfd930616506874014a267d8622daf6c22b3da4856d9f4bbedcb3e4e72285972da026f310c47973c0bb70c222292caf877d4f9ab6d5166955a SHA512 f98547e9de8c502afabf7c53409df90ec687159b5160c8ff2166acff4d6bce0fe69c8eec78d50f52919cd75733f44f82dea5f9cde362d22ed69200d332b9d6b7
diff --git a/dev-python/oslo-cache/oslo-cache-1.30.1.ebuild b/dev-python/oslo-cache/oslo-cache-1.30.1.ebuild
new file mode 100644
index 000000000000..71b251dd4d54
--- /dev/null
+++ b/dev-python/oslo-cache/oslo-cache-1.30.1.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=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Caching around dogpile.cache"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.31.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index db74ca37818a..dd5e05298588 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1,5 +1,7 @@
 DIST oslo.service-1.29.0.tar.gz 74957 BLAKE2B b56869cb28704718952c5e151eaf0442b1a4295b8e25a422d91baa241a990d031cd408474e44bd5ea2af2b7451e0c13ec491ed4c2ccf0b07c78b65a81bec4527 SHA512 84f1b8e6abc7c8c95433da53b1a1992570695b80e182f5cb7d87ab394857d8d47c0ef0528b7a45221c897eb4c5c13112d86b8a929efc2988d22844a4c712a340
 DIST oslo.service-1.31.5.tar.gz 71865 BLAKE2B 2ad5ff5124e1b33a216510d39e7d37f3371257281cda9ebe0263a3dc741762d8c737478772cb89000a01bcbb7d9647a3cc3bbeaa62949f4957d1f2eb7ff0ba1e SHA512 9c6ebcfc9683601bfd4a54dfa8eeb3d687ea813a5081550092845350fb178fb9f609ff9f3caca6f0cd48ca6280ec71b4587741ed5a836ca38bbc6958aa521fb3
+DIST oslo.service-1.31.7.tar.gz 72069 BLAKE2B 8a40608ba3b4ab8c78cc48f89607af5db3e493aaec48e4b33d917fd5ea32478dc04a0ccb2f1aec524acc900a13d9880d8bd51e49bd3b2eab787d7b7c55872e47 SHA512 18bd558cbbf67441438f62a212ca61affd625597a02cbe8948bf055e61887a0e1b21dfc18e7450ec21951377daabcda8e5e7f57b39f5dcaa1b1d635df13f8e21
 EBUILD oslo-service-1.29.0.ebuild 2027 BLAKE2B 5c9eaa83c83e38b744f34bccbde1cf493d3e8a986c52202759913d8c22aa7b2f5879aab02ce695686589159a2ac726ef8c487dfb2a2a30990b311886fe04a2bc SHA512 de0398cc0721e39adb1e20143725fd7d7b113ef11bb41279dead12b1697a4615648d50287fbe6a460306ce1236bce5b013b072a3e0ea695c9b505ee2d4b842e3
 EBUILD oslo-service-1.31.5.ebuild 2117 BLAKE2B fc227fc56866d82d9df62a0e25f8c7937409690c252c531b196641161397df3eb3d0ae57c7c49d64ca6cf3667fa3415cd402d828b9772295dbbf119600f22bf0 SHA512 43e8ab766cc75352d68c1cd2bb6bae3c9782544c54c84e6d09e5dc857ad1d2950267a87040bd59362b5916f1e87b33db0af2e08122f57e6ba66778e91ba04a0d
+EBUILD oslo-service-1.31.7.ebuild 2119 BLAKE2B 1b4dd17ccf34e3453b22886932a5a2df2ba944998ae99af18c53b7b6045d7c1761646a8da9b75540b04dab5b8d156e7308d334a1acaf88635bea73877f5d5cc6 SHA512 4540be244187b0c0a9201d824be3bab18138c767d868d3ae036571aadc8a3dc142d357437d64e5d44c171c03e906cdd08ef0437b25f83c0303447861eafcbe53
 MISC metadata.xml 329 BLAKE2B 2ef43d1bf3df7be8c2e2b08bf7cca10d1bc23235111bc74bf0b23ef6f9c5ac3ad05a1243b518c0d8b703e4815ec7fc92ad01c907baa77d9c4dbb622a1288aaf2 SHA512 c02f0b4e37e3dabe1dbc10ca6b5e08627d8e7df5fee71573cda34338249508586bf068c56711521aa20bf80a1fdcf94a1e89df5d17cb5eb21a07b996a071d1ae
diff --git a/dev-python/oslo-service/oslo-service-1.31.7.ebuild b/dev-python/oslo-service/oslo-service-1.31.7.ebuild
new file mode 100644
index 000000000000..2a0093adb6f1
--- /dev/null
+++ b/dev-python/oslo-service/oslo-service-1.31.7.ebuild
@@ -0,0 +1,63 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for running OpenStack services"
+HOMEPAGE="https://pypi.org/project/oslo.service/"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
+S="${WORKDIR}/oslo.service-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
+		>=dev-python/doc8-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/ovsdbapp/Manifest b/dev-python/ovsdbapp/Manifest
index 1366620eccd8..4582b83acc1d 100644
--- a/dev-python/ovsdbapp/Manifest
+++ b/dev-python/ovsdbapp/Manifest
@@ -1,5 +1,7 @@
 DIST ovsdbapp-0.10.0.tar.gz 71376 BLAKE2B 3f8c79b57b68da303c11d4b963367f9c9322bda1c9a02c0f7e28d57572c3056b89ae6f859592e955a81acbfe16725504163a1d799ef4d23b0ca1d77ce9eb044e SHA512 321e3efefad6ac87f9b64ad22c3d1241d6839de8dba556f2aabdecc99209457a35b082f5d62cfba4ae67f50b265e8c6a55717fc2270470a7a1b0a1fe601bb3e6
+DIST ovsdbapp-0.12.2.tar.gz 78135 BLAKE2B bd0e0b209352af0bc2939a98d2ef52aa4d610471669d9eb3e9050dccdaa093ea9c922a588e6709defc0182cc991cd38883a9a9780f03cf7350a08eee5b99d424 SHA512 ef2b4080e600c585e23e5e9fa80fd684b42a1f2209db7ff00ec59a751e47c887d296339958d2805be0d359bb30dfab35271cea1b750039170c7bbf719ccc9d6e
 DIST ovsdbapp-0.4.0.tar.gz 35790 BLAKE2B ae41b173787b761eca330e159ce3f1ac2c953c18edb706cdc72a556d680c591cf0540d20b65035c6dcfacbf43768bac81a69b95f4ba5dfde968011fa0c22b46e SHA512 6eaa98745c2c438f43bfc9ce3fe00b100689a2df7564e487bf9c2abce81a725490813d969ddd9ad56b4933f0822d6d8801297e8b6a0c81db2ccff562c1ca62ec
 EBUILD ovsdbapp-0.10.0.ebuild 741 BLAKE2B 53b677a655b02135535267c42ce4146e19e796445a52d10eac45b7e8fb58d69d406d8acabc1f0c85e4b685ff161bd320401594d8edf2f84c1d8a229ff036f931 SHA512 cbd194e6cf0878bc8450e120ebe3bf1c07bbeac74db8bf65dade2d6c1f7a8dad2ca2095b07f7e86c773e3d2edf05c847cd9ed3baa8e656a9e48036e8971c1350
+EBUILD ovsdbapp-0.12.2.ebuild 740 BLAKE2B 1c25af658074f88fadf3d3a26d61de49ab8977521f647e800fd84ce4a8f185130f2ad5182e80175530cf7e6d56ace35dfb511beb27f0415c300d95711e8d7355 SHA512 11f9e8e6b2250760a68933d6a076238784eac40c7f36bc2f2a56ad8d12afa4f2f851f396f45ddfe9151dd5054707a17eec05341db1920e6f44952202db8dc11b
 EBUILD ovsdbapp-0.4.0.ebuild 655 BLAKE2B c0786fbcf260aeeab56df42a7807e13625a3ab1c56e452e64e2e66b43ef436ffa21a3276a209686b9d60c849d2261a9b8f0790e73324b577dfb782dee77b6add SHA512 2c4605eeff18c4dce326426f8ddc694b06ca85bf8ed6b1117b6edbf345b9c6b2192b890b49aa0579d836d1820713ebb2af8ef96bc69a40de566f894b46e2e686
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/ovsdbapp/ovsdbapp-0.12.2.ebuild b/dev-python/ovsdbapp/ovsdbapp-0.12.2.ebuild
new file mode 100644
index 000000000000..c4a2f23537a0
--- /dev/null
+++ b/dev-python/ovsdbapp/ovsdbapp-0.12.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="A library for creating OVSDB applications"
+HOMEPAGE="http://bugs.launchpad.net/ovsdbapp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pkgconfig/Manifest b/dev-python/pkgconfig/Manifest
index 2a6c6d9adeea..556f8edcdd27 100644
--- a/dev-python/pkgconfig/Manifest
+++ b/dev-python/pkgconfig/Manifest
@@ -1,3 +1,5 @@
 DIST pkgconfig-1.2.2.tar.gz 5305 BLAKE2B 39fe5e05489e4eb8fefce66f23820d96039f5dfb82148e8ac2d691644aa2d4f1205bfa483f9fdc69837b7956834d1525d85281ba6aa0a0c079748336d47708c7 SHA512 88cfb27755297871c500f37c422da5d4ae30a14e0b9974afbe63f22c59746be0d175b65d9e3d2ed315b4d942046e7c18be062aef914199c99070a2767699848b
+DIST pkgconfig-1.4.0.tar.gz 5915 BLAKE2B 17ae11783b6642f6c8e726b42b725b7904ea282829b4527f92daa1e6ea43c3c126e6ef7e29fe5eefc89b40f3b69799087a46df6ac5695a593903dab9dc247c04 SHA512 8a270449b7b8b850aab9cc5774d1d6c6b68254f00157b66530c15697eda214948d3a71a75725067d63b906a9c3b1d789a775ac15a1094ff5ba3f227bcd666528
 EBUILD pkgconfig-1.2.2.ebuild 702 BLAKE2B 0c0d947f27c24aaa4f8f0faaa635dcadef6cdc3a4fd6129a7e7eec91b0ed9467edf02669dee63e7aac563e37cff8ec263b8d715ff81821bdd58d0380c6fe6c82 SHA512 ecfeb98b002081bc596fad3b5d909b80ab2a4cea677b15b8d238382dc7bb6ee5c73f8102f5c8138476f17beac92e3c7f4d7263faf742f57f752b8da7e52263d1
+EBUILD pkgconfig-1.4.0.ebuild 754 BLAKE2B f7ac1fbedca3d3b904e590fc6750dcd0c8876ae00717c06b17e9f4d4cab3ba561e5297a6a1b8fb884c5eeb863783a68a915cf97fc3fb7d48fcca4be16b63824a SHA512 534aaeb1e7abd4151a5c6fc3735ab21e9ea2bf53cbebb7d4b6a85d13b3482b6bfe2ba3b3b1d3a469ab3e0e59bb7ae769d1323b088dacdfa780ed8e8afb11bd23
 MISC metadata.xml 379 BLAKE2B 6d974351e99e999b08f6c18b48ecd4dcafb45452f724d6d038a2307a205ca00f300bf1c60761bc9e63726426f499c2622673dd677afb263c957fb398f264504f SHA512 2e92f2bbce0b0b8d9524ffdd2950c90ce34776d497c3d3ad47f239cfc562cbc7f52c3690b9df132f8466e386783b5287e63011c0bc8b1ab2ea839d1fc3fd9af4
diff --git a/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild b/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild
new file mode 100644
index 000000000000..1823ef123659
--- /dev/null
+++ b/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Interface Python with pkg-config"
+HOMEPAGE="https://pypi.org/project/pkgconfig/ https://github.com/matze/pkgconfig"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="virtual/pkgconfig"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -e '/nose/d' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index fc4cc577cd95..ccbf6e760f91 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -1,3 +1,3 @@
 DIST priority-1.3.0.tar.gz 13827 BLAKE2B 8c100eb44ed42f4f624bfb37dd6f698a3da84812783bd44ba82afef565562379a7677b3cbc9e16c4ea5a5dcc91d0897fa47c341a81bc1875461a72aff328fcff SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a
-EBUILD priority-1.3.0.ebuild 805 BLAKE2B 627d88d4ef0b18a31d0957ecf9ac0f7875500e6488ec441238e152c223f9b98526cd961444136fcd7169c05b495680413862b3ab83800491ec72a09fa6844c5d SHA512 599be3aba6abd593f4f1e09a8f5f2bb53107290161a46ebeec8c931db400c3f7bfd5d0f74e49a624791e966062deaac7f9ca3bcb02b52f4cf3e1161bdb660138
+EBUILD priority-1.3.0.ebuild 806 BLAKE2B 2e9298ec2cd03ca55e2db18fac3764cb218fff07e1e8d93cd4b743ea8b41ed69728159336fbcbd629bdf2872f24e9f55b11c834be8a816c18ae21a783749ca53 SHA512 324285b7c077aeafa6f751134e5dca5b37f99f1446aae68bbb0fa0dd9e24388202c8a35742274ae1ca457ccb663fb85e863e07f660d6818da66d7fe0c7f8f62a
 MISC metadata.xml 917 BLAKE2B c92ee27c2cdaadab26b9d68451c0b7ee055e26ba9457e5fa8dcbf2f9b4add141d07e85344d7de536db6a4a40da92d79c67862da2bb381f0bf1b384f90565f2a8 SHA512 e5daf360e9d2c4efeae4084d9a72ac975acc09f95d0064f4d2c3759ba00a080ea5a2f689f74ce666633fae26d1afa095f29b209912fcae0ba38d9fc1231b74e0
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
index bb306de084fc..a02d979143fb 100644
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ b/dev-python/priority/priority-1.3.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
@@ -14,7 +14,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 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 9cd528d63ac9..4cdb96657fa4 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -3,7 +3,7 @@ DIST psutil-5.4.3.tar.gz 412550 BLAKE2B c12a8418e7a7573d23a2599c6a4df9a3aa3bbe6b
 DIST psutil-5.4.7.tar.gz 420300 BLAKE2B e096997d22577f90cd6fc6019f2bde8855abda0eb67b496dfb8cc8dbce769e0c7da66524ac6d0c059e7a2d074a1675187af3177d904feab5a76b9b8a72c63853 SHA512 553c6de601d4c4d0c6a9dccc3eb8a449f1b3a18cd71648395ea3b43da3c92aef1565f6ce763872855d68b3de190dbd04c7f5be5ed4a79b0167d737c1825c0e2c
 DIST psutil-5.4.8.tar.gz 422742 BLAKE2B 13c4b9b412704728c4b192032a6be78756b03a37cd6f425a81a83d0aca4ce155ebf24a1f62b75e66433f21e8bd3f2fa3c7bbb5ec2686c6dc951b89e97ebfa688 SHA512 5691e7e7ecd827aff2755a85c4c1be3a23beec3a1dbff079547991dcfffa8e075cff7fb6983e1f6fa287e2216e3b1466618730afaf114a0ee209d7b70d7b0c6a
 EBUILD psutil-5.4.1.ebuild 785 BLAKE2B cde5934a3398e2fccbc88f3001d7506a4ed0e6065c92a6d9dae96c54f6e27f93d455725504cec0a9f062f83f5e4d345873616588e5a3291dbf0f03b1fa13c154 SHA512 19a1193a10f25eb496e70d04f187d27af5260f7ca40316b1318c88133cd43bc05ccdacf45e424c167ae0fcb3543402ba15dd7a586444c62b1277e894e1925b7c
-EBUILD psutil-5.4.3.ebuild 804 BLAKE2B 06d1cf8df49604b223464f3caf62a74f507841219da4a41d5af24d5706a26fe7cb507cb9ec54b08e734df916f29734de21b07d92eb7131907dfbce131e11f6da SHA512 886c24ac8a0ea53c096f09050d0e390fb88fe6687e98b0a91bbd795b9f5dd1ecc707a8316ffc5c903dafbb876f546fac71c995621430f3637a60dbbaf22cb78e
+EBUILD psutil-5.4.3.ebuild 810 BLAKE2B add86bcbe158a1c9b272198c7639b870060c19e1359072cc64d286ed92182f4990d25dda21be9595c4d487624eaecbea074d89aae27f5f97e7edecfd844b3c05 SHA512 20c85ada79b763349f26c277fb157413a35b56bd5d85fcf4c2f1995ddaa463c29bed24e04bdf2353dc85e9afc7a39e874e2a244b25d217b539e227fdb383db02
 EBUILD psutil-5.4.7.ebuild 912 BLAKE2B be8379bec2e2984efbc9d5e0a40eea1209a89aa60802c070336c59c6f4f5d3f6c2f53ce9df54a730848d394797152600288a582e017924fe9f2c0f9e3c67b890 SHA512 14457bc0841f227f69740a26f0530b2e3e26bc7224a91739264d634fe6c5eaa80798a399fc42c32f7f733fe1b122707b15099bb0f1b4b7360ec78c008281164c
 EBUILD psutil-5.4.8.ebuild 926 BLAKE2B af378e9bd77a89c73c86c6620909d1d5e979bd319f9b10c5ee92cbe3236d6b44088d42824853f3191660a948a5772e0e5b60d61deb027fa44b9da82df5ea10c8 SHA512 9d9aed52731abc80df66cd4e4b4e77646f1e77659e3894af998b0210764da3971262032508b4ab9d3dee5e7f6d8fd15f3a161b462379d1bd1ff5410ffca8220b
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.4.3.ebuild b/dev-python/psutil/psutil-5.4.3.ebuild
index ddd20191796b..56d016920867 100644
--- a/dev-python/psutil/psutil-5.4.3.ebuild
+++ b/dev-python/psutil/psutil-5.4.3.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 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ~ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index 1cfe99eee614..8492ef33de62 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 1454 BLAKE2B 1c52045ba0bcb15edadb9af87294e913abe83a0159d99a8f462e9096ab125265bf6bf9c2d99ccc71cfb6d0e84b1f83f2ed42243b3bac085f2fbbf60314f4c454 SHA512 eb3fa2294ebb5fc5472ca71f07950dc8be72d001c1fd8e393826d662d01e099ea937ecd3e6636c2b5ec5b37bcfa730e439061c4e72913ddcc115d6ea83fb701a
+EBUILD py-1.5.4.ebuild 1451 BLAKE2B df02c93c7088f79410687220994b03923b2be08e472d637912940dd3dffede3d2a46c0a861bc0cf763304115aa5b8c3ed4a6ae86fe2952f0357c0c59b704db51 SHA512 1268dcb1f9aa6dffce1f8dbaeb986ba18361723dd953253a45d30a2c12eb02ccac91709db70ab5ca3501a5cb23b4a234ef95debd2f50a1d1b37b5d3a9b2de741
 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 bb1ec2404073..a3b00c0005e3 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/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index 98c9a4efe89f..14a3d7388680 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1,4 +1,6 @@
 AUX pyatspi-2.6.0-examples-python3.patch 791 BLAKE2B ad8130ef64605915b3124dd268bb002e8e4a32c7c3e3e7f4445a5ee7e6a899b1caae25e1ecaff417d2d121063361d3dd983df08bafa666ab03aa6746fa21151c SHA512 7171f77080fed4ef235d1d3380821939d5a41e919b8509db8dcbe211d63b7b390e66389152c7275128cc8372c2a7fd1bdfaf179fc93b8fa62ed76a6edffd11ed
 DIST pyatspi-2.24.0.tar.xz 298228 BLAKE2B a1c989df5431a9fdf0b35c5fa75a12b9c083c6a979052e3a621685feada611f4322195b30bc1f4f56cd35f305087756cded31a445cca07e74262ecd807926239 SHA512 ea0c3e5a5a417c4d494cfe33ccfcca1996f417e51f5ccd3508372a0df636fb186b9940d7832681af9b353aa50a9aabd64c5477fdabbc5016794a502396b3d67a
+DIST pyatspi-2.26.0.tar.xz 309780 BLAKE2B f3657052ef7c5fde35506e04e5f1a3920fed5edd1af182b3e9bff6fc0461595e9b14644c8858d6f12b1042d57231fc09ae5061129d74a1030e0c8de88364ec7b SHA512 a1aa7e608fa95bdf4c891666fe5038dd2fd7cc7e675cef4c9759ffed4f6342e3cebbc6d5fad8899c0c91eda29664a5f8ff06a1cb0ab46958c8f629cd014d3579
 EBUILD pyatspi-2.24.0.ebuild 1297 BLAKE2B 232974954d137d16728d738e2ed0e4f3c206ba1c608a1e5997e9868f02a4cc6e9d825480bec8b1d3af7a9961a101f2e2514eb51ed5687dfae3369ca11a94ed5e SHA512 07a7cba527f24318267f80964953cdf5201a202db70dc096e117249cdb562a64e854056c90915ba473867443c7e94931834217c7f0fc7d21608da8cfa56ef15d
+EBUILD pyatspi-2.26.0.ebuild 1297 BLAKE2B 04b7e43b50e9a04915215118b28356c3e005a14017f2d187743bb279220ed07e45f06093d766d20f72935bbf98d7696cf0477090a9c08e49912de8be6f3f5856 SHA512 f00a7a30d13238e465ded58a54d5781e030ca45ac2facad4b93b92078a362402f6b6ae8cd69ca862ecd6125df1b0e767b9a09cb665a80c2d4de93f28361b9c58
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/pyatspi/pyatspi-2.26.0.ebuild b/dev-python/pyatspi/pyatspi-2.26.0.ebuild
new file mode 100644
index 000000000000..25898e111ef4
--- /dev/null
+++ b/dev-python/pyatspi/pyatspi-2.26.0.ebuild
@@ -0,0 +1,57 @@
+# 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} )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Python binding to at-spi library"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+# Note: only some of the tests are GPL-licensed, everything else is LGPL
+LICENSE="LGPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="" # test
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/atk-2.11.2
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/dbus-1
+	>=app-accessibility/at-spi2-core-2.20.2[introspection]
+	!<gnome-extra/at-spi-1.32.0-r1
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# https://bugzilla.gnome.org/show_bug.cgi?id=689957
+	"${FILESDIR}/${PN}-2.6.0-examples-python3.patch"
+)
+
+src_prepare() {
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure --disable-tests
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir gnome2_src_install
+
+	docinto examples
+	dodoc examples/*.py
+}
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index e18e19e1f406..9d98d0bfe4c2 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -3,5 +3,5 @@ DIST pycryptodome-3.4.7.tar.gz 6483140 BLAKE2B 02368e2af0a12686cf2e635cca8e2c279
 DIST pycryptodome-3.6.6.tar.gz 7137656 BLAKE2B 72a3dffa22ca4a90a6515ce0bb6939d4c11aab31793ca330523feb08f6529cbfdf3dee01b1caa4577caed1818c0227961e7f25d855b2dcfb09757beb3e0790b4 SHA512 ce03d9940c23ce59e19bcd795c300dbddeddd49756a4bfcc6933da66dfb8b7bedb8d6eaa2b01727c53e72c8e84dfcab2961d1580a188afa9c9451bd2099bdc61
 EBUILD pycryptodome-3.4.6.ebuild 813 BLAKE2B 9bcc6e760294c9490cae798015a72991d2bd39a03bae1e434ee72d82ffa77a8f5288fb711bb75b60cef4cd6c0d39224ee37decab7ea8e96235a45d1ca4055f3c SHA512 e6f54194e8da50181526bbf473f217be46c752b5be3cfc89067bcd2700eb99b0b2a2aaa88300cebe90da69c85e137ab637b7043539ae493d132aae5833e06e78
 EBUILD pycryptodome-3.4.7.ebuild 875 BLAKE2B 217bf82415263f799645a93984b525333798082cbca642260b31ce6ca60c2e16d7a2eaf786fce49d8c605828b1f4c71a09e61b17080aaa8e080bee0465c25097 SHA512 faaac2ec5382a1021dd427092146456e5ed45cba08e3ade94293de8fa44b3665ad2cb91be7ff8934378fd0df3bd930b2c6c2486eb9ac898d40786c5e3783eb0c
-EBUILD pycryptodome-3.6.6.ebuild 906 BLAKE2B d38a2b6d2411087cfd639080e46ce912ac55d9f509308a603d607ca47de09fc693a1bb52b6106309538d5ff31f162c18535636cf034ad398263d39652ea01f0d SHA512 9486672950a8284ea1c5ea4c134880a7a3708a261e5875f6b99a50d9a3a80aacbfb2b280257d9a1d401263c70babe12c28717fb40f121c5afb84f030397b864d
+EBUILD pycryptodome-3.6.6.ebuild 905 BLAKE2B 017fc75f0213e672b92f5a21f658feaa542e347961edce9c97521d9013c4e57c3f4db59fb6c911cd0289871228362e467e84163ffa7a77de3b4d2b2fdad43cf1 SHA512 978dd5acbb98b84a1aaf33eb02e8c579aa6354d752bc38a404767fbf4ed27a4746e94576c489bd9bfb4dd13dba298f3e3014412312c0f54056b072308c26ab9d
 MISC metadata.xml 334 BLAKE2B dd22c5da46085356e8049d290266f66f81a648683dacb4ad33faedb86b890c911047f245eb96b418cbde226b91bd91567036ab31919ae28e488c5eb993418c1b SHA512 f314a41851c5f31d68a7fb93ab304aab44007756472c9f18c746a0b0a7bbf464a9f196559f4ecf6f8b68b265b7ba9ef571398e1893d316b48a0fa435eb7a1b3a
diff --git a/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild b/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild
index 09af73905e8d..cbd224dfd275 100644
--- a/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.6.6.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-libs/gmp:0
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 804ef65e28a4..277e69e86d5c 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,5 +1,7 @@
 DIST pygit2-0.26.4.tar.gz 477318 BLAKE2B d17ef799ff3eab3629194fe0fe90dcc335e40509c13f53bc8f8e0b01e93dc838ca474a5e4ef44c9be2eac7d08e98c735820e936cbbcb7f398f76f9732954bc69 SHA512 e459e47bfa8137421625633a731d49882d95a52d4f2d672f2c8efe7cd6cca4b33335ee77777a353b309df4917d9b29b30c1f9a96b7e226e3e7fe0cd34bbefce6
 DIST pygit2-0.27.2.tar.gz 477237 BLAKE2B 68fc1e9d9456e4a9d6eaaf00963d02704282de2a9deb1af946ee0c7c69be22fc904b8e80fe243987a3dddb9a0e5365fdf5e336b9dca829dcd9843c2035db42c9 SHA512 f6578a3694babe7837a5ccc4c99e2fa1827b5f67815f2cac6f3b3d0498d94a0ffeb55d3c6e9c9417d47ecbf0ad9a10302e3b59ea0d2e9eec6d9da8426b10175b
+DIST pygit2-0.27.4.tar.gz 479157 BLAKE2B 5b650c7916127219ba18212f035793bb805adda570dd4a89cc7fcda8af581c7aa3916d2851117a5efe7b434dbe2e9ff103e37e69de5d158d0a58162b15f1e18b SHA512 046e8830d403d869418a8cf7f22549293e336fa1b8fc108489c3c2299316838724d1eebc8747005d594e1c6c3596aafa5192dd64a1f34e0a2d080c83214324da
 EBUILD pygit2-0.26.4.ebuild 626 BLAKE2B a077ae59833c4adb59a9a2c8eb7c37cc091478d31867e09cf3ae4949231b7f30c0dd605d47009fa40098a8b58277bdd74a744d46f5a38a08a5e2ed0e6e991cf6 SHA512 3c04ded6c6012968dfcf4a36e4c3ac5eec95cab7f558c0fc9574bc1a4ced5b93b1287291bdd84b36c8071ec2394593f70091978eed20091787ec2f53dee15a75
 EBUILD pygit2-0.27.2.ebuild 739 BLAKE2B a5c0508833bed48cccba3a63fd37f5c3f5d6e0e59773d2ff03f9b7a5f9c13dff9db506b0d505facc72db50ec589b43dc554b69f814ace442a565da3daa4ae236 SHA512 5c60050093502af5dfd107e94a892c06b3cacfeb9eec3c857fb2eabe4638f34f2dbc52b51b6bc13c9867a0caf57271f20795a518ac18318c1e65b2f523d3b100
+EBUILD pygit2-0.27.4.ebuild 790 BLAKE2B 269a8f8a624f4b9b8faf4e24df4afa95a8f73ae0aff6498d7472c06fa5f64947c22c2ee748c3ab80d5653a8bd5182a8ee9a4cfe8fc53de52af610e4a67d58222 SHA512 15872ee6f4298cea673fad6e4fe64d3d8e70102c62ae5032eb0525959c1952c53873add1285595b157e715277b4f07c7793538359efecf003c38987c47096e63
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-0.27.4.ebuild b/dev-python/pygit2/pygit2-0.27.4.ebuild
new file mode 100644
index 000000000000..bc0bb7e5f0aa
--- /dev/null
+++ b/dev-python/pygit2/pygit2-0.27.4.ebuild
@@ -0,0 +1,32 @@
+# 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 eapi7-ver
+
+DESCRIPTION="Python bindings for libgit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-libs/libgit2-$(ver_cut 1-2)*
+	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/pytest[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i -e '/pycparser/s:<2.18::' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pytest -vv --import-mode=append test || die
+}
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index 86cacec5b413..4ee39c1c1227 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,5 +1,5 @@
 DIST PyHamcrest-1.9.0.gh.tar.gz 57650 BLAKE2B c497688f03ec3b072d8ab076fc096a442d5cbbd94493eae57779879ccb6f281477aeeb7f7a67e539442010e60194f9f04a6deddd1d2267e9743742b45433f124 SHA512 3a878637ed5138365416c170871a63640f089047b723c7ec8db893dd716c0b1cdad16a98584700405693b954af7d4868a8543d1a3fc58ded22b493c8c61661b4
 DIST PyHamcrest-1.9.0.tar.gz 376623 BLAKE2B 808c74aa4dff89467c126cbc0e18029a9504cb27bbf03662a90666f85c76d7d7617260f50d35acde3a8e9e437b846589423cbb3697f8ceb86d0b5b838c586ebd SHA512 3b8393d0079b619b208ec7f06ed5133c4ff9d9dba050f818adf56347fc2225fd1c85d60f3dc262b7b9722061f0b8e4966180b6b96245a371e578d0d51633b4b0
-EBUILD pyhamcrest-1.9.0-r1.ebuild 1307 BLAKE2B 7e568f0b5a42d88b10922fcd5055067dae98139216accc5113b7788d890b08517abba9bd2c79c81aa4918e57696f5c359eca834db7dd6bd6a138eaa7672443e8 SHA512 21a14c5c4b9ab28cd4e0dfc6e6f5eb721ddedaf8251a55bae720edf8a6bf43c0d8c02fa3c62cc77a842a037a1d689c4136c739052c5f9ab5487334251fad8e4a
+EBUILD pyhamcrest-1.9.0-r1.ebuild 1311 BLAKE2B 8ed46f9c2d8c89e0cf8f5d6bed261464265eefb220f365e87d16f2b94253a355828fccb65741059a63f8d5e2605496dc12a64e9608da855929633bac071500ce SHA512 8c5ffc5913c279c3f9190e77530b4d4df6022572e404bada3d90ea306e88f9104bd1142d15becd68c5ead8463d6820913e87660f77fa195b0b45e9989a3e0092
 EBUILD pyhamcrest-1.9.0.ebuild 1227 BLAKE2B 173ad0e42c44e083043203c40435865697bf5222e7bd4fe907db296fbea627aa06de8a99dd8842f259073ecedbd902a4bc7c9eaf7b74540e1afe53d85832612d SHA512 4bca028ef12f224a122978f6ca9ed259306b7817f5f6182cd462d366b944458bf2657ff7a25f2993582d69cd9e5780004b65702062c2f6cbe429f6c39eefb81d
 MISC metadata.xml 271 BLAKE2B c9035b9fb7a0fca1355aeda317feceecac5790bb6723360063b236d6633a040a594eea8f304c3b5bc8e918b1781f0e5e887ec15225d51a021592391195b7e8ff SHA512 89f447b79dadbb441c4c51527f486fcf7110b67c0a86c9fe6413c563463be57089faa1ddb36701080c368ff0a8442532bc774602e0120cd5466a4d7fb6bb6e0d
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
index c376b449460c..8364afe1d5e2 100644
--- a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-1.9.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=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hamcrest/PyHamcrest/archive/V${PV}.tar.gz -> ${MY_PN
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~sh ~amd64-fbsd"
 IUSE="doc examples test"
 
 RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
index f3a1d6f234bd..4d587f54805f 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -2,8 +2,10 @@ DIST pymysql-0.7.11.tar.gz 82213 BLAKE2B 45ef3b4c8f4d9a9d3cb5b706f68a52b860bc212
 DIST pymysql-0.8.0.tar.gz 82975 BLAKE2B c1345ff6d266d5a3670d8bb1d7d7becad218ed294ab912f3f28e49163851e2e36fc1bb5a13a5d0f62ba753d264f736a6a87e11d290cc4fd604714fe1d4f9569d SHA512 41597d3955a35283656b5cbc137b0cb63eb48658dc61f0ba1fc0c207bad07472896e557b2996e52fbc2646163bce69e7d2fed81349355e72368cf395f51e2916
 DIST pymysql-0.8.1.tar.gz 83887 BLAKE2B 0181970d714d45db644636b57105bba1ea8d8d3ded537555ab1ae5afdc0cad308dbdfe6a67c50905ba1a2ea8cd5302bac8f997f64f0b6874436e4b90a3ea8a78 SHA512 0a58bb6a74281aaec5d23c4e59407ff1d7f3fd379285a21a39f14ad18008303d79aa87b99ebfe2536775f8b369875b15907ae6653d038a2d44589cf47ac0a2b9
 DIST pymysql-0.9.2.tar.gz 86913 BLAKE2B fc1cd695a75c9f52c4da231f7caae58f902002f38a39a1702f19d23b46bdb1a4753aea98d90e051ec56a5721999149a13b028e1614efdfcac23c76c8382a8d33 SHA512 110306477c167d0b497700b7b22c186c001c803800975b4b4e26e98116f47589b0a4bb7e02d502a62beed6d7dc1ae3fe8a817824c1f3a5caee0898b5f5d21734
+DIST pymysql-0.9.3.tar.gz 86715 BLAKE2B 0ed09f7f5c47bd1fae52dd9d0ff0790367962d8e4b89d3933704b8b8d838e1f48b68455a9a3916318bf3c1c1f102fa11b4e1e3401d021f8a2d6137612a4affb9 SHA512 d906b7a6612d91db7d4f7f2d85a9375477e6655c568e0d1e7281ad0263d4a78f0ac4e80263605723f99e12db04c80f51c5c8ed79ed6f209a7afeb4b45bf40648
 EBUILD pymysql-0.7.11.ebuild 691 BLAKE2B d2fa29a9623b07e0613e83c345be814412f5149e9089bced2d2f350ec3452b3c13cbced81720973e58cd6de38e380f912ad74390e3efeb2eba5bd7a7589dcad4 SHA512 b31309b0a30a479c494221f36c816db3bbeb66d3e373069ea6193a0163f5962f95ea612e0006a8e05cd6c633e7fe641376f8415ec4b8df6991fff858ee59a9d0
 EBUILD pymysql-0.8.0.ebuild 693 BLAKE2B 1736b3c63ca463e590692d522e6f33f0c68b645ac7a7aee6f53e784724d253eea4f4446413a9947b9eefffb68bf061a064faa5c733883d91a4e43e189a62b36e SHA512 3eaad8a2b7746a224e1c0097b5e4d2e003b4af0bcffb2e96a613f8a8e467fafbc4d6f2a0105148abe7f8268a104862bc3ac219b42f62259790cdfe1f101e5014
 EBUILD pymysql-0.8.1.ebuild 693 BLAKE2B 1736b3c63ca463e590692d522e6f33f0c68b645ac7a7aee6f53e784724d253eea4f4446413a9947b9eefffb68bf061a064faa5c733883d91a4e43e189a62b36e SHA512 3eaad8a2b7746a224e1c0097b5e4d2e003b4af0bcffb2e96a613f8a8e467fafbc4d6f2a0105148abe7f8268a104862bc3ac219b42f62259790cdfe1f101e5014
 EBUILD pymysql-0.9.2.ebuild 695 BLAKE2B c12d622287be4fe63a595fd5a67daa4c89e3f4313b7fa7a06b8e5a59758be3a3bfd5384097f1087e0c58077e10be6ce4c0d6cd80a4309df6d30b8bc24d665499 SHA512 03a15396e305524c9808046be906f2f36d118abc9d42f568ead343f19157d9e1b41081b55cd8cab7bdcc1eb11f06cacd4dc5c4c8ffbce05198d84b95d410d2d7
+EBUILD pymysql-0.9.3.ebuild 692 BLAKE2B 9131b00ececfedd06bb3578f364d1b9bee8bdc501965405c20d04c9f69dca562a043f7f3bd724bfe069828b0abbb13060cf5c12a2dd21f6703a49a15b14bb8f3 SHA512 96f73855cbaf58516ad3b9e4578579053b9dd63041853abd88148c592e49b7aa35f0d298384c0952554e554988becea30381be113b609abe5e6f580a2b1fa60e
 MISC metadata.xml 553 BLAKE2B a3f93a6e059fcb457326fe8ca880b1a268be1d5d847a0bd8648156036428a5e2f6cbe47adda3e3cb220c236b4307bb0dba8ea616842437e2408407fae01c16bb SHA512 3799a369db7d62654ead99e579ea2b7f19e33c35654fb4f721e37a46f4a449d67f1173f45abf8e34b330e87a872c0182d7a47dcda97a6d2c40e78ebfab6841bd
diff --git a/dev-python/pymysql/pymysql-0.9.3.ebuild b/dev-python/pymysql/pymysql-0.9.3.ebuild
new file mode 100644
index 000000000000..ad3b57902a23
--- /dev/null
+++ b/dev-python/pymysql/pymysql-0.9.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="PyMySQL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pure-Python MySQL Driver"
+HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# While tests exist, they require an unsecure server to run without manual config file
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} runtests.py || die
+}
diff --git a/dev-python/pysaml2/Manifest b/dev-python/pysaml2/Manifest
index 930c4e19688b..e8b6b91b8041 100644
--- a/dev-python/pysaml2/Manifest
+++ b/dev-python/pysaml2/Manifest
@@ -3,5 +3,6 @@ AUX xxe-4.0.2.patch 10657 BLAKE2B 6ecb7b265c55ee9cffda2a9acc0358dc092eec1d804041
 DIST pysaml2-4.0.2.tar.gz 13657558 BLAKE2B 35cb9dff897caf9f7fc39a70466dabce88098b6bbe0337a2ae47c733e4fd5de3bd80ddf73f27b6ff67e6f571b1f647d9856bbed58c8b19fe6547a35254dc2019 SHA512 debe23c2b193ca9f937bdb4fc9e8f308fa012c18e50e40183f7e531434af52b6e4d36608be3e9b0321190930cdfd9eb24555ed1805083e32db8de0f57e5afb14
 DIST pysaml2-4.6.3.tar.gz 316979 BLAKE2B cf393075903269ce93dd219bd23479949ce8e39383d8150f8ee30185733569fe79c7421b87b3439b95e707f17d5f513abfa2610be76441b8f18d8f75a5a9fdd3 SHA512 259f7395afad44caac32453a03bbdaf8c464adeeb856b78786b665281dbe75b37e8054efaf945a7d10333c0b09d9f516d606e95b157aed34c1cd0821b7255b9d
 EBUILD pysaml2-4.0.2-r3.ebuild 1078 BLAKE2B d3d045eff390a651e64c6354601ab63d566c0344ab07c7b014e04244f4029891455a721baaddd67b1eb9b5cd7c6fba6f2529e7e85a5ef8c94745aed33ed5a7cf SHA512 61e90dbbcc1cc55a32f285257a776504f1125d0b1b6ff5dc78ffefbbb68eab9e29c8485dd4a0da26df19a79ada63dde78f35250f7126db6a2eb2d3c2df0026d5
+EBUILD pysaml2-4.6.3-r1.ebuild 1235 BLAKE2B 29112ec3187762594465d650279e0d9adb43514f2a55fa1815612c5558638b95c95f9208b93882814ff0538441438482aee594fb1e9dd56bf04d45453c8e19d0 SHA512 3b3af9e11e151511a0c38f770b7838dfedcfa83f4c4789443674d7c5d023317f41b5c52788430f908bfc52872b13ed32e842900619e259c572bf0533e4039bb8
 EBUILD pysaml2-4.6.3.ebuild 829 BLAKE2B c3cc03f6d7fdbd0631d6d6b1742158227554d500c0eb4efd734c742dc8aae6e3665cdb71d9358fb7a55a56eeae0a88d437dbdd2ddbf4032dd55828dd17da75bc SHA512 d35b54e1d560ee54cc6ec97ee3c3823a7499d318b9e27b4177901440750e147dc0a00e8088104b7d57d5e5e2775968ea5866efc24d112629a694dfafebcd3cd0
 MISC metadata.xml 606 BLAKE2B 5262e7d7a6f2ff32547ab8570f3aace4dfc3af9d667fdaac6ba2eba77ffd562524a136154eb7b96d4f1f7dfb316b72ee7a0311efa46153afff150c3956151b32 SHA512 7b4facbe3e25898488fffb7b39f9ff7eedd12492f668fa294952711efb3ca9549f2653ab6bc2a948286deff5f45116b0b8bd9a5fc796e99413acc9334eade348
diff --git a/dev-python/pysaml2/pysaml2-4.6.3-r1.ebuild b/dev-python/pysaml2/pysaml2-4.6.3-r1.ebuild
new file mode 100644
index 000000000000..141820786e1c
--- /dev/null
+++ b/dev-python/pysaml2/pysaml2-4.6.3-r1.ebuild
@@ -0,0 +1,40 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of SAML Version 2 to be used in a WSGI environment"
+HOMEPAGE="https://github.com/rohe/pysaml2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+PATCHES=(
+)
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/cryptography-1.4[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# Work-around for bug 675824
+	# With older setuptools, version = file:... is not supported, see Note 1 in:
+	#   https://setuptools.readthedocs.io/en/latest/setuptools.html#metadata
+	# In such cases, hardcode the version
+	has_version ">=dev-python/setuptools-39.2.0" || \
+		sed --in-place "s/^version = file:.*\$/version = ${PV}/" setup.cfg
+	##
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pysendfile/Manifest b/dev-python/pysendfile/Manifest
index b0ad0e09200c..35cbe4a3c479 100644
--- a/dev-python/pysendfile/Manifest
+++ b/dev-python/pysendfile/Manifest
@@ -1,4 +1,4 @@
 DIST pysendfile-2.0.1.tar.gz 19315 BLAKE2B ac5776069de0228d5103053e82786b499478dc3cad57b1f74ede3b8b8724abb780c5b51cf8578ebece7a12ce269b7a9b5bc72f08409077bbce2d4daf63046119 SHA512 d6ee08eb251fac30c90a9ee829fd992f3620697eef2893ced5a2c6273486c3c5fd35c70962585a8d747d578817391f91c929bfeeba8c4485d52a15748229ca9c
 EBUILD pysendfile-2.0.1-r1.ebuild 592 BLAKE2B b0d05af459b4fcafbc41868b19f709df8934191b4e26689669f446c2035a3aa5c316d6f53a0d7bfaa44ffe18260b60eba01ce4247c3f064294e1529e26cb45cf SHA512 40df0045746fe5671631ae47da43e849068daa5cdf83aa4e2e5a590f9a822cdc428cba202041d5a9c2f1a2cf31e794e604c13adebf50b4dc9eafae202707e31b
-EBUILD pysendfile-2.0.1.ebuild 574 BLAKE2B c2538ede583e0144e35c9c3f37e13343e1008cb2651e5a2b9131dc983dc70234f5e2e6dc6df0ba56f2cb82892cc76d200915a378952a35fda9a54b5197d1c883 SHA512 dc9fc71cee936ec4ece4e410d78bb7ab9615b5ddd7d47b0df66543f85083f05ded4a77e2b18cd7ea63dbd93f3e31bf5ba2786540e6551ea71e38708085373423
+EBUILD pysendfile-2.0.1.ebuild 580 BLAKE2B 4b46ab0ccf42caac14fc71959e5f03cfedf6f3b4e1c948801149f3c94716d4e531d593809bb04731368bc4160641e2f783491528f8a17ce1e2110b428a1ef6c8 SHA512 0f4ee50255013f0777e5d74a296576f228c2f1c640e616d67cc8184437141c54ab5852704396d25075616e527857d08bf8ef21870e26adfecc3916d292095581
 MISC metadata.xml 461 BLAKE2B 30a174cb9b4196658e94e080e4aad73dbfd3f28bc9c5e0d966672b1d811a6d85cdabf97faa07c89a4a868f2494c46da07f6601c0f08a292f1cd00df3b95e42ae SHA512 1b76475c93a4462264ff4ee5f9b1b3da11fe666f80fbd47322e64f981d3c2ee4d7817fe3d3ef151b991f04fd9353d0b6dda9fe80f732409415fb6d7b0146e17f
diff --git a/dev-python/pysendfile/pysendfile-2.0.1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1.ebuild
index 18ae397f9250..d0970276db11 100644
--- a/dev-python/pysendfile/pysendfile-2.0.1.ebuild
+++ b/dev-python/pysendfile/pysendfile-2.0.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=5
@@ -10,7 +10,7 @@ DESCRIPTION="A python interface to the sendfile(2) system call"
 HOMEPAGE="https://github.com/giampaolo/pysendfile"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytables/Manifest b/dev-python/pytables/Manifest
index 3f0cbf1f5f22..c58fc5476bbd 100644
--- a/dev-python/pytables/Manifest
+++ b/dev-python/pytables/Manifest
@@ -3,5 +3,5 @@ DIST tables-3.4.2.tar.gz 7593471 BLAKE2B 1a011a2a910a25d4e7cad68b5a1a267482f5ed9
 DIST tables-3.4.4.tar.gz 4626053 BLAKE2B cca4f87aa62db16bb47e131bf670e1013d363dea9c807f399688e184610f682c49b00b686d8e28a03caf94a98e51b11bf646df66f4e3db66f481751f096906f8 SHA512 2d0cdd36a6f14702f424773b64187d1980d73a72525ead43b272776bb32b2ebc4c6ea0b7e3343c8600d7f62c42d008b5e835439af30e76ea11c7504666631ddf
 EBUILD pytables-3.3.0.ebuild 1576 BLAKE2B 284a5c4a14d6705f464ae82943e15ffd2abfae5a607651c0e4fcfe2d4bede9b4e672636a8e92b849b2fc69777b8e395b7f3f3d163b13fe1ebf57b6b2c4e5df6b SHA512 245b0b83df781420beb759ffcd1e66106739e4a56fdc524f1f9ddb0a65c5c91442b17775e123ec474f55a5ad7d6b26993dc4453c2afb8522507f0ec2f66997f6
 EBUILD pytables-3.4.2.ebuild 1699 BLAKE2B f9ec49367b093596e1938c64b5f9d225ac4905ff26e6392fc4f4a8bcd9944cf170fc5a149cceb3f33d947460363b63ca959e2034ee417097a329876f97b373f0 SHA512 8d437757049016b98bdd8e67c296ec1e5aa484012f50338e9d4e1416f9cc51a3a9631b15bfa7b5f1931d24a03f40a6eec4c4dca2a2d49764a406fcc14003653f
-EBUILD pytables-3.4.4.ebuild 1749 BLAKE2B 9f707f73eaf5958be941552666d6c2e3fe8f9fa3a906df586dbd090c2f9542fadab20990e84ada157f3c4bd2b6876b5ac484de204766baed2c5933ad0d7c0b82 SHA512 ac2a713ae7eb8906ac6bad70f19f882136e9bd832ac46d99e3d256c63957ea35d13fb273400a97594c9e5d83cdee1eb833c3041b41fdfab4c3e8d5917f7255c4
+EBUILD pytables-3.4.4.ebuild 1721 BLAKE2B 1439a5e0a226c5b818413c446f7698b44da69e93601a30f42146e9444ac083913f5a54a0c82c3436a2daf08f2fe77a9c9e2c91c8ed3b21a9ed3c9e69dea59a61 SHA512 2f9a13597d126e6edbeec0f18f8f8c6fb95847d879c25cdea1a7d976d4016614e6a6b0b917d05622986a23286f3998eaa6ff327430b86628e82432ac040aaa6e
 MISC metadata.xml 894 BLAKE2B 279b64a5124a6471b3ea6ed8d2f82b8d62e5d8bc809168fb2ae1c3bfd8cfa07428c2ff7f07deb5042a6ccb5ba7af43bc45d0db82b9cfc79fa5d19c090d0500a3 SHA512 88dd752e6014f6f133b5df7db6c2aafce0b9da8cdbc057493916dbfbe1da4bf52e0ed43d570d68035fc8f12302794a381a54f5b07b9726b52601724163bc672c
diff --git a/dev-python/pytables/pytables-3.4.4.ebuild b/dev-python/pytables/pytables-3.4.4.ebuild
index 265889bd4b0c..631c7abcf9b5 100644
--- a/dev-python/pytables/pytables-3.4.4.ebuild
+++ b/dev-python/pytables/pytables-3.4.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.pytables.org/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD"
 IUSE="doc examples test"
 
@@ -65,7 +65,6 @@ python_test() {
 
 python_install_all() {
 	if use doc; then
-		HTML_DOCS=( doc/html/. )
 		DOCS+=( doc/scripts )
 	fi
 	distutils-r1_python_install_all
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index e6cfb5558c4c..80dfcd9bbffc 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -5,6 +5,6 @@ DIST pytest-xdist-1.22.2.tar.gz 57866 BLAKE2B 356f9dccb7d970e6073dc7242330135039
 DIST pytest-xdist-1.23.2.tar.gz 59932 BLAKE2B f2cf73914cf095217fb8b472f5e5f7918435c75f8da1694cc7ceb920ac3a7390d84bea93cca558ba26cf3d14a01815374eab9ea03a137a8a9f5dba2f2d4453a8 SHA512 4aae9a6d74e53a29630d0233d0a903d008023e322de726ef7ab7cf4865f428942f96cc65264e19726cb6213264edaa747da2cb6f368989417ba821f2a3f9b654
 EBUILD pytest-xdist-1.15.0.ebuild 1238 BLAKE2B f9f17170a8c0f777c86f715ad954de7daaf3f2dd8d3432f561fcb43b92461ed4d374122eec99e636467ecb3f4d376ab5a07c0605e12d50fa663bc26c025c8df2 SHA512 f639099d0f809555acdf77bfbdc783b92985f45608163a30c7ab01a5efc5e16995851a72eeb09b90876ad738e6accc14e69fd852f62e8880cb0900bfaff721bc
 EBUILD pytest-xdist-1.20.1.ebuild 927 BLAKE2B f15b00b5a68556d0a5f725616199d40e130f8cbc6b9250fdfbbf54f1d05b6fd0440b1aa55412c34e564e4acc113172ec140e614907c244aace48d2736de520aa SHA512 4fa357bafcffa5b77bdebbc36b26dbf400ba178bb4d629b56a3a52e080b397438ec66e7fc5f42f31ea95f4d811f8f4e17299a2974f358a5db117389418b81eeb
-EBUILD pytest-xdist-1.22.2.ebuild 1112 BLAKE2B 8bd18da522c4e9460860ead4d2f5662cab9d9da4dd86c762221942781ed02fe3cc6faccc495c394ae36b6a75f30f9198d9c90a8a6e8345182a78e11423e91a83 SHA512 735a2be777d3054f5b3854d27dfb61f57e3490e1e2be8ec5e2a12acc466119ec3056077917a80a762e416428fff11ecc53c1b1b1346379542b3581d9f8bd662f
+EBUILD pytest-xdist-1.22.2.ebuild 1113 BLAKE2B 4471d4324628d16691d4078779166d86e933d0c86493784920a54b86e9f60b7f0371e5ca26766e78dfda0b794655f66b1427130d3e7d522d7f8c341fb0f06b46 SHA512 ae49420528397f9f1444ec8beb40d4af49b9304cb9e036c2523181971108cb6da68bfebb095be7bdcd981a51358320fa2df98cdbd2f444a02edbfb5efaae9c83
 EBUILD pytest-xdist-1.23.2.ebuild 939 BLAKE2B ec87d5f8f2f72d3ea3317fb97d6e6b667c0186341e13880b9e40793fe60f359dc9d7647f6c28a1a4454bbe5628663f60335873c037a9a44f4362dcc172ea2a3c SHA512 c2f837de51f260f8e21c2d10d8153b51c05f8ed76bccc72f8c73bf34c1c29d5098012844c71dd248b58588ca7af1abcaf287fbb2c5fbc054bef6365add9f6dc5
 MISC metadata.xml 429 BLAKE2B d1c317fa9cb06da79389adbd0d8941511127f1632aa0b5402df24827c526b634e9bfdc822c9f6dbd83a527bf3c9fc4418fffc1dd23b50812d566ff1681508fb1 SHA512 f25800e22c2d0c60991a0544f69e253c5751affd7ba178fdb6fda167baed0b9756bfba1fd850908d9ed05c5cf2091848d91593eec7346d00462cfb54aa1864ae
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.22.2.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.22.2.ebuild
index 74768c3d2d41..79cf6a2a0134 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.22.2.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.22.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-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 ~sh ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 096602fea807..3966029ce7c3 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -2,9 +2,9 @@ AUX pytest-3.4.2-pypy-syntaxerror-offset.patch 996 BLAKE2B ff6d362d20f6432f73956
 DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f
 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.1.0.tar.gz 902235 BLAKE2B 6289d13f6d81130fe4a1ea25dbe93c76206cd61c11e3c18bb5febd92539f37f45144565680a6df097667a5e940e545e7973193abd214bff7b9287d9b42b00e56 SHA512 30cbefa066728b72063b21190df74b7cbf56d045e87307915af45e3ff5cdbb76c79dd0c2428425c2db9f8f0ba99a116d787526dc806801787b89a7862dd9e56e
+DIST pytest-4.1.1.tar.gz 903912 BLAKE2B 6466f8620ddf509ad17c9fddd8d9afd8cd53b67673bf12c603a563daa30decd6ca067ec829bece49505650536c02854493ed27d5dd350f2bd5cbd4c71c85721a SHA512 e93b742b61fdba7518d833bdc312282347853abb1fe76920f14e791ede2af57513b521b967303483dfc2e308ec83c9c9e1f8d81489ee5610808e3b33b42b8452
 EBUILD pytest-3.10.1.ebuild 2190 BLAKE2B 51f2eae063abe8a901283deb9914a18258efa71084ab117bade90c9a945e203346ae2863571f5e786ab49450d9d171fd6d6a9ba3df2a0e3d23700548c010e73e SHA512 c422d28c466fd0771c70d33be2984b5e1c4c1e9142a341ab4207b62d52d98fa308ba28872685ff0b6a5cdb889745960b60a960ab4a527bad8fc8c8cba7f46487
 EBUILD pytest-3.2.2.ebuild 2113 BLAKE2B 1789686fa508f9629adc37e7fcd26e8a4426214b6335922927bcd8bb37c336792b564ce505c122a729edfaa53af604e4fd1be31f45c5251f0008e14c8cefb06c SHA512 1384082815df0f30e50881c89d81822575509f1333c2d3713b69ff7e3a9113c1a70fa5220d0e10bae0b5f17d844a14501e59af8c944ca4006dfeb9cd0e8616b1
-EBUILD pytest-3.4.2.ebuild 2509 BLAKE2B 23b2f34e9f2923a0eb143a341f4dff40e88d4ff1bf52cd7637d9354192ebadb58c39050feb00911993f0067d60571598864e5a85644b0adb33cab722594f9ebc SHA512 1958df6b0567c547bf70789836e12929caf3e1f17ac16ebad88aac081dce949888a08efceaba04649feb8098d4373548a5d4de511a8b94d6f50eebbd1d5d7b64
-EBUILD pytest-4.1.0.ebuild 2190 BLAKE2B 11afe662abfeccadfb9ed37678095c6e41939af9800cc07c736b256c062c71479469e35675d1c3ffb31f4b274159a7f769d22ea72f9fbbc44c3f5bd27dfb1849 SHA512 e8acb146b426f456540f6d0c33b552f19544677542e980af5a9647cc837466e8ec295c233da1cdb447e441ccef4e077cf048cd567418b4bd0cbf428956d0c81b
+EBUILD pytest-3.4.2.ebuild 2503 BLAKE2B b1b8a3f91525681813116bf7d8923785d2159adc0f732ed3ebd8082af0d1d2af8de07b64d06b952141801c765b3756bf55bcd646b50812a8b043b851153ff60c SHA512 e4d5459e203944d7e00324287cab06454ea78f2a0d54b4bfbb88facccd7ebe4401f2d9b3cfab950af1937c8a09faa5a33c6efa5aa908e7896454f8e25c7fb873
+EBUILD pytest-4.1.1.ebuild 2109 BLAKE2B 6a4775271bf420377c5f70aacb40b633e71fd02f42a43d782a8156ba92f815422b7e88ae2453ec28250613a18d371940ffc0859d22a7117c64463695a76c116f SHA512 2e9efbbf954c0910e974457e5f8e9dc9cb915e76954154dd6e62f35a9319918507753741fd874a75737511f2470a55726af5d0c8578753d118cd9be83389b8d3
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-3.4.2.ebuild b/dev-python/pytest/pytest-3.4.2.ebuild
index b7ebb1cbf03f..7dd289446947 100644
--- a/dev-python/pytest/pytest-3.4.2.ebuild
+++ b/dev-python/pytest/pytest-3.4.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
@@ -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.1.0.ebuild b/dev-python/pytest/pytest-4.1.1.ebuild
index 35286e06a77f..35de82a23ee4 100644
--- a/dev-python/pytest/pytest-4.1.0.ebuild
+++ b/dev-python/pytest/pytest-4.1.1.ebuild
@@ -51,15 +51,13 @@ python_prepare_all() {
 	# https://bugs.gentoo.org/598442
 	rm testing/test_pdb.py || die
 
-	# those tests appear to hang with python3.5+;  TODO: investigate why
-	sed -i -e 's:test_runtest_location_shown_before_test_starts:_&:' \
-		testing/test_terminal.py || die
-	sed -i -e 's:test_trial_pdb:_&:' testing/test_unittest.py || die
-
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
-	"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
-		-vv testing || die "tests failed with ${EPYTHON}"
+	# 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-augeas/Manifest b/dev-python/python-augeas/Manifest
index 58368b3f9933..9daf0d6c5e69 100644
--- a/dev-python/python-augeas/Manifest
+++ b/dev-python/python-augeas/Manifest
@@ -3,5 +3,5 @@ DIST python-augeas-0.4.2_pre131218.tar.xz 77636 BLAKE2B 033063d449b4c5ec2daa7a62
 DIST python-augeas-0.5.0.tar.gz 90667 BLAKE2B 5d563350c3f80db45aad87326c445e93e3563ca6eb8de17889cdc91735c61dfcf0fda4e93f15c0d450ee156d57cb71598f32cdce6f6716b0fd610b793f103641 SHA512 d93d9e21c720084ee3c1841a2172dd1a4cfb41e668de0f557bd214efd65e685a1e5fc713a7d34e0fed727fe908bb1e8a09a1c10587bc27f3708cbcdee575cc51
 EBUILD python-augeas-0.4.1.ebuild 513 BLAKE2B 7b0c1f9f0dd86d93582b08514dbbf7aeadd70067b1665e0ce844a46d41e290859ad865b3b6324b21d543afab1a38b08bdf7c091af9d2d01b13bc1b3a93c052a0 SHA512 97e9201ecf56a5a9d4b7683099c11ae81c9a3f85ab9304c97fe27ccc73066feac6978e54ed89c3e1f28f62568606ec3f8d8a90fc8007d2ceb6717413be70d201
 EBUILD python-augeas-0.4.2_pre131218.ebuild 572 BLAKE2B 07e467da411e8eb33e7f832bc3095282dac5206fcc694574f340e936e5bfb7be1c3815886173bb49b5fab38081900f1926f748050168d4c7adf13e5482db37f4 SHA512 3d7fdb4feeacd9a51e9a08b0e2c1be7e23733c3383b6b75acae9fb62a9bf130eeffc9551b273aea0959b96e470828947826a90fb8d89982293fde8cea59700de
-EBUILD python-augeas-0.5.0.ebuild 506 BLAKE2B 88ced3c0e56f8f8db4054b474166e6f105664d0cbe10012b72f823b8f4ec55907b88d28397d64cb6e7faa423a30632a86b97364d85385744ab98ae7bed5e45f2 SHA512 14a4d69e77fbb2a2cc530d4d8ce451ac618ed774926567eaa846c64c153013e811e36bf1112cee86b00604bf812248463afbceb26aab195256b834487abe2d09
+EBUILD python-augeas-0.5.0.ebuild 513 BLAKE2B 3f472c723715c84445d0a935c27a38a43900298e9006fb659cb4344ee594fcdb4fec77130fc0f46c22ed127bcee677680d450e8be0c2f4616b2ef5a8b0d40b61 SHA512 8187a36d62b40c557407d8106e6ad1c6f696f07ee090049a487b2e98ce2f2ce625ae6404a1dc94f44e3c164794b92e4053e8863ca6ee9bf0dba53d0479eca9f0
 MISC metadata.xml 417 BLAKE2B 33e8c4549ea1d67e4007731ada6037aea72697414df3cb17a532c700670a8b47188b29726d41c888d840415b16c72cb1662ea552b73a5c96ec5ee3fc2e4b7009 SHA512 54f17c94e464ce5dde8dfc1135ea90b95ced67eac61f39a2b9e653740463396d2a564753d488e390bcec08b3e4360e92a71ce2ef5c1e1050738e71e61d27d10f
diff --git a/dev-python/python-augeas/python-augeas-0.5.0.ebuild b/dev-python/python-augeas/python-augeas-0.5.0.ebuild
index 7b9f9903f2f4..7c8c82e7605e 100644
--- a/dev-python/python-augeas/python-augeas-0.5.0.ebuild
+++ b/dev-python/python-augeas/python-augeas-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="app-admin/augeas"
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index 8f832e3fb7f6..a1d643336ff7 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-glanceclient-2.13.0.tar.gz 185962 BLAKE2B a0e1453124c199855a16843aac4155627f6e8070a5c5acb947e10147492d8f12514085d28cb060cf5f8577a60ab14c79104d1453947e71c2cd03f9c54d3e008c SHA512 e8a1551bc427c07e12bc869ee09cf5e11916c7ebbb09b924d765f682010d19c4467f3dc71b1839287dc83eb15841b05598e893cc718dfd6a4882340aa7a10c76
 DIST python-glanceclient-2.13.1.tar.gz 187298 BLAKE2B e2fa34ea7840404e183fbb77592f656b296d54942581b2e1dda71285f791cf7f7d5b3b6ef2da28deb4e314f1d35395548e923f548854b7ad3ef4aa50ad000d62 SHA512 deb8454aea8b2c231604663fac2f6515e3cd6e86dc1cf3cd2174ba2e35f9d605bf162f5a089d80f52da11f97c540f5c160b96864b85d7535463ec170cba81689
-EBUILD python-glanceclient-2.13.0.ebuild 2484 BLAKE2B 11f52463f58d6722a349752ccea9607ec32298321578263799cf31d37f631e81bffa79d337fda38a8ee030033f7220fc17e6972975da3bdfe1b7b0bd00a62a97 SHA512 1de7499043022c97095739eaeadb6879dcee93b9814326470b083fcac62e1e854115b32c82aab556058513bbea03ece46be4b1ca34038e963bfb513425cc0d7a
-EBUILD python-glanceclient-2.13.1.ebuild 2486 BLAKE2B 027e2d68e5760f7fef0e0ee3ed2dda74b469b07f7488b841458d631a822f8acdf147689a3c02431e867286305d16f569210945a5abfdea3813cdc4bfa6e8d4a3 SHA512 c094392ec23b511024280fe11d5a5a6738ee3aaa7625533c9be3015e236346b864e8756ec97fbfeb40d95123116f9bdc80855719501c95e5118f7d10bd6165e3
+EBUILD python-glanceclient-2.13.1.ebuild 2484 BLAKE2B 8b0b9a1b1cf71ff97a14830904378c24fc804f853f7364c4affbd0b1146ee5ca2acb67d8732f96df05892b4b63533df8f7bffca3244f150a14ead5d8be5c1f36 SHA512 13d5ff8a5138eaf371c22f1dd7abed5f39843c01cbf82b07e614de319e8812cbf23408bd73aae4bb7e44de1696f170eff9f428edfbc3e4860c68db5a8e45555c
 MISC metadata.xml 632 BLAKE2B 69885578505253d6ec3d0245779a89ebe5c75ab8a8e9fecbf95c29d4aa17ba6864e69c1806a01cde0e92080a86ccbae146bdb2c003f50fd3dfd32b6d2186536f SHA512 d807a9aadecb131f92d6a476a8bc0b0293d46c6ac761a2d1ddb596ac219c6c8ac349402e3f56d150e78ad81c5d2838a33b3d35222a18f9a416f969f6d6208d8f
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.13.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.13.0.ebuild
deleted file mode 100644
index 8317126df93c..000000000000
--- a/dev-python/python-glanceclient/python-glanceclient-2.13.0.ebuild
+++ /dev/null
@@ -1,78 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Glance API"
-HOMEPAGE="https://github.com/openstack/python-glanceclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ordereddict-1.1[$(python_gen_usedep 'python2_7')]
-		>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.6.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/warlock-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/warlock-2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:_&:' -i doc/source/conf.py || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 tests && einfo "run flake8 over tests folder passed" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.13.1.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.13.1.ebuild
index 0fec31bc89fe..6a318ce6e77d 100644
--- a/dev-python/python-glanceclient/python-glanceclient-2.13.1.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-2.13.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=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 REQUIRED_USE="test? ( doc )"
 
diff --git a/dev-python/readme/Manifest b/dev-python/readme/Manifest
index 081c801e6c4c..b44c8157eb46 100644
--- a/dev-python/readme/Manifest
+++ b/dev-python/readme/Manifest
@@ -1,3 +1,3 @@
 DIST readme-0.6.0.tar.gz 9938 BLAKE2B b71e83ee0b2c890f4ea6330ca3409231ab4fbc52ce94a7e7e1136e53f7c13b1bb356bd19d46e53f4db37814427dcfd294a339347067ef0fa756fd7164e49699a SHA512 73c41c728171a18a963460459aa19d559f38ad34d54a9840820feb1329a0d71c1b0eb32ce773a4f8e9d361e534bfd916e376fe1a3fe8b8a9eb91fffac3ef565c
-EBUILD readme-0.6.0.ebuild 899 BLAKE2B 3ea8aa12c97709b4672549fb74dafd5feaf1bb8765bde0c8e1a26891e1b5eb82e0c10706b72fe06b1c12795a9a36b21b8e047c725fc62c10dd3c392f4812ce64 SHA512 caa4317915c08e5cab89c336e9844b38d43079e03509b4164cdbc71f51295c522a17a9092fd2d0266052b0bc34769ba0b0a4cbd84d5599158f03ad1a476e01ac
+EBUILD readme-0.6.0.ebuild 900 BLAKE2B 3bf7d1fb1d15172606516a60bc78854e63fcb4809da1e6dc98f9df374ecab5da3cd2327dc6de6518259918974ca74749411b87293e2aa2b486634edbf2597f5e SHA512 bf9dc3bb9426be838b65296e364a423c2d13ba59b2d7067b7f85e4efed33d9b6becd1ee4d0e9e548f2bd163b3b023e5d9edb6940d6f9dea47bf73aaec37a2161
 MISC metadata.xml 372 BLAKE2B 8e16abe2027f5e8c1491d3f8bae5019884bffe4b4dc5162592bde885af6d3d82e1afb3973a56253a52b01eaa245dc2a2ce58a67a79108c0c57a9c3f0b902a390 SHA512 97168e8c89035983857c0c5d3f3241665d3dfb7088e591563835214cfc2786e11f7a5ab95b0deda2f017dd2c2c3713d8dc6d7c76950ed163285013b6a4b39dda
diff --git a/dev-python/readme/readme-0.6.0.ebuild b/dev-python/readme/readme-0.6.0.ebuild
index ad94c30eee11..1e9d4ca3631c 100644
--- a/dev-python/readme/readme-0.6.0.ebuild
+++ b/dev-python/readme/readme-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=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index 2bcb1c47927c..e8fcdf401a14 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -6,5 +6,5 @@ DIST requests-toolbelt-0.8.0.tar.gz 196129 BLAKE2B 435059ff2879c44a274641c49adae
 EBUILD requests-toolbelt-0.5.1.ebuild 496 BLAKE2B c5bedc4e7b17cc2932e3801f98c29f8885a83e4071f08bffee3cf07af2dd78a876950949be5851f0abb9f619123a730c4e2ea265215b0189ed4698b696af0e5f SHA512 8d91f3a4637944a9b19e8abf93caaf4be208f7a52a1760351b95037485980ace11ca6be63bb1b5465fda5ea8e245e437426e46595d6d5ba1f5754fe9478df801
 EBUILD requests-toolbelt-0.7.0.ebuild 496 BLAKE2B 4be3275cb8b4140a1ebfdc1fbf74edd711154d58c180f80da133e61937267dab47af989de3955c74bfbb67f277137a39b125bdee422a8a36e9046ff8fcc0a02b SHA512 440173c9a947e5a8f591fcf7aa8c75d5ea2b78ef80db14c59e4da68fcd4d438d1be3247054a89ec17049e102457ba02b928616435ddeb5e775991da3c7cff721
 EBUILD requests-toolbelt-0.7.1.ebuild 766 BLAKE2B 3011c5a00c9c8bb2025b02bcfb626fea0e79841b2bf63760a876aaef8a757b6e64c60c2b661e88e00852e66f30d000bae6106c6e85959bb5ca68a5d99ed554cb SHA512 103507c91c951cbb1a3af1860c31634cd386d33903667b73978580854290dd47d421e313cae9105c4a4656b35eba803e73afec6628105654a5b92d973580c50d
-EBUILD requests-toolbelt-0.8.0.ebuild 1042 BLAKE2B 87d1bd489afeb105998023c668cd99dd4a6690799d8565e779026b017cb622e869fd719ddac7da733baaf873f903dadbd1a56280a5c700755613ba00a98f6728 SHA512 11876d884aed542d23013d62e10b369889c068fa8e3ea06911f712497e6be513dc3d867eb51461f392affdd9b89c8879206553ff12fc8438b567bcce043f697f
+EBUILD requests-toolbelt-0.8.0.ebuild 1049 BLAKE2B 518636d54a7815e2d6d65d9c725f64551b7c0a0db226f20204f61974b1d8d924b20a1d934d269fec25f6806349195b35b3782d0e232878e371d22f1bed94d0fc SHA512 0f364141fab48e81a212287b4c142f8d089f387b044f434e107e39529e3ba71d8a14d70fdd38bf2b58a32626800958ae3586cf078970c0ea5ed96d2f301a971c
 MISC metadata.xml 297 BLAKE2B 0dbab9c3d9697a1ac5ab03c7111a1862d977546c23cf42967669a6e3a19eff6e81b2a0701cfc2e11904c220026a5bc7b19934cca17339ab7f9037891ab5b2c8f SHA512 46897583f3474724b466e1d1a6b5e0d4c4d557730ce38c809ac2224d2b1dec3e844c0b66b7b6d9f5e60f82cd51a791c1a3ddf545d9898d70038ea2af183a8691
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild
index 7bfbf3543a2a..41bf323acd93 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 
 RDEPEND="<dev-python/requests-3.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/rosdistro/Manifest b/dev-python/rosdistro/Manifest
index dd08e3a3ae0c..d80d525d52d7 100644
--- a/dev-python/rosdistro/Manifest
+++ b/dev-python/rosdistro/Manifest
@@ -1,8 +1,6 @@
-DIST rosdistro-0.6.8.tar.gz 59771 BLAKE2B 5610ef992824104570abc8c5cc0224838ee1442d942f8f317b20b300831f7536649b47360e7f542e484d75eac29af71ce9e82fadf91b540f4671478039776921 SHA512 57db65b7cba29e41c14ea4e45f951a410e6152ce4247afd1b15df51cd79e50bdbc95151eac02acc666f8bc3c2658695600ad1b4fc0f4152d71901685c9e8f558
-DIST rosdistro-0.6.9.tar.gz 59831 BLAKE2B 4a576efce73cceb68496f2ba7a52e9e09c92aaf0c54ed9693e067e1ea7dcc0b53362a42524dad92b1e68acb22b88c7a92427b8962dbdec781cac5972e251ee9c SHA512 351653c95803dce034074a357f4ca878688ca3e640983cb380840b1bb898f1b8e827210620ba31261fa76edb306908e489e0b8504a6fd8c651c83fbfb8774bd2
 DIST rosdistro-0.7.0.tar.gz 60092 BLAKE2B f68dde51a3e6b5efe26608130d3a69536803baad92565c7d7cb25b22f71be4cc8bb3869d72abefa7e4de4446ff7f3f49037e789c39d9ac401fff30dd8d9fc082 SHA512 8def3e3d405483f9cd51dbe82bfbb7605a50d2d14dcd9712e3e93c5c091953df430203b2383d46c1db2248678fbf2b84638328f47a256296c78229b7783e724e
-EBUILD rosdistro-0.6.8.ebuild 979 BLAKE2B fa07155748189f0377c4ee69288f0d876d77bd8b8ed4f942abd309fcce01db3e890da5012c5c85110fc3e00724bfafc1bf32f53d5581557887102bd1407990c6 SHA512 ead56ec46c5e25727911212be51bffd567e5b84507984ab74221b5fb4107b95e17c2f1a8f51110fc70c361cd41f3e2d881dc7d9c9f42b4f911011e4443ba5bac
-EBUILD rosdistro-0.6.9.ebuild 1041 BLAKE2B 20b6315393af48a04bd289c3627d52ecf126e522dc9b6efed1cad61464f9eee6dfd1da64acff5d7e110bf17666656f3fd4514e5029a953a2bb86829b33ea06a8 SHA512 a73a13b78e9b27103b3efe59c32d64e865a493154b64d76ec0fe916e816755a8215ed22e7acc64f09518f8fb9b2f6051338c487b92e68069dfeec0019a20663d
+DIST rosdistro-0.7.1.tar.gz 60093 BLAKE2B b6e16af1b20ccc31a23365e9c74123c6cd2b17b4b522b925e66628cec0608c29bb73ffd22ca21e05f85ea20681b37d1acb95634f652e16e515e4615aec65b1b8 SHA512 cb22d331fc71324de518336b1e3afd8b9e54180b3deae55dedc619aa6308dd5ec0ffe22dfd7e2e8e362bb56b14602db9242a8b81d71f2745c9f94db94aa91ccb
 EBUILD rosdistro-0.7.0.ebuild 1038 BLAKE2B a4248c4dd092ddd577e9530db7c264cf31af851f49f077fc0db94cab60ab7b80aa3bb6ec6a3e32552177d2c4c88b196fa0e4556614a9280ca1a92334dd6c2ff6 SHA512 b594386a4db0614524b36f7948d3c1fc8f06fc44c56eb8db4bdb6a828cbb3a59fafde25c968fd9336ef957990be5997f24cb7b88cc8fdd872b094616f20b2b36
+EBUILD rosdistro-0.7.1.ebuild 1038 BLAKE2B a4248c4dd092ddd577e9530db7c264cf31af851f49f077fc0db94cab60ab7b80aa3bb6ec6a3e32552177d2c4c88b196fa0e4556614a9280ca1a92334dd6c2ff6 SHA512 b594386a4db0614524b36f7948d3c1fc8f06fc44c56eb8db4bdb6a828cbb3a59fafde25c968fd9336ef957990be5997f24cb7b88cc8fdd872b094616f20b2b36
 EBUILD rosdistro-9999.ebuild 1041 BLAKE2B 20b6315393af48a04bd289c3627d52ecf126e522dc9b6efed1cad61464f9eee6dfd1da64acff5d7e110bf17666656f3fd4514e5029a953a2bb86829b33ea06a8 SHA512 a73a13b78e9b27103b3efe59c32d64e865a493154b64d76ec0fe916e816755a8215ed22e7acc64f09518f8fb9b2f6051338c487b92e68069dfeec0019a20663d
 MISC metadata.xml 342 BLAKE2B 1975e171b6e686c5fa1cf51909101b1785f2610f619de6465329c935023adcbe5d0373512bf7e7fb5a2451e31664faeb2aed67eb9af58d40005f10ee1582e4f9 SHA512 5f55e6edbfd3be1214791b1897ce625f6cc52989ac007d7de9c9eb0bff57c1ca805ee18b911fcc2c29a86a5fb9f68e1b9647f69a38dc6b1d1d74334b35ac106d
diff --git a/dev-python/rosdistro/rosdistro-0.6.8.ebuild b/dev-python/rosdistro/rosdistro-0.6.8.ebuild
deleted file mode 100644
index 8780e241c60c..000000000000
--- a/dev-python/rosdistro/rosdistro-0.6.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 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{,3} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdistro"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Tools to work with catkinized rosdistro files"
-HOMEPAGE="http://wiki.ros.org/rosdistro"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests --with-xunit test || die
-}
diff --git a/dev-python/rosdistro/rosdistro-0.6.9.ebuild b/dev-python/rosdistro/rosdistro-0.7.1.ebuild
index c8c67d166d09..df8542c9a22e 100644
--- a/dev-python/rosdistro/rosdistro-0.6.9.ebuild
+++ b/dev-python/rosdistro/rosdistro-0.7.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
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index dd011e587162..0a1e7d71d3f4 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -4,9 +4,11 @@ DIST setuptools_scm-1.15.7.tar.gz 15426 BLAKE2B 6c23f2bd74f51ec8633a814ce22e63e5
 DIST setuptools_scm-1.16.1.tar.gz 28956 BLAKE2B 6721830e9ef171768afb94e6d6aacb829665658599409880e87c58e1bf2c6366d04a666ff60ed5d689bf376c258eda93367a4c52fe28ec694a3a93ac109db1fb SHA512 fd5017648c4a8af696e8528eab37061776e8495e2de3640f726e5e4347836eca5a13cbe54fc0c2223c3ae80ede1a81a6f3d9c0910a417545b9f9f206e5177a13
 DIST setuptools_scm-2.1.0.tar.gz 32776 BLAKE2B 7a141f3fa826a82931b6c33afd19d3185f98b735451c03651b875051e514eab287b20ee382a9576841b6f1283b9d1bf3dcbd0aabc41d2f1143cf960b856c8492 SHA512 69ce171aa4d3b576883efffb350c59f38bfe8b35bd8e4e8fa1128d9f8a3e6cfaab832633e91fada36126f8e7e2c18663fad621d62c9834be1b5d36c58ae1d1c8
 DIST setuptools_scm-3.1.0.tar.gz 35585 BLAKE2B 7ecbdf325467cb3e5217150c548b99603e1bb851a3bc8c694acf3aeb0da798ec853d13b29ad0537bdf5c1010834576786e0dde3965d61991554a12cf206ba7e0 SHA512 bd84bb02900ddc7de2f02dd7cb62bafdea7040ebdc2506b72d05f2c6a6d16be903321e576f63a04f2aa13d8c75b1834dec7d9ea8444e8330281f8e586a3d6426
+DIST setuptools_scm-3.2.0.tar.gz 39646 BLAKE2B 922e2e09a9826e8573900e8d279daf937289f91f8fead5230ea7082d85275d5d988d655854a36afd48d6b621eaa261ac9a0cd486acc115f0e389fb6828645e8b SHA512 1995754654f8bf509ec7f2186857ba0005dbaea0b1c734f521becb9d022c127e7b36f21da8defd5ec9883de5d0d4afe006f9d152c4cefe6beadf8b878e949eb2
 EBUILD setuptools_scm-1.15.6-r1.ebuild 1359 BLAKE2B 17342f793101a84d1b931b31a7e3e0a24f55efd7f19cfbe1a2eee899ee6771a729ad38f1b5c5b2c90548bd2fc9680bbc12c783553a9df629da158b41785bb937 SHA512 d68a939338f4a84bfd4638f3d48e93ec0462e996c473637e125911b512f2710f73850d69141f6c59431cbab77d51fcb6f61dc0952df81e6b08d60d21d3af4fd0
 EBUILD setuptools_scm-1.15.7.ebuild 1483 BLAKE2B f64003059ecd5ef861c7f8cec1429b877771f294daacda979cbaf42b5370a07a3453a9d59337c4656f319ee73ae090eed1bb6eafdb817d6ed0a53d7af97dff11 SHA512 8ba4dd34a36d82ebbb3ab3cbc62e35e6fbe6a7129723335d14d28aa0132101e715b4c9d07ec7f5093bfd8b8e3878e75b775ed24e963485b78b2b3011c418b69e
 EBUILD setuptools_scm-1.16.1.ebuild 1372 BLAKE2B f5503bb6c971ba9790136baa90cf49830be228a37a018f170ff92e464a65f135c76f15eeaeebe09c055b63166c2eb27bd87653de67939dd2d6a11fc487dafad1 SHA512 0943416aea652899892f6aef88ffc2db6828d41f2c647a3251960fe60126689e26f5b9b829ba50dc7a4829acb3eb929885d705fae19ac88ba8e083e7300151dc
 EBUILD setuptools_scm-2.1.0.ebuild 1073 BLAKE2B d7809dff4fbfed38ea8802e06ba5b262e41fdde30f3880c64374a40336b5efa4e6073814e5e66629c507bf8b07f0865b133c1244eac8ecba3121f66cfa5ed83c SHA512 e3bf8a2e849e49806405fe5c1688403581db804b51ba0ffac15b27bd4bcb5aa47577094a8c023b8238e643b0511c089d319107a0aa0396eab12a55e01075d421
 EBUILD setuptools_scm-3.1.0.ebuild 1175 BLAKE2B 94c27c4da2a127ff35ec649e80afea8150fc8621ded4db38e750954c4d3473e51f92d27ed16b062ec88700d3405eccbd8374845906078e2de615724f196b01d7 SHA512 eb0c03ec77fd44f0b00286e691ce82e723951e4b4c3a738b894c1fd2aed290f1391cf247028adde5336bee23b46f09c0f1da823f9fe30ae5965ff200ef59cc91
+EBUILD setuptools_scm-3.2.0.ebuild 1097 BLAKE2B b3fa24e38aa85e2bdec03292c6f058fd27e774105f8100a7c04057fbce1218e052287ab93021e067ea89647bde2fafd71499f96da5102419578beb34be9a8355 SHA512 a64261a766c42ed14dc8e165005260cc4a32b1ad48105e0a72260cedfebf04c629d47304347c6d9ba4a6e2d3c1a44bc009accc154f319635564199c7ee1892e0
 MISC metadata.xml 511 BLAKE2B 7ee7b4fe4bb93bca13880e9f6f2e0ae90a27fa79f1bb99395d234322a61de1b2f13906069bde898ad6a3f83e8dc03302cae1fe24eed92e1b7fe6e349b98ed957 SHA512 cf1e97d13c127fa92e8bc5e5d41bb308761c6b75f267969662162f50a4a1a9d9f80bd2cb037711d2f5c7204204ddb9873f21cae5d6831a3127f3cddee3878a31
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
new file mode 100644
index 000000000000..aed0e1975934
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-3.2.0.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} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="package to manage versions by scm tags via setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/"
+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-macos ~x86-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-vcs/git
+		dev-vcs/mercurial )"
+
+python_prepare_all() {
+	# network access
+	sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
+	# all fetch specific setuptools versions
+	rm testing/test_setuptools_support.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/Manifest b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
index 0c860077af8f..13d871d3fb87 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/Manifest
+++ b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
@@ -1,4 +1,4 @@
 DIST sphinx-py3doc-enhanced-theme-2.3.2.tar.gz 41894 BLAKE2B 9a38169b7e2c3331267f5c0a102d01cb0185689334adc98abe91626b27217add0abacde3422fe528588322ccc96f6976b80ce0e510cecfa80837d9b595cb2457 SHA512 efeeaf1bbb7f5557f5e1500dd0a49aa001b714f329f594e95676d8833eede7eb5e0fa978257caeab9630360b05f48132ffb00137262c7a5b663cae6a009ed42d
 EBUILD sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild 587 BLAKE2B 4459efe71b6df9dcfa41f10f57feac991edec9ee2549c4c3fd4bf0627b9fd60f8c9551978f23e46b66b4d66aec78530a6ce873287314ac9344c6c88da307cb4b SHA512 0c396ef40f70fc713ad1aba0bce2a35b1141ec223adb740a475ca98c9732375095cd81f17810ffb22f3e13bbc4fe55796bf1452035431f49cbe0392b3705ee2a
-EBUILD sphinx-py3doc-enhanced-theme-2.3.2.ebuild 573 BLAKE2B e92ee32474ac06a298de0302a3583cadc5d29fe33d0e776d5c7ab1c4c1d1b3895ea65a8ab5b530ccc220b1b0c615efcb369638feb1b96985baf6da2179e0c1c2 SHA512 7c48a41760511214e920735c5699fdf7b49faed4efb94ab45adeee2993998667b802d16580ce17e500c53c569346b282a8e24d2ab4a8ba7ee6700d973ed99f08
+EBUILD sphinx-py3doc-enhanced-theme-2.3.2.ebuild 574 BLAKE2B ec7596abf46909de7f2a90cd7e2d562d7d9d3c4f6a397a83a9747f916b98f55cfb2fc3f85fdfbbfbbcf644f692429a5b1398b39da69c73dc8d109171b85d8c94 SHA512 d19a5d86f6feb703f7994520fcd5468ea52a9354726e84c221b55ed726bd3e5023ffbccf75988d05a800589810ef3c709f37b3f7b87fe697d8946667d0fd2d15
 MISC metadata.xml 593 BLAKE2B d8e69d801973c15666c838797ca8b5bd746623b2bb2915db38e4b7461757abd2ad6dfdd95078348775c0494dfd19dc5937337b3cc9966bbce88a3711f014c3e7 SHA512 21771b0ca9695c748fe0fdfddaff603a296c671af1d1e7b097fdab104eaa33ea61bc4ff887f27f94cf0a76ff9a52ddbe7055167b5f651f954e78f318a7f9d9df
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
index 8721c79bd738..6c075c9e9343 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.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 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/tappy/Manifest b/dev-python/tappy/Manifest
index 3bce6506fb30..e9940b050b5e 100644
--- a/dev-python/tappy/Manifest
+++ b/dev-python/tappy/Manifest
@@ -1,3 +1,3 @@
 DIST tap.py-2.4.tar.gz 145440 BLAKE2B 1c6effe086c50cb8b11355db0439207330446a245c42420a948e1c3ff8caf917d9a76ea00f231199a5bd79e7396bcd2a904b764ffa1db611c57947274095a0b9 SHA512 7c843c40f0029bb122fdafec0f5416164b77fac69142c2308a6d815f2f409cddb33c5a08547409e278f06036e21cb2a53cbd3263c23f59c6618c12c201b8209c
-EBUILD tappy-2.4.ebuild 1031 BLAKE2B 11eaf565d85cb141c24295925c95ed7ba176f304f4173af7605fbbd551e86dc65cb1917dcca6d3f196f136cb69db4f9f72eacbc422de077373e5659677ec8c6f SHA512 0ad32c738eaddd1055b1e8564bf17b6c3cabbac37930f698fb7b30c68698cddb0da3a112d74498529019b9fff629937f68de075dcd0053250fc8e55c1742e1f8
+EBUILD tappy-2.4.ebuild 1037 BLAKE2B 8a5c874542957c44eae64a7ce9a9528ddc7f2acc996384dd04aa16f991caff7b2474069eec2696c19d362fad7e96aab1c6a217c8c4924eba6647fb5811e47f54 SHA512 be5690b8f67b23a050122969292b43f978aa6eef6e102b5ae6558dc6785be9c55524babdae4b4bc1cc8b5e7db0b5102dc830bea5d00756b5a46ade0147b1897a
 MISC metadata.xml 466 BLAKE2B e3ae71b2ade021aa7dac05316df1b14e1a483245103cff6aea76b6663735f5f9b2d772a7d75c6bd539da8bd1728f82639e324822fe86e1a5895b6729f455f8a5 SHA512 d43be4cc82a9795c36d9d39b37c92bd810148551a635879b802aee0fa87f833492a4c67c5e12c7b9d2cb800295242faf4157ae0cfa04269261a1b438a305262b
diff --git a/dev-python/tappy/tappy-2.4.ebuild b/dev-python/tappy/tappy-2.4.ebuild
index a8095b812977..07fc89b47ffc 100644
--- a/dev-python/tappy/tappy-2.4.ebuild
+++ b/dev-python/tappy/tappy-2.4.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 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test yaml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index be30856fead2..080782076f1a 100644
--- a/dev-python/texttable/Manifest
+++ b/dev-python/texttable/Manifest
@@ -1,5 +1,5 @@
 DIST texttable-0.9.1.tar.gz 11074 BLAKE2B 465738a7b980f2a216d63b268044c1a1b8c0deb986fd398f0ba0ae30ab84020ac6f179b5314a2071592c38443f9cb86387b9ed573342533af9e825000472ebe5 SHA512 7ec37336ef4b253879d0232dcdb4500cad33ecce1067dd7ea26c221dc2c003ee56360bdbd1dd1e00133301c51c67fb2fe9b1703628804a65f2a6ab8a1e830e50
-DIST texttable-1.5.0.tar.gz 10640 BLAKE2B 54bc7f1ac1860e2b88de092528134f8ba63b4f31f621a32e64a242b5f2d3132294818cff6bfdb848d4fa002d515069448dd077a95fa70bdf4e9266e162bb9355 SHA512 f4727947a302c8e1bf09ba08d73f79f083304b42f86f2f181a98f44602961e0b280aedd4e38660630671eac17e6eb92403b89c1ae6ea3cdd3cf861c122b904a3
+DIST texttable-1.6.0.tar.gz 10733 BLAKE2B 80a9b8a224ebaa37066df6a3aaccda6237224976076755b8f81a27eb20e3ef1c0811a529a877778b5ea7b1345ad16d510a7f3d9b6a1caadc582f34015faabb4e SHA512 df685004f24b8c1e7aa1bd6a44c658599805f1a0c6999a4a3e95ecf3a68499f515bea9cb5ccd54f5ee2563af15e9fcde2a7e1827934e4a1fc83c9ae2f5e88a52
 EBUILD texttable-0.9.1.ebuild 433 BLAKE2B 39f373d4876fc255d750d3be892e9f8b720c9f136ca9d89c6f46a3469860b640158c836fd21af37d3853bbb004e46bece4b4a103189d9f0e94c1dda6dfbb1b9c SHA512 ee3e2d6576e9bc93fcdf81e33d0a05d772397e3f662bf6a1ac0bf25e030a844ac7278bf4e2b8873360f0ad3e1ad0c3210f1bea9ea215416d32868d5e2aa9c552
-EBUILD texttable-1.5.0.ebuild 703 BLAKE2B cd137889f13e3d42425bfd5612bb8f3cfd22a0d0fd2463e3e39061ff5639e8dffbd12c5444ed635308d888b72041706ea1da2e494cab7b66ff381ac7f974e145 SHA512 fa42b524fe558249ed3b7bedd0dc6b7086f7f2ace148f3629f27a0a71d0672ab229e345f6de1d1d04ac71b2e7a81aa82f5bbb20da65cc709aceb6da0a16ca5d6
+EBUILD texttable-1.6.0.ebuild 816 BLAKE2B cfc4f43efaaeb97b990c5d1c57f25f46f2b4ce5b2a3508fd4031768a73e05f3c5625d4a90fc8b0df831b6a49280ebf4033bc7f3af10517a4a4c018533c7d86b8 SHA512 66f360079c65e95828b3207eb1ae068c3d0e6455f9f1cea9287f54dcff95768a64f10de484d451b8c3bce2f39ba20144a3c07a6b3975c5ddc3ce4db72570bcc8
 MISC metadata.xml 420 BLAKE2B 8af873837a719776cd0b19be2e7dd63656a8620f65dbd81d8b2e68c35ba17fa7c4ddf95dd60e53bb42912b475f4bee9ebee02b8312fcde789922ae9f08b77b0a SHA512 4c300a07ec0a6062c79428596fb523a220376d603105f5ae25e27911967d3212c60885f7f58d11167afc02f9c63c1ee5d57d20597bafe57fbbda32ff3bcd0740
diff --git a/dev-python/texttable/texttable-1.5.0.ebuild b/dev-python/texttable/texttable-1.6.0.ebuild
index 3b68d79f45a7..feb6ae0d9242 100644
--- a/dev-python/texttable/texttable-1.5.0.ebuild
+++ b/dev-python/texttable/texttable-1.6.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
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{5..7}} )
 inherit distutils-r1
 
 DESCRIPTION="Module for creating simple ASCII tables"
-HOMEPAGE="https://github.com/foutaise/texttable"
+HOMEPAGE="https://github.com/foutaise/texttable https://pypi.org/project/texttable/"
 SRC_URI="https://github.com/foutaise/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
@@ -21,10 +21,12 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/wcwidth[${PYTHON_USEDEP}]
 		cjk? ( dev-python/cjkwrap[${PYTHON_USEDEP}] )
 	)
 "
-RDEPEND="cjk? ( dev-python/cjkwrap[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]
+	cjk? ( dev-python/cjkwrap[${PYTHON_USEDEP}] )"
 
 python_test() {
 	pytest -vv tests.py || die
diff --git a/dev-python/tld/Manifest b/dev-python/tld/Manifest
index 637dfbffe8ad..f432eadaa273 100644
--- a/dev-python/tld/Manifest
+++ b/dev-python/tld/Manifest
@@ -1,5 +1,7 @@
 DIST tld-0.7.10.tar.gz 242027 BLAKE2B b72d673ecf4753f95d0bf8403abb296eef67b7aeea7233e1b8e3ae262667a252d7cd5125c8cd3a11b5422eded604ccc3c86fd7d5ae1a500f926b9fd6464b9acf SHA512 e144f2eb037da482965636cb14c1d0bd91f66d9836f1ea0662b1a34d6760fba7784f26a398d0a1fe0ae4f15bc79372dfd92d94eb624b04955320813b08ab4968
 DIST tld-0.9.1.tar.gz 479262 BLAKE2B 908be345720b2e8131c89fac9fbbee7137674aa036b99076e60352b5ff37f682c3f5dcd8bf4bade58fffeeebeb6cbd2924042db9da383373ba4542639189e1d1 SHA512 167629fc1f837c12d8baeb83b032fe10291ba5444373b225eb73bab515e46efe5f29f83acd1eea07caa54d6b69fad8238d531867f1956c13243bc1908961a4cf
+DIST tld-0.9.2.tar.gz 562143 BLAKE2B 6b7f3c15127d2a97240054b3ee53c628ebf3f381399f7b4460879cd0034dae4f944e33950cafeaf36ab222b9578146564369c0401dc8066d8092bc00ebeb40c4 SHA512 72e829efa48fccb7f8f771f7b84e98d7f38de8f214c26d25741448981de432bbe09f3dac646779135a74c8f3fd0669e3c371d2136e5edc3c2e3750fd5d5631dd
 EBUILD tld-0.7.10.ebuild 506 BLAKE2B d9b68a00294b7cf309469389fe3f20f253f549cd81d6a032534fc94604ac02572615b797f7e812e1c30937710d7ecadec448560a3ef1c48ef385b2879bfbcfcd SHA512 3238e3342bdee14dcce77e162e753498eea8f37e9ba3a00f90fe8875e59bb6ce1b5632bbb46edf3ef6ac014720435022b4020a3c6260c6b0d5bb4f535faeaeb2
 EBUILD tld-0.9.1.ebuild 506 BLAKE2B d9b68a00294b7cf309469389fe3f20f253f549cd81d6a032534fc94604ac02572615b797f7e812e1c30937710d7ecadec448560a3ef1c48ef385b2879bfbcfcd SHA512 3238e3342bdee14dcce77e162e753498eea8f37e9ba3a00f90fe8875e59bb6ce1b5632bbb46edf3ef6ac014720435022b4020a3c6260c6b0d5bb4f535faeaeb2
+EBUILD tld-0.9.2.ebuild 505 BLAKE2B 54391f2f16aaa90f948cb7f6fdc28244a5fd59ae795c4a640c790f0b155a35ceafc01c1067712b0bb089cab3f31c8e2fe4e09941b2f04de993b20bf6bc5b049b SHA512 8bec005b89a0ac3a0de3a1cea7fe26b74a7964e4f72968b0da2c2881a1bc31ce3ee2bac869965bc84acce5b692f61ad86a63ffc89314e4efa30c6d52c2a53e11
 MISC metadata.xml 419 BLAKE2B 48f0e2b96669406551c66e56225022f649ede7feb5e435e73b229f2fba514fd90cc1c542b34c0f31ce5f3bf7197c16188d83cd63542b7017caf114b2a1f0feaa SHA512 fd4fa0a5a30087e046f21cd68d7f5772b20a12f24ebc16641c45e28c1e033a4cf8ac99419f4a70f8d6e7997e6c612681c34e9e576632691ec443360effc75d40
diff --git a/dev-python/tld/tld-0.9.2.ebuild b/dev-python/tld/tld-0.9.2.ebuild
new file mode 100644
index 000000000000..13ac6558a491
--- /dev/null
+++ b/dev-python/tld/tld-0.9.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extract the top level domain (TLD) from the URL given"
+HOMEPAGE="https://github.com/barseghyanartur/tld"
+SRC_URI="https://github.com/barseghyanartur/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index f474db80a4bc..89a6dcd601ed 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,8 +1,8 @@
-AUX tox-3.6.0-skip-broken-tests.patch 1579 BLAKE2B 1de72f080eaab2b3da17dc5e2edfd5297072fc3cf03015113f633cfdf3596993197a75aab507b5c3b055bc7cc746093a1d0a5e95146d7a9ef562991c516eef07 SHA512 4f731f456bcf941f0120586d486c826970fdf9d28f475eba9e55d561a48c38ee43c4bb7551de636ea2f5f17c7267be3bacc949b1a5230c7c35f800efe2b398c7
+AUX tox-3.7.0-skip-broken-tests.patch 1607 BLAKE2B e25c18c9706914a8e7e209a7a9eaaa3407cd339b9d4fdfbfc13d3daf0598034b0f877491caa13fb21c777983e901ef3aa035b491b59aaca14f09c34af576ca55 SHA512 8a8b684ca56612016ef60df0082a71b0d21619600453f5f93f732d7676afa7785350a0d3d088146a5856820fe877ed186660968c54782b6aa14c79ad0ed879fd
 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.6.1.tar.gz 257471 BLAKE2B ab09a6e5f3a0de343dcea05008f6bfddc2be1e8949c5529c2a030dd4be32eb541a9d55037602efa58345210f34fa4d3f246d1a4260f7a9b77c0d473d8649673c SHA512 81edb0fc489731eb815f46cfa30677b077d4bb58d4e3e8bd7f887eaed3a2a950f7b49368af2bcb51ea07ca1821ff67145d543b8a370d642dd87d93952734249a
+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-3.6.1.ebuild 1216 BLAKE2B ce2e7c74af062bb7d2722252ae2fc538ad3ba2f7f1860131d2206b41c280e7529dbf06222694113265a3462e41445d709ecb2249a8d9f9ed267dbc9c2b62fae7 SHA512 74ab5fa44208967d5422ace3d3d4dffd2a28dc65fea349c7d66fdae778e3bcd80896afc7aabe88beae170d5b143f2ffe644247fef6984d6b5709d70c979487a0
+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/files/tox-3.6.0-skip-broken-tests.patch b/dev-python/tox/files/tox-3.7.0-skip-broken-tests.patch
index ea39bb30c1c7..db625d8846c4 100644
--- a/dev-python/tox/files/tox-3.6.0-skip-broken-tests.patch
+++ b/dev-python/tox/files/tox-3.7.0-skip-broken-tests.patch
@@ -1,7 +1,7 @@
-diff --git a/tests/unit/test_config.py b/tests/unit/test_config.py
-index 08a1ced..86e3fb6 100644
---- a/tests/unit/test_config.py
-+++ b/tests/unit/test_config.py
+diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
+index ba00b06..b1e7764 100644
+--- a/tests/unit/config/test_config.py
++++ b/tests/unit/config/test_config.py
 @@ -1869,7 +1869,7 @@ class TestConfigTestEnv:
          for name, config in configs.items():
              assert config.basepython == "python{}.{}".format(name[2], name[3])
@@ -12,7 +12,7 @@ index 08a1ced..86e3fb6 100644
              config = newconfig(
                  """
 diff --git a/tests/unit/test_interpreters.py b/tests/unit/test_interpreters.py
-index 0787b95..51e2ccc 100644
+index 9320a10..869189f 100644
 --- a/tests/unit/test_interpreters.py
 +++ b/tests/unit/test_interpreters.py
 @@ -60,7 +60,7 @@ def test_locate_via_py(monkeypatch):
diff --git a/dev-python/tox/tox-3.6.1.ebuild b/dev-python/tox/tox-3.7.0.ebuild
index f50b9bdddb5e..4a32bc04c976 100644
--- a/dev-python/tox/tox-3.6.1.ebuild
+++ b/dev-python/tox/tox-3.7.0.ebuild
@@ -28,15 +28,16 @@ RDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]
 	dev-python/virtualenv[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-2[${PYTHON_USEDEP}]
 	test? (
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
 		>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
 		<dev-python/pytest-4.0
 		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
 	)"
 
 # for some reason, --deselect doesn't work in tox's tests
-PATCHES=( "${FILESDIR}/${PN}-3.6.0-skip-broken-tests.patch" )
+PATCHES=( "${FILESDIR}/${PN}-3.7.0-skip-broken-tests.patch" )
 
 python_test() {
 	pytest -v --no-network || die "Testsuite failed under ${EPYTHON}"
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 63c63302b36e..760b4de31e7d 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -18,5 +18,5 @@ EBUILD twisted-16.6.0-r3.ebuild 5725 BLAKE2B 9a2e141acad54552c9829e85cadae44e620
 EBUILD twisted-17.1.0-r2.ebuild 5751 BLAKE2B 5239f81e689cf2be429c3b63e416de7ceb720c3f24e9ea95e3e830797c05fcfcd25925198ca8e4bd4c4c634e56c74af279008fc00358b09348eb8febd2b4dceb SHA512 4d9959e6183b5c5e6357958ef6d39c18194790b39f55fa85dd683dab620a4ae788ea9a95357ab2ed3665eff1eba13495556d92aa2628737e86bee30b5c551191
 EBUILD twisted-17.9.0.ebuild 6040 BLAKE2B 4b0f32e3625fe3e11fe8c0aa9d1042fbd82d445247b6e141df9ac169694daa94a3d2c74e2e56e09fa42b392c1aa7ef082cb27dcc5e4aabd3c898f1a644778348 SHA512 cc9a56891dd0abf1b8b468fc1c93a23c8cb5d04fd6ccefd714976fca211efb08d7eb4c25bdf64dd107605822ea5454602f45864c49dbc1846838e5ee7e5d7145
 EBUILD twisted-18.4.0.ebuild 5908 BLAKE2B 6591ec655032f44da6466ae85ae90de1247b93851f4d0087ccadca34cd16f6e1938940cc790b59b81782d8d77983b09db69b667ac5d1db52a700cc8591ae1f05 SHA512 07bb9eb0bfa661c90190bfeaf8887a4570bcba31e0e1b452c8d05f962e44b4d9e08a681c6cbcdadf2a2def6d0651d8560eb33bfa0f8b459a61a488c5c770df65
-EBUILD twisted-18.7.0.ebuild 5968 BLAKE2B c4b48f9436b6af5ac41c4c4ac8b2c292bc048ea7394a7c01abe199b8dff7412bdf06a1112c60ceed9c5248022f8f165817e1c379a76847ed2b4a6977c1427ff6 SHA512 5bb0d92c92e68880092dc9c358581cf9358957fa85ed0419776e2be88f354e4845bda13f285b9350bce392b4113dcb954b7a4df94dc9f55ff0aab5806985d7b5
+EBUILD twisted-18.7.0.ebuild 5972 BLAKE2B 24d2791db98100eb024e3bedd18de111620a3a281a94f735b0cd2595c87e04584a202e227ebe22f9b6ebfc1067df3b26bf9ffa385c2433890cca509920bdc780 SHA512 b840467de823bf335fe356ec041a8cd3a2811b9abee36646daac1318f02c3d4183b6c89ed39c70a980e6aafa12ca02165d4f10710b03a11f99f6d456d6fb3c15
 MISC metadata.xml 1429 BLAKE2B f6bf7279da38a837c80fff9f9319d5c2d3893fb4a5a17d731b170153d1c4e10479b58a6576d84fa59ae653794aa017862a4fcb11bf1bc6ca85c374e3b9dc7cd5 SHA512 1ddcc6bb727f97eacb712badf834ceca15a4544e340090622774bc0e781f2ce1a20a96f8b5018535998e9865204697a25ab84eff87c480246fe14e39ef9411ed
diff --git a/dev-python/twisted/twisted-18.7.0.ebuild b/dev-python/twisted/twisted-18.7.0.ebuild
index 2fd2dd5a5b6b..6e23ebe62d4b 100644
--- a/dev-python/twisted/twisted-18.7.0.ebuild
+++ b/dev-python/twisted/twisted-18.7.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
@@ -19,7 +19,7 @@ SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
 
 # Dropped keywords due to new deps not keyworded
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~amd64 ~arm ~mips ~s390 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sh ~amd64-fbsd"
 
 LICENSE="MIT"
 SLOT="0"
author	V3n3RiX <venerix@redcorelinux.org>	2019-01-22 10:09:44 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-01-22 10:09:44 +0000
commit	09351e78166b5e864197c4456ebae3f89dd0bed9 (patch)
tree	41a96399f56ed3aa399006871bfce4430db84aa2 /dev-python
parent	c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (diff)