From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 6B05E138350 for ; Fri, 10 Apr 2020 19:05:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7084CE0AB9; Fri, 10 Apr 2020 19:04:59 +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 451A3E0AB9 for ; Fri, 10 Apr 2020 19:04:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 AB7BD34EF83 for ; Fri, 10 Apr 2020 19:04:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 495E21CE for ; Fri, 10 Apr 2020 19:04:55 +0000 (UTC) From: "Ulrich Müller" 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" Message-ID: <1586545483.a1342100d14d174b715ece9eb2ff7aa4c654ca7b.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild X-VCS-Directories: sci-visualization/gnuplot/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: a1342100d14d174b715ece9eb2ff7aa4c654ca7b X-VCS-Branch: master Date: Fri, 10 Apr 2020 19:04:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 69d5d43f-65e3-4dcc-8b9a-f7594ff74e2c X-Archives-Hash: 6bec70772f34ecd58977d2eada453b1b commit: a1342100d14d174b715ece9eb2ff7aa4c654ca7b Author: Ulrich Müller gentoo org> AuthorDate: Fri Apr 10 18:51:23 2020 +0000 Commit: Ulrich Müller gentoo 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 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