diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-14 06:48:41 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-14 06:48:41 +0000 |
| commit | ff808cbab772ddefa57ce24029fd34b07ee648d5 (patch) | |
| tree | 831b1e882487b6575c8a39b946b694444fed1c27 | |
| parent | Remove redundant check for sse3 handled by configure. (diff) | |
| download | historical-ff808cbab772ddefa57ce24029fd34b07ee648d5.tar.gz historical-ff808cbab772ddefa57ce24029fd34b07ee648d5.tar.bz2 historical-ff808cbab772ddefa57ce24029fd34b07ee648d5.zip | |
Merge celt useflag for libav too.
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/base/package.use.mask | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 303c3f556106..9ff22f1f0d1f 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for profile directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6546 2012/05/14 04:41:23 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6547 2012/05/14 06:48:41 scarabeus 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! + 14 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> base/package.use.mask: + Merge celt useflag for libav too. + 14 May 2012; Olivier Crête <tester@gentoo.org> package.mask: net-im/amsn is maintained upstream, not removing after all diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index f1d1032fd7e9..fb5c47b51960 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -1,6 +1,6 @@ # 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.349 2012/05/14 04:20:37 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.350 2012/05/14 06:48:41 scarabeus Exp $ # This file requires >=portage-2.1.1 # New entries go on top. @@ -463,6 +463,7 @@ media-video/vlc media-library # Leave it unmasked for live ebuild, people should know what they do if they use # it anyway <media-video/ffmpeg-9999 celt +<media-video/libav-9999 celt # Alexis Ballier <aballier@gentoo.org> <5 Oct 2011> # harfbuzz support does not build for now, leave the useflag be and unmask it later |