commit:     c8349494bc758d16a47de730e13057aff602e3f4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 11:21:42 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 11:23:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8349494

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

 sys-devel/llvm/llvm-9999.ebuild | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 12c9683..4c8d6da 100644
--- 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+=(

Reply via email to