From ede7a7dca1b6e2233e61fc918151b1e870aed104 Mon Sep 17 00:00:00 2001
From: Ralph Sennhauser <sera@gentoo.org>
Date: Mon, 12 Dec 2011 13:54:03 +0000
Subject: Fix USE=-nsplugin. Bug 394421.

(Portage version: 2.1.10.39/cvs/Linux x86_64)
---
 dev-java/ibm-jre-bin/ChangeLog                        | 6 +++++-
 dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2-r1.ebuild | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'dev-java')

diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index 7e5fb0b199ff..2e579757f9da 100644
--- a/dev-java/ibm-jre-bin/ChangeLog
+++ b/dev-java/ibm-jre-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ibm-jre-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.171 2011/11/23 19:00:00 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.172 2011/12/12 13:54:03 sera Exp $
+
+  12 Dec 2011; Ralph Sennhauser <sera@gentoo.org>
+  ibm-jre-bin-1.6.0.9_p2-r1.ebuild:
+  Fix USE=-nsplugin. Bug 394421.
 
 *ibm-jre-bin-1.6.0.9_p2-r1 (23 Nov 2011)
 *ibm-jre-bin-1.5.0.12_p5-r1 (23 Nov 2011)
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2-r1.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2-r1.ebuild
index 32f6920cb50b..61d291e34bd2 100644
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2-r1.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2-r1.ebuild
@@ -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/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2-r1.ebuild,v 1.1 2011/11/23 19:00:00 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2-r1.ebuild,v 1.2 2011/12/12 13:54:03 sera Exp $
 
 EAPI="4"
 
@@ -171,8 +171,8 @@ src_install() {
 	cp -pR jre/* "${ED}"/opt/${P} || die
 
 	if use x86 || use ppc; then
+		local plugin="/opt/${P}/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so"
 		if use nsplugin; then
-			local plugin="/opt/${P}/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so"
 			install_mozilla_plugin "${plugin}"
 		else
 			rm "${ED}"/${plugin} || die
-- 
cgit v1.2.3-65-gdbad