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@gentoo.org>
This commit is contained in:
Ulrich Müller 2021-08-03 08:04:20 +02:00
parent 1c0ab5d20a
commit a90ece3571
No known key found for this signature in database
GPG Key ID: 5188335088415E2E
2 changed files with 23 additions and 5 deletions

View File

@ -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 $@

View File

@ -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() {