gentoo resync : 23.09.2020

6 files changed, 4 insertions, 290 deletions

diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index e83c3f3efd25..7934183bb4d3 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,12 +1,7 @@
-AUX coverage-4.5.4-tests.patch 5117 BLAKE2B 2a0642f71b8504d542e97fdd3258670c0c505e66100962fb63cc876a3666ba3ba21f3b03fcc664661fce030e57b67e9309c379cd2e82ec3abb79abea3aee8844 SHA512 22caa44eb8e114ddf997d7cce1d762b7140422954df4155e1282a58ee9a79a69c102fd0790a80459f65d1d9313ad38a449118e7254aa1d7751e6abd2eaff9862
-DIST coverage-4.5.2.tar.gz 384845 BLAKE2B a7b4f249a68e025449d26ef8ee2194b9ce355c979d1f5192a7863a0ab0089f9deb3a8e63a39bef528ed7c58fbcc7cd4bc193fea3a135f5996a6655268a6b7a93 SHA512 0d98c8118648a319ac6f3b4c4c6f1ff8a92085bbe8276dd5504c8df4638933f920d7382d8e6de8e16bff43b62091310e0eab7b7722c6d28c976baedbfae3d03e
 DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
-DIST coverage-5.1.tar.gz 687427 BLAKE2B f4eee548cd6fb58c4a527b9e0ac5ee4133c984358f42ca0c87301f95eb60253a2748ccf9d4e88358941d7897998e68e3c5e70e6dc7387bf5e60eda950f4a679c SHA512 7bd3ca158fe2eab1946c52161fb877623d4ed0382de193aa6eb267443fdda86089ec7aaae518115d6a3b5487fd1400320eb503b9afe83182fb3c3621ccbfb6d7
 DIST coverage-5.2.1.tar.gz 694076 BLAKE2B 0aaf9b5668c2fac1220c377d5b841341b534bd14579b70fa3d4c5e64239df71b95c2278e041f46ae3f9d2ae55145894d51457caabdd9540b7d8ce3f32f8d409c SHA512 bda6129a4f4e2db3d26878036ceec137e4f359b8d37ce087e4007751bf0bbda7d706967a50b120378fa533f980e70142328099332374a1f303fa0083ffc078b0
 DIST coverage-5.3.tar.gz 693632 BLAKE2B 9daa3a0fd7f8c3ff7c9d68603e11a0a419d3ab50e3c3fb6be5b694aa1f7566040e1212b7175dfa4f71a0a309db325c00f94a85e0e9e755ae8c4f09c499d0daf4 SHA512 f40a21c394b1a72118965f702ae2b8e09c4e0b2fe92709aedf1de4c8074cd9c2cae0ed4860fbb863e4e5479f1067ff806d7051f7683d6b324de9945c0cacfc39
