Adding metadata

4 files changed, 204 insertions, 1 deletions

diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index d34dd17afb16..30a036082023 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1 +1,2 @@
 DIST black-25.1.0.tar.gz 649449 BLAKE2B 28045d73259780c38430838ad245a3a6545f6c55890ee5105f15121659e28dc3d3b332ddd08b7f196afcabc04d3d423b0ccf61e2a467f9ac131b9d7480e86415 SHA512 57281a678d322aaf0f2b7059aa59ad65055cb6999b8fc22ead115011d1b2e607d5cc91880369ee93a438bc266d7ebd371cd046f12d41a83383577f36a6211844
+DIST black-25.9.0.tar.gz 648393 BLAKE2B 916d9b6859d31b41a2b064537dd180d37d33ffb41827fab43e8b65d04a17709e2ed20e9672a7bb4a79038e81886b198aed2ce99d46b3ede2bac2a801b23e9f19 SHA512 aa2a2ff1cd1169108968735e7fcd0ad0b25d721786461975d0aaea06b21accc877c96eff0876c40ebe7c31d6de8065c7db47580fe7372c8ad8c08a0c17951311
diff --git a/dev-python/black/black-25.1.0.ebuild b/dev-python/black/black-25.1.0.ebuild
index 8eded0c2fcfb..ac00f353f084 100644
--- a/dev-python/black/black-25.1.0.ebuild
+++ b/dev-python/black/black-25.1.0.ebuild
@@ -35,8 +35,19 @@ BDEPEND="
 		dev-python/colorama[${PYTHON_USEDEP}]
 	)
 "
+
+EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
 
