/[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.2 Revision 1.3
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2004 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.2 2006/06/25 16:28:09 nichoj Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.3 2006/06/30 12:15:35 nichoj Exp $
4# 4#
5# Author: Karl Trygve Kalleberg <karltk@gentoo.org> 5# Author: Karl Trygve Kalleberg <karltk@gentoo.org>
6 6
7inherit eutils 7inherit eutils
8 8
42 elif [[ ${systemvm1} =~ "^${VMHANDLE}" ]]; then 42 elif [[ ${systemvm1} =~ "^${VMHANDLE}" ]]; then
43 einfo "Upgrading generation-1 system-vm... updating its env file" 43 einfo "Upgrading generation-1 system-vm... updating its env file"
44 java-config-1 --set-system-vm=${P} 44 java-config-1 --set-system-vm=${P}
45 fi 45 fi
46 # else... some other VM is being updated, so we don't have to worry 46 # else... some other VM is being updated, so we don't have to worry
47 fi
48
49 if has nsplugin ${IUSE} && use nsplugin; then
50 if [[ ! -f /usr/lib/nsbrowser/plugins/javaplugin.so ]]; then
51 eselect java-nsplugin set ${VMHANDLE}
52 fi
47 fi 53 fi
48 54
49 java_mozilla_clean_ 55 java_mozilla_clean_
50} 56}
51 57
127 133
128 if [ ! -f "${D}/${plugin}" ] ; then 134 if [ ! -f "${D}/${plugin}" ] ; then
129 die "Cannot find mozilla plugin at ${D}/${plugin}" 135 die "Cannot find mozilla plugin at ${D}/${plugin}"
130 fi 136 fi
131 137
132 local plugin_dir=$(java_get_plugin_dir_) 138 local plugin_dir=/usr/share/java-config-2/nsplugin
133 dodir ${plugin_dir} 139 dodir ${plugin_dir}
134 dosym ${plugin} ${plugin_dir}/javaplugin.so 140 dosym ${plugin} ${plugin_dir}/${VMHANDLE}-javaplugin.so
135} 141}
136 142
137java_mozilla_clean_() { 143java_mozilla_clean_() {
138 # Because previously some ebuilds installed symlinks outside of pkg_install 144 # Because previously some ebuilds installed symlinks outside of pkg_install
139 # and are left behind, which forces you to manualy remove them to select the 145 # and are left behind, which forces you to manualy remove them to select the

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3

  ViewVC Help
Powered by ViewVC 1.1.20