summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2011-06-23 12:57:58 +0000
committerAlexis Ballier <aballier@gentoo.org>2011-06-23 12:57:58 +0000
commit032a8205098825c4d677f584546558ef7dde676e (patch)
tree77192fb9bfbcda20a91fe577bed61e32a163a1a0 /profiles
parentversion bump (diff)
downloadgentoo-2-032a8205098825c4d677f584546558ef7dde676e.tar.gz
gentoo-2-032a8205098825c4d677f584546558ef7dde676e.tar.bz2
gentoo-2-032a8205098825c4d677f584546558ef7dde676e.zip
mask ffmpeg 0.8
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask6
2 files changed, 9 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 8c97979020e5..2bc6d2050f2f 100644
--- 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.5472 2011/06/22 09:37:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5473 2011/06/23 12:57:58 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!
+ 23 Jun 2011; Alexis Ballier <aballier@gentoo.org> package.mask:
+ mask ffmpeg 0.8
+
22 Jun 2011; Michał Górny <mgorny@gentoo.org> package.mask:
Unmask systemd.
diff --git a/profiles/package.mask b/profiles/package.mask
index 876025edfd5b..a2b47f423e15 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12859 2011/06/22 09:37:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12860 2011/06/23 12:57:58 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
@@ -31,6 +31,10 @@
#--- END OF EXAMPLES ---
+# 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
+
# Eray Aslan <eras@gentoo.org> (21 Jun 2011)
# Mask prerelease software
=app-crypt/heimdal-1.5_pre*