summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2010-08-03 11:50:59 +0000
committerAlexis Ballier <aballier@gentoo.org>2010-08-03 11:50:59 +0000
commitaf9631f3d2f04a09c00ff410047cdb05b8e004b8 (patch)
tree8c0d67cbdc27082e3a252d488f5d0a9504ba4f93
parentadjust ocaml 3.12 mask reason (diff)
downloadgentoo-2-af9631f3d2f04a09c00ff410047cdb05b8e004b8.tar.gz
gentoo-2-af9631f3d2f04a09c00ff410047cdb05b8e004b8.tar.bz2
gentoo-2-af9631f3d2f04a09c00ff410047cdb05b8e004b8.zip
mask new type-conv as it depends on pmasked ocaml
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask4
2 files changed, 7 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index f1133bb447c8..afe725828c74 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4438 2010/08/03 01:03:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4439 2010/08/03 11:50:59 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!
+ 03 Aug 2010; Alexis Ballier <aballier@gentoo.org> package.mask:
+ mask new type-conv as it depends on pmasked ocaml
+
03 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org> package.mask:
Mask breaking-backports.
diff --git a/profiles/package.mask b/profiles/package.mask
index 2698d160398c..9b3944860e7f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11813 2010/08/03 11:49:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11814 2010/08/03 11:50:59 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
@@ -678,7 +678,9 @@ virtual/postgresql-server
# Alexis Ballier <aballier@gentoo.org> (17 Jun 2010)
# New major release, some packages fail to build
# Mask until they are fixed
+# Also mask packages _requiring_ ocaml 3.12
>=dev-lang/ocaml-3.12.0_beta
+>=dev-ml/type-conv-2.0.0
# Justin Lecher <jlec@gentoo.org> (16 Jun 10)
# Just working with the masked experimental version of refmac