diff options
| author |   Manuel Mommertz <manuel.mommertz@desy.de> | 2024-02-13 08:59:13 +0100 |
|---|---|---|
| committer |   Miroslav Šulc <fordfrog@gentoo.org> | 2024-04-10 10:11:04 +0200 |
| commit | 672028056a6bb54d5550aaff1a09d752e772bc8d (patch) | |
| tree | adf35f7ba82e75784d2e3155b0de249c8bbd852a | |
| parent | dev-python/spyder: drop 5.5.3 (diff) | |
| download | gentoo-672028056a6bb54d5550aaff1a09d752e772bc8d.tar.gz gentoo-672028056a6bb54d5550aaff1a09d752e772bc8d.tar.bz2 gentoo-672028056a6bb54d5550aaff1a09d752e772bc8d.zip | |
java-pkg-simple.eclass: use --module-path for ejavadoc when applicable
Bug: https://bugs.gentoo.org/925691
Signed-off-by: Manuel Mommertz <manuel.mommertz@desy.de>
Closes: https://github.com/gentoo/gentoo/pull/35302
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
| -rw-r--r-- | eclass/java-pkg-simple.eclass | 15 |
1 files 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 |