gentoo Easter resync : 12.04.2020

9 files changed, 4 insertions, 364 deletions

diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index 301990119586..230b632eca55 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -1,16 +1,5 @@
-AUX py-1.4.34-skip-broken-pytest3.patch 3991 BLAKE2B 4bb850c5e89d3ddc88a70c055b0e909ef26d692f721138a756b9bac6c2714c26546a89b58615d419cce72f6e205d38679724cc2ca651eeca3d759d585ba96aa2 SHA512 c2070aef37a410a0a8f9cd273396a1820170578f19fe1a8aeaf355171a7c83717aa91fd7b4121d429169a3cb496de498763cdc347f7553b799040ebce6ac76f0
 AUX py-1.5.2-skip-apiwarn-pytest31.patch 517 BLAKE2B a086d8130c1ead322461e7d89249f07e2dd9a6eee4f7e878bd8c01cf19df695a6a5698ec0cc50770f0514cbedbd2aa88e3fc356a72c78eab4b6bc378b5d1f590 SHA512 01da1bb928fe3b22a69a439481a1ebdac790811da781b7ee497ffa1b7362270628527b33f2d5dc0e83ebc2e57cdaf9fbd2974735f580931222f33e543fd69762
 AUX py-1.8.0-pytest-4.patch 21458 BLAKE2B bfc44034bc01a7ada894bbddf8989705ea96d5b455f0eb45f14f63999e73ac94dfa1eb42698e13b5867d0fadfb58c75fbe1c9cc7e40f290145552c625b938b38 SHA512 cabfdb8cd2e229bfbd5e770a145dde60f9e649f683f8e3d57d2cf393a4d246fcb0eae4596cbbee010de97bfca26470a5dd4280d0f9e34d7f30df19b09f5ea8b6
-DIST py-1.4.30.tar.gz 191796 BLAKE2B 1d908f5f29788868cb7c4da49bc8a9343176030df4549a992e06245d1d56d74ddf0477048992d282aa59e6ace1ff695a7e2c2c6f00b55f185bc91d0df8b6a6dd SHA512 dd9d92f8eaf8e5fc61bfb7feb4b07df5ae1745ebf88bcbe9d62589caa9e1f7d8beae5b2d20b407520919e47391cd50cf2d5323556fa5bd90a37e120b1d394d7a
-DIST py-1.4.34.tar.gz 194450 BLAKE2B 3e5733bb53d4f7eb8e6d43a5140f2ddf692d4272b564a9dd4fe8ede2cb4d0296e7c8764957bf4615f5cc4272d07997d126133dfce8ac8837f01d91bf557023d2 SHA512 2e19c82c8315274bffe0ba2c7e20ae3af95f942c40c16121ec953af186f8ff33e8f427c070e137bb04b7cc6dcc6779e35df3911c08595fd3294b5ec9897706e1
-DIST py-1.5.2.tar.gz 189542 BLAKE2B f0c5995121492ebca7bab9e73b7db61edf014be8e7d76822c72ded9ea19dd647dc0a83cbbcbf732c4ddae9070126cecb00958b623ca43d2219b7be8519b5b58e SHA512 ad92110d56caba2be44c6759350b05ceb882165ad0f58e6cce8361273be874b20b01856d685b142a83edff77b41bcce2911cf5797db5253b4f3e9b36e703c07d
-DIST py-1.5.3.tar.gz 202335 BLAKE2B 6a7ef206bddd641cb5e2fe04966ae93db96a7ff757fcde604f8fd2d36c4a03ce5955c2f445a866dd5cd83026ab2a9fa17feeb0da0df3d40d9746c19d865f6325 SHA512 243c0da94c439163257c525ef00b30fd6d8add5897121ee0b1f19476b50f18823ce2b99a5ab27a9cf47598b538758d0534060123dce0820d2a65d98046548c96
-DIST py-1.5.4.tar.gz 201448 BLAKE2B 3d9f71ba53c8004d4745be984e0a3b81c98f38fdcd7703c39286c53bb167a803aa92b3b0897e407f6ee98d2b870838a27b507ad8e6cceab7b22c8e7229bb6581 SHA512 45424b133be3e78ccab48e74daa6ca6a76fca283bd3a51d50c91e911c509a2c45de4fcc7c8c15f33620d61ee16dfc3969fdd78d8839e96f52897e97b1ad624c4
 DIST py-1.8.0.tar.gz 205096 BLAKE2B e08554fc3e0bae2e2d4515f075991707af29aa5c39e1387e8f8a7dab25e78c7340d389c79936ddea27b1fb0438ebdee8b5e218bbb48c62089d7fb656b1b6dbe8 SHA512 37b9a66229b834a034d9ba6769a46addf098380b494c1eb863607a52d00b7ec5b9157dd7ac6ffc52535a05006648c775c78716d7f85cf44966065b225be6e95b
