commit: a1342100d14d174b715ece9eb2ff7aa4c654ca7b
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 18:51:23 2020 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 19:04:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1342100
sci-visualization/gnuplot: Bump live ebuilds to EAPI 7.
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild | 14 +++++++++-----
sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild | 14 +++++++++-----
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
b/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
index 56845ef2630..4c57d268b61 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets
@@ -37,7 +37,8 @@ RDEPEND="
>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
libcaca? ( media-libs/libcaca )
lua? ( dev-lang/lua:0 )
- qt5? ( dev-qt/qtcore:5=
+ qt5? (
+ dev-qt/qtcore:5=
dev-qt/qtgui:5=
dev-qt/qtnetwork:5=
dev-qt/qtprintsupport:5=
@@ -52,7 +53,10 @@ RDEPEND="
x11-libs/pango
x11-libs/gtk+:2 )
X? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
virtual/pkgconfig
doc? (
virtual/latex-base
@@ -181,8 +185,8 @@ src_install() {
# Demo files
insinto /usr/share/${PN}/${GP_VERSION}
doins -r demo
- rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
- rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
+ rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
+ rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
fi
if use doc; then
diff --git a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
b/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
index f1ec64c8b8c..8dff85f2e46 100644
--- a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets
@@ -37,7 +37,8 @@ RDEPEND="
>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
libcaca? ( media-libs/libcaca )
lua? ( dev-lang/lua:0 )
- qt5? ( dev-qt/qtcore:5=
+ qt5? (
+ dev-qt/qtcore:5=
dev-qt/qtgui:5=
dev-qt/qtnetwork:5=
dev-qt/qtprintsupport:5=
@@ -51,7 +52,10 @@ RDEPEND="
x11-libs/pango
x11-libs/gtk+:2 )
X? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
virtual/pkgconfig
doc? (
virtual/latex-base
@@ -170,8 +174,8 @@ src_install() {
# Demo files
insinto /usr/share/${PN}/${GP_VERSION}
doins -r demo
- rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
- rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
+ rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
+ rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
fi
if use doc; then
