1 |
commit: 284491879b5e6a0da3ee409535d3ac6242e25990 |
2 |
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com> |
3 |
AuthorDate: Sun May 16 14:08:05 2021 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 16 15:08:45 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28449187 |
7 |
|
8 |
sys-cluster/charliecloud: backport >=dev-python/sphinx-4 fix |
9 |
|
10 |
Closes: https://bugs.gentoo.org/790473 |
11 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
12 |
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com> |
13 |
Closes: https://github.com/gentoo/gentoo/pull/20838 |
14 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
15 |
|
16 |
sys-cluster/charliecloud/charliecloud-0.22.ebuild | 4 ++++ |
17 |
sys-cluster/charliecloud/charliecloud-0.23.ebuild | 4 ++++ |
18 |
.../files/charliecloud-0.22-sphinx-4.patch | 25 ++++++++++++++++++++++ |
19 |
3 files changed, 33 insertions(+) |
20 |
|
21 |
diff --git a/sys-cluster/charliecloud/charliecloud-0.22.ebuild b/sys-cluster/charliecloud/charliecloud-0.22.ebuild |
22 |
index b9628597125..a2e756974db 100644 |
23 |
--- a/sys-cluster/charliecloud/charliecloud-0.22.ebuild |
24 |
+++ b/sys-cluster/charliecloud/charliecloud-0.22.ebuild |
25 |
@@ -46,6 +46,10 @@ DEPEND=" |
26 |
net-misc/rsync |
27 |
)" |
28 |
|
29 |
+PATCHES=( |
30 |
+ "${FILESDIR}"/${PN}-0.22-sphinx-4.patch |
31 |
+) |
32 |
+ |
33 |
src_prepare() { |
34 |
default |
35 |
eautoreconf |
36 |
|
37 |
diff --git a/sys-cluster/charliecloud/charliecloud-0.23.ebuild b/sys-cluster/charliecloud/charliecloud-0.23.ebuild |
38 |
index ae43a8ed107..a210608743e 100644 |
39 |
--- a/sys-cluster/charliecloud/charliecloud-0.23.ebuild |
40 |
+++ b/sys-cluster/charliecloud/charliecloud-0.23.ebuild |
41 |
@@ -46,6 +46,10 @@ DEPEND=" |
42 |
net-misc/rsync |
43 |
)" |
44 |
|
45 |
+PATCHES=( |
46 |
+ "${FILESDIR}"/${PN}-0.22-sphinx-4.patch |
47 |
+) |
48 |
+ |
49 |
src_prepare() { |
50 |
default |
51 |
eautoreconf |
52 |
|
53 |
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.22-sphinx-4.patch b/sys-cluster/charliecloud/files/charliecloud-0.22-sphinx-4.patch |
54 |
new file mode 100644 |
55 |
index 00000000000..474fa1efbbe |
56 |
--- /dev/null |
57 |
+++ b/sys-cluster/charliecloud/files/charliecloud-0.22-sphinx-4.patch |
58 |
@@ -0,0 +1,25 @@ |
59 |
+From f424c4078eab817b4af712b85184c4f07e2289c6 Mon Sep 17 00:00:00 2001 |
60 |
+From: Reid Priedhorsky <1682574+reidpr@××××××××××××××××××××.com> |
61 |
+Date: Wed, 12 May 2021 15:18:15 -0600 |
62 |
+Subject: [PATCH] PR #1062: configure Sphinx 4.x behavior to match 3.x (closes |
63 |
+ #1060) |
64 |
+ |
65 |
+--- |
66 |
+ doc/conf.py | 4 ++++ |
67 |
+ 1 file changed, 4 insertions(+) |
68 |
+ |
69 |
+diff --git a/doc/conf.py b/doc/conf.py |
70 |
+index 53a187bbb..417c91629 100644 |
71 |
+--- a/doc/conf.py |
72 |
++++ b/doc/conf.py |
73 |
+@@ -238,6 +238,10 @@ |
74 |
+ |
75 |
+ # -- Options for manual page output -------------------------------------------- |
76 |
+ |
77 |
++# Put all man pages in one directory regardless of section. Default changes to |
78 |
++# True in Sphinx 4.0, which broke our builds (#1060). |
79 |
++man_make_section_directory = False |
80 |
++ |
81 |
+ # One entry per manual page. List of tuples |
82 |
+ # (source start file, name, description, authors, manual section). |
83 |
+ man_pages = [ |