1 |
Signed-off-by: David Seifert <soap@g.o> |
2 |
--- |
3 |
eclass/ant-tasks.eclass | 17 +++++------------ |
4 |
1 file changed, 5 insertions(+), 12 deletions(-) |
5 |
|
6 |
diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass |
7 |
index a11716bf2b6..98a35dd40c4 100644 |
8 |
--- a/eclass/ant-tasks.eclass |
9 |
+++ b/eclass/ant-tasks.eclass |
10 |
@@ -1,4 +1,4 @@ |
11 |
-# Copyright 2007-2021 Gentoo Authors |
12 |
+# Copyright 2007-2022 Gentoo Authors |
13 |
# Distributed under the terms of the GNU General Public License v2 |
14 |
|
15 |
# @ECLASS: ant-tasks.eclass |
16 |
@@ -6,22 +6,16 @@ |
17 |
# java@g.o |
18 |
# @AUTHOR: |
19 |
# Vlastimil Babka <caster@g.o> |
20 |
-# @SUPPORTED_EAPIS: 6 7 |
21 |
+# @SUPPORTED_EAPIS: 7 |
22 |
# @PROVIDES: java-utils-2 |
23 |
# @BLURB: Eclass for building dev-java/ant-* packages |
24 |
# @DESCRIPTION: |
25 |
# This eclass provides functionality and default ebuild variables for building |
26 |
# dev-java/ant-* packages easily. |
27 |
|
28 |
-case "${EAPI:-0}" in |
29 |
- 0|1|2|3|4|5) |
30 |
- die "ant-tasks.eclass: EAPI ${EAPI} is too old." |
31 |
- ;; |
32 |
- 6|7) |
33 |
- ;; |
34 |
- *) |
35 |
- die "ant-tasks.eclass: EAPI ${EAPI} is not supported yet." |
36 |
- ;; |
37 |
+case ${EAPI} in |
38 |
+ 7) ;; |
39 |
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
40 |
esac |
41 |
|
42 |
# we set ant-core dep ourselves, restricted |
43 |
@@ -29,7 +23,6 @@ JAVA_ANT_DISABLE_ANT_CORE_DEP=true |
44 |
# rewriting build.xml for are the testcases has no reason atm |
45 |
JAVA_PKG_BSFIX_ALL=no |
46 |
inherit java-pkg-2 java-ant-2 |
47 |
-[[ ${EAPI:-0} -eq 6 ]] && inherit eapi7-ver |
48 |
|
49 |
EXPORT_FUNCTIONS src_unpack src_compile src_install |
50 |
|
51 |
-- |
52 |
2.39.0 |