gentoo auto-resync : 31:12:2022 - 14:19:51

5 files changed, 2 insertions, 116 deletions

diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index e5b856c1fad4..ec50a5b89b2b 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,8 +1,3 @@
-AUX flake8-4.0.1-upgrade-mccabe.patch 321 BLAKE2B 6febcff41b8064731f3a91bd9785516ce9534c5e6687404262df4eb984011dafe17ce8164a886d11ed0e4b795c475bdcc52e38db0b9e95ba3b36cecd4a0f452a SHA512 621771fd1976172caf2a6f1942821097ac50617c07cfa9a20f4d4b4ea24b8bcec0a41d81b6e49fce2405a6cca8b15dd513d6bbf41e186175b1aa21e30076b123
-DIST flake8-4.0.1.tar.gz 154905 BLAKE2B b93fea36236881da595ae924b056686e0cd35d2466c1858e3ee83262922df8bc38cf5cd40a910980d287d048572dc94eb8d7c8ee4b11ebd1b4a474dfca02490c SHA512 0bdbf0218ce893df1c3e61f51cd3f371a5c72bb49ef78fec39548b1684e49b024e91cf4e3dcea60ba1efc08727985ef485814c372461e062ff4f810da99a1796
-DIST flake8-5.0.4.gh.tar.gz 146207 BLAKE2B c99ec0977948e98ca62106737509f7901b15871894f08c1dc82a4dfdf7567bc85eaca5918600fc42d0c82de612644df1b587e8a7c84fbe040d1402c3513e1855 SHA512 2e9f8bf2bbca1ab0b7cb0bc6aee53f7e12288194a80a8be915478061fd76adb8d270ee50383b45beb9d4dd1ee806f104e7bbf29f69b23a7cd88ee0902ff3e965
 DIST flake8-6.0.0.gh.tar.gz 139138 BLAKE2B 87590594a95f48a9e532ca545d4ae17a098cba81a7708066d63180b27e1cd0e0b648a2362d16b3818ef1b91cbe9ecf51810d45136fb42f188fc09083e9b31921 SHA512 27de4632332ee72bb5deedfcb7ea59e31a3e7fbfd6c165adf019b06cccaba51b776f4310219d8b27cf4894ed2597330fe9c0e381187353d4dc239f102eedd26a
-EBUILD flake8-4.0.1-r2.ebuild 1233 BLAKE2B 8b22865d9d36db9a860b4132b71dcc9ce9a4de8d00312538fe7f5880d70763a4300151379222d10bfffcbcae965533581096fd47b0bcb0a2d89337cabc44c8dc SHA512 d99542c787c24d2ea3473b3acaa24f0debf53a9b038d5f14374932efc1f760c68f1aa066729b4f60c0a55e75e7b0f2d260ab4867f85652065d294d0399b8e340
-EBUILD flake8-5.0.4.ebuild 1237 BLAKE2B b3ae08e137e3422fe48218984fc12cacbaa20aa6bd868a7c7af87b8c648c6ec519658b869929ee4a8fce77e2d86ff64fc877832a8ffbea819912ebbca796b2d2 SHA512 63252af97cb9dbad49b7191ec9de23578a0e56d0643cc67db6f15eea8524085fd32128c13cdfae37736057e18d96e1d9106bbbd8cc056a6849588469a0a36cc9
-EBUILD flake8-6.0.0.ebuild 1190 BLAKE2B d4da720ef13bf473ef37be431e5476db4a3cdace71fd4d6671bf478b644f14647d565e095d131d4a1b67e5f811cc4b12dc20f0f3da66d8b7789b474ec5ec9c18 SHA512 49113ba52ac155c242bd269548ef596b97a2e53eade9030bc72e7675249ac2bef5b676f128f7de8f8d80795b4d3607a2bfbe274cca27bd29cde1a13282b3504c
+EBUILD flake8-6.0.0.ebuild 1182 BLAKE2B 34e678092c454d81e9e30dd7eae5d60c3f128f5cb7e25706f46af1271d788d4ee19790803359b0382297e72e432e08441ce9a5d0ecca8f19243b82f0bcc3626e SHA512 2e4bfe8aaf90c92a766aada4c2324a358f396203d8376562f3f706148596264854c0333645218cfca918a3cf76e0a356c23dee066cac6b756f37bd3de760f5b1
 MISC metadata.xml 399 BLAKE2B 01ae165c898af67195582e1aaf867b9f9fc937e56b87f09a812d21c9d1175131c25561524ba76857c1630a117a21bc43eeef907c2a34ab9e9b38866dc2f9430e SHA512 8f149a017f4fef8f8fe0fef037e589694e0c3b3689990f97f38ed23fb9b5c5170985fc1fd7814ef70b8200db66cb9367dcfc9bf6453f8742092335a1c3c8fae6
diff --git a/dev-python/flake8/files/flake8-4.0.1-upgrade-mccabe.patch b/dev-python/flake8/files/flake8-4.0.1-upgrade-mccabe.patch
deleted file mode 100644
index 5dab4af913fe..000000000000
--- a/dev-python/flake8/files/flake8-4.0.1-upgrade-mccabe.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.cfg b/setup.cfg
-index 9cbc9b3..732d6a2 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -35,7 +35,7 @@ packages = find:
- package_dir = 
- 	=src
- install_requires = 
--	mccabe>=0.6.0,<0.7.0
-+	mccabe>=0.7.0,<0.8.0
- 	pycodestyle>=2.8.0,<2.9.0
- 	pyflakes>=2.4.0,<2.5.0
- 	importlib-metadata<4.3;python_version<"3.8"
diff --git a/dev-python/flake8/flake8-4.0.1-r2.ebuild b/dev-python/flake8/flake8-4.0.1-r2.ebuild
deleted file mode 100644
index 330b48a50e31..000000000000
--- a/dev-python/flake8/flake8-4.0.1-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-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.7.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8.0[${PYTHON_USEDEP}]
-
-"
-BDEPEND="${RDEPEND}
-	test? (
-		${PDEPEND}
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-upgrade-mccabe.patch"
-)
-
-distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
-distutils_enable_tests 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-5.0.4.ebuild b/dev-python/flake8/flake8-5.0.4.ebuild
deleted file mode 100644
index fb872f3ac938..000000000000
--- a/dev-python/flake8/flake8-5.0.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="
-	https://github.com/pycqa/flake8/
-	https://pypi.org/project/flake8/
-"
-SRC_URI="
-	https://github.com/PyCQA/flake8/archive/${PV}.tar.gz
-		-> ${P}.gh.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.5.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.10.0[${PYTHON_USEDEP}]
-"
-PDEPEND="
-	>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		${PDEPEND}
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# fails if additional flake8 plugins are installed
-	tests/integration/test_plugins.py::test_local_plugin_can_add_option
-)
diff --git a/dev-python/flake8/flake8-6.0.0.ebuild b/dev-python/flake8/flake8-6.0.0.ebuild
index 7223706d7eb8..af77f380c879 100644
--- a/dev-python/flake8/flake8-6.0.0.ebuild
+++ b/dev-python/flake8/flake8-6.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	<dev-python/pyflakes-3.1.0[${PYTHON_USEDEP}]