| 1 |
commit: 4457e74e96d2e956b1b76856b2b238cd356c8312 |
| 2 |
Author: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 4 10:07:49 2022 +0000 |
| 4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 6 07:03:18 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4457e74e |
| 7 |
|
| 8 |
java-pkg-simple.eclass: invoke einstalldocs |
| 9 |
|
| 10 |
On EAPI 6, or newer, invoke einstalldocs in |
| 11 |
java-pkg-simple_src_install. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/789582 |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/26216 |
| 15 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
| 16 |
|
| 17 |
eclass/java-pkg-simple.eclass | 8 +++++++- |
| 18 |
1 file changed, 7 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass |
| 21 |
index 47499c7870a9..1e101a828c40 100644 |
| 22 |
--- a/eclass/java-pkg-simple.eclass |
| 23 |
+++ b/eclass/java-pkg-simple.eclass |
| 24 |
@@ -424,7 +424,7 @@ java-pkg-simple_src_compile() { |
| 25 |
# @DESCRIPTION: |
| 26 |
# src_install for simple single jar java packages. Simply installs |
| 27 |
# ${JAVA_JAR_FILENAME}. It will also install a launcher if |
| 28 |
-# ${JAVA_MAIN_CLASS} is set. |
| 29 |
+# ${JAVA_MAIN_CLASS} is set. Also invokes einstalldocs. |
| 30 |
java-pkg-simple_src_install() { |
| 31 |
local sources=sources.lst classes=target/classes apidoc=target/api |
| 32 |
|
| 33 |
@@ -455,6 +455,12 @@ java-pkg-simple_src_install() { |
| 34 |
fi |
| 35 |
java-pkg_dosrc ${srcdirs} |
| 36 |
fi |
| 37 |
+ |
| 38 |
+ if [[ ${EAPI} == 5 ]]; then |
| 39 |
+ # einstalldocs is only available on EAPI >= 6. |
| 40 |
+ return |
| 41 |
+ fi |
| 42 |
+ einstalldocs |
| 43 |
} |
| 44 |
|
| 45 |
# @FUNCTION: java-pkg-simple_src_test |
Archives