sci-geosciences/gpsprune-bin: add 23.2, drop 23.1, various fixes

- properly install the jar file
- drop empty IUSE
- fix DEPEND/RDEPEND
- use https

Closes: https://bugs.gentoo.org/915822
Closes: https://bugs.gentoo.org/915823
Signed-off-by: Florian Schmaus <flow@gentoo.org>

3 files changed, 52 insertions, 66 deletions

diff --git a/sci-geosciences/gpsprune-bin/Manifest b/sci-geosciences/gpsprune-bin/Manifest
index e5e46daa214b..d426286ca59d 100644
--- a/sci-geosciences/gpsprune-bin/Manifest
+++ b/sci-geosciences/gpsprune-bin/Manifest
@@ -1 +1 @@
-DIST gpsprune_23.1.jar 1201224 BLAKE2B 829383d8fdc5406b4bbddfb224d48142cee910b478db8e67029592c9a8382b78f0286b3850b484801688254455d043e6409e3af21d3fb4956fc284a6f2e3685d SHA512 45b285bd6f940619c2e6f73f29f377a8db01e29435833c07286261d57eee2b5584193b040ed4ce15fe1c0cfae15f629a3b95c0a25af74cf51af64cfa7fc19183
+DIST gpsprune_23.2.jar 1201771 BLAKE2B 6673381e2415ff58293a5f8aea2d4140054dfca846b5000b7fdd4ad405a3a5a634704131a7269d5a62e8a1870e6e3735321a54f6c07d729efa55c09e6ec52de0 SHA512 5e33909d709440b989426de9617b51408739c5dfea040bf0c61ff59ee654a20d318829bed1aa34cbe36dd3698ee30c6c421ad5c6f1c17018d71b5891bd7ffd45
diff --git a/sci-geosciences/gpsprune-bin/gpsprune-bin-23.1.ebuild b/sci-geosciences/gpsprune-bin/gpsprune-bin-23.1.ebuild
deleted file mode 100644
index af6ab8ead830..000000000000
--- a/sci-geosciences/gpsprune-bin/gpsprune-bin-23.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop
-
-DESCRIPTION="An application for viewing, editing and converting GPS data"
-HOMEPAGE="http://activityworkshop.net/software/gpsprune/index.html"
-SRC_URI="http://activityworkshop.net/software/gpsprune/gpsprune_${PV}.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/jre:*"
-RDEPEND="${DEPEND}"
-
-gpsprune_bin="${WORKDIR}/gpsprune"
-gpsprune_desktop="${WORKDIR}/gpsprune.desktop"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	# Provide the necessary files
-	cp "${DISTDIR}/${A}" "${WORKDIR}" || die
-	for size in 128 96 72 64 48 36 32 24 22 16; do
-		mkdir -p "${WORKDIR}/icons/$size"
-		cp "${WORKDIR}/tim/prune/gui/images/window_icon_${size}.png" "${WORKDIR}/icons/$size/gpsprune.png" || die
-	done
-
-	# Generate an executable
-	cat <<-EOF > "${gpsprune_bin}" || die
-	#!/bin/sh
-	java -jar /opt/gpsprune/gpsprune_${PV}.jar \$@
-	EOF
-
-	# Generate a .desktop file
-	cat <<-EOF > "${gpsprune_desktop}" || die
-	[Desktop Entry]
-	Name=GpsPrune
-	Type=Application
-	Comment=Application for viewing, editing and converting coordinate data from GPS systems
-	Exec=gpsprune
-	Icon=gpsprune
-	Categories=Science;Geoscience;
-	EOF
-}
-
-src_install() {
-	insinto /opt/gpsprune
-	doins "gpsprune_${PV}.jar"
-	exeinto /usr/bin
-	doexe "${gpsprune_bin}"
-
-	for size in 128 96 72 64 48 36 32 24 22 16; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		doins "icons/${size}/gpsprune.png"
-	done
-
-	domenu gpsprune.desktop
-}
diff --git a/sci-geosciences/gpsprune-bin/gpsprune-bin-23.2.ebuild b/sci-geosciences/gpsprune-bin/gpsprune-bin-23.2.ebuild
new file mode 100644
index 000000000000..62b86546e93b
--- /dev/null
+++ b/sci-geosciences/gpsprune-bin/gpsprune-bin-23.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An application for viewing, editing and converting GPS data"
+HOMEPAGE="https://activityworkshop.net/software/gpsprune/index.html"
+SRC_URI="https://activityworkshop.net/software/gpsprune/gpsprune_${PV}.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-11:*"
+
+S="${WORKDIR}"
+
+JAVA_JAR_FILENAME="gpsprune.jar"
+JAVA_MAIN_CLASS="tim.prune.GpsPrune"
+JAVA_LAUNCHER_FILENAME="gpsprune"
+
+src_prepare() {
+	default
+
+	cp "${DISTDIR}/gpsprune_${PV}.jar" gpsprune.jar || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	for size in 128 96 72 64 48 36 32 24 22 16; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "tim/prune/gui/images/window_icon_${size}.png" gpsprune.png
+	done
+
+	newmenu - gpsprune.desktop <<-EOF
+		[Desktop Entry]
+		Name=GpsPrune
+		Type=Application
+		Comment=Application for viewing, editing and converting coordinate data from GPS systems
+		Exec=gpsprune
+		Icon=gpsprune
+		Categories=Science;Geoscience;
+	EOF
+}