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 05D7B15806E for ; Fri, 26 May 2023 08:17:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51077E07EA; Fri, 26 May 2023 08:16:58 +0000 (UTC) Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.74]) (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 7EF93E07D3 for ; Fri, 26 May 2023 08:16:57 +0000 (UTC) Received: from CYRTRY1.fritz.box ([109.250.80.97]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.146]) with ESMTPSA (Nemesis) id 1MPXlM-1pgxSs0MGQ-00McuK for ; Fri, 26 May 2023 10:16:56 +0200 From: "Volkmar W. Pogatzki" To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH] java-pkg-simple.eclass: respect SLOT="0" in JAVA_LAUNCHER_FILENAME Date: Fri, 26 May 2023 10:16:46 +0200 Message-Id: <20230526081646.7272-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:vVW3cIcAuapNrlQYryVAIsi2YonIa10jeljdOFAPgyW3vakei5r H3CU194ED2EDH/YVdRrWidz20YLLBZK+XzM6leWCHXN+3Cr2VsSdd7viCmxyyKXMqiNY6o/ rNQXmTAawHqi786VkCWoOw1R3/kbRq2f309SBQ0ELERxckoed670EnoFz8Mejz0A8VC02IE ws3mK+bmUULHh0Aqs7UPA== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:dGNQwv0mfco=;M0ygGMnKOkpKopcAnQv7G+fHmck POoiCFyU+NQpptFotuD0UwvKnl0RoBMFRXeK4bO5tkezIURiBck3EUBJkqj8thWAzRK8WcEBb 4XxAIH0xGm3P/7qb2oNEmy05dW5fzE6s7jYx7E+o+rHMIZpe3D4LU4H3mM85kAtvR4bNf+G8p NGl4eqP4sIp3i9H7OWnuMQakvkouVO9gPjehDRYHcGpjJIVHBu2zKADUk0jbux2GkuUXOIWu6 VjLUmcFqvcZqYlneYu5d38gQaptEvWJqLLWZ1pHwkMY8qaqIPShQx8s1N5m0xEHvGZmZYnrew 5Udpku1jDzX/TQmGNlIhCV/QzQUVGXcrfbDgR88HqdDX+x7CQ4eJ5LG2TK6eLNCWzf5Ru76Mk 83HxCxIJq4RteIipeGVlgXalk7b3PjCbMOst1bilVJiXW8FvQM+yUqTvu9x/GnhqUW6S4OT2i 5gsnJE0A/EhZY+878jRJ3z/5kPpQFnmWY/GrBQNb9JFn0Q4Mpahb5HhOyNBBiedyGUZGKWtGH JDgNJBO3sSNOTUczXwPreGFN7nKQeoLOkX+tzYwOKqakRYSV2Z/o7S5jzgCcACoxp2z0lln5I 5MwK13gtfpp9sIPYUDzok3l6GT8TRx5NSB/99BWmNlFREto9P/AZuGASwIjUTGk5gL7005kp5 YtXCu+v8Y1u1ZIsyfh6VEqVMgXhe48yGbRQvIFWhuw== X-Archives-Salt: 8f5892da-ae80-4899-8ddf-4ad6e94642d4 X-Archives-Hash: 2a29a06361159aaa7f52884133a82ba4 Avoids the need for setting JAVA_LAUNCHER_FILENAME="${PN}" if SLOT is 0. Signed-off-by: Volkmar W. Pogatzki --- 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 929ce68c6c07..f919945280b1 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. -: "${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 -- 2.39.3