diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-01-13 19:45:10 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-01-13 19:45:10 +0000 |
| commit | 694d2ae4addaf1a708f3e2cc37e233f602fa9a16 (patch) | |
| tree | b9dbf31c963db9d8863bf9778f8498b2e7107d1a /profiles/base | |
| parent | Fix dependency on xz-utils, reported by onox. (diff) | |
| download | historical-694d2ae4addaf1a708f3e2cc37e233f602fa9a16.tar.gz historical-694d2ae4addaf1a708f3e2cc37e233f602fa9a16.tar.bz2 historical-694d2ae4addaf1a708f3e2cc37e233f602fa9a16.zip | |
also mask dev-ml/eliom[ocamlduce], bug #446876 by Michael Palimaka (kensington)
Diffstat (limited to 'profiles/base')
| -rw-r--r-- | profiles/base/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/base/package.use.mask | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog index 65a1a3290035..9c2644a4c5ad 100644 --- a/profiles/base/ChangeLog +++ b/profiles/base/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for Gentoo base-profile # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.491 2013/01/02 20:11:11 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.492 2013/01/13 19:45:10 aballier Exp $ + + 13 Jan 2013; Alexis Ballier <aballier@gentoo.org> package.use.mask: + also mask dev-ml/eliom[ocamlduce], bug #446876 by Michael Palimaka + (kensington) 02 Jan 2013; Michał Górny <mgorny@gentoo.org> package.use.force: Force pypy2.0 on python-exec. diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index e1e9ee917d5b..72153414802a 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 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.429 2012/12/30 22:40:02 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.430 2013/01/13 19:45:10 aballier Exp $ # This file requires >=portage-2.1.1 # New entries go on top. @@ -60,6 +60,7 @@ net-libs/gnutls dane # unmask ocaml-4. dev-ml/tyxml ocamlduce www-servers/ocsigen ocamlduce +dev-ml/eliom ocamlduce # Samuli Suominen <ssuominen@gentoo.org> (22 Oct 2012) # This is temporary mask for >=sys-fs/udev-171 because we don't want |