| 1 |
commit: 44a5a4e78358f35fb3a2442ed0145abbe058a9d4 |
| 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 11:13:53 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44a5a4e7 |
| 7 |
|
| 8 |
eclass/java-utils-2.eclass: support Prefix. |
| 9 |
|
| 10 |
Reintroduce fbdddd87ff9 with EAPI gatekeeping code. |
| 11 |
|
| 12 |
Credit: Martin Mokrejš |
| 13 |
Bug: 595002 |
| 14 |
|
| 15 |
eclass/java-utils-2.eclass | 21 ++++++++++++--------- |
| 16 |
1 file changed, 12 insertions(+), 9 deletions(-) |
| 17 |
|
| 18 |
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass |
| 19 |
index ee4c319914..c6132199f0 100644 |
| 20 |
--- a/eclass/java-utils-2.eclass |
| 21 |
+++ b/eclass/java-utils-2.eclass |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 2004-2015 Gentoo Foundation |
| 24 |
+# Copyright 2004-2017 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
# $Id$ |
| 27 |
|
| 28 |
@@ -23,6 +23,9 @@ IUSE="elibc_FreeBSD" |
| 29 |
# Make sure we use java-config-2 |
| 30 |
export WANT_JAVA_CONFIG="2" |
| 31 |
|
| 32 |
+# Prefix variables is only available for EAPI>=3 |
| 33 |
+!use prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}" EPREFIX= EROOT="${ROOT}" |
| 34 |
+ |
| 35 |
# @VARIABLE: JAVA_PKG_PORTAGE_DEP |
| 36 |
# @INTERNAL |
| 37 |
# @DESCRIPTION: |
| 38 |
@@ -338,7 +341,7 @@ java-pkg_dojar() { |
| 39 |
if [[ -e "${jar}" ]] ; then |
| 40 |
# Don't overwrite if jar has already been installed with the same |
| 41 |
# name |
| 42 |
- local dest="${D}${JAVA_PKG_JARDEST}/${jar_basename}" |
| 43 |
+ local dest="${ED}${JAVA_PKG_JARDEST}/${jar_basename}" |
| 44 |
if [[ -e "${dest}" ]]; then |
| 45 |
ewarn "Overwriting ${dest}" |
| 46 |
fi |
| 47 |
@@ -352,13 +355,13 @@ java-pkg_dojar() { |
| 48 |
insinto "${JAVA_PKG_JARDEST}" |
| 49 |
doins "${jar}" |
| 50 |
) || die "failed to install ${jar}" |
| 51 |
- java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}" |
| 52 |
- debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}" |
| 53 |
+ java-pkg_append_ JAVA_PKG_CLASSPATH "${EPREFIX}/${JAVA_PKG_JARDEST}/${jar_basename}" |
| 54 |
+ debug-print "installed ${jar} to ${ED}${JAVA_PKG_JARDEST}" |
| 55 |
# make a symlink to the original jar if it's symlink |
| 56 |
else |
| 57 |
# TODO use dosym, once we find something that could use it |
| 58 |
# -nichoj |
| 59 |
- ln -s "$(readlink "${jar}")" "${D}${JAVA_PKG_JARDEST}/${jar_basename}" |
| 60 |
+ ln -s "$(readlink "${jar}")" "${ED}${JAVA_PKG_JARDEST}/${jar_basename}" |
| 61 |
debug-print "${jar} is a symlink, linking accordingly" |
| 62 |
fi |
| 63 |
else |
| 64 |
@@ -828,7 +831,7 @@ java-pkg_dolauncher() { |
| 65 |
echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" |
| 66 |
cat "${var_tmp}" >> "${target}" |
| 67 |
rm -f "${var_tmp}" |
| 68 |
- echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" |
| 69 |
+ echo "source ${EPREFIX}/usr/share/java-config-2/launcher/launcher.bash" >> "${target}" |
| 70 |
|
| 71 |
if [[ -n "${target_dir}" ]]; then |
| 72 |
( |
| 73 |
@@ -1745,7 +1748,7 @@ java-pkg_register-ant-task() { |
| 74 |
local TASK_NAME="${1:-${JAVA_PKG_NAME}}" |
| 75 |
|
| 76 |
dodir /usr/share/ant/${TASKS_DIR} |
| 77 |
- touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}" |
| 78 |
+ touch "${ED}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}" |
| 79 |
} |
| 80 |
|
| 81 |
# @FUNCTION: java-pkg_ant-tasks-depend |
| 82 |
@@ -2339,9 +2342,9 @@ java-pkg_init_paths_() { |
| 83 |
|
| 84 |
JAVA_PKG_SHAREPATH="/usr/share/${JAVA_PKG_NAME}" |
| 85 |
JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" |
| 86 |
- JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" |
| 87 |
+ JAVA_PKG_ENV="${ED}${JAVA_PKG_SHAREPATH}/package.env" |
| 88 |
JAVA_PKG_VIRTUALS_PATH="/usr/share/java-config-2/virtuals" |
| 89 |
- JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}" |
| 90 |
+ JAVA_PKG_VIRTUAL_PROVIDER="${ED}${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}" |
| 91 |
|
| 92 |
[[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" |
| 93 |
[[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="/usr/$(get_libdir)/${JAVA_PKG_NAME}" |
Archives