-EBUILD py-1.4.30.ebuild 1266 BLAKE2B 19f3553f50fa41278885a03b9fb2c98a450d527b44a4544dfa3786dd1422bd0d33702fbd0b65f51194bc3734921317cf9391e477e9304640d943fcc812b9bba5 SHA512 5aef15bf79e286a447d76a8ac27a0148977c57267cc7646ba63293e831fc02718f72245b6707280c92d48bce7e594b90e85289ec0b33d3822cdea7713ac17f5b
-EBUILD py-1.4.34.ebuild 1334 BLAKE2B 18e31132a0202d4f1c608d71b0d93cb80ee871af9534004e6999d575f8a720bd47f2099a84cdee53581d21a2e28bc8e25defabc65b804b414093b4da47fd3f8c SHA512 8f0012c4cc85b39e78be6cba19cb96b443109b1c5deaa4e932bee70cbbf2806c86629cdd0bc14ed1ef27b56da0c39d1bce55c51e9bc7de52650daee151138cc5
-EBUILD py-1.5.2.ebuild 1338 BLAKE2B d18bcf1b1d13e6f33a1b163ed24a4425602fb7526e5beef9cb7902f859c03762ede3e513d772919352c1c73643820b0cf95e73383b5f995349824d2cca999425 SHA512 ea1d714f6314cc85a11006b4b7ddba839a8e864e73675a3db563ef10b19a889b4c16da4bc4e2af59769b38cff59fcd51a4e6773b9f1a79aecb8e7c8b30c51f82
-EBUILD py-1.5.3.ebuild 1349 BLAKE2B cba0ee130aaad63bb423afaba55ef16d0779af37c5598e535e4af0f8b34a62161aff3dec5e002c5a56161d8301349e5cdaba369bfa23a10361d516cdf9468b91 SHA512 c4d07ae4750af7b90a298b1ee6f73e6be998137734443e40eb3bd24373b704803eda2c5c226a3db53cf7ac76c1b8f50e9345b48e45395cd41cc9b3130d623a0e
-EBUILD py-1.5.4.ebuild 1440 BLAKE2B 35ec29533074bb6c211e9e82d9aa715edb4a53cc02a1c1b91778f5cc20f6ce15240eff69ff4cc8703e3895586302c4dddda19bf37ae11c4cccbe0d17543ab4c0 SHA512 9b79697a0ccc671df56620086c7bc4c8d7ae6bac2f677876b5d33dd023a3a2cfa9a3fe9684647e8f58ec0bd1c0b64c9d3fd5f9d344147c9e1fc4f3a98945b842
-EBUILD py-1.8.0.ebuild 1445 BLAKE2B 2abee08a91d79611c7710f5e98931a53e5ebcf7756f923e97c9fea1dc02ee899211c4e94188013221c29ff8b943c9396e5b48f3b69e4475088de5e0b6fe29c79 SHA512 13b385ee5c4e991bb93d0f6ccb14a43a63f9a2b577e914b590269a5b60b943526dfece65bbe2fb4a474ec034fe483aec618361748ac250707b956aeeb7acbd77
-MISC metadata.xml 315 BLAKE2B 3154c92be7826e4b562d5172b792f652ede8fff96b3fd3abebea5d6107eca432718bd0c8be7934a9f90a34891ce6e9b74d02c82881976cc86ed9635a0457b2da SHA512 e2ede56189d791c18b64d1db6615249e6ae5a3afd31f17b9ae6d23e9123d4c68a22bc61b7935deb284d2fa7e6732679e2286a271854dc818e7f651e9daa54fbe
+EBUILD py-1.8.0.ebuild 1431 BLAKE2B 07e4b2c726182d15b9b7c076e56b143ef5531c7802b1311073681b3b34f7f456eb941d1f8a5e43f00c4e7e4da53cfeed63fe567d008688664fe68f604989a9c5 SHA512 b3fb34e0b91b80a382cc4e53d70921f87dfbee6df2f5a008dbc3686c313beda8a5ad8ceea79b29228e60478d1813441a74213da47fee1c203af191eb084c657b
+MISC metadata.xml 340 BLAKE2B 110b7f7cc26818661b98f60f589a782c0a9ed827fb43a89eef8cd7096045b1cc168410d9525641d4a78dee9709679d4d9ee7c38680caef5f37a73f1e726007cd SHA512 ce65db3c076a27acc6af28c1adecf61bfd7d10872612994fd616c72e91264be87460823055182e3b60f6931f22386d3a9f541ddd16c902fd8e02a6a345e65f5c
diff --git a/dev-python/py/files/py-1.4.34-skip-broken-pytest3.patch b/dev-python/py/files/py-1.4.34-skip-broken-pytest3.patch
deleted file mode 100644
index 67b1f4eb95ac..000000000000
--- a/dev-python/py/files/py-1.4.34-skip-broken-pytest3.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Backport of https://github.com/pytest-dev/py/commit/3305183b964bded36f9cd43976d22524f6ae15b2
-
---- a/testing/code/test_assertion.py
-+++ b/testing/code/test_assertion.py
-@@ -141,7 +141,10 @@ def test_assert_implicit_multiline():
-         e = exvalue()

