gentoo resync : 20.03.2022

4 files changed, 61 insertions, 13 deletions

diff --git a/dev-python/pytest-console-scripts/Manifest b/dev-python/pytest-console-scripts/Manifest
index 1e2e1079b1c6..937d49671f0d 100644
--- a/dev-python/pytest-console-scripts/Manifest
+++ b/dev-python/pytest-console-scripts/Manifest
@@ -1,5 +1,7 @@
-DIST pytest-console-scripts-1.2.0.tar.gz 13976 BLAKE2B 1452ecfdc47d3341d8f3f30d49f371ae89d6138d56e4dc3a230f6a3803c6c36f542df40e2785c99c3cfd5080fa03b5b3d4926bb742dc99bd2127d47305fbf788 SHA512 07c9baab85035265ab6a21cc0c754b076dba87f08e1ab51319ef47a0a8af0b44f7d42422014c68cf93ed28b508138a70e14b968707cc831682885b3ca8106aa7
 DIST pytest-console-scripts-1.2.2.tar.gz 14314 BLAKE2B 1e4c210fe9fa6a4e9dbe308cf3d6c1a1829f2155185fe3911ee0a299c0292db6bceeeeb7efd5ace9a166c90ae8376d3cdfec8b0c0b585467f157e175709afe6d SHA512 c749b76c8370734f9ab7fe93284f9ac25a38e4bef61181a3b61b3b0d229532f1876e668e5a6e1449dcb939d9cb53527e021f79fd9132f3a28bdf45d95bdcb40e
-EBUILD pytest-console-scripts-1.2.0.ebuild 735 BLAKE2B 8ac179b58ed92b13dda8e3bc3b0f1173d1732e542d079b731cfd9f60c4c4d6ac35675d3a8142a6a420da00ec78416b56f62a744f20ee04a812cd8d94115460cf SHA512 f94d3a820169b8662aa409fafada9a72748cb11084bfe0ca8d2e55200a8c05dae90acc12dda1788810a0de4113e9adea6d904c3cd464c1c1dece2eafefc288f2
-EBUILD pytest-console-scripts-1.2.2.ebuild 579 BLAKE2B be0f5006c2a193c1f05d1d3d2d35bd483ab9877d2f0573977afd2df7edac98382589e7f7d7db91489c2f3a5f49077c28811c672b63af59a3b8e4567468351845 SHA512 ebfee08e3fc10bbf7c483ed1c36525ce6d87d6f6684faf196a49c23a8aec66a688ae9b5867f700472bec19eb4eb06d2c743ada629fe1efa9b417f11f80d087a9
+DIST pytest-console-scripts-1.3.1.tar.gz 14238 BLAKE2B 2c00af468d19500078f48ca38d20430ed426e66b2277b7ad233356969d2a72d51cf60e90a46ae7808e6d33172fa053cc34d45b1f618d866dd14e917e6b225935 SHA512 344e9379976d9a7541f9683f7646b47f7fc25d2ab8d941351811ada7fddd77497cc24f4bc6a6d5ab9388dd5b289ed125bcbfad869009fb3b80aaaa1b951d656d
+DIST pytest-console-scripts-1.3.tar.gz 14365 BLAKE2B 7a9b83f53ef9911e5f336375389e6c6311e64e7b4880ea2cb1f996221d4dbf119bf6fc487f7bb7bfda4355df8f797981e99ac9db2fff3e4871173a878a4fbd64 SHA512 8b66df3a8ff700817f8ec34aa95385ff82c4df47fd67974e91cf4d2fdae578d4683032b0a8162723adfcd461e5da7f1c5bb99339d62ed9cbdca4fd1be001b0f6
+EBUILD pytest-console-scripts-1.2.2.ebuild 632 BLAKE2B 2a72f494c8c9cfa51c1a2966e02cddc5d3aecf87d909f6056d4d047c1720b3b77bbb955ed3a613b0ba75d80a56d6d192c9a944088a9c36b6d93607c99ed4b9b2 SHA512 7d8092785b429228086feb486008e20542e4cd6dd4f829f8680fed5dc09ac2a3d8a9f246b17091d6a904fc47b634150c12848cdf804333b8f82ee89c6257253a
+EBUILD pytest-console-scripts-1.3.1.ebuild 883 BLAKE2B a4ff0391d58e1e267f66fd2db5bef2f1d55d7c621b6c323d1c6342aabf501bfa7eb6af6bbae1dd584c4d1714e2b1e7bad40aa241e84ff96971b5a077671d89ce SHA512 54da98ebeba024e4a897aaa40da50da6daa10237b1b04c46c394e0bafc89c88d65e24bac4201f4c08ee220efd151cf7f76f4d3ae9174c6f5aefc1592590627a7
+EBUILD pytest-console-scripts-1.3.ebuild 926 BLAKE2B 88535684cf66d2fb2c8746bfe4ef6733bff89f62a216a53d5ca659d85d0c783673befa567d4dc19456ab06d9ed7131040ebeb69c7a18d27965c2cf8ead066795 SHA512 c03114a7c443cedf0552cfee56f3e7012349b74f9dbd427a036717626868121a0a7a81473efd300cadfd26e49c41a0eeeaf8efa82a7262be7853623f493e36b2
 MISC metadata.xml 433 BLAKE2B 89f8e1d9dac848739320e06de4b6212f72538d6b9ae39d8266fb70f0849c529174ae89afae16e7282fe22f78e8970c3e2043f4d7e7327ea10d2659ef49b649d4 SHA512 58636b71252ea9aacbcf2c4640d4f63bef22710dfed931b3a081de2c92ba89499711df90aed069e71cbb8006d6ce515fb5ee46ec5f2631406cc01dcc92493fcf
