gentoo resync : 05.02.2020

7 files changed, 4 insertions, 192 deletions

diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 7fd48fd33176..3565bc375a5c 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,13 +1,5 @@
-DIST flake8-2.1.0.tar.gz 25010 BLAKE2B 23f89456a28815700f88e2eb3abd29e0936b0c40b93e57036f07ac384a82ab6b05bdb0a656fed08406569d33165f68ff1fb8074ef376a4d8c530c4d62405bfa4 SHA512 bf961d76ed08dafe7c2a9b767594577a57a2276166e515f1d84654223aa50879c5ee1e20919b3a4c7576c7d549037c8cfe67c11ab1f6648a0205200f5060950b
-DIST flake8-2.2.5.tar.gz 28333 BLAKE2B 016b5b05b7448dec762e7d5e06fad9d631351d02ba5941a34760c51406164dc2c5508e3c4c54b52c49738c193f815a816d9cd39558bfecaeb83cfddbc6dcc63f SHA512 fe5e06d3a7699e3f348181108f1ab3ee9eb1f2b0422de582a172d3a4aed42a5cf839ef8a5b5b113da1e0c3c2b53ed7b43af1ca24314ea842d0d3d3735eba1dee
-DIST flake8-2.5.4.tar.gz 81663 BLAKE2B 89bd5965fe1f6862cadbfc7b614a819a13d4ab147994485542ba519d6151ab11d4b496066c74141020858f468050e7b6dc3d6ce3a89ddf809e9cdc6d130984ef SHA512 31cbec556fc41361ac464d2547275e319ab663c907a4a8644113a2288a9f349bcfbec85197b6dfa13a7db9e82419f01e0f2abc84a347e133c144ea137e0daa28
 DIST flake8-3.5.0.tar.gz 140608 BLAKE2B 938ad4406370da27155512355432edd23a824db1d6ee635591628fefad43ee1116256ae7f240496d93941800212ea2479be73fb9ee9bd03c9a54ab70bbce452f SHA512 ac5d1bd9c44ed76c9e5cbd941b24bb552aa76e156b24ccda6cc8440ee90f3a574fdb393665adc75298e4f57111d7ab3115ef21ef9088fb327d0a9703d442450c
-DIST flake8-3.6.0.tar.gz 144684 BLAKE2B 3a6edf83860c6c6a59c150cde47b22eeb17b9e83cb23e4d8f747715b8867093a7f1d1e2bc55c9f9cf43b69463746026d839b0177f2abef746581563a670c3ce0 SHA512 f4377bc7806074a88f88b3652c3061583e576ee515b2b741cee9c6dc18f84f34a7807c93fda9dca3d8b006e379dcee60bb3ae20e6a2e62fd216a82a2b36f2eb5
 DIST flake8-3.7.9.tar.gz 150123 BLAKE2B fd46710c0dcce7d3dcb3d5fc8ff7a83a35315679fa838e68abafd5bdc342c13218706fec0dac3fc9a6d919971f1f846c855f00cbd60c925e979378e431dace0b SHA512 c3c753ad050d8a8f87f7c28c8a1c953ed9bd04f08b09512d9323152b4eebb57d67fbfb0f5317d629174fa12fa234e1a86d6a633dd951fff6a45330b1c4f62850
-EBUILD flake8-2.1.0.ebuild 1097 BLAKE2B e90a1cb50a39a987321a497df7e0b10153721858e1fa1b7555a44149b652fcdcecb7716f556a29b8e66de1d2d0fd52ebc314ef59a71442b1a6bfb26fa974fcd2 SHA512 7002e42fe8859348daa24c6c233966f7602bf95647f9d0b5db3978edd4f30ef54de546410dbb78d757e5d632b3cb0c331e8858539ee07a6cf39548dd6b4c44e9
-EBUILD flake8-2.2.5.ebuild 1122 BLAKE2B fbc5b05cc55ffc0ba61c547604d4e16da2b388eacd918857cba8e5ebd5580dfd95ec222c1657d5c6fa2d5c7dcc58a16506c996a0a0fe799242bc5382065de6f1 SHA512 87b66eefaeb7fa10185c5cf06607301b328e9925de5116209a7f2b01b513abb1bf1bb46f98cb0cfcd560087d831a210b32591f1178b77b4adcd459fa2d45dd17
-EBUILD flake8-2.5.4.ebuild 1627 BLAKE2B a9bb2b883d489915e8c7d4494a993379281f1fbe25a98e44a5b8e69022a2b05ce39a229370097615a10481479bd01e0a311d080ebdae54cb5960feb9bd05f67e SHA512 16fdfaeb19f6c35deb7c8c4869cb0acf709f0765936bc7876afcc03624c8b3a29935b99f149af891bfea703cc4488ae7dbfc02715bbb66ecc88634ef7ee501c0
-EBUILD flake8-3.5.0.ebuild 1599 BLAKE2B d125e0bfac657484fae1031fe674f9b5962ba4110a27eaec07b3f09622dff6ea9901d1fe5508d7220884279d3b382707e65d3c56967e38095401226ab799598a SHA512 f24f5727f57be4bed5b340b79308da318232a064dd73e54d558404cb3496c2739a5a6ec48cc95125d4c24fd4840487a5e35b7968dd8d5090abed6506094ce808
-EBUILD flake8-3.6.0.ebuild 1613 BLAKE2B 9204a054483015b7d9bc98f334bd95c5849e5d392c2be6d970093b6f03e81a8a189388df57b771064a924ffa4c12dab167f47e6ed4783b704e2d52a1cd1e4841 SHA512 0beddabe54a578ccc650b9673d5f888f2f6b2e0880ed19f6975244a76d31c859359795c274d2c95621059242c6d60d17d578d81293edcabd2ee1092a86aa3c75
-EBUILD flake8-3.7.9.ebuild 1592 BLAKE2B 1c32be81f59edb2b1b942988c3f98c481f1e1494e0db81b9110588e571105a12946b72346df8701a6bed39a60f6b8466dbdb42832ecc009e5a1e11ee6ee741a6 SHA512 0c3d53a0e5dd0bc976b5f502a03389058bde38844d9a1d835cf20442d5d338660de7e88e281ce2feb139d23d31be25b91c66907f467ac34caea90d8e04c22a09
+EBUILD flake8-3.5.0.ebuild 1600 BLAKE2B 8450b5b85db4ee14942a44eadb7db5ba22a424d9041bd6c556529459364528a948590a3927e95c401bcd1e77a41f881155cfa7880212a0d828d5b4a0b5aa4742 SHA512 832fd75e55330e6fb3a64d1bee5e6b544ca6b7a2d230c98638de10fe88fc35242cae647109071c2d5b564b1de8a6c380207659cd0b1d358c9d1b77ac24183fe7
+EBUILD flake8-3.7.9.ebuild 1588 BLAKE2B f012e93293ac08f2cf21dacd65f7cdabfbb1d24e6057f1bb4910b394d1043ec4bca27fd8095a46839daea43dbbae7d902ca072793708badb2dffb489c227b7a7 SHA512 78fa37e5122dcb265d1bfc97e8a103ef3891d5523716e91f28ee960228f9959bece6bb9591c70b33ff990674a5c1567ea5d96c0ddb682d845b1caf9435e9ee93
 MISC metadata.xml 373 BLAKE2B af4d7678c87281f631048d3c49b0a642ceee1d771be2b662458888659b7c8e262c98adcd7bcb7f6ab251783998950725729ed35c887c004f8d8da87da81eda7d SHA512 449aa40152590e7103a4bf10006a33e6a0d5010a7846b0c5fbee8a78d99a3539995eccf441845c205bf48fc1e9b35cd7b1d6af0d98b469bdd06989baf8b88646
