commit: 735a8c0df42dc1486356e695ad82017e23638593 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Tue Jul 16 09:07:38 2019 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Tue Jul 16 09:08:12 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=735a8c0d
sci-visualization/gnuplot: Fix build of documentation without gd. Bug: https://bugs.gentoo.org/577828 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> sci-visualization/gnuplot/gnuplot-5.0.7.ebuild | 6 +++--- sci-visualization/gnuplot/gnuplot-5.2.6.ebuild | 4 ++-- sci-visualization/gnuplot/gnuplot-5.2.7.ebuild | 4 ++-- sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild index 8d3338bad0a..27def81ca7f 100644 --- a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -160,10 +160,10 @@ src_compile() { if use doc; then # Avoid sandbox violation in epstopdf/ghostscript addpredict /var/cache/fontconfig - if use cairo; then + if use cairo && use gd; then emake -C docs pdf else - ewarn "Cannot build figures unless cairo is enabled." + ewarn "Cannot build figures unless cairo and gd are enabled." ewarn "Building documentation without figures." emake -C docs pdf_nofig mv docs/nofigures.pdf docs/gnuplot.pdf || die diff --git a/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild index e71b7253da9..99a845fc743 100644 --- a/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild @@ -158,10 +158,10 @@ src_compile() { if use doc; then # Avoid sandbox violation in epstopdf/ghostscript addpredict /var/cache/fontconfig - if use cairo; then + if use cairo && use gd; then emake -C docs pdf else - ewarn "Cannot build figures unless cairo is enabled." + ewarn "Cannot build figures unless cairo and gd are enabled." ewarn "Building documentation without figures." emake -C docs pdf_nofig mv docs/nofigures.pdf docs/gnuplot.pdf || die diff --git a/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild index 9240510b103..4ea9c17d144 100644 --- a/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild @@ -158,10 +158,10 @@ src_compile() { if use doc; then # Avoid sandbox violation in epstopdf/ghostscript addpredict /var/cache/fontconfig - if use cairo; then + if use cairo && use gd; then emake -C docs pdf else - ewarn "Cannot build figures unless cairo is enabled." + ewarn "Cannot build figures unless cairo and gd are enabled." ewarn "Building documentation without figures." emake -C docs pdf_nofig mv docs/nofigures.pdf docs/gnuplot.pdf || die diff --git a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild index 517402b5018..38d6d67f756 100644 --- a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -156,10 +156,10 @@ src_compile() { if use doc; then # Avoid sandbox violation in epstopdf/ghostscript addpredict /var/cache/fontconfig - if use cairo; then + if use cairo && use gd; then emake -C docs pdf else - ewarn "Cannot build figures unless cairo is enabled." + ewarn "Cannot build figures unless cairo and gd are enabled." ewarn "Building documentation without figures." emake -C docs pdf_nofig mv docs/nofigures.pdf docs/gnuplot.pdf || die
