diff options
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/base/package.use.mask | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 0a70cdeb8bea..5c41246274c8 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.8963 2014/05/14 22:49:57 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8964 2014/05/15 06:15:35 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! + 15 May 2014; Alexis Ballier <aballier@gentoo.org> base/package.use.mask: + unmask ffmpeg:0.10 flags that have their multilib deps satisfied now + 14 May 2014; Michał Górny <mgorny@gentoo.org> package.mask: Mask the mit-krb5 multilib conversion block. diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 31e2f0a22dd3..f1b2ba1ac684 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.569 2014/05/14 14:31:33 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.570 2014/05/15 06:15:36 aballier Exp $ # This file requires >=portage-2.1.1 # New entries go on top. @@ -193,7 +193,7 @@ app-editors/gvim luajit racket # Alexis Ballier <aballier@gentoo.org> (11 Aug 2013) # Multilib migrated version for binary compatibility. # Those useflags have deps that are not migrated yet. -=media-video/ffmpeg-0.10* libass frei0r gnutls rtmp sdl openssl +=media-video/ffmpeg-0.10* frei0r gnutls rtmp openssl # Kacper Kowalik <xarthisius@gentoo.org> (09 Aug 2013) # Doesn't work on most profiles. Easier to mask here and |