summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-10-15 13:41:23 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-10-15 13:41:23 +0000
commit088d16966d099f69fd6940102b1bde08eff05f99 (patch)
treec2d6dcc76b8287629976a253a73c67eb3edc6340 /profiles
parentFix 1.5 env file to state Diablo and not Sun JRE (diff)
downloadgentoo-2-088d16966d099f69fd6940102b1bde08eff05f99.tar.gz
gentoo-2-088d16966d099f69fd6940102b1bde08eff05f99.tar.bz2
gentoo-2-088d16966d099f69fd6940102b1bde08eff05f99.zip
move java6 mask to 6.2 x86 profile
Diffstat (limited to 'profiles')
-rw-r--r--profiles/default-bsd/ChangeLog6
-rw-r--r--profiles/default-bsd/fbsd/6.2/x86/use.mask7
-rw-r--r--profiles/default-bsd/use.mask6
3 files changed, 12 insertions, 7 deletions
diff --git a/profiles/default-bsd/ChangeLog b/profiles/default-bsd/ChangeLog
index 6f6ef7ffde04..a969e100f86d 100644
--- a/profiles/default-bsd/ChangeLog
+++ b/profiles/default-bsd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for profile directory
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/ChangeLog,v 1.39 2008/10/15 13:30:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/ChangeLog,v 1.40 2008/10/15 13:41:23 aballier Exp $
+
+ 15 Oct 2008; Alexis Ballier <aballier@gentoo.org> fbsd/6.2/x86/use.mask,
+ use.mask:
+ move java6 mask to 6.2 x86 profile
15 Oct 2008; Alexis Ballier <aballier@gentoo.org> fbsd/6.2/package.mask:
Mask Diablo JDK/JRE 1.6 on 6.2 profiles as we have FreeBSD 7 ebuilds only
diff --git a/profiles/default-bsd/fbsd/6.2/x86/use.mask b/profiles/default-bsd/fbsd/6.2/x86/use.mask
index 1b22e1371e56..8ad246361dab 100644
--- a/profiles/default-bsd/fbsd/6.2/x86/use.mask
+++ b/profiles/default-bsd/fbsd/6.2/x86/use.mask
@@ -1,6 +1,6 @@
# Copyright 2004-2005 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/6.2/x86/use.mask,v 1.4 2006/10/08 10:56:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/6.2/x86/use.mask,v 1.5 2008/10/15 13:41:23 aballier Exp $
-3dnow
-3dnowext
@@ -21,3 +21,8 @@
# Diablo Latte and Caffe (JRE and JDK) works here
-java
+
+# Petteri Räty <betelgeuse@gentoo.org>
+# No java6 for fbsd 6.2
+java6
+
diff --git a/profiles/default-bsd/use.mask b/profiles/default-bsd/use.mask
index 600b2a5a82eb..6fe6c77bdfde 100644
--- a/profiles/default-bsd/use.mask
+++ b/profiles/default-bsd/use.mask
@@ -1,10 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/use.mask,v 1.36 2008/07/04 19:55:23 betelgeuse Exp $
-
-# Petteri Räty <betelgeuse@gentoo.org>
-# No java6 for bsd
-java6
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/use.mask,v 1.37 2008/10/15 13:41:23 aballier Exp $
# Mart Raudsepp <leio@gentoo.org>
# net-misc/networkmanager not keyworded