/[gentoo-x86]/eclass/java-vm-2.eclass
Gentoo

Diff of /eclass/java-vm-2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.44 Revision 1.45
1# Copyright 1999-2012 Gentoo Foundation 1# Copyright 1999-2012 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.44 2012/06/12 09:17:33 sera Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.45 2012/07/18 16:54:55 sera Exp $
4 4
5# @ECLASS: java-vm-2.eclass 5# @ECLASS: java-vm-2.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# java@gentoo.org 7# java@gentoo.org
8# @BLURB: Java Virtual Machine eclass 8# @BLURB: Java Virtual Machine eclass
71 71
72java-vm-2_pkg_postinst() { 72java-vm-2_pkg_postinst() {
73 # Note that we cannot rely on java-config here, as it will silently recognize 73 # Note that we cannot rely on java-config here, as it will silently recognize
74 # e.g. icedtea6-bin as valid system VM if icedtea6 is set but invalid (e.g. due 74 # e.g. icedtea6-bin as valid system VM if icedtea6 is set but invalid (e.g. due
75 # to the migration to icedtea-6) 75 # to the migration to icedtea-6)
76 if [[ ! -L "${JAVA_VM_SYSTEM}" ]]; then 76 if [[ ! -L "${ROOT}${JAVA_VM_SYSTEM}" ]]; then
77 java_set_default_vm_ 77 java_set_default_vm_
78 else 78 else
79 local current_vm_path="$(readlink "${JAVA_VM_SYSTEM}")" 79 local current_vm_path=$(readlink "${ROOT}${JAVA_VM_SYSTEM}")
80 local current_vm="$(basename "${current_vm_path}")" 80 local current_vm=$(basename "${ROOT}${current_vm_path}")
81 if [[ ! -L "${JAVA_VM_DIR}/${current_vm}" ]]; then 81 if [[ ! -L "${ROOT}${JAVA_VM_DIR}/${current_vm}" ]]; then
82 java_set_default_vm_ 82 java_set_default_vm_
83 fi 83 fi
84 fi 84 fi
85 85
86 java-vm_check-nsplugin 86 java-vm_check-nsplugin
104 104
105 has ${EAPI:-0} 0 1 2 && ! use prefix && EPREFIX= 105 has ${EAPI:-0} 0 1 2 && ! use prefix && EPREFIX=
106 106
107 # Install a default nsplugin if we don't already have one 107 # Install a default nsplugin if we don't already have one
108 if in_iuse nsplugin && use nsplugin; then 108 if in_iuse nsplugin && use nsplugin; then
109 if [[ ! -f "${EPREFIX}"/usr/${libdir}/nsbrowser/plugins/javaplugin.so ]]; then 109 if [[ ! -f "${ROOT}${EPREFIX}"/usr/${libdir}/nsbrowser/plugins/javaplugin.so ]]; then
110 einfo "No system nsplugin currently set." 110 einfo "No system nsplugin currently set."
111 java-vm_set-nsplugin 111 java-vm_set-nsplugin
112 else 112 else
113 einfo "System nsplugin is already set, not changing it." 113 einfo "System nsplugin is already set, not changing it."
114 fi 114 fi

Legend:
Removed from v.1.44  
changed lines
  Added in v.1.45

  ViewVC Help
Powered by ViewVC 1.1.20