-         assert str(e).find('assert [1, 2, 3] !=') != -1

- 

--

-+@py.test.mark.xfail(py.test.__version__[0] != "2",
-+                    reason="broken on modern pytest",
-+                    run=False
-+)
- def test_assert_with_brokenrepr_arg():

-     class BrokenRepr:

-         def __repr__(self): 0 / 0

-@@ -278,7 +281,10 @@ def test_assert_raise_alias(testdir):
-     ])

- 

- 

--@pytest.mark.skipif("sys.version_info < (2,5)")

-+@py.test.mark.xfail(py.test.__version__[0] != "2",
-+                    reason="broken on modern pytest",
-+                    run=False)
-+@py.test.mark.skipif("sys.version_info < (2,5)")
- def test_assert_raise_subclass():

-     class SomeEx(AssertionError):

-         def __init__(self, *args):

---- a/testing/code/test_excinfo.py
-+++ b/testing/code/test_excinfo.py
-@@ -16,6 +16,13 @@ else:
- 

- import pytest

- pytest_version_info = tuple(map(int, pytest.__version__.split(".")[:3]))

-+
-+broken_on_modern_pytest = pytest.mark.xfail(
-+    pytest_version_info[0] != 2,
-+    reason="this test hasn't been fixed after moving py.code into pytest",
-+    run=False
-+    )
-+
- 

- class TWMock:

-     def __init__(self):

-@@ -355,6 +362,7 @@ class TestFormattedExcinfo:
-         assert lines[0] == "|   def f(x):"

-         assert lines[1] == "        pass"

- 

-+    @broken_on_modern_pytest
-     def test_repr_source_excinfo(self):

-         """ check if indentation is right """

-         pr = FormattedExcinfo()

-@@ -657,6 +665,7 @@ raise ValueError()
-         assert p._makepath(__file__) == __file__

-         reprtb = p.repr_traceback(excinfo)

- 

-+    @broken_on_modern_pytest
-     def test_repr_excinfo_addouterr(self, importasmod):

