summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2011-07-06 16:36:07 +0000
committerAlexis Ballier <aballier@gentoo.org>2011-07-06 16:36:07 +0000
commite4a36ef3c44a75614dfc792a515fa84dd331760d (patch)
tree0fead5136830d02f8019699bcc21943823cdec7a /profiles
parentPunt cgal-python as planned (diff)
downloadgentoo-2-e4a36ef3c44a75614dfc792a515fa84dd331760d.tar.gz
gentoo-2-e4a36ef3c44a75614dfc792a515fa84dd331760d.tar.bz2
gentoo-2-e4a36ef3c44a75614dfc792a515fa84dd331760d.zip
unmask ocaml-3.12.1
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask7
2 files changed, 5 insertions, 7 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index f94a4757f31e..b8cfd0ebf1bc 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5513 2011/07/06 10:27:33 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5514 2011/07/06 16:36:07 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!
+ 06 Jul 2011; Alexis Ballier <aballier@gentoo.org> package.mask:
+ unmask ocaml-3.12.1
+
06 Jul 2011; Andreas Proschofsky <suka@gentoo.org> package.mask:
Mask LibreOffice 3.4.1 for some additional testing
diff --git a/profiles/package.mask b/profiles/package.mask
index abc4280eb125..fa65942fc714 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12891 2011/07/06 10:27:33 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12892 2011/07/06 16:36:07 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
@@ -107,11 +107,6 @@ app-editors/scribes
# Mask until it is bumped
sci-chemistry/webmo
-# Alexis Ballier <aballier@gentoo.org> (26 Jun 2011)
-# Mask release candidate of ocaml
->=dev-lang/ocaml-3.12.1_rc
->=dev-ml/ocamlduce-3.12.0.0-r10
-
# Hans de Graaff <graaff@gentoo.org> (25 Jun 2011)
# Mask for testing, still incomplete and too central to
# all things ruby to just throw out there.