1 |
commit: f22fd46a6f73c8fcdb77b3b93f0f044222783c09 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 31 01:10:31 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 31 02:02:54 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f22fd46a |
7 |
|
8 |
java-pkg-2.eclass: mark JAVA_PKG_IUSE as @PRE_INHERIT |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
eclass/java-pkg-2.eclass | 8 ++------ |
13 |
1 file changed, 2 insertions(+), 6 deletions(-) |
14 |
|
15 |
diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass |
16 |
index bd5e92da6a2..4b690be1375 100644 |
17 |
--- a/eclass/java-pkg-2.eclass |
18 |
+++ b/eclass/java-pkg-2.eclass |
19 |
@@ -1,4 +1,4 @@ |
20 |
-# Copyright 2004-2015 Gentoo Foundation |
21 |
+# Copyright 2004-2021 Gentoo Authors |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
# @ECLASS: java-pkg-2.eclass |
25 |
@@ -14,6 +14,7 @@ |
26 |
inherit java-utils-2 |
27 |
|
28 |
# @ECLASS-VARIABLE: JAVA_PKG_IUSE |
29 |
+# @PRE_INHERIT |
30 |
# @DEFAULT_UNSET |
31 |
# @DESCRIPTION: |
32 |
# Use JAVA_PKG_IUSE instead of IUSE for doc, source and examples so that |
33 |
@@ -42,7 +43,6 @@ esac |
34 |
# @FUNCTION: java-pkg-2_pkg_setup |
35 |
# @DESCRIPTION: |
36 |
# pkg_setup initializes the Java environment |
37 |
- |
38 |
java-pkg-2_pkg_setup() { |
39 |
java-pkg_init |
40 |
} |
41 |
@@ -51,7 +51,6 @@ java-pkg-2_pkg_setup() { |
42 |
# @FUNCTION: java-pkg-2_src_prepare |
43 |
# @DESCRIPTION: |
44 |
# wrapper for java-utils-2_src_prepare |
45 |
- |
46 |
java-pkg-2_src_prepare() { |
47 |
java-utils-2_src_prepare |
48 |
} |
49 |
@@ -72,7 +71,6 @@ java-pkg-2_src_prepare() { |
50 |
# EANT_EXTRA_ARGS - extra arguments to pass to eant |
51 |
# EANT_ANT_TASKS - modifies the ANT_TASKS variable in the eant environment |
52 |
# @CODE |
53 |
- |
54 |
java-pkg-2_src_compile() { |
55 |
if [[ -e "${EANT_BUILD_XML:=build.xml}" ]]; then |
56 |
# auto generate classpath |
57 |
@@ -96,7 +94,6 @@ java-pkg-2_src_compile() { |
58 |
# @FUNCTION: java-pkg-2_src_test |
59 |
# @DESCRIPTION: |
60 |
# src_test, not exported. |
61 |
- |
62 |
java-pkg-2_src_test() { |
63 |
[[ -e "${EANT_BUILD_XML:=build.xml}" ]] || return |
64 |
|
65 |
@@ -149,7 +146,6 @@ java-pkg-2_src_test() { |
66 |
# @FUNCTION: java-pkg-2_pkg_preinst |
67 |
# @DESCRIPTION: |
68 |
# wrapper for java-utils-2_pkg_preinst |
69 |
- |
70 |
java-pkg-2_pkg_preinst() { |
71 |
java-utils-2_pkg_preinst |
72 |
} |