diff options
| author |   Marty E. Plummer <hanetzer@startmail.com> | 2018-05-30 10:10:27 +0200 |
|---|---|---|
| committer |   Patrice Clement <monsieurp@gentoo.org> | 2018-05-30 10:11:09 +0200 |
| commit | f295bf09c02ae28d64e812914d53c41e1a94be96 (patch) | |
| tree | 1c7756fb0546d130b70c1b3e63b04487d440eda0 /eclass | |
| parent | net-libs/nodejs: Old. (diff) | |
| download | gentoo-f295bf09c02ae28d64e812914d53c41e1a94be96.tar.gz gentoo-f295bf09c02ae28d64e812914d53c41e1a94be96.tar.bz2 gentoo-f295bf09c02ae28d64e812914d53c41e1a94be96.zip | |
ant-tasks.eclass: use eapi7-ver.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ant-tasks.eclass | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass index e008e6eaea81..31683e682437 100644 --- a/eclass/ant-tasks.eclass +++ b/eclass/ant-tasks.eclass @@ -16,7 +16,8 @@ JAVA_ANT_DISABLE_ANT_CORE_DEP=true # rewriting build.xml for are the testcases has no reason atm JAVA_PKG_BSFIX_ALL=no -inherit versionator java-pkg-2 java-ant-2 +inherit java-pkg-2 java-ant-2 +[[ ${EAPI:-0} == [0123456] ]] && inherit eapi7-ver EXPORT_FUNCTIONS src_unpack src_compile src_install @@ -60,12 +61,12 @@ if [[ ${PV} == *beta2* ]]; then MY_PV=${PV/_beta2/beta} UPSTREAM_PREFIX="http://people.apache.org/dist/ant/v1.7.1beta2/src" GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles" - ANT_TASK_PV=$(get_version_component_range 1-3) + ANT_TASK_PV=$(ver_cut 1-3) elif [[ ${PV} == *_rc* ]]; then MY_PV=${PV/_rc/RC} UPSTREAM_PREFIX="https://dev.gentoo.org/~caster/distfiles" GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles" - ANT_TASK_PV=$(get_version_component_range 1-3) + ANT_TASK_PV=$(ver_cut 1-3) else # default for final releases MY_PV=${PV} @@ -101,7 +102,7 @@ if [[ -z "${ANT_TASK_DISABLE_VM_DEPS}" ]]; then fi # we need direct blockers with old ant-tasks for file collisions - bug #252324 -if version_is_at_least 1.7.1 ; then +if ver_test -ge 1.7.1; then DEPEND+=" !dev-java/ant-tasks" fi @@ -167,7 +168,7 @@ ant-tasks_src_install() { java-pkg_register-ant-task --version "${ANT_TASK_PV}" # create the compatibility symlink - if version_is_at_least 1.7.1_beta2; then + if ver_test -ge 1.7.1_beta2; then dodir /usr/share/ant/lib dosym /usr/share/${PN}/lib/${PN}.jar /usr/share/ant/lib/${PN}.jar fi |