commit: 672028056a6bb54d5550aaff1a09d752e772bc8d Author: Manuel Mommertz <manuel.mommertz <AT> desy <DOT> de> AuthorDate: Tue Feb 13 07:59:13 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Wed Apr 10 08:11:04 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67202805
java-pkg-simple.eclass: use --module-path for ejavadoc when applicable Bug: https://bugs.gentoo.org/925691 Signed-off-by: Manuel Mommertz <manuel.mommertz <AT> desy.de> Closes: https://github.com/gentoo/gentoo/pull/35302 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> eclass/java-pkg-simple.eclass | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 1a4bcb1b0a63..6b473ed768ed 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -417,11 +417,18 @@ java-pkg-simple_src_compile() { 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" + if [[ -z ${moduleinfo} ]] || [[ ${target#1.} -lt 9 ]]; then + ejavadoc -d ${apidoc} \ + -encoding ${JAVA_ENCODING} -docencoding UTF-8 -charset UTF-8 \ + ${classpath:+-classpath ${classpath}} ${JAVADOC_ARGS:- -quiet} \ + @${sources} || die "javadoc failed" + else + ejavadoc -d ${apidoc} \ + -encoding ${JAVA_ENCODING} -docencoding UTF-8 -charset UTF-8 \ + ${classpath:+--module-path ${classpath}} ${JAVADOC_ARGS:- -quiet} \ + @${sources} || die "javadoc failed" fi + fi fi # package
