gentoo resync : 19.07.2019

3 files changed, 87 insertions, 2 deletions

diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index dc0c354ea172..3477072114b4 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -6,11 +6,13 @@ DIST aiohttp-2.3.2.tar.gz 841030 BLAKE2B a291baa1c5e915815ec80ea1cbd8434b31f4098
 DIST aiohttp-3.0.6.tar.gz 738111 BLAKE2B 28a3560a7b351ee974db8bbdd372798e01696e66660b6330707c542253c4d8a0405e6e8c2c8ec03c3b0ea8b548516ffb2dfe14b800b5f17e908991244bfd9335 SHA512 43f1b3c2da1bc57ac6e83a01abb3568b71ed5514e9331aaba4b691ff036d2d3e72eeddadd0f2f20608fa1f622a673ce1d4489bced2096ae546a350ad5f438d0d
 DIST aiohttp-3.3.0.tar.gz 722307 BLAKE2B 3bf1906e8a518d443a2f1bfff536fe9c4024dd18d12ed791dd4a81cfa3f81260bbbf293ae093086fa45c068f3417bcc797d1ee01e64a890a9427944ac9836760 SHA512 e7dd320abb0d9baa0dd583ce034b2d2dd328aa37750197789207e80eabfaf1e998a58e9aa0a6b98ff213f8c78ca90b85698ac559c57f44ce1b643fc317735a4b
 DIST aiohttp-3.4.4.tar.gz 822110 BLAKE2B 808c125f0d826b11d5b333ecfc35ed15cfe5a4f4242df5dd1b1e8edf6502c78d6162ad21e4fb7026294bc7013251a3b55d50c9cf34539b06b32348be2b1627a9 SHA512 968b701b8a19aa445a4af402f4bb38754565e3b80b4248127e5017671c921c370eea63fcec4148b7229ac1a74bb8739f33513abd6cb7fe02f3feddfd3ec1a6b1
+DIST aiohttp-3.5.4.tar.gz 1097647 BLAKE2B 27d3631cf33cc5052deecfeca23f6c052fce344d9a889b0c0c0e68d9dcc19eb56e2ef2496f025c795dea4f906a59ae579ecd489188f8c56bc41255b4f450f4bf SHA512 9bc31457029f7db5bbfe1e213c1f428bf90ac96d83b6d2c8838261a3910ab9f7632a4299618377acb1bed04b0cbb4b4f6d9ee814495c05f210ed9bb4f4c61714
 EBUILD aiohttp-1.3.3.ebuild 1538 BLAKE2B 0a09a1834fdfa7acda3b6aeed04217f71d01b5db13142f5c2c6261c7e33d6dafbbecfd2bc4ef667960dfad9bc953d2398541811c4ff6093b3358107ec25fc051 SHA512 2fd4ad6d6f98ce4b66d6b9e4150ddac9cadc7664a40ca93ec0059e0fc8b846ba5fc94b372211d65704ec386800a48a40f4934670796fd1408524f8f1439a168a
 EBUILD aiohttp-1.3.5.ebuild 1538 BLAKE2B 0a09a1834fdfa7acda3b6aeed04217f71d01b5db13142f5c2c6261c7e33d6dafbbecfd2bc4ef667960dfad9bc953d2398541811c4ff6093b3358107ec25fc051 SHA512 2fd4ad6d6f98ce4b66d6b9e4150ddac9cadc7664a40ca93ec0059e0fc8b846ba5fc94b372211d65704ec386800a48a40f4934670796fd1408524f8f1439a168a
 EBUILD aiohttp-2.3.10.ebuild 1716 BLAKE2B a2736bc15b41a4a29bb45ff422b86c30d886fbc80e968bf7b435045addf953bef80e24950e5ab6573e5e84f358f89c59d217e56c717a9e13aa06410f8d5e7a2d SHA512 541325c91470dc74f8f51843c5544efed81ad52bf706a8160f6fb269ae9c594a4c1f86f556b846998667b8996a80dacbc86bad968dbf5824fa81b509f3dc4049
 EBUILD aiohttp-2.3.2.ebuild 1583 BLAKE2B 4f4268a8b8a32d4d8aa4f982cf386575f9aa00852819d07e08e4e128dae10d7247585b5ef798d58fd687eff109e70da671902b91073962bdbc3b2b19c8cdfddc SHA512 3dbc911cc0ed37b993a398722c9314636cd39aef0f2a47a58e825d5df90bc49a239d6d30192304b120a87d837968f21047b85faf108d9af94bce3c60d9638ce2
 EBUILD aiohttp-3.0.6.ebuild 1833 BLAKE2B c0d3a1c13ebd7699ae2d506e78de5df605cfcebcc5c25d06aa5d696e534768dea9a0439cb6dce1aec76c042a07f852e87a228f6b1b8150a8b3f3347f8d914e9f SHA512 67b964d4905c55423ed6a1ed30db93b8439a69d0ec1b3d642f4c9b79da669dcdf4cb012c750c34a616e23767df5a1094218337fc5037a29ea35b87e775755bf6
 EBUILD aiohttp-3.3.0.ebuild 1833 BLAKE2B afc0463eaac8b5bcf7317616a3dab30adb223792c64c7516a528c235e53e72e8254cccfc9c2ee8693b83e56c26ce41dfe0107736d00dfce169d587e7541fbd3e SHA512 5647745d6f7225498f8ff20a13cc050d6e6a45091f5e84b411075ea686772971ab3d82cdfa175353b50d567a01ee9002694b45e5fdf52bcba113ec116d946daf
