gentoo resync : 15.06.2021

3 files changed, 2 insertions, 29 deletions

diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index 3a31caa678cf..76c36bb2166e 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,7 +1,5 @@
 AUX sh-1.12.14-skip-unreliable-test.patch 317 BLAKE2B 3c45673daeec13cbdf851dd97061df85c41783a1b5d760d9d45386b8b4e3f88e25e3f98cbdbce44796e5803614d5474444e554d305089d098fab2cb07075cf71 SHA512 6adc7fd1e2a9f52804272bba1d83eddd6db82b4b67569fc75d169794a19c505d51fd53c949eaabdeb775119a5e3929902c2bbf3883ed299b2de0e4faad597835
 AUX sh-1.14.0-skip-unreliable-test.patch 237 BLAKE2B 55b600d9426f127704cb698bb4df90b103b0ee08d29165f4d45e3fa56f1c0e20d3ab63b404cfa8d2bc372549a77474a2396903081c606516837ff295990eb47d SHA512 632f195df6a85cd65890d093400f4fed099c2344fe4e7f9d46f3decd817405ea587a18b271da3449088cc23519b5f16b30a2030a81d3bfcee30d4d55c591d5fe
-DIST sh-1.14.1.tar.gz 63317 BLAKE2B e4439a54d4bf2c106ae5217b55d6fa19f2bc369fb63e8515954a017fd2e98eca88fce07ea3efa70b3c427826bec657aa75c057a09c88de76c1595ef89465ee32 SHA512 9a4d9b841e81ae465b036f3fbf5e8ca277b090ffada660b17e9c2c457e09f7dbb0038b687fc0c0f4a6d575a55deb451c572a60f92f8c8d18ea65d6d902abb9b4
 DIST sh-1.14.2.tar.gz 63779 BLAKE2B adc9004334a53f3704e22c318df6b4f60fd9ca2d31f5a9601f84abfaf0fe2ded06938b165e10b1a977ed38fcad7d0fa08799f2f552fc2c6b9b4c2a6476477115 SHA512 b7917504ae85606e1986b681274077777ad3011639bfe933d4133c3ed16f930842e03b572caa396ca4d58f41fd5594bef776cc16c4b0fbd1242e57c6aad19e62
-EBUILD sh-1.14.1.ebuild 581 BLAKE2B 969a5b1c3cac88573a3173f8b0c701fa269a4377160ef84708ec87ef27706a583a2356f03fdc179fe23db4ef032981a01da254aa59254230fc7b77f2facf6c0b SHA512 8485ac067a2d5670af7da3d5a057896775462f9afc0990e9a0cf612360113f542493537561b5503bafc9d13ff00388d64e8d4573346aedbce76a2fd3ef52f98e
-EBUILD sh-1.14.2.ebuild 584 BLAKE2B c93cd7caa2f4d5aedcaa5df491b99c317257ccfac29668224ad9132d91d84350a3feda63dc34c97d3c234a893806cd49d9a4a0397243ddb8d131ae28bf214fc2 SHA512 d273225834f7fc5401bcd115c0734a8e62fb2b0531d299bbbd33c0930e3986bd4c97c522186f85eea80a410ae5d1efa304696ada1e6ab9680b0192d029ecc6f5
+EBUILD sh-1.14.2.ebuild 582 BLAKE2B ba1188b704ae54da2b0ea3ce64d86f1bb43c0d155423878bfcf1332e8e148000710384cd6db4257928dc876231fb5adbdca7433602464590f550ee095a176a3a SHA512 85a293b07b4de004b48bda9b3d6febafa865e4316e5181dcd8a8af94feccdfaebb9ccfccdc49f54a846c36ea39da7509a7158c0cb7b631eb016c88e1548a755c
 MISC metadata.xml 700 BLAKE2B b28a6dcf657471c09605d90f1dd4ebe20d793939d3fe4efbec1365d8ad9deb93b93fb7d2686c77e05f03421f5914d44694f8828d54cb72d48f15f50c35b92aba SHA512 64fa8aad2743f7ebdb43475c3528a214ec2d2fc27a9147ec33fda61c97d5a08efb8d9d0786a34d16a0a5da34005654c75475dee62c46db9932b73ac4747c18cd
diff --git a/dev-python/sh/sh-1.14.1.ebuild b/dev-python/sh/sh-1.14.1.ebuild
deleted file mode 100644
index a29d303bb894..000000000000
--- a/dev-python/sh/sh-1.14.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..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"
-)
-
-python_test() {
-	"${EPYTHON}" test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/sh/sh-1.14.2.ebuild b/dev-python/sh/sh-1.14.2.ebuild
index a8a1c5f8050d..601531575981 100644
--- a/dev-python/sh/sh-1.14.2.ebuild
+++ b/dev-python/sh/sh-1.14.2.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"