gentoo resync : 25.08.2020

4 files changed, 4 insertions, 56 deletions

diff --git a/dev-python/pytest-services/Manifest b/dev-python/pytest-services/Manifest
index 260b6c768454..a298f9c0909f 100644
--- a/dev-python/pytest-services/Manifest
+++ b/dev-python/pytest-services/Manifest
@@ -1,7 +1,5 @@
 AUX pytest-services-2.0.1-lockdir.patch 1085 BLAKE2B 09982cf4874d82a332b441e4538d1fb177735af3acb2ba2d7fed9c0a2ef006841ca0c4221fc51c0472a0a94c49bbcb72877c67b5c7630333f550e3fda1b5aa91 SHA512 7b5d4d5adb722936bd3593ed4e12fa2ca9bc3aa764565d9cbbea2d70424d9811d5838e97bbbe8fafa2f73acb8bdfa6c705e8c4aec12b5b6556b1e4c8db629ea9
 AUX pytest-services-2.0.1-no-mysql.patch 821 BLAKE2B 3a041e51c0e2c08ce8727eccdbfac36eacec2542d8d8cc7ab7544f46916b47a62e960437821f8fa85fe968b9e68808b94d9ac51fe06daf487008bfaf305ba81e SHA512 68788f6b6700793df2de4fbae85a41fad095f09ac9af717c786305fc1ca6b29438a65d096076b9469dc543a54ce8f72a40dc0f211eb9d517e658ce068e60ee23
-DIST pytest-services-2.0.1.tar.gz 20386 BLAKE2B 5ec94fdd0fbc5990216fcbae112973fa8b41902a6fa666dd4c5dee2422f76e128ce3a576ec93ecb86bddff5f6bca0e1afaf791583bd275b2543d0e780e45014b SHA512 445cd5346f0c19b68014eb3c27b06376ae6699e31d8c1fee0cb3cda6e927d0ecadbffe3b0b832dd38fe63bc1fe4e3108e2ecbcabf0641af0bdbff019681f0576
 DIST pytest-services-2.1.0.tar.gz 20552 BLAKE2B 6359c419591efed553e095e267c24f78f36b152f0eefe21d46742f7c15f05e92a9e86891f99762a3716fef5284b00d07d8d6eb825008dbbbf07e36dc62a7a6b4 SHA512 54a487546a2af7996acdbcd63bfc01626832aa41683617cdd345453cf6518afdf03cb8c2465e1f5d28c88b2cc801ffb0d9d4440582865f899e21fe42ab431ebc
-EBUILD pytest-services-2.0.1.ebuild 1228 BLAKE2B 3d933dfc11cb8259132329a6150dd7e817afa0547d81182e0b347bf1c9e99c1849dd5d61e9975927200c22c1f02fe2ba30b519a687701bbd2b1268b3a0db791d SHA512 a3bc05992dc5b07989abc3d99ceaf88448120ffa8355399adb062034f27b5851be1f054a39483b6abb160d307d755e6a812a571c0c49203b9de28c14988b23ee
-EBUILD pytest-services-2.1.0.ebuild 1230 BLAKE2B 5e7b007cd22490b6ef8790651ffe1bfe2b4fd6cd9378541fa8fee3df3955267040296a842339491bf8b915af7daaa2b89dce38ecbfd73fc4f7c270c58ffd57b0 SHA512 f1e5970a319ac54f3b5b7a19197258a1efa590acd6fc170a71f15a868216a2e2b2761d8fdf65ea059a7495656e8ca30410475f13e66d6101c0168042e0dd4e98
-MISC metadata.xml 384 BLAKE2B 3b55101f9c900a8570344ac9335687f3c505f5055022af866fe090878b2b44222a311d3166103e16be780d28a84d9142416acf2933be1a01712587910f7c5d77 SHA512 b18e80dac13f712ff61216f2b23f7c33fea7508634ad523b67f232fcb8301000edff1ca92307834878b6392ea38be8f03118abd2dc55ff6b9c03c8c4dd342e4d
+EBUILD pytest-services-2.1.0.ebuild 1225 BLAKE2B 5f2c7bf24fd7af1ce364a2a9b87b4fb073aa00365e38c960c92970ac5d83718ce7dd1abb486165b29603c46f0a813552cd588ea87b2d537b47eb3cea7063c864 SHA512 c550e8b95d208a8cedc612917209ac4ab575e0d17030fd997aee1e5960823266072a93607c2a1214a9be4ba972a9ce956b4ec6dceb9974372f8e5759fd30dcc1
+MISC metadata.xml 408 BLAKE2B 84e0589c8c4d813b4542e5d3080ad855611c320c9d5950a08c232c9fa344bca969fa4b23cf6d2b427731d2d30c2f678d33605207042779ea40123c6b249017ed SHA512 de1340d8f01941355ec01b2f92b4e89ad798dd9438e858050861dfb8c139994b5e8fe620b00fcc8133204ba8d265eac36f60ba3bca3a4e0da49332da13b75a9f
diff --git a/dev-python/pytest-services/metadata.xml b/dev-python/pytest-services/metadata.xml
index e3205b37b69e..0d519d2171f2 100644
--- a/dev-python/pytest-services/metadata.xml
+++ b/dev-python/pytest-services/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-services</remote-id>
 		<remote-id type="github">pytest-dev/pytest-services</remote-id>
diff --git a/dev-python/pytest-services/pytest-services-2.0.1.ebuild b/dev-python/pytest-services/pytest-services-2.0.1.ebuild
deleted file mode 100644
index 8875cb0a0719..000000000000
--- a/dev-python/pytest-services/pytest-services-2.0.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Collection of fixtures and utility functions to run service processes for pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-services"
-SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/zc-lockfile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( ${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pylibmc[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xvfb]
-		net-misc/memcached
-		!dev-python/pytest-salt
-	)
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/pytest-services-2.0.1-no-mysql.patch"
-	"${FILESDIR}/pytest-services-2.0.1-lockdir.patch"
-)
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv tests || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/pytest-services/pytest-services-2.1.0.ebuild b/dev-python/pytest-services/pytest-services-2.1.0.ebuild
index 60d08abcefa8..08f343771474 100644
--- a/dev-python/pytest-services/pytest-services-2.1.0.ebuild
+++ b/dev-python/pytest-services/pytest-services-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 IUSE="test"
 
 RDEPEND="