/[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.46 Revision 1.47
1# Copyright 1999-2012 Gentoo Foundation 1# Copyright 1999-2014 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.46 2012/07/23 19:06:20 sera Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.47 2014/07/22 06:38:56 haubi 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
68# 68#
69# Set the generation-2 system VM and Java plugin, if it isn't set or the 69# Set the generation-2 system VM and Java plugin, if it isn't set or the
70# setting is invalid. Also update mime database. 70# setting is invalid. Also update mime database.
71 71
72java-vm-2_pkg_postinst() { 72java-vm-2_pkg_postinst() {
73 has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT=${ROOT}
73 # Note that we cannot rely on java-config here, as it will silently recognize 74 # 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 75 # e.g. icedtea6-bin as valid system VM if icedtea6 is set but invalid (e.g. due
75 # to the migration to icedtea-6) 76 # to the migration to icedtea-6)
76 if [[ ! -L "${ROOT}${JAVA_VM_SYSTEM}" ]]; then 77 if [[ ! -L "${EROOT}${JAVA_VM_SYSTEM}" ]]; then
77 java_set_default_vm_ 78 java_set_default_vm_
78 else 79 else
79 local current_vm_path=$(readlink "${ROOT}${JAVA_VM_SYSTEM}") 80 local current_vm_path=$(readlink "${EROOT}${JAVA_VM_SYSTEM}")
80 local current_vm=$(basename "${ROOT}${current_vm_path}") 81 local current_vm=$(basename "${ROOT}${current_vm_path}")
81 if [[ ! -L "${ROOT}${JAVA_VM_DIR}/${current_vm}" ]]; then 82 if [[ ! -L "${EROOT}${JAVA_VM_DIR}/${current_vm}" ]]; then
82 java_set_default_vm_ 83 java_set_default_vm_
83 fi 84 fi
84 fi 85 fi
85 86
86 java-vm_check-nsplugin 87 java-vm_check-nsplugin

Legend:
Removed from v.1.46  
changed lines
  Added in v.1.47

  ViewVC Help
Powered by ViewVC 1.1.20