commit: 4457e74e96d2e956b1b76856b2b238cd356c8312 Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Mon Jul 4 10:07:49 2022 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Wed Jul 6 07:03:18 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4457e74e
java-pkg-simple.eclass: invoke einstalldocs On EAPI 6, or newer, invoke einstalldocs in java-pkg-simple_src_install. Closes: https://bugs.gentoo.org/789582 Closes: https://github.com/gentoo/gentoo/pull/26216 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> eclass/java-pkg-simple.eclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 47499c7870a9..1e101a828c40 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -424,7 +424,7 @@ java-pkg-simple_src_compile() { # @DESCRIPTION: # src_install for simple single jar java packages. Simply installs # ${JAVA_JAR_FILENAME}. It will also install a launcher if -# ${JAVA_MAIN_CLASS} is set. +# ${JAVA_MAIN_CLASS} is set. Also invokes einstalldocs. java-pkg-simple_src_install() { local sources=sources.lst classes=target/classes apidoc=target/api @@ -455,6 +455,12 @@ java-pkg-simple_src_install() { fi java-pkg_dosrc ${srcdirs} fi + + if [[ ${EAPI} == 5 ]]; then + # einstalldocs is only available on EAPI >= 6. + return + fi + einstalldocs } # @FUNCTION: java-pkg-simple_src_test
