[gentoo-commits] repo/gentoo:master commit in: app-misc/rundeck-cli-bin/

[William Hubbs]

commit:     38dc429245b0d935aeeb0b423ace19787c88b195
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Aug 24 10:46:34 2022 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 16:37:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38dc4292

app-misc/rundeck-cli-bin: revert to 0.1.11 style

Bug: https://bugs.gentoo.org/861026
Closes: https://github.com/gentoo/gentoo/pull/27000
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 app-misc/rundeck-cli-bin/metadata.xml                 |  3 ---
 app-misc/rundeck-cli-bin/rundeck-cli-bin-2.0.1.ebuild | 13 +++++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app-misc/rundeck-cli-bin/metadata.xml b/app-misc/rundeck-cli-bin/metadata.xml
index 6f8ff53657c1..e8b9db973b54 100644
--- a/app-misc/rundeck-cli-bin/metadata.xml
+++ b/app-misc/rundeck-cli-bin/metadata.xml
@@ -12,7 +12,4 @@
 	<upstream>
 		<remote-id type="github">rundeck/rundeck-cli</remote-id>
 	</upstream>
-	<use>
-		<flag name="binary">Copy the precompiled jar file and skip the rest of src_compile</flag>
-	</use>
 </pkgmetadata>

diff --git a/app-misc/rundeck-cli-bin/rundeck-cli-bin-2.0.1.ebuild b/app-misc/rundeck-cli-bin/rundeck-cli-bin-2.0.1.ebuild
index 52095686cabf..c48dc52c2588 100644
--- a/app-misc/rundeck-cli-bin/rundeck-cli-bin-2.0.1.ebuild
+++ b/app-misc/rundeck-cli-bin/rundeck-cli-bin-2.0.1.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=8
 
-JAVA_PKG_IUSE="binary"
-
-inherit java-pkg-2 java-pkg-simple
+inherit java-pkg-2
 
 DESCRIPTION="Command line tool for rundeck"
 HOMEPAGE="https://www.rundeck.com/open-source"
@@ -14,9 +12,12 @@ SRC_URI="https://github.com/rundeck/rundeck-cli/releases/download/v${PV}/rundeck
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+binary"
 
 RDEPEND=">=virtual/jre-11:*"
 
-JAVA_MAIN_CLASS="org.rundeck.client.tool.Main"
-JAVA_BINJAR_FILENAME="rundeck-cli-${PV}-all.jar"
+S="${WORKDIR}"
+
+src_install() {
+	java-pkg_newjar "${DISTDIR}"/rundeck-cli-${PV}-all.jar rundeck-cli.jar
+	java-pkg_dolauncher rd
+}