sys-cluster/charliecloud: backport >=dev-python/sphinx-4 fix

Closes: https://bugs.gentoo.org/790473
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Oliver Freyermuth <o.freyermuth@googlemail.com>
Closes: https://github.com/gentoo/gentoo/pull/20838
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
This commit is contained in:
Oliver Freyermuth 2021-05-16 16:08:05 +02:00 committed by Joonas Niilola
parent 71ca581405
commit 284491879b
No known key found for this signature in database
GPG Key ID: 7383942B8DC06962
3 changed files with 33 additions and 0 deletions

View File

@ -46,6 +46,10 @@ DEPEND="
net-misc/rsync
)"
PATCHES=(
"${FILESDIR}"/${PN}-0.22-sphinx-4.patch
)
src_prepare() {
default
eautoreconf

View File

@ -46,6 +46,10 @@ DEPEND="
net-misc/rsync
)"
PATCHES=(
"${FILESDIR}"/${PN}-0.22-sphinx-4.patch
)
src_prepare() {
default
eautoreconf

View File

@ -0,0 +1,25 @@
From f424c4078eab817b4af712b85184c4f07e2289c6 Mon Sep 17 00:00:00 2001
From: Reid Priedhorsky <1682574+reidpr@users.noreply.github.com>
Date: Wed, 12 May 2021 15:18:15 -0600
Subject: [PATCH] PR #1062: configure Sphinx 4.x behavior to match 3.x (closes
#1060)
---
doc/conf.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/doc/conf.py b/doc/conf.py
index 53a187bbb..417c91629 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -238,6 +238,10 @@
# -- Options for manual page output --------------------------------------------
+# Put all man pages in one directory regardless of section. Default changes to
+# True in Sphinx 4.0, which broke our builds (#1060).
+man_make_section_directory = False
+
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [