gentoo resync : 25.08.2020

5 files changed, 4 insertions, 103 deletions

diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index 5c944a1a042b..981de324e817 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,7 +1,3 @@
-DIST PyHamcrest-1.10.1.gh.tar.gz 59019 BLAKE2B 1a090533ea8fe2dff9ad232b2e6dbf82841c38f3699e57750e2309b06a46e70ae5a9c7d087baf06de53e17323a5e36edee1a01d7a4442374d15b76a7723c2031 SHA512 f7e79f7d26c4c6add042052e451898bbf5adf21b05a234cc62bce890d68f5997693b042a9daf136f7026040a8ab7bf28b829288417b947973dcb959bf613a37b
-DIST PyHamcrest-1.9.0.gh.tar.gz 57650 BLAKE2B c497688f03ec3b072d8ab076fc096a442d5cbbd94493eae57779879ccb6f281477aeeb7f7a67e539442010e60194f9f04a6deddd1d2267e9743742b45433f124 SHA512 3a878637ed5138365416c170871a63640f089047b723c7ec8db893dd716c0b1cdad16a98584700405693b954af7d4868a8543d1a3fc58ded22b493c8c61661b4
 DIST PyHamcrest-2.0.2.gh.tar.gz 55491 BLAKE2B 749f227b8cb1180a64e24cdbf97b6f610b9871b21215a761642d19fdd43ad8e175718b12cfb0de2cdb5c6ae8c3c5271e04b7c3b489e01ac689769e24202ece56 SHA512 d6e510ca1e6533b425b424d411e23c4ee2a6bad2d635695e4e68f991fbdc57269c3a433361e431cb5dda7891278951d5de7a05f5c1c167714eecdaf74644d1c8
-EBUILD pyhamcrest-1.10.1.ebuild 905 BLAKE2B 503de3051f8cb82d602a0c193661fa6a6e5d5fac4913e92370504fea9522a80af5fa3c64f2e6ce6a81a0f6b9076bf3ee4a05acdcc1c0fc5cba39527a6b15e519 SHA512 aa475c5f14a7de091b2f3ea7883a7276621a59fd5d85c9447d2165a1b6b7716f9a2e50976ff1cc53e0c9c4568eec2fb937d82b186899d4d8d8331edfda7ecc58
-EBUILD pyhamcrest-1.9.0-r1.ebuild 1732 BLAKE2B 1462d6b579517b98dba0b0cbbba8794586ae6350f389f8c50bea47eaf43d3c34ec59407e6da42aecb4c40e88892236c9ba77dfe47b13c86624643f810f655905 SHA512 604cbaaf356da559abc145c90649ab0ab5e52c6c8fd19852bf8ea57e08c7e3b531580b7a2970681c61cd5159a08b57a82e58518e8a12b16682b688855f1175ce
-EBUILD pyhamcrest-2.0.2.ebuild 754 BLAKE2B 3bcc31478f8459da9dd0eddfd8cc393a17b8444e3cb572a4a78d00fb11b32aeb6209d3abbdc8cba10832290e63601620e37a5b4ef7426666f1876313fa71f624 SHA512 02cf49fc3ec5b4f93e3182008bd16794bc727020fb65809fc06f91cffe692d655689e070d2bd935cbe94441cbf8ead69633a1e9e8186ea1ae40fcad2036771a3
-MISC metadata.xml 372 BLAKE2B 73836583934bf3547c74ffa03d6187a30d71b50e6ad9d7b8c25a5f2fdbd276c735c3d3c39636aaa3e48c84daa0d559ee70621331c211a259148a771a7dc4f9b7 SHA512 7b8e3214627548449a3f0c6d70120978fd2afa5636db2cdfe0bfe71d5a2c46aa33975e29661afd851ce920508559c98d98285265297425b2ca7de043b887ac6f
+EBUILD pyhamcrest-2.0.2.ebuild 745 BLAKE2B 3b59e7a9ebf959a03278f4f1440de3715913ff9b60f3176be3c8cae2a105721e035cebd5e04494537a7e2d4f7378c928478d1905044f9fba004b0850572d274f SHA512 3a9bd0abd01d03493936c9f382727c549c341f8fdca375a891bf68b4fe6fb96158cd15e8c26ceef040bf804431c553b580fd1cf5e2d32422f845704c0ef848b1
+MISC metadata.xml 396 BLAKE2B 1086960a423e348fa862f395703ef468c4e2a5a362e8fa78d15cf8c2c0e56f8bc21627688c1295dc57014cdd91644ddd81037fb0505ef1f43e2e8c93bd9774a0 SHA512 cb07fb7bf1b7af660af9ab2cbba7f87a51afd254fbb5896bed0dfa07f98dc2a6d0361e567eb9cd240291cffcabc8eb3f3427809e1ce8b95b1de36d964d8262a5
diff --git a/dev-python/pyhamcrest/metadata.xml b/dev-python/pyhamcrest/metadata.xml
index bb75201b6495..5eb981bffdbb 100644
--- a/dev-python/pyhamcrest/metadata.xml
+++ b/dev-python/pyhamcrest/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">PyHamcrest</remote-id>
 		<remote-id type="github">hamcrest/PyHamcrest</remote-id>
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.10.1.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.10.1.ebuild
deleted file mode 100644
index 85ed0b0e2a84..000000000000
--- a/dev-python/pyhamcrest/pyhamcrest-1.10.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=( python2_7 python3_{6..9} )
-
-inherit distutils-r1
-
-MY_PN="PyHamcrest"
-
-DESCRIPTION="Hamcrest framework for matcher objects"
-HOMEPAGE="https://github.com/hamcrest/PyHamcrest"
-SRC_URI="https://github.com/hamcrest/PyHamcrest/archive/V${PV}.tar.gz -> ${MY_PN}-${PV}.gh.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
deleted file mode 100644
index 6c7080cb324b..000000000000
--- a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,60 +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..9} )
-
-inherit distutils-r1
-
-MY_PN="PyHamcrest"
-
-DESCRIPTION="Hamcrest framework for matcher objects"
-HOMEPAGE="https://github.com/hamcrest/PyHamcrest"
-SRC_URI="https://github.com/hamcrest/PyHamcrest/archive/V${PV}.tar.gz -> ${MY_PN}-${PV}.gh.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.6[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc \
-	dev-python/sphinx_rtd_theme
-
-python_prepare_all() {
-	# enables coverage testing which we don't want
-	rm pytest.ini || die
-
-	# Known test failures. Remove them for now.
-	rm tests/hamcrest_unit_test/base_description_test.py || die "removing test #1 failed"
-	rm tests/hamcrest_unit_test/core/is_test.py || die "removing test #2 failed"
-	rm tests/hamcrest_unit_test/core/isinstanceof_test.py || die "removing test #3 failed"
-
-	# These fail on HPPA. Drop them too.
-	if use hppa; then
-		rm tests/hamcrest_unit_test/base_matcher_test.py || die "removing test #4 failed"
-		rm tests/hamcrest_unit_test/core/described_as_test.py || die "removing test #5 failed"
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv || die "Tests failed under ${EPYTHON}"
-	"${EPYTHON}" tests/object_import.py || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild b/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
index ec73612b5ef1..0b57b1bb6ce0 100644
--- a/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 distutils_enable_sphinx doc \