gentoo Easter resync : 12.04.2020

4 files changed, 3 insertions, 54 deletions

diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index d662a93043c5..de24c42a4de3 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -1,8 +1,4 @@
 AUX pytest-timeout-1.3.3-tests.patch 1113 BLAKE2B 88e8158169bb254b4c36c6eb3a32a4f9c78b3e47ef080e2d28703ef0826267b3c925bd6de84b72f1e5b30b4109fcc99fd830704f2790e5505d5974eca90af676 SHA512 3543b0240d17a7e6e3aed29553e22a9638b285817110dd1fddbc26f667ab3c00864572ea4f9e4564c81e7dca60203b24e7ea2b317b6e328a48d518853e7ea26a
-DIST pytest-timeout-1.2.0.tar.gz 13258 BLAKE2B 71c137fb0440c15cc8285b4bef51405a6b53deb850c109d1a892159e8758c712e9d1bae8f400adadf1b85cf399c0b87bd2cab51d959b4eb68023052f6c42788c SHA512 b86548843e9ff8c8f7d1c39735025cdfa98befe2860e2a8a5d422d08bd7f542032384f147125a2a2841268154cc3a3874ef0aa4765d454fd5390edb773b106ae
-DIST pytest-timeout-1.2.1.tar.gz 11498 BLAKE2B 65b50ed52409ed0031c7c9b07ef5b96c088cdf98c0155c1a6405e701fbddc2da1070a9f5a63e22428bd2d18e0ad4eec4050239f7d786fa854256c86eb6be0b1b SHA512 749a0dad83b82e93a97a8590900f2285679ec368612fdcfe3f5f7a5b64774ac85196dc31df111c6a99efda92dc03f751f17ec20862bed1f6aea7d7e4140a06bb
 DIST pytest-timeout-1.3.3.tar.gz 11627 BLAKE2B e20348cc461ad03e95c22a16e753b72441ee70da9769214f4d07db15818a8997339ced47244b15de62a61107eb749dff8d6f41ddb4720c925ef1e6eb9962db27 SHA512 633f5aee550d568e403b958f4490ecb828eb322811c9f18cfefb26613be4fc36da14232ecbef8666fcf2dc693a93674c00a853ab546ea8328a07ea34da79fb84
-EBUILD pytest-timeout-1.2.0.ebuild 540 BLAKE2B c9271d3855ee6b87dffdc6acfdfd3ba5113b4e951149457b0626eda6538ffbf9068f9bd568442ddfa2b8651db7715ad8c14e9092538faee071c38220467cc665 SHA512 f8fd110f226e3beec669c3f7369e7cbb1029c7e77484ba33229187f0a60ecc566941d1a6a878b7d590be9996367db17c1770fbc6618bf5d67b09bf15a93e77d4
-EBUILD pytest-timeout-1.2.1.ebuild 555 BLAKE2B 39309d15a78bf9941db052ca743e5d7c722ffe3a5f2c71942d7f4214a094906eb091c14d69c2c0bce71db9365ca381bbe22b7933405c9e94717735b3bce6a4be SHA512 37594de2fbb33e6e9d0c87bbb75d3d7945df57c2ba4bfa0b248abd55620b12cbcf77b00a3fbb301f67b4a3d777bfdf25b914e9556202f900d23497582fe63ccd
-EBUILD pytest-timeout-1.3.3.ebuild 694 BLAKE2B e471e48b4638ee0fe26ae47d359bc4e5850bc3f150742111f315973a6c52e2d646e15e9e60f7c89d3181ad3bd134d7ea12fc6b5efc5b5ee5bdf4cdef542eb1b3 SHA512 e550b0425ba6db1ef531d33dd30ba4a1b8e57abe89fc5a3c1e2ccf333ca28e0cf8a847fa542ffbdc76e6e4ed6d6f3e89d7e49713d102be6fb946d3699420a54d
+EBUILD pytest-timeout-1.3.3.ebuild 744 BLAKE2B e9e48f09a1fad311f0eed69375ac435d6dbdab42276eabd1ccd22b7683dc53784bf5a730f19db228fdf22b5c8917e8db92a2e0d253a9c332c1bf691f67ecac14 SHA512 4e0bfa5c627f8f2f3b998d8583c521ac6fbdebdede8e019260bd7b5af2b677ff1b6d38c3e178c7d47ebc2b1b1c6cf8c1bd483e28c4b9d096cfb4600de84ed26a
 MISC metadata.xml 327 BLAKE2B 23dc2e5e6f023223ab4774206b2d94fd27fc0a6b2592c8e0c317e1c1a0e7c26ed4f8e23187c5499b7fc9c4acc0df601a056ab1dced8115a47a9e72697037fa32 SHA512 6040289d134f65896f2fb80538d9caa4ce628911c5ed21568a30087d1b0ffb14b9acbf874956720b1d9c56290c78bb965ac9299bc400fd89a258f3627180780a
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.2.0.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.2.0.ebuild
deleted file mode 100644
index c1cb596f5d7e..000000000000
--- a/dev-python/pytest-timeout/pytest-timeout-1.2.0.ebuild
+++ /dev/null
@@ -1,24 +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="py.test plugin to abort hanging tests"
-HOMEPAGE="https://pypi.org/project/pytest-timeout/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/pytest"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	${EPYTHON} test_pytest_timeout.py || die
-}
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild
deleted file mode 100644
index f983aa28e6ac..000000000000
--- a/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild
+++ /dev/null
@@ -1,24 +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="py.test plugin to abort hanging tests"
-HOMEPAGE="https://pypi.org/project/pytest-timeout/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/pytest"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	py.test -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild
index ceee801bbcec..9925bb1f12cf 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
@@ -13,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"