diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2019-03-20 18:24:37 +0100 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2019-03-20 18:27:44 +0100 |
| commit | d3bb014cc872f4b9ff6d116e7655c9a668ee8447 (patch) | |
| tree | af9a87fdaf1a44873043078ee2266fb198063fdd /eclass/ant-tasks.eclass | |
| parent | dev-java/ant-core-1.9.2: removed obsolete (diff) | |
| download | gentoo-d3bb014cc872f4b9ff6d116e7655c9a668ee8447.tar.gz gentoo-d3bb014cc872f4b9ff6d116e7655c9a668ee8447.tar.bz2 gentoo-d3bb014cc872f4b9ff6d116e7655c9a668ee8447.zip | |
eclass/ant-tasks.eclass: cleanup
1) removed support for eapi 5 (was used in ant tasks v 1.9.2 and those are already gone)
2) removed support for ant tasks 1.9.2 (those are already gone)
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'eclass/ant-tasks.eclass')
| -rw-r--r-- | eclass/ant-tasks.eclass | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass index f889a92aa361..84e657657952 100644 --- a/eclass/ant-tasks.eclass +++ b/eclass/ant-tasks.eclass @@ -12,10 +12,10 @@ # dev-java/ant-* packages easily. case "${EAPI:-0}" in - 0|1|2|3|4) + 0|1|2|3|4|5) die "ant-tasks.eclass: EAPI ${EAPI} is too old." ;; - 5|6|7) + 6|7) ;; *) die "ant-tasks.eclass: EAPI ${EAPI} is not supported yet." @@ -27,7 +27,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} == [56] ]] && inherit eapi7-ver +[[ ${EAPI:-0} -eq 6 ]] && inherit eapi7-ver EXPORT_FUNCTIONS src_unpack src_compile src_install @@ -68,16 +68,9 @@ ANT_TASK_PV="${PV}" # default for final releases MY_PV=${PV} -case ${PV} in -1.9.2) - UPSTREAM_PREFIX="https://archive.apache.org/dist/ant/source" - GENTOO_PREFIX="https://dev.gentoo.org/~tomwij/files/dist" - ;; -*) - UPSTREAM_PREFIX="mirror://apache/ant/source" - GENTOO_PREFIX="https://dev.gentoo.org/~fordfrog/distfiles" - ;; -esac + +UPSTREAM_PREFIX="mirror://apache/ant/source" +GENTOO_PREFIX="https://dev.gentoo.org/~fordfrog/distfiles" # source/workdir name MY_P="apache-ant-${MY_PV}" @@ -123,10 +116,6 @@ ant-tasks_src_unpack() { # replace build.xml with our modified for split building if [ -e "${WORKDIR}"/${PV}-build.patch ] ; then - if [ ${EAPI:-0} -eq 5 ]; then - die "ant-tasks.eclass: build.xml patching not supported for EAPI 5 ebuilds" - fi - eapply "${WORKDIR}"/${PV}-build.patch else mv -f "${WORKDIR}"/build.xml . |