| 1 |
commit: 8cb182d6a7c9a6f75df73e64f15d34e077271405 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 30 20:25:00 2019 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 30 20:27:17 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cb182d6 |
| 7 |
|
| 8 |
eclass/java-{ant,utils}: updated for new javatoolkit layout |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/627440 |
| 11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 12 |
|
| 13 |
eclass/java-ant-2.eclass | 15 ++++++++++----- |
| 14 |
eclass/java-utils-2.eclass | 9 ++++++--- |
| 15 |
2 files changed, 16 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass |
| 18 |
index 1fd4feb3913..5be76953edd 100644 |
| 19 |
--- a/eclass/java-ant-2.eclass |
| 20 |
+++ b/eclass/java-ant-2.eclass |
| 21 |
@@ -224,8 +224,13 @@ java-ant_bsfix_files() { |
| 22 |
files+=( -f "${file}" ) |
| 23 |
done |
| 24 |
|
| 25 |
- local rewriter3="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-3.py" |
| 26 |
- local rewriter4="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/build-xml-rewrite" |
| 27 |
+ if [ -e "${EPREFIX}/usr/libexec/javatoolkit" ]; then |
| 28 |
+ local rewriter3="${EPREFIX}/usr/libexec/javatoolkit/xml-rewrite-3.py" |
| 29 |
+ local rewriter4="${EPREFIX}/usr/libexec/javatoolkit/build-xml-rewrite" |
| 30 |
+ else |
| 31 |
+ local rewriter3="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-3.py" |
| 32 |
+ local rewriter4="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/build-xml-rewrite" |
| 33 |
+ fi |
| 34 |
|
| 35 |
if [[ -x ${rewriter4} && ${JAVA_ANT_ENCODING} ]]; then |
| 36 |
[[ ${JAVA_ANT_REWRITE_CLASSPATH} ]] && local gcp="-g" |
| 37 |
@@ -375,11 +380,11 @@ java-ant_ignore-system-classes() { |
| 38 |
# @DESCRIPTION: |
| 39 |
# Run the right xml-rewrite binary with the given arguments |
| 40 |
java-ant_xml-rewrite() { |
| 41 |
- local gen2="${EPREFIX}/usr/bin/xml-rewrite-2.py" |
| 42 |
local gen2_1="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-2.py" |
| 43 |
+ local gen2_2="${EPREFIX}/usr/libexec/javatoolkit/xml-rewrite-2.py" |
| 44 |
# gen1 is deprecated |
| 45 |
- if [[ -x "${gen2}" ]]; then |
| 46 |
- ${gen2} "${@}" || die "${gen2} failed" |
| 47 |
+ if [[ -x "${gen2_2}" ]]; then |
| 48 |
+ ${gen2_2} "${@}" || die "${gen2_2} failed" |
| 49 |
elif [[ -x "${gen2_1}" ]]; then |
| 50 |
${gen2_1} "${@}" || die "${gen2_1} failed" |
| 51 |
else |
| 52 |
|
| 53 |
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass |
| 54 |
index 4f7eb0356fc..e32cb572f14 100644 |
| 55 |
--- a/eclass/java-utils-2.eclass |
| 56 |
+++ b/eclass/java-utils-2.eclass |
| 57 |
@@ -2729,10 +2729,13 @@ java-pkg_jar-list() { |
| 58 |
java-pkg_verify-classes() { |
| 59 |
#$(find ${D} -type f -name '*.jar' -o -name '*.class') |
| 60 |
|
| 61 |
- local version_verify="/usr/bin/class-version-verify.py" |
| 62 |
+ local version_verify_1="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py" |
| 63 |
+ local version_verify_2="${EPREFIX}/usr/libexec/javatoolkit/class-version-verify.py" |
| 64 |
|
| 65 |
- if [[ ! -x "${version_verify}" ]]; then |
| 66 |
- version_verify="/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py" |
| 67 |
+ if [[ -x "${version_verify_1}" ]]; then |
| 68 |
+ local version_verify=${version_verify_1} |
| 69 |
+ else |
| 70 |
+ local version_verify=${version_verify_2} |
| 71 |
fi |
| 72 |
|
| 73 |
if [[ ! -x "${version_verify}" ]]; then |
Archives