From a5ffd232dbe9f3aae4809f8d71355a97a65c2680 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Mon, 29 May 2023 18:55:13 +0200 Subject: sci-visualization/gnuplot: Update live ebuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update picins removal patch. Drop ggi USE flag, following upstream. Signed-off-by: Ulrich Müller --- .../gnuplot/files/gnuplot-5.5-no-picins.patch | 18 ------------------ .../gnuplot/files/gnuplot-6.1-no-picins.patch | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch create mode 100644 sci-visualization/gnuplot/files/gnuplot-6.1-no-picins.patch (limited to 'sci-visualization/gnuplot/files') diff --git a/sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch b/sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch deleted file mode 100644 index b27b0bd941bd..000000000000 --- a/sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch +++ /dev/null @@ -1,18 +0,0 @@ -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/files/gnuplot-6.1-no-picins.patch b/sci-visualization/gnuplot/files/gnuplot-6.1-no-picins.patch new file mode 100644 index 000000000000..a0e2c8a429ab --- /dev/null +++ b/sci-visualization/gnuplot/files/gnuplot-6.1-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 +@@ -143,9 +143,10 @@ + $(AM_V_at)GNUPLOT_LIB=$(top_srcdir)/demo $(GNUPLOT_EXE) $(srcdir)/plotstyles.gnu + rm -f gpinsetfigure.tex + printf '%s\n' '\usepackage{graphicx}' \ +- '\usepackage{picins}' \ + '\newcommand{\gpinsetfigure}[1]{' \ +- ' \parpic[r][rt]{\includegraphics[width=3in,keepaspectratio]{#1}}' \ ++ ' \begin{figure}[htb]' \ ++ ' \centering\includegraphics[width=3in,keepaspectratio]{#1}' \ ++ ' \end{figure}' \ + '}' > gpinsetfigure.tex + $(AM_V_GEN)touch $@ + $(AM_V_at)touch figurestyle -- cgit v1.2.3-65-gdbad