gentoo Easter resync : 12.04.2020

3 files changed, 9 insertions, 63 deletions

diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index dac9f091336a..e46ea53f6c41 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,5 +1,3 @@
-DIST flake8-3.5.0.tar.gz 140608 BLAKE2B 938ad4406370da27155512355432edd23a824db1d6ee635591628fefad43ee1116256ae7f240496d93941800212ea2479be73fb9ee9bd03c9a54ab70bbce452f SHA512 ac5d1bd9c44ed76c9e5cbd941b24bb552aa76e156b24ccda6cc8440ee90f3a574fdb393665adc75298e4f57111d7ab3115ef21ef9088fb327d0a9703d442450c
 DIST flake8-3.7.9.tar.gz 150123 BLAKE2B fd46710c0dcce7d3dcb3d5fc8ff7a83a35315679fa838e68abafd5bdc342c13218706fec0dac3fc9a6d919971f1f846c855f00cbd60c925e979378e431dace0b SHA512 c3c753ad050d8a8f87f7c28c8a1c953ed9bd04f08b09512d9323152b4eebb57d67fbfb0f5317d629174fa12fa234e1a86d6a633dd951fff6a45330b1c4f62850
-EBUILD flake8-3.5.0.ebuild 1600 BLAKE2B 8450b5b85db4ee14942a44eadb7db5ba22a424d9041bd6c556529459364528a948590a3927e95c401bcd1e77a41f881155cfa7880212a0d828d5b4a0b5aa4742 SHA512 832fd75e55330e6fb3a64d1bee5e6b544ca6b7a2d230c98638de10fe88fc35242cae647109071c2d5b564b1de8a6c380207659cd0b1d358c9d1b77ac24183fe7
-EBUILD flake8-3.7.9.ebuild 1593 BLAKE2B d0c81406da3fe5850b60c7dabc2a52c1f4bc67e942540212d63b44bc6f2d8ae44080a49f4a540e9172c99d8f959fa7abf5734f87bc863218c187f89abb4105d1 SHA512 9b864ac71aa8077beef78ccb1bac6cca543aa395d51c17877632074c15e6047479d6abc54d8743c97ba0819b863bd555c9eb8ca0aff79bab6c6dcc9d46a3cb2a
+EBUILD flake8-3.7.9.ebuild 1462 BLAKE2B 018a10a3444ddeae818dd4778e13a2ab2fe59628bb05a7ed8d14b601e17eac9418d4f4308acd0b9bc059b32f767e5eec45ac6dab60018bb81d22f5d34b729162 SHA512 f9aa61283545541fb58101dd6d22d0843aeda469cf6731c146fe740ba46ff20819087cf4d7d39a305efe448c47f24e975f60b8ad5cd4c42096027da40fa6c120
 MISC metadata.xml 373 BLAKE2B af4d7678c87281f631048d3c49b0a642ceee1d771be2b662458888659b7c8e262c98adcd7bcb7f6ab251783998950725729ed35c887c004f8d8da87da81eda7d SHA512 449aa40152590e7103a4bf10006a33e6a0d5010a7846b0c5fbee8a78d99a3539995eccf441845c205bf48fc1e9b35cd7b1d6af0d98b469bdd06989baf8b88646
diff --git a/dev-python/flake8/flake8-3.5.0.ebuild b/dev-python/flake8/flake8-3.5.0.ebuild
deleted file mode 100644
index 13da912b4ca6..000000000000
--- a/dev-python/flake8/flake8-3.5.0.ebuild
+++ /dev/null
@@ -1,52 +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="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~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="test"
-RESTRICT="!test? ( test )"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.0.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.4.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 'python2*' pypy )
-"
-PDEPEND="
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${PDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Flake8 falsely assumes it needs pytest-runner unconditionally and will
-	# try to install it, causing sandbox violations.
-	sed -i -e "/setup_requires=\['pytest-runner'\],/d" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/flake8/flake8-3.7.9.ebuild b/dev-python/flake8/flake8-3.7.9.ebuild
index a1d579273d10..644e9f992dd9 100644
--- a/dev-python/flake8/flake8-3.7.9.ebuild
+++ b/dev-python/flake8/flake8-3.7.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 # requires.txt inc. mccabe however that creates a circular dep
@@ -24,12 +24,12 @@ RDEPEND="
 	<dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/pycodestyle-2.5.0[${PYTHON_USEDEP}]
 	<dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' -2)
-	$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' -2)
-	$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' -2)
-	!dev-python/pep8[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/configparser[${PYTHON_USEDEP}]
+		dev-python/enum34[${PYTHON_USEDEP}]
+		dev-python/functools32[${PYTHON_USEDEP}]
+		dev-python/typing[${PYTHON_USEDEP}]
+	' -2)
 "
 PDEPEND="
 	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]