summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-08-11 18:24:46 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-08-11 18:24:46 +0000
commitb332b7a67e8c440c0a46e79546923fda8142395c (patch)
treeefc910a496aa5a12c29e7d771b38ce01687f7103 /profiles
parentunmask latest celt, it should be ok now (diff)
downloadgentoo-2-b332b7a67e8c440c0a46e79546923fda8142395c.tar.gz
gentoo-2-b332b7a67e8c440c0a46e79546923fda8142395c.tar.bz2
gentoo-2-b332b7a67e8c440c0a46e79546923fda8142395c.zip
unmask celt for masked ffmpeg releases
Diffstat (limited to 'profiles')
-rw-r--r--profiles/base/ChangeLog5
-rw-r--r--profiles/base/package.use.mask8
2 files changed, 7 insertions, 6 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index dd5943874fe6..acf2ec63751b 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for Gentoo base-profile
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.580 2013/08/10 09:15:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.581 2013/08/11 18:24:46 aballier Exp $
+
+ 11 Aug 2013; Alexis Ballier <aballier@gentoo.org> package.use.mask:
+ unmask celt for masked ffmpeg releases
10 Aug 2013; Michał Górny <mgorny@gentoo.org> make.defaults:
Move COLLISION_IGNORE and UNINSTALL_IGNORE from make.globals.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 5d7dcc663d73..b25bfb6fba0a 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.497 2013/08/09 09:02:17 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.498 2013/08/11 18:24:46 aballier Exp $
# This file requires >=portage-2.1.1
# New entries go on top.
@@ -506,7 +506,5 @@ media-video/vlc audioqueue ios-vout macosx macosx-audio macosx-dialog-provider m
media-video/vlc media-library
# 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
+# Requires ~arch libcelt and keywording
+<media-video/ffmpeg-2.0 celt