commit: 63183912631f6741a157c59629aa8bb700fb8874
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Sep 7 07:45:30 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Sep 19 11:04:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63183912
java-pkg-simple.eclass: respect SLOT="0" in JAVA_LAUNCHER_FILENAME
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
eclass/java-pkg-simple.eclass | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
index 77038c708256..14650ea7e8d3 100644
--- a/eclass/java-pkg-simple.eclass
+++ b/eclass/java-pkg-simple.eclass
@@ -162,7 +162,11 @@ fi
# If ${JAVA_MAIN_CLASS} is set, we will create a launcher to
# execute the jar, and ${JAVA_LAUNCHER_FILENAME} will be the
# name of the script.
-: "${JAVA_LAUNCHER_FILENAME:=${PN}-${SLOT}}"
+if [[ ${SLOT} = 0 ]]; then
+ : "${JAVA_LAUNCHER_FILENAME:=${PN}}"
+else
+ : "${JAVA_LAUNCHER_FILENAME:=${PN}-${SLOT}}"
+fi
# @ECLASS_VARIABLE: JAVA_TESTING_FRAMEWORKS
# @DEFAULT_UNSET
