Update Oracle JVM masks for Mac OS. Mask by default and unmask only on

recent releases because these are fewer.

8 files changed, 53 insertions, 17 deletions

diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog
index a5b23a8a55b0..f0e870cf9e24 100644
--- a/profiles/prefix/ChangeLog
+++ b/profiles/prefix/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for profiles/prefix
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.466 2015/06/30 08:16:35 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.467 2015/07/29 12:20:06 chewi Exp $
+
+  29 Jul 2015; James Le Cuirot <chewi@gentoo.org>
+  darwin/macos/10.4/package.mask, darwin/macos/10.5/package.mask,
+  +darwin/macos/10.8/package.unmask, +darwin/macos/10.9/package.unmask,
+  +darwin/macos/10.10/package.unmask, darwin/macos/package.mask,
+  darwin/macos/package.use.mask:
+  Update Oracle JVM masks for Mac OS. Mask by default and unmask only on recent
+  releases because these are fewer.
 
   16 Jun 2015; Fabian Groffen <grobian@gentoo.org> package.mask:
   Unmask Python 2.7.10, haubi applied a fix from upstream for the issue
diff --git a/profiles/prefix/darwin/macos/10.10/package.unmask b/profiles/prefix/darwin/macos/10.10/package.unmask
new file mode 100644
index 000000000000..a9b4d27dc5bd
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.10/package.unmask
@@ -0,0 +1,8 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.10/package.unmask,v 1.1 2015/07/29 12:20:06 chewi Exp $
+
+# James Le Cuirot <chewi@gentoo.org> (29 Jul 2015)
+# Recent releases are supported in 10.10.
+dev-java/oracle-jdk-bin
+dev-java/oracle-jre-bin
diff --git a/profiles/prefix/darwin/macos/10.4/package.mask b/profiles/prefix/darwin/macos/10.4/package.mask
index 3cef7e59e667..fdb11c22bb59 100644
--- a/profiles/prefix/darwin/macos/10.4/package.mask
+++ b/profiles/prefix/darwin/macos/10.4/package.mask
@@ -1,10 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/package.mask,v 1.6 2013/12/25 13:41:39 grobian Exp $
-
-# Fabian Groffen <grobian@gentoo.org> (25 Dec 2013)
-# Needs 64-bits Intel
-dev-java/oracle-jdk-bin
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/package.mask,v 1.7 2015/07/29 12:20:06 chewi Exp $
 
 # Fabian Groffen <grobian@gentoo.org> (03 May 2012)
 # Needs 10.6 or up
diff --git a/profiles/prefix/darwin/macos/10.5/package.mask b/profiles/prefix/darwin/macos/10.5/package.mask
index 0fc0fbbdc18f..6bf6a25f01b0 100644
--- a/profiles/prefix/darwin/macos/10.5/package.mask
+++ b/profiles/prefix/darwin/macos/10.5/package.mask
@@ -1,10 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/package.mask,v 1.5 2013/12/25 13:41:39 grobian Exp $
-
-# Fabian Groffen <grobian@gentoo.org> (25 Dec 2013)
-# Needs 64-bits Intel, only tested on 10.6, might work on 10.5
-dev-java/oracle-jdk-bin
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/package.mask,v 1.6 2015/07/29 12:20:06 chewi Exp $
 
 # Fabian Groffen <grobian@gentoo.org> (03 May 2012)
 # Needs 10.6 or up
diff --git a/profiles/prefix/darwin/macos/10.8/package.unmask b/profiles/prefix/darwin/macos/10.8/package.unmask
new file mode 100644
index 000000000000..5857bf99cd5c
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.8/package.unmask
@@ -0,0 +1,8 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.8/package.unmask,v 1.1 2015/07/29 12:20:06 chewi Exp $
+
+# James Le Cuirot <chewi@gentoo.org> (29 Jul 2015)
+# Recent releases are supported in 10.8.
+dev-java/oracle-jdk-bin
+dev-java/oracle-jre-bin
diff --git a/profiles/prefix/darwin/macos/10.9/package.unmask b/profiles/prefix/darwin/macos/10.9/package.unmask
new file mode 100644
index 000000000000..cfc3fdda3bc6
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.9/package.unmask
@@ -0,0 +1,8 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.9/package.unmask,v 1.1 2015/07/29 12:20:06 chewi Exp $
+
+# James Le Cuirot <chewi@gentoo.org> (29 Jul 2015)
+# Recent releases are supported in 10.9.
+dev-java/oracle-jdk-bin
+dev-java/oracle-jre-bin
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index cbb1857f856c..c9f8fb8e8b2a 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,6 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/package.mask,v 1.8 2014/01/02 22:49:09 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/package.mask,v 1.9 2015/07/29 12:20:06 chewi Exp $
+
+# James Le Cuirot <chewi@gentoo.org> (29 Jul 2015)
+# Recent Oracle releases only support recent Mac OS releases. We can't
+# keep old versions due to vulnerabilities.
+dev-java/oracle-jdk-bin
+dev-java/oracle-jre-bin
 
 # Fabian Groffen <grobian@gentoo.org> (29 Sep 2012)
 # Use Apple's provided Java6 instead!
diff --git a/profiles/prefix/darwin/macos/package.use.mask b/profiles/prefix/darwin/macos/package.use.mask
index 32201e489ab1..772922a12794 100644
--- a/profiles/prefix/darwin/macos/package.use.mask
+++ b/profiles/prefix/darwin/macos/package.use.mask
@@ -1,6 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/package.use.mask,v 1.13 2012/08/01 10:46:14 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/package.use.mask,v 1.14 2015/07/29 12:20:06 chewi Exp $
+
+# James Le Cuirot <chewi@gentoo.org> (29 Jul 2015)
+# JavaFX is included on Mac OS. I think a browser plugin is too but as
+# libjvm rather than libnpjp2 like on Linux so keep nsplugin masked.
+dev-java/oracle-jdk-bin -javafx
+dev-java/oracle-jre-bin -javafx
 
 # Fabian Groffen <grobian@gentoo.org> (30 Oct 2009)
 # X and linux only