From bf53beb77f6bf5c5f4ee813e0692affa4ce3419f Mon Sep 17 00:00:00 2001
From: Ralph Sennhauser <sera@gentoo.org>
Date: Thu, 24 Nov 2011 20:05:01 +0000
Subject: [PATCH] set_java_env(): Substitute @SLOT@ in vm env files
 java-vm_check-nsplugin(): Fix handling of IUSE defaults

---
 eclass/ChangeLog        | 6 +++++-
 eclass/java-vm-2.eclass | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index a071240b1a69..bd8bcc66bd31 100644
--- 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 0f993874b23a..554f9e5715fa 100644
--- 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/\"|" \
-- 
2.26.2