[gentoo-commits] repo/gentoo:master commit in: eclass/

[Miroslav Šulc]

commit:     dd5e874e34b895fe48d1ca863882e9f25f65719a
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Dec  4 14:47:20 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 09:48:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd5e874e

java-pkg-simple.eclass: respect JAVADOC_SRC_DIRS

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 <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 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