gentoo resync : 28.11.2020

5 files changed, 128 insertions, 30 deletions

diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index e70aeb0600b4..ad8330a180c5 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,7 +1,9 @@
 DIST aiohttp-3.6.2.tar.gz 1076923 BLAKE2B 14327a0bc5b5fffdf436a4c3525e4c25d80100aa464ed652316f7724c2bea6de4ace6c27e8a2a8cf9d895673ed63ed52e8c958ad611636e1e524a4e40efa4735 SHA512 49bd3089158c05ff6312420190ccd7fed95efb4a18b8aff7497d5507c71c692080d6949801edabdcd95379ca8e6614398408118d72ff1e782399e059e2cfc1a8
 DIST aiohttp-3.7.1.tar.gz 1111777 BLAKE2B 03d16e8c9d64ec407cf7b6dbbf5547a88f528ab23e9e256559c11fc2cb6f568101f79dad89b0e5698fd02a3918051e4bc3c349e3ea4358ecb5de1543fea91708 SHA512 accdd588fdd7ba1792cf5e8fb67c6d5dd3e1c5382d9c9ece14e449d6f4f1c116975809d2dad786e0d472b3bb54e3b8c59722be871401a82cef5eff9c12f3c3f8
 DIST aiohttp-3.7.2.tar.gz 1111049 BLAKE2B faffc582f2c72ff892862b5b782da75b381e59b21b284b1120e4edb16f22b760f8cabe56261061e0049a5dfd041456076e294e942a02309e9b3d6b414facb0cb SHA512 2dd4f0264f1fb0801be366c269b73dd80b542e8e5bfe18a01fbdfadd0210022ccd6e3975be1be416551ccce82f42881e18735d5c6fc68a42b7452ab18e157dc5