+PATCHES=(
+	# combined upstream test fixes:
+	# https://github.com/psf/black/pull/4577
+	# https://github.com/psf/black/pull/4591
+	# https://github.com/psf/black/pull/4666
+	# https://github.com/psf/black/pull/4690
+	"${FILESDIR}/${P}-test.patch"
+)
+
 python_test() {
 	local EPYTEST_DESELECT=()
 
@@ -50,7 +61,6 @@ python_test() {
 			;;
 	esac
 
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	epytest
 }
 
diff --git a/dev-python/black/black-25.9.0.ebuild b/dev-python/black/black-25.9.0.ebuild
new file mode 100644
index 000000000000..5ba7be51de4d
--- /dev/null
+++ b/dev-python/black/black-25.9.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..14} )
+
+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 ~x86"
+
+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}]
+	>=dev-python/pytokens-0.1.10[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/aiohttp-3.10[${PYTHON_USEDEP}]
+		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_PLUGINS=()
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+
+	case ${EPYTHON} in
+		pypy3.11)
+			EPYTEST_DESELECT+=(
+				# https://github.com/psf/black/issues/4582
+				'tests/test_format.py::test_simple_format[backslash_before_indent]'
+				'tests/test_format.py::test_simple_format[form_feeds]'
+			)
+			;;
+	esac
+
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "blackd - HTTP API for black" \
+		"dev-python/aiohttp dev-python/aiohttp-cors"
+}
diff --git a/dev-python/black/files/black-25.1.0-test.patch b/dev-python/black/files/black-25.1.0-test.patch
new file mode 100644
index 000000000000..5573519caea4
--- /dev/null
+++ b/dev-python/black/files/black-25.1.0-test.patch
@@ -0,0 +1,130 @@
+diff --git a/tests/data/cases/pep_701.py b/tests/data/cases/pep_701.py
+index 9acee95..6f86988 100644
+--- a/tests/data/cases/pep_701.py
++++ b/tests/data/cases/pep_701.py
+@@ -74,9 +74,9 @@
+ x = f"a{2+2:=^{foo(x+y**2):something else}one more}b"
+ f'{(abc:=10)}'
+ 
+-f"This is a really long string, but just make sure that you reflow fstrings {
++f"""This is a really long string, but just make sure that you reflow fstrings {
+     2+2:d
+-}"
++}"""
+ f"This is a really long string, but just make sure that you reflow fstrings correctly {2+2:d}"
+ 
+ f"{2+2=}"
+@@ -213,9 +213,9 @@
+ x = f"a{2+2:=^{foo(x+y**2):something else}one more}b"
+ f"{(abc:=10)}"
+ 
+-f"This is a really long string, but just make sure that you reflow fstrings {
++f"""This is a really long string, but just make sure that you reflow fstrings {
+     2+2:d
+-}"
++}"""
+ f"This is a really long string, but just make sure that you reflow fstrings correctly {2+2:d}"
+ 
+ f"{2+2=}"
+diff --git a/tests/test_black.py b/tests/test_black.py
+index 31bc34d..f7a68aa 100644
+--- a/tests/test_black.py
++++ b/tests/test_black.py
+@@ -14,6 +14,7 @@
+ from concurrent.futures import ThreadPoolExecutor
+ from contextlib import contextmanager, redirect_stderr
+ from dataclasses import fields, replace
++from importlib.metadata import version as imp_version
+ from io import BytesIO
+ from pathlib import Path, WindowsPath
+ from platform import system
+@@ -25,6 +26,7 @@
+ import pytest
+ from click import unstyle
+ from click.testing import CliRunner
++from packaging.version import Version
+ from pathspec import PathSpec
+ 
+ import black
+@@ -114,7 +116,10 @@ class BlackRunner(CliRunner):
+     """Make sure STDOUT and STDERR are kept separate when testing Black via its CLI."""
+ 
+     def __init__(self) -> None:
+-        super().__init__(mix_stderr=False)
++        if Version(imp_version("click")) >= Version("8.2.0"):
++            super().__init__()
++        else:
++            super().__init__(mix_stderr=False)
+ 
+ 
+ def invokeBlack(
+@@ -187,10 +192,10 @@ def test_piping(self) -> None:
+             input=BytesIO(source.encode("utf-8")),
+         )
+         self.assertEqual(result.exit_code, 0)
+-        self.assertFormatEqual(expected, result.output)
+-        if source != result.output:
+-            black.assert_equivalent(source, result.output)
+-            black.assert_stable(source, result.output, DEFAULT_MODE)
++        self.assertFormatEqual(expected, result.stdout)
++        if source != result.stdout:
++            black.assert_equivalent(source, result.stdout)
++            black.assert_stable(source, result.stdout, DEFAULT_MODE)
+ 
+     def test_piping_diff(self) -> None:
+         diff_header = re.compile(
+@@ -210,7 +215,7 @@ def test_piping_diff(self) -> None:
+             black.main, args, input=BytesIO(source.encode("utf-8"))
+         )
+         self.assertEqual(result.exit_code, 0)
+-        actual = diff_header.sub(DETERMINISTIC_HEADER, result.output)
++        actual = diff_header.sub(DETERMINISTIC_HEADER, result.stdout)
+         actual = actual.rstrip() + "\n"  # the diff output has a trailing space
+         self.assertEqual(expected, actual)
+ 
+@@ -295,7 +300,7 @@ def test_expression_diff(self) -> None:
+             self.assertEqual(result.exit_code, 0)
+         finally:
+             os.unlink(tmp_file)
+-        actual = result.output
++        actual = result.stdout
+         actual = diff_header.sub(DETERMINISTIC_HEADER, actual)
+         if expected != actual:
+             dump = black.dump_to_file(actual)
+@@ -404,7 +409,7 @@ def test_skip_magic_trailing_comma(self) -> None:
+             self.assertEqual(result.exit_code, 0)
+         finally:
+             os.unlink(tmp_file)
+-        actual = result.output
++        actual = result.stdout
+         actual = diff_header.sub(DETERMINISTIC_HEADER, actual)
+         actual = actual.rstrip() + "\n"  # the diff output has a trailing space
+         if expected != actual:
+@@ -1826,7 +1831,7 @@ def test_bpo_2142_workaround(self) -> None:
+             self.assertEqual(result.exit_code, 0)
+         finally:
+             os.unlink(tmp_file)
+-        actual = result.output
++        actual = result.stdout
+         actual = diff_header.sub(DETERMINISTIC_HEADER, actual)
+         self.assertEqual(actual, expected)
+ 
+@@ -1836,7 +1841,7 @@ def compare_results(
+     ) -> None:
+         """Helper method to test the value and exit code of a click Result."""
+         assert (
+-            result.output == expected_value
++            result.stdout == expected_value
+         ), "The output did not match the expected value."
+         assert result.exit_code == expected_exit_code, "The exit code is incorrect."
+ 
+@@ -1913,7 +1918,8 @@ def test_code_option_safe(self) -> None:
+             args = ["--safe", "--code", code]
+             result = CliRunner().invoke(black.main, args)
+ 
+-            self.compare_results(result, error_msg, 123)
++            assert error_msg == result.output
++            assert result.exit_code == 123
+ 
+     def test_code_option_fast(self) -> None:
+         """Test that the code option ignores errors when the sanity checks fail."""