gentoo resync : 22.05.2021

3 files changed, 32 insertions, 1 deletions

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 810d27fa28bf..d2c765f9a9c2 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -11,6 +11,7 @@ AUX cmake-3.17.0_rc1-FindBLAS.patch 1087 BLAKE2B 5e549db39f0e8c5f821a70121551cce
 AUX cmake-3.17.0_rc1-FindLAPACK.patch 1973 BLAKE2B d4f10694b55fcea047f364f3dd383ba12fb5c3ce4369bd527c286e23260b551a915fa5257f0351bce00a4332c987c047c246812f2a713b0d1db312c7d03edee4 SHA512 20baafcda95ba219ae4e186a8878aa75e2e27f766ab3afaa14ce316cd2c2bc85debfc6be4ed1b6c17c3c1532b3a6868d0b4ee7cc47145cb788838f023b624303
 AUX cmake-3.18.0-filter_distcc_warning.patch 842 BLAKE2B 8c9b02a251d118f2ac31fe417e10750e3f4b911891723b0edacea83bf2b6220f121e02c299655cd49ae5a019af8a747218f81d6ece6cda41aeb57d24f9385277 SHA512 91b795225313270449d6da12baa818382da4f6937795303c5cc894f3f38f03cb88d8fb3b774fb0b8ab9cf5cd344ebeda3d83f48ef8474093a8a0268d8f342828
 AUX cmake-3.19.1-darwin-gcc.patch 433 BLAKE2B 72fb716af3d24d2723a06f0c2351d16af215cb64effa46bf404d8e00106ec80297b34b3d7f787b191e3fc08e1d35c515b6d2d527213285de91cb1f4b81272cb2 SHA512 a732f6f22e4eaab747cf80eaebb4fe5624aec893fc2bbb782f86d8377d3eda365568f091dd2505e18798fa8147f13adda0fa5cb0687c5c427a65bdc7cb957ff0
+AUX cmake-3.20.2-sphinx-4.patch 937 BLAKE2B 433693ccca65d8f389bac738217efaa79e8ee2dc6d498df7aea63b6f26aa198ba8923f4c172907b0e6a5a384c2498671e97fcd5850cb1822858d571225eb16a1 SHA512 22215383e98d90cda79396ba9cafbfaba10c43138228d033a89544c5190e4e415fecf541115169f9c062afe6b95ad42b2678f0afefe3af16aff8a8c711558a49
 AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 BLAKE2B 99fc8061352b6a503f472e11045f9a99c2b980f08e9c1406722eacdd438617dccc394f53bdcaa4d93c4aa499b4615185c3ec99ccad8be3504972001498b02c48 SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9
 AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b656eb7f58d61c7d9e30db9dac36e934f2a529b4ea20d69c5f8a653c727bae34374ebcb7f5017fd70df41abd538164 SHA512 bab8960bfea3c29416bdc8f39c7dee59b89bd7951752401f24eeb9161ac7bc2c6dd200cb62c6b9f964d763b5d257a94d8b04dc7090d6fa947a04f2d0c2e8c479
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
@@ -22,5 +23,5 @@ DIST cmake-3.20.2.tar.gz 9438694 BLAKE2B b1e1c091047d5ccae77d64ffda8201cfa7661f0
 EBUILD cmake-3.13.5.ebuild 6239 BLAKE2B 5e3b289af5d341e73fbdfe6162330e9e39dac40276991f08df670fcff6e40438995b608704e535545c4538cedb7ed789c2cc2ae0b38a1fd0f3a2e9627c95a494 SHA512 e75ea6defa00993410ed865329b450f38f9ad418c59bfe345880bae25d2f19e4463a407d744527d3f5c6c59fe8cf732cad5ac6274901cfcf3809d29573be7ad1
 EBUILD cmake-3.18.5.ebuild 6070 BLAKE2B 24ab19a092db23bbcbf3d8f1a87e21cc8f17575e8eff885efa81c3fb0161204f8f821bda04ac819fbad5f73936db8b2bff38b688252a9bcab30a7df002adfc71 SHA512 59b479102626d771fbf66f1dccc011e33ca5e3d77bc37f291c6e28fbdf998b7b5853da56875345807714b85a1e95c7b41fe2f5e98f6486191b1c80d6962697c8
 EBUILD cmake-3.19.7.ebuild 6990 BLAKE2B f382eff3d258673c34e7642ec088f708281a6a65bed568b2094344fbd966eca22128dd93e382a88da16132291bd0f7c644362eaee0b34545c4d3df8ef512c832 SHA512 27af2c67d4a06e0cc3f0d86f003738a8def88a274dc3eda6da32de0b5f015a8e13f315ae93efbcec07cd9b95fc9f046786336f2a1b9ac9f5478610a440cb9964
-EBUILD cmake-3.20.2.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
+EBUILD cmake-3.20.2.ebuild 7090 BLAKE2B 0786af9257074a701d588aaf47fefe6890e476e6790833e284da3e607c7cf6be7133ef318321982880d0b2d73b5e9a211030bc719f01100edd4633e0dad49932 SHA512 8d4bfe0d835382ace232048e57fa0c38b613c72f55ecbaa30336172c21c81d69281011bba4befb51e9287ecc7868f646184115b3c7d382232c84457250686c2a
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.20.2.ebuild b/dev-util/cmake/cmake-3.20.2.ebuild
index b1cc1455ac6c..95de22ba838f 100644
--- a/dev-util/cmake/cmake-3.20.2.ebuild
+++ b/dev-util/cmake/cmake-3.20.2.ebuild
@@ -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() {
diff --git a/dev-util/cmake/files/cmake-3.20.2-sphinx-4.patch b/dev-util/cmake/files/cmake-3.20.2-sphinx-4.patch
new file mode 100644
index 000000000000..dabe39e0b376
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.20.2-sphinx-4.patch
@@ -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
+