gentoo auto-resync : 05:02:2023 - 03:15:29

3 files changed, 44 insertions, 1 deletions

diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 8d3d92d8bb37..6380421d8841 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -15,6 +15,7 @@ AUX ghc-9.0.2-fptools.patch 711 BLAKE2B b529444c270fea04b27e57ccd5a758ecb5889cf2
 AUX ghc-9.0.2-llvm-13.patch 988 BLAKE2B dee0a02ffb7b79981981615e7933f5ba3348f700794dac1a34fa71987ab9d267af9a79a40db7d66f6bf6ffdb26bed57bdd7dc157f3f27efa296c4152b8e81070 SHA512 a20213400f48882e8c8521a950088fa9dcbfe7cc2ae678d76fd6f1298f019dae9ed334f03050116527554d9ada60b649694d6674a914ce48fa1b5bbf918aa712
 AUX ghc-9.0.2-llvm-14.patch 487 BLAKE2B 884dc20e80bd5a0ec9c85833253ca48816e3cf719854ddb58d67cc11fb2eb4583d7b76f93977ccaa28dcbb3fa5ca416122b92f1e486f17529f7c46ac8e659ea0 SHA512 8cf67272181f507ed4263fdb4fb26bf5f1f1b9359ab4e1158af50ab89a82d37cc632873124700034805ae62eaa12efcfbe74a99ee16cbc1b5c653025b8333a8c
 AUX ghc-9.0.2-modorigin-semigroup.patch 1210 BLAKE2B e29917dd740bded98257366ca37d3ac8fdc8ffd0e988e6286b8cf21fb9f0232ce1584a1a22665f4afad36e5585c29091040cac16b1204022f5a5f3328420c4ff SHA512 dc54fb02dfed55f5a9309c61ec23859ad4f80fd271fe0ccb41b786fc7d44bc0d9722069e2f56731c6af5ad1703c5081ba9e4b4e683911af4ad9b498f53b67a5e
+AUX ghc-9.0.2-sphinx-6.patch 1560 BLAKE2B 60cf463ecd2b0b3677b6f9b171c2b71b59d31d563c70461ed96b276bd831ca722419ad802a6c58851c3cc83eb4e229bbb53dee02e227c41751985834597b08a4 SHA512 89ed630b3d35d4f6fe73e66ff622c63bac35688cdcae4b82e8ff1c1bc069df0897d0744dec9f57a386ca07b8b1fcbdc38b8ad7773f8629718473479afd61eec0
 AUX ghc-bash-completion 6496 BLAKE2B dc94a1979e886026a2fbe04bf7b45718ffa3e025a0e8945262e21a1243bfce6517fa1794f2ba6cd54cc853e93ad5d80472b9019b95762f10b5be83634a479955 SHA512 ede79ccf23555f60f48297d29bd98e3ccfd67d2cf27462153e00beb930398cb497e34ba8316e91df44c577ed11fdbe5606f7c6a2777e35d5e783590e49ccfeb5
 AUX latomic-subword 2886 BLAKE2B 97c6fb8d055e2ae4abf366f9f0e255588ca2f61f189d9356c5d0e6ff0dd7e7f10676469c72c02d1bd1bc10e5329bc31056670d2ddf03d6e65ae3ff1a5b4cb561 SHA512 8e7e261211ce4cc9baf855ca7b9a289b07fdda27b9738434c42374f9381429fa5798fd15f9cfeb50cc17839a8b8d3634653b72dc8ae9bb5970cf88d35553516c
 DIST ghc-8.10.6-src.tar.xz 19932832 BLAKE2B f5d0c43aa5df87648e32beeb5ed6866b231cbce4f344fb03110db826b36bbac435f5e89d9ffeef3f87c15e830fdee6b95150b7bdcd06906575bfcd9c83797dff SHA512 6314eb9744d47d803b30b621bd12bf6179dad5cc578ec267b3a65b89e9c9b431bdb4913936f040c7ca4fcc71a676a43e78b5f6173d123a844e7f29004405b8b6
@@ -31,5 +32,5 @@ DIST ghc-bin-9.0.2-powerpc64le-unknown-linux-gnu.tar.gz 275226316 BLAKE2B 10ade2
 DIST ghc-bin-9.0.2-riscv64-unknown-linux-gnu.tar.gz 313475807 BLAKE2B a5e1bbd4630eaff63dd01d79fdcb26a663771c0241d3211aa3a0033cb58addbe8e696177500ac06ae727fc645bfc6f16a3df763a6a0ae039b8823bcbfb9918bb SHA512 5e462f6f9d3f3507b3e09230729faa2a3e1fa92a8024fac602d75b804fff25f27e335871658f4b7b2c671f9e066373ca0285720da315a6c22f6f2c9c3cfea927
 DIST ghc-bin-9.0.2-x86_64-pc-linux-gnu-r1.tbz2 121347519 BLAKE2B 6bd41cdb8ba1661735e46df4709888e6461cff969678716c82681a0a0b0e8d0a32532a070f52efb0ab99ca126207998e8883d01902071e797a7a0f19881d5925 SHA512 c7de43577fd97e6fbde7bbffba4e1d2b83cdda405cff46f95c9eff23260542b426091d8dba75605d81ed41740a793a409e7448538e5adc7a391a901f20e8f2e4
 EBUILD ghc-8.10.6-r2.ebuild 26359 BLAKE2B c81305dbb761361d63dff6ff8d040632f5f0be5c2f9d0bf8406211321332888f232a377a081625bd19163d228d388aa42ccefe286e61cd8e82ea1255be6546ef SHA512 1e22cfa9a22ee3f28f825ef342ac69574dab3c2cda262a39ad369da08735000556ac5d5510f7b6d15d7fecbb0a261bc386e88d217162853e460c0e0053b1f1ff
