From 0b2d666c2babeded0b8ff1c380d428c5ab4607e1 Mon Sep 17 00:00:00 2001
From: "Wolfgang E. Sanyer" <ezzieyguywuf@gmail.com>
Date: Mon, 3 May 2021 20:10:26 -0400
Subject: 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 <ezzieyguywuf@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20608/commits/3a217c7f3c5f31abcbcb3ae81e5dbeb80246beee
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
---
 sci-visualization/gcalc/gcalc-3.1_rc1-r1.ebuild | 40 -------------------------
 sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild | 38 +++++++++++++++++++++++
 2 files changed, 38 insertions(+), 40 deletions(-)
 delete mode 100644 sci-visualization/gcalc/gcalc-3.1_rc1-r1.ebuild
 create mode 100644 sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild

diff --git a/sci-visualization/gcalc/gcalc-3.1_rc1-r1.ebuild b/sci-visualization/gcalc/gcalc-3.1_rc1-r1.ebuild
deleted file mode 100644
index 285044c90585..000000000000
--- a/sci-visualization/gcalc/gcalc-3.1_rc1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils java-pkg-2 java-pkg-simple
-
-MY_P="GCalc-${PV/_/-}"
-DESCRIPTION="Java Mathematical Graphing System"
-HOMEPAGE="http://gcalc.net/"
-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"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	java-pkg_clean
-	default
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src ! -name "*.html"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher gcalc --main net.gcalc.calc.GCalc
-
-	newicon src/resources/gicon.png ${PN}.png
-	make_desktop_entry ${PN} "GCalc Java Mathematical Graphing System"
-}
diff --git a/sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild b/sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild
new file mode 100644
index 000000000000..f5a27970376f
--- /dev/null
+++ b/sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop java-pkg-2 java-pkg-simple
+
+MY_P="GCalc-${PV/_/-}"
+DESCRIPTION="Java Mathematical Graphing System"
+HOMEPAGE="http://gcalc.net/"
+SRC_URI="http://gcalc.net/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	java-pkg_clean
+	default
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src ! -name "*.html"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher gcalc --main net.gcalc.calc.GCalc
+
+	newicon src/resources/gicon.png ${PN}.png
+	make_desktop_entry ${PN} "GCalc Java Mathematical Graphing System"
+}
-- 
cgit v1.2.3-18-g5258