/[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.5 Revision 1.6
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.5 2006/07/15 13:55:06 grobian Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.6 2006/08/01 12:23:57 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
10 =dev-java/java-config-2.0* 10 =dev-java/java-config-2.0*
11 =dev-java/java-config-1.3* 11 =dev-java/java-config-1.3*
12 >=sys-apps/portage-2.1" 12 >=sys-apps/portage-2.1"
13RDEPEND=" 13RDEPEND="
14 =dev-java/java-config-2.0* 14 =dev-java/java-config-2.0*
15 =dev-java/java-config-1.3*" 15 =dev-java/java-config-1.3*
16 >=sys-apps/bash-3"
16 17
17export WANT_JAVA_CONFIG=2 18export WANT_JAVA_CONFIG=2
18 19
19if [[ "${SLOT}" != "0" ]]; then 20if [[ "${SLOT}" != "0" ]]; then
20 VMHANDLE=${PN}-${SLOT} 21 VMHANDLE=${PN}-${SLOT}
38 # no generation-1 system-vm was yet set 39 # no generation-1 system-vm was yet set
39 if [[ -z "${systemvm1}" ]]; then 40 if [[ -z "${systemvm1}" ]]; then
40 einfo "No valid generation-1 system-vm set, setting to ${P}" 41 einfo "No valid generation-1 system-vm set, setting to ${P}"
41 java-config-1 --set-system-vm=${P} 42 java-config-1 --set-system-vm=${P}
42 # dirty check to see if we are upgrading current generation-1 system vm 43 # dirty check to see if we are upgrading current generation-1 system vm
43 elif [[ x${systemvm1} = x${VMHANDLE} ]]; then 44 elif [[ ${systemvm1} =~ "^${VMHANDLE}" ]]; then
44 einfo "Upgrading generation-1 system-vm... updating its env file" 45 einfo "Upgrading generation-1 system-vm... updating its env file"
45 java-config-1 --set-system-vm=${P} 46 java-config-1 --set-system-vm=${P}
46 fi 47 fi
47 # else... some other VM is being updated, so we don't have to worry 48 # else... some other VM is being updated, so we don't have to worry
48 fi 49 fi

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6

  ViewVC Help
Powered by ViewVC 1.1.20