Merge branch 'edge' into next

3 files changed, 58 insertions, 3 deletions

diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 8f9696d28061..e02c6f6a8664 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,10 +1,11 @@
 AUX pytest-xdist-1.28.0-strip-setuptools-scm.patch 926 BLAKE2B 1943edbd4511b40b137ffbf27b67ef42218dce9c740c7a98e0c203a4688fbe8bc98bd3c15578dfc7c39fb5d4bb0aae7ceb4efa55dd8a633ab3bf3a80e69fbdde SHA512 43e6e52ca5e436b292f966d36c7276ca4d3dbc6f94c58eee014a357f18ce35a3ed8530b69418028f51311a465f4904c4ed52a279c910b1bb8469352238f162dc
+AUX pytest-xdist-1.32.0-timeout.patch 1864 BLAKE2B dcecdd06bc1e41a1206f5bf08cd19b5bbb35fb5bbf8e81aa188a75e43c648c68b052e3eb6e9041d1f92337a271e278cc60d4e9a7cbdaa43c0f155f5425373cdf SHA512 71520b9da47c272799c91f1856979bb087f7dda73bebb38f6288c2c688953853ce474e92608d84dc17316d22cd7cb78027144269662ce4cc6f62b923acf620ba
 DIST pytest-xdist-1.23.2.tar.gz 59932 BLAKE2B f2cf73914cf095217fb8b472f5e5f7918435c75f8da1694cc7ceb920ac3a7390d84bea93cca558ba26cf3d14a01815374eab9ea03a137a8a9f5dba2f2d4453a8 SHA512 4aae9a6d74e53a29630d0233d0a903d008023e322de726ef7ab7cf4865f428942f96cc65264e19726cb6213264edaa747da2cb6f368989417ba821f2a3f9b654
 DIST pytest-xdist-1.28.0.tar.gz 61486 BLAKE2B ef8157079ea890342cd566f327588148fa898a3404e3edcffb60ba8ba37d9473b4c2a47fc737f7bb074042c6aadd737ac51f348ce79a718eb446036016cd5e23 SHA512 89b8885103a944ae72535de40028db052f76631ade6f969489d3dc3a1a61a3233df6655d0905d9f5253f23740a15aea824b460c680e79c16f275b31cb2abd6ad
-DIST pytest-xdist-1.30.0.tar.gz 62286 BLAKE2B 8d6a79c123bcee81751f2dd3a87e1d8effc82ff48a701c8cf0014292e5df575136d25847794c8e9fc94eb88a37cb42c659a142212faf30b0d1a0b1f9f948d2d6 SHA512 978b67df2366d916db62af21f2c610ac5d2de43cecf3260ec9bf52f904098514c3052ce8ca2195c17addd4012f3c5d38ce8a701d26c8158142a821b0d0cf9122
 DIST pytest-xdist-1.31.0.tar.gz 66133 BLAKE2B 79fe5f3bcad3421c1c751ffe6e09f0da42d4ff7c0016cb421ffabcab167028ec41ccfb02bbb275564cd74b13ade8d6e79bbb70b34995f3bc9000604a1533df9a SHA512 b7960d20295232b251c8ddcc5a3b9d6e7b761d577ba11c2647b4b4b410ee5c05998cf57fa57208561eb3ea7c4914db1fd446173794589d8c8e8e79ff8e0ad3aa
+DIST pytest-xdist-1.32.0.tar.gz 67733 BLAKE2B da0ce4e43dc8752e4329ddcbc13a5f55f5bc120c13f39bb01916770d2dc1864197fd91f92bc55ba27cd74b0d837ac2d310980874cdf54761339b2cd654dd6e74 SHA512 f159b4653efb4afeff4124df484670d3c672e1014712f948390b25efc53096f8237258c83a5f1a9e688c52b4a756291cb731d37fdfa800707f556550a19cb0e8
 EBUILD pytest-xdist-1.23.2.ebuild 1038 BLAKE2B 1d3b0a9b09b92c4ca54420f8c080a84c975e070e8195243659bde9dd4de01641fbd702ac00b059edd90c430e503b976a8e228457d630dae827298c2b8cc6bbd1 SHA512 c49f37f82f8167652b5a354be76e05be6b6cf378af707ae5a3ff1b1bdd0ed6366c682f09062118443264324faa4eafa3b7f131668eb9180a8708cfd25d92f546
 EBUILD pytest-xdist-1.28.0.ebuild 986 BLAKE2B d86f45dbed162f88fd5b5e48ca031e922a95fa49a0d87b8eefc8686267a8dfa884bf202e0caa4c9d23dede106c0af69b05fcb119f8ee1feaa43ad6326308be79 SHA512 6d6f25f9cafe11725bd4403bf4fc5188860e29c0b70d05896b1198d93750e71cafdb9726eb046ff31fcb1aab84621e5dfec0c69e37e278bb2960abb09e6931de
