Version bump, bug #403177. Force python-2 during build, bug #392969.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

6 files changed, 504 insertions, 3 deletions

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index 4b63666120b8..ea94adb9c09e 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,13 @@
 # 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.73 2012/02/01 17:14:47 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.74 2012/02/24 00:07:21 chithanh Exp $
+
+*gnash-0.8.10 (24 Feb 2012)
+
+  24 Feb 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +gnash-0.8.10.ebuild, +files/gnash-0.8.10-amf-include.patch,
+  +files/gnash-0.8.10-gettext-macro.patch, metadata.xml:
+  Version bump, bug #403177. Force python-2 during build, bug #392969.
 
   01 Feb 2012; Brent Baude <ranger@gentoo.org> gnash-0.8.9-r2.ebuild:
   Mistakenly commited. Back to ~ppc gnash-0.8.9-r2
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index eba50690a7cb..1c723a6fdcf1 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -1,3 +1,5 @@
+AUX gnash-0.8.10-amf-include.patch 1245 RMD160 78108fb568c5ce5055f45fd388944d1e73206295 SHA1 2f82807f003b2f03cbd29e0ed27d14ff1442ebd9 SHA256 81f0cdf8246689614b1deaf36cf9c3e09d3501a55691ef95130d08ab1f6bc2e6
+AUX gnash-0.8.10-gettext-macro.patch 6296 RMD160 3898b588c07ae9786f429cb3d37c717d4783eeae SHA1 7f2fbd108eae2f0af15c5120c15afe31969b6c73 SHA256 ddacc3823ec0b87ceee618f48fbab87a083bf8047b4080bb8872b7bd19b07125
 AUX gnash-0.8.3-boost-dynamic-link.patch 1474 RMD160 0ce418d9e7a0f4d5b3bc724c65dedc3c675b69ef SHA1 df6ae427a0efda13da822ca65700aebcb25ef504 SHA256 d3ada2ca33083b0b233051f66041eb57c402783b2cc177b126e4dccab2e32b76
 AUX gnash-0.8.5-klash.patch 4219 RMD160 f7d49ca32cf18d3d160ce8f0653fd12e5a278511 SHA1 fc44e119975ecc49d2d64450e0eeb92f6a84f893 SHA256 e1ad6b241bc28892ff9758d55851439b2b61b496dc2e73d96d9a13fdd44a4a08
 AUX gnash-0.8.7-amf-include.patch 1121 RMD160 5e17e26f5033816f011ccee9b943588fd55986a4 SHA1 955b1e17ddad3f2cca3cadb73e84c52714f57f3c SHA256 ea3a2324c061828142f715c9e40dbf21007e5230b1f81f8dbea7a8313bcc86bd
@@ -21,10 +23,12 @@ AUX gnash-0.8.9-no-deprecated-avcodec-decode-audio.patch 931 RMD160 4a980c8329aa
 AUX gnash-0.8.9-no-deprecated-avcodec-decode-video.patch 753 RMD160 106cfee3903fcc23b1c473052d7ebd7bbd75e091 SHA1 baf4ab006ab3ded69eba3bbb0e801fdfae4e5eee SHA256 0f80bf395f015443a1e15c44a9492f87604e1176f231254a5e26d3b776f6f2c7
 AUX gnash-0.8.9-no-deprecated-avcodec-parser.patch 807 RMD160 09b2b0eb0bcf4dd5f52863ef221e92322d5b4e0d SHA1 67013b85dcd88641477951127db0003f8c8b9fc8 SHA256 9ad06584eb75218c300e732b461e275759963931b8e0fb4ad1dd8852fa77b6d3
 AUX gnash-0.8.9-no-deprecated-avformat-metadata.patch 1299 RMD160 a88e744b8886ad53cbf871212be2c2cbef3632b1 SHA1 d74e350e788d6f87b9c886bb6c7775e940e20bf0 SHA256 c2b72cbcab71756c285c207870175aadc0bd5619f364f2ede7b008c0b6d5aa1d
