Remove obsolete nsplugin unmasks because the old Sun JVMs are masked

entirely. Replace with new Oracle ones that also include javafx.

4 files changed, 22 insertions, 14 deletions

diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog
index eeb77854d622..b4b28453cf5e 100644
--- a/profiles/arch/amd64/ChangeLog
+++ b/profiles/arch/amd64/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo/AMD64 profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.328 2015/07/16 16:21:03 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.329 2015/07/28 23:37:52 chewi Exp $
+
+  28 Jul 2015; James Le Cuirot <chewi@gentoo.org> package.use.mask:
+  Remove obsolete nsplugin unmasks because the old Sun JVMs are masked
+  entirely. Replace with new Oracle ones that also include javafx.
 
   16 Jul 2015; Brian Evans <grknight@gentoo.org> package.use.mask:
   Remove stale package.use.mask entry on igbinary for dev-php/pecl-memcached
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 5bad27ce0e52..83c068df3c12 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.206 2015/07/16 16:21:03 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.207 2015/07/28 23:37:52 chewi Exp $
 
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -18,6 +18,11 @@
 
 #--- END OF EXAMPLES ---
 
+# James Le Cuirot <chewi@gentoo.org> (28 Jul 2015)
+# JavaFX and the browser plugin are included on x64 Linux.
+dev-java/oracle-jdk-bin -javafx -nsplugin
+dev-java/oracle-jre-bin -javafx -nsplugin
+
 # Michael Sterrett <mr_bones_@gentoo.org> (21 Apr 2015)
 # None of the fusionsound deps support multilib currently, maybe later.
 # Hiding the use flag fixes bug #545662 for now.
@@ -247,10 +252,6 @@ app-backup/backup-manager s3
 media-libs/imlib2 mmx
 media-libs/imlib2 cpu_flags_x86_mmx
 
-# Serkan Kaba <serkan@gentoo.org> (5 Feb 2009)
-# finally a 64bit java plugin
->=dev-java/sun-jre-bin-1.6.0.12 -nsplugin
-
 # Jeremy Olexa <darkside@gentoo.org> (27 Dec 2008)
 # Mask static USE flag because it just doesn't work on amd64. See bug 236591
 >=app-arch/p7zip-4.58 static
@@ -260,10 +261,6 @@ media-libs/imlib2 cpu_flags_x86_mmx
 # bad comment heading. see bug #246144
 media-video/mplayer -cpudetection -custom-cpuopts -bindist
 
-# Vlastimil Babka <caster@gentoo.org> (12 Dec 2008)
-# finally a 64bit java plugin
->=dev-java/sun-jdk-1.6.0.12_beta2 -nsplugin
-
 # Tomas Chvatal <scarabeus@gentoo.org> (31 Jan 2009)
 # masked in base, unmask for x86/amd64
 sci-misc/boinc -cuda
diff --git a/profiles/arch/x86/ChangeLog b/profiles/arch/x86/ChangeLog
index 7a6256a54423..cdf7d8797067 100644
--- a/profiles/arch/x86/ChangeLog
+++ b/profiles/arch/x86/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo/x86 profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.197 2015/06/09 23:57:34 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.198 2015/07/28 23:38:05 chewi Exp $
+
+  28 Jul 2015; James Le Cuirot <chewi@gentoo.org> package.use.mask:
+  Remove obsolete nsplugin unmasks because the old Sun JVMs are masked
+  entirely. Replace with new Oracle ones that also include javafx.
 
   09 Jun 2015; Gilles Dartiguelongue <eva@gentoo.org> package.use.mask:
   Add package.use.mask for media-plugins/grilo-plugins[upnp-av], bug #551634.
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 7e1989f49187..2fc2c5318b6e 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,9 +1,14 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.155 2015/06/09 23:57:34 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.156 2015/07/28 23:38:05 chewi Exp $
 
 # This file requires >=portage-2.1.1
 
+# James Le Cuirot <chewi@gentoo.org> (28 Jul 2015)
+# JavaFX and the browser plugin are included on x86 Linux.
+dev-java/oracle-jdk-bin -javafx -nsplugin
+dev-java/oracle-jre-bin -javafx -nsplugin
+
 # Gilles Dartiguelongue <eva@gentoo.org> (10 Jun 2015)
 # net-libs/dleyna-connector-dbus lack x86 keyword, bug #551634
 >=media-plugins/grilo-plugins-0.2.14 upnp-av
@@ -208,8 +213,6 @@ www-client/firefox -ipc
 sys-power/pm-utils -video_cards_intel -video_cards_radeon
 
 # Vlastimil Babka <caster@gentoo.org> (31 Mar 2010)
->=dev-java/sun-jdk-1.6 -nsplugin
->=dev-java/sun-jre-bin-1.6 -nsplugin
 >=dev-java/ibm-jdk-bin-1.5 -nsplugin
 >=dev-java/ibm-jre-bin-1.5 -nsplugin