• [gentoo-dev] [PATCH] java-pkg-simple.eclass: invoke einstalldocs

    From Florian Schmaus@21:1/5 to All on Mon Jul 4 15:20:01 2022
    On EAPI 6, or newer, invoke einstalldocs in
    java-pkg-simple_src_install.

    Closes: https://bugs.gentoo.org/789582
    Signed-off-by: Florian Schmaus <flow@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
    --
    2.35.1

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (2