summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-11-01 15:51:08 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-11-01 15:51:08 +0000
commit7709d86498c224fb08b884bb1158c7473dfab0c8 (patch)
tree8128ac1512dc709047e880f4cb7e12c3f1470a4c /profiles/base
parenthttp://my.opera.com/desktopteam/blog/2012/11/01/opera-12-10-rc1 (diff)
downloadgentoo-2-7709d86498c224fb08b884bb1158c7473dfab0c8.tar.gz
gentoo-2-7709d86498c224fb08b884bb1158c7473dfab0c8.tar.bz2
gentoo-2-7709d86498c224fb08b884bb1158c7473dfab0c8.zip
mask useflags requiring dev-ml/ocamlduce so that we can mask it and unmask ocaml-4
Diffstat (limited to 'profiles/base')
-rw-r--r--profiles/base/ChangeLog6
-rw-r--r--profiles/base/package.use.mask9
2 files changed, 13 insertions, 2 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index d53aeab5a1c2..1a4eebc73b6b 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for Gentoo base-profile
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.454 2012/11/01 11:44:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.455 2012/11/01 15:51:08 aballier Exp $
+
+ 01 Nov 2012; Alexis Ballier <aballier@gentoo.org> package.use.mask:
+ mask useflags requiring dev-ml/ocamlduce so that we can mask it and unmask
+ ocaml-4
01 Nov 2012; <swift@gentoo.org> package.mask:
Adding mask for selinux-dbadmin package
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index b7ee089030e1..a2517067088b 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,10 +1,17 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.403 2012/10/30 18:49:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.404 2012/11/01 15:51:08 aballier Exp $
# This file requires >=portage-2.1.1
# New entries go on top.
+# Alexis Ballier <aballier@gentoo.org> (1 Nov 2012)
+# dev-ml/ocamlduce requires ocaml-3 and there has been no upstream release to
+# support ocaml-4. Mask useflags requiring it so that we can mask ocamlduce and
+# unmask ocaml-4.
+dev-ml/tyxml ocamlduce
+www-servers/ocsigen ocamlduce
+
# Samuli Suominen <ssuominen@gentoo.org> (22 Oct 2012)
# This is temporary mask for >=sys-fs/udev-171 because we don't want
# anyone to use USE=extras. It has the separate USE flags like