-EBUILD ghc-9.0.2-r3.ebuild 27777 BLAKE2B e49867f633e62e8cc176e93c95423f54e8fad1a95cc39791c8af9768cb3fc91dbf2521381e8b6847e6c3fe8d20e21bd8872ccc49a22af8c84f7364f9bfbecd50 SHA512 80ae819d851956a6a7d65164c7cd49e37349f305f683a06bb26464e27ae24aeacf0d0ee55d08d2628d867b2e21914e68e76155637b00a758a54a001430752b7e
+EBUILD ghc-9.0.2-r3.ebuild 27827 BLAKE2B 2faec46997df7767e87bfb82aaa9809895fa088dadc7a778c64355b3c181e4332f99e02869d268468ee9835b18206fb0b1dfbc9d70813b30dbd24c974bf1ac96 SHA512 fed4a7a76d001e0725bc3ac14510f27b94bda59d0e9dbe8f8b7c2dad1e0241ce695efc729e08f79a8ac1ca6e0c5748c40e9466264e0807c3cbcc4bc2d7386216
 MISC metadata.xml 1172 BLAKE2B 88b5e4af0e8c0e3335185f2c5469837a43ee87e6fc598242f29aced9bb8a3c330139978c564eb4ca503101934917e8406e9400dffd2eeaf7cd9983e8dc96105e SHA512 b03bb932efa54be0d55be591850064fcc967c8d77afdded255be91794544d47bdbbbd2959103cb739f6ec57b8571a955352e965ee1540a9854235a963b218bd3
diff --git a/dev-lang/ghc/files/ghc-9.0.2-sphinx-6.patch b/dev-lang/ghc/files/ghc-9.0.2-sphinx-6.patch
new file mode 100644
index 000000000000..02364dd8eea5
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-9.0.2-sphinx-6.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/890563
+https://gitlab.haskell.org/ghc/ghc/-/commit/00dc51060881df81258ba3b3bdf447294618a4de
+https://gitlab.haskell.org/ghc/ghc/-/issues/22690
+
+From 00dc51060881df81258ba3b3bdf447294618a4de Mon Sep 17 00:00:00 2001
+From: Matthew Pickering <matthewtpickering@gmail.com>
+Date: Tue, 3 Jan 2023 15:56:37 +0000
+Subject: [PATCH] sphinx: Use modern syntax for extlinks
+
+This fixes the following build error:
+
+```
+  Command line: /opt/homebrew/opt/sphinx-doc/bin/sphinx-build -b man -d /private/tmp/extra-dir-55768274273/.doctrees-man -n -w /private/tmp/extra-dir-55768274273/.log docs/users_guide /private/tmp/extra-dir-55768274273
+  ===> Command failed with error code: 2
+
+  Exception occurred:
+    File "/opt/homebrew/Cellar/sphinx-doc/6.0.0/libexec/lib/python3.11/site-packages/sphinx/ext/extlinks.py", line 101, in role
+      title = caption % part
+              ~~~~~~~~^~~~~~
+  TypeError: not all arguments converted during string formatting
+```
+
+I tested on Sphinx-5.1.1 and Sphinx-6.0.0
+
+Thanks for sterni for providing instructions about how to test using
+sphinx-6.0.0.
+
+Fixes #22690
+--- a/docs/users_guide/ghc_config.py.in
++++ b/docs/users_guide/ghc_config.py.in
+@@ -1,6 +1,6 @@
+ extlinks = {
+-    'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', '#'),
+-    'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', '#'),
++    'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', '%s'),
++    'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', '#%s'),
+ }
+ 
+ libs_base_uri = '../libraries'
+-- 
+GitLab
diff --git a/dev-lang/ghc/ghc-9.0.2-r3.ebuild b/dev-lang/ghc/ghc-9.0.2-r3.ebuild
index b7d4466a00c3..1cd220d817eb 100644
--- a/dev-lang/ghc/ghc-9.0.2-r3.ebuild
+++ b/dev-lang/ghc/ghc-9.0.2-r3.ebuild
@@ -544,6 +544,7 @@ src_prepare() {
 		eapply "${FILESDIR}"/latomic-subword
 		eapply "${WORKDIR}"/${P}-riscv64-llvm.patch
 		eapply "${FILESDIR}"/${PN}-9.0.2-fptools.patch # clang-16 workaround
+		eapply "${FILESDIR}"/${PN}-9.0.2-sphinx-6.patch
 
 		# mingw32 target
 		pushd "${S}/libraries/Win32"