gentoo resync : 08.09.2019

14 files changed, 242 insertions, 101 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a69eca82cdd5..57584b0416a8 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 84d88940362d..d53bc9df7379 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,6 +1,8 @@
 AUX aiohttp-3.0.5-tests.patch 294 BLAKE2B c535d85c0ad73394897db4db2743e3e6c09faa98a5a8a013b5b5b7af79adffaaa30f20a4cdff65760911c8f3ff373318e144d7ace6a7de6b0fa7b6cf9b8bf352 SHA512 0e5871efad3d360757fdd1ef723b741669a1e0b98728f58fe689b66b765dd4607e05a72cb618ac55b6a61cd53247916f9d497ca147eb7c8c86b8473a298a4b38
 DIST aiohttp-2.3.10.tar.gz 848324 BLAKE2B c32a7be3f3d9ba0bd1308c5bea779a10e177b9c018a03fb3cf95d1a1392180f3b4ea294dc23e2e946cc1065d16d212a169ec262a79034ae94b3a5067fbaf362c SHA512 e4ea725bbd3d7d749f2ec21eea1ff9f5c836fbeaa17ad72f77e378c69b008448e57503175bee6adff86110f65edc915cb6368df3011d1d9d61cf47718b086be0
 DIST aiohttp-3.5.4.tar.gz 1097647 BLAKE2B 27d3631cf33cc5052deecfeca23f6c052fce344d9a889b0c0c0e68d9dcc19eb56e2ef2496f025c795dea4f906a59ae579ecd489188f8c56bc41255b4f450f4bf SHA512 9bc31457029f7db5bbfe1e213c1f428bf90ac96d83b6d2c8838261a3910ab9f7632a4299618377acb1bed04b0cbb4b4f6d9ee814495c05f210ed9bb4f4c61714
+DIST aiohttp-3.6.0.tar.gz 1110800 BLAKE2B 30c583c5d9079dcc3481b917b51c09e40572228a2df3acab468036f22a75fbb21963805bc37d353c82cc81fddc6da85e9ae9fa6b4a0eb0c305de5428f48a05b2 SHA512 90a0c55b5f20fc7cc14d138fca93206a7b64ac069fbd81c77b5373985236c0c09b44bd167be58129ce2e4f2bdefe59891d6d52938f9fe04c462d4aea6af67d9d
 EBUILD aiohttp-2.3.10.ebuild 1716 BLAKE2B a2736bc15b41a4a29bb45ff422b86c30d886fbc80e968bf7b435045addf953bef80e24950e5ab6573e5e84f358f89c59d217e56c717a9e13aa06410f8d5e7a2d SHA512 541325c91470dc74f8f51843c5544efed81ad52bf706a8160f6fb269ae9c594a4c1f86f556b846998667b8996a80dacbc86bad968dbf5824fa81b509f3dc4049
 EBUILD aiohttp-3.5.4.ebuild 2194 BLAKE2B 5d8c82f63b0f6aff4f640da121266e99489073653107f912ac224ea78e5c419af40909994fc8d4fd3e825d0acb4c01eee572b6f7ce77088c7a53f2a988eee4a1 SHA512 35012568426f847ba852b26db64dcd3f6d535692bf897c75b822cc33b5b826a1c526f9f300bc3496b38beef7d940c785b3634704f8137d6a8ea1a2af9ff211d1
