[gentoo-commits] repo/gentoo:master commit in: eclass/

[Sam James]

commit:     f22fd46a6f73c8fcdb77b3b93f0f044222783c09
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 31 01:10:31 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 31 02:02:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f22fd46a

java-pkg-2.eclass: mark JAVA_PKG_IUSE as @PRE_INHERIT

Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/java-pkg-2.eclass | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass
index bd5e92da6a2..4b690be1375 100644
--- a/eclass/java-pkg-2.eclass
+++ b/eclass/java-pkg-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2015 Gentoo Foundation
+# Copyright 2004-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: java-pkg-2.eclass
@@ -14,6 +14,7 @@
 inherit java-utils-2
 
 # @ECLASS-VARIABLE: JAVA_PKG_IUSE
+# @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Use JAVA_PKG_IUSE instead of IUSE for doc, source and examples so that
@@ -42,7 +43,6 @@ esac
 # @FUNCTION: java-pkg-2_pkg_setup
 # @DESCRIPTION:
 # pkg_setup initializes the Java environment
-
 java-pkg-2_pkg_setup() {
        java-pkg_init
 }
@@ -51,7 +51,6 @@ java-pkg-2_pkg_setup() {
 # @FUNCTION: java-pkg-2_src_prepare
 # @DESCRIPTION:
 # wrapper for java-utils-2_src_prepare
-
 java-pkg-2_src_prepare() {
        java-utils-2_src_prepare
 }
@@ -72,7 +71,6 @@ java-pkg-2_src_prepare() {
 #   EANT_EXTRA_ARGS - extra arguments to pass to eant
 #   EANT_ANT_TASKS - modifies the ANT_TASKS variable in the eant environment
 # @CODE
-
 java-pkg-2_src_compile() {
        if [[ -e "${EANT_BUILD_XML:=build.xml}" ]]; then
                # auto generate classpath
@@ -96,7 +94,6 @@ java-pkg-2_src_compile() {
 # @FUNCTION: java-pkg-2_src_test
 # @DESCRIPTION:
 # src_test, not exported.
-
 java-pkg-2_src_test() {
        [[ -e "${EANT_BUILD_XML:=build.xml}" ]] || return
 
@@ -149,7 +146,6 @@ java-pkg-2_src_test() {
 # @FUNCTION: java-pkg-2_pkg_preinst
 # @DESCRIPTION:
 # wrapper for java-utils-2_pkg_preinst
-
 java-pkg-2_pkg_preinst() {
        java-utils-2_pkg_preinst
 }