gentoo resync : 22.12.2021

4 files changed, 2 insertions, 86 deletions

diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index d22872561bde..6e7acf87b410 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,9 +1,5 @@
-DIST flake8-3.8.4.tar.gz 163583 BLAKE2B 221234931365912adffec99c7c6761d2f35918222bee902ade4d8009d24f6918c66d23fc4b973fe653152cc6857b62ba859780b0d9de53fb91b7ea0379bee9d0 SHA512 51ed09beed50175573e6184b404431b3f89aa6594c40c70ed8288982fe12c2a68992e36d69c99013188f03555bf9fef1ba4f111f8e389cef1e1daa69b41ff5b0
 DIST flake8-3.9.2.tar.gz 164777 BLAKE2B 1c991296a3e47e4c41f1196fcaf1e7ea059226dfb41657a52fc4f5a9023b54dba21dd99635398e12f37f52f6e498a0a1fb7d87aba0fe7098ebbdfb54dc5598b0 SHA512 618fe1b35070b24395e5d4da9fa1b1f6308abf6f85d8de71b8b553f84d70d9cd7d2a6f616fa1418db9a8b5ad3efab038f4e2d7c6020c0c1bdeb8157e666911fd
-DIST flake8-4.0.0.tar.gz 154732 BLAKE2B 3d469e3e12212051abfeb93943ac8ec310e607c86c06db47b5487544e582f39480e76bc8ea621c5dba6493592eff64b19cb2be9b6b122527c66993415fab15ab SHA512 202b89c9b93f10a09453a215bbcd4260513ee21e4c1b3591088779155a4ca7277a1c274edbb12fcaf33d29ebe9389a3c57ce5aa4e12434f17960dcb0f769680e
 DIST flake8-4.0.1.tar.gz 154905 BLAKE2B b93fea36236881da595ae924b056686e0cd35d2466c1858e3ee83262922df8bc38cf5cd40a910980d287d048572dc94eb8d7c8ee4b11ebd1b4a474dfca02490c SHA512 0bdbf0218ce893df1c3e61f51cd3f371a5c72bb49ef78fec39548b1684e49b024e91cf4e3dcea60ba1efc08727985ef485814c372461e062ff4f810da99a1796
-EBUILD flake8-3.8.4.ebuild 1188 BLAKE2B 7b0c81113db70735cdb5757df5142aaf6a387133cf2a28c6c89cac1d316a3e632a0f3f39408d14e72a096a57040cb104940dda83b6c0c0c315e4cf7c7046f947 SHA512 a3b9b959da19ca3406c355108d3df65d7d17c7a33bf597e86d34b6fa51891fdff8cfb4831cdda6b36f78af19bc2045025205957bdf98c9484ed3d73968c01659
 EBUILD flake8-3.9.2-r1.ebuild 1074 BLAKE2B f1e62693829de7cf5293bb2a437c1c9f4fba0b6732d4b96308bfa20f6e65d6e7ee0de4fc81b09de6058a1dc6395041c1e3c615f93a07e80d9673d74502c837db SHA512 c3ab57bf570bceb3d1060ddc7fb44dd528c1d12b56439f68d08bd6060a9566253fca54c2c6bb34e5d0e51850246449ce60a03c21c59146442ca15d1cba2f0988
-EBUILD flake8-4.0.0.ebuild 1164 BLAKE2B 4230e8df9d9ae449c326ff812edd8f314cc67a6fa5dc0c21682371ab04096bf440e360dc1d6d24903843031ae16b70354e359499d13539d8d0a317b2cc3931b3 SHA512 5359d27f21f822699622b5bf8d34bc3c3e02b82483e03dc5d611572a5575b215f67df34ccf02ce9f216addb46972c5e0685f82bba9e16a5fa61427d344fb3eec
-EBUILD flake8-4.0.1-r1.ebuild 1163 BLAKE2B b23f41f3d5976aeb4844dcf6288eb171425a2276c298a8273e3437fd1e56cfb1ae3b6b613e8b87ad8e13c306eda051b4ceac8bde79b5f925900586a0c0cad09b SHA512 57afc11cb5cde92e6e2d7aaa9c76a7436fb5e1c83b751f75d338d8ebe588607bc08b19e28e7da043f59ba79ed40754989cd33c8b8eb1b754c2f843135309dafd
+EBUILD flake8-4.0.1-r1.ebuild 1156 BLAKE2B 91bcc9eafde77ae2e650db55a9f27850439ab32715229480b591227375666e621e783f318a54005e6a29c64f50addab3463d93b0130c8e3bd13ed1e2de94a0d2 SHA512 3eafc8d9cba7f26d1c1158224b9b03427daddebe1e17d7564499e7ef48889043fc835ef65ef3f31557dc811cc0d72df367d1ec59215086c5d81d6a0e6aa86354
 MISC metadata.xml 399 BLAKE2B 70701bbf00aac5f16ae5bb241b56a69c79abe02eea8695d5cdf71fb427e5ed1f1e19dca0e77904889a99e22026b39d64c309d4072dc4175f7660e414aec3736d SHA512 98ef1cc82925436bd40fe18876be4ba3b8b5aee42e62e73406b46ac49cdd2c689a69e4e685fb5f69f5ea7fbf6335797dc059817f4cf36f51c73404255830acf9
diff --git a/dev-python/flake8/flake8-3.8.4.ebuild b/dev-python/flake8/flake8-3.8.4.ebuild
deleted file mode 100644
index d002ff0c785f..000000000000
--- a/dev-python/flake8/flake8-3.8.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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 ~x64-macos"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
-"
-PDEPEND="
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		${PDEPEND}
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
-distutils_enable_tests --install pytest
diff --git a/dev-python/flake8/flake8-4.0.0.ebuild b/dev-python/flake8/flake8-4.0.0.ebuild
deleted file mode 100644
index 3c07a4d85dc9..000000000000
--- a/dev-python/flake8/flake8-4.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
-"
-PDEPEND="
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		${PDEPEND}
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
-distutils_enable_tests --install pytest
-
-src_prepare() {
-	# remove version-limited dep
-	sed -i -e '/importlib-metadata/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/flake8/flake8-4.0.1-r1.ebuild b/dev-python/flake8/flake8-4.0.1-r1.ebuild
index e2b118bdbb23..9cd00e96c286 100644
--- a/dev-python/flake8/flake8-4.0.1-r1.ebuild
+++ b/dev-python/flake8/flake8-4.0.1-r1.ebuild
@@ -12,7 +12,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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 # requires.txt inc. mccabe however that creates a circular dep
 RDEPEND="