Gentoo Archives: gentoo-dev

From: Florian Schmaus <flow@g.o>
To: gentoo-dev@l.g.o
Cc: Florian Schmaus <flow@g.o>
Subject: [gentoo-dev] [PATCH] java-pkg-simple.eclass: invoke einstalldocs
Date: Mon, 04 Jul 2022 13:14:55
Message-Id: 20220704131441.2096016-1-flow@gentoo.org
1 On EAPI 6, or newer, invoke einstalldocs in
2 java-pkg-simple_src_install.
3
4 Closes: https://bugs.gentoo.org/789582
5 Signed-off-by: Florian Schmaus <flow@g.o>
6 ---
7 eclass/java-pkg-simple.eclass | 8 +++++++-
8 1 file changed, 7 insertions(+), 1 deletion(-)
9
10 diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
11 index 47499c7870a9..1e101a828c40 100644
12 --- a/eclass/java-pkg-simple.eclass
13 +++ b/eclass/java-pkg-simple.eclass
14 @@ -424,7 +424,7 @@ java-pkg-simple_src_compile() {
15 # @DESCRIPTION:
16 # src_install for simple single jar java packages. Simply installs
17 # ${JAVA_JAR_FILENAME}. It will also install a launcher if
18 -# ${JAVA_MAIN_CLASS} is set.
19 +# ${JAVA_MAIN_CLASS} is set. Also invokes einstalldocs.
20 java-pkg-simple_src_install() {
21 local sources=sources.lst classes=target/classes apidoc=target/api
22
23 @@ -455,6 +455,12 @@ java-pkg-simple_src_install() {
24 fi
25 java-pkg_dosrc ${srcdirs}
26 fi
27 +
28 + if [[ ${EAPI} == 5 ]]; then
29 + # einstalldocs is only available on EAPI >= 6.
30 + return
31 + fi
32 + einstalldocs
33 }
34
35 # @FUNCTION: java-pkg-simple_src_test
36 --
37 2.35.1