summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2012-09-29 11:25:04 +0000
committerFabian Groffen <grobian@gentoo.org>2012-09-29 11:25:04 +0000
commite345d923e16375b51fa5d9ad378edfb0291c8aa1 (patch)
tree0540fde393979fe2b1d346a683c9fa07b93e6735 /profiles/prefix
parentUnmask soylatte-jdk-bin on 10.4/x86, 10.5/x86 and 10.5/x64, because it is the... (diff)
downloadgentoo-2-e345d923e16375b51fa5d9ad378edfb0291c8aa1.tar.gz
gentoo-2-e345d923e16375b51fa5d9ad378edfb0291c8aa1.tar.bz2
gentoo-2-e345d923e16375b51fa5d9ad378edfb0291c8aa1.zip
Mask >=dev-java/apple-jdk-bin-1.6.0 on Leopard x64, since it will never find the necessary files
Diffstat (limited to 'profiles/prefix')
-rw-r--r--profiles/prefix/ChangeLog7
-rw-r--r--profiles/prefix/darwin/macos/10.5/x64/package.mask8
2 files changed, 12 insertions, 3 deletions
diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog
index 887140f134ea..142240774b94 100644
--- a/profiles/prefix/ChangeLog
+++ b/profiles/prefix/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for profiles/prefix
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.361 2012/09/29 11:15:44 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.362 2012/09/29 11:25:03 grobian Exp $
+
+ 29 Sep 2012; Fabian Groffen <grobian@gentoo.org>
+ darwin/macos/10.5/x64/package.mask:
+ Mask >=dev-java/apple-jdk-bin-1.6.0 on Leopard x64, since it will never find
+ the necessary files
29 Sep 2012; Fabian Groffen <grobian@gentoo.org>
+darwin/macos/10.4/x86/package.unmask, +darwin/macos/10.5/x64/package.unmask,
diff --git a/profiles/prefix/darwin/macos/10.5/x64/package.mask b/profiles/prefix/darwin/macos/10.5/x64/package.mask
index 5f02bc8e6f19..48e6c4c0c0f1 100644
--- a/profiles/prefix/darwin/macos/10.5/x64/package.mask
+++ b/profiles/prefix/darwin/macos/10.5/x64/package.mask
@@ -1,3 +1,7 @@
-# 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/10.5/x64/package.mask,v 1.4 2010/04/18 15:48:55 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x64/package.mask,v 1.5 2012/09/29 11:25:04 grobian Exp $
+
+# Fabian Groffen <grobian@gentoo.org> (29 Sep 2012)
+# Apple does not provide 1.6 and up on Leopard
+>=dev-java/apple-jdk-bin-1.6.0