summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
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 42a484269741..f0e51eba67d8 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,12 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5760 2011/10/06 20:00:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5761 2011/10/06 20:08:57 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 Oct 2011; Alexis Ballier <aballier@gentoo.org> package.mask:
+ Mask new bin-prot
+
+ 06 Oct 2011; Alexis Ballier <aballier@gentoo.org> package.mask:
mask new type-conv
06 Oct 2011; Jeremy Olexa <darkside@gentoo.org> use.desc:
diff --git a/profiles/package.mask b/profiles/package.mask
index e385a88fb90c..3946fbd19dba 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13110 2011/10/06 20:00:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13111 2011/10/06 20:08:57 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
@@ -431,6 +431,7 @@ net-zope/zwiki
# New releases from Jane Street, breaks their rev. deps for now
>=dev-ml/sexplib-7
>=dev-ml/type-conv-3
+>=dev-ml/bin-prot-2
# Ole Markus With <olemarkus@gentoo.org> (07 Sep 2011)
# Masked for removal 7 Oct 2011.