commit: 284491879b5e6a0da3ee409535d3ac6242e25990 Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com> AuthorDate: Sun May 16 14:08:05 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sun May 16 15:08:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28449187
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 <AT> googlemail.com> Closes: https://github.com/gentoo/gentoo/pull/20838 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> sys-cluster/charliecloud/charliecloud-0.22.ebuild | 4 ++++ sys-cluster/charliecloud/charliecloud-0.23.ebuild | 4 ++++ .../files/charliecloud-0.22-sphinx-4.patch | 25 ++++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/sys-cluster/charliecloud/charliecloud-0.22.ebuild b/sys-cluster/charliecloud/charliecloud-0.22.ebuild index b9628597125..a2e756974db 100644 --- a/sys-cluster/charliecloud/charliecloud-0.22.ebuild +++ b/sys-cluster/charliecloud/charliecloud-0.22.ebuild @@ -46,6 +46,10 @@ DEPEND=" net-misc/rsync )" +PATCHES=( + "${FILESDIR}"/${PN}-0.22-sphinx-4.patch +) + src_prepare() { default eautoreconf diff --git a/sys-cluster/charliecloud/charliecloud-0.23.ebuild b/sys-cluster/charliecloud/charliecloud-0.23.ebuild index ae43a8ed107..a210608743e 100644 --- a/sys-cluster/charliecloud/charliecloud-0.23.ebuild +++ b/sys-cluster/charliecloud/charliecloud-0.23.ebuild @@ -46,6 +46,10 @@ DEPEND=" net-misc/rsync )" +PATCHES=( + "${FILESDIR}"/${PN}-0.22-sphinx-4.patch +) + src_prepare() { default eautoreconf diff --git a/sys-cluster/charliecloud/files/charliecloud-0.22-sphinx-4.patch b/sys-cluster/charliecloud/files/charliecloud-0.22-sphinx-4.patch new file mode 100644 index 00000000000..474fa1efbbe --- /dev/null +++ b/sys-cluster/charliecloud/files/charliecloud-0.22-sphinx-4.patch @@ -0,0 +1,25 @@ +From f424c4078eab817b4af712b85184c4f07e2289c6 Mon Sep 17 00:00:00 2001 +From: Reid Priedhorsky <1682574+rei...@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 = [
