set_java_env(): Substitute @SLOT@ in vm env files

java-vm_check-nsplugin(): Fix handling of IUSE defaults

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index a071240b1a6930ffae0ccd99577692a80b600269..bd8bcc66bd31be1e5968dc646a872387258c8cb7 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.25 2011/11/24 00:57:00 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.26 2011/11/24 20:05:01 sera Exp $
+
+  24 Nov 2011; Ralph Sennhauser <sera@gentoo.org> java-vm-2.eclass:
+  set_java_env(): Substitute @SLOT@ in vm env files
+  java-vm_check-nsplugin(): Fix handling of IUSE defaults
 
   24 Nov 2011; Maciej Mrozowski <reavertm@gentoo.org> virtuoso.eclass:
   Dependency on <gawk-4 moved to virtuoso-server-6.1.{2,3}.

diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass
index 0f993874b23a458c43485a9ef047db55f93fa3ec..554f9e5715fa2c7cb5b65678e91cfdf6ea3383d9 100644 (file)
--- a/eclass/java-vm-2.eclass
+++ b/eclass/java-vm-2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.39 2011/11/21 10:15:46 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.40 2011/11/24 20:05:01 sera Exp $
 
 # -----------------------------------------------------------------------------
 # @eclass-begin
@@ -68,7 +68,7 @@ java-vm_check-nsplugin() {
        has ${EAPI:-0} 0 1 2 && ! use prefix && EPREFIX=
 
        # Install a default nsplugin if we don't already have one
-       if has nsplugin ${IUSE} && use nsplugin; then
+       if in_iuse nsplugin && use nsplugin; then
                if [[ ! -f "${EPREFIX}"/usr/${libdir}/nsbrowser/plugins/javaplugin.so ]]; then
                        einfo "No system nsplugin currently set."
                        java-vm_set-nsplugin
@@ -150,6 +150,7 @@ set_java_env() {
                -e "s/@PN@/${PN}/g" \
                -e "s/@PV@/${PV}/g" \
                -e "s/@PF@/${PF}/g" \
+               -e "s/@SLOT@/${SLOT}/g" \
                -e "s/@PLATFORM@/${platform}/g" \
                -e "s/@LIBDIR@/$(get_libdir)/g" \
                -e "/^LDPATH=.*lib\\/\\\"/s|\"\\(.*\\)\"|\"\\1${platform}/:\\1${platform}/server/\"|" \