diff options
| author |   Ralph Sennhauser <sera@gentoo.org> | 2012-07-18 16:54:55 +0000 |
|---|---|---|
| committer | Ralph Sennhauser <sera@gentoo.org> | 2012-07-18 16:54:55 +0000 |
| commit | 355b5a45ab7ecb0a6d84d850222804eca2ad1b7e (patch) | |
| tree | 3929c085f030f3bc213cedfbd79da634b294627e /eclass | |
| parent | Version bump (diff) | |
| download | gentoo-2-355b5a45ab7ecb0a6d84d850222804eca2ad1b7e.tar.gz gentoo-2-355b5a45ab7ecb0a6d84d850222804eca2ad1b7e.tar.bz2 gentoo-2-355b5a45ab7ecb0a6d84d850222804eca2ad1b7e.zip | |
Add ROOT support, patch by vapier. #416341
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/java-vm-2.eclass | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 2948f7d42ef4..8f36c736a3e0 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.342 2012/07/18 15:12:54 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.343 2012/07/18 16:54:55 sera Exp $ + + 18 Jul 2012; Ralph Sennhauser <sera@gentoo.org> java-vm-2.eclass: + Add ROOT support, patch by vapier. #416341 18 Jul 2012; Ulrich Müller <ulm@gentoo.org> bzr.eclass: Don't assign useless values to DESCRIPTION and HOMEPAGE variables. diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass index 67127b80abc2..b7fa21d06d5c 100644 --- a/eclass/java-vm-2.eclass +++ b/eclass/java-vm-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.44 2012/06/12 09:17:33 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.45 2012/07/18 16:54:55 sera Exp $ # @ECLASS: java-vm-2.eclass # @MAINTAINER: @@ -73,12 +73,12 @@ java-vm-2_pkg_postinst() { # Note that we cannot rely on java-config here, as it will silently recognize # e.g. icedtea6-bin as valid system VM if icedtea6 is set but invalid (e.g. due # to the migration to icedtea-6) - if [[ ! -L "${JAVA_VM_SYSTEM}" ]]; then + if [[ ! -L "${ROOT}${JAVA_VM_SYSTEM}" ]]; then java_set_default_vm_ else - local current_vm_path="$(readlink "${JAVA_VM_SYSTEM}")" - local current_vm="$(basename "${current_vm_path}")" - if [[ ! -L "${JAVA_VM_DIR}/${current_vm}" ]]; then + local current_vm_path=$(readlink "${ROOT}${JAVA_VM_SYSTEM}") + local current_vm=$(basename "${ROOT}${current_vm_path}") + if [[ ! -L "${ROOT}${JAVA_VM_DIR}/${current_vm}" ]]; then java_set_default_vm_ fi fi @@ -106,7 +106,7 @@ java-vm_check-nsplugin() { # Install a default nsplugin if we don't already have one if in_iuse nsplugin && use nsplugin; then - if [[ ! -f "${EPREFIX}"/usr/${libdir}/nsbrowser/plugins/javaplugin.so ]]; then + if [[ ! -f "${ROOT}${EPREFIX}"/usr/${libdir}/nsbrowser/plugins/javaplugin.so ]]; then einfo "No system nsplugin currently set." java-vm_set-nsplugin else |