gentoo resync : 23.09.2020

6 files changed, 2 insertions, 169 deletions

diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 85dbc905b545..e332e767eb40 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,12 +1,4 @@
 AUX pytest-mock-2.0.0-warnings.patch 1363 BLAKE2B 67611daf7c070a0de2d368506b3e34653940f21bf565b0d7361b5f1e759c84533001f68483e1ca301e86cf2d734e10f973737f3775f898928c4b4c2d1aee9bf1 SHA512 6b306f19834559223af3e64372d46fed0146a783a6f134ed07883742b5ba1ad974fd3ba440376350345f939105e84abd8efdc7bf99cb9796eb638ba2c22e4e64
-DIST pytest-mock-1.11.2.tar.gz 22825 BLAKE2B d6843d1cb1afc0d5a242103ec4900d56418198b84fa037faf4b6841d7fbfd388273a819a26bfe051e6030690105e74211a27d2b864448598962b3e03788958fa SHA512 6dc927ce35001d088bddd9d79e024141b9e8163033b07af14b1f63330ef8b93dbf88649702f8fcc4f6ad314212fa5cbd39486b539811ec918450b3f7a716f96c
-DIST pytest-mock-2.0.0.tar.gz 24665 BLAKE2B 31a3464e8bff5a2109716e95492ce1d59f2555769e69cccf4012bc268f88c5eeca99924006bdc78cc5e20cf227860d845bead9656aba1c081da58effb38ea100 SHA512 8bd7f634afebeae628470270c81f0198647bf8cd5b0fac438891d881d9823e40e814d598670bb9c9722b864990958e69d385c7c6a6e2adc81d2adcb303fbe0b0
-DIST pytest-mock-3.2.0.tar.gz 25569 BLAKE2B e6a1ab23142cf3d7ac9385ac221bfce680c7b982cb489306557b60ca81563718cb9b7fcbb149cccb2cf6f06de5c3fa737d28b0711a3197fbbc86e432c5f4e614 SHA512 1ff442e26339ac41414a8678303fbc7eab573964661c664ef029c3b3377df4ab40173976316ef99e49dd208dc1e3c7cd0a0090f5453865343090cc9439f85fa9
-DIST pytest-mock-3.3.0.tar.gz 27139 BLAKE2B bd7295b00ef78f6a4c73eb732faa3573c668bf95884a23c6753d6674f082cbcc565e84c5598e6015c60323f6fba2b3d344c63009c353c5db84ade2b339d83970 SHA512 6ce63495e326101942d1808fe937547cca781dccbdf0845a6a70bb7c990f443ae16f870169c9c8c32084cf6d8ce7cd17f74f90504bd505a7f916c9376b75ac5a
 DIST pytest-mock-3.3.1.tar.gz 27551 BLAKE2B 9e3602b988c0e27caa295d42d7400cbe7e3e30392511e662fa6ec16ec9fa4ef776d3e64b63b0345d1b520f753c6776103f507f91f0bad022544bfccc510b7e6b SHA512 ffd53974f82f725cf3bdbe750c1deb568ad1a12a67532eca93ff28d80b1cbcd8ebf709985f5473717c9d54345b251c1627c0567821e9e8b9e102db5c16cf7421
