From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1308994-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 550BA139360
for <garchives@archives.gentoo.org>; Tue, 3 Aug 2021 06:08:10 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2265CE0952;
Tue, 3 Aug 2021 06:08:09 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id E3B86E0905
for <gentoo-commits@lists.gentoo.org>; Tue, 3 Aug 2021 06:08:08 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id A4D5F343AD4
for <gentoo-commits@lists.gentoo.org>; Tue, 3 Aug 2021 06:08:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 237F3851
for <gentoo-commits@lists.gentoo.org>; Tue, 3 Aug 2021 06:08:06 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1627970660.a90ece3571d05bea373445881972f7c2b9f1ab79.ulm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
X-VCS-Directories: sci-visualization/gnuplot/ sci-visualization/gnuplot/files/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: a90ece3571d05bea373445881972f7c2b9f1ab79
X-VCS-Branch: master
Date: Tue, 3 Aug 2021 06:08:06 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0a9b37d4-75a0-4d6e-9562-d43e7856ee6b
X-Archives-Hash: 53e3ca50b51a2cc835fd493290525a7c
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() {