[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     9f4fe74fbc922f3a1c0546116a777a227c5baa83
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 09:15:28 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 14 09:54:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f4fe74f

java-utils-2.eclass: DESTTREE querying -> /usr, #566480

 eclass/java-utils-2.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 976243f..9e0d2d5 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -2334,14 +2334,14 @@ java-pkg_init_paths_() {
                JAVA_PKG_NAME="${PN}-${SLOT%/*}"
        fi
 
-       JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
+       JAVA_PKG_SHAREPATH="/usr/share/${JAVA_PKG_NAME}"
        JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/"
        JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env"
-       JAVA_PKG_VIRTUALS_PATH="${DESTTREE}/share/java-config-2/virtuals"
+       JAVA_PKG_VIRTUALS_PATH="/usr/share/java-config-2/virtuals"
        
JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}"
 
        [[ -z "${JAVA_PKG_JARDEST}" ]] && 
JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib"
-       [[ -z "${JAVA_PKG_LIBDEST}" ]] && 
JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}"
+       [[ -z "${JAVA_PKG_LIBDEST}" ]] && 
JAVA_PKG_LIBDEST="/usr/$(get_libdir)/${JAVA_PKG_NAME}"
        [[ -z "${JAVA_PKG_WARDEST}" ]] && 
JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
 
        # TODO maybe only print once?