gentoo resync : 14.12.2020

5 files changed, 27 insertions, 3 deletions

diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 3b49f469d417..7b9401aa1631 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,7 +1,8 @@
+AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
 DIST Sphinx-2.4.4.tar.gz 5966973 BLAKE2B 727a75eb4ec33beadf80b22cdd8dda02a53f4da4aea10ee18ecae658a69a9bb797f83b0d11b41b8405bf18b2472ea7fd501bea85382c20c5f2a9d5b14a032428 SHA512 cd35b7ebdf4eb41fb3a58706333ca4328fbf9b37999ad1bcc751f9769f0a294464e4def019a403fcd2204ca963ef641c35c957a4145eb50af07573d21df8c74d
 DIST Sphinx-3.2.1.tar.gz 5970067 BLAKE2B 6158d31390c9b07aa3abcdc4eb7ed827cf2160192a2c53ad845f07d5027cc4bd65264ea1114e78e06f9652a8788a8d0e992a8988382787a05bf507a73618cd96 SHA512 3f0f49036a44938abd470c2f825a0eeeeb818daf3dfbb3bc5c746b64305b5fe66c1c34d9703eb9420b2b347247c122825ddae1b6c28c88c249206151f39e3bdb
 DIST Sphinx-3.3.1.tar.gz 5979919 BLAKE2B 4eb9d8c9dccfd83690252ad6be05a3e69006e1e801bb0b37b77fb6ccf998f3a2fd99a90eba890cfb2baa5545ac0c2734fcd72d602fc2d1091e6754337f241b34 SHA512 bb1fb0780b741c0162ca014cb996dcdaac06985d14b6cc645a835679d7cf2680912784a815a027caf3fe902f721f9707bc9e9daaaf2c2d43051d31fe00584f78
 EBUILD sphinx-2.4.4.ebuild 3644 BLAKE2B 28df6a37d7fab6255e893501fbc4a45f427f1928f9e77420806f8eb2bcc2b23f05d2d5eb2b9a04258913555f1401c94c968811b270f4c3a0085340bd7e334ff5 SHA512 f6332488785a0c6795348b76db72a80e3bfc839a3ded793e12ae185941ebbba062f91c10f7dc8aca111bb951f62dc8f86fdd946a80e7253dbd14735dd5d6648c
-EBUILD sphinx-3.2.1.ebuild 4773 BLAKE2B bacbc635f142bc61e76c00929168ced40cccaf6b15820df46a6ff2e70d2074e187a5b3e01be15d94a27eaa7dd23ea5bd9527f53a463498e44a0e8de1e46f1c09 SHA512 f5b8f731a48271b1500697161af150f5027078e1f1dd1024295b6705118ed1c6c4f7d578982ea86f3f5861cc58b906cdd3b95ae41890fc1971c683d415394388
-EBUILD sphinx-3.3.1.ebuild 4782 BLAKE2B d9a7915fa8a5dedb1189c4f8584035f99534fd5a61c934ba930b6f845c55b021425751756741ffc643eaa954bdb19598b3c87034c67db398271a66ac3e8046ff SHA512 5395467362b25affdaf8a6c99fc1b46f8d8071e6f24c114d5ac460ffd149549498ec64e0745d3f7bb89fe72041ebe029f98289d0920eafc7bab831bec3707d0c
-MISC metadata.xml 510 BLAKE2B 878684f285906bb31649cb244f7af0e62ce854d20d260c269c0f1764f142adff08ce690fd778e3932181fa62947a2fa5521ee76c17871d15f73783dbd7730388 SHA512 496e3380982af69d59b05c94b773ff6e9449023e6b9bd314876e952fc54dd23db4a09ad24dfddfd752656445c71631503ae898ad778ad1702385057b047ebaab
+EBUILD sphinx-3.2.1.ebuild 4828 BLAKE2B 7b7b7103673f03d554c61924c50bd1bed09dfb78cc7b3d23eaa6e3c0b2380b18ee7b806063e920d34da3c3ff5b9d03379622830f67f409c98c29e52eccf9bcde SHA512 d18730f233d138a351e6e99da00d9ce289dd7decf98a5ce365055dc9d200b0c0360df25a6a7873b65c9b9efa22790688c0351eb30ec35f4ff4270889766b8c82
+EBUILD sphinx-3.3.1.ebuild 4837 BLAKE2B 28c764dcd0dc3e2c730280a379bfaa0ebc10a2e3ded11e42a4fa9923784f60015cdb33cdc89e815c4e221cb832719995928376c9af879bd35460db53be3183fe SHA512 9c52b6e44aeac8f8917eaff0609d54bd32e5b588bba03c341868196bb93f9e0dea80c97f041b31161b5aaf01de901a62c1a3062ee795483ada5a010b725613e2
+MISC metadata.xml 567 BLAKE2B e99637c5c116e3b8b17bd92341271350eaab38d3e0c5918ba2921db1fa0abb4615a1903b9916f94f3951f8b22e2939d71c5fde97b6ae467bc80570bdfee3b13e SHA512 7f9edc2ab5d01da2d23630f1cca2a25cb727b8336b600b48934b205727876361c2cc5432772940d855a00766d190b3319dc397927b9218345dac226886e9cec4
diff --git a/dev-python/sphinx/files/sphinx-3.2.1-doc-link.patch b/dev-python/sphinx/files/sphinx-3.2.1-doc-link.patch
new file mode 100644
index 000000000000..0c1b2ad7d98c
--- /dev/null
+++ b/dev-python/sphinx/files/sphinx-3.2.1-doc-link.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/728810
+--- ./doc/internals/release-process.rst
++++ ./doc/internals/release-process.rst
+@@ -97,8 +97,8 @@
+ * ``set PYTHONWARNINGS=`` and do ``make html`` (Windows)
+ 
+ But you can also explicitly enable the pending ones using e.g.
+-``PYTHONWARNINGS=default`` (see the :ref:`Python docs on configuring warnings
+-<python:describing-warning-filters>`) for more details.
++``PYTHONWARNINGS=default`` (see the `Python docs on configuring warnings
++<https://docs.python.org/3/library/warnings.html#describing-warning-filters>`_) for more details.
+ 
+ Release procedures
+ ------------------
diff --git a/dev-python/sphinx/metadata.xml b/dev-python/sphinx/metadata.xml
index 87aa42aee055..9d3a35739700 100644
--- a/dev-python/sphinx/metadata.xml
+++ b/dev-python/sphinx/metadata.xml
@@ -9,5 +9,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Sphinx</remote-id>
+		<remote-id type="github">sphinx-doc/sphinx</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinx/sphinx-3.2.1.ebuild b/dev-python/sphinx/sphinx-3.2.1.ebuild
index c46ed0085541..4e64e33c3b6d 100644
--- a/dev-python/sphinx/sphinx-3.2.1.ebuild
+++ b/dev-python/sphinx/sphinx-3.2.1.ebuild
@@ -62,6 +62,10 @@ BDEPEND="
 
 S="${WORKDIR}/${P^}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+)
+
 python_prepare_all() {
 	# remove tests that fail due to network-sandbox
 	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
diff --git a/dev-python/sphinx/sphinx-3.3.1.ebuild b/dev-python/sphinx/sphinx-3.3.1.ebuild
index f29129962d65..1d28fd613269 100644
--- a/dev-python/sphinx/sphinx-3.3.1.ebuild
+++ b/dev-python/sphinx/sphinx-3.3.1.ebuild
@@ -62,6 +62,10 @@ BDEPEND="
 
 S="${WORKDIR}/${P^}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+)
+
 python_prepare_all() {
 	# remove tests that fail due to network-sandbox
 	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"