-EBUILD pytest-mock-1.11.2.ebuild 1456 BLAKE2B 79673aaf4f03ec6c5475e68a5eb5960bea359f538af1f710daf205956cba1a6216f51656659ca17f6e2d52b64922be3c74499cfc85bc64cc937f1b3e7faead73 SHA512 77b1c578805b102cc04bb9f58273cbb238c128e2708968a3d9f27ca727a347cf3dbabf4d7e6bf7bf47f3356daa3345f62ae516f90c7f807b39e8c0a7089ba868
-EBUILD pytest-mock-2.0.0.ebuild 1112 BLAKE2B e84f9be37980feef82140399dc81f41141ce42d2b3304bbb93c31b444975a1976fadbff5ebb5a9d4a1ad5127a04172a8d88d4d2be7c176560b980cb1d20de160 SHA512 c726eccf84c8e58b34a479cc7f0741f1e80830f39f631c223399f851351426b3959293990348823e794bbe25e0c0578d9ccb0990d1d03f87947e1a457e557979
-EBUILD pytest-mock-3.2.0.ebuild 970 BLAKE2B c2d9bf51aa358b3748bedbc4b8fc73a47f1ae9c6d0af02d98847ecf72edca0334f7d7846b4ad2c95da73da2063ea71722926afe1eb4eb3a8fb29291858594920 SHA512 322d6aa0f181cf291d0a46471018d1ec717dc4c8f1122ad2cc71a8d1feac7f025e489712cae90769e287444055b8f2887a5a447828d2ebc16e407f575312cd30
-EBUILD pytest-mock-3.3.0.ebuild 978 BLAKE2B 121c1744dd24724d6573014125f7551dc519e1958df58c684da83850ea50baa0d545e1cc90360780442acd0df173e9d27a7c84acdf27c397b7d1d8f6e3b35c8e SHA512 89c6d2e5c974101ce96916c46a5031312dc4adf2e5d88082c638478595acbeac69f259789f85520e8577a8b38d55e46b68bdfc6337292fea8cd81ce76eb66062
-EBUILD pytest-mock-3.3.1.ebuild 985 BLAKE2B 30be5d360b8742cc9929f450c36c9c6f0205280379646963a889f2c2ac67b9af99803d903d4b5cbd8e20d2afc8ace4b513e328d6256f66f87659b9409425d2ca SHA512 3a89a01fe99c3594e1134fec2d1523fde5f0df18d140c882a886689e521e37abb08b027e254b5328a94a058eddbc128891798982ca4fd9de1ca50bfe58b434dc
+EBUILD pytest-mock-3.3.1.ebuild 944 BLAKE2B 475efc91ea9f51771557b9ce15bc672087b94929fa2cfbbd989282ab5ba51cf48f8574b8a28f627291a77c19ff2f6c87598fd85ebad82fb4da8b0a19d1cd7f64 SHA512 75849d8f191d54f07f9725ce7d82bdb7ba1bf04acb908af06b01e5a6d3a91f73ac2c7174a4e2df6532f7f51deadfc0325cfe13bd9879a268fb610e21f4f0060b
 MISC metadata.xml 457 BLAKE2B 9ec62ff0eda60ae60bb1b63509ecc696ae4256d1b3ff00c9b7f834ffd735f87edef57ccbfb78a2f9002632c4287b581a8a81003c45601b314059675a8f2d288d SHA512 0defca8aefe2c6bb95d36112b14645d93c8bc5b8db08956b97b9a42cf4a7e1d97170068937e6ec818e43d4d6afd7ef414e1d5d7f4b72bae71291eeda9caf5c1a
diff --git a/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild b/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
deleted file mode 100644
index 8b643a363b3a..000000000000
--- a/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
+++ /dev/null
@@ -1,42 +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,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Thin-wrapper around the mock package for easier use with py.test"
-HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/mock-2[${PYTHON_USEDEP}]' -2)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	if has_version dev-python/mock; then
-		# test fails when standalone mock is installed
-		sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i tests/test_pytest_mock.py || die
-	fi
-	sed -e 's|^\(    def \)\(test_failure_message_with_no_name(\)|\1_\2|' \
-		-e 's|^\(    def \)\(test_failure_message_with_name(\)|\1_\2|' \
-		-e 's|^\(def \)\(test_detailed_introspection(\)|\1_\2|' \
-		-e 's|^\(def \)\(test_assert_called_args_with_introspection(\)|\1_\2|' \
-		-e 's|^\(def \)\(test_assert_called_kwargs_with_introspection(\)|\1_\2|' \
-		-i tests/test_pytest_mock.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH}
-	py.test -vv tests/test_pytest_mock.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-mock/pytest-mock-2.0.0.ebuild b/dev-python/pytest-mock/pytest-mock-2.0.0.ebuild
deleted file mode 100644
index 045b6a938e82..000000000000
--- a/dev-python/pytest-mock/pytest-mock-2.0.0.ebuild
+++ /dev/null
@@ -1,42 +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=( python2_7 python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/mock-2[${PYTHON_USEDEP}]' -2)"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/pytest-mock-2.0.0-warnings.patch
-)
-
-src_prepare() {
-	if has_version dev-python/mock; then
-		# test fails when standalone mock is installed
-		sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i tests/test_pytest_mock.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest --assert=plain -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-mock/pytest-mock-3.2.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.2.0.ebuild
deleted file mode 100644
index cd95af08b9b4..000000000000
--- a/dev-python/pytest-mock/pytest-mock-3.2.0.ebuild
+++ /dev/null
@@ -1,37 +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,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	if has_version dev-python/mock; then
-		# test fails when standalone mock is installed
-		sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i tests/test_pytest_mock.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest --assert=plain -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-mock/pytest-mock-3.3.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.3.0.ebuild
deleted file mode 100644
index a646df8a08aa..000000000000
--- a/dev-python/pytest-mock/pytest-mock-3.3.0.ebuild
+++ /dev/null
@@ -1,37 +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,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	if has_version dev-python/mock; then
-		# test fails when standalone mock is installed
-		sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i tests/test_pytest_mock.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest --assert=plain -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild
index bc5e1e840ae8..9671b4ec0572 100644
--- a/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
@@ -14,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"