diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-02 17:13:10 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-02 17:13:10 +0100 |
| commit | 0bff53119f08d677db6c1a991bd30741682a8a08 (patch) | |
| tree | 6ec8d4c38152bb4f2bb4b93277236ebd9fbbd21d /eclass/ant-tasks.eclass | |
| parent | 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec (diff) | |
Revert "gentoo resync : 02.06.2018"
This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.
Diffstat (limited to 'eclass/ant-tasks.eclass')
| -rw-r--r-- | eclass/ant-tasks.eclass | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass index 31683e682437..e008e6eaea81 100644 --- a/eclass/ant-tasks.eclass +++ b/eclass/ant-tasks.eclass @@ -16,8 +16,7 @@ JAVA_ANT_DISABLE_ANT_CORE_DEP=true # rewriting build.xml for are the testcases has no reason atm JAVA_PKG_BSFIX_ALL=no -inherit java-pkg-2 java-ant-2 -[[ ${EAPI:-0} == [0123456] ]] && inherit eapi7-ver +inherit versionator java-pkg-2 java-ant-2 EXPORT_FUNCTIONS src_unpack src_compile src_install @@ -61,12 +60,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=$(ver_cut 1-3) + ANT_TASK_PV=$(get_version_component_range 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=$(ver_cut 1-3) + ANT_TASK_PV=$(get_version_component_range 1-3) else # default for final releases MY_PV=${PV} @@ -102,7 +101,7 @@ if [[ -z "${ANT_TASK_DISABLE_VM_DEPS}" ]]; then fi # we need direct blockers with old ant-tasks for file collisions - bug #252324 -if ver_test -ge 1.7.1; then +if version_is_at_least 1.7.1 ; then DEPEND+=" !dev-java/ant-tasks" fi @@ -168,7 +167,7 @@ ant-tasks_src_install() { java-pkg_register-ant-task --version "${ANT_TASK_PV}" # create the compatibility symlink - if ver_test -ge 1.7.1_beta2; then + if version_is_at_least 1.7.1_beta2; then dodir /usr/share/ant/lib dosym /usr/share/${PN}/lib/${PN}.jar /usr/share/ant/lib/${PN}.jar fi |