Stable on ppc wrt bug#408209. Remove old.

(Portage version: 2.2.0_alpha105/cvs/Linux x86_64)

26 files changed, 25 insertions, 1875 deletions

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index 1ba23bbdafbd..dc7ddedb4ddf 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for www-plugins/gnash
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.85 2012/05/03 06:08:02 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.86 2012/05/16 11:35:05 scarabeus Exp $
+
+  16 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/gnash-0.8.3-boost-dynamic-link.patch, -files/gnash-0.8.5-klash.patch,
+  -files/gnash-0.8.7-amf-include.patch, -files/gnash-0.8.7-moc-qt4.patch,
+  -files/gnash-0.8.8-documentation-paths.patch,
+  -files/gnash-0.8.8-external-dejagnu.patch, -files/gnash-0.8.8-klash.patch,
+  -files/gnash-0.8.8-secure-tempfile-creation.patch,
+  -files/gnash-0.8.9-cve-2011-4328.patch,
+  -files/gnash-0.8.9-cygnal-sshclient.patch,
+  -files/gnash-0.8.9-documentation-paths.patch,
+  -files/gnash-0.8.9-ffmpeg-detection.patch,
+  -files/gnash-0.8.9-find-openvg.patch,
+  -files/gnash-0.8.9-libavcodec-version.patch,
+  -files/gnash-0.8.9-look-harder-for-version_h.patch,
+  -files/gnash-0.8.9-no-deprecated-avcodec-audio-resample.patch,
+  -files/gnash-0.8.9-no-deprecated-avcodec-decode-audio.patch,
+  -files/gnash-0.8.9-no-deprecated-avcodec-decode-video.patch,
+  -files/gnash-0.8.9-no-deprecated-avcodec-parser.patch,
+  -files/gnash-0.8.9-no-deprecated-avformat-metadata.patch,
+  -gnash-0.8.10-r1.ebuild, -gnash-0.8.8.ebuild, -gnash-0.8.9-r2.ebuild,
+  -gnash-0.8.9.ebuild, gnash-0.8.10-r2.ebuild:
+  Stable on ppc wrt bug#408209. Remove old.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> gnash-0.8.8.ebuild,
   gnash-0.8.9.ebuild, gnash-0.8.9-r2.ebuild, gnash-0.8.10-r1.ebuild,
