summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2009-11-25 01:13:47 +0000
committerBen de Groot <yngwin@gentoo.org>2009-11-25 01:13:47 +0000
commit15325c4f85b9f864a34d433575e471de7d33612d (patch)
tree08cdf27e47f3bcc44b90731f73a4354849ac548a /profiles
parentAutomated update of use.local.desc (diff)
downloadgentoo-2-15325c4f85b9f864a34d433575e471de7d33612d.tar.gz
gentoo-2-15325c4f85b9f864a34d433575e471de7d33612d.tar.bz2
gentoo-2-15325c4f85b9f864a34d433575e471de7d33612d.zip
Temporary mask of latest mplayer and ffmpeg bumps wrt bug 294469
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask8
2 files changed, 11 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index c6c693e65a91..a0102b73435c 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3602 2009/11/24 17:28:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3603 2009/11/25 01:13:47 yngwin 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!
+ 25 Nov 2009; Ben de Groot <yngwin@gentoo.org> package.mask:
+ Temporary mask of latest mplayer and ffmpeg bumps wrt bug 294469
+
24 Nov 2009; Diego E. Pettenò <flameeyes@gentoo.org> package.mask:
Masking app-forensics/airt for QA removal.
diff --git a/profiles/package.mask b/profiles/package.mask
index f6e0ed95be41..20962db345fb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.10876 2009/11/24 17:28:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.10877 2009/11/25 01:13:47 yngwin 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,12 @@
#--- END OF EXAMPLES ---
+# Ben de Groot <yngwin@gentoo.org> (25 Nov 20009)
+# Temporarily mask premature version bumps until x264 is bumped as well
+# bug 294469
+=media-video/ffmpeg-0.5_p20601
+=media-video/mplayer-1.0_rc4_p20091124
+
# Diego E. Pettenò <flameeyes@gentoo.org> (24 Nov 2009)
# on behalf of QA team
#