[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Christoph Junghans]

commit:     fe1014ef3c396c3ab94f54d604da7f082060df3b
Author:     Christoph Junghans <junghans <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 05:20:35 2018 +0000
Commit:     Christoph Junghans <junghans <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 02:54:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe1014ef

sci-libs/fftw: fix doc build for live ebuild

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 sci-libs/fftw/fftw-9999.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index bef41e83ea0..c08278dde80 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -30,11 +30,11 @@ DEPEND="${RDEPEND}
        test? ( dev-lang/perl )"
 if [[ ${PV} = *9999 ]]; then
        DEPEND="${DEPEND}
-               dev-ml/ocamlbuild"
+               dev-ml/ocamlbuild
+               doc? ( media-gfx/transfig )"
 fi
 
 S=${WORKDIR}/${MY_P}
-HTML_DOCS=( doc/html/. )
 
 pkg_pretend() {
        [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -146,7 +146,7 @@ src_configure() {
 }
 
 src_compile() {
-       multibuild_foreach_variant multilib-minimal_src_compile
+       multibuild_foreach_variant multilib-minimal_src_compile all $([[ ${PV} 
= *9999 ]] && usev doc)
 }
 
 multilib_src_test() {
@@ -164,6 +164,7 @@ src_test() {
 }
 
 src_install() {
+       use doc && HTML_DOCS=( doc/html/. )
        multibuild_foreach_variant multilib-minimal_src_install
        dodoc CONVENTIONS
 
@@ -171,8 +172,6 @@ src_install() {
                dodoc doc/*.pdf
                docinto faq
                dodoc -r doc/FAQ/fftw-faq.html/.
-       else
-               rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
        fi
 
        local x