unmask ffmpeg 0.8, bug #389037

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 2e79ad6469ff305b8528ecbb1e93ce806ed0239f..523e249651a5c53a6007d5a8e52d79620277032c 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5961 2011/11/26 16:24:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5962 2011/11/28 12:39:55 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!
 
+  28 Nov 2011; Alexis Ballier <aballier@gentoo.org> package.mask:
+  unmask ffmpeg 0.8, bug #389037
+
   26 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> package.mask:
   Remove obsolete networkmanagement / knetworkmanager mask, bug 391955
 

diff --git a/profiles/package.mask b/profiles/package.mask
index a58d464847a2cb0234ce465eeb5cc4a171c4dd13..d7f1d8131edc70e66ec15b7aae22109b9f39eaaa 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13286 2011/11/26 16:24:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13287 2011/11/28 12:39:55 aballier 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
@@ -678,10 +678,6 @@ dev-tex/pdftex
 # Mask until it is bumped
 sci-chemistry/webmo
 
-# Alexis Ballier <aballier@gentoo.org> (23 Jun 2011)
-# Breaks API/ABI and has the same features as 0.7.1
->=media-video/ffmpeg-0.8
-
 # Andreas K. Huettel <dilfridge@gentoo.org> (18 Jun 2011)
 # Mask cups-1.5, too new and still needs a lot of testing
 >=net-print/cups-1.4.9999