From: Ulrich Müller <ulm@gentoo.org>
Date: Tue, 16 Jul 2019 09:07:38 +0000 (+0200)
Subject: sci-visualization/gnuplot: Fix build of documentation without gd.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=735a8c0df42dc1486356e695ad82017e23638593;p=gentoo.git

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@gentoo.org>
---

diff --git a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
index 8d3338bad0a1..27def81ca7fe 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 e71b7253da9e..99a845fc7433 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 9240510b1032..4ea9c17d1442 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 517402b50184..38d6d67f756b 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