gentoo resync : 23.09.2020

6 files changed, 3 insertions, 141 deletions

diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 0362718e9419..8112d7c3154c 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,11 +1,6 @@
-AUX pytest-xdist-1.32.0-timeout.patch 1864 BLAKE2B dcecdd06bc1e41a1206f5bf08cd19b5bbb35fb5bbf8e81aa188a75e43c648c68b052e3eb6e9041d1f92337a271e278cc60d4e9a7cbdaa43c0f155f5425373cdf SHA512 71520b9da47c272799c91f1856979bb087f7dda73bebb38f6288c2c688953853ce474e92608d84dc17316d22cd7cb78027144269662ce4cc6f62b923acf620ba
 AUX pytest-xdist-1.34.0-pytest4.patch 1839 BLAKE2B 6f16b51b8b8415390d66b5763afe038e035e22f4f5e2db637497284c52a0eb271d4fc2a9585414ca5d3e34354ca84e2f291b10344331cc1c25663d616f34c7d4 SHA512 d25119e0f26b4b9e97764c962c83e43ca5564e27f711374ee1d1932de0917b30671e29c98799f61bd436f6b560abbbf379a24ce79271c5dbc7ed4563ee145b4b
-DIST pytest-xdist-1.33.0.tar.gz 65588 BLAKE2B 096ffa9295ec0ef4d390b714b02a4d126aa33475b55591b91375f2da0c957802e007b990dc2051d5198f223b250a4a7294367c9da8f8969313a61a7e8ef18ebd SHA512 5e5b23e60b546779d4bbcc9b86c004bdb084689ba006c8bb8a7db9be60b6080f04a5bb2b1f5b43a5062b82e35493331d1da699d8a36177307280b06aa23a1367
 DIST pytest-xdist-1.34.0.tar.gz 66151 BLAKE2B ac5274e32b3ef6b72113efd4300eb6946a977e0e202d3383abcdbc022126b7806edb326ddc16abb1219e22eb091e06a9c39fce3031aaf5943d4ad653a47af142 SHA512 69e9877ee0268d71d7c0ca202ccc46b3ba1a9271f0e6e4ac4b76602833f9b7012364eb6924ae994e76c1d48d63adf1702d4c5e6ed5b75c52ac7ebae958210e24
-DIST pytest-xdist-2.0.0.tar.gz 65663 BLAKE2B 01f4154ae77c0ca67bef9cc0c36f9e3aea03ea554ba45ababb53647720795eae85e6c884eee6cd14037d566dc7bc46f49496aaaecfaaa31322b045339e6c01e8 SHA512 ad1e22ec6963e16f3f1408f0ed39c2945da8f8d2b332b29c36151bc1245e1b9ab532315d8315c22f93f249a64ab508fd78bccd5390be7315d962dd2382f63e0d
 DIST pytest-xdist-2.1.0.tar.gz 66332 BLAKE2B ac3c19a32bb9153537edfcf55bc656011661cf0d166da1aba969055a398616bb5782534a12ba354175be722c070fcfb2013d58405048814a3d11434a314e38b8 SHA512 85c69d8e649a19de5639738eae4cb213dc7323d96883ec82f39ab51a196346edd9fadbaf97f9763ac0dea104bc123d521264a39d2701878edfa76ce7e5bb347b
-EBUILD pytest-xdist-1.33.0.ebuild 1056 BLAKE2B 94e4bdef998cbe0fb49237c364223aa761247ebea7970720491113aaa11aaf65b8afa4cf11bae2be7ad6a980bd060bbc18ef0484c2803f67dec76fb192963b28 SHA512 64703fa61cd35fd69970c3574b38fda94fe534ab59949092d5da6551e9093596f00c0a0f896d862077f250eb8e934bc6a74c120c41c33b2a23aa2657abf8fc24
-EBUILD pytest-xdist-1.34.0.ebuild 1079 BLAKE2B 1820d596a247be18e633c0b1b344e3308868c5f30e5dbce843e55bf6205a8ebfd908968399708621adb038e2a591ce46442259e26c9ce44e8c7ed2b5c8b1b9cd SHA512 47e03af86ce46f3046ec8e9657bc5d908be52b9e746c68b1bbb01dc175782f4d9436956ab4f66c42ad162b50e5cec935a3257c2d511b883c28905a721a7a35c4
-EBUILD pytest-xdist-2.0.0.ebuild 974 BLAKE2B 787263f04153aa40ab2aaaa4387a88cf25eae00d5df9cde0540a5eb852e08413cd49bdfc0806206dc1c606dd2a319a060adea0f614049491d139b3210ed8bcab SHA512 0373a088d378678d4edfc9cff2e1ae2f3531e52c923c691436119af4c9efc87e7e2e445cbd5d2ed462bd00d67004ca492b5714975791879b58950c4c205ac429
-EBUILD pytest-xdist-2.1.0.ebuild 981 BLAKE2B a045f87ed0cb6327e537c0333bdc1a44c4073eec64f912643dfea9fb442778b314c3f3865ea84474493f6e2f52f05b5482d03dd932ad91e684fce8624be11149 SHA512 6edc1e05d9b7a6b8093c2ee71342dab41410382f0d715994965c8c11edf6dff0e5cf4bc1b9e4fd89076c78e47436581444a9b179a50bb84c7406bb271aaf7fe8
+EBUILD pytest-xdist-1.34.0-r1.ebuild 1036 BLAKE2B f576f44fdb55876e9cf7ccaec9ce5ffeede2095111a48f2455da590cc4c053ffac094b21baad142dc9ed54c654af423b29c4f7719dd32ff49da2d2f149e666d3 SHA512 3dc96e04f982a62f24f9ab9b2748dbd1a97c486ae3feee09b2e6fbd1ae4af6910455c456537453fa48d3cb85e03ac09acd7d26512a054e3aff83b5dc28591f62
+EBUILD pytest-xdist-2.1.0.ebuild 948 BLAKE2B 929903847fc4f7364e877526a1b0cc86f67914c1a2d398ca56b925cfa34054f73291fa24081880517b652ccf8b1340dfff980ef607f3a04e66abcc59e5946d93 SHA512 ce13c2b58cc23a5ce988d09fc1d8e91913446969030e28db095ff9e6dfc9838cac666df59bc976326679f75ae2331db09e37a6b3a2f7b68f1e02343041093dd3
 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
deleted file mode 100644
index 52fdc681dfb2..000000000000
--- a/dev-python/pytest-xdist/files/pytest-xdist-1.32.0-timeout.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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.33.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.33.0.ebuild
deleted file mode 100644
index 0a7311caa0e4..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-1.33.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# pleaes do not depend on pytest to avoid unnecessary USEDEP enforcement
-RDEPEND="
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/pytest-forked[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/filelock[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/pytest-xdist-1.32.0-timeout.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv testing || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.34.0-r1.ebuild
index d71a0fb7c1d9..4deedea4198a 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.34.0-r1.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.0.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.0.0.ebuild
deleted file mode 100644
index 454164201554..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-2.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-# please do not depend on pytest to avoid unnecessary USEDEP enforcement
-RDEPEND="
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pytest-forked[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/filelock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv testing || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
index 60bf4edb5e89..75f1a49f1a2f 100644
--- a/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1