+EBUILD aiohttp-3.6.0.ebuild 2196 BLAKE2B 31e48cd677a296f32f3f8249fedf71d288eaddd62a7c46ead50729662c8c201994ad8cc3544decd04968784ef5a7baa86ff1daaf64b7f996367d0f4276b376f2 SHA512 592685e8a6ff8a6da602dc63659f4c37bc522ac5be1c7aa8edb6be96d224f57c41e6ea7dca9c462b5c4662a4a1db342ae5db38b1b6b7ac5d04ca3d7ba05873b1
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.6.0.ebuild b/dev-python/aiohttp/aiohttp-3.6.0.ebuild
new file mode 100644
index 000000000000..069ceaa89856
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-3.6.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://pypi.org/project/aiohttp/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/multidict-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
+	dev-python/idna-ssl[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' \
+		python3_{5,6})
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-aiohttp-theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/async_generator[${PYTHON_USEDEP}]
+		dev-python/brotlipy[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.4.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+DOCS=( CHANGES.rst CONTRIBUTING.rst CONTRIBUTORS.txt HISTORY.rst README.rst )
+
+python_prepare_all() {
+	# FIXME
+	rm tests/test_pytest_plugin.py || die
+	sed -i -e 's:test_testcase_no_app:_&:' tests/test_test_utils.py || die
+
+	# remove pointless dep on pytest-cov
+	sed -i -e '/addopts/s/--cov=aiohttp//' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index 986cf7eba417..57b73549fe96 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -4,10 +4,12 @@ DIST awscli-1.16.148.tar.gz 1227053 BLAKE2B 3dd32671fff511933703a418c34df8a0c71b
 DIST awscli-1.16.190.tar.gz 1283492 BLAKE2B 9030c7d1c992b15d816cb611a132ab6cc50e58576bc60120aa1de7b87cd863e530f0b46eecb7fb50f2aeab6e11cd840a330d59ad509f0936c4aab04d26432bdd SHA512 ffea030a45128e6e4fd8530488b9a3d8868915a7eb557144d82fd84e50b3ad73acc4b3217298539cdd3d8ac1ee57f9262930bf009357b21d5f5b4fa70ec021f7
 DIST awscli-1.16.215.tar.gz 1344712 BLAKE2B 408c30ec166d1614a6b877b0d88ce3c41668fe4c0e147c4a4df5652b5c9cd19735da8af857dba5534f84dc35dba1d35aaf2409ff68bfa4464e4abcdd711d26ff SHA512 16168fa034498df09587854e4c628b6b4e5ed589a7c023c2a48fb740715f14a2aba53bafa6dba7d6a16a50292f0bb19027bd5704901a009d95795c05cf71f5b5
 DIST awscli-1.16.220.tar.gz 1363235 BLAKE2B 9db063972092dee9d03cbd6567544df2c8c0fdcc57f447667b402903bd39c46ca61c3ee06e7c00bd37a99bdbc14847a86415ed2eb7621a5f57606c03ac602ee3 SHA512 b1c2d1e8ac41e92735b6b48f112b59ea869c210991511a51725b38223865c57bb64687ad6f1ef03ab620a133bc6afd1e530ea5f2912824097638c46926b7e3cd
+DIST awscli-1.16.233.tar.gz 1395357 BLAKE2B 4ebd3e51439891464864a2c8a089da96d3f33a77fe78810b073f746fa6015608f8650eb51c1b148c2cae6030f736ea2e6c01f3f21b2fe73bdc0878fd0215fea5 SHA512 356433221e352437d4f4997dd3a66a8cb866388ca480ef9ef405d8eb1d5d034d6a018c6b303446c07ff5b52778035e6b0df5922ca2fbfbb19628de3f04c9a34e
 EBUILD awscli-1.16.104.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
 EBUILD awscli-1.16.125.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
 EBUILD awscli-1.16.148.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
 EBUILD awscli-1.16.190.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
 EBUILD awscli-1.16.215.ebuild 1304 BLAKE2B 6636b1a295156b3dd5887c6eb734368f516c18812af8472c8954f6bc056d2e32c2c35261c180db714a2cb51e38090245ea792793a72345dfa2af5836c0dfd5ae SHA512 81e65f6f925ab25959a0c22aea53a341f4152be66c2af0168d0f934bff05ddbb57415e45f205325befb480ad741e137cf14f19a262f67d56cab38699dc930bf9
 EBUILD awscli-1.16.220.ebuild 1304 BLAKE2B a4687c4aa3cef1ce9c24d3c84353080684fc5547e3322b161b8216d1255625c137ed3f787a7fc24e12519c0e88b9b5d4a2a5aad450a1e8a40fb10cb2f8a37cb8 SHA512 61d3a69714931f89ac2710365ce13f847bcadf115b89bf30ed951e1347324b4a1316f814cf86f87184c2a0cfc10a353788b13b7db76173b7b2fea8cd1ce8902f
+EBUILD awscli-1.16.233-r1.ebuild 1306 BLAKE2B 2396bd7b7b0fd463f0a0faa560986dfef3735feefa34bae1e9e959c3cb190f4b27d52f02825267f46192a2a9072bb9e0cc52f94f618f455ba24eabc70d822dc3 SHA512 55fc153a697a5cc0afa048c042323cd938063e733516becfedd9080c3082a0bb390fdcd14dfbd3d851eb3c4f44c51a012e5f58f9be4911bc4c799560d305acf9
 MISC metadata.xml 316 BLAKE2B 29c8ad67f4e7c5db4439aeae00deda8b57bb36bea7bd6490ae60efaa30cd2db1f7b2cff5b21558cdadea05f9caa8a9f4ee580fe2ea80959fe6ef7ef6f740c550 SHA512 86b3359e64e41ac4f2216e5bbcee6468100df3cd6e9c25595527d6819a2c27ce327797163a3a43bab11516a4826cff47825449cb797d7fe845794700a3a2bed0
diff --git a/dev-python/awscli/awscli-1.16.233-r1.ebuild b/dev-python/awscli/awscli-1.16.233-r1.ebuild
new file mode 100644
index 000000000000..63afdae0e49d
--- /dev/null
+++ b/dev-python/awscli/awscli-1.16.233-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+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.223[${PYTHON_USEDEP}]
+	<dev-python/colorama-0.3.9.0[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-5.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/aws-cli-${PV}"
+
+python_test() {
+	nosetests -vv || die
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED%/}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index a51452ef1a4d..0963b8b7c96e 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,11 +2,13 @@ AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e3
 DIST botocore-1.12.122.tar.gz 5492931 BLAKE2B 05371245cd0de404713f920d0651f9bbdcabe9508c5e27f692adc4cda7ac2f7fba24b2b95a26b788e4960b01553c1746f08b9db4f38e4629c5703fd6872893be SHA512 f92581ac6b8a46d4af8b55b391e6e75c452f83a4ffde6c940c9f85b2215a3eda44e8b2672f469769b4d9a0d7ac2823540f45c1822279b6264d016986f2b06c53
 DIST botocore-1.12.205.tar.gz 5794632 BLAKE2B dfa0813ee1cd4d6d699fc27f2777da95b1719779bbb84f3d7d61da5c85b76c79286acfe304c598bade8d5320088070d1d69d99689f32f6efb05f04ffa66492ac SHA512 53d3770d8b771f3bbedbc0d6046cebec0b3961550c38ec29be4dd2b8c5f4da0150e70417f2070131746ab5c0df40ebce4ef6a1a2d6de0ce8d03e9928dbeeb594
 DIST botocore-1.12.210.tar.gz 5859196 BLAKE2B 4ce448ea4bbf5bc21b84395188a7236a0d9f18c87c98fa3269185a2d947dd84f78cfa43b1806f51783f6009e1cbfba2d8833b5e3e6633eb3c4185dfd5ffaab77 SHA512 85e0679597935ed13ddd85997156a424df5b32bed1c96c65f89cc9eafd653015f87f261a042574bd8773dc46c76fb38da4bbddb031f20226fdab708c2438b1ce
+DIST botocore-1.12.223.tar.gz 5892788 BLAKE2B 32a25636c7e3882e567daefeb0945863dd1b3c096d0c8459bec1814a371b455347ca7dbf21d8fffa5f3edb75fade36bd1dd25d86c23e2a01a3b465f769f53dde SHA512 1dde1fa483f9227f1048bf3e28bbb67687016d61a61781808dfdfb36b6024d680581423b5240d513c9d96e24fa94a762feb1aa44ef92bbb916974dbcf7c3127a
 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.12.122.ebuild 1489 BLAKE2B ae51526223136a8809a7c834cae3db2b95f940870ccc96b64d7c79dbdad83ca85e235cf169357fd25b4632aa0a87b0d8c7d7ebb739487435518a8a595b9139be SHA512 9c8e8400fad4fc0adef47bfa77767a0e59bef09c98a54492c0f0a56739b65b0689df8cf3702eab42e545a9dd257a5b820e39c31b9f23860f7792940dad4521b2
 EBUILD botocore-1.12.205.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
 EBUILD botocore-1.12.210.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
+EBUILD botocore-1.12.223.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
 EBUILD botocore-1.12.4-r1.ebuild 1489 BLAKE2B ae51526223136a8809a7c834cae3db2b95f940870ccc96b64d7c79dbdad83ca85e235cf169357fd25b4632aa0a87b0d8c7d7ebb739487435518a8a595b9139be SHA512 9c8e8400fad4fc0adef47bfa77767a0e59bef09c98a54492c0f0a56739b65b0689df8cf3702eab42e545a9dd257a5b820e39c31b9f23860f7792940dad4521b2
 EBUILD botocore-1.12.81.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
 EBUILD botocore-9999.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
diff --git a/dev-python/botocore/botocore-1.12.223.ebuild b/dev-python/botocore/botocore-1.12.223.ebuild
new file mode 100644
index 000000000000..f81c7d0b849a
--- /dev/null
+++ b/dev-python/botocore/botocore-1.12.223.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_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/mpi4py/Manifest b/dev-python/mpi4py/Manifest
index d6edcc10dda3..16d7d3197051 100644
--- a/dev-python/mpi4py/Manifest
+++ b/dev-python/mpi4py/Manifest
@@ -1,7 +1,3 @@
-DIST mpi4py-2.0.0.tar.gz 1279957 BLAKE2B ad75492ec09edbf6663a8962bcb4592c076ef47cdf8a9c14275077dea0abf4ce01f928d03eec80941fec37941c2ba99287263b71436baf7ed755a84cca2ea983 SHA512 6459b482db782fea1a80499774ebfeb09c828b6c3f1805a0ca306f26f3ebcac52ad1c83bb97a98a01b518b6a6c887f6b99dbda9c37381a5ce05ddff0edb16d81
-DIST mpi4py-3.0.0.tar.gz 1426843 BLAKE2B a68182c6abebac6af73654f04db9eba38f020793a9f6d0f98a5e4a483b0531e44aca3c853c20572123cc02331350bf98f8405ddd12b77e79de732f714437da9f SHA512 29ce8b7fd187aadd0bf8e1928ed00cac3e898ff82432b7a95984a248559b0d580c5af418b1986d83b17ad2cf8cbb45135afacf290ba4d9b75a62b03e9ca08e16
 DIST mpi4py-3.0.2.tar.gz 1429331 BLAKE2B 9e35749a82698ec656553583f01ebd8edbfb3b649c7693a9ff63f9f6abfa3fd41a54cbe4e3a1de55cbaf4dc626602706c776c505d0f5c0d82ebe88f2b4ceeddb SHA512 0a18332fd45e8e80b8dab0761fbaa30444a0d55776af7a2333be17ade827e92d04ac5bb8619ce26937142f344f75de0e5ef6dcb7502f33389716aa9482ddf5ab
-EBUILD mpi4py-2.0.0.ebuild 1114 BLAKE2B e8ba3c2d390b3cb89f4d6a265a14e1a37db4d64de254dc6e0226c12339ded13ae217b03f202bb4f673b73c8225ce4a02aeaffa0bc15acdc2ed19a28a4d911e9a SHA512 2660ff53f787c9ce1dbae757c79328d53062ec317a8d4e72435fc1f8887cbec601f054a879be7465e95f2e385977630289a0bb48f550cc15b9df2e219fcd2aa1
-EBUILD mpi4py-3.0.0.ebuild 1116 BLAKE2B d6023428513b82e92623455a695cf07cacc524ba73ef7d2d4690f87f7da2a630e340993a54961ab12d6812dda09c3ecff3ef92cd846fc75dec8e288c2b33f697 SHA512 cb974499fdb92c7b1b701811bc7c75ed691c7e97e777f4de68c2e1e6546a9ffbfa0271ffa6218becd870597140ac6f1d39b615d7e0d1b0b852e12c3dac0344a0
 EBUILD mpi4py-3.0.2.ebuild 1122 BLAKE2B de24136836cf2950379d83caef88191f3bae516b8ed71e1a8468ef2e4163289dedea04e1777b0348965a662b772c7e5967442e0eda9e52c0288d8cb335ccee39 SHA512 3d59953cf84783fcb3181ef9002d0e48a5d1d9279d3c3d985f47962b82db729b97ccabb2c13450f5c2124a38e60da54406f1026cb3e9ebfcc452285c1f5d27a6
 MISC metadata.xml 1118 BLAKE2B 0bc626a2106e628d7eb639e6ce90c4badb63ec2ea66b0322e7b83418791b7edc4bd443294fba3d31133812416eb4428b5dc47d074da3aeebf6867e8a0998d046 SHA512 7afb6d05007036bf5562d6d262165d8c2576bb49a86f9230f939d6a2ef929affa8461fa6421ffd8d97203a4425b397a8dd8556190364f29622e53a67674978c7
diff --git a/dev-python/mpi4py/mpi4py-2.0.0.ebuild b/dev-python/mpi4py/mpi4py-2.0.0.ebuild
deleted file mode 100644
index 3564ebdbd9b9..000000000000
--- a/dev-python/mpi4py/mpi4py-2.0.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Message Passing Interface for Python"
-HOMEPAGE="https://bitbucket.org/mpi4py/ https://pypi.org/project/mpi4py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RDEPEND="virtual/mpi"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-	virtual/mpi[romio] )"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# not needed on install
-	rm -vr docs/source || die
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	export FAKEROOTKEY=1
-	distutils-r1_src_compile
-}
-
-python_test() {
-	echo "Beginning test phase"
-	pushd "${BUILD_DIR}"/../ &> /dev/null || die
-	mpiexec -n 2 "${PYTHON}" ./test/runtests.py -v || die "Testsuite failed under ${EPYTHON}"
-	popd &> /dev/null || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	use examples && local DOCS=( demo )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mpi4py/mpi4py-3.0.0.ebuild b/dev-python/mpi4py/mpi4py-3.0.0.ebuild
deleted file mode 100644
index f2e754ef9223..000000000000
--- a/dev-python/mpi4py/mpi4py-3.0.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Message Passing Interface for Python"
-HOMEPAGE="https://bitbucket.org/mpi4py/ https://pypi.org/project/mpi4py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RDEPEND="virtual/mpi"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-	virtual/mpi[romio] )"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# not needed on install
-	rm -vr docs/source || die
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	export FAKEROOTKEY=1
-	distutils-r1_src_compile
-}
-
-python_test() {
-	echo "Beginning test phase"
-	pushd "${BUILD_DIR}"/../ &> /dev/null || die
-	mpiexec -n 2 "${PYTHON}" ./test/runtests.py -v || die "Testsuite failed under ${EPYTHON}"
-	popd &> /dev/null || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	use examples && local DOCS=( demo )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index 84f2b7d420d5..4f434c2be832 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,3 +1,5 @@
 DIST trustme-0.5.0.tar.gz 21232 BLAKE2B 3804fe4e9b7049da0bab926bb1180af6bbb8f882cfb16109bed040ca50c85e7b83b5468c3388dd8478ee9fc6478523bba98c39b74cb76c86a72761a26685122e SHA512 7ce5041b8d3687fa462fe93e55b2f83549ab805cec4a2a94c9178a02af557cf8900fe6c05bae0bf100eb36181952fb2bc31cb1d4d6ad6ed2fd2b0706d569518f
-EBUILD trustme-0.5.0.ebuild 935 BLAKE2B c852809a40a3fc5cacbde6b1b4d720ccf5c219c620f0ca62372c276d6aa69504401c25588c6dff68945cd34278db3fa39f952e7bd340f7ac18f839b184c97487 SHA512 7c13729c43a8d8f44cba8fb40682055f7b545ec878f6ca8bac7f19d5c4bad7671863f32b0a50eefb68008ef8d26b48a1c16c05e83b05170c9f7fb29527d66be4
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+DIST trustme-0.5.2.tar.gz 21819 BLAKE2B 68516eee909851f16c092cff580b1267e57aad5641014c7e1ff5da98fc328e1e392cf0e08d1965be062f2be1c16de735ddeff2dfbb2f20b1bb34498a1b048861 SHA512 32ab33a82752228aad200203b7b217f9b9da970067330a273c9ff5c13c8ae15ef20c39e61fc9cd748b7030691ef4b003f279a50374f59b7743c4c90aeca56a22
+EBUILD trustme-0.5.0-r1.ebuild 940 BLAKE2B 65aca1b1d83262d5ecde5526acebb0257b0bb4a5df3ed406a8abc43bfbc3035d8a49534397cd06f711a53422ccd95cef3f1df4d44ab9414691c14d22d4c7de5f SHA512 b332c51b7dbb0b8f6fdbe33865b3ccf929b6f91ea8fb6b198580b2cd6e4a776e24833a67978a2d7ae4bd751b983916931a85075b01c10926849478846c618d1e
+EBUILD trustme-0.5.2.ebuild 976 BLAKE2B 7fcbd480777a9861053c69779d4e93cbdc68305421643cf9f5850a99d9896ba3301d78d09bb4c2a2cab2554e960a14d2def863b09fd80d4bdb2ab39f1e05825f SHA512 f5291937f87fb8b0297714ca716fdfb9d6588426beb8c2455888253c9d07478fb5c21f580d167be82e8e18f8c18e23a4aa85d9afea5e9442a94d2486a099b5a9
+MISC metadata.xml 349 BLAKE2B d750432001725ac1266b82b174011a342b115739dcce7a9ba4da4465a907f64620f0e5e4e38cf6b41beffc4021cfd070b1f68b6da88f2a309f44c45d23b4b40f SHA512 6152f78467097c2e5ed0c65dbdf6bcedd84310b74c9ee92efda96fb855db3f0f990387a48f58f34e2c9f4769bc0f7a28b1c6c4be7e9561f6a3c4a22fa279cf0f
diff --git a/dev-python/trustme/metadata.xml b/dev-python/trustme/metadata.xml
index c36c37139fad..9f8e145958a9 100644
--- a/dev-python/trustme/metadata.xml
+++ b/dev-python/trustme/metadata.xml
@@ -5,4 +5,8 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/trustme/trustme-0.5.0.ebuild b/dev-python/trustme/trustme-0.5.0-r1.ebuild
index d316b2809a5c..9f868768a873 100644
--- a/dev-python/trustme/trustme-0.5.0.ebuild
+++ b/dev-python/trustme/trustme-0.5.0-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
+RDEPEND="<dev-python/cryptography-2.7[${PYTHON_USEDEP}]
 	dev-python/idna[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )"
 DEPEND="${RDEPEND}
diff --git a/dev-python/trustme/trustme-0.5.2.ebuild b/dev-python/trustme/trustme-0.5.2.ebuild
new file mode 100644
index 000000000000..ee3f8b306297
--- /dev/null
+++ b/dev-python/trustme/trustme-0.5.2.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_5,3_6,3_7} )
+inherit distutils-r1
+
+DESCRIPTION="#1 quality TLS certs while you wait, for the discerning tester"
+HOMEPAGE="https://github.com/python-trio/trustme"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' -2 )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' -2 )
+	)"
+
+python_test() {
+	pytest -vv || die "Tests failed under ${EPYTHON}"
+}