-EBUILD aiohttp-3.6.2.ebuild 6771 BLAKE2B 85e3eef05753cfed581229163844a0514621658062944aaa52e26c007c77b69baf0e09af3ff7238038610a387e7825ad188f58de7c7d6b1bb858656edc44632d SHA512 8e7aac6bb100d108f4ea5888b1ce0717176906a6b5d742d7dff26b31929dd6fc265b2dbf93aaf9194e7d22fff431745e09dfebeb8f6e5be0c76c049f4dbb5e3d
-EBUILD aiohttp-3.7.1.ebuild 2326 BLAKE2B 5dea0384e478f85b0dec98c467e8b43698838ec2b85e59f4117165e3e2656a2835aeec34ee1e02770820c289a6ae1501f02bd0199678c4b4c6579cfc1604397b SHA512 5f0188310fa7a1cc934f3d6907ebeac015022446ea7392d7845689bfbcd0888d7faf721fab51b7d2076e5ec31bc63a9cdbf6bac857c5dfe7969ba99ace5bbfcf
-EBUILD aiohttp-3.7.2.ebuild 2348 BLAKE2B 5ebdcb55074a4022950985ada8792b0f2c92fe2f57093d3057a0f1c16fc96546924c5f2271c46b7fcd1688d3094019a6b50c16dffe63d22f2d7b4fe6b63f1b5c SHA512 d21aa1a75c2ae1f92e5b1940962e694358f2592034c8214b26413ac914bf0dbb18a397775a1f115c7e141d28bc5168563e74ed156cfd9225ec4f72cd3fe75e68
+DIST aiohttp-3.7.3.tar.gz 1113127 BLAKE2B 47d95565db1184c6b55a1e7d7a6df8cda872e4fe621f653e3143608f51dde2c7d30d00835da357dd7ae33f4858ad5778074dfde5261331a3539a5d6776ea1a25 SHA512 d1dbbe3cbdeb1a460f5030a08a251a7bb7ae7ec038ca93ba5187b2da1fe21b80ed6513db647ef382d2d92a3d527a34dffbd37f51aa1e8b65bb36d517304b1812
+EBUILD aiohttp-3.6.2-r1.ebuild 6857 BLAKE2B 733c733bbdf573fd4bfc1c9fcc44b4224f5913ee886abbf1908f3ffb258fe611babb6c46cc5ace49996875140cab24286e79e961f17b1af00093862d6a37f4bf SHA512 ecef2bd9d04e3d6dcb626effce1a895da5d5cb6354d522305484f4c33f4298bcabc7b0a08cda9e3dc89545c2405a021351e62c71f755c937123d345b8b7b4f5c
+EBUILD aiohttp-3.7.1-r1.ebuild 2479 BLAKE2B 32fae46276551e80eb35ec918506586419b3f8d15bcc06b0d2a4859bf403e3e38e8b3999301116054558d5e8a5665d149c9a205c2327a8cd227eac0c3e302887 SHA512 ed3e64ee8b04ead78a7c1f8cee5f4f165c6d61290a5d795fdeb44d30755cb5d1c5422b56594b3f38dd12ec39255bb63eab080dfa8da13b35a414b9942aaf7622
+EBUILD aiohttp-3.7.2-r1.ebuild 2506 BLAKE2B eed6db56a3d93185ca0018ae4337841dd20e9d90cada19bdab7c0a7575eb1f124ec4457546c13a83886f918c37f0b056d9a3363e2b4768aa8ec0ccab8822132e SHA512 3aaf70bb8ae5d84f3e387879b590ff830df5c3db952664d32cacdb92908afd96efce76103bb74af57baf4f9c68b0217202a02fc84785e152eefbefdbef6d4889
+EBUILD aiohttp-3.7.3.ebuild 2506 BLAKE2B eed6db56a3d93185ca0018ae4337841dd20e9d90cada19bdab7c0a7575eb1f124ec4457546c13a83886f918c37f0b056d9a3363e2b4768aa8ec0ccab8822132e SHA512 3aaf70bb8ae5d84f3e387879b590ff830df5c3db952664d32cacdb92908afd96efce76103bb74af57baf4f9c68b0217202a02fc84785e152eefbefdbef6d4889
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.6.2.ebuild b/dev-python/aiohttp/aiohttp-3.6.2-r1.ebuild
index 3221c80393a9..ef61f9018dea 100644
--- a/dev-python/aiohttp/aiohttp-3.6.2.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.6.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
@@ -23,7 +23,10 @@ COMMON_DEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
 	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-	dev-python/idna-ssl[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/idna-ssl[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
diff --git a/dev-python/aiohttp/aiohttp-3.7.1.ebuild b/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
index 19931a20f7ad..6494a6eada30 100644
--- a/dev-python/aiohttp/aiohttp-3.7.1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
 
-inherit distutils-r1
+inherit distutils-r1 multiprocessing
 
 DESCRIPTION="http client/server for asyncio"
 HOMEPAGE="https://pypi.org/project/aiohttp/"
@@ -13,37 +13,38 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86"
 
-COMMON_DEPEND="
+RDEPEND="
 	>=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.5.0[${PYTHON_USEDEP}]
 	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-	dev-python/idna-ssl[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/idna-ssl[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
-DEPEND="
+BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	test? (
-		${COMMON_DEPEND}
 		!!dev-python/pytest-aiohttp
 		dev-python/async_generator[${PYTHON_USEDEP}]
 		dev-python/brotlipy[${PYTHON_USEDEP}]
 		dev-python/freezegun[${PYTHON_USEDEP}]
 		www-servers/gunicorn[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.4.0[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		dev-python/trustme[${PYTHON_USEDEP}]
 	)
 "
-RDEPEND="${COMMON_DEPEND}"
 
 DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
 
+distutils_enable_tests pytest
 distutils_enable_sphinx docs \
 	'>=dev-python/alabaster-0.6.2' \
 	'dev-python/sphinxcontrib-asyncio' \
@@ -53,8 +54,6 @@ distutils_enable_sphinx docs \
 	'dev-python/sphinx' \
 	'dev-python/sphinx-aiohttp-theme'
 
-distutils_enable_tests pytest || die "Tests fail with ${EPYTHON}"
-
 python_prepare_all() {
 	# Fails due to a warning
 	sed -e 's:test_read_boundary_with_incomplete_chunk:_&:' \
@@ -71,13 +70,17 @@ python_prepare_all() {
 	sed -e 's:test_mark_formdata_as_processed:_&:' \
 		-i tests/test_formdata.py || die
 
+	# takes a very long time, then fails
+	rm tests/test_pytest_plugin.py || die
+
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
 	pushd "${BUILD_DIR}/lib" >/dev/null || die
 	ln -snf "${S}"/{LICENSE.txt,tests} . || die
-	pytest -vv tests || die "Tests fail with ${EPYTHON}"
+	pytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" --forked \
+		-vv tests || die "Tests fail with ${EPYTHON}"
 	rm -rf .pytest_cache tests || die
 	popd >/dev/null || die
 }
diff --git a/dev-python/aiohttp/aiohttp-3.7.2.ebuild b/dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild
index 0969fb26d76f..9e8be6e734f4 100644
--- a/dev-python/aiohttp/aiohttp-3.7.2.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
 
-inherit distutils-r1
+inherit distutils-r1 multiprocessing
 
 DESCRIPTION="http client/server for asyncio"
 HOMEPAGE="https://pypi.org/project/aiohttp/"
@@ -14,37 +14,38 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
 
-COMMON_DEPEND="
+RDEPEND="
 	>=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.5.0[${PYTHON_USEDEP}]
 	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-	dev-python/idna-ssl[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/idna-ssl[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
-DEPEND="
+BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	test? (
-		${COMMON_DEPEND}
 		!!dev-python/pytest-aiohttp
 		dev-python/async_generator[${PYTHON_USEDEP}]
 		dev-python/brotlipy[${PYTHON_USEDEP}]
 		dev-python/freezegun[${PYTHON_USEDEP}]
 		www-servers/gunicorn[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.4.0[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		dev-python/re-assert[${PYTHON_USEDEP}]
 		dev-python/trustme[${PYTHON_USEDEP}]
 	)
 "
-RDEPEND="${COMMON_DEPEND}"
 
 DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
 
+distutils_enable_tests pytest
 distutils_enable_sphinx docs \
 	'>=dev-python/alabaster-0.6.2' \
 	'dev-python/sphinxcontrib-asyncio' \
@@ -54,8 +55,6 @@ distutils_enable_sphinx docs \
 	'dev-python/sphinx' \
 	'dev-python/sphinx-aiohttp-theme'
 
-distutils_enable_tests pytest || die "Tests fail with ${EPYTHON}"
-
 python_prepare_all() {
 	# Fails due to a warning
 	sed -e 's:test_read_boundary_with_incomplete_chunk:_&:' \
@@ -72,13 +71,17 @@ python_prepare_all() {
 	sed -e 's:test_mark_formdata_as_processed:_&:' \
 		-i tests/test_formdata.py || die
 
+	# takes a very long time, then fails
+	rm tests/test_pytest_plugin.py || die
+
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
 	pushd "${BUILD_DIR}/lib" >/dev/null || die
 	ln -snf "${S}"/{LICENSE.txt,tests} . || die
-	pytest -vv tests || die "Tests fail with ${EPYTHON}"
+	pytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" --forked \
+		-vv tests || die "Tests fail with ${EPYTHON}"
 	rm -rf .pytest_cache tests || die
 	popd >/dev/null || die
 }
diff --git a/dev-python/aiohttp/aiohttp-3.7.3.ebuild b/dev-python/aiohttp/aiohttp-3.7.3.ebuild
new file mode 100644
index 000000000000..9e8be6e734f4
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-3.7.3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://pypi.org/project/aiohttp/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=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.5.0[${PYTHON_USEDEP}]
+	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/idna-ssl[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		!!dev-python/pytest-aiohttp
+		dev-python/async_generator[${PYTHON_USEDEP}]
+		dev-python/brotlipy[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	'>=dev-python/alabaster-0.6.2' \
+	'dev-python/sphinxcontrib-asyncio' \
+	'dev-python/sphinxcontrib-blockdiag' \
+	'dev-python/sphinxcontrib-newsfeed' \
+	'dev-python/sphinxcontrib-spelling' \
+	'dev-python/sphinx' \
+	'dev-python/sphinx-aiohttp-theme'
+
+python_prepare_all() {
+	# Fails due to a warning
+	sed -e 's:test_read_boundary_with_incomplete_chunk:_&:' \
+		-i tests/test_multipart.py || die
+	# with py3.7+
+	sed -e 's:test_aiohttp_request_coroutine:_&:' \
+		-i tests/test_client_functional.py || die
+
+	# Fails due to path mismatch
+	sed -e 's:test_static:_&:' \
+		-i tests/test_route_def.py || die
+
+	# Internet
+	sed -e 's:test_mark_formdata_as_processed:_&:' \
+		-i tests/test_formdata.py || die
+
+	# takes a very long time, then fails
+	rm tests/test_pytest_plugin.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pushd "${BUILD_DIR}/lib" >/dev/null || die
+	ln -snf "${S}"/{LICENSE.txt,tests} . || die
+	pytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" --forked \
+		-vv tests || die "Tests fail with ${EPYTHON}"
+	rm -rf .pytest_cache tests || die
+	popd >/dev/null || die
+}