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 B272C158089 for ; Thu, 28 Sep 2023 05:12:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 460BB2BC03C; Thu, 28 Sep 2023 05:12:20 +0000 (UTC) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.133]) (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 987B42BC013 for ; Thu, 28 Sep 2023 05:12:19 +0000 (UTC) Received: from CYRTRY1.fritz.box ([109.250.30.18]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.130]) with ESMTPSA (Nemesis) id 1Mnq8Y-1rSFvk0Wwk-00pPp2 for ; Thu, 28 Sep 2023 07:12:18 +0200 From: "Volkmar W. Pogatzki" To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH 4/4] java-utils-2.eclass: avoid reverse dependency for dev-java/testng Date: Thu, 28 Sep 2023 07:10:18 +0200 Message-ID: <20230928051202.4548-4-gentoo@pogatzki.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230928051202.4548-1-gentoo@pogatzki.net> References: <20230928051202.4548-1-gentoo@pogatzki.net> 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:erwq/Kb9fS5sbqw29ZGlTNALeWCDTb+brI0ZrAKikNHUUJp8cr3 7U5IegbpK14QFqDLrKsvPB5sesaBzvPA/3AXSY2syRW3K2iBj21Ku/yK/mWwSzy/CQgpI6n cb6ysNz8PnfQJTQDns1fiYLOC6nkLsRkWdrCkntlip1LvMW++xWmp+H3QM5xVjtY/U+cMK7 LqZh36Ns/onEpN5Fw2RDg== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:0EiLYJ47EwE=;AT+n3qWrKtRooOMQAStBjsghRDe ZNBk0RU2YwHhU9Z+axL6Cgv9wloB5WJOac95mXg+htCONVHCsnSXQmLpqjb1c2jwEq23NWevp it7NYcRK94FIYMriKIsR5GV5uX/3+YgJQbCnW4dZwKeNWxXIzhU+22C7eR1jwK1evpHANsAP2 l5XH9z0L38f7T28cPcFXafYbc2n5rnT9WkmR0VW8oW651HsskDJ9i5A0MWsoPGjwt6UVTzFt7 bZBIEjBKvHlWu14jIG8HNMvc/6mCFDDYMz5QkuTtQCI+Bggcxh5m6wD10i5lHPvI6o5EJqyTw DN9JyCYwgZTGaGhAPeCzs4mRK1I5BPdl3jvZzeob9jQze9yxavzKmatAT1iguFJgY8SHZTCi/ i0pZTpzcEYfrzDt/rRE7ZWr4Dbu/JbObso4g5s9GhZXGrgYmxiOzVQ+zBS6TVkLiF7VIqhNgD kXhgmcWKBrlHHw9JF1jT9nV7sNwZeDLfsQOCKkcMAERWFAdiYGYJz+7MC4LZCFZjHEndUx7KY kr54dc7/6h+CQM2ARpjm6MkbBB2ljmbB5F+Ew6eIduO3O+kHQiNvg4YbFFyTj+tjGvSWB/ZvH M8IBwYkGIkKWn5Y1AS/q6Fx9AM43BfAJ7Wwh0eMbYaLbfIvSbJD7bKANytslCWoBrt8q7la6K 1WpYav9+QUWkxx0mGX3R6wxPZqPiiT+7ajKeO/pT4aj7QNUZUVJ9OppMjDTPJQuyI/0OsUu9D NWmkjz451/sUslfF49ZkSf5aq1e1i8/jXh6dd16GFT3W/2ek+VNZ3BqdKIkxyPSAMiuCKIrDV PFSnWdXQuIViKGh7wZKfKWH9HPpiqEmJwXzb7az4IjB+lPFdRMzqj1Fu6ONYMLMWiCsGzK8gU etHDG+oMWIgryGQ== X-Archives-Salt: 87941fea-08b7-43ad-8977-9d924a284d93 X-Archives-Hash: bcdf75096dc566948cf793b8bd3aa4c7 This change depends on the correlating change on the java-pkg-simple.eclass. For testing dev-java/testng before having it installed it is not possible to use java-pkg_getjars. This change adds a condition so that this case uses the freshly compiled testng.jar. Signed-off-by: Volkmar W. Pogatzki --- eclass/java-utils-2.eclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 3fe64e1c317d..133dde59cebd 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1892,7 +1892,11 @@ etestng() { debug-print-function ${FUNCNAME} $* local runner=org.testng.TestNG - local cp=$(java-pkg_getjars --with-dependencies testng) + if [[ ${PN} != testng ]]; then + local cp=$(java-pkg_getjars --with-dependencies testng) + else + local cp=testng.jar + fi local tests if [[ ${1} = -cp || ${1} = -classpath ]]; then -- 2.41.0