10 files changed, 198 insertions, 202 deletions
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 5d1868f898d5..2fd1391260c6 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,3 +1,4 @@
-DIST black-20.8b1.tar.gz 1092546 BLAKE2B 5a0a755222617d8d551b627c91670ecc32a9330cc1197900a9d21b071d0d99ddd32e09786becfc577407ab402f6da3d8683a59a9deaea1f6b4f07b9e1e4ecbed SHA512 53d6f6a6f47027e5bdfd3909471c993480034c8aa8ae395792565b8d79fb4e3a44299ea529652c0ccabf4309d645db9179bf54efc06fee20517f479e91cec838
-DIST black-21.6b0.tar.gz 1149421 BLAKE2B a9935d9ef3c9530d127cc2d06e2d64b48e6f2a5488ed4851b5afa3bf3166df9723c3815220b68eb5a069c167393f501063321addde19149ad4ef85d59938eac7 SHA512 0f676f6bcd8bcbbdc615a2086631b3cebf9b9612fabc62de78215a7319cabd4e200333340471dd26a6a80cb920f04bcfde5a8dd42d069c19dba471ade30487ac
-DIST black-21.7b0.tar.gz 1148431 BLAKE2B 34dcd2fd45b914433d6290c10bb07b44277cb490ef884c44ec00cb5495fadd2e649099dd356c4063d0fff5a6477609b11db73e1dc94d88106c56a3ca9b087c90 SHA512 7e6ee4e185080802c9dfc6eeb73b52b2489283c4bcbc086366f50ffb8ea3e0f4bdfedac9a5906be6ec119e65050741c71591c394f0c361a1d75b3ff4061945c1
+DIST black-24.3.0.tar.gz 634292 BLAKE2B 9a853a0943ba081ecb7a4c22913b060607ac47fb90b70a9645358d681f3eab55707ad6fe9ad9928ba0d39a8adf5dfde0168598a8abcc24b823b407287cefaf82 SHA512 57e3b651009578f1d15b6e9ffb49d24be80885b2cf7ad48a68407862778ac2099d119e7ba6d58ddea4fc7fc21345435a7572a970baf882f763d9347868d5504b
+DIST black-24.4.0.tar.gz 635902 BLAKE2B 2821c0f4674524d3457fb8cbf1f1224d9c7e76abdbb1e47bcd4d488ff560a417b3ad57223318b28951c92c59d13c4a2894a323865a2be2859e7b7e891c54064c SHA512 3f9150faa36413ffff3a65f9f55b33a6b69b3abec5bf649bfc0662a92faa41edc76e90151e27a74f04bc3defc0687c898d54b2f137d16d13ea46e86670aa7a98
+DIST black-24.4.1.tar.gz 641335 BLAKE2B 996528509a71d8e2b8cb8e1ebf1beac5d2460d0759de77805645ca293a648aac8a658a4b9e6b239b591e9e4e43c0af66c7a972ca0b1ecc6d9aef911f559c0cff SHA512 057c2cc2ff47111487a46bfc50b961c719f92caaca49494a6cc57bb5e8aa19d0d47a7f3164421e104ef2815060e7d771a9532e970e07e1c2ce709b4cf7e99656
+DIST black-24.4.2.tar.gz 642299 BLAKE2B aa62394dc4a14fd6dd49502a86e46e7f707d6342127e2fb3b5cb7365ab392f5a0514df548d30219e9b6ed1f9d8ca80241ea206a06011ef8dc3d770191d3328ce SHA512 f3fb63fdbff947a217ad371939a6eaac1e818f58fb924516639f3c9469f0db6fbda8d4b207163d4a6db8a58a048fefe46fbfdb1ddf40f91348bd767208e60f35
diff --git a/dev-python/black/black-20.8_beta1.ebuild b/dev-python/black/black-20.8_beta1.ebuild
deleted file mode 100644
index 83195677b3b4..000000000000
--- a/dev-python/black/black-20.8_beta1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature
-
-MY_PV="${PV//_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black"
-SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-IUSE="test"
-# bug #754201
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.10.1[${PYTHON_USEDEP}]
-	dev-python/typed-ast[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/dataclasses[${PYTHON_USEDEP}]' python3_6)
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/black-20.8_beta1-setuptools_scm.patch"
-)
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	local version_path
-	version_path="$(grep '"write_to"' setup.py | \
-		sed -r 's|[[:space:]]+"write_to": "([[:graph:]]+)",|\1|' \
-		|| die "could not find path to write version to")"
-
-	[[ -e ${version_path} ]] && die "could not find path to write version to"
-	printf 'version = "%s"\n' "${MY_PV}" > "${version_path}" || die "error writing version"
-	sed -e 's:setuptools_scm::' -i setup.cfg || die
-
-	# don't version lock dependencies
-	sed -r -e 's:("pathspec>.*), <[0-9.-]+:\1:' -i setup.py || die
-
-	# make sure that setup.py can read version
-	export MY_PV
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cp "${S}"/src/black_primer/primer.json "${BUILD_DIR}"/lib/black_primer/primer.json || die
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
-}
diff --git a/dev-python/black/black-21.6_beta0.ebuild b/dev-python/black/black-21.6_beta0.ebuild
deleted file mode 100644
index 43103259dffc..000000000000
--- a/dev-python/black/black-21.6_beta0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1 optfeature
-
-MY_PV="${PV//_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black"
-SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	<dev-python/pathspec-1[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typed-ast[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	' python3_7)
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV}
-
-python_test() {
-	cp "${S}"/src/black_primer/primer.json "${BUILD_DIR}"/lib/black_primer/primer.json || die
-	distutils_install_for_testing
-	epytest -m "not python2"
-}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
-}
diff --git a/dev-python/black/black-21.7_beta0.ebuild b/dev-python/black/black-21.7_beta0.ebuild
deleted file mode 100644
index d104c045b58a..000000000000
--- a/dev-python/black/black-21.7_beta0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1 optfeature
-
-MY_PV="${PV//_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black"
-SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	<dev-python/pathspec-1[${PYTHON_USEDEP}]
-	<dev-python/tomli-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV}
-
-python_test() {
-	cp "${S}"/src/black_primer/primer.json "${BUILD_DIR}"/lib/black_primer/primer.json || die
-	distutils_install_for_testing
-	epytest -m "not python2"
-}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
-}
diff --git a/dev-python/black/black-24.3.0.ebuild b/dev-python/black/black-24.3.0.ebuild
new file mode 100644
index 000000000000..1b370ca6b917
--- /dev/null
+++ b/dev-python/black/black-24.3.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="The uncompromising Python code formatter"
+HOMEPAGE="
+	https://black.readthedocs.io/en/stable/
+	https://github.com/psf/black/
+	https://pypi.org/project/black/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
+		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "blackd - HTTP API for black" \
+		"dev-python/aiohttp dev-python/aiohttp-cors"
+}
diff --git a/dev-python/black/black-24.4.0.ebuild b/dev-python/black/black-24.4.0.ebuild
new file mode 100644
index 000000000000..bbf320447679
--- /dev/null
+++ b/dev-python/black/black-24.4.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="The uncompromising Python code formatter"
+HOMEPAGE="
+	https://black.readthedocs.io/en/stable/
+	https://github.com/psf/black/
+	https://pypi.org/project/black/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
+		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "blackd - HTTP API for black" \
+		"dev-python/aiohttp dev-python/aiohttp-cors"
+}
diff --git a/dev-python/black/black-24.4.1.ebuild b/dev-python/black/black-24.4.1.ebuild
new file mode 100644
index 000000000000..bbf320447679
--- /dev/null
+++ b/dev-python/black/black-24.4.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="The uncompromising Python code formatter"
+HOMEPAGE="
+	https://black.readthedocs.io/en/stable/
+	https://github.com/psf/black/
+	https://pypi.org/project/black/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
+		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "blackd - HTTP API for black" \
+		"dev-python/aiohttp dev-python/aiohttp-cors"
+}
diff --git a/dev-python/black/black-24.4.2.ebuild b/dev-python/black/black-24.4.2.ebuild
new file mode 100644
index 000000000000..bbf320447679
--- /dev/null
+++ b/dev-python/black/black-24.4.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="The uncompromising Python code formatter"
+HOMEPAGE="
+	https://black.readthedocs.io/en/stable/
+	https://github.com/psf/black/
+	https://pypi.org/project/black/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
+		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "blackd - HTTP API for black" \
+		"dev-python/aiohttp dev-python/aiohttp-cors"
+}
diff --git a/dev-python/black/files/black-20.8_beta1-setuptools_scm.patch b/dev-python/black/files/black-20.8_beta1-setuptools_scm.patch
deleted file mode 100644
index 368c21812e24..000000000000
--- a/dev-python/black/files/black-20.8_beta1-setuptools_scm.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 12fde25..340d2c0 100644
---- a/setup.py
-+++ b/setup.py
-@@ -47,10 +47,7 @@ else:
- 
- setup(
-     name="black",
--    use_scm_version={
--        "write_to": "src/_black_version.py",
--        "write_to_template": 'version = "{version}"\n',
--    },
-+    version=os.getenv("MY_PV"),
-     description="The uncompromising code formatter.",
-     long_description=get_long_description(),
-     long_description_content_type="text/markdown",
diff --git a/dev-python/black/metadata.xml b/dev-python/black/metadata.xml
index e8a03e5238e9..f3e7a2a98408 100644
--- a/dev-python/black/metadata.xml
+++ b/dev-python/black/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>chutzpah@gentoo.org</email>
@@ -10,5 +10,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">black</remote-id>
+		<remote-id type="github">psf/black</remote-id>
 	</upstream>
 </pkgmetadata>