commit:     a890940dce62dea54a867901f85e37985bc76943
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 20:19:05 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu May  5 09:30:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a890940d

java-pkg-simple.eclass: eqawarn if module-info.java is not compiled

In preperation of this ewarn part becoming 'die' (bug #842447), switch
it to eqawarn to improve catching the affected packages.

Bug: https://bugs.gentoo.org/796875
Bug: https://bugs.gentoo.org/842447
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/25306

 eclass/java-pkg-simple.eclass | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
index eab56460eef6..47499c7870a9 100644
--- a/eclass/java-pkg-simple.eclass
+++ b/eclass/java-pkg-simple.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2021 Gentoo Authors
+# Copyright 2004-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: java-pkg-simple.eclass
@@ -17,7 +17,8 @@
 # directory before calling the src_compile function of this eclass.
 
 case ${EAPI:-0} in
-       [5678]) ;;
+       5|6) inherit eutils ;; # eutils for eqawarn
+       7|8) ;;
        *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -393,8 +394,8 @@ java-pkg-simple_src_compile() {
                        JAVA_PKG_WANT_SOURCE=${tmp_source}
                        JAVA_PKG_WANT_TARGET=${tmp_target}
                else
-                       ewarn "Need at least JDK 9 to compile module-info.java 
in src_compile,"
-                       ewarn "see https://bugs.gentoo.org/796875";
+                       eqawarn "Need at least JDK 9 to compile 
module-info.java in src_compile."
+                       eqawarn "Please adjust DEPEND accordingly. See 
https://bugs.gentoo.org/796875#c3";
                fi
        fi
 

Reply via email to