summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2014-11-28 16:46:46 +0000
committerAlexis Ballier <aballier@gentoo.org>2014-11-28 16:46:46 +0000
commit8067d37759c5f451ee739e16a143266bb2c18bc0 (patch)
treeb4fc40de2a38e556fd0acd255d695d9132bd15e8 /profiles
parentdepend on a findlib that it does not collide with (diff)
downloadhistorical-8067d37759c5f451ee739e16a143266bb2c18bc0.tar.gz
historical-8067d37759c5f451ee739e16a143266bb2c18bc0.tar.bz2
historical-8067d37759c5f451ee739e16a143266bb2c18bc0.zip
mask dev-ml/camlp4 with ocaml 4.02
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 49cecc6d8483..0644af530fef 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,12 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9571 2014/11/28 16:38:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9572 2014/11/28 16:46: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!
28 Nov 2014; Alexis Ballier <aballier@gentoo.org> package.mask:
+ mask dev-ml/camlp4 with ocaml 4.02
+
+ 28 Nov 2014; Alexis Ballier <aballier@gentoo.org> package.mask:
mask findlib requiring ocaml 4.02
28 Nov 2014; Alexis Ballier <aballier@gentoo.org> package.mask:
diff --git a/profiles/package.mask b/profiles/package.mask
index 0da5e9851634..8f1a2b4a431f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16186 2014/11/28 16:38:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16187 2014/11/28 16:46: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
@@ -35,6 +35,7 @@
>=dev-lang/ocaml-4.02.1
dev-ml/labltk
>=dev-ml/findlib-1.5.5-r1
+dev-ml/camlp4
# Aaron W. Swenson <titanofold@gentoo.org> (26 Nov 2014)
# Masked for removal in 30 days. dev-perl/pgperl hasn't been updated