gentoo resync : 31.01.2021

6 files changed, 4 insertions, 172 deletions

diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 837152190372..25ceae12fe40 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,12 +1,7 @@
-AUX pytest-cov-2.8.1-disable-broken-tests.patch 763 BLAKE2B d36ec8acb8329cff8619f22cf485d2161d3ddda7740eea7f1516b5fee6e70bc597b1ca5ac79514be06eeccbd22a458381282622404152e7a41def6af3c3b15a4 SHA512 fc301e116072b7d77864f51a973b20274034569015c198fa8c05efa09d5863bbe9534d1ee1d2170a41485f914f4006cc6818332df76292aecb7e229cd61c7a63
-AUX pytest-cov-2.8.1-latest-setuptools.patch 1247 BLAKE2B 24ac573f41ea6beff690330b26900e99f7454bbc74bb868246055bbd5ed9385f7fff9e72c4222c855dcfcd06e1cab6ac322ec9c085c3b3fdbb12137f8f64455b SHA512 699c4e0e5e3f0b8b145946fa319d19be4ddd42ab7f565af875ca37df0aac222d2b0af50f13ee52f19cf01c9e799a8b7e60ccf114b59530731f820c91311b1b5a
-AUX pytest-cov-2.8.1-python38.patch 2522 BLAKE2B c09196ac945cd4b00acd75e45987be12ad1c8c251b679135fce1c2356d58396bc11b986f6d65ba0b946f5008eae70dcf18ceed68ba1ea50cb39bce303e710912 SHA512 3bd1fc80cfc76bdf643ed00bb59ecee1ceaf3c838f851cd65f844a5297ea33ab514ed441a5807ce6424ac461b10b629a8b6885851cb80336c5836c5f72ca6271
 DIST pytest-cov-2.10.1.tar.gz 56822 BLAKE2B 45eba205a2c6687882445d3554cedc04ad556854f5eac8eb0fab7fda84cdf2736b034dfdceb664293d1add153a5271403eb94585a863676ccfef9ab09727d165 SHA512 2dd575141754a417f34b414ba7e07291c273abdc63a6b7dc72d317c6ec10076b83c2ad78eeefdda7cee1fd6f56932d838602da4dd760a1c0d12095be94c22568
 DIST pytest-cov-2.11.0.tar.gz 59018 BLAKE2B f2ecaff439e701c3b7d029e4c51cb019d5222a083815ae5771341b0fa0f1b658f921a6eab75c0b568b630cc7ca75887f25ae7fb6fcaa9c2e8dc419397c4c799a SHA512 001f4975d7ad1a573354074366f983887ec9035bcc29afe9bd1ae2654fab520b8f479c5037936e6131749e5205077e937304e73d366cb43460db1f24a58b02be
 DIST pytest-cov-2.11.1.tar.gz 59143 BLAKE2B 21aeffbc9ccbe6a7c69a08fe3f0013204eb039c6dc9ddbb364a74ad10764e16ce7be0154e27beaab2c8f9b2a972131c4c2421c4aa4557efc18318556056a421b SHA512 19c465f5972ee0ee3b9a2f1a656fdf5457622cb449f73a6f707d377a617807dadda997a6875f0c081bc4c4f7039559c6e7ce820b818db42dfd053c016e1c3b4e
-DIST pytest-cov-2.8.1.tar.gz 47661 BLAKE2B 590fd50b69d01a71b20982d8cdbed0698ebe24c290d791bb44c96aa1aaaf77cf1f379d565eb775864c6945facf6d271115236cb44b95e4a4c9bb7cc6fd591acf SHA512 769a17c2095dbe990df148a0105c9e3dc88ac2265ac77ac31448dab6abf6d8cc0d54f5c6ff01fd708bd38700bfea93f57d3bb702bd9bb0a708257d094b2376ec
-EBUILD pytest-cov-2.10.1.ebuild 1396 BLAKE2B eb6d91beeebb87a89f7af47630e53b52e663568bc711c6117beddb534d73c65652e6799ccec1de6639de9cb5018d686db5ce105bf4a3c1cd048b356699e3cbae SHA512 26fe1a217e12c41ba5a830338b0a0d525e21767d199d1cf0f60efc8497094a42007aa435e02dffbafd849be2139d70bb31a9fcef0a1f0667394c447718a65702
+EBUILD pytest-cov-2.10.1.ebuild 1388 BLAKE2B 1de8f9b3cc7235e4db2c56d1e679285483bc2564a1c4bf9c6f6c0bed681bb8a938a9e3bde5b9981c1b7ccb2bb06997aae2a528f285b69ea2c2e7428c21bf3678 SHA512 6374cec526c1de49f920a996c952458fff8caec3d4e5e946d658877085d145de4d32213459aa574e92901167e8d01284b01825b56bc8be47ddeb6d3e1836fd74
 EBUILD pytest-cov-2.11.0.ebuild 1285 BLAKE2B 49e15b8d30865c76ef41d328bd2049c915ee17551d89e844491aecd3d8f1fccf218f7645c3e75f3f10ca19bd353594cea15561e855faa590e3de05e450a8a1bb SHA512 8dae610239503d4c7f711572889808a07cfffb3e7f66027d38b0c07864a398953082561f564ed0f62d1840eaf6dd3b468a86eb1a31b0ccc26e9b4a8d26b1a068
 EBUILD pytest-cov-2.11.1.ebuild 1285 BLAKE2B 49e15b8d30865c76ef41d328bd2049c915ee17551d89e844491aecd3d8f1fccf218f7645c3e75f3f10ca19bd353594cea15561e855faa590e3de05e450a8a1bb SHA512 8dae610239503d4c7f711572889808a07cfffb3e7f66027d38b0c07864a398953082561f564ed0f62d1840eaf6dd3b468a86eb1a31b0ccc26e9b4a8d26b1a068
