Masking media-video/ffprobe for QA removal.

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 0c7b926ca69ed60f89da876c8db0a57bc1985e83..961aee9f6c9df2d076ae4563b798da17aff8c2df 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for profile directory
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4294 2010/06/18 13:10:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4295 2010/06/18 14:23:48 flameeyes 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!
 
+  18 Jun 2010; Diego E. Pettenò <flameeyes@gentoo.org> package.mask:
+  Masking media-video/ffprobe for QA removal.
+
   18 Jun 2010; Markos Chandras <hwoarang@gentoo.org> package.mask:
   Remove entry for zen-sources rc ebuilds
 

diff --git a/profiles/package.mask b/profiles/package.mask
index 099bfe49309a51f4fc9a8b248448a92fbe59c65a..79068809fac42d4f9538e0eeb8ab81f1c48f9414 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11659 2010/06/18 13:10:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11660 2010/06/18 14:23:48 flameeyes 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
@@ -31,6 +31,17 @@
 
 #--- END OF EXAMPLES ---
 
+# Diego E. Pettenò <flameeyes@gentoo.org> (18 Jun 2010)
+#  on behalf of QA team
+#
+# Collides with FFmpeg, which is a dependency of it. Its
+# functionality should now be part of the main package
+# (officially since 0.6, but also in our previous
+# snapshots). See bug #314985.
+#
+# Removal on 2010-08-17
+media-video/ffprobe
+
 # Patrick Lauer <patrick@gentoo.org> (18 Jun 2010)
 # Only one provider left, so the virtuals serve
 # no purpose and will be removed soon