+DIST gnash-0.8.10.tar.gz 6099894 RMD160 72debb3e64853450fe74b7f1d6e9b40b9ae70964 SHA1 4f8ace5af1a327718f353d5294b589f3251f41ae SHA256 61fbeec6826c89e6f3fc520336a152b17901e6d0e9db207d7c4db27eeb5ceb2b
 DIST gnash-0.8.8.tar.bz2 3850383 RMD160 621afbd14180ce770f60a6e158f9fda0b4d5ec02 SHA1 d349e0321e7fe9abcd265d63ce282cd2a7ce59d3 SHA256 dcac4b81f81ecd6cc7c5422d7c731fc5c2a7be7fb18b5570a7e6f8fb5fc6e220
 DIST gnash-0.8.9.tar.bz2 3777140 RMD160 34bb51cfe5b8593dc14bc2c21c0085277dbb23f1 SHA1 585c320c98b3304fcbba230f2c4b1fdf2a52aee0 SHA256 f90dbdc6f03d787b239b9edacbea077b46d69ae9d85f08af23f256af389c48bd
+EBUILD gnash-0.8.10.ebuild 7617 RMD160 c0c1ff14e8ca0fecc85f2538d421653d74101551 SHA1 bd07e9a56b957d0945fe40d55dfabe7922014606 SHA256 2e730d4ad10f20ccccfd5b2bc4dfac1bc48823c581bffa51b577f1c7d1ad8524
 EBUILD gnash-0.8.8.ebuild 9006 RMD160 cd9a10d9b7b121b638bac179c97de26771e66542 SHA1 f6b0ae7862286aabbbd34e99a318021136ae33bc SHA256 594842337ae216fa7a89112298f00e2a1c74609af4a4b48f3e39b4b2dc82b380
 EBUILD gnash-0.8.9-r2.ebuild 9118 RMD160 1d2c163338940197f734f7dfb8adb935ead89a2c SHA1 b4159f25a03280bc60c4562cfbef30973be1bd6c SHA256 52f4250e39beeada4c56d45f8fcd3e1de143287c91249c9c82de5a2c2cb2d720
 EBUILD gnash-0.8.9.ebuild 8830 RMD160 b3e6ab1a6a6ce84c502af1647e4e58b65e110809 SHA1 f6fd90d100132b8658428cf3cafc8cbe6bec1c8d SHA256 8a3c33a3a82619f22863e32fb83e264193cfe94132491535fb919a9ed863478a
