gentoo resync : 29.12.2022

5 files changed, 48 insertions, 110 deletions

diff --git a/dev-python/pytest-skip-markers/Manifest b/dev-python/pytest-skip-markers/Manifest
index d420f12689bd..db2ef6e544cc 100644
--- a/dev-python/pytest-skip-markers/Manifest
+++ b/dev-python/pytest-skip-markers/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-skip-markers-1.2.0.tar.gz 79343 BLAKE2B 7f24b454fe19210d9ecadf10317a5a32830d722b64adbaf0fa6fad70a4c0cb598fa93b782a2b0f71bd23c4f91f2007d21383b488d725f61519d064e98ddd48f8 SHA512 76c1d0f0af7f7a56fa95d33bd5cb078792df3f054714d2ca1baa6d861e9404e2ec734a88a0768985388b1226c399ee6b54fe082ef7fcce6fc190fcae6201a416
 DIST pytest-skip-markers-1.3.0.tar.gz 79882 BLAKE2B 2c44711e6194aebf0a0299f8a50e6162a088023c2fff6bdb7c142060695a6977b1d4a5cc574199d8f11a5a94e413d7444f81d9e954327e8317ed1bcf3725a60f SHA512 bea602032a7796be7c2dad62ba750e987b77f04349c96f6f8e1f15f5d2b58c3ba1e549a775ce7e541f6041091a578def59900a726872c8aa8b31c585e3f0c3e0
-EBUILD pytest-skip-markers-1.2.0.ebuild 1580 BLAKE2B 70ba4fe95d5b71e17b685f45bd8127b6582346b8b23d20381dac9ad3052b407b1b1117cd57e81a0dd37df39b898520b93a7f1ff53efbeb8b72f6a0cd8b8859c3 SHA512 c8457d502fb0e48a5fe24c8d7749559e2c9a67990080144eeda26cbef27abb1e9059463ed3b341995fe0f4250a49073d519f8baef9fc876dd6790757fd2b7d1f
-EBUILD pytest-skip-markers-1.3.0.ebuild 1581 BLAKE2B 0f4da0a78e83a949f96a16a4019dd29f0aa96736769a64167ae70d88b64fdd234615c61bf4ff1e529aae2037e40da1aafa4d089758c0d848ae4d54f7da6db931 SHA512 1793ba8b9be8b75df611e88efbddadace8ca513bee85a871ba0c2037643ecdd808afa9d0410f4a3ea45f102ddccd92de0ffe4f2193ce3dec3b129672ccdd7f2f
-MISC metadata.xml 332 BLAKE2B 444e088c986bc7bcfa6ede30c807c1ada0a8c3dba264ebea0469df16858c0adae29bf5dfdc0ca6b1039ee02d092f6470156b161c88bb9f2bb03989f4ff117855 SHA512 b4251ca80a18902ed8be25eca4830de8fb9ce23bee47b013a992c1250a84788ccf82e5c6029d655884f71ff78feb1915482c9405882657f0b99846df01c174a8
+EBUILD pytest-skip-markers-1.3.0-r1.ebuild 1009 BLAKE2B 13d913d2577c5b605f7433680079e64078947d5b4a9e23b82ea1ae86febd939c80d15d0989686573ba6e28437cefa5919722a0cb62789b2d3a7ec8c2d9d3a638 SHA512 a6e5def5a19c2950dddbcdc2bc694b4af4a50877e0946a310bd5f2f7259370137a9e1397c9f738a3644cfa6fa8746bc38b4951a0d17b285fb9af7a47a167131e
+MISC metadata.xml 433 BLAKE2B 07de1af137dd4f1644c069f92e73f7558023095fb0e965ae3e1fe04ecf80f65fe267aa66cb54bddfe4df70c65f1bbbd87ddcb018e4e6bc52e8a83347d0720220 SHA512 842b3fedb252ab2493f2bd349fe6d1dd475bfd4b2ac6422c5dc4eea0ee422dcaebc09bf57a87b3f52260408e56b1036961af3accfcf43cc8a10c2d957ea18573
diff --git a/dev-python/pytest-skip-markers/metadata.xml b/dev-python/pytest-skip-markers/metadata.xml
index fe019e56f6a8..2d065697b436 100644
--- a/dev-python/pytest-skip-markers/metadata.xml
+++ b/dev-python/pytest-skip-markers/metadata.xml
@@ -5,6 +5,10 @@
 		<name>Patrick McLean</name>
 		<email>chutzpah@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pytest-skip-markers</remote-id>
 	</upstream>
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild
deleted file mode 100644
index 0fdd92751034..000000000000
--- a/dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 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="A Pytest plugin which implements a few useful skip markers"
-HOMEPAGE="
-	https://pytest-skip-markers.readthedocs.io/en/latest/
-	https://github.com/saltstack/pytest-skip-markers
-"
-SRC_URI="https://github.com/saltstack/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
-	dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/setuptools-declarative-requirements[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
-	sed -e "/setuptools_scm/ d" -i setup.cfg || die
-	sed -e "s/tool.setuptools_scm/tool.disabled/" -i pyproject.toml || die
-
-	printf '__version__ = "${PV}"\n' > src/pytestskipmarkers/version.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..ea590b0e73dd
--- /dev/null
+++ b/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Pytest plugin which implements a few useful skip markers"
+HOMEPAGE="
+	https://pytest-skip-markers.readthedocs.io/en/latest/
+	https://github.com/saltstack/pytest-skip-markers
+"
+SRC_URI="
+	https://github.com/saltstack/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+
+RDEPEND="
+	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-declarative-requirements[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0.ebuild
deleted file mode 100644
index b04007948c06..000000000000
--- a/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 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="A Pytest plugin which implements a few useful skip markers"
-HOMEPAGE="
-	https://pytest-skip-markers.readthedocs.io/en/latest/
-	https://github.com/saltstack/pytest-skip-markers
-"
-SRC_URI="https://github.com/saltstack/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
-	dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/setuptools-declarative-requirements[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
-	sed -e "/setuptools_scm/ d" -i setup.cfg || die
-	sed -e "s/tool.setuptools_scm/tool.disabled/" -i pyproject.toml || die
-
-	printf '__version__ = "${PV}"\n' > src/pytestskipmarkers/version.py || die
-
-	distutils-r1_python_prepare_all
-}