-EBUILD aiohttp-3.4.4.ebuild 2102 BLAKE2B c01efa97ed06a1ecd37a0f13e04a9eaadc32a5742fcdaaa78c6a76c65feae1a241e137c097515d9505469c89a15f34620b7e17ed47e498c006d5da6f9948afe4 SHA512 a183aada3345f04a0290ecba5a0ef574af152df596e3de2b262155b3210b1fc9638348538c7d5ed0cf3b2e6002f026b472b3e185fabd412b365cfa38d69fed1e
+EBUILD aiohttp-3.4.4.ebuild 2261 BLAKE2B d2a2ed87c1966d02a25a3d644e3d6b7ddb51fbea0cb8f9db507fd59b562ed297f6bd86f47029cc65b9b6d7b126627776f9892f4f02c279cec89bdab60b452a13 SHA512 57d9346f6372cd6249d7cfb6887db812217868f59170dffc342d45caedf9f04ae716573fc6b583ceb966cd144790237b7f5dfae82a157de65248f49e45394c19
+EBUILD aiohttp-3.5.4.ebuild 2184 BLAKE2B 24418040a58103cfb951e19b24aed1d89ddad4a9ad7867e84c99ef2f12bc8002fd132242e5cec3a16b8ceb45631650cbb0c731eba5c6b0a45b730fed43dc3713 SHA512 3c00cc5f0cf954e85a818ce6f604f1e1686757198648b83fba3a278405953e94784e06c70079aeb71e319dbe97d4b5b702cecb2344b0609da0eff924c224657e
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.4.4.ebuild b/dev-python/aiohttp/aiohttp-3.4.4.ebuild
index 2cd4b9b624ed..ec6ebeb0b474 100644
--- a/dev-python/aiohttp/aiohttp-3.4.4.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.4.4.ebuild
@@ -15,6 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
@@ -57,6 +58,8 @@ python_prepare_all() {
 	sed -e 's:test_compression_brotli:_\0:' \
 		-e 's:test_feed_eof_no_err_brotli:_\0:' \
 		-i tests/test_http_parser.py || die
+	# make pytest warnings non-fatal, to unbreak tests
+	sed -i -e '/filterwarnings/d' setup.cfg || die
 
 	distutils-r1_python_prepare_all
 }
@@ -66,7 +69,7 @@ python_compile_all() {
 }
 
 python_test() {
-	esetup.py test
+	pytest -vv || die "Tests fail with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/aiohttp/aiohttp-3.5.4.ebuild b/dev-python/aiohttp/aiohttp-3.5.4.ebuild
new file mode 100644
index 000000000000..3b9fe39c93de
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-3.5.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://pypi.org/project/aiohttp/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/multidict-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
+	dev-python/idna-ssl[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' \
+		python3_{5,6})
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-aiohttp-theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/async_generator[${PYTHON_USEDEP}]
+		dev-python/brotlipy[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.4.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+DOCS=( CHANGES.rst CONTRIBUTING.rst CONTRIBUTORS.txt HISTORY.rst README.rst )
+
+python_prepare_all() {
+	# FIXME
+	rm tests/test_pytest_plugin.py || die
+	sed -i -e 's:test_testcase_no_app:_&:' tests/test_test_utils.py || die
+
+	# remove pointless dep on pytest-cov
+	sed -i -e '/addopts/s/--cov=aiohttp//' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}