-EBUILD pytest-cov-2.8.1.ebuild 1381 BLAKE2B d94212fb13d2e1ab3f1f79c2a6025d64f6f514ae9bc7703dfb3359b5f47a560bbfcf2821055578a28c16e41db98c05d4ca0b5e9def8eab5a499cd3904d617dbb SHA512 40ea68bfc2c03f70161d08e367abd29a86e173504511d1e53e53d31f5aa4718a59ae32db3d0d5337349bf14bcf3db2f79952f07bd36048394d724fea087763db
 MISC metadata.xml 411 BLAKE2B 5ecf37fefd3ba802d31a3f7e10a58fb7391d213164cca73117a5723b174b66e29574ef694960af9346df13667e6c203c309e8372086ddd481eca1eda7f843926 SHA512 ffb291dfaa0724a05a65152d6e1d1fcffed59bf260e07e216fb8e097fef0c3aeec320fd75a7c45ffefdd39c1c0e6a50e196a4cea99654fc3e5d768fd3a81dd99
diff --git a/dev-python/pytest-cov/files/pytest-cov-2.8.1-disable-broken-tests.patch b/dev-python/pytest-cov/files/pytest-cov-2.8.1-disable-broken-tests.patch
deleted file mode 100644
index 660db5e59431..000000000000
--- a/dev-python/pytest-cov/files/pytest-cov-2.8.1-disable-broken-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py
-index e79e9aa..e5ef2c1 100644
---- a/tests/test_pytest_cov.py
-+++ b/tests/test_pytest_cov.py
-@@ -820,6 +820,7 @@ parallel = true
-     assert result.ret == 0
- 
- 
-+@pytest.mark.skip(reason="test is broken")
- def test_central_subprocess_change_cwd_with_pythonpath(testdir, monkeypatch):
-     stuff = testdir.mkdir('stuff')
-     parent_script = stuff.join('parent_script.py')
-@@ -951,6 +952,7 @@ def test_invalid_coverage_source(testdir):
-     assert not matching_lines
- 
- 
-+@pytest.mark.skip(reason="test is broken")
- @pytest.mark.skipif("'dev' in pytest.__version__")
- @pytest.mark.skipif('sys.platform == "win32" and platform.python_implementation() == "PyPy"')
- def test_dist_missing_data(testdir):
diff --git a/dev-python/pytest-cov/files/pytest-cov-2.8.1-latest-setuptools.patch b/dev-python/pytest-cov/files/pytest-cov-2.8.1-latest-setuptools.patch
deleted file mode 100644
index 8a9618c3fd98..000000000000
--- a/dev-python/pytest-cov/files/pytest-cov-2.8.1-latest-setuptools.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 1305b23..3a5803e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -29,7 +29,7 @@ def read(*names, **kwargs):
- 
- 
- class BuildWithPTH(build):
--    def run(self):
-+    def run(self, **kwargs):
-         build.run(self)
-         path = join(dirname(__file__), 'src', 'pytest-cov.pth')
-         dest = join(self.build_lib, basename(path))
-@@ -37,7 +37,7 @@ class BuildWithPTH(build):
- 
- 
- class EasyInstallWithPTH(easy_install):
--    def run(self):
-+    def run(self, **kwargs):
-         easy_install.run(self)
-         path = join(dirname(__file__), 'src', 'pytest-cov.pth')
-         dest = join(self.install_dir, basename(path))
-@@ -45,7 +45,7 @@ class EasyInstallWithPTH(easy_install):
- 
- 
- class InstallLibWithPTH(install_lib):
--    def run(self):
-+    def run(self, **kwargs):
-         install_lib.run(self)
-         path = join(dirname(__file__), 'src', 'pytest-cov.pth')
-         dest = join(self.install_dir, basename(path))
-@@ -57,7 +57,7 @@ class InstallLibWithPTH(install_lib):
- 
- 
- class DevelopWithPTH(develop):
--    def run(self):
-+    def run(self, **kwargs):
-         develop.run(self)
-         path = join(dirname(__file__), 'src', 'pytest-cov.pth')
-         dest = join(self.install_dir, basename(path))
diff --git a/dev-python/pytest-cov/files/pytest-cov-2.8.1-python38.patch b/dev-python/pytest-cov/files/pytest-cov-2.8.1-python38.patch
deleted file mode 100644
index 6292672b6191..000000000000
--- a/dev-python/pytest-cov/files/pytest-cov-2.8.1-python38.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py
-index e79e9aa..198478b 100644
---- a/tests/test_pytest_cov.py
-+++ b/tests/test_pytest_cov.py
-@@ -662,6 +662,7 @@ def test_fail(p):
-     ])
- 
- 
-+@pytest.mark.skipif("sys.hexversion >= 0x3080000", reason="Seems buggy on python3.8")
- @pytest.mark.skipif('sys.platform == "win32" or platform.python_implementation() == "PyPy"')
- def test_dist_combine_racecondition(testdir):
-     script = testdir.makepyfile("""
-@@ -1018,6 +1019,7 @@ def test_funcarg_not_active(testdir):
-     assert result.ret == 0
- 
- 
-+@pytest.mark.skipif("sys.hexversion >= 0x3080000", reason="https://bugs.python.org/issue38227")
- @pytest.mark.skipif("sys.version_info[0] < 3", reason="no context manager api on Python 2")
- @pytest.mark.skipif('sys.platform == "win32"', reason="multiprocessing support is broken on Windows")
- @pytest.mark.skipif('platform.python_implementation() == "PyPy"', reason="often deadlocks on PyPy")
-@@ -1059,6 +1061,7 @@ def test_run_target():
-     assert result.ret == 0
- 
- 
-+@pytest.mark.skipif("sys.hexversion >= 0x3080000", reason="https://bugs.python.org/issue38227")
- @pytest.mark.skipif('sys.platform == "win32"', reason="multiprocessing support is broken on Windows")
- @pytest.mark.skipif('platform.python_implementation() == "PyPy"', reason="often deadlocks on PyPy")
- def test_multiprocessing_pool_terminate(testdir):
-@@ -1141,6 +1144,7 @@ def test_run_target():
-     assert result.ret == 0
- 
- 
-+@pytest.mark.skipif("sys.hexversion >= 0x3080000", reason="https://bugs.python.org/issue38227")
- @pytest.mark.skipif('sys.platform == "win32"', reason="multiprocessing support is broken on Windows")
- def test_multiprocessing_process(testdir):
-     pytest.importorskip('multiprocessing.util')
-@@ -1171,6 +1175,7 @@ def test_run_target():
-     assert result.ret == 0
- 
- 
-+@pytest.mark.skipif("sys.hexversion >= 0x3080000", reason="https://bugs.python.org/issue38227")
- @pytest.mark.skipif('sys.platform == "win32"', reason="multiprocessing support is broken on Windows")
- def test_multiprocessing_process_no_source(testdir):
-     pytest.importorskip('multiprocessing.util')
-@@ -1201,6 +1206,7 @@ def test_run_target():
-     assert result.ret == 0
- 
- 
-+@pytest.mark.skipif("sys.hexversion >= 0x3080000", reason="https://bugs.python.org/issue38227")
- @pytest.mark.skipif('sys.platform == "win32"', reason="multiprocessing support is broken on Windows")
- def test_multiprocessing_process_with_terminate(testdir):
-     pytest.importorskip('multiprocessing.util')
diff --git a/dev-python/pytest-cov/pytest-cov-2.10.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.10.1.ebuild
index 3b5c7c30a5e5..fc5c14c4dd9e 100644
--- a/dev-python/pytest-cov/pytest-cov-2.10.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.10.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
deleted file mode 100644
index 960f0686259e..000000000000
--- a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
+++ /dev/null
@@ -1,51 +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..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-	>=dev-python/coverage-4.4[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/fields[${PYTHON_USEDEP}]
-		>=dev-python/process-tests-2.0.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# Bug 597708
-	"${FILESDIR}/${PN}-2.8.1-disable-broken-tests.patch"
-	"${FILESDIR}/${PN}-2.8.1-latest-setuptools.patch"
-	# https://github.com/pytest-dev/pytest-cov/issues/365
-	"${FILESDIR}/pytest-cov-2.8.1-python38.patch"
-)
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-py3doc-enhanced-theme
-
-python_test() {
-	distutils_install_for_testing
-	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib:${PYTHONPATH}" \
-		PYTEST_PLUGINS=${PN/-/_} \
-		pytest -vv || die "Tests failed under ${EPYTHON}"
-}