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: eqawarn if module-info.java is not compiled
Date: Wed, 04 May 2022 05:39:42
Message-Id: 20220504053926.38099-1-flow@gentoo.org
1 In preperation of this ewarn part becoming 'die' (bug #842447), switch
2 it to eqawarn to improve catching the affected packages.
3
4 Bug: https://bugs.gentoo.org/796875
5 Bug: https://bugs.gentoo.org/842447
6 Signed-off-by: Florian Schmaus <flow@g.o>
7 ---
8 eclass/java-pkg-simple.eclass | 9 +++++----
9 1 file changed, 5 insertions(+), 4 deletions(-)
10
11 diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
12 index eab56460eef6..47499c7870a9 100644
13 --- a/eclass/java-pkg-simple.eclass
14 +++ b/eclass/java-pkg-simple.eclass
15 @@ -1,4 +1,4 @@
16 -# Copyright 2004-2021 Gentoo Authors
17 +# Copyright 2004-2022 Gentoo Authors
18 # Distributed under the terms of the GNU General Public License v2
19
20 # @ECLASS: java-pkg-simple.eclass
21 @@ -17,7 +17,8 @@
22 # directory before calling the src_compile function of this eclass.
23
24 case ${EAPI:-0} in
25 - [5678]) ;;
26 + 5|6) inherit eutils ;; # eutils for eqawarn
27 + 7|8) ;;
28 *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
29 esac
30
31 @@ -393,8 +394,8 @@ java-pkg-simple_src_compile() {
32 JAVA_PKG_WANT_SOURCE=${tmp_source}
33 JAVA_PKG_WANT_TARGET=${tmp_target}
34 else
35 - ewarn "Need at least JDK 9 to compile module-info.java in src_compile,"
36 - ewarn "see https://bugs.gentoo.org/796875"
37 + eqawarn "Need at least JDK 9 to compile module-info.java in src_compile."
38 + eqawarn "Please adjust DEPEND accordingly. See https://bugs.gentoo.org/796875#c3"
39 fi
40 fi
41
42 --
43 2.35.1

Replies