-         mod = importasmod("""

-             def entry():

-@@ -699,6 +708,7 @@ raise ValueError()
-             assert reprtb.extraline == "!!! Recursion detected (same locals & position)"

-             assert str(reprtb)

- 

-+    @broken_on_modern_pytest
-     def test_tb_entry_AssertionError(self, importasmod):

-         # probably this test is a bit redundant

-         # as py/magic/testing/test_assertion.py

-@@ -742,6 +752,7 @@ raise ValueError()
-         x = py.builtin._totext(MyRepr())

-         assert x == py.builtin._totext("я", "utf-8")

- 

-+    @broken_on_modern_pytest
-     def test_toterminal_long(self, importasmod):

-         mod = importasmod("""

-             def g(x):

-@@ -768,6 +779,7 @@ raise ValueError()
-         assert tw.lines[9] == ""

-         assert tw.lines[10].endswith("mod.py:3: ValueError")

- 

-+    @broken_on_modern_pytest
-     def test_toterminal_long_missing_source(self, importasmod, tmpdir):

-         mod = importasmod("""

-             def g(x):

-@@ -793,6 +805,7 @@ raise ValueError()
-         assert tw.lines[7] == ""

-         assert tw.lines[8].endswith("mod.py:3: ValueError")

- 

-+    @broken_on_modern_pytest
-     def test_toterminal_long_incomplete_source(self, importasmod, tmpdir):

-         mod = importasmod("""

-             def g(x):

-@@ -818,6 +831,7 @@ raise ValueError()
-         assert tw.lines[7] == ""

-         assert tw.lines[8].endswith("mod.py:3: ValueError")

- 

-+    @broken_on_modern_pytest
-     def test_toterminal_long_filenames(self, importasmod):

-         mod = importasmod("""

-             def f():

-@@ -863,6 +877,7 @@ raise ValueError()
-         assert tw.stringio.getvalue()

- 

- 

-+    @broken_on_modern_pytest
-     def test_native_style(self):

-         excinfo = self.excinfo_from_exec("""

-             assert 0

-@@ -877,6 +892,7 @@ raise ValueError()
-         if py.std.sys.version_info >= (2, 5):

-             assert s.count('assert 0') == 2

- 

-+    @broken_on_modern_pytest
-     def test_traceback_repr_style(self, importasmod):

-         mod = importasmod("""

-             def f():

diff --git a/dev-python/py/metadata.xml b/dev-python/py/metadata.xml
index b207ff96af21..3967a80033db 100644
--- a/dev-python/py/metadata.xml
+++ b/dev-python/py/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">py</remote-id>
   </upstream>
diff --git a/dev-python/py/py-1.4.30.ebuild b/dev-python/py/py-1.4.30.ebuild
deleted file mode 100644
index 93015db00c57..000000000000
--- a/dev-python/py/py-1.4.30.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# 1 failure, test_comments, under both pypy only.
-	# Also appears the home repo has no issue tracker.
-	[[ "${EPYTHON}" == pypy ]] && return
-	py.test -v -v || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py/py-1.4.34.ebuild b/dev-python/py/py-1.4.34.ebuild
deleted file mode 100644
index b7f9f55c5d19..000000000000
--- a/dev-python/py/py-1.4.34.ebuild
+++ /dev/null
@@ -1,47 +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="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.4.34-skip-broken-pytest3.patch )
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# 1 failure, test_comments, under both pypy only.
-	# Also appears the home repo has no issue tracker.
-	[[ "${EPYTHON}" == pypy ]] && return
-	py.test -v -v || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py/py-1.5.2.ebuild b/dev-python/py/py-1.5.2.ebuild
deleted file mode 100644
index ed9ba3e15e17..000000000000
--- a/dev-python/py/py-1.5.2.ebuild
+++ /dev/null
@@ -1,47 +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="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${P}-skip-apiwarn-pytest31.patch )
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# 1 failure, test_comments, under both pypy only.
-	# Also appears the home repo has no issue tracker.
-	[[ "${EPYTHON}" == pypy ]] && return
-	py.test -v -v || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py/py-1.5.3.ebuild b/dev-python/py/py-1.5.3.ebuild
deleted file mode 100644
index 7966b74a2e41..000000000000
--- a/dev-python/py/py-1.5.3.ebuild
+++ /dev/null
@@ -1,47 +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="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.5.2-skip-apiwarn-pytest31.patch )
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# 1 failure, test_comments, under both pypy only.
-	# Also appears the home repo has no issue tracker.
-	[[ "${EPYTHON}" == pypy ]] && return
-	py.test -v -v || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py/py-1.5.4.ebuild b/dev-python/py/py-1.5.4.ebuild
deleted file mode 100644
index cefe4de4abcf..000000000000
--- a/dev-python/py/py-1.5.4.ebuild
+++ /dev/null
@@ -1,48 +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="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.5.2-skip-apiwarn-pytest31.patch )
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# 1 failure, test_comments, under both pypy only.
-	# Also appears the home repo has no issue tracker.
-	[[ "${EPYTHON}" == pypy ]] && return
-	py.test -v -v || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py/py-1.8.0.ebuild b/dev-python/py/py-1.8.0.ebuild
index 5ecc54325825..13dc1cd9cd43 100644
--- a/dev-python/py/py-1.8.0.ebuild
+++ b/dev-python/py/py-1.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 BDEPEND="