summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2011-02-22 15:03:26 +0000
committerAlexis Ballier <aballier@gentoo.org>2011-02-22 15:03:26 +0000
commit7759f4877ad55041b670f90454cd310d15e0359e (patch)
tree9b7c19b1dba0c76d01257bd3654043abccc6c173 /profiles
parentDrop HPPA because of missing dep on media-sound/lilypond (bug #356069). (diff)
downloadgentoo-2-7759f4877ad55041b670f90454cd310d15e0359e.tar.gz
gentoo-2-7759f4877ad55041b670f90454cd310d15e0359e.tar.bz2
gentoo-2-7759f4877ad55041b670f90454cd310d15e0359e.zip
mask new dev-ml/bin-prot as it requires masked type-conv
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask3
2 files changed, 6 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 073acc5cbe18..3491f842d456 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.5071 2011/02/22 07:53:43 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5072 2011/02/22 15:03:26 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!
+ 22 Feb 2011; Alexis Ballier <aballier@gentoo.org> package.mask:
+ mask new dev-ml/bin-prot as it requires masked type-conv
+
22 Feb 2011; Sebastian Pipping <sping@gentoo.org>
arch/alpha/package.use.mask, arch/arm/package.use.mask,
arch/hppa/package.use.mask, arch/ia64/package.use.mask,
diff --git a/profiles/package.mask b/profiles/package.mask
index 57af305fd3c3..fae43b37aba8 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12484 2011/02/22 08:47:17 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12485 2011/02/22 15:03:26 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
@@ -763,6 +763,7 @@ dev-libs/seed
# Also mask packages _requiring_ ocaml 3.12
>=dev-lang/ocaml-3.12.0_beta
>=dev-ml/type-conv-2.0.0
+>=dev-ml/bin-prot-1.3.0
>=dev-ml/ocamlduce-3.12.0
# Justin Lecher <jlec@gentoo.org> (16 Jun 10)