sys-devel/llvm: Update for the Sphinx install dir patch applied upstream

diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 12c96833db849c54d9f512c1555872c31b2a0089..4c8d6da5ab84d56914e20f38212cd8a8c259a7a4 100644 (file)
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -92,10 +92,6 @@ src_prepare() {
        # Fix libdir for ocaml bindings install, bug #559134
        eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
 
-       # Make it possible to override Sphinx HTML install dirs
-       # https://llvm.org/bugs/show_bug.cgi?id=23780
-       eapply "${FILESDIR}"/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
-
        # Prevent race conditions with parallel Sphinx runs
        # https://llvm.org/bugs/show_bug.cgi?id=23781
        eapply "${FILESDIR}"/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
@@ -190,7 +186,7 @@ multilib_src_configure() {
                        -DLLVM_INSTALL_UTILS=ON
                )
                use doc && mycmakeargs+=(
-                       -DLLVM_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/html"
+                       -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
                        -DSPHINX_WARNINGS_AS_ERRORS=OFF
                )
                use gold && mycmakeargs+=(