-EBUILD coverage-4.5.2.ebuild 1237 BLAKE2B e34bf2b12ce2f78f0882e690ed2d8fb9dccc805a3ba05ffbb25e5a69e9590fbf5706800b0b5fdcb055e0044afa92feb6b7903b23f85343d8b5d56ad724a4145a SHA512 24f1e3624cbf90d7debff9fe521cda8c4ee9cc368377cfa7d1143768ea7f674f534a3c94201e5f3154b0fc5499e953b53b79958bd5aa0e40d0e424ce6f28f02c
-EBUILD coverage-4.5.4.ebuild 1787 BLAKE2B b644cd4091377f15566c9bc3979410910429cede262de4d941e48c1bd68db7cdb5d7840cb71fa9454d6289db66b69772b2519b5ae2a82ce129ab2a54136d1528 SHA512 a52843da254fdf9632bb3461bcae4f58c5e7537577510aa8f4e0ca8bf7cd236376cbb707b01b3933670dc686d4a4c433115116e42e6c63f66336c2d6234a5486
-EBUILD coverage-5.1.ebuild 1882 BLAKE2B 654f744159702478c1570a0f3bad15db7dc5f377442c30e256c650da68e80bd071b06a3a96453965916254fd88747a5d023d5f4f8f83ff35d2a9644e66687e55 SHA512 cb43a7226368f4266ebe0ef1a001508c054aa3d4655a1d6f51e669e5dc49c67df1ec583664ded59e7a13191b132c510002dc5099ced9d347ecd91364703a7a5e
-EBUILD coverage-5.2.1.ebuild 1891 BLAKE2B f96cda5458c5fd5f2be1ad962970a99cb530da08ce4c33ea78411b3c5bf59b5f099c2019b28d52f1809e1ffd72b472ee5e54fe0c5054b00e010e2b5736462832 SHA512 9620a77e36ffb9d9839e324acc7e396cb52834fb137e5933e6053bed3c0eb04288f359b0f121f3ce285bf099b52f83e21b5c01a3e36618163219630b4c1ffa02
+EBUILD coverage-4.5.4.ebuild 709 BLAKE2B 429ab0823d2b945cdfa7355e0b2170638af3884459a83a9da311a29bc2e8ed23698c2cbb6a6ac6f00bbe1e0d63e5bfb8630a1a6fcfa476955f76efa9e0ceda17 SHA512 1d4e8911b8d73f06ce97f1f615d67e70e192659400f1d606d2b8fcfa495b60dc88951a7efd5ab8b171eb009840f2fbea9719c0a55d3af315a3f1ea6d96e7a692
+EBUILD coverage-5.2.1.ebuild 1888 BLAKE2B 49eb7e02280cd92768ef79b54a1a122687df236ad3d274a5e9206161561f363f574feff86e7ce3c607144057937f3b6667141e5a62d0412cdfb36cb407409b04 SHA512 ab315289064de6b46e424cf1ed422b929a76d86203ad91408d301f512538702900ebd0d6ffd880ce71dfdad2bff5a359d425008907503662e5090051c25a75aa
 EBUILD coverage-5.3.ebuild 1896 BLAKE2B 9da4cbe5ff7901f65dcb1b94e91397418726ee7a3af6d5e139acb28771532ffb7cfd2764810640562e22c8f3f06fa5ed004d651805711c9fcec6fb284400fe2e SHA512 fbb2ceff06b7f8c4103d376aa5d8d1190bb0be5f9189e1fe922545b10ade5e1a99e7f6b1b853850191854efc0f851cede8a6228a517f49eef7d5f7cc2289134f
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-4.5.2.ebuild b/dev-python/coverage/coverage-4.5.2.ebuild
deleted file mode 100644
index dbdc4f892f0b..000000000000
--- a/dev-python/coverage/coverage-4.5.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	>=dev-python/setuptools-18.4[${PYTHON_USEDEP}]
-	test? (
-		dev-python/PyContracts[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile() {
-	if [[ ${EPYTHON} == python2.7 ]]; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	[[ "${PYTHON}" =~ pypy ]] && export COVERAGE_NO_EXTENSION=no
-	${PYTHON} "${S}"/igor.py test_with_tracer py || die
-	${PYTHON} "${S}"/igor.py test_with_tracer c || die
-}
diff --git a/dev-python/coverage/coverage-4.5.4.ebuild b/dev-python/coverage/coverage-4.5.4.ebuild
index 5da1dac252e0..0f9a10796d32 100644
--- a/dev-python/coverage/coverage-4.5.4.ebuild
+++ b/dev-python/coverage/coverage-4.5.4.ebuild
@@ -14,33 +14,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-BDEPEND="
-	>=dev-python/setuptools-18.4[${PYTHON_USEDEP}]
-	test? (
-		dev-python/PyContracts[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
-	)
-"
+RESTRICT="test"
 
 DISTUTILS_IN_SOURCE_BUILD=1
 
-PATCHES=(
-	"${FILESDIR}/coverage-4.5.4-tests.patch"
-)
-
-src_prepare() {
-	# avoid the dep on xdist, run tests verbosely
-	sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
 python_compile() {
 	if [[ ${EPYTHON} == python2.7 ]]; then
 		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
@@ -49,24 +26,3 @@ python_compile() {
 
 	distutils-r1_python_compile
 }
-
-python_test() {
-	distutils_install_for_testing
-	local bindir=${TEST_DIR}/scripts
-
-	pushd tests/eggsrc >/dev/null || die
-	distutils_install_for_testing
-	popd >/dev/null || die
-
-	"${EPYTHON}" igor.py zip_mods || die
-	PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer py || die
-
-	# No C extensions under pypy
-	if [[ ${EPYTHON} != pypy* ]]; then
-		cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
-		PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer c || die
-	fi
-
-	# clean up leftover "egg1" directory
-	rm -rf build/lib/egg1 || die
-}
diff --git a/dev-python/coverage/coverage-5.1.ebuild b/dev-python/coverage/coverage-5.1.ebuild
deleted file mode 100644
index 279b142fc1a9..000000000000
--- a/dev-python/coverage/coverage-5.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-#IUSE="test"
-# The tests are impossible to appease.  Please run them externally
-# via tox.  Or fix the ebuild if you have hours of time to spend
-# on something utterly useless.
-RESTRICT="test"
-
-#BDEPEND="
-#	test? (
-#		dev-python/PyContracts[${PYTHON_USEDEP}]
-#		dev-python/flaky[${PYTHON_USEDEP}]
-#		dev-python/hypothesis[${PYTHON_USEDEP}]
-#		dev-python/mock[${PYTHON_USEDEP}]
-#		dev-python/pytest[${PYTHON_USEDEP}]
-#		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
-#	)
-#"
-
-src_prepare() {
-	# avoid the dep on xdist, run tests verbosely
-	sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	if [[ ${EPYTHON} == python2.7 ]]; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	distutils_install_for_testing
-	local bindir=${TEST_DIR}/scripts
-
-	pushd tests/eggsrc >/dev/null || die
-	distutils_install_for_testing
-	popd >/dev/null || die
-
-	"${EPYTHON}" igor.py zip_mods || die
-	PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer py || die
-
-	# No C extensions under pypy
-	if [[ ${EPYTHON} != pypy* ]]; then
-		cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
-		PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer c || die
-	fi
-
-	# clean up leftover "egg1" directory
-	rm -rf build/lib/egg1 || die
-}
diff --git a/dev-python/coverage/coverage-5.2.1.ebuild b/dev-python/coverage/coverage-5.2.1.ebuild
index 7c1796f4f87b..6f1953cdc422 100644
--- a/dev-python/coverage/coverage-5.2.1.ebuild
+++ b/dev-python/coverage/coverage-5.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 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"
 # The tests are impossible to appease.  Please run them externally
 # via tox.  Or fix the ebuild if you have hours of time to spend
diff --git a/dev-python/coverage/files/coverage-4.5.4-tests.patch b/dev-python/coverage/files/coverage-4.5.4-tests.patch
deleted file mode 100644
index 779102c8f658..000000000000
--- a/dev-python/coverage/files/coverage-4.5.4-tests.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff --git a/tests/farm/run/run_timid.py b/tests/farm/run/run_timid.py
-index 0370cf84..4e3cf1ca 100644
---- a/tests/farm/run/run_timid.py
-+++ b/tests/farm/run/run_timid.py
-@@ -38,6 +38,10 @@ if os.environ.get('COVERAGE_TEST_TRACER', 'c') == 'c':
- else:
-     # If the Python trace function is being tested, then regular running will
-     # also show the Python function.
--    contains("out_timid/showtraceout.txt", "regular PyTracer")
-+    #
-+    # tox.ini deletes compiled c modules to make this test work, not feasible
-+    # to do this from the ebuild environment
-+    #contains("out_timid/showtraceout.txt", "regular PyTracer")
-+    pass
- 
- clean("out_timid")
-diff --git a/tests/test_concurrency.py b/tests/test_concurrency.py
-index 578cc679..c875be86 100644
---- a/tests/test_concurrency.py
-+++ b/tests/test_concurrency.py
-@@ -11,6 +11,7 @@ import time
- 
- from flaky import flaky
- 
-+import unittest
- import coverage
- from coverage import env
- from coverage.backward import import_local_file
-@@ -255,22 +256,27 @@ class ConcurrencyTest(CoverageTest):
-         code = SIMPLE.format(QLIMIT=self.QLIMIT)
-         self.try_some_code(code, "thread", threading)
- 
-+    @unittest.skipIf(env.PY2, "eventlet tests don't work with python tracer on python2")
-     def test_eventlet(self):
-         code = (EVENTLET + SUM_RANGE_Q + PRINT_SUM_RANGE).format(QLIMIT=self.QLIMIT)
-         self.try_some_code(code, "eventlet", eventlet)
- 
-+    @unittest.skipIf(env.PY2, "eventlet tests don't work with python tracer on python2")
-     def test_eventlet_simple_code(self):
-         code = SIMPLE.format(QLIMIT=self.QLIMIT)
-         self.try_some_code(code, "eventlet", eventlet)
- 
-+    @unittest.skipIf(env.PY2, "gevent tests don't work with python tracer on python2")
-     def test_gevent(self):
-         code = (GEVENT + SUM_RANGE_Q + PRINT_SUM_RANGE).format(QLIMIT=self.QLIMIT)
-         self.try_some_code(code, "gevent", gevent)
- 
-+    @unittest.skipIf(env.PY2, "gevent tests don't work with python tracer on python2")
-     def test_gevent_simple_code(self):
-         code = SIMPLE.format(QLIMIT=self.QLIMIT)
-         self.try_some_code(code, "gevent", gevent)
- 
-+    @unittest.skip("greenlet tests don't work with python tracer")
-     def test_greenlet(self):
-         GREENLET = """\
-             from greenlet import greenlet
-@@ -289,6 +295,7 @@ class ConcurrencyTest(CoverageTest):
-             """
-         self.try_some_code(GREENLET, "greenlet", greenlet, "hello world\n42\n")
- 
-+    @unittest.skip("greenlet tests don't work with python tracer")
-     def test_greenlet_simple_code(self):
-         code = SIMPLE.format(QLIMIT=self.QLIMIT)
-         self.try_some_code(code, "greenlet", greenlet)
-diff --git a/tests/test_filereporter.py b/tests/test_filereporter.py
-index 91e47762..121c3260 100644
---- a/tests/test_filereporter.py
-+++ b/tests/test_filereporter.py
-@@ -4,6 +4,7 @@
- """Tests for FileReporters"""
- 
- import os
-+import unittest
- 
- from coverage.plugin import FileReporter
- from coverage.python import PythonFileReporter
-@@ -87,6 +88,7 @@ class FileReporterTest(UsingModulesMixin, CoverageTest):
-         assert acu < bcu and acu <= bcu and acu != bcu
-         assert bcu > acu and bcu >= acu and bcu != acu
- 
-+    @unittest.skip("we don't install zip eggs on gentoo")
-     def test_egg(self):
-         # Test that we can get files out of eggs, and read their source files.
-         # The egg1 module is installed by an action in igor.py.
-diff --git a/tests/test_oddball.py b/tests/test_oddball.py
-index aa2f333c..bc63395a 100644
---- a/tests/test_oddball.py
-+++ b/tests/test_oddball.py
-@@ -405,7 +405,9 @@ class DoctestTest(CoverageTest):
-         # well with coverage. Nose fixes the problem by monkeypatching doctest.
-         # I want to be sure there's no monkeypatch and that I'm getting the
-         # doctest module that users of coverage will get.
--        assert 'doctest' not in sys.modules
-+
-+        # gentoo is not running these tests via nose, so there is no monkeypatching
-+        #assert 'doctest' not in sys.modules
- 
-     def test_doctest(self):
-         self.check_coverage('''\
-diff --git a/tests/test_process.py b/tests/test_process.py
-index 62dc80a5..7fa9b2ba 100644
---- a/tests/test_process.py
-+++ b/tests/test_process.py
-@@ -620,11 +620,16 @@ class ProcessTest(CoverageTest):
-             print("FOOEY == %s" % os.getenv("FOOEY"))
-             """)
- 
--        fullcov = os.path.join(
--            os.path.dirname(coverage.__file__), "fullcoverage"
--            )
-+        # we want to use the coverage module we are testing, not the system installation
-+        paths = [
-+            os.path.join(
-+                os.path.dirname(coverage.__file__), "fullcoverage"
-+            ),
-+            os.path.dirname(os.path.dirname(coverage.__file__))
-+        ]
-         self.set_environ("FOOEY", "BOO")
--        self.set_environ("PYTHONPATH", fullcov)
-+        self.set_environ("PYTHONPATH", ':'.join(paths))
-+        print(paths)
-         out = self.run_command("python -m coverage run -L getenv.py")
-         self.assertEqual(out, "FOOEY == BOO\n")
-         data = coverage.CoverageData()