diff --git a/dev-python/flake8/flake8-2.1.0.ebuild b/dev-python/flake8/flake8-2.1.0.ebuild
deleted file mode 100644
index c755bd34d173..000000000000
--- a/dev-python/flake8/flake8-2.1.0.ebuild
+++ /dev/null
@@ -1,38 +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 )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://bitbucket.org/tarek/flake8"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-LICENSE="MIT"
-SLOT="0"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND=">=dev-python/pyflakes-0.7.3[${PYTHON_USEDEP}]
-	>=dev-python/pep8-1.4.6[${PYTHON_USEDEP}]"
-PDEPEND=">=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${PDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# This tests requires / assumes this version is already installed.
-	sed -e 's:test_register_extensions:_&:' -i flake8/tests/test_engine.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/flake8/flake8-2.2.5.ebuild b/dev-python/flake8/flake8-2.2.5.ebuild
deleted file mode 100644
index b690049e9b6c..000000000000
--- a/dev-python/flake8/flake8-2.2.5.ebuild
+++ /dev/null
@@ -1,38 +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 )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.org/project/flake8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-LICENSE="MIT"
-SLOT="0"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND=">=dev-python/pyflakes-0.7.3[${PYTHON_USEDEP}]
-	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]"
-PDEPEND=">=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${PDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# This tests requires / assumes this version is already installed.
-	sed -e 's:test_register_extensions:_&:' -i flake8/tests/test_engine.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/flake8/flake8-2.5.4.ebuild b/dev-python/flake8/flake8-2.5.4.ebuild
deleted file mode 100644
index 850b6d0fc8b6..000000000000
--- a/dev-python/flake8/flake8-2.5.4.ebuild
+++ /dev/null
@@ -1,52 +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,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.org/project/flake8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-LICENSE="MIT"
-SLOT="0"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
-	!=dev-python/pep8-1.6.1[${PYTHON_USEDEP}]
-	!=dev-python/pep8-1.6.2[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${PDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
-	        <dev-python/mccabe-0.5[${PYTHON_USEDEP}]
-	)"
-PDEPEND="
-	>=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.5[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# This tests requires / assumes this version is already installed.
-	sed -e 's:test_register_extensions:_&:' -i flake8/tests/test_engine.py || die
-
-	# Gentoo has flake8 support restored in >=pep8-1.6.2-r1.
-	sed -e 's:, != 1.6.2::' -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/flake8/flake8-3.5.0.ebuild b/dev-python/flake8/flake8-3.5.0.ebuild
index 6615b0de01dc..13da912b4ca6 100644
--- a/dev-python/flake8/flake8-3.5.0.ebuild
+++ b/dev-python/flake8/flake8-3.5.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 ~mips ppc ppc64 s390 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 ~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 )"
 
diff --git a/dev-python/flake8/flake8-3.6.0.ebuild b/dev-python/flake8/flake8-3.6.0.ebuild
deleted file mode 100644
index 2b23de610185..000000000000
--- a/dev-python/flake8/flake8-3.6.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,7} 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-2.0.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.5.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 032442b3ac5f..b6e6ab64270d 100644
--- a/dev-python/flake8/flake8-3.7.9.ebuild
+++ b/dev-python/flake8/flake8-3.7.9.ebuild
@@ -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 ~x86"
+KEYWORDS="amd64 ~arm arm64 ia64 ppc ppc64 x86"
 IUSE="test"
 
 # requires.txt inc. mccabe however that creates a circular dep