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