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