Fix USE=-nsplugin. Bug 394421.

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index 696b536728392b8d12359350c6f60d1a691eb663..6629520ea8e9275905203204a4efcb38d722d211 100644 (file)
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.246 2011/11/23 18:51:46 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.247 2011/12/12 13:49:10 sera Exp $
+
+  12 Dec 2011; Ralph Sennhauser <sera@gentoo.org>
+  ibm-jdk-bin-1.6.0.9_p2-r1.ebuild:
+  Fix USE=-nsplugin. Bug 394421.
 
 *ibm-jdk-bin-1.6.0.9_p2-r1 (23 Nov 2011)
 *ibm-jdk-bin-1.5.0.12_p5-r1 (23 Nov 2011)

diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild
index e3cbe36c87571e26b2b2b5a29a373f34110e76b4..8c2fdecbbe9e7e14a412896dad80e36523220eb6 100644 (file)
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-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-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild,v 1.1 2011/11/23 18:51:46 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild,v 1.2 2011/12/12 13:49:10 sera Exp $
 
 EAPI="4"
 
@@ -243,8 +243,8 @@ src_install() {
        fi
 
        if use x86 || use ppc; then
+               local plugin="/opt/${P}/jre/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so"
                if use nsplugin; then
-                       local plugin="/opt/${P}/jre/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so"
                        install_mozilla_plugin "${plugin}"
                else
                        rm "${ED}${plugin}" || die

diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index 7e5fb0b199ff7c4481af30664c83d224f92b932f..2e579757f9da67a8aad6c6415a12ad3f23a19370 100644 (file)
--- 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 32f6920cb50be0c770bf8ba72e118a264e28cf9e..61d291e34bd2c3aaecea07403fb0dee4c744d545 100644 (file)
--- 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