Gentoo Archives: gentoo-dev

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-dev@l.g.o
Cc: "Miroslav Šulc" <fordfrog@g.o>
Subject: [gentoo-dev] [PATCH] eclass/java-ant-2.eclass: added eapi8 support
Date: Sat, 25 Dec 2021 19:01:56
Message-Id: 20211225190131.15055-1-fordfrog@gentoo.org
1 Signed-off-by: Miroslav Šulc <fordfrog@g.o>
2 ---
3 eclass/java-ant-2.eclass | 6 +++---
4 1 file changed, 3 insertions(+), 3 deletions(-)
5
6 diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass
7 index 501d17ef229e..438b0dbb5001 100644
8 --- a/eclass/java-ant-2.eclass
9 +++ b/eclass/java-ant-2.eclass
10 @@ -7,7 +7,7 @@
11 # @AUTHOR:
12 # kiorky <kiorky@××××××××××.net>
13 # Petteri Räty <betelgeuse@g.o>
14 -# @SUPPORTED_EAPIS: 5 6 7
15 +# @SUPPORTED_EAPIS: 5 6 7 8
16 # @PROVIDES: java-utils-2
17 # @BLURB: eclass for ant based Java packages
18 # @DESCRIPTION:
19 @@ -18,7 +18,7 @@
20 inherit java-utils-2 multilib
21
22 case ${EAPI:-0} in
23 - [567]) ;;
24 + [5678]) ;;
25 *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
26 esac
27
28 @@ -73,7 +73,7 @@ fi
29 # constructed above.
30 JAVA_ANT_E_DEPEND="${JAVA_ANT_E_DEPEND}
31 ${ANT_TASKS_DEPEND}
32 - >=dev-java/javatoolkit-0.3.0-r2"
33 + dev-java/javatoolkit"
34
35 # this eclass must be inherited after java-pkg-2 or java-pkg-opt-2
36 # if it's java-pkg-opt-2, ant dependencies are pulled based on USE flag
37 --
38 2.34.1