dev-util/cmake: Fix IUSE=doc with >=dev-python/sphinx-4.0.0

Closes: https://bugs.gentoo.org/789375
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2021-05-14 20:17:10 +02:00
parent 28eb39c77c
commit 6296367630
2 changed files with 30 additions and 0 deletions

View File

@@ -70,6 +70,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
# upstream fixes (can usually be removed with a version bump)
"${FILESDIR}"/${P}-sphinx-4.patch # bug 789375
)
cmake_src_bootstrap() {

View File

@@ -0,0 +1,29 @@
From bb9c69ed7052614546d34d98a9cf1218e4a45bdc Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Fri, 14 May 2021 10:26:11 -0400
Subject: [PATCH] Utilities/Sphinx: Update man page config for Sphinx 4
Sphinx 4 by default generates `man/#/foo.#`, but older versions generate
`man/foo.#` as our install rules expect. Update our Sphinx config file
to tell Sphinx 4 to use the old layout.
Fixes: #22192
---
Utilities/Sphinx/conf.py.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in
index 5def681dc4..c383828bd7 100644
--- a/Utilities/Sphinx/conf.py.in
+++ b/Utilities/Sphinx/conf.py.in
@@ -53,6 +53,7 @@ for fpath in cmake_manuals:
except Exception as e:
sys.stderr.write("ERROR: %s\n" % str(e))
man_show_urls = False
+man_make_section_directory = False
html_show_sourcelink = True
html_static_path = ['@conf_path@/static']
--
GitLab