[gentoo-commits] repo/gentoo:master commit in: sys-devel/clang/

[Michał Górny]

commit:     3dc2033249469ce893abcd73164058280fbaae95
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  6 07:40:27 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Apr  6 12:47:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dc20332

sys-devel/clang: Fix installing extra tool docs to docdir

 sys-devel/clang/clang-4.0.0-r1.ebuild | 3 +++
 sys-devel/clang/clang-9999.ebuild     | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/sys-devel/clang/clang-4.0.0-r1.ebuild 
b/sys-devel/clang/clang-4.0.0-r1.ebuild
index cd232123da2..b8ce12c11d4 100644
--- a/sys-devel/clang/clang-4.0.0-r1.ebuild
+++ b/sys-devel/clang/clang-4.0.0-r1.ebuild
@@ -187,6 +187,7 @@ multilib_src_configure() {
                )
                use doc && mycmakeargs+=(
                        
-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+                       
-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
                        -DSPHINX_WARNINGS_AS_ERRORS=OFF
                )
        else
@@ -293,4 +294,6 @@ multilib_src_install_all() {
        fi
 
        docompress "/usr/lib/llvm/${SLOT}/share/man"
+       # match 'html' non-compression
+       use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
 }

diff --git a/sys-devel/clang/clang-9999.ebuild 
b/sys-devel/clang/clang-9999.ebuild
index 03ed29156ba..cd95492a02c 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -184,6 +184,7 @@ multilib_src_configure() {
                )
                use doc && mycmakeargs+=(
                        
-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+                       
-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
                        -DSPHINX_WARNINGS_AS_ERRORS=OFF
                )
        else
@@ -290,4 +291,6 @@ multilib_src_install_all() {
        fi
 
        docompress "/usr/lib/llvm/${SLOT}/share/man"
+       # match 'html' non-compression
+       use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
 }