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 523D915806E for ; Mon, 29 May 2023 07:24:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D0A29E0845; Mon, 29 May 2023 07:24:54 +0000 (UTC) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.130]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 442D6E083D for ; Mon, 29 May 2023 07:24:54 +0000 (UTC) Received: from CYRTRY1.fritz.box ([109.250.83.9]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.130]) with ESMTPSA (Nemesis) id 1MpDRv-1qRcjr3Ihb-00qjgT for ; Mon, 29 May 2023 09:24:52 +0200 From: "Volkmar W. Pogatzki" To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH v2] java-pkg-simple.eclass: respect SLOT="0" in JAVA_LAUNCHER_FILENAME Date: Mon, 29 May 2023 09:24:44 +0200 Message-Id: <20230529072444.1296-1-gentoo@pogatzki.net> X-Mailer: git-send-email 2.39.3 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:0dEQMwor4T+nPhvpfzGi01oGdLOS4XA/UYW1NpIXR+OL1M+8B4G 5JcN59DJWE6pAgByswc3kFD1MyeVewUxFmniR8oRlYsp3FxtK5ozzJEfSU7enGzCj2vRfiy LTHoKYi+SQpGMslthtjly9KRuVLEAkS2litrTchHQOwtEOV/5nE0MRMN4789QM16OyS96Z4 UmU4IbU3CddoA39UEY9hA== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:PFiCDQ0VML4=;zKXbnayNGhyHImkFlagiDyjw+yu 6d8VGpx+ralMCY+cYiU7CQlGqmsuNK5yPVfQdAfQEf2eIxuYeJ3SwuxoKr0AlO67gs4+LYr3W buYih4jiMpXRWCXYi5bJVDzzRjaIFz8pe1zqoMWjjlAax6JfTK2hqhRO3rggVF6UD34jBs2YO WotYPp0ZtATDcwAXUWOe3/pU2/blv/m1BQkNoknjG4MIZP/OTOYFaawl/wUyxRd+01Zssm51U dFOQzvWfvprxGYnh8kNeyEkEnDC/9waIdUa0vMYa/vm/zXSn74t/9r1IRLyGtcq+N/lw39z3R Y2hlqzBm9oCsw0sbOYpfaugEWDtRwFZ2KuYbT+biqJ5ixrooNZArVTT0mEZ7bjtGj5PSz4FbU LaDGNaeSEY7UBH4Bt6egTrqUmmhiU1OsTSOFgHLk0pYH7Dt8zjsEsidhfkG92yTmSyah1pNRp FwhT8kXMDeWYA2CgFZJdLjpyqVUT6B1l/bgiWLCNN42UNAElUXQ3i4EmoiPcWugbdlKZxvpvs +ATWSgN+EMiE/sDN6Eq7eKHZdmzWOTGmXHZ8E6VcNTxZYuZW49AYUjcHDhUjg7SrzwUgQdgO0 OGRplZzSQwI6msBAqBktUN7DsOzttdvcZ6p+PXi5NghaPaKdTIXpYOiQdsCew/1G+rLnoXC3E 0ipTUMv2xYqK0wIhsVUAey22UPWE0BVP8/s2XXgS6w== X-Archives-Salt: 596190c9-e837-4278-b915-aaf4982a4722 X-Archives-Hash: 8fca4614f0d098429bc873102cf2e896 Avoids the need for setting JAVA_LAUNCHER_FILENAME="${PN}" if SLOT is 0. Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 929ce68c6c07..a57fae02ffd7 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -161,7 +161,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. +if [[ ${SLOT} = 0 ]]; then +: "${JAVA_LAUNCHER_FILENAME:=${PN}}" +else : "${JAVA_LAUNCHER_FILENAME:=${PN}-${SLOT}}" +fi # @ECLASS_VARIABLE: JAVA_TESTING_FRAMEWORKS # @DEFAULT_UNSET -- 2.39.3