diff options
author | Ulrich Müller <ulm@gentoo.org> | 2017-11-19 12:31:48 +0100 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2017-11-19 12:46:25 +0100 |
commit | a6fc01a9978f3850a95e53b8a8f8b4a202745aed (patch) | |
tree | 56d6d9df64d07bd2a2ff3324a0a614e952539bbc /sci-visualization | |
parent | sci-visualization/gnuplot: Fix building with USE="doc". (diff) | |
download | gentoo-a6fc01a9978f3850a95e53b8a8f8b4a202745aed.tar.gz gentoo-a6fc01a9978f3850a95e53b8a8f8b4a202745aed.tar.bz2 gentoo-a6fc01a9978f3850a95e53b8a8f8b4a202745aed.zip |
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
Diffstat (limited to 'sci-visualization')
-rw-r--r-- | sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild | 15 |
1 files 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 cbc8a7447f0a..c2be8b92510f 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 } |