commit: cbf211f5d2de6e14836c59906653220fb0c4caaa Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> AuthorDate: Mon Sep 1 23:36:25 2025 +0000 Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> CommitDate: Mon Sep 1 23:45:48 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbf211f5
dev-python/sphinx: apply metadata patch for docutils as well Fixes running pkg_resources checks against dist-info metadata, which is apparently a thing (test suites?) Suggested-by: Michał Górny <mgorny <AT> gentoo.org> Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org> .../sphinx-8.2.3-metadata-docutils-0.22.patch | 27 ++++++++++++++++++++++ ...hinx-8.2.3-r1.ebuild => sphinx-8.2.3-r2.ebuild} | 1 + 2 files changed, 28 insertions(+) diff --git a/dev-python/sphinx/files/sphinx-8.2.3-metadata-docutils-0.22.patch b/dev-python/sphinx/files/sphinx-8.2.3-metadata-docutils-0.22.patch new file mode 100644 index 000000000000..7f3ec4b6cd29 --- /dev/null +++ b/dev-python/sphinx/files/sphinx-8.2.3-metadata-docutils-0.22.patch @@ -0,0 +1,27 @@ +From 5d3bb2e3b7c47e4ecd540c657018f16b961c821b Mon Sep 17 00:00:00 2001 +From: Adam Turner <[email protected]> +Date: Tue, 29 Jul 2025 19:44:31 +0200 +Subject: [PATCH] Support Docutils 0.22 (#13786) + +--- + CHANGES.rst | 4 ++++ + doc/changes/7.3.rst | 2 +- + pyproject.toml | 2 +- + sphinx/transforms/__init__.py | 2 +- + sphinx/transforms/references.py | 2 +- + tests/test_markup/test_markup.py | 2 +- + 6 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 75ae0f71a9d..d915f293f3b 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -76,7 +76,7 @@ dependencies = [ + "sphinxcontrib-serializinghtml>=1.1.9", + "Jinja2>=3.1", + "Pygments>=2.17", +- "docutils>=0.20,<0.22", ++ "docutils>=0.20,<0.23", + "snowballstemmer>=2.2", + "babel>=2.13", + "alabaster>=0.7.14", diff --git a/dev-python/sphinx/sphinx-8.2.3-r1.ebuild b/dev-python/sphinx/sphinx-8.2.3-r2.ebuild similarity index 99% rename from dev-python/sphinx/sphinx-8.2.3-r1.ebuild rename to dev-python/sphinx/sphinx-8.2.3-r2.ebuild index 8b8a1f23a836..dea7b6538d96 100644 --- a/dev-python/sphinx/sphinx-8.2.3-r1.ebuild +++ b/dev-python/sphinx/sphinx-8.2.3-r2.ebuild @@ -76,6 +76,7 @@ PATCHES=( # https://github.com/sphinx-doc/sphinx/pull/13610 # test assumptions for docutils 0.22 "${FILESDIR}"/${P}-testfix-docutils-0.22.patch + "${FILESDIR}"/${P}-metadata-docutils-0.22.patch ) distutils_enable_tests pytest
