[patch] java-vm-2.eclass.patch

java-vm-2.eclass.patch (text/plain), 1.43 KB, created by SpanKY on 2012-05-17 02:40:04 UTC

Index: java-vm-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v
retrieving revision 1.42
diff -u -p -r1.42 java-vm-2.eclass
--- java-vm-2.eclass	5 Dec 2011 07:07:44 -0000	1.42
+++ java-vm-2.eclass	17 May 2012 02:39:14 -0000
@@ -42,12 +42,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
@@ -69,7 +69,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