From 0b2d666c2babeded0b8ff1c380d428c5ab4607e1 Mon Sep 17 00:00:00 2001 From: "Wolfgang E. Sanyer" Date: Mon, 3 May 2021 20:10:26 -0400 Subject: [PATCH] sci-visualization/gcalc: updated java deps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also, update to EAPI 7. Regarding sci-mathematics/gcalc, I did some grepping and found no mention of it anywhere else in the repo. I think it's just an artifact of a realllly old re-categorization. Signed-off-by: Wolfgang E. Sanyer Closes: https://github.com/gentoo/gentoo/pull/20608/commits/3a217c7f3c5f31abcbcb3ae81e5dbeb80246beee Signed-off-by: Miroslav Šulc --- ...alc-3.1_rc1-r1.ebuild => gcalc-3.1_rc1-r2.ebuild} | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) rename sci-visualization/gcalc/{gcalc-3.1_rc1-r1.ebuild => gcalc-3.1_rc1-r2.ebuild} (78%) diff --git a/sci-visualization/gcalc/gcalc-3.1_rc1-r1.ebuild b/sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild similarity index 78% rename from sci-visualization/gcalc/gcalc-3.1_rc1-r1.ebuild rename to sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild index 285044c905854..f5a27970376f9 100644 --- a/sci-visualization/gcalc/gcalc-3.1_rc1-r1.ebuild +++ b/sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils java-pkg-2 java-pkg-simple +inherit desktop java-pkg-2 java-pkg-simple MY_P="GCalc-${PV/_/-}" DESCRIPTION="Java Mathematical Graphing System" @@ -12,12 +12,10 @@ SRC_URI="http://gcalc.net/files/${MY_P}.tar.gz" LICENSE="GPL-2" KEYWORDS="~amd64" -IUSE="" SLOT="0" -RDEPEND=">=virtual/jre-1.7 - !!sci-mathematics/gcalc" -DEPEND=">=virtual/jdk-1.7" +RDEPEND=">=virtual/jre-1.8:*" +DEPEND=">=virtual/jdk-1.8:*" S="${WORKDIR}/${MY_P}"