gentoo resync : 20.03.2022

4 files changed, 65 insertions, 60 deletions

diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index f51a26450760..b69c12830b6a 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,5 +1,5 @@
-DIST coverage-6.2.tar.gz 678664 BLAKE2B 98fe2e5d85db042d95a791838b121a4aeb0edc09f15e5454943d6d1ca3cafdbf0127e8683ddcb5c1f6372b18205bf92e24a803533f19d1bdd5e0477b669cf99f SHA512 e8ef5f2483b2e6d12f0f9801d63a0cd0b81395ea0c88b3cdaf6f6758e1fc1b381f803b0f58345c94007de175d0c2a24559dec93f51db8786f801a2a2d48d6b8f
-DIST coverage-6.3.tar.gz 705131 BLAKE2B bd2905f2872cd6b691fc1db3852ad84a27613a8a4c28158b7469408e8c38af5f1b8f6362a91d31c7d0ca9a20dbac0b7d1d8646322cd298f0284c6a5c2ab31050 SHA512 d011d479f49fa5e0036ab68d64361c1060468c3b20e791b18277edaf647858138417d35edaf2688232670f446df33d7a28b71f92467c08ae9b8923ef14eb3e7e
-EBUILD coverage-6.2.ebuild 1522 BLAKE2B 5312bbd1c49954277704394edb650dc781e4e6fbc9f938a9ce3db076279310cede10ef604a62c2f9e1cf93df10f6334dc19bba265be28e84501f5c2358c2a1e6 SHA512 25f317d0adc03981e52374106b9d995b82ac44d1116aed0b5374dcb22270eef02c9d5b5bb5caf35bc11fd0bf77c5f0d5c0dbaac3517802c8ec5272d4044ac7bb
-EBUILD coverage-6.3.ebuild 1530 BLAKE2B ce716dd6e2158cadd99d58105283ece25e27229196a19b37748bece7b72106ffcfc30da104102b787b9a7786395a907da57b77f902e136176408035c9f105184 SHA512 47d71f4e6c174db176a8759a40150f2c134372c0f92536ddfa249b38f925212e5b75169550cf8fc5fd0d2587ee2e1797528c38c59e22370ab2c003715b0cfaa7
+DIST coverage-6.3.1.tar.gz 707088 BLAKE2B 4253f2973fec34dd5737878c6977c4b7cd273d7786f5e34877b2061774a5177cf7905472e6c578f3292120dc9123e74387c2fe71723206efcf9a257563918a28 SHA512 aa91f7f45510ce8120081aef6367bc3f39f56480901b57f8e2c3f26c921b5d2c15c44c1ed628eefdd2f1d2360a2c62063004aeb19d287a50c4b33304f8eae5b7
+DIST coverage-6.3.2.tar.gz 709294 BLAKE2B 2da96731ee0065fb6139af7db073284a83efa135e7379d2a6d6e571cdf58c888cf72719fbddadb1bd8f62b0b155b8420a84377068c40e4c813533b3ad6b190a8 SHA512 d9ea3a93eefe2dbb723ed1eadb09dc1165c4f46e7186889ce3615411283baac1d80f04a3831208a164f99accea5d246d4613a7c2e909d2e63d3c714620432a16
+EBUILD coverage-6.3.1.ebuild 1522 BLAKE2B 0bebeab7afc69a217c3e3a146f7ef829effb7aae18d100438f5569e2b350f2ff4d242ebda9081da93782b8547fd4c8aacd1f62180fcb67e5cabcc53458986e67 SHA512 68faf983cf3ec85e0cea4b0da7507e6d2010e771678ca7f0ffd52a78f88ae68b66300376d321efa3b7d8015519e761482644fbe33954e837e9fe97b3ad679965
+EBUILD coverage-6.3.2-r1.ebuild 1546 BLAKE2B 79eb9746be1294f8cec5959947ab4bbd646bb5ec669cdbcbb145e2bd478eb5b5245b1c8ad4ab0ea2939c0d7f412e97cc2ec3975dfdf7ae0334c9c0daff6df915 SHA512 1c1e9608b57500273af316f774a74fe37bc22aab2f74d99abebd4f823f3eb39f6a55621ef5c8ebe51e6b6992c3c2b250e148ad228b99a7f24071358e5ad636a6
 MISC metadata.xml 714 BLAKE2B c0d2641f795a21a80b6fa36206973f41421effe055e4c5e41bf752869759eb48e8fe42a0ab00af55b5d5111bfaccd330676d63e263013dc9bd3c344cb038a3a6 SHA512 412d70b7c9c2871bb93ae6ed6ae110a9f29c26957f6e1b24cc531c7d49f292ecb5206df10b409f2e44d2f814b119ef4ed973bca608df999026bda8df2156df24
diff --git a/dev-python/coverage/coverage-6.2.ebuild b/dev-python/coverage/coverage-6.3.1.ebuild
index efdecf358257..7ceab2052d7d 100644
--- a/dev-python/coverage/coverage-6.2.ebuild
+++ b/dev-python/coverage/coverage-6.3.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite(+)"
 inherit distutils-r1
@@ -38,8 +39,6 @@ src_prepare() {
 }
 
 python_test() {
-	distutils_install_for_testing
-
 	"${EPYTHON}" igor.py zip_mods || die
 	"${EPYTHON}" igor.py test_with_tracer py || die
 
diff --git a/dev-python/coverage/coverage-6.3.2-r1.ebuild b/dev-python/coverage/coverage-6.3.2-r1.ebuild
new file mode 100644
index 000000000000..1a2016543a8b
--- /dev/null
+++ b/dev-python/coverage/coverage-6.3.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+
+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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/^addopts/s:-q -n auto::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+test_tracer() {
+	local -x COVERAGE_TEST_TRACER=${1}
+	einfo "  Testing with the ${COVERAGE_TEST_TRACER} tracer ..."
+	epytest tests
+}
+
+python_test() {
+	"${EPYTHON}" igor.py zip_mods || die
+
+	local -x COVERAGE_TESTING=True
+	# TODO: figure out why they can't be imported inside test env
+	local -x COVERAGE_NO_CONTRACTS=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=_hypothesis_pytestplugin,flaky.flaky_pytest_plugin,xdist.plugin
+
+	if [[ ${EPYTHON} != pypy* ]]; then
+		cp "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so \
+			coverage/ || die
+		test_tracer c
+		rm coverage/*.so || die
+	else
+		test_tracer py
+	fi
+}
diff --git a/dev-python/coverage/coverage-6.3.ebuild b/dev-python/coverage/coverage-6.3.ebuild
deleted file mode 100644
index 47b693e67167..000000000000
--- a/dev-python/coverage/coverage-6.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite(+)"
-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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-#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
-	sed -i -e '/^addopts/s:-q -n auto::' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" igor.py zip_mods || die
-	"${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
-		"${EPYTHON}" igor.py test_with_tracer c || die
-	fi
-
-	# clean up leftover "egg1" directory
-	rm -rf build/lib/egg1 || die
-}