diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2007-05-07 15:51:29 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-05-07 15:51:29 +0000 |
| commit | 5eccb12fb05689271ae4de60c48964def86563a6 (patch) | |
| tree | 2c26891a778a878050b2a06dca168e4dcf72d182 | |
| parent | Added new init script. (diff) | |
| download | gentoo-2-5eccb12fb05689271ae4de60c48964def86563a6.tar.gz gentoo-2-5eccb12fb05689271ae4de60c48964def86563a6.tar.bz2 gentoo-2-5eccb12fb05689271ae4de60c48964def86563a6.zip | |
Add pkg_setup and calculate VMHANDLE in there. In pkg_setup we can be sure that SLOT is defined.
| -rw-r--r-- | eclass/java-vm-2.eclass | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass index 8da858417906..b0d60a0112d6 100644 --- a/eclass/java-vm-2.eclass +++ b/eclass/java-vm-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.16 2006/11/11 00:13:22 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.17 2007/05/07 15:51:29 betelgeuse Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -23,16 +23,18 @@ RDEPEND=" export WANT_JAVA_CONFIG=2 -if [[ "${SLOT}" != "0" ]]; then - VMHANDLE=${PN}-${SLOT} -else - VMHANDLE=${PN} -fi - JAVA_VM_CONFIG_DIR="/usr/share/java-config-2/vm" JAVA_VM_DIR="/usr/lib/jvm" -EXPORT_FUNCTIONS pkg_postinst pkg_prerm pkg_postrm +EXPORT_FUNCTIONS pkg_setup pkg_postinst pkg_prerm pkg_postrm + +java-vm-2_pkg_setup() { + if [[ "${SLOT}" != "0" ]]; then + VMHANDLE=${PN}-${SLOT} + else + VMHANDLE=${PN} + fi +} java-vm-2_pkg_postinst() { # Set the generation-2 system VM, if it isn't set |