gentoo Easter resync : 12.04.2020

5 files changed, 2 insertions, 114 deletions

diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 72c84c09a5fa..1f353ebde67d 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,9 +1,3 @@
-DIST pytest-mock-1.10.0.tar.gz 20754 BLAKE2B db60bfe6ee9d6d0a6ee4f0df7f5efa6ef05f5e2360945aa86ff6de02fc6a01f1e6715cbb61ced0c1e737c300965835fb08727b926852c5b71c0cc3d56c1171f1 SHA512 b8afba13da3e598b6493459298e395c0ecc06538733916659191bd5c5c22f40b0e296853ad940c16a6d492fcf46b2daf490ee589661d391e2c7cd1deb84da756
 DIST pytest-mock-1.11.2.tar.gz 22825 BLAKE2B d6843d1cb1afc0d5a242103ec4900d56418198b84fa037faf4b6841d7fbfd388273a819a26bfe051e6030690105e74211a27d2b864448598962b3e03788958fa SHA512 6dc927ce35001d088bddd9d79e024141b9e8163033b07af14b1f63330ef8b93dbf88649702f8fcc4f6ad314212fa5cbd39486b539811ec918450b3f7a716f96c
-DIST pytest-mock-1.6.0.tar.gz 17780 BLAKE2B 4fbc0cbd951668eb2ce427496c54e958591fe368bd42544eb1d0379adcb3d0e10b223ab044956e4003aac88665b3132dcb9d167442d6d85a5be79edea36881ca SHA512 c3b897be9156d57d7012e95b620c543500b849d7076224e3328d3783311210c57141dfb82c01bb98e5e419125dce0f68f6631bd610f4909f5ac1798458a7949f
-DIST pytest-mock-1.6.3.tar.gz 18482 BLAKE2B 1c0d366e5afd1b247ff454716b6d96d9d68846adfff81adc0ea079a72d3e7710fd9385122723cfee69965588235ec2deb1e0b52328ace5c967652c93b404cea3 SHA512 6857f373728d3f2c6b152d4f89da3590e2e74795695dc9f4f3704a4e0250e49d705ce0de4121a801ac35c83217678a95a5023338124293ca74db406941f5072a
-EBUILD pytest-mock-1.10.0.ebuild 1046 BLAKE2B 31d2747d8df4599de796a5d9bdd1b7836337bfc70dee6326da93d37ab879c22a23dc64599a2b4bb100c6a8c0a95e7ae4d1b58183a58b5a32425e1eb428e351ca SHA512 cd4ec2689198202824f75370c9b08f520fbd29ceba9ebeaddc18f5d2335ef02c1992f11688322f31263dfe8c9df77282f207e53de9649260711df4915fd3d091
-EBUILD pytest-mock-1.11.2.ebuild 1454 BLAKE2B ca49492fad98b46f59fee64e388e9314879d3069f1b8aa435f05ed271e08313fdbca69ca2aefbea7f20299bec79a4f26efe5cca4ac978b5dfa5f2b265e71b72b SHA512 4b5b565dbbc8d8bb1dc10b9e2ac5b6f62cfaa6f726f47ac73a865c9d3a8bf564631d920b80e14a75559ecbc5fbf58a15dd2ed46881eac84da4d797268e2770e4
-EBUILD pytest-mock-1.6.0.ebuild 992 BLAKE2B c830ed45e41f6ee28ed7caccec251fccbec6d12d387993d22ddaf584c9cbc0e9b7be4fde2bbc538fc952407bfbc1cc2569919d0512aff1862d2b4cba5e1deba1 SHA512 5081ce4e0e2333aa54413f6d3c680c2ed3ecf673385f3a037b178736896b84774fdb011cdd5a6a29261827fd9212eb7ea71076fa4764d9066cf3e777f5feb2f1
-EBUILD pytest-mock-1.6.3.ebuild 1046 BLAKE2B b7f09c9ea65dee2637f695e56bc8b248baa09f22180458681dbd60fda8a9c6130b324fde44a2c7d8a1c7cf872173fe78576de0b310d8e55c93da24588a443771 SHA512 880dc8ee5eeb892647929544d16af0210dd7b42b6a74d0e8bb2a05c8320b586ec59acaab0a2276ff06b38f9ac51dab3f20b2c01087ea5c2ccc5d3b00a9f9c0f5
+EBUILD pytest-mock-1.11.2.ebuild 1457 BLAKE2B 76254d6fd520c00584141fac23171e64ca6d5679f44015113b76dd8d054162f48fe9312ed523bb5a1ad7a0b2ee7f3cd3d0b07dcc639fc0ae3d25c8d65b8d9b6a SHA512 0edf6e730bcc1697d9f73cf62c05fb5c4a4dcf404d859de16d68825a0f1f60609c6ee335c9a3f96eb3caf7143facf8af7b776f060456e3974628d13aee0a656c
 MISC metadata.xml 433 BLAKE2B 78d844dea9620760c0766eda59e09f93248fba58778f26fb4dd53e864ece455ede7299db90bec0fe11fdf64b762e2c660c260ce10e3758bb8e25024b1bf2877f SHA512 16324c7a2ce4e3e7261b9be389d646ba8e797719b6dd6782fd66311aefa262e338bac99c09a9399d55b362b941cecfc8039fa14e53b79e214359ba6d294c9529
diff --git a/dev-python/pytest-mock/pytest-mock-1.10.0.ebuild b/dev-python/pytest-mock/pytest-mock-1.10.0.ebuild
deleted file mode 100644
index 898f8bbeed81..000000000000
--- a/dev-python/pytest-mock/pytest-mock-1.10.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} 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 ~ia64 ~ppc ~ppc64 ~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 test_pytest_mock.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH}
-	py.test -vv test_pytest_mock.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild b/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
index 9d438f900a95..7a3edcab327f 100644
--- a/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild b/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
deleted file mode 100644
index 27fa9101a9a4..000000000000
--- a/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 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 ~ppc64 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 test_pytest_mock.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH} \
-		py.test test_pytest_mock.py || die
-}
diff --git a/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild b/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
deleted file mode 100644
index 22582207b5ad..000000000000
--- a/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} 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="~amd64 ~arm ~arm64 ~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 test_pytest_mock.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH}
-	py.test -vv test_pytest_mock.py || die "Tests fail with ${EPYTHON}"
-}