hi,
i just committed the changes to the eclass:
commit f14e39de0e2eaa3d3011918e9febd89bfe98f7ee (HEAD -> master,
origin/master, origin/HEAD)
Author: Miroslav Šulc <fordf...@gentoo.org>
Date: Mon Jan 21 09:45:29 2019 +0100
ant-tasks.eclass: cleanup and improvement
1) removed obsolete code
2) increased default jdk/jre version to the lowest available
version 1.8
3) added support for patching build.xml along with the original
build.xml replacement
Signed-off-by: Miroslav Šulc <fordf...@gentoo.org>
i did one minor change that was not in the patch. after chat with chewi
i increased default jdk/jre to 1.8 instead of 1.6. this change does not
affect any ebuild as all ebuilds have these values defined.
regards
miroslav
Dne 18. 01. 19 v 18:25 Miroslav Šulc napsal(a):
thank you for the comments. i added eapi check at the beginning
supporting eapi 5|6|7 (5 is needed for current ebuilds). i also
changed epatch to eapply and disabled patching build.xml for eapi5
just to make the code more robust, build.xml patching is not used in
current ebuilds and those will be soon gone. once they are gone, this
check and support for eapi5 can both be removed. attached is the
updated patch.
miroslav
Dne 18. 01. 19 v 17:23 Brian Evans napsal(a):
On 1/18/2019 11:11 AM, Miroslav Šulc wrote:
@@ -130,7 +112,11 @@ ant-tasks_src_unpack() {
cd "${S}"
# replace build.xml with our modified for split
building
- mv -f "${WORKDIR}"/build.xml .
+ if [ -e "${WORKDIR}"/${PV}-build.patch ] ; then
+ epatch "${WORKDIR}"/${PV}-build.patch
Adding epatch without 'inherit epatch'? Sounds like gambling on faith.
Also limits to EAPI=6.
Brian
+ else
+ mv -f "${WORKDIR}"/build.xml .
+ fi
cd lib
# remove bundled xerces
