summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2010-06-18 14:23:48 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2010-06-18 14:23:48 +0000
commit77e8a74bbff6c270f8a9b7436a63113e67463de7 (patch)
treea7f04f87dfbc20474764d3b57f04381ee9d519b4 /profiles
parentcosmetics patch by Nikoli <nikoli@lavabit.com>, bug #324453 (diff)
downloadhistorical-77e8a74bbff6c270f8a9b7436a63113e67463de7.tar.gz
historical-77e8a74bbff6c270f8a9b7436a63113e67463de7.tar.bz2
historical-77e8a74bbff6c270f8a9b7436a63113e67463de7.zip
Masking media-video/ffprobe for QA removal.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask13
2 files changed, 16 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 0c7b926ca69e..961aee9f6c9d 100644
--- 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 099bfe49309a..79068809fac4 100644
--- 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