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 644B81396D9 for ; Sun, 19 Nov 2017 11:46:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B99A6E0C56; Sun, 19 Nov 2017 11:46:53 +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 969C3E0C56 for ; Sun, 19 Nov 2017 11:46:53 +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 A299833BEA7 for ; Sun, 19 Nov 2017 11:46:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 686F6A025 for ; Sun, 19 Nov 2017 11:46:50 +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: <1511091985.a6fc01a9978f3850a95e53b8a8f8b4a202745aed.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.1.9999.ebuild X-VCS-Directories: sci-visualization/gnuplot/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: a6fc01a9978f3850a95e53b8a8f8b4a202745aed X-VCS-Branch: master Date: Sun, 19 Nov 2017 11:46:50 +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-Archives-Salt: b9112784-9ca3-4dac-b151-dadede5312db X-Archives-Hash: 5e4912fd676d5b6e77fd9d131edce234 commit: a6fc01a9978f3850a95e53b8a8f8b4a202745aed Author: Ulrich Müller gentoo org> AuthorDate: Sun Nov 19 11:31:48 2017 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun Nov 19 11:46:25 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6fc01a9 sci-visualization/gnuplot: Update live ebuild for HEAD. - Sync with ebuild for stable branch. - configure.in is configure.ac now. - Option --without-pdf has been removed from upstream configure. Package-Manager: Portage-2.3.14, Repoman-2.3.6 sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild index cbc8a7447f0..c2be8b92510 100644 --- a/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild @@ -67,7 +67,9 @@ E_SITEFILE="lisp/50${PN}-gentoo.el" TEXMF="${EPREFIX}/usr/share/texmf-site" src_prepare() { - default + eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch + eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch + eapply_user if [[ -z ${PV%%*9999} ]]; then local dir @@ -98,7 +100,6 @@ src_prepare() { environment variables. See the FAQ file in /usr/share/doc/${PF}/ for more information.' - mv configure.in configure.ac || die eautoreconf # Make sure we don't mix build & host flags. @@ -125,7 +126,6 @@ src_configure() { export CC_FOR_BUILD=${BUILD_CC} econf \ - --without-pdf \ --with-texdir="${TEXMF}/tex/latex/${PN}" \ --with-readline=$(usex readline gnu builtin) \ $(use_with bitmap bitmap-terminals) \ @@ -160,7 +160,14 @@ src_compile() { if use doc; then # Avoid sandbox violation in epstopdf/ghostscript addpredict /var/cache/fontconfig - emake -C docs gnuplot.pdf + if use cairo; then + emake -C docs pdf + else + ewarn "Cannot build figures unless cairo is enabled." + ewarn "Building documentation without figures." + emake -C docs pdf_nofig + mv docs/nofigures.pdf docs/gnuplot.pdf || die + fi emake -C tutorial pdf fi }