gentoo resync : 16.09.2021

4 files changed, 2 insertions, 124 deletions

diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index b6d7f66237dc..3ed441599541 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,14 +1,11 @@
 AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a0124dc4f35892b18ecbcce34280a00774012822fced0045ac7113a50f8f88d042b88e404dbf4d8d3760140c66a48daa3da2a44c6 SHA512 d34d7c1db57804f0d1ff71f3f51c9a736592945fdf564f54c0c20c398c86f08616eb21f75d77457a71738df4d254ec3d69e46aa3378dea6f7913933bcdf45c08
-AUX pytest-4.6.10-timeout.patch 1297 BLAKE2B 3a5b4005b1aff72b17a366283e692bca19ebd952ef1d5e10f6c702962cb20a83fec48cce5fb0cc35a8da47df2370e85879bf01b9e95f4c271d2d3241f9ea9545 SHA512 f1d2270644e43dfc2ff31ed900456c5707ea19a83447ab80a4d3013e44db36f726676917156930385547f8a75bdbc8835d46d7e6f3301fd51f187c281a5425b0
 AUX pytest-6.2.4-py310.patch 1288 BLAKE2B 7fc0054de8a991f71fec041372839b8df52da5e1d5ac88b9e813f8456892839e3bbd63d6f8593989d7912b24bc552fe5f3a83c1cdee5161333721531b1e9d3c2 SHA512 715318d9b6520e31df6399957d14c7bba608288152359101a84b20b139d289be584f7b87856bbdef4eb4b2c85415ae679a6c018caeab4f9d228a4f1cf3a8d2ef
-DIST pytest-4.6.11.tar.gz 952305 BLAKE2B af07adf5e8fc614b1fdb7b5673fb9c557ff0dd3f22e2f3bf853c643c5c8bd38f307018579299b700d90034a826db73a3e569857d6d6f7ac6646ace894b35a39b SHA512 6fddf4944bd9fab83024aa2d338d54aaf3d164bd5c7f634357376f3b0d2dab6a43d784e7fb567236c2d2f029151c5d9e2cb36c22e9b551c2c8823c52a2246e9c
 DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
 DIST pytest-6.1.2.tar.gz 1084943 BLAKE2B cbdf29c54118b5daf699f11fb674d37d5972a163a7a53f42f6ddf9224e2d8d9e84b9a88106d5a77e70f470ccbffb15c2cf9a939be69bc0a2cab1fc4c76054562 SHA512 6335e994c5273881c8d1c334fe6bfa9cd0a3e5c251f3d6a9332f7f7c1427e6560ff48d8f235b307ea5eb53491072daf30c41f566bb67b304354fd88d286c61b1
 DIST pytest-6.2.4.tar.gz 1118084 BLAKE2B 611db50e7432dfb6f8d212621a3803871fd8f6c05ec3cdefeb3958d0886f754326fc358a9a67bdb3f516388aab901b169c951471bf304adfb78fe457dc59d6c5 SHA512 43adc9a78e16a05f07e689e4557b63f2e0f4de5a1cdea6f24272b6a658a6b0a18721713cf46b5102cf2726ddbc4ffe131c39e652bd2511d285f40cbfcccc2289
 DIST pytest-6.2.5.tar.gz 1118720 BLAKE2B 9dfc87279617be58353566009325f929e6fa53d54fd4c665a75f3b359ab5415972d745a680eb85ab21ca9eaec84450bc1decd50566b0ccdf90d7551f3d03ee70 SHA512 7624563a9d967da4cbf82cfff90bae8c0cca07b32e291dc7c5efa787725ed1a255edd066bf0d5fbd89b8cbed8cf5b619fe7c7017f44a7f8a014e3310c06bdbf9
-EBUILD pytest-4.6.11-r1.ebuild 2471 BLAKE2B 159e689c5597088979d0d1d0e9be37b0128f2a3bfe54cd0bc11ab6c4d7c26fca121a0bdaeaa1621964aa24d8b03580f0a00663a1b77a6a62195d031deb1bc712 SHA512 4533c66af3f820c63437504655af8607923ff0b0d386a38073dd32eaacf0f47043d3b31e6cca1aff353aeef7b82ea747737270db1e8cebbcb2fe69750fe24898
 EBUILD pytest-5.4.3.ebuild 1938 BLAKE2B e40cc338970d931c7cd51b5a6377f5d73cae21789fcea2a6f2b401f92fb9dbe6e12c45b3357a10b76c0d6bc11708f35b8fc65a3b7084328b5664c0ad2baa6c77 SHA512 dbfc71f4a77d366a1eb55d38a1c8f209f6e6d42fe22d0604a5695d8e99faae05883b82fec45b7192399ccbc7bddc25997291fca9638edc01d961b292190d25e1
 EBUILD pytest-6.1.2.ebuild 1662 BLAKE2B dddcee1dba302a810b80dd9832edc6af6f044ab728497498b5b4b762dfbe383d7255fce15b0615c37c3857ee2353546de2ee6b7093b01651f43ad4df7cbbfaf6 SHA512 e9ba570887b4ff0889abc2db20b3de2e634be5ba5ba60679f45c466006d3f7626c329c65f427b1cc6ede1942d2786ef4da44528a82d8be09752e1e028dcad2f6
 EBUILD pytest-6.2.4-r1.ebuild 1719 BLAKE2B a6bb7f7cd393d8d5bff4d6f563f621328eaee18ed482e1dea2b14dcfc9540515868507eb769c2522d140285417f822db158c5f3598eeee62f001b73a9b37bf27 SHA512 71e8a53b22f5093b577be42a5a3cdebb1c2aefc77f4fac25ad8bf4d980c1c0b8cd1d09f7e9e6348df776814e180ca172a356ad4816f8f0ef05ad5cf5930d30db
 EBUILD pytest-6.2.5.ebuild 1550 BLAKE2B 1013687f0e76b7fe4cbd9de38fb74387d0c61198152d827015eeee6c2b64743dc88a3a836c9dc2c89b9679da0b5d7a0bd76c7ca3c86418756bc092769393ba25 SHA512 8f2e656fd12726497eff17782e9c452004a6d47492411ed096dfa7969904e2b7be45d7d61f30f6ee08a0ebbe76630b115ea570c4d86e6be8e717a9d686c22635