-MISC ChangeLog 26014 RMD160 01a7828542ab61edbc6a605e2e5e4f866a636a8c SHA1 1255676bd044355cf30be9bc6ad320ef15359e8d SHA256 a16036c02f6ac29aeaf3caad9ea972fc86a76e4be402e699c5068f871b67bc12
-MISC metadata.xml 876 RMD160 c66baf8ded1d751eda1c55992f39a189931f1a9f SHA1 bc490cb83a3ed47c561f2975c61400c8bc867be4 SHA256 b087a4196095d60ce0949b9374c4077322aca887bd6e0019c5dc34762d199152
+MISC ChangeLog 26306 RMD160 fa63470d9de9097db2a9209a57dbb2d2d552e8d5 SHA1 8c25e9731d6964754dce7c608b8e0b8b3cc1cd4d SHA256 e7c53e0e7a0af4aa78e4bd1a5318042ef7a8378eaa4f4b07cae91fa9264f0666
+MISC metadata.xml 963 RMD160 47638585582102889f4092c0af62a269078eb21a SHA1 5693acc070729ed652c2585c585adc1cea5e27cf SHA256 5faf0785cc036e027d5c00fbf5136563b1ae615a479c8ec3fd386b0e136dc89e
diff --git a/www-plugins/gnash/files/gnash-0.8.10-amf-include.patch b/www-plugins/gnash/files/gnash-0.8.10-amf-include.patch
new file mode 100644
index 000000000000..983fa6b70eb1
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.10-amf-include.patch
@@ -0,0 +1,45 @@
+diff -ur a/cygnal/libnet/cque.h b/cygnal/libnet/cque.h
+--- a/cygnal/libnet/cque.h	2012-01-19 20:17:47.000000000 +0100
++++ b/cygnal/libnet/cque.h	2012-02-23 20:13:39.000000000 +0100
+@@ -25,8 +25,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/cygnal/libnet/sshclient.h b/cygnal/libnet/sshclient.h
+--- a/cygnal/libnet/sshclient.h	2012-01-19 20:17:47.000000000 +0100
++++ b/cygnal/libnet/sshclient.h	2012-02-23 20:13:09.000000000 +0100
+@@ -32,9 +32,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/cygnal/libnet/sslclient.h b/cygnal/libnet/sslclient.h
+--- a/cygnal/libnet/sslclient.h	2012-01-19 20:17:47.000000000 +0100
++++ b/cygnal/libnet/sslclient.h	2012-02-23 20:13:21.000000000 +0100
+@@ -36,10 +36,11 @@
+ #include <openssl/err.h>
+ #endif
+ 
++#include "../libamf/amf.h"
+ #include "dsodefs.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.10-gettext-macro.patch b/www-plugins/gnash/files/gnash-0.8.10-gettext-macro.patch
new file mode 100644
index 000000000000..0501f745581f
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.10-gettext-macro.patch
@@ -0,0 +1,170 @@
+diff -ur a/libdevice/vaapi/VaapiImage.cpp b/libdevice/vaapi/VaapiImage.cpp
+--- a/libdevice/vaapi/VaapiImage.cpp	2012-01-19 20:17:48.000000000 +0100
++++ b/libdevice/vaapi/VaapiImage.cpp	2012-02-23 19:05:13.000000000 +0100
+@@ -35,7 +35,7 @@
+     : _format(format)
+     , _image_data(NULL)
+ {
+-    log_debug(_("VaapiImage::VaapiImage(): format '%s'\n", string_of_FOURCC(format)));
++    log_debug("VaapiImage::VaapiImage(): format '%s'\n", string_of_FOURCC(format));
+ 
+     memset(&_image, 0, sizeof(_image));
+     _image.image_id = VA_INVALID_ID;
+@@ -79,7 +79,7 @@
+     if (!vaapi_check_status(status, "vaCreateImage()"))
+         return false;
+ 
+-    log_debug(_("  image 0x%08x, format '%s'\n", get(), string_of_FOURCC(_format)));
++    log_debug("  image 0x%08x, format '%s'\n", get(), string_of_FOURCC(_format));
+ 
+     return true;
+ }
+diff -ur a/libdevice/vaapi/VaapiSubpicture.cpp b/libdevice/vaapi/VaapiSubpicture.cpp
+--- a/libdevice/vaapi/VaapiSubpicture.cpp	2012-01-19 20:17:48.000000000 +0100
++++ b/libdevice/vaapi/VaapiSubpicture.cpp	2012-02-23 19:05:13.000000000 +0100
+@@ -32,7 +32,7 @@
+     : _image(image)
+     , _subpicture(VA_INVALID_ID)
+ {
+-    log_debug(_("VaapiSubpicture::VaapiSubpicture(): format '%s'\n", string_of_FOURCC(image->format())));
++    log_debug("VaapiSubpicture::VaapiSubpicture(): format '%s'\n", string_of_FOURCC(image->format()));
+ 
+     if (!create()) {
+         boost::format msg;
+diff -ur a/libdevice/vaapi/VaapiSurface.cpp b/libdevice/vaapi/VaapiSurface.cpp
+--- a/libdevice/vaapi/VaapiSurface.cpp	2012-01-19 20:17:48.000000000 +0100
++++ b/libdevice/vaapi/VaapiSurface.cpp	2012-02-23 19:05:13.000000000 +0100
+@@ -74,7 +74,7 @@
+ 
+ VaapiSurfaceImpl::~VaapiSurfaceImpl()
+ {
+-    log_debug(_("VaapiSurface::~VaapiSurface(): surface 0x%08x\n", surface()));
++    log_debug("VaapiSurface::~VaapiSurface(): surface 0x%08x\n", surface());
+ 
+     if (surface() == VA_INVALID_SURFACE) {
+         return;
+diff -ur a/libdevice/vaapi/VaapiSurfaceGLX.cpp b/libdevice/vaapi/VaapiSurfaceGLX.cpp
+--- a/libdevice/vaapi/VaapiSurfaceGLX.cpp	2012-01-19 20:17:48.000000000 +0100
++++ b/libdevice/vaapi/VaapiSurfaceGLX.cpp	2012-02-23 19:05:13.000000000 +0100
+@@ -202,14 +202,14 @@
+ 
+     reset(reinterpret_cast<uintptr_t>(surface));
+ 
+-    log_debug(_("  -> surface %p\n", this->surface()));
++    log_debug("  -> surface %p\n", this->surface());
+ }
+ 
+ VaapiSurfaceGLXImpl::~VaapiSurfaceGLXImpl()
+ {
+     // GNASH_REPORT_FUNCTION;
+ 
+-    log_debug(_("VaapiSurface::~VaapiSurface(): surface %p\n", surface()));
++    log_debug("VaapiSurface::~VaapiSurface(): surface %p\n", surface());
+ 
+     if (!surface()) {
+         return;
+@@ -263,7 +263,7 @@
+ 
+ bool VaapiSurfaceGLX::update(boost::shared_ptr<VaapiSurface> surface)
+ {
+-    log_debug(_("VaapiSurfaceGLX::update(): from surface 0x%08x\n", surface->get()));
++    log_debug("VaapiSurfaceGLX::update(): from surface 0x%08x\n", surface->get());
+ 
+     return dynamic_cast<VaapiSurfaceGLXImpl *>(_impl.get())->update(surface);
+ }
+diff -ur a/libdevice/vaapi/VaapiSurfaceProxy.cpp b/libdevice/vaapi/VaapiSurfaceProxy.cpp
+--- a/libdevice/vaapi/VaapiSurfaceProxy.cpp	2012-01-19 20:17:48.000000000 +0100
++++ b/libdevice/vaapi/VaapiSurfaceProxy.cpp	2012-02-23 19:05:13.000000000 +0100
+@@ -28,12 +28,12 @@
+                                      boost::shared_ptr<VaapiContext> context)
+     : _context(context), _surface(surface)
+ {
+-    log_debug(_("VaapiSurfaceProxy::VaapiSurfaceProxy(): surface 0x%08x\n", _surface->get()));
++    log_debug("VaapiSurfaceProxy::VaapiSurfaceProxy(): surface 0x%08x\n", _surface->get());
+ }
+     
+ VaapiSurfaceProxy::~VaapiSurfaceProxy()
+ {
+-    log_debug(_("VaapiSurfaceProxy::~VaapiSurfaceProxy(): surface 0x%08x\n", _surface->get()));
++    log_debug("VaapiSurfaceProxy::~VaapiSurfaceProxy(): surface 0x%08x\n", _surface->get());
+ 
+     _context->releaseSurface(_surface);
+ }
+diff -ur a/libdevice/x11/X11Device.cpp b/libdevice/x11/X11Device.cpp
+--- a/libdevice/x11/X11Device.cpp	2012-01-19 20:17:48.000000000 +0100
++++ b/libdevice/x11/X11Device.cpp	2012-02-23 19:05:13.000000000 +0100
+@@ -85,7 +85,7 @@
+     GNASH_REPORT_FUNCTION;
+ 
+     if (!initDevice(0, 0)) {
+-        log_error(_("Couldn't initialize X11 device!"));
++        log_error("Couldn't initialize X11 device!");
+     }
+ }
+ 
+@@ -103,7 +103,7 @@
+     GNASH_REPORT_FUNCTION;
+     
+     if (!initDevice(argc, argv)) {
+-        log_error(_("Couldn't initialize X11 device!"));
++        log_error("Couldn't initialize X11 device!");
+     }
+ }
+ 
+@@ -139,7 +139,7 @@
+ 
+     _display = XOpenDisplay(dpyName);
+     if (!_display) {
+-        log_error(_("couldn't open X11 display!"));
++        log_error("couldn't open X11 display!");
+         return false;
+     }
+ 
+@@ -159,7 +159,7 @@
+     _vinfo = XGetVisualInfo(_display, VisualIDMask, &visTemplate, &num_visuals);
+     std::cerr << "Num Visuals: " << num_visuals << std::endl;
+     if (!_vinfo) {
+-        log_error(_("Error: couldn't get X visual\n"));
++         log_error("Error: couldn't get X visual\n");
+          exit(1);
+     }
+     std::cerr << "X11 visual is: " << _vinfo->visual << std::endl;
+@@ -196,7 +196,7 @@
+     if (_display) {
+         XGetErrorText(_display, error, msg, 80);
+     } else {
+-        log_error(_("The default Display is not set!"));
++        log_error("The default Display is not set!");
+     }
+ 
+     return msg;
+@@ -209,12 +209,12 @@
+     GNASH_REPORT_FUNCTION;
+ 
+     if (!_display) {
+-        log_error(_("No Display device set!"));
++        log_error("No Display device set!");
+         return;
+     }
+     
+     if (!_root) {
+-        log_error(_("No drawable window set!"));
++        log_error("No drawable window set!");
+         return;
+     }
+ 
+@@ -279,11 +279,11 @@
+           case KeyPress:
+           {
+               char buffer[10];
+-              int code;
++              int r, code;
+               code = XLookupKeysym(&event.xkey, 0);
+               if (!keyPress || !keyPress(code)) {
+-                  // int r = XLookupString(&event.xkey, buffer, sizeof(buffer),
+-                  //                   NULL, NULL);
++                  r = XLookupString(&event.xkey, buffer, sizeof(buffer),
++                                    NULL, NULL);
+                   if (buffer[0] == 27) {
+                       // escape
+                       return;
diff --git a/www-plugins/gnash/gnash-0.8.10.ebuild b/www-plugins/gnash/gnash-0.8.10.ebuild
new file mode 100644
index 000000000000..1b70b43d84c1
--- /dev/null
+++ b/www-plugins/gnash/gnash-0.8.10.ebuild
@@ -0,0 +1,274 @@
+# 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.ebuild,v 1.1 2012/02/24 00:07:21 chithanh 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="http://git.savannah.gnu.org/cgit/gnash.git/snapshot/gnash-0.8.10.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X +agg cairo cygnal dbus directfb doc egl fbcon +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi"
+REQUIRED_USE="fbcon? ( agg )
+	nsplugin? ( gtk )
+	python? ( gtk )
+	vaapi? ( agg ffmpeg )
+	|| ( agg cairo opengl openvg )
+	|| ( fbcon kde gtk 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?]
+	)
+	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}
+	dev-util/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
+
+	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 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.
+	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) \
+		--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/metadata.xml b/www-plugins/gnash/metadata.xml
index 68ab14dbffdb..64a6f8b48ccc 100644
--- a/www-plugins/gnash/metadata.xml
+++ b/www-plugins/gnash/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 	  <flag name='agg'>Rendering based on the Anti-Grain Geometry Rendering Engine library</flag>
+	  <flag name='egl'>Enable EGL support for the OpenVG, OpenGL and X11 renderers</flag>
 	  <flag name='cygnal'>Enable building of the cygnal server</flag>
 	  <flag name='openvg'>Rendering based on the OpenVG graphics acceleration API</flag>
 	  <flag name='sdl-sound'>Enable SDL audio output for the standalone player</flag>