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 3EE4215817D for ; Wed, 19 Jun 2024 11:39:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 602A1E2A58; Wed, 19 Jun 2024 11:39:02 +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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AF9B8E2A53 for ; Wed, 19 Jun 2024 11:39:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pogatzki.net; s=s1-ionos; t=1718797140; x=1719401940; i=gentoo@pogatzki.net; bh=4tn2UbSa05OUdriEaVv39xCHwgnG8NJt8JdLkfXrces=; h=X-UI-Sender-Class:From:To:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:cc:content-transfer-encoding: content-type:date:from:message-id:mime-version:reply-to:subject: to; b=wDIuXxSC/qrFZVSEEArWWE91FkKeOKPwuVPEeDng6tzxj9f+NGZhudg3IiE5UqN9 B5ShV+7gMSw0bsIShHuFegola/EA6zO2a1iGjZmUzzs4M95o77gWxzjauZAC/78EY zUGyX341d/PhduIUfXGTHT+PA6IpN88HbEqoIPnk5xRVJXf0+Weyw9DjDUMguq4GD KUATtaHckYR5cJjtgpMuU2AGPFvP4C9yP++JwWgUd9+ZGMG8KQnsG0cOdWoYj2NnG +Fd1vt/zozFBdAnm4uaZn2nqBZbLMPED64vULAwCVNmgSuiN6bnPU295zdXg0K1si Y5W5rlGeYgdfhw076g== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from CYRTRY1.fritz.box ([92.117.119.128]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.130]) with ESMTPSA (Nemesis) id 1MirX2-1spgA40tFM-00pahT for ; Wed, 19 Jun 2024 13:39:00 +0200 From: "Volkmar W. Pogatzki" To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH] java-utils-2.eclass: allow eant without java-ant-2_src_configure Date: Wed, 19 Jun 2024 13:38:15 +0200 Message-ID: <20240619113848.3216-1-gentoo@pogatzki.net> X-Mailer: git-send-email 2.41.0 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: quoted-printable X-Provags-ID: V03:K1:wkwnv6Z/jERFxiOEPO0ydiZpRRbnv3mI+f9C5LsBcGcHkSIriRv qC9riOUNeQA0auuohWCIEdyT9s69oycOROoEYfjMCw2KSItUeikcOA+5ehLp1mncvMYeYAu fZ48ydYbhR5lju6JQ4S7TNriRmKuUexrTb5nIyPZXKdMxmSQXjbcAPhw0hUghvEh2LNznHe n29NekFphzOKsWg1ton1A== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:3LQg/za0AbM=;Zf5mdS/K9eJikMwx0/GPzZ8DfKX eEKe7PX/zLZTVkqnw28kHMr3AWkiI8GcM7RryP1JGbdx1+mYJD0eIi04PtRmiQJOwY0FsFGCP 0D+5ZW+pcAWWtOmhiKoNH3nLcHSGRtj22+TsaAKMKl+R/kbB0MAesRNbjO0o8IcbFfCs4FB8t CLPUOrqecFELAzfV/yregx+sF0Vai3TU3bCpfs3O3LBPQ2rxmDCuatzTw6g+J1h5Ld5rFj4V1 8cbDc0V3D93xYTaWuhJ/knOaz0ZWEEX29U+d7FNHSj/VgLJ6UafD16Wy2fumBDcLomMt8QXXu oD48XjdIsdURDZBjUirizo3JRcHUl8WkFW0mpnGQ2FrUgGBGrX8b00E2jWsxJowVEBe4rzRE2 3UGgTkav7OCD/S4RESFrhjAceWZc79BfyR3CqJgKs2lXcIYRI90CSJf14fGpV5tzDkktxIVYC R88BrRXt3Bx4mu9oNYTOeYC/ODm5B3i8X4dS/McdfHk1t5iICQo6XTd7IILM2KDOOUioYQq0T O5LIyxJ33qWaY3PfP0XDW6/JH+O/aTaw0vUsvbKOwU5d+ezp1NfaTOnmVcUS4L97f7fqYe36U 4c3xGct99UvyDapwXZTPlFpB6xJLvpZm6PfIKppSq9i2wmpg7Sv/ml4nkIlROEEtXiLwUxuw5 yqODzz9Ghq2uzd9lQwYmxyJGe3rR8t7TDPSL6HVEWBP0+3SQgXbmCzvFel0RzrsnIGNmtx+ns yDIwfjUhNhflozRElMUwgjvAFgeIPt4Ch9QhhCYEu3Z9eto6bR8+lw= X-Archives-Salt: 1319be5b-c029-4b0c-b58e-0e68a790e1e8 X-Archives-Hash: 726686f572bac3a136f63afbc2311de5 Packages which can build without BSFIX need not inherit java-ant-2. To allow using eant without inheriting java-ant-2 we enhance the eant functio= n with a condition which controls calling java-ant-2_src_configure. Signed-off-by: Volkmar W. Pogatzki =2D-- eclass/java-utils-2.eclass | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index adbc5242053a..2527819d7315 100644 =2D-- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -2029,13 +2029,23 @@ java-utils-2_pkg_preinst() { eant() { debug-print-function ${FUNCNAME} $* - if [[ ${EBUILD_PHASE} =3D compile ]]; then - java-ant-2_src_configure - fi + if [[ ${!JAVA_PKG_BSFIX*} ]] \ + || [[ ${JAVA_ANT_BSFIX_EXTRA_ARGS} ]] \ + || [[ ${JAVA_ANT_CLASSPATH_TAGS} ]] \ + || [[ ${JAVA_ANT_JAVADOC_INPUT_DIRS} ]] \ + || [[ ${JAVA_ANT_REWRITE_CLASSPATH} ]] \ + || [[ ${EANT_BUILD_XML} ]] \ + || [[ ${!EANT_GENTOO_CLASSPATH*} ]] \ + || [[ ${EANT_TEST_GENTOO_CLASSPATH} ]] + then + if [[ ${EBUILD_PHASE} =3D compile ]]; then + java-ant-2_src_configure + fi - if ! has java-ant-2 ${INHERITED}; then - local msg=3D"You should inherit java-ant-2 when using eant" - java-pkg_announce-qa-violation "${msg}" + if ! has java-ant-2 ${INHERITED}; then + local msg=3D"You should inherit java-ant-2 when using eant" + java-pkg_announce-qa-violation "${msg}" + fi fi local antflags=3D"-Dnoget=3Dtrue -Dmaven.mode.offline=3Dtrue -Dbuild.sys= classpath=3Dignore" =2D- 2.41.0