[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/

[Ulrich Müller]

commit:     a6fc01a9978f3850a95e53b8a8f8b4a202745aed
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 11:31:48 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> 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
 }