gentoo resync : 22.05.2021

4 files changed, 36 insertions, 2 deletions

diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index d40c581ca60c..348ada29e1b7 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,6 +1,7 @@
+AUX charliecloud-0.22-sphinx-4.patch 838 BLAKE2B 09fbf97c9145ca050ffb56215c5e114354c6fad39eda5e9876427b8272c700a495137dbeac1972eb3aaf525322634f5250595293f9f5af04421b6cc85ba89732 SHA512 1743e8fd6619185059892e70c1906d99d60c9fd27392eab331dd8f624c842aa1426f77da4f7b826cf0025d92777d30aba137f9d3685037607af66560031e3bd1
 DIST charliecloud-0.22.tar.gz 402106 BLAKE2B 4c2d4bf77424c5b46e5593bc28bbe10891c353c23c8d382a9ca7515187538f5fef4d90b95f34572f65223f27433ccab9021bf9e4bc31931787894924d1dd02e2 SHA512 c528ffa9ecddbd4a26b0a8b6cc593340f3aaa0911cf45e1f6a5fe860178917f069ca9b31b7c1aee6220762bbe4b75114219eac4cdd3987bcb3f3338e2b6fb18e
 DIST charliecloud-0.23.tar.gz 403281 BLAKE2B f7a6824782e7bf3bdb51ae791fdca2f5929f5c713590ff49cc8a7e1e1c1758e83bdd429a99497dd15e565d01f0f66f2873f64edddacf24ea78f68c2326669db7 SHA512 35543ed3d838b80fbb64fe3e658993fe9f7ded2d1dfd92e0e9a7725fab6d872503a790964c0f3fabb6438c8bd872b5b00cdf31a028f26588b318b9d0dc568119
-EBUILD charliecloud-0.22.ebuild 2068 BLAKE2B 8b2bcda1299d983bc7a3a94ad0fcb967924cc8a3f2e2038d188cb5fd5cdb9ffbc3431617a82f301b6bc876e3d5ddaa831533214658e5cde21a749107b35c5868 SHA512 0962bbf85a3217a7a3530e7688963dc9aeff6e5aa4e841cc30c068b89f64b47dbe15a855c65b4cb518334f6e490448453806ff56cc30ffdd3300ac8e8ac637bd
-EBUILD charliecloud-0.23.ebuild 2070 BLAKE2B b703c4d5bc566cca1acf2f5555208d5ebc9457d3f3cce1141e86b3f08c5a26902ff3ebc4f21cbd456cca09c1e48f862745f181f26917a90da563cec68eebb70a SHA512 12a3d6d5a77fabf562cacf533ff6a52b24118a153e9342fd7c49359213882e2a5c17b7df247040aa270787af9f34f89f984f93ba304b7f50d32c1d0a11d0d7b6
+EBUILD charliecloud-0.22.ebuild 2122 BLAKE2B fc09d9bae83760a95aa4811b83fc0672f27dbabd08608cfb44d505eb8a4fdfa21bcaac0c52017b8fd867a23ecfbe061c364d0dac43e7f3de82f3393b54007b7a SHA512 7b4aa4a31a76e2b6dc5b2266f7963df4ea57ff36eccc8a8d3c7a591790d49608cddf2f42278503df66600fd692d9cefb94392aeb6a565250165d121c5edc025a
+EBUILD charliecloud-0.23.ebuild 2124 BLAKE2B 672e1584fc4cd100a77618bd6a3b2f7fa1b7fa850f573e2c80ad946834bc138e626de483fd123d4eb4a9494f037219b83d2079fa3c4f4d1844a27039e5050375 SHA512 02fa7e8b8343850ababaee5eab491325aa2c1e598dcb0a871dd57b1fd44d04c8941949b09ee946f295ebd52efda4e172d5ce9405d17a536b6d68a3904ce5c372
 EBUILD charliecloud-9999.ebuild 2070 BLAKE2B b703c4d5bc566cca1acf2f5555208d5ebc9457d3f3cce1141e86b3f08c5a26902ff3ebc4f21cbd456cca09c1e48f862745f181f26917a90da563cec68eebb70a SHA512 12a3d6d5a77fabf562cacf533ff6a52b24118a153e9342fd7c49359213882e2a5c17b7df247040aa270787af9f34f89f984f93ba304b7f50d32c1d0a11d0d7b6
 MISC metadata.xml 617 BLAKE2B 1c9b75dc0e15fec82053803042667d20b9b3cf49bc90a2630bc7dd3139de79d1d1791e5677640d510a3641ab7d117037bb5134ccb336f5027b5ea7105f63eafb SHA512 8fb83c8b9c57c98893ebfc724026a88e484ef2f7d50c6ede3dcd982978cf428b699126c5eb5e7cec3c3308c875b657bca53dc879030b54fd3c0d03282cd1776f
diff --git a/sys-cluster/charliecloud/charliecloud-0.22.ebuild b/sys-cluster/charliecloud/charliecloud-0.22.ebuild
index b96285971254..a2e756974dbc 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 ae43a8ed1073..a210608743e5 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 000000000000..474fa1efbbea
--- /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+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 = [