summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/package.mask3
2 files changed, 6 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 92a2c4f717f4..098ebffa9de6 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6778 2012/07/13 18:09:57 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6779 2012/07/13 22:20:46 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!
+ 13 Jul 2012; Alexis Ballier <aballier@gentoo.org> package.mask:
+ unmask newer findlib as latest version works with ~arch ocaml and does not
+ require ocaml-4
+
13 Jul 2012; Ralph Sennhauser <sera@gentoo.org> package.mask:
Mask app-misc/jbidwatcher for removal in 30 days. #235124, #298701, #421917.
diff --git a/profiles/package.mask b/profiles/package.mask
index 48f067ce1f32..0aa2ffcbff38 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13961 2012/07/13 18:09:57 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13962 2012/07/13 22:20:46 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
@@ -318,7 +318,6 @@ app-shells/pdksh
# 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
# Michael Weber <xmw@gentoo.org> (9 Jun 2012)
# The mentioned versions fail to assemble raid 0/1/5 devices.