gentoo resync : 29.12.2022

4 files changed, 26 insertions, 44 deletions

diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 6e7acf87b410..7d0c86b58eee 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,5 +1,4 @@
-DIST flake8-3.9.2.tar.gz 164777 BLAKE2B 1c991296a3e47e4c41f1196fcaf1e7ea059226dfb41657a52fc4f5a9023b54dba21dd99635398e12f37f52f6e498a0a1fb7d87aba0fe7098ebbdfb54dc5598b0 SHA512 618fe1b35070b24395e5d4da9fa1b1f6308abf6f85d8de71b8b553f84d70d9cd7d2a6f616fa1418db9a8b5ad3efab038f4e2d7c6020c0c1bdeb8157e666911fd
+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
-EBUILD flake8-3.9.2-r1.ebuild 1074 BLAKE2B f1e62693829de7cf5293bb2a437c1c9f4fba0b6732d4b96308bfa20f6e65d6e7ee0de4fc81b09de6058a1dc6395041c1e3c615f93a07e80d9673d74502c837db SHA512 c3ab57bf570bceb3d1060ddc7fb44dd528c1d12b56439f68d08bd6060a9566253fca54c2c6bb34e5d0e51850246449ce60a03c21c59146442ca15d1cba2f0988
-EBUILD flake8-4.0.1-r1.ebuild 1156 BLAKE2B 91bcc9eafde77ae2e650db55a9f27850439ab32715229480b591227375666e621e783f318a54005e6a29c64f50addab3463d93b0130c8e3bd13ed1e2de94a0d2 SHA512 3eafc8d9cba7f26d1c1158224b9b03427daddebe1e17d7564499e7ef48889043fc835ef65ef3f31557dc811cc0d72df367d1ec59215086c5d81d6a0e6aa86354
+EBUILD flake8-4.0.1-r2.ebuild 1233 BLAKE2B 8b22865d9d36db9a860b4132b71dcc9ce9a4de8d00312538fe7f5880d70763a4300151379222d10bfffcbcae965533581096fd47b0bcb0a2d89337cabc44c8dc SHA512 d99542c787c24d2ea3473b3acaa24f0debf53a9b038d5f14374932efc1f760c68f1aa066729b4f60c0a55e75e7b0f2d260ab4867f85652065d294d0399b8e340
 MISC metadata.xml 399 BLAKE2B 70701bbf00aac5f16ae5bb241b56a69c79abe02eea8695d5cdf71fb427e5ed1f1e19dca0e77904889a99e22026b39d64c309d4072dc4175f7660e414aec3736d SHA512 98ef1cc82925436bd40fe18876be4ba3b8b5aee42e62e73406b46ac49cdd2c689a69e4e685fb5f69f5ea7fbf6335797dc059817f4cf36f51c73404255830acf9
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
new file mode 100644
index 000000000000..5dab4af913fe
--- /dev/null
+++ b/dev-python/flake8/files/flake8-4.0.1-upgrade-mccabe.patch
@@ -0,0 +1,13 @@
+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-3.9.2-r1.ebuild b/dev-python/flake8/flake8-3.9.2-r1.ebuild
deleted file mode 100644
index ba315d7ed262..000000000000
--- a/dev-python/flake8/flake8-3.9.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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.3.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-"
-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.1-r1.ebuild b/dev-python/flake8/flake8-4.0.1-r2.ebuild
index 9cd00e96c286..330b48a50e31 100644
--- a/dev-python/flake8/flake8-4.0.1-r1.ebuild
+++ b/dev-python/flake8/flake8-4.0.1-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
@@ -22,8 +23,9 @@ RDEPEND="
 	<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}]
+	>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.8.0[${PYTHON_USEDEP}]
+
 "
 BDEPEND="${RDEPEND}
 	test? (
@@ -31,8 +33,12 @@ BDEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-upgrade-mccabe.patch"
+)
+
 distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
-distutils_enable_tests --install pytest
+distutils_enable_tests pytest
 
 src_prepare() {
 	# remove version-limited dep