summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-06-10 20:10:19 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-06-10 20:10:19 +0000
commit044455aede49dae93f5bf33f2ba4513b9aea8e0f (patch)
tree8a1a2e1ff3847ebdeef4531e8cc7adf97b987d52 /profiles
parentx11-themes/light-themes: No longer install gtk-3.0 files for USE=-gtk3 (bug #... (diff)
downloadgentoo-2-044455aede49dae93f5bf33f2ba4513b9aea8e0f.tar.gz
gentoo-2-044455aede49dae93f5bf33f2ba4513b9aea8e0f.tar.bz2
gentoo-2-044455aede49dae93f5bf33f2ba4513b9aea8e0f.zip
mask new ocaml version
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask7
2 files changed, 10 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 5c97674d80e6..7b5400cb1d25 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6654 2012/06/10 16:01:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6655 2012/06/10 20:10:19 aballier Exp $
#
# This ChangeLog should include records for all changes in profiles directory.
# Only typo fixes which don't affect portage/repoman behaviour could be avoided
# here. If in doubt put a record here!
+ 10 Jun 2012; Alexis Ballier <aballier@gentoo.org> package.mask:
+ mask new ocaml version
+
10 Jun 2012; Jeroen Roovers <jer@gentoo.org> package.mask:
Mask dev-libs/libnl-3.2.10 (bug #420261).
diff --git a/profiles/package.mask b/profiles/package.mask
index 32bcc70668df..0e95063c5c0d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13842 2012/06/10 16:01:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13843 2012/06/10 20:10:19 aballier 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
@@ -31,6 +31,11 @@
#--- END OF EXAMPLES ---
+# Alexis Ballier <aballier@gentoo.org> (10 Jun 2012)
+# Beta release, mask until rev. deps are fixed
+>=dev-lang/ocaml-4.00.0_alpha
+>=dev-ml/findlib-1.3.2
+
# Jeroen Roovers <jer@gentoo.org> (10 Jun 2012)
# Breaks net-misc/networkmanager (bug #420261)
=dev-libs/libnl-3.2.10