Adding metadata

4 files changed, 1 insertions, 61 deletions

diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index c2a35495ad0a..3f2e83390f0f 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -1,2 +1 @@
-DIST pytest-timeout-1.4.2.tar.gz 15424 BLAKE2B b7ab91833e59af56ae50c066c14bb9b8ae9995d1586f35b29f107665d7da124828d7accc1b0149702f2973c61f18024739c68de736ae8aae6f55e8a10bf5d4ff SHA512 3446ecdb5aaad5fbca12df4e7f4f40c6c1a12895d3ed9f3a3ee24800ce36deed3cb8c09a4cc72220c962b06f821cfd55bf7eebbca23664c56abf2d0e5bc8fbea
 DIST pytest-timeout-2.0.0.tar.gz 16210 BLAKE2B 8e3c0436147b6cc680540329daabd7269d301c95663599f7e9c64313bc3a45fde5cc5ea297d5b8c85f43d1a80c2db44b8e150877c3c7b29eef5e38426dfd4efc SHA512 96e9b545b4ac1e4a615863f69d190e0265e85f23dc12df51e9035b8e6bceff23279bb042eed83aa0ddd6d06b0e02a2dcc29ee352fd44cc86f0682fb328264645
diff --git a/dev-python/pytest-timeout/files/pytest-timeout-1.4.2-optional-cov.patch b/dev-python/pytest-timeout/files/pytest-timeout-1.4.2-optional-cov.patch
deleted file mode 100644
index 424cfa6c57d4..000000000000
--- a/dev-python/pytest-timeout/files/pytest-timeout-1.4.2-optional-cov.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 65a79fe8ceb52d7ae978f4a2ecc47a1fd34fda2b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 2 Aug 2020 00:11:53 +0200
-Subject: [PATCH] Skip test_cov if pytest-cov is not installed
-
-Skip test_cov gracefully if pytest_cov module can't be imported.
-This would help us since we're removing py2 support from pytest-cov
-but still need it for pytest-timeout.
----
- test_pytest_timeout.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test_pytest_timeout.py b/test_pytest_timeout.py
-index 16302d7..69707b4 100644
---- a/test_pytest_timeout.py
-+++ b/test_pytest_timeout.py
-@@ -77,6 +77,7 @@ def test_thread(testdir):
- )
- def test_cov(testdir):
-     # This test requires pytest-cov
-+    pytest.importorskip("pytest_cov")
-     testdir.makepyfile(
-         """
-         import time
--- 
-2.28.0
-
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.4.2-r1.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.4.2-r1.ebuild
deleted file mode 100644
index b9a9eb20f209..000000000000
--- a/dev-python/pytest-timeout/pytest-timeout-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} 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="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-# do not rdepend on pytest, it won't be used without it anyway
-# pytest-cov used to test compatibility
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		!hppa? ( $(python_gen_cond_dep '
-			dev-python/pytest-cov[${PYTHON_USEDEP}]
-		' python3_{7..9}) )
-	)"
-
-distutils_enable_tests --install pytest
-
-PATCHES=(
-	"${FILESDIR}"/pytest-timeout-1.4.2-optional-cov.patch
-)
diff --git a/dev-python/pytest-timeout/pytest-timeout-2.0.0.ebuild b/dev-python/pytest-timeout/pytest-timeout-2.0.0.ebuild
index c44e2bbb8a0d..6cdca5d547f0 100644
--- a/dev-python/pytest-timeout/pytest-timeout-2.0.0.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # do not rdepend on pytest, it won't be used without it anyway
 # pytest-cov used to test compatibility