gentoo resync : 22.01.2021

4 files changed, 5 insertions, 43 deletions

diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 8ebe45c254e8..8de55055cb92 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,7 +1,5 @@
-DIST pytest-mock-3.3.1.tar.gz 27551 BLAKE2B 9e3602b988c0e27caa295d42d7400cbe7e3e30392511e662fa6ec16ec9fa4ef776d3e64b63b0345d1b520f753c6776103f507f91f0bad022544bfccc510b7e6b SHA512 ffd53974f82f725cf3bdbe750c1deb568ad1a12a67532eca93ff28d80b1cbcd8ebf709985f5473717c9d54345b251c1627c0567821e9e8b9e102db5c16cf7421
 DIST pytest-mock-3.4.0.tar.gz 28115 BLAKE2B 0a7f9098955d57f7121c04f7ab706dd67eb52d8ec0b2254552460eb90b2e3fef3cd3b925cf46619532ffe7bede2f208bf822e465647f3ac4504566c18ff58a75 SHA512 5456b60bdd06a63859232b28aeb79be643e8298e69ae103cb6e194891987e01b17771ad895dfead97fa45531959689fb202bb1ebc9ba44491098760c10d1ef43
-DIST pytest-mock-3.5.0.tar.gz 28903 BLAKE2B 39490d30546ad7419a16309a60cc7a3d8090cb38c11ca89d41034264147501fcd1ca52b26d391425df043b7234a0dc0b1255b973f93c8f40898a19d364df2e77 SHA512 ca85c49144a2dba83b4e3c5cfc5a82ddb631429271a4b87af686ba738f8137fe87db22121e4c04d04038c0bc786a555e882bfea21d667d1ed9f67c21b208d4ce
-EBUILD pytest-mock-3.3.1.ebuild 955 BLAKE2B 3206260037284cdc8f2d6b7c521a58225c149e99d97475087bf39170bf26b75c69ce0f683b6e564d779f342463a7afd9f697579207688ec336399ca546e18a4d SHA512 a1648c76ad6e4e4cbcf89b221adab82d51089d0dae49358456907c5a8980bd3106cba2b7e0aec344e166334534c5732653204fa1c047ad060729a9868933ed26
-EBUILD pytest-mock-3.4.0.ebuild 963 BLAKE2B 97ad64c97530064e3957ceb7ef7642e76c9c98384e056db8889488e11c9f4f5c9cbeb52a9575aec6934850ef73432a8d1a503fae2ec9b0b96cdd388e3afeb8aa SHA512 9d80293fc9109c11c89a02e78b8fd3d32089ff6086a9cf1fc4920fcc87d52acc23aef64875ccff76c373f13b1a3e646ef7393c238008277b3132a444d485b7cf
-EBUILD pytest-mock-3.5.0.ebuild 963 BLAKE2B e24095c69f723392adc6f18a69f329cabb8e4b07d3f5168c273b3a71fabd6945de2b2cc8aca55c7bd76a73c31b7e43c0a5ba9f5ef39805b3e6da00c28493c0a3 SHA512 8abc312f9b975075bb1eb6953ee7046281b8d70acefbbd3c7b341eed5898bc8c22a7c3af6125c2e048ecbee528c7afee96bdce9061a1090db866b3cea8334b19
+DIST pytest-mock-3.5.1.tar.gz 29135 BLAKE2B f9eb37bff0965772919c359ad56a0cdd0cac24fa763685c42ffaa2dfaea183a9c0be480269cbfc80990baaf406021c541b6dccc09602e98c8f731bbd530e928a SHA512 28ab2f239d3dfee134dd4e4fd467109cf3c76cb60aeb537dbc0c21b9a7619d068d54737e33d98c585e9341588fdafba4737ea5f428af37796f55e61ec30373a7
+EBUILD pytest-mock-3.4.0.ebuild 955 BLAKE2B 2fb63999ee7d8980209b07f4327dc4c1a75323045715dbbf00075969e69a10a9ded621f44ed18a21a4c68c76185b574ac94348e8d20de2f7195d52e44b7f575b SHA512 2cc14ebffc9670e7c3909f51ffc8926458971e10ff29c60865838b01c7c93e1420f5a1daf6ad3ae65aec1a501835acdd894c1cec1982dc0e4462a8c7fc6ddcbe
+EBUILD pytest-mock-3.5.1.ebuild 963 BLAKE2B e24095c69f723392adc6f18a69f329cabb8e4b07d3f5168c273b3a71fabd6945de2b2cc8aca55c7bd76a73c31b7e43c0a5ba9f5ef39805b3e6da00c28493c0a3 SHA512 8abc312f9b975075bb1eb6953ee7046281b8d70acefbbd3c7b341eed5898bc8c22a7c3af6125c2e048ecbee528c7afee96bdce9061a1090db866b3cea8334b19
 MISC metadata.xml 457 BLAKE2B 9ec62ff0eda60ae60bb1b63509ecc696ae4256d1b3ff00c9b7f834ffd735f87edef57ccbfb78a2f9002632c4287b581a8a81003c45601b314059675a8f2d288d SHA512 0defca8aefe2c6bb95d36112b14645d93c8bc5b8db08956b97b9a42cf4a7e1d97170068937e6ec818e43d4d6afd7ef414e1d5d7f4b72bae71291eeda9caf5c1a
diff --git a/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild
deleted file mode 100644
index 48dd889e97f3..000000000000
--- a/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild
+++ /dev/null
@@ -1,36 +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 )
-
-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 ~riscv sparc x86 ~x64-macos"
-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.4.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.4.0.ebuild
index dc04d9251c5b..f0b059648691 100644
--- a/dev-python/pytest-mock/pytest-mock-3.4.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE=""
 
 RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-mock/pytest-mock-3.5.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.5.1.ebuild
index 8f3aa84f0a71..8f3aa84f0a71 100644
--- a/dev-python/pytest-mock/pytest-mock-3.5.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.5.1.ebuild