Unmask soylatte-jdk-bin on 10.4/x86, 10.5/x86 and 10.5/x64, because it is the only Java6 provider there

5 files changed, 34 insertions, 7 deletions

diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog
index f23de73ddcb2..887140f134ea 100644
--- a/profiles/prefix/ChangeLog
+++ b/profiles/prefix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for profiles/prefix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.360 2012/09/09 10:23:33 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.361 2012/09/29 11:15:44 grobian Exp $
+
+  29 Sep 2012; Fabian Groffen <grobian@gentoo.org>
+  +darwin/macos/10.4/x86/package.unmask, +darwin/macos/10.5/x64/package.unmask,
+  +darwin/macos/10.5/x86/package.unmask, darwin/macos/package.mask:
+  Unmask soylatte-jdk-bin on 10.4/x86, 10.5/x86 and 10.5/x64, because it is the
+  only Java6 provider there
 
   09 Sep 2012; Fabian Groffen <grobian@gentoo.org>
   +sunos/solaris/make.defaults, darwin/macos/make.defaults:
diff --git a/profiles/prefix/darwin/macos/10.4/x86/package.unmask b/profiles/prefix/darwin/macos/10.4/x86/package.unmask
new file mode 100644
index 000000000000..c990fd0a0360
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.4/x86/package.unmask
@@ -0,0 +1,7 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/x86/package.unmask,v 1.1 2012/09/29 11:15:45 grobian Exp $
+
+# Fabian Groffen <grobian@gentoo.org> (29 Sep 2012)
+# This is the only way to get Java6 here
+dev-java/soylatte-jdk-bin
diff --git a/profiles/prefix/darwin/macos/10.5/x64/package.unmask b/profiles/prefix/darwin/macos/10.5/x64/package.unmask
new file mode 100644
index 000000000000..251142e38790
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.5/x64/package.unmask
@@ -0,0 +1,7 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x64/package.unmask,v 1.1 2012/09/29 11:15:45 grobian Exp $
+
+# Fabian Groffen <grobian@gentoo.org> (29 Sep 2012)
+# This is the only way to get Java6 here
+dev-java/soylatte-jdk-bin
diff --git a/profiles/prefix/darwin/macos/10.5/x86/package.unmask b/profiles/prefix/darwin/macos/10.5/x86/package.unmask
new file mode 100644
index 000000000000..ac31d9aff5f1
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.5/x86/package.unmask
@@ -0,0 +1,7 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x86/package.unmask,v 1.1 2012/09/29 11:15:45 grobian Exp $
+
+# Fabian Groffen <grobian@gentoo.org> (29 Sep 2012)
+# This is the only way to get Java6 here
+dev-java/soylatte-jdk-bin
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index ff14366106f8..63ca53435a9e 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,12 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 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.6 2010/04/06 19:17:26 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/package.mask,v 1.7 2012/09/29 11:15:45 grobian Exp $
+
+# Fabian Groffen <grobian@gentoo.org> (29 Sep 2012)
+# Use Apple's provided Java6 instead!
+dev-java/soylatte-jdk-bin
 
 # Fabian Groffen <grobian@gentoo.org> (15 Feb 2007)
 # Doesn't compile, previous release (1.0.6) does.
 # error: stropts.h: No such file or directory
 =app-misc/ttyrec-1.0.8
-
-# Elias Pipping <pipping@gentoo.org> (19 Dec 2007)
-# experimenting here -- with bsd java6 on macosx
-dev-java/soylatte-jdk-bin