1 |
commit: fbdddd87ff997e74644c2d5feb56c2e2d915860b |
2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 9 04:45:57 2017 +0000 |
4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 9 04:47:37 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbdddd87 |
7 |
|
8 |
eclass/java-utils-2.eclass: support Prefix. |
9 |
|
10 |
Credit: Martin Mokrejš |
11 |
Bug: 595002 |
12 |
|
13 |
eclass/java-utils-2.eclass | 18 +++++++++--------- |
14 |
1 file changed, 9 insertions(+), 9 deletions(-) |
15 |
|
16 |
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass |
17 |
index ee4c319914..e46a53d7d5 100644 |
18 |
--- a/eclass/java-utils-2.eclass |
19 |
+++ b/eclass/java-utils-2.eclass |
20 |
@@ -1,4 +1,4 @@ |
21 |
-# Copyright 2004-2015 Gentoo Foundation |
22 |
+# Copyright 2004-2017 Gentoo Foundation |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
# $Id$ |
25 |
|
26 |
@@ -338,7 +338,7 @@ java-pkg_dojar() { |
27 |
if [[ -e "${jar}" ]] ; then |
28 |
# Don't overwrite if jar has already been installed with the same |
29 |
# name |
30 |
- local dest="${D}${JAVA_PKG_JARDEST}/${jar_basename}" |
31 |
+ local dest="${ED}${JAVA_PKG_JARDEST}/${jar_basename}" |
32 |
if [[ -e "${dest}" ]]; then |
33 |
ewarn "Overwriting ${dest}" |
34 |
fi |
35 |
@@ -352,13 +352,13 @@ java-pkg_dojar() { |
36 |
insinto "${JAVA_PKG_JARDEST}" |
37 |
doins "${jar}" |
38 |
) || die "failed to install ${jar}" |
39 |
- java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}" |
40 |
- debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}" |
41 |
+ java-pkg_append_ JAVA_PKG_CLASSPATH "${EPREFIX}/${JAVA_PKG_JARDEST}/${jar_basename}" |
42 |
+ debug-print "installed ${jar} to ${ED}${JAVA_PKG_JARDEST}" |
43 |
# make a symlink to the original jar if it's symlink |
44 |
else |
45 |
# TODO use dosym, once we find something that could use it |
46 |
# -nichoj |
47 |
- ln -s "$(readlink "${jar}")" "${D}${JAVA_PKG_JARDEST}/${jar_basename}" |
48 |
+ ln -s "$(readlink "${jar}")" "${ED}${JAVA_PKG_JARDEST}/${jar_basename}" |
49 |
debug-print "${jar} is a symlink, linking accordingly" |
50 |
fi |
51 |
else |
52 |
@@ -828,7 +828,7 @@ java-pkg_dolauncher() { |
53 |
echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" |
54 |
cat "${var_tmp}" >> "${target}" |
55 |
rm -f "${var_tmp}" |
56 |
- echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" |
57 |
+ echo "source ${EPREFIX}/usr/share/java-config-2/launcher/launcher.bash" >> "${target}" |
58 |
|
59 |
if [[ -n "${target_dir}" ]]; then |
60 |
( |
61 |
@@ -1745,7 +1745,7 @@ java-pkg_register-ant-task() { |
62 |
local TASK_NAME="${1:-${JAVA_PKG_NAME}}" |
63 |
|
64 |
dodir /usr/share/ant/${TASKS_DIR} |
65 |
- touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}" |
66 |
+ touch "${ED}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}" |
67 |
} |
68 |
|
69 |
# @FUNCTION: java-pkg_ant-tasks-depend |
70 |
@@ -2339,9 +2339,9 @@ java-pkg_init_paths_() { |
71 |
|
72 |
JAVA_PKG_SHAREPATH="/usr/share/${JAVA_PKG_NAME}" |
73 |
JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" |
74 |
- JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" |
75 |
+ JAVA_PKG_ENV="${ED}${JAVA_PKG_SHAREPATH}/package.env" |
76 |
JAVA_PKG_VIRTUALS_PATH="/usr/share/java-config-2/virtuals" |
77 |
- JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}" |
78 |
+ JAVA_PKG_VIRTUAL_PROVIDER="${ED}${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}" |
79 |
|
80 |
[[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" |
81 |
[[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="/usr/$(get_libdir)/${JAVA_PKG_NAME}" |