5 files changed, 4 insertions, 66 deletions
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index ffc505b6551a..64e5174ed72c 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,8 +1,5 @@
 AUX sh-1.12.14-skip-unreliable-test.patch 317 BLAKE2B 3c45673daeec13cbdf851dd97061df85c41783a1b5d760d9d45386b8b4e3f88e25e3f98cbdbce44796e5803614d5474444e554d305089d098fab2cb07075cf71 SHA512 6adc7fd1e2a9f52804272bba1d83eddd6db82b4b67569fc75d169794a19c505d51fd53c949eaabdeb775119a5e3929902c2bbf3883ed299b2de0e4faad597835
-AUX sh-1.14.0-fix-sleep-test.patch 1231 BLAKE2B 290a33009a7046d2a461e623e6e3fd7789ea04a2a54cb086f98bc7fcecddcda6cb3ec3d85429107688ac4d1e5e3dc7555dc924e64241f54fe1875832ce8651dc SHA512 a69ae0ef2b1637cfb579a2c7c4de903f191af9e32f1347add26a2efd32ecb6085799b5cbc96eddaa59d6cb4a9164f61df54b5ec1449b98705fac60526a2b3ff2
 AUX sh-1.14.0-skip-unreliable-test.patch 237 BLAKE2B 55b600d9426f127704cb698bb4df90b103b0ee08d29165f4d45e3fa56f1c0e20d3ab63b404cfa8d2bc372549a77474a2396903081c606516837ff295990eb47d SHA512 632f195df6a85cd65890d093400f4fed099c2344fe4e7f9d46f3decd817405ea587a18b271da3449088cc23519b5f16b30a2030a81d3bfcee30d4d55c591d5fe
-DIST sh-1.14.0.tar.gz 63313 BLAKE2B 9975944455077729d172a34dcf7847930f9bb943d5345729a9c09afeb411de72b59cd5e4f1192406ba8430a26439acd2ee4d477b10f31b5e55be936c711f70a9 SHA512 816c0562f4f779ba79b5206d151893cd5043898d1b74ee109c0ea67f862a097ab9c7509e4a20459fc623f14fa3fb1a9e2a2ccec8257a68fcba14414779a20128
 DIST sh-1.14.1.tar.gz 63317 BLAKE2B e4439a54d4bf2c106ae5217b55d6fa19f2bc369fb63e8515954a017fd2e98eca88fce07ea3efa70b3c427826bec657aa75c057a09c88de76c1595ef89465ee32 SHA512 9a4d9b841e81ae465b036f3fbf5e8ca277b090ffada660b17e9c2c457e09f7dbb0038b687fc0c0f4a6d575a55deb451c572a60f92f8c8d18ea65d6d902abb9b4
