commit: a90ece3571d05bea373445881972f7c2b9f1ab79 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Tue Aug 3 06:04:20 2021 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Tue Aug 3 06:04:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a90ece35
sci-visualization/gnuplot: Update live ebuild to EAPI 8 and fix patch Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> .../gnuplot/files/gnuplot-5.5-no-picins.patch | 18 ++++++++++++++++++ sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild | 10 +++++----- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch b/sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch new file mode 100644 index 00000000000..b27b0bd941b --- /dev/null +++ b/sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch @@ -0,0 +1,18 @@ +Do not require picins.sty. +https://bugs.gentoo.org/577828#c4 + +--- gnuplot/docs/Makefile.am ++++ gnuplot/docs/Makefile.am +@@ -179,9 +179,10 @@ + $(AM_V_at)GNUPLOT_LIB=$(top_srcdir)/demo $(GNUPLOT_EXE) $(srcdir)/plotstyles.gnu + rm -f gpinsetfigure.tex ; \ + ( echo "\usepackage{graphicx}" > gpinsetfigure.tex ; \ +- echo "\usepackage{picins}" >> gpinsetfigure.tex ; \ + echo "\newcommand{\gpinsetfigure}[1]{" >> gpinsetfigure.tex ; \ +- echo " \parpic[r][rt]{\includegraphics[width=3in,keepaspectratio]{#1}}" >> gpinsetfigure.tex ; \ ++ echo " \begin{figure}[htb]" >> gpinsetfigure.tex ; \ ++ echo " \centering\includegraphics[width=3in,keepaspectratio]{#1}" >> gpinsetfigure.tex ; \ ++ echo " \end{figure}" >> gpinsetfigure.tex ; \ + echo "}" >> gpinsetfigure.tex ; \ + ) ; \ + $(AM_V_GEN)touch $@ diff --git a/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild index 306871a94a9..bb22478f1dc 100644 --- a/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -LUA_COMPAT=( lua5-{1,2,3} ) +LUA_COMPAT=( lua5-{1,2,3,4} ) WX_GTK_VER="3.0-gtk3" inherit autotools flag-o-matic lua-single readme.gentoo-r1 toolchain-funcs wxwidgets @@ -70,13 +70,13 @@ BDEPEND=" app-text/ghostscript-gpl ) qt5? ( dev-qt/linguist-tools:5 )" +IDEPEND="latex? ( virtual/latex-base )" + GP_VERSION="${PV%.*}" -E_SITEFILE="lisp/50${PN}-gentoo.el" TEXMF="${EPREFIX}/usr/share/texmf-site" PATCHES=( - "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch - "${FILESDIR}"/${PN}-5.0.6-no-picins.patch + "${FILESDIR}"/${PN}-5.5-no-picins.patch ) pkg_setup() {