diff --git a/dev-python/pytest-console-scripts/pytest-console-scripts-1.2.2.ebuild b/dev-python/pytest-console-scripts/pytest-console-scripts-1.2.2.ebuild
index 4553e3197f27..5555d0c3dfbf 100644
--- a/dev-python/pytest-console-scripts/pytest-console-scripts-1.2.2.ebuild
+++ b/dev-python/pytest-console-scripts/pytest-console-scripts-1.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild b/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild
new file mode 100644
index 000000000000..7c7afb1e0666
--- /dev/null
+++ b/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild
@@ -0,0 +1,39 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pytest plugin for testing console scripts"
+HOMEPAGE="https://github.com/kvas-it/pytest-console-scripts"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local script="${BUILD_DIR}/install${EPREFIX}/usr/bin/pytest"
+	cat > "${script}" <<-EOF
+		#!/usr/bin/env python
+		import pytest
+		import sys
+		sys.exit(pytest.console_main())
+	EOF
+	chmod +x "${script}" || die
+	epytest -x
+	rm "${script}" || die
+}
diff --git a/dev-python/pytest-console-scripts/pytest-console-scripts-1.2.0.ebuild b/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.ebuild
index 6a673ce97309..c63120a98ecc 100644
--- a/dev-python/pytest-console-scripts/pytest-console-scripts-1.2.0.ebuild
+++ b/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.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} )
 
 inherit distutils-r1
@@ -13,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
@@ -23,11 +24,17 @@ BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# allow newer setuptools_scm
-	sed -i -e 's/setuptools_scm<6/setuptools_scm/g' setup.py || die
-
-	distutils-r1_python_prepare_all
+distutils_enable_tests pytest
+
+python_test() {
+	local script="${BUILD_DIR}/install${EPREFIX}/usr/bin/pytest"
+	cat > "${script}" <<-EOF
+		#!/usr/bin/env python
+		import pytest
+		import sys
+		sys.exit(pytest.console_main())
+	EOF
+	chmod +x "${script}" || die
+	epytest -x
+	rm "${script}" || die
 }