-EBUILD sh-1.14.0.ebuild 670 BLAKE2B cf5c26a6e9badefb7b18fb088e2dd0fb7f5b0049dcf444979209d4f4ae66cc98aecaddb792e0300c81f68533a2152545eafe41b17f0b8285fb7195bec9084096 SHA512 061db572ff56d84710023aa9c0cd5eccd67ab2142751bab19f80990f4898b81496729683854fb1ad3b46cebd0d295d03f7a23d95a2512b0e27bf70877cf9ce69
-EBUILD sh-1.14.1.ebuild 583 BLAKE2B 544da65ace9dfc530ef5adccbe666073a14a806d9312f10b0a1751ebb45a57debe0a0fd828ca3cbcdc24d1d68ca4d355d7f19a39a7f3f36e2a56d3a75af4aa8b SHA512 8c62419e0a896a23cd0941ef6464b811081a22dc8c76c5deda4ed51755f84962eee571fdcdcc6205e34ce7d548375d186b54f327dfd15a619486f36b1e32ead2
-MISC metadata.xml 676 BLAKE2B 217e170b6b5cbfba2e5029c250dba3927f3cd2b3bbc5111cb5ea459fdcc1bcff0448a8dd2e4e2d8afe42f459e7a485fe4fe04202e9c253bd51f785eec216eb5a SHA512 4d4633de70608259eb2bb288af89992c90fe192258ac157d07f2d568922a88b497cf6a3e2961b266603089e55ce7cfcd7ae2831879ed9afce4c3c740479c2756
+EBUILD sh-1.14.1.ebuild 581 BLAKE2B 969a5b1c3cac88573a3173f8b0c701fa269a4377160ef84708ec87ef27706a583a2356f03fdc179fe23db4ef032981a01da254aa59254230fc7b77f2facf6c0b SHA512 8485ac067a2d5670af7da3d5a057896775462f9afc0990e9a0cf612360113f542493537561b5503bafc9d13ff00388d64e8d4573346aedbce76a2fd3ef52f98e
+MISC metadata.xml 700 BLAKE2B b28a6dcf657471c09605d90f1dd4ebe20d793939d3fe4efbec1365d8ad9deb93b93fb7d2686c77e05f03421f5914d44694f8828d54cb72d48f15f50c35b92aba SHA512 64fa8aad2743f7ebdb43475c3528a214ec2d2fc27a9147ec33fda61c97d5a08efb8d9d0786a34d16a0a5da34005654c75475dee62c46db9932b73ac4747c18cd
diff --git a/dev-python/sh/files/sh-1.14.0-fix-sleep-test.patch b/dev-python/sh/files/sh-1.14.0-fix-sleep-test.patch
deleted file mode 100644
index 28d1ec9847fd..000000000000
--- a/dev-python/sh/files/sh-1.14.0-fix-sleep-test.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 83b189de4f461ed0370b0472f1938d3162ed00c7 Mon Sep 17 00:00:00 2001
-From: David Runge <dave@sleepmap.de>
-Date: Tue, 1 Sep 2020 23:18:13 +0200
-Subject: [PATCH] Remove hardcoded path for sleep executable
-
-test.py:
-In test_timeout the path for the sleep executable has been hardcoded to
-be /bin/sleep. However, on operating systems such as Arch Linux, Fedora
-or Solaris the executable resides in /usr/bin/sleep due to a /usr merge
-(e.g. see
-  https://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge/).
-By only checking for the name of the executable and its parameter the
-test becomes more generic and thus can run on any (Unix-like) operating
-system (given that `sleep` is in PATH).
-
-Fixes #539
----
- test.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test.py b/test.py
-index f8029c04..142fcc0d 100644
---- a/test.py
-+++ b/test.py
-@@ -2014,7 +2014,7 @@ def test_timeout(self):
-         try:
-             sh.sleep(sleep_for, _timeout=timeout).wait()
-         except sh.TimeoutException as e:
--            self.assertEqual(e.full_cmd, '/bin/sleep 3')
-+            assert 'sleep 3' in e.full_cmd
-         else:
-             self.fail("no timeout exception")
-         elapsed = time() - started
diff --git a/dev-python/sh/metadata.xml b/dev-python/sh/metadata.xml
index 07e719850609..4159bcce4b33 100644
--- a/dev-python/sh/metadata.xml
+++ b/dev-python/sh/metadata.xml
@@ -15,6 +15,7 @@
 
 	sh is not a collection of system commands implemented in Python.
 </longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">sh</remote-id>
 		<remote-id type="github">amoffat/sh</remote-id>
diff --git a/dev-python/sh/sh-1.14.0.ebuild b/dev-python/sh/sh-1.14.0.ebuild
deleted file mode 100644
index 81607b3f3c8d..000000000000
--- a/dev-python/sh/sh-1.14.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python subprocess interface"
-HOMEPAGE="https://github.com/amoffat/sh"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
-
-PATCHES=(
-	"${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch"
-	"${FILESDIR}/sh-1.14.0-skip-unreliable-test.patch"
-	# https://github.com/amoffat/sh/pull/540
-	"${FILESDIR}/sh-1.14.0-fix-sleep-test.patch"
-)
-
-python_test() {
-	"${EPYTHON}" test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/sh/sh-1.14.1.ebuild b/dev-python/sh/sh-1.14.1.ebuild
index 27df45dc064e..a29d303bb894 100644
--- a/dev-python/sh/sh-1.14.1.ebuild
+++ b/dev-python/sh/sh-1.14.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch"