6 files changed, 3 insertions, 110 deletions
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index a06985668cec..de5f8e75d59d 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,11 +1,5 @@
 AUX sh-1.12.14-skip-unreliable-test.patch 317 BLAKE2B 3c45673daeec13cbdf851dd97061df85c41783a1b5d760d9d45386b8b4e3f88e25e3f98cbdbce44796e5803614d5474444e554d305089d098fab2cb07075cf71 SHA512 6adc7fd1e2a9f52804272bba1d83eddd6db82b4b67569fc75d169794a19c505d51fd53c949eaabdeb775119a5e3929902c2bbf3883ed299b2de0e4faad597835
 AUX sh-1.12.14-tests.patch 1261 BLAKE2B 57c41b50078596998758410f79f0c54458b7884015382f28c82c893223620b42191d19f7fcb4a7065c38e6f2c35ee3e5e3c238667154aa0a2ad3ed6c6e342664 SHA512 e31ef40766e793e1717d15a537a30bf184cdee767d97b06b073074e0545c7d7fbb6a215e21d86ac70e0991a2a4d1bc35165442414ffdea4ece9a7c6a0c73952d
-AUX sh-1.12.9-python2-unicode-tests.patch 674 BLAKE2B 18153eb571fd50faf9c4e733b53f63f0630e7cd172eb5e5bdc04f550b49e247e9bdfecd6fc81868125c270e21899de29cc418e807d6b26df5ea8dd97a85d5b16 SHA512 c33cc195c54232dc7790aba2b34750f623a00ada51f55fc5da3ff9979f2c83359a904e47c0c3ded9f016ff256fafe5099be824261d91af0603f2d714c01e2342
-DIST sh-1.11.tar.gz 36821 BLAKE2B 30ac7cdb814b307c810190deea54f819d7ad3d134440040c5e0d1718b970331ec4764665f79784acf40b3905da074c19e9dd0338f7306e07d086a583dd058517 SHA512 ccaf178384b5a609c00bb44796a6bec088750414385f19b2d8ffcb93cc8f5ddb6bf82fb966d2bf519651f6efed54258a3c6542a9827d01e6be64af8cb8f86d3d
 DIST sh-1.12.14.tar.gz 56861 BLAKE2B dcab86c518fdfdf763053f05a6701fbd0faa76e05d710d6ef709dca89b7527157385ecde355f5f358ba08f7da8e551712732ef43f3074f5568fc7092ed12f014 SHA512 5f2daa2666cf8efe90ba550c8ea5875f2a8812d787597c9d9b933f58feccd192e1ec0ab5695b756bdbfbf9748d106c2045be20838e680b31dac3f778970b5786
-DIST sh-1.12.9.tar.gz 54077 BLAKE2B 6a63a07fe82479388e5d84655d7a22d01fb2be2cb858884f2f69799aa3390443cbf7e6d42b640be6432239ab5d1a0db0b69f1e39bc3e30719dbba78c6fc8f5f0 SHA512 378ebfe148de6d1fb0f6488a42a39570f1fde6bb2d3ce40cbe29a6920e102f4c31d38a686663e52b2968099d85a0b5867e112c5d53ca0a4527a2f2bc9e607d35
-EBUILD sh-1.11-r1.ebuild 505 BLAKE2B bcdda93f27cae340b57c54df8cafc2a3076b88e93a3ee3b30345711bfb945c836288d95832a3e4f9c6e5d2fef5bb66b77d6c275e1e83595c5c66e1a9197c471e SHA512 2b7b8d5f0e95e71f22a035cf42a95c51799d5c092c429ee39a1acedc22ca0dc46d0d96a0df55d0a9300c0482ad2fbe91f0252b7a64630b64b7783dd937a5c452
-EBUILD sh-1.11.ebuild 495 BLAKE2B 550a3fe10a5e82fa8c251bc61dee8fee805b45938d07dc1202895563ff59fa3a2e1bf635333fe53222834461b339748b12f29317baceedb76b188a5de3210467 SHA512 5e3c5fafa966277c1d227079ff70fa340f6c4b3e7f48ca3bf93861f1980c7e195cb7545512cbb11234e9b7136a06482826339e4cb33375005d096b05d13047aa
-EBUILD sh-1.12.14.ebuild 672 BLAKE2B a644f818667bb00ab0423caa3291f68276e25289ab9b7b5a7c07895c70f3e8fab657337c0b6c4b1ac964da86300167a1dfbf6db735d421c4fa96209919255f64 SHA512 7559fafe47d08f47e21fa36b4016f4bd24528576401462a2960adfc08b6ef5ab4d734092cdb8f7b52cdbf3e6d4a81405cae4bd075f7a55d03fce69e839040cd7
-EBUILD sh-1.12.9.ebuild 575 BLAKE2B 117dc214f33b5820d3f2c36ed55b09018f75765ac3cef57c5f461fcb488bc82499e538f7255412aa14030a758fa25375e118c79a81c9ad0d960963cc00239971 SHA512 b300e0ea0b7863b4d3165a3f537c4ed95880ac4d3f6e6ba8dd28d56ea315ecb84330c561447232d2e5ffce314bc92cd08f4e024942e1c7f937b5ef0233db894b
+EBUILD sh-1.12.14.ebuild 667 BLAKE2B bcaf7fa8b7160f5126103efb90745449fad781392ba4aae7ab10e6a6d1a02291f6fd402cfe3e42102327f13790c42803d40e10a89c2bbea24c11ae0dd3d21a9f SHA512 5ee9a0bd52d1579ccf77498a7b97e697caa10818e514b58603750ae91e2178e5208340deee7313a2256930e6122277f1a71295d7d731f2b285e17d6ee34fa74e
 MISC metadata.xml 676 BLAKE2B 217e170b6b5cbfba2e5029c250dba3927f3cd2b3bbc5111cb5ea459fdcc1bcff0448a8dd2e4e2d8afe42f459e7a485fe4fe04202e9c253bd51f785eec216eb5a SHA512 4d4633de70608259eb2bb288af89992c90fe192258ac157d07f2d568922a88b497cf6a3e2961b266603089e55ce7cfcd7ae2831879ed9afce4c3c740479c2756
diff --git a/dev-python/sh/files/sh-1.12.9-python2-unicode-tests.patch b/dev-python/sh/files/sh-1.12.9-python2-unicode-tests.patch
deleted file mode 100644
index 230b16ae5fb1..000000000000
--- a/dev-python/sh/files/sh-1.12.9-python2-unicode-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/test.py b/test.py
-index 78e00ab..0487594 100644
---- a/test.py
-+++ b/test.py
-@@ -502,7 +502,7 @@ for key in osx_cruft:
- print(os.environ["HERP"] + " " + str(len(os.environ)))
- """ % osx_cruft)
-         out = python(py.name, _env=env).strip()
--        self.assertEqual(out, "DERP 1")
-+        self.assertEqual(out, u"DERP 12")
- 
-         py = create_tmp_test("""
- import os, sys
-@@ -515,7 +515,7 @@ for key in osx_cruft:
- print(sh.HERP + " " + str(len(os.environ)))
- """ % osx_cruft)
-         out = python(py.name, _env=env, _cwd=THIS_DIR).strip()
--        self.assertEqual(out, "DERP 1")
-+        self.assertEqual(out, u"DERP 12")
- 
- 
-     def test_which(self):
diff --git a/dev-python/sh/sh-1.11-r1.ebuild b/dev-python/sh/sh-1.11-r1.ebuild
deleted file mode 100644
index 809a920a6c82..000000000000
--- a/dev-python/sh/sh-1.11-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(python2_7 python3_5 )
-
-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 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	${PYTHON} test.py || die
-}
diff --git a/dev-python/sh/sh-1.11.ebuild b/dev-python/sh/sh-1.11.ebuild
deleted file mode 100644
index a1d927e6592b..000000000000
--- a/dev-python/sh/sh-1.11.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(python2_7 )
-
-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 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	${PYTHON} test.py || die
-}
diff --git a/dev-python/sh/sh-1.12.14.ebuild b/dev-python/sh/sh-1.12.14.ebuild
index 2d02b529b89a..3e665fc94200 100644
--- a/dev-python/sh/sh-1.12.14.ebuild
+++ b/dev-python/sh/sh-1.12.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sh/sh-1.12.9.ebuild b/dev-python/sh/sh-1.12.9.ebuild
deleted file mode 100644
index 4f3271d0964f..000000000000
--- a/dev-python/sh/sh-1.12.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-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 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/sh-1.12.9-python2-unicode-tests.patch"
-)
-
-python_test() {
-	${PYTHON} test.py || die
-}