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 58FE015803E for ; Sun, 31 Dec 2023 16:26:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB2CB2BC075; Sun, 31 Dec 2023 16:26:45 +0000 (UTC) Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.75]) (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 3E8602BC025 for ; Sun, 31 Dec 2023 16:26:45 +0000 (UTC) Received: from CYRTRY1.fritz.box ([109.250.31.104]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.146]) with ESMTPSA (Nemesis) id 1MN4ux-1rcSyE3HbZ-00J4X1 for ; Sun, 31 Dec 2023 17:26:43 +0100 From: "Volkmar W. Pogatzki" To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH 2/3] java-pkg-simple.eclass: respect JAVADOC_SRC_DIRS Date: Sun, 31 Dec 2023 17:26:01 +0100 Message-ID: <20231231162632.10228-2-gentoo@pogatzki.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231231162632.10228-1-gentoo@pogatzki.net> References: <20231231162632.10228-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:q5JykXw2jLr2kl6pT+pOauYbQHoPuy1ZtMh4n+8IdaVUU9KJbct b/XeTL8RixKlUDnGhsNquaI/E33HpmdTmW/BnubopBCFKBUxdKyTq92Eb5lN8Oe6RteLaPy KEod7+GTm5Z0ojDyzCU2ycg6G3gnboPGiU7nrrW4cOIgRooNmffSYKm37/VX9ioPv3RDDxM rV1bzV/xZy6qNIGspZpWQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:RVD9j7+x+ws=;ces28MF5h60iXFkl2oHtkhgul7z pnAYce+o9cSlQ3L7Xn/z3WkmzQ1oRQlTH8xSSbfneg20QRpEpd37gUWms99Z0PLk61IO/7G8G nJQ9a9c8vfhweOJpTkIQC6s+I5UPzGGAlIIu3ZdkWNteVcPtMjkGSAArnPgop9EHHX1Gv0P0O EFzDrgL5rET4t+VgcCBblw0nJ7tmoep4YiqLUO7cWfVgbnDye4hARo/4j6G/fKifKw13p2VNL aem1I+ErFS2DuMj/zQ8Qe6xjasFdeM8wIOSIPylU9DqX0ICjuke2tKny4moTL0Zy/26YOfl/q KPvs+z15gWdCRYess9Yswr8XQnd1CWN8hv6tZkL5KuinaL9at5bHcIUS37De0UiNKztinuoJa GNO+C6T/gvusfLHdlgXlJzbe1fMV40OVFND3ZvJYpGncDRsmGD9I3VJvHRx0IwMSePraoflZV 5Q/0XAhqgX48JPCehg7KyAjegyVEcHnLKzT1lJgbaH/Ps0RQVybAXozvwzCbBkSSGe+emGTRV l+dFvVsehUNxZSfShuxEFuwj2b/rU1aWZvMUo9cfvR+WWkO3icplyqICT/e6A0sKcYEdK09Jq KBrniq2zwA2ou+KEpc4aNlatl4qff1sgGkdYCSjPoDqiifqm1qNAHdp9Uq7ZQMBrCJGYfMnnI LYdoMrc+kaI14yfXM7M3SIbTKF1FssZyZvIzBbLAbVtGDd4XGONT0bJdwHIW5PEaEv4+3xTia XRsQNy5k620jfHeC57aztTkcXxw+ar+lFdFEKvddiO4z5ZjZ8hXJX9dutZlcJtaZMDWR3C4bf syBbG3aKQM9iyxQ/U03hzFyRn/EiOXTFQSiFEIsp5D6ix91Tera15BAmBxFoUGCnheN2Jecfz k49xvLGAzzRGT3A== X-Archives-Salt: 46ba051a-c508-4188-953b-12dd3d008c39 X-Archives-Hash: 3dcaf069cf38bc16eee0fbad7151a44b This patch helps to avoid useless runs of ejavadoc in multi-jar packages where java-pkg-simple_src_compile is called for each jar file. JAVADOC_SRC_DIRS can be set in the ebuild in global scope and "use doc && ejavadoc" be called at the end of src_compile. And it no longer needs to build a useless "ignoreme.jar". Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 143efa707751..97bad414afb7 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -412,11 +412,15 @@ java-pkg-simple_src_compile() { # javadoc if has doc ${JAVA_PKG_IUSE} && use doc; then - mkdir -p ${apidoc} - ejavadoc -d ${apidoc} \ - -encoding ${JAVA_ENCODING} -docencoding UTF-8 -charset UTF-8 \ - ${classpath:+-classpath ${classpath}} ${JAVADOC_ARGS:- -quiet} \ - @${sources} || die "javadoc failed" + if [[ ${JAVADOC_SRC_DIRS} ]]; then + einfo "JAVADOC_SRC_DIRS exists, you need to call ejavadoc separately" + else + mkdir -p ${apidoc} + ejavadoc -d ${apidoc} \ + -encoding ${JAVA_ENCODING} -docencoding UTF-8 -charset UTF-8 \ + ${classpath:+-classpath ${classpath}} ${JAVADOC_ARGS:- -quiet} \ + @${sources} || die "javadoc failed" + fi fi # package -- 2.41.0