summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask15
2 files changed, 18 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 6ed755c875c8..f6af33128081 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.5250 2011/04/03 01:30:32 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5251 2011/04/03 10:07:09 ssuominen 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!
+ 03 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> package.mask:
+ Mask media-video/libav and media-video/mplayer2.
+
03 Apr 2011; Ryan Hill <dirtyepic@gentoo.org> package.mask:
Mask >=sys-devel/gcc-4.6.0 for testing.
diff --git a/profiles/package.mask b/profiles/package.mask
index f32568b63dda..90dba636ec05 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12649 2011/04/03 01:30:32 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12650 2011/04/03 10:07:09 ssuominen 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,19 @@
#--- END OF EXAMPLES ---
+# Samuli Suominen <ssuominen@gentoo.org> (03 Apr 2011)
+# Masked for QA
+# Unresolvable dependencies and unnecessary blockers
+# caused by ill researched migration to ~arch. Masked until
+# everything is fixed.
+# Bugs 358919, 360889, 360921, 361123, 361269, 361613, 361665,
+# 361731.
+# This shouldn't have any results before unmasking:
+# http://tinderbox.dev.gentoo.org/misc/rindex/media-video/ffmpeg
+# For mplayer vs. mplayer2, 312295 and 361115.
+media-video/libav
+media-video/mplayer2
+
# Ryan Hill <dirtyepic@gentoo.org> (02 Apr 2011)
# Masked for testing
>=sys-devel/gcc-4.6.0