Unmasking gnash, but use.masking ffmpeg support in gnash

7 files changed, 26 insertions, 3 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index e3370461d82f..4c433f2a4cbc 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.1599 2008/06/22 22:32:23 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.1600 2008/06/22 22:39:14 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!
 
+  22 Jun 2008; Ben de Groot <yngwin@gentoo.org> base/package.use.mask,
+  default-bsd/package.use.mask, default-linux/package.use.mask,
+  default/linux/package.use.mask, hardened/package.use.mask, package.mask:
+  Unmasking gnash, but use.masking ffmpeg support in gnash
+
   22 Jun 2008; Samuli Suominen <drac@gentoo.org> +updates/3Q-2008:
   Move xfce4-icon-theme to x11-themes. Move ristretto to media-gfx.
   Move terminal to x11-terms. Move xfburn to app-cdr. Move mousepad
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 5c2680c7d2be..331c10a53a08 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,5 +1,9 @@
 # This file requires >=portage-2.1.1
 
+# Ben de Groot <yngwin@gentoo.org> (22 Jun 2008)
+# does not work with ffmpeg new headers yet
+net-www/gnash ffmpeg
+
 # Serkan Kaba <serkan@gentoo.org> (21 Jun 2008)
 # Masked since dev-java/sun-jmx sources are no longer available
 # See bug #226381.
diff --git a/profiles/default-bsd/package.use.mask b/profiles/default-bsd/package.use.mask
index f09d552e3916..2e9dc075c66f 100644
--- a/profiles/default-bsd/package.use.mask
+++ b/profiles/default-bsd/package.use.mask
@@ -42,3 +42,7 @@ media-plugins/gst-plugins-meta mythtv
 # use.masking for as long as kde4 is p.masked, see bug 225197
 x11-themes/qtcurve-qt4 kde
 
+# Ben de Groot <yngwin@gentoo.org> (22 Jun 2008)
+# does not work with ffmpeg new headers yet
+net-www/gnash ffmpeg
+
diff --git a/profiles/default-linux/package.use.mask b/profiles/default-linux/package.use.mask
index c92efbfad2b3..5a3256c263f9 100644
--- a/profiles/default-linux/package.use.mask
+++ b/profiles/default-linux/package.use.mask
@@ -24,3 +24,7 @@ games-fps/freedoom doomsday
 # use.masking for as long as kde4 is p.masked, see bug 225197
 x11-themes/qtcurve-qt4 kde
 
+# Ben de Groot <yngwin@gentoo.org> (22 Jun 2008)
+# does not work with ffmpeg new headers yet
+net-www/gnash ffmpeg
+
diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index c92efbfad2b3..d1e195a9eb99 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -24,3 +24,6 @@ games-fps/freedoom doomsday
 # use.masking for as long as kde4 is p.masked, see bug 225197
 x11-themes/qtcurve-qt4 kde
 
+# Ben de Groot <yngwin@gentoo.org> (22 Jun 2008)
+# does not work with ffmpeg new headers yet
+net-www/gnash ffmpeg
diff --git a/profiles/hardened/package.use.mask b/profiles/hardened/package.use.mask
index 81f9303f61d4..1f60d15f466b 100644
--- a/profiles/hardened/package.use.mask
+++ b/profiles/hardened/package.use.mask
@@ -17,3 +17,7 @@ media-tv/mythtv opengl-xvmc
 # use.masking for as long as kde4 is p.masked, see bug 225197
 x11-themes/qtcurve-qt4 kde
 
+# Ben de Groot <yngwin@gentoo.org> (22 Jun 2008)
+# does not work with ffmpeg new headers yet
+net-www/gnash ffmpeg
+
diff --git a/profiles/package.mask b/profiles/package.mask
index 1fe1040a1f41..2747b03775ff 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.8762 2008/06/22 18:15:50 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.8763 2008/06/22 22:39:14 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
@@ -63,7 +63,6 @@ media-sound/potamus
 # voip herd, bug 218102:
 media-libs/mediastreamer
 # no herd, bug 218105:
-net-www/gnash
 # mpeg4ip-1.5.0.1-r5 has new patches
 =media-video/mpeg4ip-1.5.0.1-r3
 =media-video/mpeg4ip-1.5.0.1-r4