gentoo resync : 23.09.2020

3 files changed, 2 insertions, 62 deletions

diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index e3ad6193bf3f..e22fd32aae37 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -1,7 +1,5 @@
 AUX py-1.5.2-skip-apiwarn-pytest31.patch 517 BLAKE2B a086d8130c1ead322461e7d89249f07e2dd9a6eee4f7e878bd8c01cf19df695a6a5698ec0cc50770f0514cbedbd2aa88e3fc356a72c78eab4b6bc378b5d1f590 SHA512 01da1bb928fe3b22a69a439481a1ebdac790811da781b7ee497ffa1b7362270628527b33f2d5dc0e83ebc2e57cdaf9fbd2974735f580931222f33e543fd69762
 AUX py-1.8.0-pytest-4.patch 20364 BLAKE2B 8fe8f3b659ef6f586d3de299dcc2e986fec0ede3659c19c08f1c273e3204278620770051603e0c7bffbb47a6b9ecb438f5b7744c0c5894512b0f50877188a6e0 SHA512 ade290d37af218077100f03da5c8ce6e77b93e79317405b9e62059a2c97e14e21e56a11dec7d031f6f2deeff05ce0d6c0c3488535a6d117a02cacc1e18da46e3
-DIST py-1.8.0.tar.gz 205096 BLAKE2B e08554fc3e0bae2e2d4515f075991707af29aa5c39e1387e8f8a7dab25e78c7340d389c79936ddea27b1fb0438ebdee8b5e218bbb48c62089d7fb656b1b6dbe8 SHA512 37b9a66229b834a034d9ba6769a46addf098380b494c1eb863607a52d00b7ec5b9157dd7ac6ffc52535a05006648c775c78716d7f85cf44966065b225be6e95b
 DIST py-1.9.0.tar.gz 210098 BLAKE2B d7f9b22ebaedd12534198912c1fa0be80f42e97751701442e060e1c244b06ab82239fe78a3cc7119fa4df5d87ecfd97bfb2568744693d3ffe9824ae1d73e59f9 SHA512 965b2adfe1b13177629ccfcdf6d0a13460683ca7a01d585163deb1af15d926fc86680d9e51660f6cbb8569f822a4d54ce281c029e363d244ddf67e33b102ad0a
-EBUILD py-1.8.0.ebuild 1708 BLAKE2B bf4579b20c2b98910f611fa6c12ae64083e1e274a1062aff8ba528697a16b536e91189cee78ef9add278ff90005dbc7b638f599fe012a6263e1431c05473ca13 SHA512 65bee22f4d16768e8403cf46fa90e93347e29b9850b5a966a437693b2aa26be42140562d6f38a6bab501cd957835293bb0aa88caf5dc64ca68bb06f46770871f
-EBUILD py-1.9.0.ebuild 1277 BLAKE2B 94c8716883077800ecefdd89af820072932c296f7dac23c2caae81d6230717bd0af0f0863c7423347dd2e3efd5be5855e176fc6894c96bf9f91cfc920c704f0d SHA512 c609ba52aa45702fbfb45fe353f8af62c9f5eda34bb33c3ddc09609d96fd2eada2868f38381570eb21edf8bb6871bcf333326af2dac1dbc73284a9248e6993f8
+EBUILD py-1.9.0-r1.ebuild 1267 BLAKE2B 3e75fff7e68162c68e9a5c2bc4cd659759741642d4a5eb4957010ce66c555c2a512b3975ee166b696e52b79ce1cd2bb83c414afa02745501244471d6951a48a3 SHA512 1e77587976a6769973f48ae9ca5aa80bb12e77695d45594f390282652fa8971d13507e9ab503aaf389f7c283f077c7827741420996032a0a3fb0efa64de24074
 MISC metadata.xml 340 BLAKE2B 110b7f7cc26818661b98f60f589a782c0a9ed827fb43a89eef8cd7096045b1cc168410d9525641d4a78dee9709679d4d9ee7c38680caef5f37a73f1e726007cd SHA512 ce65db3c076a27acc6af28c1adecf61bfd7d10872612994fd616c72e91264be87460823055182e3b60f6931f22386d3a9f541ddd16c902fd8e02a6a345e65f5c
diff --git a/dev-python/py/py-1.8.0.ebuild b/dev-python/py/py-1.8.0.ebuild
deleted file mode 100644
index f9c73970d315..000000000000
--- a/dev-python/py/py-1.8.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.2-skip-apiwarn-pytest31.patch
-	"${FILESDIR}"/${P}-pytest-4.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-
-	# broken, and relying on exact assertion strings
-	rm testing/code/test_assertion.py || die
-	# broken on py3.8, don't seem important
-	sed -i -e 's:test_syntaxerror_rerepresentation:_&:' \
-		-e 's:test_comments:_&:' \
-		testing/code/test_source.py || die
-	# broken on py3.9, this package is just dead
-	sed -i -e 's:test_excinfo_\(repr\|set\):_&:' \
-		-e 's:test_format_excinfo:_&:' \
-		-e 's:test_excinfo_str:_&:' \
-		testing/code/test_excinfo.py || die
-	sed -i -e 's:test_getfslineno:_&:' \
-		testing/code/test_source.py || die
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py/py-1.9.0.ebuild b/dev-python/py/py-1.9.0-r1.ebuild
index 69f323e39f2a..78e1479659e4 100644
--- a/dev-python/py/py-1.9.0.ebuild
+++ b/dev-python/py/py-1.9.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1