-MISC metadata.xml 390 BLAKE2B 2038fd5e5c5e05fcfcba51bb7cec7cad006e24767dbd57e39749b5871b3a1bb7499bd02cc04de3400ad4d1943297e7c67155433927948206564c254b3ac662c2 SHA512 b3c0b8a54997b02401ced267b0c8195521f8df94ede163173409843fd7ff9a13572b63199cfebec0c94829289fe060df45ff18da1142515ebc3fe70f0028dce9
+MISC metadata.xml 391 BLAKE2B 48d31ecb4c8b171ee4e84a58399211368ddc00dfb5dbe0999f96e03d744294cd4fd5263e90600c93d1f13c7da21052faef84b6d0d56709f3559e37b3392ca31d SHA512 6e9caa57eda23995d21df6f52c52d5868e1ff56abb6c1351ffc0fe14b771639473481a2630e659caaff83f0255379aa2d012175af52a0de41221b27d3ab2f425
diff --git a/dev-python/pytest/files/pytest-4.6.10-timeout.patch b/dev-python/pytest/files/pytest-4.6.10-timeout.patch
deleted file mode 100644
index 5bf9bcdbd8f5..000000000000
--- a/dev-python/pytest/files/pytest-4.6.10-timeout.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py
-index f1d739c99..72406b85d 100644
---- a/src/_pytest/pytester.py
-+++ b/src/_pytest/pytester.py
-@@ -1209,7 +1209,7 @@ class Testdir(object):
-         args = self._getpytestargs() + args
-         return self.run(*args, timeout=timeout)
- 
--    def spawn_pytest(self, string, expect_timeout=10.0):
-+    def spawn_pytest(self, string, expect_timeout=60.0):
-         """Run pytest using pexpect.
- 
-         This makes sure to use the right pytest and sets up the temporary
-@@ -1223,7 +1223,7 @@ class Testdir(object):
-         cmd = "%s --basetemp=%s %s" % (invoke, basetemp, string)
-         return self.spawn(cmd, expect_timeout=expect_timeout)
- 
--    def spawn(self, cmd, expect_timeout=10.0):
-+    def spawn(self, cmd, expect_timeout=60.0):
-         """Run a command using pexpect.
- 
-         The pexpect child is returned.
-diff --git a/testing/test_terminal.py b/testing/test_terminal.py
-index 1b2e46c7c..52ba80f46 100644
---- a/testing/test_terminal.py
-+++ b/testing/test_terminal.py
-@@ -138,7 +138,7 @@ class TestTerminal(object):
-             """
-             def test_1():
-                 import time
--                time.sleep(20)
-+                time.sleep(120)
-         """
-         )
-         child = testdir.spawn_pytest("")
diff --git a/dev-python/pytest/metadata.xml b/dev-python/pytest/metadata.xml
index f42d75353d93..658b076e7182 100644
--- a/dev-python/pytest/metadata.xml
+++ b/dev-python/pytest/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
diff --git a/dev-python/pytest/pytest-4.6.11-r1.ebuild b/dev-python/pytest/pytest-4.6.11-r1.ebuild
deleted file mode 100644
index f600dacc8d60..000000000000
--- a/dev-python/pytest/pytest-4.6.11-r1.ebuild
+++ /dev/null
@@ -1,84 +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_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="https://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.5.0"
-
-# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
-# support, which only came in py3.6.
-RDEPEND="
-	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' -2 python3_{5,6,7} pypy3)
-	$(python_gen_cond_dep '
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		dev-python/funcsigs[${PYTHON_USEDEP}]
-	' -2)
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]"
-
-# flake cause a number of tests to fail
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-		!!dev-python/pytest-aiohttp
-		!!dev-python/pytest-asyncio
-		!!dev-python/pytest-django
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
-	)"
-
-PATCHES=(
-	"${FILESDIR}/pytest-4.5.0-strip-setuptools_scm.patch"
-	"${FILESDIR}/pytest-4.6.10-timeout.patch"
-)
-
-python_prepare_all() {
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Something in the ebuild environment causes this to hang/error.
-	# https://bugs.gentoo.org/598442
-	rm testing/test_pdb.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	# In v4.1.1, pytest started being picky about its own verbosity options.
-	# running pytest on itself with -vv made 3 tests fail. This is why we don't
-	# have it below.
-	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
-		|| die "tests failed with ${EPYTHON}"
-}