diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2014-09-18 06:28:57 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2014-09-18 06:28:57 +0000 |
| commit | 535aff83887f9ec22949c0b04cfd81e1c15d5514 (patch) | |
| tree | 01399abbeee4e63febde34c410403b5cccac16cb /profiles | |
| parent | Version bump. (diff) | |
| download | gentoo-2-535aff83887f9ec22949c0b04cfd81e1c15d5514.tar.gz gentoo-2-535aff83887f9ec22949c0b04cfd81e1c15d5514.tar.bz2 gentoo-2-535aff83887f9ec22949c0b04cfd81e1c15d5514.zip | |
Temporarily mask >=dev-libs/lib{ixion,orcus}-0.7, pending libreoffice update.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/package.mask | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index ad272b1e0e7d..9a134ce6ff67 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for profile directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9387 2014/09/17 23:10:34 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9388 2014/09/18 06:28:57 ulm 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! + 18 Sep 2014; Ulrich Müller <ulm@gentoo.org> package.mask: + Temporarily mask >=dev-libs/lib{ixion,orcus}-0.7, pending libreoffice update. + 17 Sep 2014; Bernard Cafarelli <voyageur@gentoo.org> package.mask: Unmask llvm/clang 3.5 diff --git a/profiles/package.mask b/profiles/package.mask index 46bb0db309ae..2663f2b26844 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16043 2014/09/17 23:10:34 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16044 2014/09/18 06:28:57 ulm 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 @@ -30,6 +30,12 @@ #--- END OF EXAMPLES --- +# Ulrich Müller <ulm@gentoo.org> (18 Sep 2014) +# QA: Avoid slot conflicts blocking world update, bug 523064. +# Pending unmasking of app-office/libreoffice-4.3* +>=dev-libs/libixion-0.7 +>=dev-libs/liborcus-0.7 + # Michael Orlitzky <mjo@gentoo.org> (16 Sep 2014) # Superseded by app-text/dos2unix, use that instead. # Masked for removal in 30 days (bug #522804). |