Adding metadata

4 files changed, 27 insertions, 62 deletions

diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 6907d9b88a58..468a0ce739e2 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,2 +1 @@
-DIST flake8-5.0.4.tar.gz 145862 BLAKE2B 9cf163879bb06638898fe734ea3414373d0bc940e35cdade5d4440ae0da634066c4191c21897852706f29a15f1f8e85766a182c681a78955b531f020086bc4c3 SHA512 522ae2e15d963740712eba03ac1a844d5da23fd55dfef81423d7c0447f638b4d3e0e5683b5d7153fae14f6776a4e1e480b2f4d476403dd96064e6daa3e222731
-DIST flake8-6.0.0.tar.gz 138524 BLAKE2B b96a8798b8dbdb51aa853e4a49108cf82609c5a90601d433b3bb8a2006b23247b4261f6adf01cf2df5692d1a67612b53bf795c450a35e4f87b9a58b1a7cb7cb0 SHA512 d326659a4dc73e72b07611c3ddbd2c8526b65372ef17a273eadf7f56dd3eedada39d2edd187e207175d688ec155b5b8b6ca8c76ad2a768667350ad516cff1725
+DIST flake8-6.0.0.gh.tar.gz 139138 BLAKE2B 87590594a95f48a9e532ca545d4ae17a098cba81a7708066d63180b27e1cd0e0b648a2362d16b3818ef1b91cbe9ecf51810d45136fb42f188fc09083e9b31921 SHA512 27de4632332ee72bb5deedfcb7ea59e31a3e7fbfd6c165adf019b06cccaba51b776f4310219d8b27cf4894ed2597330fe9c0e381187353d4dc239f102eedd26a
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 406c708c35b2..000000000000
--- a/dev-python/flake8/flake8-5.0.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2022 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-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/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-"
-PDEPEND="
-	>=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 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-6.0.0.ebuild b/dev-python/flake8/flake8-6.0.0.ebuild
index ab99b6db5cfa..1ff488747df9 100644
--- a/dev-python/flake8/flake8-6.0.0.ebuild
+++ b/dev-python/flake8/flake8-6.0.0.ebuild
@@ -1,39 +1,48 @@
-# Copyright 2022 Liguros Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} 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"
+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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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/pycodestyle-2.8.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyflakes-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.11.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}
+BDEPEND="
+	${RDEPEND}
 	test? (
 		${PDEPEND}
 	)
 "
 
-distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
+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
-}
+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/metadata.xml b/dev-python/flake8/metadata.xml
index ca53b25347ed..ea8988e8af6a 100644
--- a/dev-python/flake8/metadata.xml
+++ b/dev-python/flake8/metadata.xml
@@ -2,14 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
-  <email>dev@liguros.net</email>
-  <name>Development</name>
- </maintainer>
- <maintainer type="project">
   <email>python@gentoo.org</email>
   <name>Python</name>
  </maintainer>
  
- <origin>ports</origin>
+ <origin>gentoo-staging</origin>
  <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file