Unmasking media-video/ffmpeg-0.4.9_p20080326 and packages depending on that version. Masing ~arch packages that are incompatible. See bug #214740.

2 files changed, 36 insertions, 13 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 41c7a5be2ab8..2d042abe12d4 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,16 @@
 # ChangeLog for profile directory
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.1571 2008/06/20 09:32:58 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.1572 2008/06/20 12:37:36 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 doubt put a record here!
 
+  20 Jun 2008; Ben de Groot <yngwin@gentoo.org> package.mask:
+  Unmasking media-video/ffmpeg-0.4.9_p20080326 and packages depending on
+  that version. Masing ~arch packages that are incompatible. See bug
+  #214740.
+
   20 Jun 2008; Samuli Suominen <drac@gentoo.org> package.mask:
   Update spandsp mask from = to >= so new version can be introduced.
 
diff --git a/profiles/package.mask b/profiles/package.mask
index 5cd9ecad5ded..97de18217168 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.8743 2008/06/20 09:32:58 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.8744 2008/06/20 12:37:36 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
@@ -29,6 +29,29 @@
 
 #--- END OF EXAMPLES ---
 
+# Ben de Groot <yngwin@gentoo.org> (20 Jun 2008)
+# == The great ffmpeg new headers mask (bug #214740) ==
+# Maintainers have been given ample advance warning of the change in headers
+# location of media-video/ffmpeg-0.4.9_p20080326, see bug 214740 and dependant
+# bugs. The following packages are masked now because they are incompatible,
+# and have not yet been fixed. (~arch versions only, because stable versions
+# will build against current stable ffmpeg)
+# games herd, bug 218089:
+games-arcade/stepmania
+# media-tv herd, bug 218094:
+media-plugins/vdr-graphtft
+# sound herd, bug 218099:
+media-sound/gnusound
+media-sound/potamus
+# video herd, bug 218101, see also security bug 227053:
+media-video/motion
+# voip herd, bug 218102:
+media-libs/mediastreamer
+# no herd, bug 218105:
+>=media-video/mpeg4ip-1.5.0.1-r3
+net-www/gnash
+
+
 # Jeremy Olexa <darkside@gentoo.org> (20 Jun 2008)
 # Masked for removal in ~30 days by the treecleaners
 # Dead project and predecessor to dev-util/bzr, use that instead. bug #219236
@@ -84,7 +107,7 @@ dev-cpp/libwefts
 =dev-java/mx4j-3.0.2
 
 # Donnie Berkholz <dberkholz@gentoo.org> (11 Jun 2008)
-# (#225907) Huge memory leaks, and 0.11.2 is just broken so try to get 
+# (#225907) Huge memory leaks, and 0.11.2 is just broken so try to get
 # people off it. (#225843) Font readability issues
 =x11-libs/pixman-0.11*
 
@@ -121,7 +144,7 @@ x11-proto/dri2proto
 
 # Alfredo Tupone <tupone@gentoo.org> (08 Jun 2008)
 # Masked for removal in 30 days.
-# Depend on dev-lang/python 2.3 (bug #222037) that is 
+# Depend on dev-lang/python 2.3 (bug #222037) that is
 # going to be dropped
 <net-zope/zope-2.9
 <net-zope/plone-2.5
@@ -227,7 +250,7 @@ net-analyzer/sonar
 =app-text/gtranslator-1.1.7
 
 # Steve Dibb <beandog@gentoo.org> (25 May 2008)
-# Needs testing 
+# Needs testing
 >=media-video/mplayer-1.0_rc2_p26753-r2
 
 # Ingmar Vanhassel <ingmar@gentoo.org (25 May 2008)
@@ -470,14 +493,9 @@ media-sound/lastfmproxy
 =dev-db/postgresql-8.3*
 
 # Luca Barbato <lu_zero@gentoo.org> (26 Mar 2008)
-# huge ffmpeg migration mask, append to this further packages working
-# with the new include layout
->=media-video/ffmpeg-0.4.9_p20080206
-=media-gfx/blender-2.45-r3
-=media-gfx/blender-2.46-r1
-=x11-misc/xvidcap-1.1.7_rc1
->=media-sound/picard-0.10.0_rc1
->=media-video/ffmpeg2theora-0.21
+# huge ffmpeg migration mask
+# we leave intermediate version masked, unmasking 20080326 -yngwin
+=media-video/ffmpeg-0.4.9_p20080206
 
 # William L. Thomson Jr. <wltjr@gentoo.org> (25 Mar 2008)
 # Masked due to bugs and availability of forked alternative Frostwire.