[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gcalc/

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gcalc/

[James Le Cuirot]

commit:     24218dbfd47b2fe7ca0bee5396aebd44b4db0931
Author:     Gerhard Bräunlich <wippbox <AT> gmx <DOT> net>
AuthorDate: Sat Jan 14 14:17:42 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 22:59:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24218dbf

sci-visualization/gcalc: EAPI bump 4 -> 6

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/3471

 sci-visualization/gcalc/gcalc-3.1_rc1-r1.ebuild | 41 +++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/sci-visualization/gcalc/gcalc-3.1_rc1-r1.ebuild b/sci-visualization/gcalc/gcalc-3.1_rc1-r1.ebuild
new file mode 100644
index 00000000..6aaed93
--- /dev/null
+++ b/sci-visualization/gcalc/gcalc-3.1_rc1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+}

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gcalc/

[James Le Cuirot]

commit:     d8cf0b51f7c564e22dd7fad314586724aabce169
Author:     Gerhard Bräunlich <wippbox <AT> gmx <DOT> net>
AuthorDate: Sat Jan 14 14:18:08 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 23:00:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8cf0b51

sci-visualization/gcalc: Removing EAPI 4 build

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/3471

 sci-visualization/gcalc/gcalc-3.1_rc1.ebuild | 42 ----------------------------
 1 file changed, 42 deletions(-)

diff --git a/sci-visualization/gcalc/gcalc-3.1_rc1.ebuild b/sci-visualization/gcalc/gcalc-3.1_rc1.ebuild
deleted file mode 100644
index 0ee0c5e..00000000
--- a/sci-visualization/gcalc/gcalc-3.1_rc1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils java-pkg-2
-
-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.4
-	!!sci-mathematics/gcalc"
-DEPEND=">=virtual/jdk-1.4"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
-}
-
-src_compile() {
-	cd src || die
-	ejavac $(find . -name '*.java')
-
-	jar cf ${PN}.jar resources pluginlist.xml $(find . -name '*.class') || die
-}
-
-src_install() {
-	java-pkg_dojar src/${PN}.jar
-	java-pkg_dolauncher gcalc --main net.gcalc.calc.GCalc
-
-	newicon src/resources/gicon.png ${PN}.png || die
-	make_desktop_entry ${PN} "GCalc Java Mathematical Graphing System"
-}

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gcalc/

[Miroslav Šulc]

commit:     0b2d666c2babeded0b8ff1c380d428c5ab4607e1
Author:     Wolfgang E. Sanyer <ezzieyguywuf <AT> gmail <DOT> com>
AuthorDate: Tue May  4 00:10:26 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue May  4 09:21:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b2d666c

sci-visualization/gcalc: updated java deps

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 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20608/commits/3a217c7f3c5f31abcbcb3ae81e5dbeb80246beee
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../{gcalc-3.1_rc1-r1.ebuild => gcalc-3.1_rc1-r2.ebuild}     | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

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 285044c9058..f5a27970376 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}"
 

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gcalc/

[Miroslav Šulc]

commit:     8998e9cd25f7eba6d4e1198f7942be5b885a4836
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Nov  7 17:14:08 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 07:55:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8998e9cd

sci-visualization/gcalc: style update, update EAPI 7 -> 8

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/39233/commits/5fe47fd0f9be63794fc52a4875262833da20f49c
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 ...c-3.1_rc1-r2.ebuild => gcalc-3.1_rc1-r3.ebuild} | 31 +++++++++++-----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild b/sci-visualization/gcalc/gcalc-3.1_rc1-r3.ebuild
similarity index 56%
rename from sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild
rename to sci-visualization/gcalc/gcalc-3.1_rc1-r3.ebuild
index f5a27970376f..825f3b99f106 100644
--- a/sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild
+++ b/sci-visualization/gcalc/gcalc-3.1_rc1-r3.ebuild
@@ -1,38 +1,37 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 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"
+HOMEPAGE="https://gcalc.net/"
+SRC_URI="https://gcalc.net/files/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64"
 SLOT="0"
+KEYWORDS="~amd64"
 
-RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
-S="${WORKDIR}/${MY_P}"
+JAVA_MAIN_CLASS="net.gcalc.calc.GCalc"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR="src"
 
 src_prepare() {
+	java-pkg-2_src_prepare
 	java-pkg_clean
-	default
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src ! -name "*.html"
+	mkdir res || die
+	mv {src,res}/resources || die
+	cp {src,res}/pluginlist.xml || die
 }
 
 src_install() {
 	java-pkg-simple_src_install
-	java-pkg_dolauncher gcalc --main net.gcalc.calc.GCalc
-
-	newicon src/resources/gicon.png ${PN}.png
+	newicon res/resources/gicon.png ${PN}.png
 	make_desktop_entry ${PN} "GCalc Java Mathematical Graphing System"
 }