summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2011-04-28 13:52:14 +0000
committerAlexis Ballier <aballier@gentoo.org>2011-04-28 13:52:14 +0000
commit38b65c6db01f9527e6f28544d9fc9a0b323bc6ae (patch)
tree4128aebe0af6c82d75f466ff95b50123822c08b4 /profiles
parentFix for gcc46, Some cleanup QA of the ebuilds (diff)
downloadgentoo-2-38b65c6db01f9527e6f28544d9fc9a0b323bc6ae.tar.gz
gentoo-2-38b65c6db01f9527e6f28544d9fc9a0b323bc6ae.tar.bz2
gentoo-2-38b65c6db01f9527e6f28544d9fc9a0b323bc6ae.zip
mask celt useflag for non live ffmpeg ebuilds as libcelt is masked
Diffstat (limited to 'profiles')
-rw-r--r--profiles/base/ChangeLog5
-rw-r--r--profiles/base/package.use.mask8
2 files changed, 11 insertions, 2 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 0f8f8cb76669..736f110e6609 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for Gentoo base-profile
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.261 2011/04/24 21:23:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.262 2011/04/28 13:52:14 aballier Exp $
+
+ 28 Apr 2011; Alexis Ballier <aballier@gentoo.org> package.use.mask:
+ mask celt useflag for non live ffmpeg ebuilds as libcelt is masked
24 Apr 2011; Ulrich Mueller <ulm@gentoo.org> packages, virtuals:
Remove old-style virtual/modutils, bug 358891.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 07a486225d60..c04acd5f267d 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.230 2011/04/24 17:19:25 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.231 2011/04/28 13:52:14 aballier Exp $
# This file requires >=portage-2.1.1
# New entries go on top.
@@ -285,3 +285,9 @@ media-video/mplayer cpudetection custom-cpuopts bindist vdpau
media-video/vlc direct2d directx dshow dxva2 waveout wingdi
# Mac OSX / iPhone OS specific useflags
media-video/vlc audioqueue ios-vout macosx macosx-audio macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtcapture macosx-vout
+
+# Alexis Ballier <aballier@gentoo.org> <28 Apr 2011>
+# Requires masked libcelt
+# Leave it unmasked for live ebuild, people should know what they do if they use
+# it anyway
+<media-video/ffmpeg-9999 celt