commit: ce19cc9df7e5623a6a1c486e3c0075f58df0f599 Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> AuthorDate: Wed Jan 22 17:00:14 2025 +0000 Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> CommitDate: Wed Jan 22 17:00:14 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce19cc9d
net-wireless/tempestsdr: use the java eclass Custom launcher didn't work correctly, no reason to be special. Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> net-wireless/tempestsdr/tempestsdr-0.0_p20200221-r1.ebuild | 14 +++----------- net-wireless/tempestsdr/tempestsdr-9999.ebuild | 14 +++----------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/net-wireless/tempestsdr/tempestsdr-0.0_p20200221-r1.ebuild b/net-wireless/tempestsdr/tempestsdr-0.0_p20200221-r1.ebuild index 1301229d0e69..6899df0f0f5b 100644 --- a/net-wireless/tempestsdr/tempestsdr-0.0_p20200221-r1.ebuild +++ b/net-wireless/tempestsdr/tempestsdr-0.0_p20200221-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,7 +19,6 @@ else SRC_URI="https://github.com/deltj/TempestSDR/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/TempestSDR-${COMMIT}" fi -IUSE="" DEPEND=">=virtual/jdk-1.8:* dev-libs/boost:= @@ -29,19 +28,12 @@ DEPEND=">=virtual/jdk-1.8:* net-wireless/bladerf:= net-wireless/hackrf-tools" RDEPEND="${DEPEND}" -BDEPEND="" src_compile() { emake all } src_install() { - insinto /usr/share/${PN} - doins JavaGUI/JTempestSDR.jar - dodir /usr/bin - cat <<-EOF > "${ED}/usr/bin/tempestsdr" -#!/bin/sh -java -jar /usr/share/tempestsdr/JTempestSDR.jar -EOF - fperms +x /usr/bin/tempestsdr + java-pkg_dojar JavaGUI/JTempestSDR.jar + java-pkg_dolauncher tempestsdr --jar JTempestSDR.jar } diff --git a/net-wireless/tempestsdr/tempestsdr-9999.ebuild b/net-wireless/tempestsdr/tempestsdr-9999.ebuild index 1301229d0e69..6899df0f0f5b 100644 --- a/net-wireless/tempestsdr/tempestsdr-9999.ebuild +++ b/net-wireless/tempestsdr/tempestsdr-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,7 +19,6 @@ else SRC_URI="https://github.com/deltj/TempestSDR/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/TempestSDR-${COMMIT}" fi -IUSE="" DEPEND=">=virtual/jdk-1.8:* dev-libs/boost:= @@ -29,19 +28,12 @@ DEPEND=">=virtual/jdk-1.8:* net-wireless/bladerf:= net-wireless/hackrf-tools" RDEPEND="${DEPEND}" -BDEPEND="" src_compile() { emake all } src_install() { - insinto /usr/share/${PN} - doins JavaGUI/JTempestSDR.jar - dodir /usr/bin - cat <<-EOF > "${ED}/usr/bin/tempestsdr" -#!/bin/sh -java -jar /usr/share/tempestsdr/JTempestSDR.jar -EOF - fperms +x /usr/bin/tempestsdr + java-pkg_dojar JavaGUI/JTempestSDR.jar + java-pkg_dolauncher tempestsdr --jar JTempestSDR.jar }