diff --git a/www-plugins/gnash/files/gnash-0.8.3-boost-dynamic-link.patch b/www-plugins/gnash/files/gnash-0.8.3-boost-dynamic-link.patch
deleted file mode 100644
index ec1564a34d30..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.3-boost-dynamic-link.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: boost.m4
-===================================================================
-RCS file: /sources/gnash/gnash/macros/boost.m4,v
-retrieving revision 1.74
-diff -u -r1.74 boost.m4
---- macros/boost.m4	16 Jan 2008 00:42:55 -0000	1.74
-+++ macros/boost.m4	19 Jan 2008 18:35:14 -0000
-@@ -127,9 +127,9 @@
-         missing_libs=""
-       fi
-       for j in ${boost_libs}; do
--        dirs="`ls -dr $i/libboost_${j}*.${shlibext} $i/libboost_${j}*.a 2>/dev/null`"
-+        dirs="`ls -dr $i/libboost_${j}*.so 2>/dev/null`"
-         if test -n "${dirs}"; then
--          libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.${shlibext}::" -e "s:\.a::"`"
-+          libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.so::"`"
-           if test x$dirname = x; then
-             dirname="`echo ${dirs} | sed -e 's:/libboost.*$::'`"
-            if test x"${dirname}" != "x/usr/lib"; then
-@@ -143,9 +143,9 @@
-       done
-     done
-     for j in ${extra_boost_libs}; do
--      dirs="`ls -dr ${dirname}/libboost_${j}*.${shlibext} ${dirname}/libboost_${j}*.a 2>/dev/null`"
-+      dirs="`ls -dr ${dirname}/libboost_${j}*.so 2>/dev/null`"
-       if test -n "${dirs}"; then
--          libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.${shlibext}::" -e "s:\.a::"`"
-+          libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.so::"`"
-         ac_cv_path_boost_extra_lib="${ac_cv_path_boost_extra_lib} -l${libname}"
-       else
-         extra_missing_libs="${extra_missing_libs} $j"
diff --git a/www-plugins/gnash/files/gnash-0.8.5-klash.patch b/www-plugins/gnash/files/gnash-0.8.5-klash.patch
deleted file mode 100644
index e906439db088..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.5-klash.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- gnash-0.8.5/macros/kde4.m4.alt-kde4	2009-02-28 15:27:53 +0300
-+++ gnash-0.8.5/macros/kde4.m4	2009-07-15 16:02:13 +0400
-@@ -24,7 +24,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
-              with_kde4_incl=${withval})
-   dnl make sure the path is a useable one
-   if test x"${with_kde4_incl}" != x ; then
--    if test ! -f ${with_kde4_incl}/kapp.h ; then
-+    if test ! -f ${with_kde4_incl}/kapplication.h ; then
-       AC_MSG_ERROR([${with_kde4_incl} directory doesn't contain any KDE 4.x headers])
-     fi
-   fi
-@@ -38,7 +38,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
-              with_kde4_lib=${withval})
-   dnl make sure the path is a useable one
-   if test x"${with_kde4_lib}" != x ; then 
--    if test ! -f ${with_kde4_lib}/libkdeui.la; then
-+    if test ! -f ${with_kde4_lib}/libkdeui.so; then
-       AC_MSG_ERROR([${with_kde4_lib} directory doesn't contain any KDE 4.x libraries!])
-     fi
-   fi
-@@ -134,7 +134,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
-     dnl Look for the libraries
-     AC_CACHE_VAL(ac_cv_path_kde4_lib, [
-       if test x"${with_kde4_lib}" != x ; then
--        if test -f ${with_kde4_lib}/libkdeui.la; then
-+        if test -f ${with_kde4_lib}/libkdeui.so; then
- 	        ac_cv_path_kde4_lib="-L`(cd ${with_kde4_lib}; pwd)`"
-         else
- 	        AC_MSG_ERROR([${with_kde4_lib} directory doesn't contain KDE 4.x libraries.])
-@@ -144,7 +144,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
-         AC_MSG_CHECKING([for kdeui library])
-         kde4_topdir=
-         for i in ${kde4_prefix}/lib64 ${kde4_prefix}/lib $libslist ; do
--          if test -f $i/libkdeui.${shlibext} -o -f $i/libkdeui.la; then
-+          if test -f $i/libkdeui.${shlibext} -o -f $i/libkdeui.so; then
-             kde4_topdir=$i
-             AC_MSG_RESULT(${kde4_topdir}/libkdeui)
- 	          if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
-@@ -160,26 +160,13 @@ AC_DEFUN([GNASH_PATH_KDE4],
-       dnl Look for the kdecore library, which is required
-       if test x"${ac_cv_path_kde4_lib}" != x; then
-         AC_MSG_CHECKING([for kdecore library])
--        if test -f ${kde4_topdir}/libkdecore.la; then
-+        if test -f ${kde4_topdir}/libkdecore.so; then
-           ac_cv_path_kde4_lib="${ac_cv_path_kde4_lib} -lkdecore"
-           AC_MSG_RESULT(${kde4_topdir}/libkdecore)
-         else
-          AC_MSG_RESULT(no)
-         fi
-       fi
--      dnl Look for the kdeprint library, which is required
--      AC_MSG_CHECKING([for kdeprint library])
--      if test x"${libkdeprint}" = x; then
--        if test -f ${kde4_topdir}/libkdeprint.la -o -f ${kde4_topdir}/libkdeprint.${shlibext}; then
--          ac_cv_path_kde4_lib="${ac_cv_path_kde4_lib} -lkdeprint"
--          AC_MSG_RESULT(${kde4_topdir}/libkdeprint)
--        else
--          AC_MSG_RESULT(no)
--        fi
--      else
--        AC_MSG_RESULT(${libkdeprint})
--        ac_cv_path_kde4_lib="${ac_cv_path_kde4_lib} ${libkdeprint}"
--      fi	
-     ])                  dnl end of cache ac_cv_path_kde4_lib
-   fi                    dnl end of build_kde4
- 
-@@ -216,7 +203,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
-   fi                            dnl end of build_kparts4
- 
-   if test x"${ac_cv_path_kde4_incl}" != x ; then
--    if test x"${ac_cv_path_kde3_incl}" != x"-I/usr/include"; then
-+    if test x"${ac_cv_path_kde4_incl}" != x"-I/usr/include"; then
-       KDE4_CFLAGS="${ac_cv_path_kde4_incl}"
-     else
-       KDE4_CFLAGS=""
---- gnash-0.8.5/plugin/klash4/Makefile.am.alt-kde4	2009-06-15 11:53:31 +0400
-+++ gnash-0.8.5/plugin/klash4/Makefile.am	2009-07-15 16:02:58 +0400
-@@ -42,6 +39,7 @@ libklashpart_la_LDFLAGS = -avoid-version
- else
- libklashpart_la_LDFLAGS = -module -avoid-version -L$(plugindir) $(KDE4_LIBS) $(QT4_LIBS)
- endif
-+libklashpart_la_LIBADD = $(KDE4_LIBS) $(QT4_LIBS) $(X11_LIBS) -lkparts
- 
- dist_kde_services_DATA = klash_part.desktop
- dist_kde_rc_DATA = klashpartui.rc
---- gnash-0.8.5/plugin/klash4/pluginsinfo.alt-kde4	2008-12-28 13:13:38 +0300
-+++ gnash-0.8.5/plugin/klash4/pluginsinfo	2009-07-15 16:02:13 +0400
-@@ -1,7 +1,7 @@
- number=1
- 
- [0]
--description=Shockwave Flash 7.0
-+description=Shockwave Flash 10.1 r999
- file=libklashpart.so
- mime=application/x-shockwave-flash:swf:Shockwave Flash;application/futuresplash:spl:FutureSplash Player
- name=Shockwave Flash
diff --git a/www-plugins/gnash/files/gnash-0.8.7-amf-include.patch b/www-plugins/gnash/files/gnash-0.8.7-amf-include.patch
deleted file mode 100644
index 2537ab06b4bc..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.7-amf-include.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ur a/libnet/cque.h b/libnet/cque.h
---- a/libnet/cque.h	2010-02-11 00:20:18.000000000 +0100
-+++ b/libnet/cque.h	2010-03-18 00:05:37.000000000 +0100
-@@ -24,8 +24,9 @@
- #include <boost/thread/condition.hpp>
- #include <deque>
- 
-+#include "libamf/amf.h"
- #include "getclocktime.hpp"
--#include "buffer.h"
-+#include "libamf/buffer.h"
- #include "network.h"
- #include "dsodefs.h" //For DSOEXPORT.
- 
-diff -ur a/libnet/sshclient.h b/libnet/sshclient.h
---- a/libnet/sshclient.h	2010-02-11 00:20:18.000000000 +0100
-+++ b/libnet/sshclient.h	2010-03-18 00:03:49.000000000 +0100
-@@ -34,9 +34,10 @@
- #include <libssh/sftp.h>
- }
- 
-+#include "libamf/amf.h"
- #include "cque.h"
- #include "network.h"
--#include "buffer.h"
-+#include "libamf/buffer.h"
- 
- namespace gnash
- {
-diff -ur a/libnet/sslclient.h b/libnet/sslclient.h
---- a/libnet/sslclient.h	2010-02-11 00:20:17.000000000 +0100
-+++ b/libnet/sslclient.h	2010-03-18 00:05:24.000000000 +0100
-@@ -38,9 +38,10 @@
- #include <openssl/err.h>
- #endif
- 
-+#include "libamf/amf.h"
- #include "cque.h"
- #include "network.h"
--#include "buffer.h"
-+#include "libamf/buffer.h"
- 
- namespace gnash
- {
diff --git a/www-plugins/gnash/files/gnash-0.8.7-moc-qt4.patch b/www-plugins/gnash/files/gnash-0.8.7-moc-qt4.patch
deleted file mode 100644
index 219685ef16fa..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.7-moc-qt4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur a/macros/qt4.m4 b/macros/qt4.m4
---- a/macros/qt4.m4	2010-02-11 00:20:17.000000000 +0100
-+++ b/macros/qt4.m4	2010-03-15 18:26:34.000000000 +0100
-@@ -167,8 +167,8 @@
-       has_qt4="no"
-     fi
- 
--    AC_PATH_PROGS(MOC4, [moc-qt4 moc], ,[${QTDIR}/bin /usr/lib/qt4/bin /usr/share/qt4/bin/ ${pathlist}])
--    AC_PATH_PROGS(UIC4, [uic-qt4 uic], ,[${QTDIR}/bin /usr/lib/qt4/bin /usr/share/qt4/bin/ ${pathlist}])
-+    AC_PATH_PROGS(MOC4, [moc-qt4 moc], ,[/usr/bin ${QTDIR}/bin /usr/lib/qt4/bin /usr/share/qt4/bin/ ${pathlist}])
-+    AC_PATH_PROGS(UIC4, [uic-qt4 uic], ,[/usr/bin ${QTDIR}/bin /usr/lib/qt4/bin /usr/share/qt4/bin/ ${pathlist}])
- 
- 
-     AC_SUBST([QT4_CFLAGS])
diff --git a/www-plugins/gnash/files/gnash-0.8.8-documentation-paths.patch b/www-plugins/gnash/files/gnash-0.8.8-documentation-paths.patch
deleted file mode 100644
index e57c2cecb2bc..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.8-documentation-paths.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur a/doc/C/Makefile.am b/doc/C/Makefile.am
---- a/doc/C/Makefile.am	2010-08-07 17:50:00.000000000 +0200
-+++ b/doc/C/Makefile.am	2010-09-28 18:33:03.000000000 +0200
-@@ -18,14 +18,12 @@
- 
- # Building a PDF using Apache FOP only works with fop-0.20.5 for now.
- 
--htmldir = ${prefix}/share/doc/gnash
--infodir = ${prefix}/share/info
--man1dir = ${prefix}/share/man/man1
-+man1dir = ${mandir}/man1
- docname = gnash
- lang = C
- omffile = gnash-C.omf
- 
--docdir = $(datadir)/$(PACKAGE)/doc/$(docname)/$(lang)
-+# docdir = $(datadir)/$(PACKAGE)/doc/$(docname)/$(lang)
- omf_dest_dir=$(datadir)/omf/$(PACKAGE)
- scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
- 
diff --git a/www-plugins/gnash/files/gnash-0.8.8-external-dejagnu.patch b/www-plugins/gnash/files/gnash-0.8.8-external-dejagnu.patch
deleted file mode 100644
index 1453b6df3894..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.8-external-dejagnu.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur a/plugin/npapi/test.cpp b/plugin/npapi/test.cpp
---- a/plugin/npapi/test.cpp	2010-08-07 17:50:01.000000000 +0200
-+++ b/plugin/npapi/test.cpp	2010-09-29 00:08:15.735999998 +0200
-@@ -27,7 +27,7 @@
- #include "npruntime.h"
- #include "pluginbase.h"
- #include "npfunctions.h"
--#include "dejagnu.h"
-+#include <dejagnu.h>
- #include <regex.h>
- 
- #include "external.h"
-diff -ur a/testsuite/check.h b/testsuite/check.h
---- a/testsuite/check.h	2010-08-07 17:50:01.000000000 +0200
-+++ b/testsuite/check.h	2010-09-29 00:08:33.032999999 +0200
-@@ -11,7 +11,7 @@
- 
- #define HAVE_DEJAGNU_H 1 // we ship our own now...
- #ifdef HAVE_DEJAGNU_H
--#include "dejagnu.h"
-+#include <dejagnu.h>
- 
- #define info(x) note x
- 
diff --git a/www-plugins/gnash/files/gnash-0.8.8-klash.patch b/www-plugins/gnash/files/gnash-0.8.8-klash.patch
deleted file mode 100644
index c895bde65763..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.8-klash.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur gnash-0.8.7_p20100812.orig/macros/kde4.m4 gnash-0.8.7_p20100812/macros/kde4.m4
---- gnash-0.8.7_p20100812.orig/macros/kde4.m4	2010-08-12 13:49:01.319789001 +0200
-+++ gnash-0.8.7_p20100812/macros/kde4.m4	2010-08-12 13:49:50.875789001 +0200
-@@ -136,7 +136,7 @@
-     dnl Look for the libraries
-     AC_CACHE_VAL(ac_cv_path_kde4_lib, [
-       if test x"${with_kde4_lib}" != x ; then
--        if test -f ${with_kde4_lib}/libkdeui.la; then
-+        if test -f ${with_kde4_lib}/libkdeui.so; then
- 	        ac_cv_path_kde4_lib="-L`(cd ${with_kde4_lib}; pwd)`"
-         else
- 	        AC_MSG_ERROR([${with_kde4_lib} directory doesn't contain KDE 4.x libraries.])
-@@ -214,9 +214,9 @@
-       KDE4_CONFIGDIR="${KDE4_PREFIX}}/share/kde4/config"
-     fi
-     if test x"${KDE4_APPSDATADIR}" != x ; then 
--      KDE4_APPSDATADIR="${KDE4_APPSDATADIR}/share/kde4/apps/klash"
-+      KDE4_APPSDATADIR="${KDE4_APPSDATADIR}/share/apps/klash"
-     else
--      KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash"
-+      KDE4_APPSDATADIR="${KDE4_PREFIX}/share/apps/klash"
-     fi
-   fi                            dnl end of build_kparts4
- 
diff --git a/www-plugins/gnash/files/gnash-0.8.8-secure-tempfile-creation.patch b/www-plugins/gnash/files/gnash-0.8.8-secure-tempfile-creation.patch
deleted file mode 100644
index 8c9e79dfccaa..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.8-secure-tempfile-creation.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6d86dd8cb9d567d8a6cedac301850c7349fe0ced Mon Sep 17 00:00:00 2001
-From: Gabriele Giacone <1o5g4r8o@gmail.com>
-Date: Mon, 03 Jan 2011 16:55:51 +0000
-Subject: Create configure temporary files in a secure way
-
----
-diff --git a/configure.ac b/configure.ac
-index 08d217b..85e19da 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3021,9 +3021,14 @@ cygnal/testsuite/cygnal.all/Makefile
- ########################## Final report begins... ############################
- ###
- 
--cerr=/tmp/gnash-configure-errors.$$
--cwarn=/tmp/gnash-configure-warnings.$$
--crec=/tmp/gnash-configure-recommended.$$
-+dnl Create temporary directory in a secure way
-+tmp=`mktemp -d ${TMPDIR=/tmp}/gnash-configure-XXXXXX`
-+if test \! -n "$tmp" || test \! -d "$tmp"; then
-+  tmp=`(umask 077 && mkdir -d ${TMPDIR=/tmp}/gnash-configure-${RANDOM}-$$) 2>/dev/null`
-+fi
-+cerr=${tmp}/errors
-+cwarn=${tmp}/warnings
-+crec=${tmp}/recommended
- echo ""
- 
- #trap 'rm cerr' 0 # trap isn't a good idea, might override other traps
-@@ -4051,6 +4056,7 @@ else
-   rm $cerr
- fi
- 
-+rmdir $tmp
- 
- if test x"$fork" = x"no"; then
-   AC_MSG_ERROR([Currently only forking the standalone player works!])
---
-cgit v0.8.3.2
diff --git a/www-plugins/gnash/files/gnash-0.8.9-cve-2011-4328.patch b/www-plugins/gnash/files/gnash-0.8.9-cve-2011-4328.patch
deleted file mode 100644
index 14e3477b8020..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.9-cve-2011-4328.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From fa481c116e65ccf9137c7ddc8abc3cf05dc12f55 Mon Sep 17 00:00:00 2001
-From: Gabriele Giacone <1o5g4r8o@gmail.com>
-Date: Sun, 20 Nov 2011 17:27:42 +0100
-Subject: [PATCH] Make cookie file not world-readable. Fixes http://bugs.debian.org/649384
-
----
- plugin/npapi/plugin.cpp |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/plugin/npapi/plugin.cpp b/plugin/npapi/plugin.cpp
-index e161a1d..04950e6 100644
---- a/plugin/npapi/plugin.cpp
-+++ b/plugin/npapi/plugin.cpp
-@@ -1108,6 +1108,7 @@ nsPluginInstance::setupCookies(const std::string& pageurl)
-     ss << "/tmp/gnash-cookies." << getpid();
- 
-     cookiefile.open(ss.str().c_str(), std::ios::out | std::ios::trunc);
-+    chmod (ss.str().c_str(), 0600);
- 
-     // Firefox provides cookies in the following format:
-     //
--- 
-1.7.2.5
-
diff --git a/www-plugins/gnash/files/gnash-0.8.9-cygnal-sshclient.patch b/www-plugins/gnash/files/gnash-0.8.9-cygnal-sshclient.patch
deleted file mode 100644
index 52793e576ce9..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.9-cygnal-sshclient.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -ur a/cygnal/libnet/sshclient.cpp b/cygnal/libnet/sshclient.cpp
---- a/cygnal/libnet/sshclient.cpp	2011-02-26 19:11:07.000000000 +0100
-+++ b/cygnal/libnet/sshclient.cpp	2011-11-26 02:58:31.314227874 +0100
-@@ -103,7 +103,7 @@
- 
- // Read bytes from the already opened SSH connection
- int
--SSHClient::sshRead(amf::Buffer &buf)
-+SSHClient::sshRead(cygnal::Buffer &buf)
- {
-     GNASH_REPORT_FUNCTION;
- 
-@@ -125,7 +125,7 @@
- 
- // Write bytes to the already opened SSH connection
- int
--SSHClient::sshWrite(amf::Buffer &buf)
-+SSHClient::sshWrite(cygnal::Buffer &buf)
- {
-     GNASH_REPORT_FUNCTION;
- 
-@@ -401,7 +401,7 @@
- }
- 
- int 
--SSHClient::readChannel(ssh_channel channel, amf::Buffer &buf)
-+SSHClient::readChannel(ssh_channel channel, cygnal::Buffer &buf)
- {
- //    GNASH_REPORT_FUNCTION;
-     int ret = -1;
-@@ -416,7 +416,7 @@
- }
- 
- int 
--SSHClient::writeChannel(ssh_channel channel, amf::Buffer &buf)
-+SSHClient::writeChannel(ssh_channel channel, cygnal::Buffer &buf)
- {
- //    GNASH_REPORT_FUNCTION;
-     int ret = -1;
-diff -ur a/cygnal/libnet/sshclient.h b/cygnal/libnet/sshclient.h
---- a/cygnal/libnet/sshclient.h	2011-02-26 19:11:07.000000000 +0100
-+++ b/cygnal/libnet/sshclient.h	2011-11-26 02:58:57.203229777 +0100
-@@ -32,6 +32,7 @@
- #include <libssh/sftp.h>
- }
- 
-+#include "dsodefs.h"
- #include "cque.h"
- #include "network.h"
- #include "buffer.h"
-@@ -56,12 +57,12 @@
-     ~SSHClient();
- 
-     // Read bytes from the already opened SSH connection
--    int sshRead(amf::Buffer &buf);
-+    int sshRead(cygnal::Buffer &buf);
-     int sshRead(boost::uint8_t *buf, size_t length);
-     int sshRead(std::string &buf);
- 
-     // Write bytes to the already opened SSH connection
--    int sshWrite(amf::Buffer &buf);
-+    int sshWrite(cygnal::Buffer &buf);
-     int sshWrite(const boost::uint8_t *buf, size_t length);
-     int sshWrite(std::string &buf);
- 
-@@ -104,13 +105,13 @@
-     // Accessors
-     ssh_channel getChannel() { return _channel; };
-     ssh_session getSession() { return _session; };
--    boost::shared_ptr<amf::Buffer> &getBuffer()  { return _buffer; };
-+    boost::shared_ptr<cygnal::Buffer> &getBuffer()  { return _buffer; };
- 
-     // Dump internal data to the screen for debugging
-     void dump();
-  protected:
--    int readChannel (ssh_channel channel, amf::Buffer &buf);
--    int writeChannel(ssh_channel channel, amf::Buffer &buf);
-+    int readChannel (ssh_channel channel, cygnal::Buffer &buf);
-+    int writeChannel(ssh_channel channel, cygnal::Buffer &buf);
- 
-     std::string		_hostname;
-     std::string		_user;
-@@ -126,7 +127,7 @@
-     ssh_session _session;
-     ssh_channel	_channel;
- #endif
--    boost::shared_ptr<amf::Buffer> _buffer;
-+    boost::shared_ptr<cygnal::Buffer> _buffer;
- };
-     
- } // end of gnash namespace
diff --git a/www-plugins/gnash/files/gnash-0.8.9-documentation-paths.patch b/www-plugins/gnash/files/gnash-0.8.9-documentation-paths.patch
deleted file mode 100644
index dc56805fec6d..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.9-documentation-paths.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ur a/doc/C/Makefile.am b/doc/C/Makefile.am
---- a/doc/C/Makefile.am	2011-03-13 17:47:36.000000000 +0100
-+++ b/doc/C/Makefile.am	2011-03-20 23:50:03.560998121 +0100
-@@ -19,13 +19,13 @@
- 
- # Building a PDF using Apache FOP only works with fop-0.20.5 for now.
- 
--infodir = ${prefix}/share/info
-+# infodir = ${prefix}/share/info
- man1dir = ${mandir}/man1
- docname = gnash
- lang = C
- omffile = gnash-C.omf
- 
--docdir = $(datadir)/$(PACKAGE)/doc/$(docname)/$(lang)
-+# docdir = $(datadir)/$(PACKAGE)/doc/$(docname)/$(lang)
- omf_dest_dir=$(datadir)/omf/$(PACKAGE)
- scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
- 
diff --git a/www-plugins/gnash/files/gnash-0.8.9-ffmpeg-detection.patch b/www-plugins/gnash/files/gnash-0.8.9-ffmpeg-detection.patch
deleted file mode 100644
index 73e478f40ed9..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.9-ffmpeg-detection.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f05022aca2c14022a942d36a22764fae4b8f00c0 Mon Sep 17 00:00:00 2001
-From: Brad Smith <brad@comstyle.com>
-Date: Sun, 03 Apr 2011 10:56:27 +0000
-Subject: Fix newer FFmpeg detection with pkg-config.
-
----
-diff --git a/macros/ffmpeg.m4 b/macros/ffmpeg.m4
-index 2a3d3fb..42c7555 100644
---- a/macros/ffmpeg.m4
-+++ b/macros/ffmpeg.m4
-@@ -70,6 +70,9 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
-           if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then
-             ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}; pwd)`"
-             avcodec_h="${ffmpeg_top_incl}/${i}/avcodec.h"
-+            if test -f ${ffmpeg_top_incl}/${i}/version.h; then
-+              avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h
-+            fi
-             break
-           fi
-         done
---
-cgit v0.8.3.4
diff --git a/www-plugins/gnash/files/gnash-0.8.9-find-openvg.patch b/www-plugins/gnash/files/gnash-0.8.9-find-openvg.patch
deleted file mode 100644
index dfd6914ba320..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.9-find-openvg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac	2011-03-18 14:49:55.000000000 +0100
-+++ b/configure.ac	2011-03-21 01:54:41.058996609 +0100
-@@ -2393,7 +2393,7 @@
- 
- if test x"${build_ogv}" = xyes; then
-   GNASH_PKG_FIND(EGL, [EGL/egl.h], [EGL library], eglGetDisplay)
--  GNASH_PKG_FIND(OpenVG, [vg/openvg.h], [OpenVG library], vgDrawImage)
-+  GNASH_PKG_FIND(OpenVG, [VG/openvg.h], [OpenVG library], vgDrawImage)
- fi
- 
- if test x"${build_gtk}" = xyes; then
diff --git a/www-plugins/gnash/files/gnash-0.8.9-libavcodec-version.patch b/www-plugins/gnash/files/gnash-0.8.9-libavcodec-version.patch
deleted file mode 100644
index 323913e296f6..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.9-libavcodec-version.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 27a4e1f6a5b50e35af8fa29f9cd9fabf5ee777bd Mon Sep 17 00:00:00 2001
-From: Benjamin Wolsey <bwy@benjaminwolsey.de>
-Date: Fri, 01 Apr 2011 11:15:47 +0000
-Subject: FFmpeg trunk uses libavcodec/version.h to store the version.
-
----
-diff --git a/macros/ffmpeg.m4 b/macros/ffmpeg.m4
-index 4eb68c2..85f11b8 100644
---- a/macros/ffmpeg.m4
-+++ b/macros/ffmpeg.m4
-@@ -22,6 +22,7 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
-   backupLIBS="$LIBS"
-   backupCFLAGS="$CFLAGS"
-   avcodec_h=""
-+  avcodec_version_h=""
-   ffmpeg_top_incl=""
- 
-   dnl If the user specify an path to include headers from, we assume it's the full
-@@ -46,6 +47,9 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
-       else
-         AC_MSG_ERROR([${with_ffmpeg_incl} directory does not contain the avcodec.h header])
-       fi
-+      if test -f ${with_ffmpeg_incl}/version.h; then
-+        avcodec_version_h=${with_ffmpeg_incl}/version.h
-+      fi
-     fi
-   ])
- 
-@@ -182,14 +186,24 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
-   dnl a modified form of grepping may be better, making sure all old kinds of
-   dnl version numbering fail gracefully.
- 
-+  versionfile=""
-+
-   dnl Check avcodec version number, if it was found
--  if test x"${avcodec_h}" != x; then
-+  if test x"${avcodec_version_h}" != x; then
-+    versionfile=${avcodec_version_h}
-+  else
-+    if test x"${avcodec_h}" != x; then
-+      versionfile=${avcodec_h}
-+    fi
-+  fi
-+
-+  if test x"${versionfile}" != x; then
- 
-     AC_MSG_CHECKING([ffmpeg version])
- 
--    ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
--    ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
--    ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
-+    ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"`
-+    ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"`
-+    ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${versionfile} | sed -e "s%[[^0-9]]%%g"`
- 
-     if test x"${ffmpeg_major_version}" != x ; then
- 
-@@ -198,15 +212,15 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
-     else
- 
-       dnl #define LIBAVCODEC_VERSION_TRIPLET 51,50,1
--      ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%,%.%g"`
-+      ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${versionfile} | awk '{print $'3'}' | sed -e "s%,%.%g"`
- 
-       if test x"${ffmpeg_version}" = x ; then
- 
-         dnl NOTE: the [0-9]*d. pattern discards deb-heads rubbish prefix
--        ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` 
-+        ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${versionfile} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` 
- 
-         if test x"${ffmpeg_version}" = x ; then
--          ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${avcodec_h} | awk '{print $'3'}'`
-+          ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${versionfile} | awk '{print $'3'}'`
-         fi
-       fi
- 
---
-cgit v0.8.3.4
diff --git a/www-plugins/gnash/files/gnash-0.8.9-look-harder-for-version_h.patch b/www-plugins/gnash/files/gnash-0.8.9-look-harder-for-version_h.patch
deleted file mode 100644
index 71fc9b58793a..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.9-look-harder-for-version_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur a/macros/ffmpeg.m4 b/macros/ffmpeg.m4
---- a/macros/ffmpeg.m4	2011-04-09 17:26:26.817016067 +0200
-+++ b/macros/ffmpeg.m4	2011-04-09 17:51:04.142016943 +0200
-@@ -96,6 +96,9 @@
-         if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then
-           ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}/${i}; pwd)`"
-           avcodec_h=${ffmpeg_top_incl}/${i}/avcodec.h
-+          if test -f ${ffmpeg_top_incl}/${i}/version.h; then
-+            avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h
-+          fi
-           break
-         fi
-       done
diff --git a/www-plugins/gnash/files/gnash-0.8.9-no-deprecated-avcodec-audio-resample.patch b/www-plugins/gnash/files/gnash-0.8.9-no-deprecated-avcodec-audio-resample.patch
deleted file mode 100644
index 675b6eec6fba..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.9-no-deprecated-avcodec-audio-resample.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur a/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp b/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
---- a/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp	2011-02-26 19:11:08.000000000 +0100
-+++ b/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp	2011-07-02 22:45:54.804995296 +0200
-@@ -46,8 +46,10 @@
- {
-   if ( (ctx->sample_rate != 44100) || (ctx->channels != 2) ) {
-     if ( ! _context ) {
--      _context = audio_resample_init( 
--		2, ctx->channels, 44100, ctx->sample_rate 
-+      _context = av_audio_resample_init( 
-+		2, ctx->channels, 44100, ctx->sample_rate,
-+		AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16,
-+		16, 10, 0, 0.8
- 	);
-     }
- 
diff --git a/www-plugins/gnash/files/gnash-0.8.9-no-deprecated-avcodec-decode-audio.patch b/www-plugins/gnash/files/gnash-0.8.9-no-deprecated-avcodec-decode-audio.patch
deleted file mode 100644
index 513d7f79723b..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.9-no-deprecated-avcodec-decode-audio.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
---- a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp	2011-02-26 19:11:08.000000000 +0100
-+++ b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp	2011-07-02 21:03:32.785996541 +0200
-@@ -29,7 +29,7 @@
- 
- //#define GNASH_DEBUG_AUDIO_DECODING
- 
--#define AVCODEC_DECODE_AUDIO avcodec_decode_audio2
-+#define AVCODEC_DECODE_AUDIO avcodec_decode_audio3
- 
- namespace gnash {
- namespace media {
-@@ -549,8 +549,12 @@
- #endif
- 
-     // older ffmpeg versions didn't accept a const input..
-+    AVPacket pkt;
-+    av_init_packet(&pkt);
-+    pkt.data = (uint8_t*) input;
-+    pkt.size = inputSize;
-     int tmp = AVCODEC_DECODE_AUDIO(_audioCodecCtx, outPtr, &outSize,
--                                   input, inputSize);
-+                                   &pkt);
- 
- #ifdef GNASH_DEBUG_AUDIO_DECODING
-     log_debug(" avcodec_decode_audio[2](ctx, bufptr, %d, input, %d) "
diff --git a/www-plugins/gnash/files/gnash-0.8.9-no-deprecated-avcodec-decode-video.patch b/www-plugins/gnash/files/gnash-0.8.9-no-deprecated-avcodec-decode-video.patch
deleted file mode 100644
index f73506260ef2..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.9-no-deprecated-avcodec-decode-video.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
---- a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp	2011-03-13 17:47:36.000000000 +0100
-+++ b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp	2011-07-02 21:40:28.026996093 +0200
-@@ -356,8 +356,12 @@
- 
-     int bytes = 0;    
-     // no idea why avcodec_decode_video wants a non-const input...
--    avcodec_decode_video(_videoCodecCtx->getContext(), frame, &bytes,
--            input, input_size);
-+    AVPacket pkt;
-+    av_init_packet(&pkt);
-+    pkt.data = (uint8_t*) input;
-+    pkt.size = input_size;
-+    avcodec_decode_video2(_videoCodecCtx->getContext(), frame, &bytes,
-+            &pkt);
-     
-     if (!bytes) {
-         log_error("Decoding of a video frame failed");
diff --git a/www-plugins/gnash/files/gnash-0.8.9-no-deprecated-avcodec-parser.patch b/www-plugins/gnash/files/gnash-0.8.9-no-deprecated-avcodec-parser.patch
deleted file mode 100644
index 9a46b521b755..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.9-no-deprecated-avcodec-parser.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ur a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
---- a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp	2011-02-26 19:11:08.000000000 +0100
-+++ b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp	2011-04-10 23:59:17.170781787 +0200
-@@ -658,13 +658,13 @@
- {
-     if ( _needsParsing )
-     {
--        return av_parser_parse(_parser, _audioCodecCtx,
-+        return av_parser_parse2(_parser, _audioCodecCtx,
-                     // as of 2008-10-28 SVN, ffmpeg doesn't
-                     // accept a pointer to pointer to const..
-                     const_cast<boost::uint8_t**>(outFrame),
-                     outFrameSize,
-                     input, inputSize,
--                    0, 0); // pts & dts
-+                    0, 0, AV_NOPTS_VALUE); // pts & dts
-     }
-     else
-     {
diff --git a/www-plugins/gnash/files/gnash-0.8.9-no-deprecated-avformat-metadata.patch b/www-plugins/gnash/files/gnash-0.8.9-no-deprecated-avformat-metadata.patch
deleted file mode 100644
index dcfb24cb20f9..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.9-no-deprecated-avformat-metadata.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ur a/libmedia/ffmpeg/MediaParserFfmpeg.cpp b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
---- a/libmedia/ffmpeg/MediaParserFfmpeg.cpp	2011-03-13 17:47:36.000000000 +0100
-+++ b/libmedia/ffmpeg/MediaParserFfmpeg.cpp	2011-07-02 22:29:55.889995495 +0200
-@@ -387,7 +387,7 @@
-     
-     log_debug("Parsing FFMPEG media file: format:%s; nstreams:%d",
-         _inputFmt->name, _formatCtx->nb_streams);
--    
-+    /*
-     if ( _formatCtx->title[0] )
-         log_debug(_("  Title:'%s'"), _formatCtx->title);
-     if ( _formatCtx->author[0] )
-@@ -398,7 +398,7 @@
-         log_debug(_("  Comment:'%s'"), _formatCtx->comment);
-     if ( _formatCtx->album[0] )
-         log_debug(_("  Album:'%s'"), _formatCtx->album);
--    
-+    */
-     // Find first audio and video stream
-     for (unsigned int i = 0; i < static_cast<unsigned int>(_formatCtx->nb_streams); i++)
- 	{
-@@ -415,7 +415,7 @@
- 	    }
- 	    
- 	    switch (enc->codec_type) {
--	    case CODEC_TYPE_AUDIO:
-+	    case AVMEDIA_TYPE_AUDIO:
- 		if (_audioStreamIndex < 0) {
- 		    _audioStreamIndex = i;
- 		    _audioStream = _formatCtx->streams[i];
-@@ -425,7 +425,7 @@
- 		}
- 		break;
- 		
--	    case CODEC_TYPE_VIDEO:
-+	    case AVMEDIA_TYPE_VIDEO:
- 		if (_videoStreamIndex < 0) {
- 		    _videoStreamIndex = i;
- 		    _videoStream = _formatCtx->streams[i];
diff --git a/www-plugins/gnash/gnash-0.8.10-r1.ebuild b/www-plugins/gnash/gnash-0.8.10-r1.ebuild
deleted file mode 100644
index 154e4e9ea72c..000000000000
--- a/www-plugins/gnash/gnash-0.8.10-r1.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.10-r1.ebuild,v 1.3 2012/05/03 06:08:02 jdhore Exp $
-
-EAPI=4
-CMAKE_REQUIRED="never"
-KDE_REQUIRED="optional"
-AT_M4DIR="cygnal"
-PYTHON_DEPEND="python? 2"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit autotools eutils kde4-base multilib nsplugins python flag-o-matic
-
-DESCRIPTION="GNU Flash movie player that supports many SWF v7,8,9 features"
-HOMEPAGE="http://www.gnu.org/software/gnash/"
-
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.savannah.gnu.org/gnash.git"
-	inherit git-2
-else
-# Release tarball is b0rked, upstream #35612
-#	SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2"
-	SRC_URI="mirror://gentoo/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X +agg cairo cygnal dbus directfb doc dump egl fbcon +ffmpeg gconf gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi"
-REQUIRED_USE="dump? ( agg ffmpeg )
-	fbcon? ( agg )
-	nsplugin? ( gtk )
-	openvg? ( egl )
-	python? ( gtk )
-	vaapi? ( agg ffmpeg )
-	|| ( agg cairo opengl openvg )
-	|| ( dump fbcon gtk kde sdl )
-	"
-
-# gnash fails if obsolete boost is installed, bug #334259
-RDEPEND=">=dev-libs/boost-1.41.0
-	!!dev-libs/boost:0
-	dev-libs/expat
-	dev-libs/libxml2
-	virtual/jpeg
-	media-libs/libpng
-	net-misc/curl
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	media-libs/giflib
-	x11-proto/xproto
-	agg? ( x11-libs/agg )
-	cairo? ( x11-libs/cairo )
-	directfb? (
-		dev-libs/DirectFB
-	)
-	doc? (
-		>=app-text/docbook2X-0.8.8
-		app-text/docbook-sgml-utils
-	)
-	egl? (
-		media-libs/mesa[egl]
-	)
-	fbcon? (
-		x11-libs/tslib
-	)
-	ffmpeg? (
-		virtual/ffmpeg[vaapi?]
-	)
-	gconf? (
-		gnome-base/gconf
-	)
-	gstreamer? (
-		media-plugins/gst-plugins-ffmpeg
-		media-plugins/gst-plugins-mad
-		media-plugins/gst-plugins-meta
-	)
-	gtk? (
-		x11-libs/gtk+:2
-		net-libs/xulrunner:1.9
-		python? ( dev-python/pygtk:2 )
-	)
-	kde? ( $(add_kdebase_dep kdebase-startkde) )
-	opengl? (
-		virtual/opengl
-		gtk? ( x11-libs/gtkglext )
-	)
-	openvg? (
-		media-libs/mesa[openvg]
-	)
-	nsplugin? (
-		|| (
-			net-misc/npapi-sdk
-			>=net-libs/xulrunner-1.9.2:1.9
-		)
-	)
-	sdl? ( media-libs/libsdl[X] )
-	sdl-sound? ( media-libs/libsdl )
-	media-libs/speex[ogg]
-	sys-libs/zlib
-	>=sys-devel/libtool-2.2
-	mysql? ( virtual/mysql )
-	lirc? ( app-misc/lirc )
-	dbus? ( sys-apps/dbus )
-	ssh?  ( >=net-libs/libssh-0.4[server] )
-	ssl? ( dev-libs/openssl )
-	vaapi? ( x11-libs/libva[opengl?] )
-	"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	gnome? ( app-text/rarian )
-	test? ( dev-util/dejagnu )"
-# Tests hang with sandbox, bug #321017
-RESTRICT="test"
-
-pkg_setup() {
-	kde4-base_pkg_setup
-
-	if has_version ">=dev-libs/boost-1.46" && has_version "<dev-libs/boost-1.46"; then
-		ewarn "If you have multiple versions of boost installed, gnash may attempt to"
-		ewarn "compile against the older version and link against newer version, which can"
-		ewarn "cause the build to fail. Unmerge of the old version of boost is recommended."
-	fi
-
-	if use !ffmpeg && use !gstreamer; then
-		ewarn "You are trying to build Gnash without choosing a media handler."
-		ewarn "Sound and video playback will not work."
-	fi
-
-	# won't build with python-3, bug #392969
-	if use python; then
-		python_set_active_version 2
-	fi
-}
-
-src_prepare() {
-	# Fix paths for klash, bug #339610
-	epatch "${FILESDIR}"/${PN}-0.8.9-klash.patch
-
-	# Use external dejagnu for tests, bug #321017
-	epatch "${FILESDIR}"/${PN}-0.8.9-external-dejagnu.patch
-
-	# Fix building on ppc64, bug #342535
-	use ppc64 && append-flags -mminimal-toc
-
-	# Fix kde multilib library path, bug #391283
-	epatch "${FILESDIR}"/${PN}-0.8.9-kde4-libdir.patch
-
-	# Fix gettext macros build failure
-	epatch "${FILESDIR}"/${PN}-0.8.10-gettext-macro.patch
-
-	# Fix libamf includes
-	epatch "${FILESDIR}"/${PN}-0.8.10-amf-include.patch
-
-	# Allow building against npapi-sdk, bug #383071
-	epatch "${FILESDIR}"/${PN}-0.8.10-npapi-sdk.patch
-
-	# Fix broken jemalloc, bug #405993
-	epatch "${FILESDIR}"/${PN}-0.8.10-jemalloc-aslr-fix.patch
-
-	eautoreconf
-}
-src_configure() {
-	local device gui input media myconf myext renderers
-
-	# Set nsplugin install directory.
-	use nsplugin && myconf="${myconf} --with-npapi-plugindir=/usr/$(get_libdir)/gnash/npapi/"
-
-	# Set hardware acceleration.
-	use X && device+=",x11"
-	use directfb && device+=",directfb"
-	use egl && device+=",egl"
-	use fbcon && device+=",rawfb"
-	use vaapi && device+=",vaapi"
-	[[ "${device}x" == "x" ]] && device+=",none"
-
-	# Set rendering engine.
-	use agg && renderers+=",agg"
-	use cairo && renderers+=",cairo"
-	use opengl && renderers+=",opengl"
-	use openvg && renderers+=",openvg"
-
-	# Set kde and konqueror plugin directories.
-	if use kde; then
-		myconf="${myconf}
-			--with-plugins-install=system
-			--with-kde4-incl=${KDEDIR}/include
-			--with-kde4-configdir=${KDEDIR}/share/config
-			--with-kde4-prefix=${KDEDIR}
-			--with-kde4-lib=${KDEDIR}/$(get_libdir)
-			--with-kde-appsdatadir=${KDEDIR}/share/apps/klash
-			--with-kde4-servicesdir=${KDEDIR}/share/kde4/services"
-	fi
-
-	# Set media handler.
-	use ffmpeg || use gstreamer || media+=",none"
-	use ffmpeg && media+=",ffmpeg"
-	use gstreamer && media+=",gst"
-
-	# Set gui.
-	use dump && gui="${gui},dump"
-	use fbcon && gui="${gui},fb"
-	use gtk && gui=",gtk"
-	use kde && gui="${gui},kde4"
-	use sdl && gui="${gui},sdl"
-
-	if use sdl-sound; then
-		myconf="${myconf} --enable-sound=sdl"
-	else
-		myconf="${myconf} --enable-sound=none"
-	fi
-
-	# Set extensions
-	use mysql && myext=",mysql"
-	use gtk && myext="${myext},gtk"
-	use lirc && myext="${myext},lirc"
-	use dbus && myext="${myext},dbus"
-
-	# Strip extra comma from gui, myext, hwaccel and renderers.
-	device=$( echo $device | sed -e 's/,//' )
-	gui=$( echo $gui | sed -e 's/,//' )
-	myext=$( echo $myext | sed -e 's/,//' )
-	renderers=$( echo $renderers | sed -e 's/,//' )
-	media=$( echo $media | sed -e 's/,//' )
-
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		--disable-kparts3 \
-		$(use_enable cygnal) \
-		$(use_enable cygnal cgibins) \
-		$(use_enable doc docbook) \
-		$(use_enable gnome ghelp) \
-		$(use_enable kde kparts4) \
-		$(use_enable nls) \
-		$(use_enable nsplugin npapi) \
-		$(use_enable python) \
-		$(use_enable ssh) \
-		$(use_enable ssl) \
-		$(use_enable test testsuite) \
-		$(use_with gconf) \
-		--enable-gui=${gui} \
-		--enable-device=${device} \
-		--enable-extensions=${myext} \
-		--enable-renderer=${renderers} \
-		--enable-media=${media} \
-		${myconf}
-}
-src_test() {
-	local log=testsuite-results.txt
-	cd testsuite
-	emake check || die "make check failed"
-	./anaylse-results.sh > $log || die "results analyze failed"
-	cat $log
-}
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Install nsplugin in directory set by --with-npapi-plugindir.
-	if use nsplugin; then
-		emake DESTDIR="${D}" install-plugin || die "install plugins failed"
-	fi
-
-	# Install kde konqueror plugin.
-	if use kde; then
-		pushd "${S}/plugin/klash4" >& /dev/null || die
-		emake DESTDIR="${D}" install-plugin || die "install kde plugins failed"
-		popd >& /dev/null
-	fi
-	# Create a symlink in /usr/$(get_libdir)/nsbrowser/plugins to the nsplugin install directory.
-	use nsplugin && inst_plugin /usr/$(get_libdir)/gnash/npapi/libgnashplugin.so \
-
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
-pkg_postinst() {
-	if use !gnome || use !gstreamer && use !ffmpeg ; then
-		ewarn ""
-		ewarn "Gnash was built without a media handler and or http handler !"
-		ewarn ""
-		ewarn "If you want Gnash to support video then you will need to"
-		ewarn "rebuild Gnash with either the ffmpeg or gstreamer and gnome use flags set."
-		ewarn ""
-	fi
-	ewarn "${PN} is still in heavy development"
-	ewarn "Please first report bugs on upstream gnashdevs and deal with them"
-	ewarn "And then report a Gentoo bug to the maintainer"
-	use kde && kde4-base_pkg_postinst
-}
diff --git a/www-plugins/gnash/gnash-0.8.10-r2.ebuild b/www-plugins/gnash/gnash-0.8.10-r2.ebuild
index 952fba49064f..4aa33795d901 100644
--- a/www-plugins/gnash/gnash-0.8.10-r2.ebuild
+++ b/www-plugins/gnash/gnash-0.8.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.10-r2.ebuild,v 1.5 2012/05/03 06:08:02 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.10-r2.ebuild,v 1.6 2012/05/16 11:35:05 scarabeus Exp $
 
 EAPI=4
 CMAKE_REQUIRED="never"
@@ -26,7 +26,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
 IUSE="X +agg cairo cygnal dbus directfb doc dump egl fbcon +ffmpeg gconf gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi"
 REQUIRED_USE="dump? ( agg ffmpeg )
 	fbcon? ( agg )
diff --git a/www-plugins/gnash/gnash-0.8.8.ebuild b/www-plugins/gnash/gnash-0.8.8.ebuild
deleted file mode 100644
index 7e498059af13..000000000000
--- a/www-plugins/gnash/gnash-0.8.8.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.8.ebuild,v 1.22 2012/05/03 06:08:02 jdhore Exp $
-
-EAPI=3
-CMAKE_REQUIRED="never"
-KDE_REQUIRED="optional"
-AT_M4DIR="cygnal"
-
-inherit autotools eutils kde4-base multilib nsplugins python flag-o-matic
-
-DESCRIPTION="GNU Flash movie player that supports many SWF v7,8,9 features"
-HOMEPAGE="http://www.gnu.org/software/gnash/"
-
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.savannah.gnu.org/gnash.git"
-	inherit git
-else
-	SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
-IUSE="+agg cairo cygnal dbus doc fbcon +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl python +sdl sdl-sound ssh ssl test vaapi video_cards_intel xv"
-
-# gnash fails if obsolete boost is installed, bug #334259
-RDEPEND=">=dev-libs/boost-1.41.0
-	!!dev-libs/boost:0
-	dev-libs/expat
-	dev-libs/libxml2
-	virtual/jpeg
-	media-libs/libpng
-	net-misc/curl
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXv
-	media-libs/giflib
-	x11-proto/xproto
-	agg? ( x11-libs/agg )
-	cairo? ( x11-libs/cairo )
-	doc? (
-		>=app-text/docbook2X-0.8.8
-		app-text/docbook-sgml-utils
-	)
-	ffmpeg? (
-		virtual/ffmpeg[vaapi?]
-	)
-	gstreamer? (
-		media-plugins/gst-plugins-ffmpeg
-		media-plugins/gst-plugins-mad
-		media-plugins/gst-plugins-meta
-	)
-	gtk? (
-		x11-libs/gtk+:2
-		net-libs/xulrunner:1.9
-		python? ( dev-python/pygtk:2 )
-	)
-	kde? ( $(add_kdebase_dep kdebase-startkde) )
-	opengl? (
-		virtual/opengl
-		gtk? ( x11-libs/gtkglext )
-	)
-	nsplugin? ( >=net-libs/xulrunner-1.9.2:1.9 )
-	sdl? ( media-libs/libsdl[X] )
-	sdl-sound? ( media-libs/libsdl )
-	media-libs/speex[ogg]
-	sys-libs/zlib
-	>=sys-devel/libtool-2.2
-	mysql? ( virtual/mysql )
-	lirc? ( app-misc/lirc )
-	dbus? ( sys-apps/dbus )
-	ssh?  ( >=net-libs/libssh-0.4[server] )
-	ssl? ( dev-libs/openssl )
-	vaapi? ( x11-libs/libva[opengl?] )
-	xv? ( x11-libs/libXv )
-	"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	gnome? ( app-text/rarian )
-	test? ( dev-util/dejagnu )"
-# Tests hang with sandbox, bug #321017
-RESTRICT="test"
-
-pkg_setup() {
-	if use !ffmpeg && use !gstreamer; then
-		ewarn "You are trying to build Gnash without choosing a media handler."
-		ewarn "Sound and video playback will not work."
-	fi
-
-	if use vaapi && use !ffmpeg; then
-		eerror "Support for VAAPI currently requires the ffmpeg media handler."
-		die "vaapi requires the ffmpeg USE flag."
-	fi
-
-	if use xv && use !opengl; then
-		eerror "Support for xvideo currently requires the opengl renderer."
-		die "xv requires the opengl USE flag."
-	fi
-
-	if use !agg && use !cairo && use !opengl; then
-		eerror "You are trying to build Gnash without choosing a renderer [agg|cairo|opengl]."
-		die "Please enable a renderer"
-	fi
-
-	if use !fbcon && use !kde && use !gtk && use !sdl; then
-		ewarn "You are trying to build Gnash without choosing a gui frontend [fbcon,gtk,kde,sdl]."
-		die "Please enable at least one of these USE flags."
-	fi
-
-	if use python && use !gtk; then
-		eerror "Building gnash with python support requires gtk."
-		die "python requires the gtk USE flag."
-	fi
-
-	if use nsplugin && use !gtk; then
-		eerror "Building gnash with nsplugin requires the gtk gui."
-		die "Nsplugin requires the gtk gui."
-	fi
-
-	if use fbcon && use !agg; then
-		eerror "Building gnash with fbcon requires the agg renderer."
-		die "fbcon requires the agg USE flag."
-	fi
-
-	if use sdl; then
-		einfo "Enable SDL as gui frontend and sound handler"
-	fi
-
-	if use lirc; then
-		einfo "Enable LIRC daemon support and lirc extension"
-	fi
-
-	kde4-base_pkg_setup
-}
-
-src_prepare() {
-	# TODO: Patch no longer applies
-#	epatch "${FILESDIR}"/${PN}-0.8.7-amf-include.patch
-
-	# Resurect patch from bug #230287
-	epatch "${FILESDIR}"/${PN}-0.8.3-boost-dynamic-link.patch
-
-	# Adapted from Alt Linux to fix klash support properly
-	epatch "${FILESDIR}"/${PN}-0.8.8-klash.patch
-
-	# Make gnash find moc and uic properly, upstream bug #25758,
-	# gentoo bug #283905
-	epatch "${FILESDIR}"/${PN}-0.8.7-moc-qt4.patch
-
-	# Install documentation into the proper directories, bug #296110
-	epatch "${FILESDIR}"/${PN}-0.8.8-documentation-paths.patch
-
-	# Use external dejagnu for tests, bug #321017
-	epatch "${FILESDIR}"/${PN}-0.8.8-external-dejagnu.patch
-
-	# Fix insecure creation of temporary files, bug #351724
-	epatch "${FILESDIR}"/${PN}-0.8.8-secure-tempfile-creation.patch
-
-	# Fix detection of recent ffmpeg, bug #362683
-	epatch "${FILESDIR}"/${PN}-0.8.9-ffmpeg-detection.patch
-	epatch "${FILESDIR}"/${PN}-0.8.9-libavcodec-version.patch
-	epatch "${FILESDIR}"/${PN}-0.8.9-look-harder-for-version_h.patch
-
-	# Fix building on ppc64, bug #342535
-	use ppc64 && append-flags -mminimal-toc
-
-	eautoreconf
-}
-src_configure() {
-	local gui hwaccel input media myconf myext renderers
-
-	# Set nsplugin install directory.
-	use nsplugin && myconf="${myconf} --with-npapi-plugindir=/usr/$(get_libdir)/gnash/npapi/"
-
-	# Set hardware acceleration.
-	use xv && hwaccel+=",xv"
-	use vaapi && hwaccel+=",vaapi"
-
-	# Set rendering engine.
-	use agg && renderers+=",agg"
-	use cairo && renderers+=",cairo"
-	use opengl && renderers+=",opengl"
-
-	# Set kde and konqueror plugin directories.
-	if use kde; then
-		myconf="${myconf}
-			--with-plugins-install=system
-			--with-kde4-incl=${KDEDIR}/include
-			--with-kde4-configdir=${KDEDIR}/share/config
-			--with-kde4-prefix=${KDEDIR}
-			--with-kde4-lib=${KDEDIR}/$(get_libdir)
-			--with-kde-appsdatadir=${KDEDIR}/share/apps/klash
-			--with-kde4-servicesdir=${KDEDIR}/share/kde4/services
-			--with-kde4-plugindir=${KDEDIR}/$(get_libdir)/kde4/plugins"
-	fi
-
-	# Set media handler.
-	use ffmpeg || use gstreamer || media+=",none"
-	use ffmpeg && media+=",ffmpeg"
-	use gstreamer && media+=",gst"
-
-	# Set gui.
-	use gtk && gui=",gtk"
-	use fbcon && gui="${gui},fb"
-	use kde && gui="${gui},kde4"
-	use sdl && gui="${gui},sdl"
-
-	if use sdl-sound; then
-		myconf="${myconf} --enable-sound=sdl"
-	fi
-
-	# Set extensions
-	use mysql && myext=",mysql"
-	use gtk && myext="${myext},gtk"
-	use lirc && myext="${myext},lirc"
-	use dbus && myext="${myext},dbus"
-
-	# Strip extra comma from gui, myext, hwaccel and renderers.
-	gui=$( echo $gui | sed -e 's/,//' )
-	hwaccel=$( echo $hwaccel | sed -e 's/,//' )
-	myext=$( echo $myext | sed -e 's/,//' )
-	renderers=$( echo $renderers | sed -e 's/,//' )
-	media=$( echo $media | sed -e 's/,//' )
-
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		--disable-kparts3 \
-		$(use_enable cygnal) \
-		$(use_enable cygnal cgibins) \
-		$(use_enable doc docbook) \
-		$(use_enable gnome ghelp) \
-		$(use_enable kde kparts4) \
-		$(use_enable lirc) \
-		$(use_enable nls) \
-		$(use_enable nsplugin npapi) \
-		$(use_enable python) \
-		$(use_enable ssh) \
-		$(use_enable ssl) \
-		$(use_enable test testsuite) \
-		$(use_enable video_cards_intel i810-lod-bias) \
-		--enable-gui=${gui} \
-		--enable-extensions=${myext} \
-		--enable-renderer=${renderers} \
-		--enable-hwaccel=${hwaccel} \
-		--enable-media=${media} \
-		${myconf}
-}
-src_test() {
-	local log=testsuite-results.txt
-	cd testsuite
-	emake check || die "make check failed"
-	./anaylse-results.sh > $log || die "results analyze failed"
-	cat $log
-}
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Install nsplugin in directory set by --with-npapi-plugindir.
-	if use nsplugin; then
-		emake DESTDIR="${D}" install-plugin || die "install plugins failed"
-	fi
-
-	# Install kde konqueror plugin.
-	if use kde; then
-		pushd "${S}/plugin/klash4" >& /dev/null
-		emake DESTDIR="${D}" install-plugin || die "install kde plugins failed"
-		popd >& /dev/null
-	fi
-	# Create a symlink in /usr/$(get_libdir)/nsbrowser/plugins to the nsplugin install directory.
-	use nsplugin && inst_plugin /usr/$(get_libdir)/gnash/npapi/libgnashplugin.so \
-
-	# Remove pointless .la file, bug 338831
-	if use python; then
-		rm "${D}/$(python_get_sitedir)"/gtk-2.0/${PN}.la || die
-	fi
-
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
-pkg_postinst() {
-	if has_version net-misc/curl[threads]; then
-		ewarn "net-misc/curl was built with USE=\"threads\", which causes problems."
-		ewarn "If flash animations fail to download resources such as videos, build"
-		ewarn "net-misc/curl without threading support. For details see"
-		ewarn "https://bugs.gentoo.org/show_bug.cgi?id=332757 or"
-		ewarn "https://savannah.gnu.org/bugs/?func=detailitem&item_id=30357"
-	fi
-	if use !gnome || use !gstreamer && use !ffmpeg ; then
-		ewarn ""
-		ewarn "Gnash was built without a media handler and or http handler !"
-		ewarn ""
-		ewarn "If you want Gnash to support video then you will need to"
-		ewarn "rebuild Gnash with either the ffmpeg or gstreamer and gnome use flags set."
-		ewarn ""
-	fi
-	ewarn "${PN} is still in heavy development"
-	ewarn "Please first report bugs on upstream gnashdevs and deal with them"
-	ewarn "And then report a Gentoo bug to the maintainer"
-	use kde && kde4-base_pkg_postinst
-}
diff --git a/www-plugins/gnash/gnash-0.8.9-r2.ebuild b/www-plugins/gnash/gnash-0.8.9-r2.ebuild
deleted file mode 100644
index 2740100b0303..000000000000
--- a/www-plugins/gnash/gnash-0.8.9-r2.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.9-r2.ebuild,v 1.7 2012/05/03 06:08:02 jdhore Exp $
-
-EAPI=3
-CMAKE_REQUIRED="never"
-KDE_REQUIRED="optional"
-AT_M4DIR="cygnal"
-
-inherit autotools eutils kde4-base multilib nsplugins python flag-o-matic
-
-DESCRIPTION="GNU Flash movie player that supports many SWF v7,8,9 features"
-HOMEPAGE="http://www.gnu.org/software/gnash/"
-
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.savannah.gnu.org/gnash.git"
-	inherit git-2
-else
-	SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+agg cairo cygnal dbus doc fbcon +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi"
-
-# gnash fails if obsolete boost is installed, bug #334259
-RDEPEND=">=dev-libs/boost-1.41.0
-	!!dev-libs/boost:0
-	dev-libs/expat
-	dev-libs/libxml2
-	virtual/jpeg
-	media-libs/libpng
-	net-misc/curl
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	media-libs/giflib
-	x11-proto/xproto
-	agg? ( x11-libs/agg )
-	cairo? ( x11-libs/cairo )
-	doc? (
-		>=app-text/docbook2X-0.8.8
-		app-text/docbook-sgml-utils
-	)
-	fbcon? (
-		x11-libs/tslib
-	)
-	ffmpeg? (
-		virtual/ffmpeg[vaapi?]
-	)
-	gstreamer? (
-		media-plugins/gst-plugins-ffmpeg
-		media-plugins/gst-plugins-mad
-		media-plugins/gst-plugins-meta
-	)
-	gtk? (
-		x11-libs/gtk+:2
-		net-libs/xulrunner:1.9
-		python? ( dev-python/pygtk:2 )
-	)
-	kde? ( $(add_kdebase_dep kdebase-startkde) )
-	opengl? (
-		virtual/opengl
-		gtk? ( x11-libs/gtkglext )
-	)
-	openvg? (
-		virtual/opengl
-	)
-	nsplugin? ( >=net-libs/xulrunner-1.9.2:1.9 )
-	sdl? ( media-libs/libsdl[X] )
-	sdl-sound? ( media-libs/libsdl )
-	media-libs/speex[ogg]
-	sys-libs/zlib
-	>=sys-devel/libtool-2.2
-	mysql? ( virtual/mysql )
-	lirc? ( app-misc/lirc )
-	dbus? ( sys-apps/dbus )
-	ssh?  ( >=net-libs/libssh-0.4[server] )
-	ssl? ( dev-libs/openssl )
-	vaapi? ( x11-libs/libva[opengl?] )
-	"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	gnome? ( app-text/rarian )
-	test? ( dev-util/dejagnu )"
-# Tests hang with sandbox, bug #321017
-RESTRICT="test"
-
-pkg_setup() {
-	if has_version ">=dev-libs/boost-1.46" && has_version "<dev-libs/boost-1.46"; then
-		ewarn "If you have multiple versions of boost installed, gnash may attempt to"
-		ewarn "compile against the older version and link against newer version, which can"
-		ewarn "cause the build to fail. Unmerge of the old version of boost is recommended."
-	fi
-
-	if use !ffmpeg && use !gstreamer; then
-		ewarn "You are trying to build Gnash without choosing a media handler."
-		ewarn "Sound and video playback will not work."
-	fi
-
-	if use vaapi && use !ffmpeg; then
-		eerror "Support for VAAPI currently requires the ffmpeg media handler."
-		die "vaapi requires the ffmpeg USE flag."
-	fi
-
-	if use vaapi && use !agg; then
-		eerror "Support for VAAPI currently requires the agg renderer."
-		die "vaapi requires the agg USE flag."
-	fi
-
-	if use !agg && use !cairo && use !opengl && !use openvg; then
-		eerror "You are trying to build Gnash without choosing a renderer [agg|cairo|opengl|openvg]."
-		die "Please enable a renderer"
-	fi
-
-	if use !fbcon && use !kde && use !gtk && use !sdl; then
-		ewarn "You are trying to build Gnash without choosing a gui frontend [fbcon,gtk,kde,sdl]."
-		die "Please enable at least one of these USE flags."
-	fi
-
-	if use python && use !gtk; then
-		eerror "Building gnash with python support requires gtk."
-		die "python requires the gtk USE flag."
-	fi
-
-	if use nsplugin && use !gtk; then
-		eerror "Building gnash with nsplugin requires the gtk gui."
-		die "Nsplugin requires the gtk gui."
-	fi
-
-	if use fbcon && use !agg; then
-		eerror "Building gnash with fbcon requires the agg renderer."
-		die "fbcon requires the agg USE flag."
-	fi
-
-	kde4-base_pkg_setup
-}
-
-src_prepare() {
-	# TODO: Patch no longer applies
-#	epatch "${FILESDIR}"/${PN}-0.8.7-amf-include.patch
-
-	# Look for openvg.h in correct path
-	epatch "${FILESDIR}"/${PN}-0.8.9-find-openvg.patch
-
-	# Fix paths for klash, bug #339610
-	epatch "${FILESDIR}"/${PN}-0.8.9-klash.patch
-
-	# Install documentation into the proper directories, bug #296110
-	epatch "${FILESDIR}"/${PN}-0.8.9-documentation-paths.patch
-
-	# Use external dejagnu for tests, bug #321017
-	epatch "${FILESDIR}"/${PN}-0.8.9-external-dejagnu.patch
-
-	# Fix detection of recent ffmpeg, bug #362683
-	epatch "${FILESDIR}"/${PN}-0.8.9-ffmpeg-detection.patch
-	epatch "${FILESDIR}"/${PN}-0.8.9-libavcodec-version.patch
-	epatch "${FILESDIR}"/${PN}-0.8.9-look-harder-for-version_h.patch
-
-	# Fix building against ffmpeg-0.8, bug #362949, upstream #33696
-	epatch "${FILESDIR}"/${PN}-0.8.9-no-deprecated-avcodec-audio-resample.patch
-	epatch "${FILESDIR}"/${PN}-0.8.9-no-deprecated-avcodec-decode-audio.patch
-	epatch "${FILESDIR}"/${PN}-0.8.9-no-deprecated-avcodec-decode-video.patch
-	epatch "${FILESDIR}"/${PN}-0.8.9-no-deprecated-avcodec-parser.patch
-	epatch "${FILESDIR}"/${PN}-0.8.9-no-deprecated-avformat-metadata.patch
-
-	# Fix building on ppc64, bug #342535
-	use ppc64 && append-flags -mminimal-toc
-
-	# Fix building of cygnal sshclient, bug #391915
-	epatch "${FILESDIR}"/${PN}-0.8.9-cygnal-sshclient.patch
-
-	# Fix kde multilib library path, bug #391283
-	epatch "${FILESDIR}"/${PN}-0.8.9-kde4-libdir.patch
-
-	# Fix security bug #391283
-	epatch "${FILESDIR}"/${PN}-0.8.9-cve-2011-4328.patch
-
-	eautoreconf
-}
-src_configure() {
-	local gui hwaccel input media myconf myext renderers
-
-	# Set nsplugin install directory.
-	use nsplugin && myconf="${myconf} --with-npapi-plugindir=/usr/$(get_libdir)/gnash/npapi/"
-
-	# Set hardware acceleration.
-	if use vaapi; then
-		hwaccel="vaapi"
-	else
-		hwaccel="none"
-	fi
-
-	# Set rendering engine.
-	use agg && renderers+=",agg"
-	use cairo && renderers+=",cairo"
-	use opengl && renderers+=",opengl"
-	use openvg && renderers+=",openvg"
-
-	# Set kde and konqueror plugin directories.
-	if use kde; then
-		myconf="${myconf}
-			--with-plugins-install=system
-			--with-kde4-incl=${KDEDIR}/include
-			--with-kde4-configdir=${KDEDIR}/share/config
-			--with-kde4-prefix=${KDEDIR}
-			--with-kde4-lib=${KDEDIR}/$(get_libdir)
-			--with-kde-appsdatadir=${KDEDIR}/share/apps/klash
-			--with-kde4-servicesdir=${KDEDIR}/share/kde4/services"
-	fi
-
-	# Set media handler.
-	use ffmpeg || use gstreamer || media+=",none"
-	use ffmpeg && media+=",ffmpeg"
-	use gstreamer && media+=",gst"
-
-	# Set gui.
-	use gtk && gui=",gtk"
-	use fbcon && gui="${gui},fb"
-	use kde && gui="${gui},kde4"
-	use sdl && gui="${gui},sdl"
-
-	if use sdl-sound; then
-		myconf="${myconf} --enable-sound=sdl"
-	else
-		myconf="${myconf} --enable-sound=none"
-	fi
-
-	# Set extensions
-	use mysql && myext=",mysql"
-	use gtk && myext="${myext},gtk"
-	use lirc && myext="${myext},lirc"
-	use dbus && myext="${myext},dbus"
-
-	# Strip extra comma from gui, myext, hwaccel and renderers.
-	gui=$( echo $gui | sed -e 's/,//' )
-	hwaccel=$( echo $hwaccel | sed -e 's/,//' )
-	myext=$( echo $myext | sed -e 's/,//' )
-	renderers=$( echo $renderers | sed -e 's/,//' )
-	media=$( echo $media | sed -e 's/,//' )
-
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		--disable-kparts3 \
-		$(use_enable cygnal) \
-		$(use_enable cygnal cgibins) \
-		$(use_enable doc docbook) \
-		$(use_enable gnome ghelp) \
-		$(use_enable kde kparts4) \
-		$(use_enable lirc) \
-		$(use_enable nls) \
-		$(use_enable nsplugin npapi) \
-		$(use_enable python) \
-		$(use_enable ssh) \
-		$(use_enable ssl) \
-		$(use_enable test testsuite) \
-		--enable-gui=${gui} \
-		--enable-extensions=${myext} \
-		--enable-renderer=${renderers} \
-		--enable-hwaccel=${hwaccel} \
-		--enable-media=${media} \
-		${myconf}
-}
-src_test() {
-	local log=testsuite-results.txt
-	cd testsuite
-	emake check || die "make check failed"
-	./anaylse-results.sh > $log || die "results analyze failed"
-	cat $log
-}
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Install nsplugin in directory set by --with-npapi-plugindir.
-	if use nsplugin; then
-		emake DESTDIR="${D}" install-plugin || die "install plugins failed"
-	fi
-
-	# Install kde konqueror plugin.
-	if use kde; then
-		pushd "${S}/plugin/klash4" >& /dev/null || die
-		emake DESTDIR="${D}" install-plugin || die "install kde plugins failed"
-		popd >& /dev/null
-	fi
-	# Create a symlink in /usr/$(get_libdir)/nsbrowser/plugins to the nsplugin install directory.
-	use nsplugin && inst_plugin /usr/$(get_libdir)/gnash/npapi/libgnashplugin.so \
-
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
-pkg_postinst() {
-	if use !gnome || use !gstreamer && use !ffmpeg ; then
-		ewarn ""
-		ewarn "Gnash was built without a media handler and or http handler !"
-		ewarn ""
-		ewarn "If you want Gnash to support video then you will need to"
-		ewarn "rebuild Gnash with either the ffmpeg or gstreamer and gnome use flags set."
-		ewarn ""
-	fi
-	ewarn "${PN} is still in heavy development"
-	ewarn "Please first report bugs on upstream gnashdevs and deal with them"
-	ewarn "And then report a Gentoo bug to the maintainer"
-	use kde && kde4-base_pkg_postinst
-}
diff --git a/www-plugins/gnash/gnash-0.8.9.ebuild b/www-plugins/gnash/gnash-0.8.9.ebuild
deleted file mode 100644
index 4258d231c0ed..000000000000
--- a/www-plugins/gnash/gnash-0.8.9.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.9.ebuild,v 1.9 2012/05/03 06:08:02 jdhore Exp $
-
-EAPI=3
-CMAKE_REQUIRED="never"
-KDE_REQUIRED="optional"
-AT_M4DIR="cygnal"
-
-inherit autotools eutils kde4-base multilib nsplugins python flag-o-matic
-
-DESCRIPTION="GNU Flash movie player that supports many SWF v7,8,9 features"
-HOMEPAGE="http://www.gnu.org/software/gnash/"
-
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.savannah.gnu.org/gnash.git"
-	inherit git-2
-else
-	SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+agg cairo cygnal dbus doc fbcon +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi"
-
-# gnash fails if obsolete boost is installed, bug #334259
-RDEPEND=">=dev-libs/boost-1.41.0
-	!!dev-libs/boost:0
-	dev-libs/expat
-	dev-libs/libxml2
-	virtual/jpeg
-	media-libs/libpng
-	net-misc/curl
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	media-libs/giflib
-	x11-proto/xproto
-	agg? ( x11-libs/agg )
-	cairo? ( x11-libs/cairo )
-	doc? (
-		>=app-text/docbook2X-0.8.8
-		app-text/docbook-sgml-utils
-	)
-	fbcon? (
-		x11-libs/tslib
-	)
-	ffmpeg? (
-		virtual/ffmpeg[vaapi?]
-	)
-	gstreamer? (
-		media-plugins/gst-plugins-ffmpeg
-		media-plugins/gst-plugins-mad
-		media-plugins/gst-plugins-meta
-	)
-	gtk? (
-		x11-libs/gtk+:2
-		net-libs/xulrunner:1.9
-		python? ( dev-python/pygtk:2 )
-	)
-	kde? ( $(add_kdebase_dep kdebase-startkde) )
-	opengl? (
-		virtual/opengl
-		gtk? ( x11-libs/gtkglext )
-	)
-	openvg? (
-		virtual/opengl
-	)
-	nsplugin? ( >=net-libs/xulrunner-1.9.2:1.9 )
-	sdl? ( media-libs/libsdl[X] )
-	sdl-sound? ( media-libs/libsdl )
-	media-libs/speex[ogg]
-	sys-libs/zlib
-	>=sys-devel/libtool-2.2
-	mysql? ( virtual/mysql )
-	lirc? ( app-misc/lirc )
-	dbus? ( sys-apps/dbus )
-	ssh?  ( >=net-libs/libssh-0.4[server] )
-	ssl? ( dev-libs/openssl )
-	vaapi? ( x11-libs/libva[opengl?] )
-	"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	gnome? ( app-text/rarian )
-	test? ( dev-util/dejagnu )"
-# Tests hang with sandbox, bug #321017
-RESTRICT="test"
-
-pkg_setup() {
-	if has_version ">=dev-libs/boost-1.46" && has_version "<dev-libs/boost-1.46"; then
-		ewarn "If you have multiple versions of boost installed, gnash may attempt to"
-		ewarn "compile against the older version and link against newer version, which can"
-		ewarn "cause the build to fail. Unmerge of the old version of boost is recommended."
-	fi
-
-	if use !ffmpeg && use !gstreamer; then
-		ewarn "You are trying to build Gnash without choosing a media handler."
-		ewarn "Sound and video playback will not work."
-	fi
-
-	if use vaapi && use !ffmpeg; then
-		eerror "Support for VAAPI currently requires the ffmpeg media handler."
-		die "vaapi requires the ffmpeg USE flag."
-	fi
-
-	if use vaapi && use !agg; then
-		eerror "Support for VAAPI currently requires the agg renderer."
-		die "vaapi requires the agg USE flag."
-	fi
-
-	if use !agg && use !cairo && use !opengl && !use openvg; then
-		eerror "You are trying to build Gnash without choosing a renderer [agg|cairo|opengl|openvg]."
-		die "Please enable a renderer"
-	fi
-
-	if use !fbcon && use !kde && use !gtk && use !sdl; then
-		ewarn "You are trying to build Gnash without choosing a gui frontend [fbcon,gtk,kde,sdl]."
-		die "Please enable at least one of these USE flags."
-	fi
-
-	if use python && use !gtk; then
-		eerror "Building gnash with python support requires gtk."
-		die "python requires the gtk USE flag."
-	fi
-
-	if use nsplugin && use !gtk; then
-		eerror "Building gnash with nsplugin requires the gtk gui."
-		die "Nsplugin requires the gtk gui."
-	fi
-
-	if use fbcon && use !agg; then
-		eerror "Building gnash with fbcon requires the agg renderer."
-		die "fbcon requires the agg USE flag."
-	fi
-
-	kde4-base_pkg_setup
-}
-
-src_prepare() {
-	# TODO: Patch no longer applies
-#	epatch "${FILESDIR}"/${PN}-0.8.7-amf-include.patch
-
-	# Look for openvg.h in correct path
-	epatch "${FILESDIR}"/${PN}-0.8.9-find-openvg.patch
-
-	# Fix paths for klash, bug #339610
-	epatch "${FILESDIR}"/${PN}-0.8.9-klash.patch
-
-	# Install documentation into the proper directories, bug #296110
-	epatch "${FILESDIR}"/${PN}-0.8.9-documentation-paths.patch
-
-	# Use external dejagnu for tests, bug #321017
-	epatch "${FILESDIR}"/${PN}-0.8.9-external-dejagnu.patch
-
-	# Fix detection of recent ffmpeg, bug #362683
-	epatch "${FILESDIR}"/${PN}-0.8.9-ffmpeg-detection.patch
-	epatch "${FILESDIR}"/${PN}-0.8.9-libavcodec-version.patch
-	epatch "${FILESDIR}"/${PN}-0.8.9-look-harder-for-version_h.patch
-
-	# Fix building against ffmpeg-0.8, bug #362949, upstream #33696
-	epatch "${FILESDIR}"/${PN}-0.8.9-no-deprecated-avcodec-audio-resample.patch
-	epatch "${FILESDIR}"/${PN}-0.8.9-no-deprecated-avcodec-decode-audio.patch
-	epatch "${FILESDIR}"/${PN}-0.8.9-no-deprecated-avcodec-decode-video.patch
-	epatch "${FILESDIR}"/${PN}-0.8.9-no-deprecated-avcodec-parser.patch
-	epatch "${FILESDIR}"/${PN}-0.8.9-no-deprecated-avformat-metadata.patch
-
-	# Fix building on ppc64, bug #342535
-	use ppc64 && append-flags -mminimal-toc
-
-	eautoreconf
-}
-src_configure() {
-	local gui hwaccel input media myconf myext renderers
-
-	# Set nsplugin install directory.
-	use nsplugin && myconf="${myconf} --with-npapi-plugindir=/usr/$(get_libdir)/gnash/npapi/"
-
-	# Set hardware acceleration.
-	if use vaapi; then
-		hwaccel="vaapi"
-	else
-		hwaccel="none"
-	fi
-
-	# Set rendering engine.
-	use agg && renderers+=",agg"
-	use cairo && renderers+=",cairo"
-	use opengl && renderers+=",opengl"
-	use openvg && renderers+=",openvg"
-
-	# Set kde and konqueror plugin directories.
-	if use kde; then
-		myconf="${myconf}
-			--with-plugins-install=system
-			--with-kde4-incl=${KDEDIR}/include
-			--with-kde4-configdir=${KDEDIR}/share/config
-			--with-kde4-prefix=${KDEDIR}
-			--with-kde4-lib=${KDEDIR}/$(get_libdir)
-			--with-kde-appsdatadir=${KDEDIR}/share/apps/klash
-			--with-kde4-servicesdir=${KDEDIR}/share/kde4/services"
-	fi
-
-	# Set media handler.
-	use ffmpeg || use gstreamer || media+=",none"
-	use ffmpeg && media+=",ffmpeg"
-	use gstreamer && media+=",gst"
-
-	# Set gui.
-	use gtk && gui=",gtk"
-	use fbcon && gui="${gui},fb"
-	use kde && gui="${gui},kde4"
-	use sdl && gui="${gui},sdl"
-
-	if use sdl-sound; then
-		myconf="${myconf} --enable-sound=sdl"
-	else
-		myconf="${myconf} --enable-sound=none"
-	fi
-
-	# Set extensions
-	use mysql && myext=",mysql"
-	use gtk && myext="${myext},gtk"
-	use lirc && myext="${myext},lirc"
-	use dbus && myext="${myext},dbus"
-
-	# Strip extra comma from gui, myext, hwaccel and renderers.
-	gui=$( echo $gui | sed -e 's/,//' )
-	hwaccel=$( echo $hwaccel | sed -e 's/,//' )
-	myext=$( echo $myext | sed -e 's/,//' )
-	renderers=$( echo $renderers | sed -e 's/,//' )
-	media=$( echo $media | sed -e 's/,//' )
-
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		--disable-kparts3 \
-		$(use_enable cygnal) \
-		$(use_enable cygnal cgibins) \
-		$(use_enable doc docbook) \
-		$(use_enable gnome ghelp) \
-		$(use_enable kde kparts4) \
-		$(use_enable lirc) \
-		$(use_enable nls) \
-		$(use_enable nsplugin npapi) \
-		$(use_enable python) \
-		$(use_enable ssh) \
-		$(use_enable ssl) \
-		$(use_enable test testsuite) \
-		--enable-gui=${gui} \
-		--enable-extensions=${myext} \
-		--enable-renderer=${renderers} \
-		--enable-hwaccel=${hwaccel} \
-		--enable-media=${media} \
-		${myconf}
-}
-src_test() {
-	local log=testsuite-results.txt
-	cd testsuite
-	emake check || die "make check failed"
-	./anaylse-results.sh > $log || die "results analyze failed"
-	cat $log
-}
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Install nsplugin in directory set by --with-npapi-plugindir.
-	if use nsplugin; then
-		emake DESTDIR="${D}" install-plugin || die "install plugins failed"
-	fi
-
-	# Install kde konqueror plugin.
-	if use kde; then
-		pushd "${S}/plugin/klash4" >& /dev/null || die
-		emake DESTDIR="${D}" install-plugin || die "install kde plugins failed"
-		popd >& /dev/null
-	fi
-	# Create a symlink in /usr/$(get_libdir)/nsbrowser/plugins to the nsplugin install directory.
-	use nsplugin && inst_plugin /usr/$(get_libdir)/gnash/npapi/libgnashplugin.so \
-
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
-pkg_postinst() {
-	if use !gnome || use !gstreamer && use !ffmpeg ; then
-		ewarn ""
-		ewarn "Gnash was built without a media handler and or http handler !"
-		ewarn ""
-		ewarn "If you want Gnash to support video then you will need to"
-		ewarn "rebuild Gnash with either the ffmpeg or gstreamer and gnome use flags set."
-		ewarn ""
-	fi
-	ewarn "${PN} is still in heavy development"
-	ewarn "Please first report bugs on upstream gnashdevs and deal with them"
-	ewarn "And then report a Gentoo bug to the maintainer"
-	use kde && kde4-base_pkg_postinst
-}