From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BDCD5138334 for ; Tue, 16 Jul 2019 09:08:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E644FE077A; Tue, 16 Jul 2019 09:08:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 81151E077A for ; Tue, 16 Jul 2019 09:08:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 325AB347D34 for ; Tue, 16 Jul 2019 09:08:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64EC9742 for ; Tue, 16 Jul 2019 09:08:38 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1563268092.735a8c0df42dc1486356e695ad82017e23638593.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-visualization/gnuplot/gnuplot-5.0.7.ebuild sci-visualization/gnuplot/gnuplot-5.2.6.ebuild sci-visualization/gnuplot/gnuplot-5.2.7.ebuild sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild X-VCS-Directories: sci-visualization/gnuplot/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 735a8c0df42dc1486356e695ad82017e23638593 X-VCS-Branch: master Date: Tue, 16 Jul 2019 09:08:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fc0e49f4-ee97-4b45-9534-82f10ebeb8a2 X-Archives-Hash: cbce0a3df2ee120cc0ca515843f22e7d commit: 735a8c0df42dc1486356e695ad82017e23638593 Author: Ulrich Müller gentoo org> AuthorDate: Tue Jul 16 09:07:38 2019 +0000 Commit: Ulrich Müller gentoo 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 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