-EBUILD pytest-xdist-1.30.0.ebuild 966 BLAKE2B 16872e25ce64a383b3f5c48297a10373f0b3e3e47c21ba22b3d024dae816711da4b1dc670f1d49ad9423ed459d0e254581f3db16a5a3e9ce712b8897e30c5b8e SHA512 578228d144d5a47fc64d68833a5997f35d06c707ebedd6e175ebd3842dcf4c0453e9c6b05deee68e724d80dbf298f9f9672abcd3d9d2cb025be001682c20b804
 EBUILD pytest-xdist-1.31.0.ebuild 952 BLAKE2B b101742aed03693b16217b08740cd559fa57749391eecb1fd16a6c18237fa456523931b96f2cf266db8bf36783c641df5f1f98c6a3e96f01f51c45c9a086c2de SHA512 1eb978bc6872b57a562c1d4268f02189c5f26bf7816ad14ba9d547fb995e0da4c93f9b8dc8558e926ee441307239d12b1632b4b4a836997c711e88717ac8a0a8
+EBUILD pytest-xdist-1.32.0.ebuild 1020 BLAKE2B abb938ff1f8b397c23573fe0e285b310d3137828c56757d3de9ac155ffa03c915fbc651c5ab8e9d42d352ab77c6e0d4966e6c26957cc6209cfc19e224ede997c SHA512 278ff0f0ba19b4ae832b462e995abc3352f2b15cc35e1ea5631baf162ed81793b413c28a51cb625d5998c2d8a6a8623a7e8c53dda5f73f63aea8b15d507cb29f
 MISC metadata.xml 453 BLAKE2B 9480ffb520fafac8b32ec407fb065a89b67c085c7474032528e6a7489fdb26d288228cb75a502e407d92f0e53283bda58c2632e552d4daf65d37b78d33b3598b SHA512 13ec72148a023c16de4b51f02f8a34f5a29ba26bae56aebd8a89ca7a90f249126f92096d138d41d770eb1053618e58679211f468e3136f594514a936f414b265
diff --git a/dev-python/pytest-xdist/files/pytest-xdist-1.32.0-timeout.patch b/dev-python/pytest-xdist/files/pytest-xdist-1.32.0-timeout.patch
new file mode 100644
index 000000000000..52fdc681dfb2
--- /dev/null
+++ b/dev-python/pytest-xdist/files/pytest-xdist-1.32.0-timeout.patch
@@ -0,0 +1,50 @@
+From 27519e8018ee199219ab223e0b31b76b4e950a2a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 3 May 2020 11:23:33 +0200
+Subject: [PATCH] Increase pexpect timeouts to prevent tests from failing
+
+---
+ testing/acceptance_test.py | 2 +-
+ testing/test_looponfail.py | 6 ++++--
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
+index b6a4a94..a089baa 100644
+--- a/testing/acceptance_test.py
++++ b/testing/acceptance_test.py
+@@ -332,7 +332,7 @@ class TestDistribution:
+                 time.sleep(10)
+         """
+         )
+-        child = testdir.spawn_pytest("-n1 -v")
++        child = testdir.spawn_pytest("-n1 -v", expect_timeout=30.0)
+         child.expect(".*test_sleep.*")
+         child.kill(2)  # keyboard interrupt
+         child.expect(".*KeyboardInterrupt.*")
+diff --git a/testing/test_looponfail.py b/testing/test_looponfail.py
+index 94fccd7..a6ebebe 100644
+--- a/testing/test_looponfail.py
++++ b/testing/test_looponfail.py
+@@ -284,7 +284,8 @@ class TestFunctional:
+         )
+         # p = testdir.mkdir("sub").join(p1.basename)
+         # p1.move(p)
+-        child = testdir.spawn_pytest("-f %s --traceconfig" % p)
++        child = testdir.spawn_pytest("-f %s --traceconfig" % p,
++                                     expect_timeout=30.0)
+         child.expect("def test_one")
+         child.expect("x == 1")
+         child.expect("1 failed")
+@@ -311,7 +312,8 @@ class TestFunctional:
+                 pass
+         """
+         )
+-        child = testdir.spawn_pytest("-f %s" % p)
++        child = testdir.spawn_pytest("-f %s" % p,
++                                     expect_timeout=30.0)
+         child.expect("1 xpass")
+         # child.expect("### LOOPONFAILING ####")
+         child.expect("waiting for changes")
+-- 
+2.26.2
+
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.30.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.32.0.ebuild
index b414d28e8faf..4d03af9b28d5 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.30.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.32.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
@@ -25,7 +26,6 @@ RDEPEND="
 "
 
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
@@ -33,6 +33,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/pytest-xdist-1.32.0-timeout.patch
+)
+
 python_test() {
 	distutils_install_for_testing
 	pytest -vv testing || die "Tests failed under ${EPYTHON}"