diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-04-10 12:32:09 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-04-10 12:32:09 +0100 |
| commit | bcb1bf8297438e33e98fec6991ba68dec0f4dd7c (patch) | |
| tree | 641656fce8ff13ec9fae86d68bd03073d9afc4a0 /eclass | |
| parent | fb0d4b003026d01b3d52956c7a0069b9363efff8 (diff) | |
gentoo auto-resync : 10:04:2024 - 12:32:09
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 39630 -> 39625 bytes | |||
| -rw-r--r-- | eclass/java-pkg-simple.eclass | 15 |
2 files changed, 11 insertions, 4 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 47fcaf10a6ce..8f6d0e084b43 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz 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 |