8 files changed, 35 insertions, 23 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index d2f999bb123f..9feea7bd9e36 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,17 @@
 # ChangeLog for profile directory
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.2684 2009/05/24 00:18:21 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.2685 2009/05/24 21:01:36 caster Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  24 May 2009; Vlastimil Babka <caster@gentoo.org>
+  arch/x86/package.use.mask, default-linux/x86/package.use.mask,
+  hardened/ia64/package.use.mask, hardened/x86/package.use.mask,
+  uclibc/x86/package.use.mask:
+  Mask nsplugin of 1.4 JVM's. Bug #263810.
+
   24 May 2009; MATSUU Takuto <matsuu@gentoo.org> package.mask:
   remove x11-libs/xcb-util from p.mask
 
diff --git a/profiles/arch/x86/ChangeLog b/profiles/arch/x86/ChangeLog
index 0690ee73fcea..f0720f43f4ec 100644
--- a/profiles/arch/x86/ChangeLog
+++ b/profiles/arch/x86/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/x86 profile directory
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.18 2009/03/20 20:02:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.19 2009/05/24 21:01:36 caster Exp $
+
+  24 May 2009; Vlastimil Babka <caster@gentoo.org> package.use.mask:
+  Mask nsplugin of 1.4 JVM's. Bug #263810.
 
   20 Mar 2009; Raúl Porcel <armin76@gentoo.org> package.use.mask:
   Package.use.mask sse2 on pixman, bug #260287
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 15e7731b2c8f..7d417d3dbf8b 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -18,10 +18,10 @@ dev-python/kaa-base -tls
 # Serkan Kaba <serkan@gentoo.org> (20 Jul 2008)
 app-text/enchant -zemberek
 
-dev-java/sun-jdk -nsplugin
-dev-java/sun-jre-bin -nsplugin
-dev-java/ibm-jdk-bin -nsplugin 
-dev-java/ibm-jre-bin -nsplugin
+>=dev-java/sun-jdk-1.5 -nsplugin
+>=dev-java/sun-jre-bin-1.5 -nsplugin
+>=dev-java/ibm-jdk-bin-1.5 -nsplugin 
+>=dev-java/ibm-jre-bin-1.5 -nsplugin
 x11-terms/eterm sse2
 
 # Dawid Węgliński <cla@gentoo.org> (21.11.2007)
diff --git a/profiles/default-linux/x86/ChangeLog b/profiles/default-linux/x86/ChangeLog
index 871a8bcc8b3c..cace81d07a73 100644
--- a/profiles/default-linux/x86/ChangeLog
+++ b/profiles/default-linux/x86/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/x86 profile directory
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/ChangeLog,v 1.148 2009/03/20 20:04:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/ChangeLog,v 1.149 2009/05/24 21:01:37 caster Exp $
+
+  24 May 2009; Vlastimil Babka <caster@gentoo.org> package.use.mask:
+  Mask nsplugin of 1.4 JVM's. Bug #263810.
 
   20 Mar 2009; Raúl Porcel <armin76@gentoo.org> package.use.mask:
   Package.use.mask sse2 on pixman, bug #260287
diff --git a/profiles/default-linux/x86/package.use.mask b/profiles/default-linux/x86/package.use.mask
index d4b6df0da5bd..4b09d256999a 100644
--- a/profiles/default-linux/x86/package.use.mask
+++ b/profiles/default-linux/x86/package.use.mask
@@ -18,10 +18,10 @@ dev-python/kaa-base -tls
 # Serkan Kaba <serkan@gentoo.org> (20 Jul 2008)
 app-text/enchant -zemberek
 
-dev-java/sun-jdk -nsplugin
-dev-java/sun-jre-bin -nsplugin
-dev-java/ibm-jdk-bin -nsplugin 
-dev-java/ibm-jre-bin -nsplugin
+>=dev-java/sun-jdk-1.5 -nsplugin
+>=dev-java/sun-jre-bin-1.5 -nsplugin
+>=dev-java/ibm-jdk-bin-1.5 -nsplugin 
+>=dev-java/ibm-jre-bin-1.5 -nsplugin
 x11-terms/eterm sse2
 
 # Dawid Węgliński <cla@gentoo.org> (21.11.2007)
diff --git a/profiles/hardened/ia64/package.use.mask b/profiles/hardened/ia64/package.use.mask
index 63a3a3bf8b71..3355773e4e21 100644
--- a/profiles/hardened/ia64/package.use.mask
+++ b/profiles/hardened/ia64/package.use.mask
@@ -1,7 +1,7 @@
 # This file requires >=portage-2.1.1
 
 # bug #147908 - unmask these on x86 profiles
-dev-java/sun-jdk -nsplugin
-dev-java/sun-jre-bin -nsplugin
-dev-java/ibm-jdk-bin -nsplugin 
-dev-java/ibm-jre-bin -nsplugin
+>=dev-java/sun-jdk-1.5 -nsplugin
+>=dev-java/sun-jre-bin-1.5 -nsplugin
+>=dev-java/ibm-jdk-bin-1.5 -nsplugin 
+>=dev-java/ibm-jre-bin-1.5 -nsplugin
diff --git a/profiles/hardened/x86/package.use.mask b/profiles/hardened/x86/package.use.mask
index 40abbdcd4464..e1f386404c72 100644
--- a/profiles/hardened/x86/package.use.mask
+++ b/profiles/hardened/x86/package.use.mask
@@ -15,10 +15,10 @@ dev-java/eclipse-ecj gcj
 dev-libs/cyrus-sasl berkdb
 
 # bug #147908 - unmask these on x86 profiles
-dev-java/sun-jdk -nsplugin
-dev-java/sun-jre-bin -nsplugin
-dev-java/ibm-jdk-bin -nsplugin 
-dev-java/ibm-jre-bin -nsplugin
+>=dev-java/sun-jdk-1.5 -nsplugin
+>=dev-java/sun-jre-bin-1.5 -nsplugin
+>=dev-java/ibm-jdk-bin-1.5 -nsplugin 
+>=dev-java/ibm-jre-bin-1.5 -nsplugin
 
 # missing the necessary linux-headers dep
 >=net-fs/netatalk-2.0.3-r3 xfs
diff --git a/profiles/uclibc/x86/package.use.mask b/profiles/uclibc/x86/package.use.mask
index d6a3e1f36c6a..c5354b0c690b 100644
--- a/profiles/uclibc/x86/package.use.mask
+++ b/profiles/uclibc/x86/package.use.mask
@@ -1,6 +1,6 @@
 # This file requires >=portage-2.1.1
 
-dev-java/sun-jdk -nsplugin
-dev-java/sun-jre-bin -nsplugin
-dev-java/ibm-jdk-bin -nsplugin 
-dev-java/ibm-jre-bin -nsplugin
+>=dev-java/sun-jdk-1.5 -nsplugin
+>=dev-java/sun-jre-bin-1.5 -nsplugin
+>=dev-java/ibm-jdk-bin-1.5 -nsplugin 
+>=dev-java/ibm-jre-bin-1.5 -nsplugin