From f9684452050527f66b517274c156ceaca3a8c47e Mon Sep 17 00:00:00 2001
From: "Andreas Billmeier (@STR/VW3)" <andreas.billmeier@streicher.de>
Date: Tue, 27 Jul 2021 08:21:52 +0200
Subject: [PATCH] from main archiv restore pytest-xdist-2.2.1

---
 dev-python/pytest-xdist/Manifest              |  3 ++
 ...pytest-xdist-2.2.0-services-conflict.patch | 31 ++++++++++++++++
 .../pytest-xdist/pytest-xdist-2.2.1.ebuild    | 37 +++++++++++++++++++
 3 files changed, 71 insertions(+)
 create mode 100644 dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch
 create mode 100644 dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild

diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index e9a6c9048..856c155b5 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,3 +1,6 @@
+AUX pytest-xdist-2.2.0-services-conflict.patch 1097 BLAKE2B edc3ecb79578f89e9ce5515e194dc16df34abc2685d9fb78cc5930f29893dbd9e145c95e5b1f58bf252710c57964ea00dc8b71e20fd0aa713e9b9ab2d8d29a93 SHA512 50155aa39d0a87be7a22d0ccf6c9d8eacc8ce4342baa3fd67839b3c5b4d05b31fef5786a60e15051de3000b3ee3494ddb48feba43850d677484e239ee4be8b02
 DIST pytest-xdist-2.1.0.tar.gz 66332 BLAKE2B ac3c19a32bb9153537edfcf55bc656011661cf0d166da1aba969055a398616bb5782534a12ba354175be722c070fcfb2013d58405048814a3d11434a314e38b8 SHA512 85c69d8e649a19de5639738eae4cb213dc7323d96883ec82f39ab51a196346edd9fadbaf97f9763ac0dea104bc123d521264a39d2701878edfa76ce7e5bb347b
+DIST pytest-xdist-2.2.1.tar.gz 64956 BLAKE2B 7ea18b0e7893000ed9d8718506a7b0f7cf45444196a23e3defec34639c2159b52c7a533ddbc0e0a9b3c3f1e0a867ad5c85e3549167e9b7049ce718646ed50717 SHA512 0732f5ffb56eead3d1aeecd37381c2d9c6ed22398e8e51e9358b562765d737ebde48ecb6fe9f90d9a46902dba1422721cb2c7bfc9fc13918aa2c3b8e6a5e48c4
 EBUILD pytest-xdist-2.1.0.ebuild 1147 BLAKE2B 5f8b2db3dda86e53857ae6155e4c13ec868f744b9113c012ee961cd651584f010125d3ae3539deb5b3bab106397211cea17de81f8c506e9d1fc7e2cc50a4f7b7 SHA512 c9ac3c5c1d0e4d728e0edaa5ae122248a0c6d7ef426573e50274385b0ccca14feb3dc4a1112e00f11a23bf8529a036430b8f239cfde386d0c9cc407dd19ba5a4
+EBUILD pytest-xdist-2.2.1.ebuild 924 BLAKE2B f6dc3fb9beede5a58e7d1ca112435f287b226bd78326bfd6ab2c6b74377da6770d462d4f7817ae9888ad756f43581146721e55be798f8e6fd41895311ca0805c SHA512 214b7fa4672bc009b6f5c5176f26912c888d5a5dd895cb0c100c3bfa11cc827dd093d2b7026cc456dc325caeb9464da1e4deeba1634fb732dccc72de78098125
 MISC metadata.xml 495 BLAKE2B e9b6fb711fef224e63b2b4c1137e46b1b0706d9c47f1bfbd2b3d9da78a5fa4d61fa9a78a94cf75a7e3e7b1d96ad15e6e38f00d3041e7ddda53a468139338b554 SHA512 e126cc5ef4e81af7c2cba1486988b0d119789763cc7d7b952fc6d6292153e7f1cbefd82fb472e7813eb0d4a65cfe15a9db662d59e661787d4ab8463d93277396
diff --git a/dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch b/dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch
new file mode 100644
index 000000000..2c911601b
--- /dev/null
+++ b/dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch
@@ -0,0 +1,31 @@
+From 082beb2ce0fe1f338311d85e656b962df8a16ce1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 15 Dec 2020 11:38:53 +0100
+Subject: [PATCH] Disable pytest-services plugin in test to avoid worker_id
+ conflict
+
+Pass "-p no:pytest-services" in test_worker_id_fixture() to ensure
+that the presence (and implicit loading) of pytest-services will not
+cause the test to fail via overriding worker name.
+
+Fixes #611
+---
+ testing/acceptance_test.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
+index c273bfa..3bea8fc 100644
+--- a/testing/acceptance_test.py
++++ b/testing/acceptance_test.py
+@@ -1025,7 +1025,7 @@ def test_worker_id_fixture(testdir, n):
+                 f.write(worker_id)
+     """
+     )
+-    result = testdir.runpytest(f, "-n%d" % n)
++    result = testdir.runpytest(f, "-n%d" % n, "-p", "no:pytest-services")
+     result.stdout.fnmatch_lines("* 2 passed in *")
+     worker_ids = set()
+     for fname in glob.glob(str(testdir.tmpdir.join("*.txt"))):
+-- 
+2.29.2
+
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild
new file mode 100644
index 000000000..a05d3a645
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} 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 ~riscv ~s390 sparc x86 ~x64-macos"
+
+# pytest-xdist >= 2 fails with pytest < 6
+RDEPEND="
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pytest-6[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/filelock[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.0-services-conflict.patch
+)
+
+distutils_enable_tests --install pytest