diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2013-06-26 05:57:03 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2013-06-26 05:57:03 +0000 |
| commit | a76c9ccf2966edf5871708601a5aef6c87d98a3f (patch) | |
| tree | 04c2233b0852e6f9e53946bab958ad677e154cde /profiles | |
| parent | Switch 9999 to master rather than stable branch (bug #474430). (diff) | |
| download | gentoo-2-a76c9ccf2966edf5871708601a5aef6c87d98a3f.tar.gz gentoo-2-a76c9ccf2966edf5871708601a5aef6c87d98a3f.tar.bz2 gentoo-2-a76c9ccf2966edf5871708601a5aef6c87d98a3f.zip | |
Reverting revert of lame and libvpx unmasking
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/package.mask | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index b44e528de909..1b319a1cc53f 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,12 +1,15 @@ # ChangeLog for profile directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7975 2013/06/26 03:08:32 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7976 2013/06/26 05:57:02 patrick 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! 26 Jun 2013; Patrick Lauer <patrick@gentoo.org> package.mask: + Reverting revert of lame and libvpx unmasking + + 26 Jun 2013; Patrick Lauer <patrick@gentoo.org> package.mask: Masking multilib versions of lame and libvpx that conflict with app-emulation/emul-linux-x86-medialibs diff --git a/profiles/package.mask b/profiles/package.mask index 3307aa9daaf2..280f8eca3c43 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,6 +1,6 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14857 2013/06/26 03:08:32 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14858 2013/06/26 05:57:03 patrick 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 @@ -32,12 +32,6 @@ #--- END OF EXAMPLES --- -# Patrick Lauer <patrick@gentoo.org> (26 Jun 2013) -# Conflicts with app-emulation/emul-linux-x86-medialibs -# and many other packages -=media-libs/libvpx-1.2.0_pre20130625 -=media-sound/lame-3.99.5-r1 - # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (25 Jun 2013) # Mask new ptlib/opal for breakage, tracked in bug #474742 =net-libs/ptlib-2.12.4 |