1 |
commit: f295bf09c02ae28d64e812914d53c41e1a94be96 |
2 |
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> |
3 |
AuthorDate: Wed May 30 08:10:27 2018 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 30 08:11:09 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f295bf09 |
7 |
|
8 |
ant-tasks.eclass: use eapi7-ver. |
9 |
|
10 |
eclass/ant-tasks.eclass | 11 ++++++----- |
11 |
1 file changed, 6 insertions(+), 5 deletions(-) |
12 |
|
13 |
diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass |
14 |
index e008e6eaea8..31683e68243 100644 |
15 |
--- a/eclass/ant-tasks.eclass |
16 |
+++ b/eclass/ant-tasks.eclass |
17 |
@@ -16,7 +16,8 @@ |
18 |
JAVA_ANT_DISABLE_ANT_CORE_DEP=true |
19 |
# rewriting build.xml for are the testcases has no reason atm |
20 |
JAVA_PKG_BSFIX_ALL=no |
21 |
-inherit versionator java-pkg-2 java-ant-2 |
22 |
+inherit java-pkg-2 java-ant-2 |
23 |
+[[ ${EAPI:-0} == [0123456] ]] && inherit eapi7-ver |
24 |
|
25 |
EXPORT_FUNCTIONS src_unpack src_compile src_install |
26 |
|
27 |
@@ -60,12 +61,12 @@ if [[ ${PV} == *beta2* ]]; then |
28 |
MY_PV=${PV/_beta2/beta} |
29 |
UPSTREAM_PREFIX="http://people.apache.org/dist/ant/v1.7.1beta2/src" |
30 |
GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles" |
31 |
- ANT_TASK_PV=$(get_version_component_range 1-3) |
32 |
+ ANT_TASK_PV=$(ver_cut 1-3) |
33 |
elif [[ ${PV} == *_rc* ]]; then |
34 |
MY_PV=${PV/_rc/RC} |
35 |
UPSTREAM_PREFIX="https://dev.gentoo.org/~caster/distfiles" |
36 |
GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles" |
37 |
- ANT_TASK_PV=$(get_version_component_range 1-3) |
38 |
+ ANT_TASK_PV=$(ver_cut 1-3) |
39 |
else |
40 |
# default for final releases |
41 |
MY_PV=${PV} |
42 |
@@ -101,7 +102,7 @@ if [[ -z "${ANT_TASK_DISABLE_VM_DEPS}" ]]; then |
43 |
fi |
44 |
|
45 |
# we need direct blockers with old ant-tasks for file collisions - bug #252324 |
46 |
-if version_is_at_least 1.7.1 ; then |
47 |
+if ver_test -ge 1.7.1; then |
48 |
DEPEND+=" !dev-java/ant-tasks" |
49 |
fi |
50 |
|
51 |
@@ -167,7 +168,7 @@ ant-tasks_src_install() { |
52 |
java-pkg_register-ant-task --version "${ANT_TASK_PV}" |
53 |
|
54 |
# create the compatibility symlink |
55 |
- if version_is_at_least 1.7.1_beta2; then |
56 |
+ if ver_test -ge 1.7.1_beta2; then |
57 |
dodir /usr/share/ant/lib |
58 |
dosym /usr/share/${PN}/lib/${PN}.jar /usr/share/ant/lib/${PN}.jar |
59 |
fi |