diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2019-10-30 21:25:00 +0100 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2019-10-30 21:27:17 +0100 |
| commit | 8cb182d6a7c9a6f75df73e64f15d34e077271405 (patch) | |
| tree | 9ab56aec3c02a59bd872738b8a5ecb3feecf0e61 /eclass/java-ant-2.eclass | |
| parent | net-mail/courier-imap: adding info as courier-imap run now as user mail (diff) | |
| download | gentoo-8cb182d6a7c9a6f75df73e64f15d34e077271405.tar.gz gentoo-8cb182d6a7c9a6f75df73e64f15d34e077271405.tar.bz2 gentoo-8cb182d6a7c9a6f75df73e64f15d34e077271405.zip | |
eclass/java-{ant,utils}: updated for new javatoolkit layout
Bug: https://bugs.gentoo.org/627440
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'eclass/java-ant-2.eclass')
| -rw-r--r-- | eclass/java-ant-2.eclass | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index 1fd4feb39134..5be76953edd6 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -224,8 +224,13 @@ java-ant_bsfix_files() { files+=( -f "${file}" ) done - local rewriter3="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-3.py" - local rewriter4="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/build-xml-rewrite" + if [ -e "${EPREFIX}/usr/libexec/javatoolkit" ]; then + local rewriter3="${EPREFIX}/usr/libexec/javatoolkit/xml-rewrite-3.py" + local rewriter4="${EPREFIX}/usr/libexec/javatoolkit/build-xml-rewrite" + else + local rewriter3="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-3.py" + local rewriter4="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/build-xml-rewrite" + fi if [[ -x ${rewriter4} && ${JAVA_ANT_ENCODING} ]]; then [[ ${JAVA_ANT_REWRITE_CLASSPATH} ]] && local gcp="-g" @@ -375,11 +380,11 @@ java-ant_ignore-system-classes() { # @DESCRIPTION: # Run the right xml-rewrite binary with the given arguments java-ant_xml-rewrite() { - local gen2="${EPREFIX}/usr/bin/xml-rewrite-2.py" local gen2_1="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-2.py" + local gen2_2="${EPREFIX}/usr/libexec/javatoolkit/xml-rewrite-2.py" # gen1 is deprecated - if [[ -x "${gen2}" ]]; then - ${gen2} "${@}" || die "${gen2} failed" + if [[ -x "${gen2_2}" ]]; then + ${gen2_2} "${@}" || die "${gen2_2} failed" elif [[ -x "${gen2_1}" ]]; then ${gen2_1} "${@}" || die "${gen2_1} failed" else |