From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8AF1C158089 for ; Tue, 19 Sep 2023 11:12:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 937E42BC03E; Tue, 19 Sep 2023 11:12:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 79D022BC03E for ; Tue, 19 Sep 2023 11:12:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4C2F3335C9F for ; Tue, 19 Sep 2023 11:12:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ADCE411D6 for ; Tue, 19 Sep 2023 11:12:11 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1695121488.63183912631f6741a157c59629aa8bb700fb8874.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/java-pkg-simple.eclass X-VCS-Directories: eclass/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 63183912631f6741a157c59629aa8bb700fb8874 X-VCS-Branch: master Date: Tue, 19 Sep 2023 11:12:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 41714c67-f250-4f0b-a66c-9145f3f0c134 X-Archives-Hash: 165858ecdf63b589fc40dd2dbd1deed9 commit: 63183912631f6741a157c59629aa8bb700fb8874 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Thu Sep 7 07:45:30 2023 +0000 Commit: Miroslav Šulc gentoo 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 pogatzki.net> Signed-off-by: Miroslav Šulc 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