Do not install eglinfo, bug #463654.

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64

6 files changed, 42 insertions, 156 deletions

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index 53564d324302..2ebedce1e39a 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-plugins/gnash
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.95 2013/03/09 17:37:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.96 2013/03/28 22:06:54 chithanh Exp $
+
+*gnash-0.8.10_p20120903-r1 (28 Mar 2013)
+
+  28 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +gnash-0.8.10_p20120903-r1.ebuild, -files/gnash-0.8.10-cve-2012-1175.patch,
+  -files/gnash-0.8.10-jemalloc-aslr-fix.patch, -gnash-0.8.10-r2.ebuild,
+  gnash-0.8.10_p20120903.ebuild:
+  Do not install eglinfo, bug #463654.
 
   09 Mar 2013; Agostino Sarubbo <ago@gentoo.org> gnash-0.8.10_p20120903.ebuild:
   Stable for x86, wrt bug #456328
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index e71b29bd7427..a7fcf905a2d1 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -1,11 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX gnash-0.8.10-amf-include.patch 1245 SHA256 81f0cdf8246689614b1deaf36cf9c3e09d3501a55691ef95130d08ab1f6bc2e6 SHA512 46c2b9d4a57a1180626760ebcdbcbdc10c01fba4e01d8c45378ad26da3bf1181daaa54a2c88419452b6e691467c1ccb77374d8e926776b5f1b93ee2baa875986 WHIRLPOOL a6bc2db921b0e4cca443a0fe2b309d6e83409b93749241eeff600ae41977bcb07a8e16add81aabbf458e4a034eb8a5ed40198d7085152a2eabbd6ab742c62e89
 AUX gnash-0.8.10-boost-1.50.patch 1138 SHA256 d52ee4016c9bd764ad0eb416de7ea5fe97e543f2e04e84461d5a04f5cce52e5a SHA512 f9dcfe2dfa5f6135418e7f0b96ef0b81d9b350c62adc07935308dcb60e3c9b1df2784ee5d3b8bfee7ec0c75185a621314e3de540da27bc4af92b17b9ce87349e WHIRLPOOL b6933f8bdcad6a6fdfd1d17f3925604d2e48f60ee8ce93b45a7ae96751fa604fed6e2d369ce6fbd72975fedf1204c2d63c26ab9998f10374130468c74d75ea80
-AUX gnash-0.8.10-cve-2012-1175.patch 1934 SHA256 610b33797162481eb907ead375aa520f0ca745f3b709fd18af20f69df0aafebc SHA512 261c530f61436fda65e9eb249214878113bc2ef388f7cd21f135e301a03914ab6e5eb31ac070b56be8f03e65be35de91b3874a95249326356275bf4ce82cd213 WHIRLPOOL 3e5ac65faaefd07a16ad6dae91b632dc910248a7e44096dcf55f7b0ca26f81a14aea59af2533197e5d2145529aec6bdce78d9f94ba16b00bab6c64fbd637e848
 AUX gnash-0.8.10-gettext-macro.patch 6296 SHA256 ddacc3823ec0b87ceee618f48fbab87a083bf8047b4080bb8872b7bd19b07125 SHA512 6b1c06166b545a7cb430801db90d413dce78c2ad46239abc664ebcc24930acef4057380e7e0358b13ec8f41f48e0d277ce528e10b39dfba71ca302d0509f5b04 WHIRLPOOL 91dead0e4b9bb0a36a46b25b51b7ccdc55d5979ca837ae87485726743fde4597a4b8d5dbdebff7375de0d91cb9d7b50445672564968abccb994ebaf2232ad32e
-AUX gnash-0.8.10-jemalloc-aslr-fix.patch 1763 SHA256 00a8a9996ce6648639041309a98fe467419afd19271a557304eb5fffe981fb23 SHA512 ba15684ed94b78baf663bd1fecab873ddf903a420dfcd4bf4fd81f0d9479b20246a8b8f0c48b6f02a48dc1b57bf103ac806a2d02e88cb83dd72424f86af491fd WHIRLPOOL e331d72ac6caeded2f376b5073a2c5cadc8d948a7f73531e787b00af8b3b6432540c8cd7838192c9c5dbfb7903b1b8fd4846937bb57e216745555cd5902bdbee
 AUX gnash-0.8.10-npapi-sdk.patch 964 SHA256 16ad2ce72fc235ccce4de2962cdede30b46f057cce5c530bae2fbd1bbdd7c57c SHA512 1e514971b9ed58e8686c96b5ce3427b492702cba23fe86ecbb07c70fef860e52174b61ca2f24151db4194847d851a549cbd27d8d8b900802ec5dd34df232b1df WHIRLPOOL 14e81dd1098f3fa96afe40225b1ad966e82adfb4780ecc144d09d4f7f9fd907d013a5b8afc81e2293d54f14bf7351d908559b0767dc67f0ac62076f6b6b61653
 AUX gnash-0.8.10_p20120903-bytesfmt.patch 1031 SHA256 69aa885985928297c193c25e9d9fb2d7dfbb3458f771e2f49ef7dd1e6dc2f08b SHA512 73f44d56f3e24645b3f625b955cad6628e487d8e7bdfa187725d2e25763cf164aa18f40f7c9accbc7bdc8b965172a6d77b3c7e35a6d6762873196e91e1e9daad WHIRLPOOL 7dec49a5fac649ea9eb47d9fd211f6da8f09ceae4fea199108d7e86c07dc261a337f6f1a0c2be68e43d943736119ec445ef7d7ea059a93d837a5d167e60eb650
 AUX gnash-0.8.10_p20120903-ffmpeg1.patch 8820 SHA256 5b3845574015bb5e3606eda6bee1794a0ef63b850f174fb4cd40f7ab0ce446ba SHA512 efac7c4604c4689696179715d805cabc6efb796835defb133fa9fba457bc7abc37788429250a987f4f474a6c506d887ee63e7afaf49ad6765f900708a45f521c WHIRLPOOL 529f237a7a0bd8bd92078518672434cd14e6e09de79db129fbbc4a768e4816b2a86a183df8a752a425f3de1ac668cfca6a6d9efb77929ea9914758a84332c333
@@ -13,26 +8,8 @@ AUX gnash-0.8.10_p20120903-libav9.patch 3250 SHA256 1cd06676a41e190a9589dbdfe074
 AUX gnash-0.8.9-external-dejagnu.patch 700 SHA256 b838af0304d41165557dff2538031edf8d14d5a221375aff4b9e404ef1cb261d SHA512 1b6714e0d44d3d43dcef53622cb6a8c153a1e336a99ef5ee13de1a092e54dc1b1c346e4468e9ea66035762195bd45b84dd185370bb726427472e5b5d6b470556 WHIRLPOOL 160bbc555ba3fab4027a3287fec37a83ffbd1cd09f131168eac66bd1a14574432a9575f01e0589da56285586032bc351e84ba2ef59d619ed097532e9f92c4089
 AUX gnash-0.8.9-kde4-libdir.patch 498 SHA256 43a74367b0f7452bed23577ddda2bde692b6ce4d2bd1d56e480c4d37380af80d SHA512 df1a6faf5b3cae8a519b590ee3e26009b5a194a01f5dacc5b1862751118d1172f0babf85f7641d6b8e898d5013b6c11002c593df589c57312d842930ab964341 WHIRLPOOL 57ed37224e2c02de8ca648dc1ac172905384a254c537787d1d393e5f0b441654f74c1bd1efacf2178146ddcbfcbf11b453fc9aa4579c177168b659f69e20225f
 AUX gnash-0.8.9-klash.patch 471 SHA256 779f4be4eb25f654010b380fea4d6b092310d1f850acb040a203a7b8caf02bb8 SHA512 4a57310522ac2323eee26bb027432b12606d91add6d528b31afd69e172c73aa9f80bafc7c0a84fed4214773f901b65ddea4a7de67865f82a2984ac1dfe274c4d WHIRLPOOL a27cec3d6e62d86a42452cffad3ac376bd5a04de53818371bffa45c71c5f70e23962c0ab79293048e9358e46124352de191a5e82125069bffd8e8dbb20438696
-DIST gnash-0.8.10.tar.gz 6099894 SHA256 61fbeec6826c89e6f3fc520336a152b17901e6d0e9db207d7c4db27eeb5ceb2b SHA512 71444eedfdefc5eae14b405dea0388f94d7804fe76006ae762e8a422a2a2976bc8e7775062b052449f083c7244c53eb1e50233d1b2ee5df0efe3668e5e065578 WHIRLPOOL 2391f4425af84347f2a3b3353640cbe744d6edbbdb83040d7beed83d351145172825b85e7be5414910ce95feba6f33dc030111404473b51beeff181e2e55e3b2
 DIST gnash-0.8.10_p20120903.tar.xz 3898504 SHA256 fc250a62ad96a631a111d8439145a2f738a13adca89b6dab86f6333d4fcc4ceb SHA512 1927bd20b09240f7ffbaf62cea5944bcf86196cfb91af28edc4440ed9d1494258167f1807d49f5e72a08d28deeef17fb7e7191a5a5acc986af9cc31cf38912a7 WHIRLPOOL a1f091ca2241f9b962e45b46517f195e8b997992fbf35097cac2f5ca34fa1a4b3ed338282890ef6b2d7d0e31bf0d143577c2d9d5d25e961123dc465a78a98a55
-EBUILD gnash-0.8.10-r2.ebuild 7564 SHA256 00204208feaaaf47180ceba7b7176a38c103c8c8665078ae06a337a2805acc8b SHA512 8127bc3380834caf23053debad3b93768cc1c9d22fd42ffee172c4f2e3d94077da61945d05d77a5bba80d13cbb1659c68a46a7084bb6aaaea7b877e9837b06d8 WHIRLPOOL eaa67c4a73f21bd82603d040b38322f2da7fc663bb1fb07940a310455617f59f1afd90296ca1ee76e2029de7c34cdcb83453670452adf23be6a44c5954de52b8
-EBUILD gnash-0.8.10_p20120903.ebuild 7844 SHA256 e402e7455198141d0572512b9150de258324b5bdc7f9e829e95274801d641d6b SHA512 9d1bc4754191bbc5a7d3722b3a8ed82b34590ea8b6d9fab62642a1fc33303177feccf01abea3f2dd52dd5e74669d1e8a7c2b9fa571cb0709207354e8c6c7b089 WHIRLPOOL 4635218b9315f7775c23d1d4c1473df1c1c1ab665dd45ad33a4a8a50978f2a1ec549a6aef68c9c2058cfbb7ece7935542b472297ea078c6ac091e46bf651878c
-MISC ChangeLog 30895 SHA256 0f4fd75187390eece50dedcc0f10dd65798bb73c49e10d2b6e3ada2d78f80f1c SHA512 43184f53339ce1804b2712c2fde88e5942ff9b97d0fc7193c781327f7f92d39105c8ed1aae94169942d43f70fca75b69a312823c290b409ba28c76246198d66d WHIRLPOOL 3c92f06b131e1de58446ded3c8790fd3d77c576797ba61fc7eda58a870aeb2ad20769998efd62a61d7e8a6c79f2ea45c488d1a289457cfe7cad23cb20d67467a
+EBUILD gnash-0.8.10_p20120903-r1.ebuild 7945 SHA256 93871d9a9b33116d3206826208a7cb739893a55e8bacd1ea9e2a0c41225c5c72 SHA512 00d39b8ec21d3520f8b7b11f62fce6c550026111244b41b5cb7ff0fd3074bfd2c51305bf40fd5c895f11cf2b51a8e002f6fc78e960bb17da61848c6194b7a120 WHIRLPOOL ed1fc401fd9d0d1eb8caf0b6ef4ff5563e683019af13eed38e2c53b484d79014470a3da468b90660b6319542b6e606399ef2e78181e64659852a415caa1a241f
+EBUILD gnash-0.8.10_p20120903.ebuild 7875 SHA256 ccb9f52cc8af1a665f80608ee6471de496760a4433cb8584702d7c62e0bd2d32 SHA512 66fd44e6ad4968ad9892e26bf50353d7254b65c9368a1cc30d6cc6e94872e91673ebde6759eeb12eb5f5dcb1417da77b8e099a375b25529f94e9ee40bf673c63 WHIRLPOOL dc2d65ddf1658b882a1c4bb3dc70730690b031076fe7ef229c87ac0505c19075d606d2047b7ff66f9e6833593e2fdaeb02075c5a6255adc17c82882c82e5ab2f
+MISC ChangeLog 31234 SHA256 9f8aa435cfac1bf1587bd542eba506286d6ad5d7f4dd9f135b2d8d6c5c06315d SHA512 9cd7587afb0bd055d09ee3aa463a8e9ba416a8fac3ae1c76406354dfa2d46d0ec3a4f6011ec63698e4b4f3940017bc3f2469ccbd1bb8dc2e3ee957b0705f0628 WHIRLPOOL eefe6e1e6c1d7a325d30801b5996cd417e1856facf5576863f5d590f7ef7535bc60bf2131292c7e2aebcad5b94f502de862238ca9dfa8f92b08ca9705e95d3ef
 MISC metadata.xml 1221 SHA256 33790b61773b2705eaacea793b5d52b74263fa10feec4ed407062430fa12b285 SHA512 e8c9010d6133a798340ef306fbc461841966bf373756a73a0860cd276fa0c32b99cc8d22c8c682bd2bc8dfcc59badaad703ee5ac81fb014ae2b776eb3d9d801c WHIRLPOOL e9e4d0a84c30eb7ac3a5ab3044464fc587387e29796f5cad70e4d1ab4fffd074f7b09eb4b7156b19dd4fda0d898d099c25f1ab9c111bfc4fad3a3e9fa29d2e09
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCgAGBQJRO3NVAAoJELp701BxlEWfWwAQAKtcAdlgV5vJ4lcuBpb2XsXL
-dj7lLIbrCP3iVTVo8hHGop0+5PVOXBItQp3vcmKqNNt5G+3h1HfEBvsDUDaVx2kg
-zN1pdsbX6bquFY2uxV1UIGJOEpk53WUNC9wQKBaiK0RQI8U+YU1Him9xBvlen/wX
-i34CGNaTOhfc8qVIYBPmtpJzMrI/cEQaoEZWppYbuu5F/Qym1IXiXFZclZHwD9Yf
-HVUYASQrP9YPFK8dKNazXdHa08PczW0RlDVQnY0ZOMT2HTcmW+bmo6OHyATlsc5O
-yRpKzRB5Pjv1JPB83N/0/tJX/Ba5r7SzMse2jyV0k5/AO7cJ2ocVZKMRHjx+EHYE
-Kb9AVdhW9xs3pttu1gsRYwSJX+3RnsjelwuosZEfn6PVTbYm9hNL9+fX0zVCbO4o
-M8V4mIFy4R+clTQ+HPEymqDAOACfWB/Ec0NmrMM1Fuh0EFAWo+q4+/GsAUfhE6xV
-9ks6WFyqrLZm8lGV7ZvRQ9nwGVYjNwd6iB6ZGjIWHvPK3jGt7IhfaC+kc5vArQvv
-AHNtb9T39EiedO3y0yE/+8/EnzpWxPVGsv2c274Deu2hPrRjBevT+ZQR+y0+39JU
-AB2/mr44FmeBcw1UtncB6+3+3wN/oJCvYT4MK6+T/cn5k1RQn/HqvlEMtLc6Ydet
-2jpCK5TWm2bNeFohqwdj
-=nxyU
------END PGP SIGNATURE-----
diff --git a/www-plugins/gnash/files/gnash-0.8.10-cve-2012-1175.patch b/www-plugins/gnash/files/gnash-0.8.10-cve-2012-1175.patch
deleted file mode 100644
index 9a218d9216be..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.10-cve-2012-1175.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From bb4dc77eecb6ed1b967e3ecbce3dac6c5e6f1527 Mon Sep 17 00:00:00 2001
-From: Benjamin Wolsey <bwy@benjaminwolsey.de>
-Date: Sat, 10 Mar 2012 14:52:50 +0000
-Subject: Fix crash in GnashImage.cpp
-
----
-diff --git a/libbase/GnashImage.cpp b/libbase/GnashImage.cpp
-index 11c6956..03a6939 100644
---- a/libbase/GnashImage.cpp
-+++ b/libbase/GnashImage.cpp
-@@ -26,6 +26,7 @@
- #include <boost/scoped_array.hpp>
- #include <boost/shared_ptr.hpp>
- #include <algorithm>
-+#include <cassert>
- 
- #ifdef USE_PNG
- # include "GnashImagePng.h"
-@@ -44,6 +45,21 @@ namespace image {
- 
- namespace {
-     void processAlpha(GnashImage::iterator imageData, size_t pixels);
-+    bool checkValidSize(size_t width, size_t height, size_t channels) {
-+
-+        if (width == 0 || height == 0) return false;
-+
-+        assert(channels > 0);
-+
-+        boost::uint32_t maxSize = std::numeric_limits<boost::int32_t>::max();
-+        if (width >= maxSize || height >= maxSize) return false;
-+
-+        maxSize /= channels;
-+        maxSize /= width;
-+        maxSize /= height;
-+
-+        return maxSize > 0;
-+    }
- }
- 
- GnashImage::GnashImage(iterator data, size_t width, size_t height,
-@@ -55,6 +71,8 @@ GnashImage::GnashImage(iterator data, size_t width, size_t height,
-     _height(height),
-     _data(data)
- {
-+    // Callers should check dimensions
-+    assert(checkValidSize(_width, _height, channels()));
- }
- 
- /// Create an image allocating a buffer of height*pitch bytes
-@@ -66,8 +84,9 @@ GnashImage::GnashImage(size_t width, size_t height, ImageType type,
-     _width(width),
-     _height(height)
- {
--    const size_t max = std::numeric_limits<boost::int32_t>::max();
--    if (size() > max) {
-+    // Constructed from external input, so restrict dimensions to avoid
-+    // overflow in size calculations
-+    if (!checkValidSize(_width, _height, channels())) {
-         throw std::bad_alloc();
-     }
-     _data.reset(new value_type[size()]);
---
-cgit v0.9.0.2
diff --git a/www-plugins/gnash/files/gnash-0.8.10-jemalloc-aslr-fix.patch b/www-plugins/gnash/files/gnash-0.8.10-jemalloc-aslr-fix.patch
deleted file mode 100644
index 413744c4b3c4..000000000000
--- a/www-plugins/gnash/files/gnash-0.8.10-jemalloc-aslr-fix.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Naur gnash-0.8.10.alt/libbase/jemalloc.c gnash-0.8.10/libbase/jemalloc.c
---- gnash-0.8.10.alt/libbase/jemalloc.c	2012-02-07 09:39:41.000000000 +0100
-+++ gnash-0.8.10/libbase/jemalloc.c	2012-02-24 18:36:47.000000000 +0100
-@@ -429,7 +429,7 @@
- static const bool __isthreaded = true;
- #endif
- 
--#if defined(MOZ_MEMORY_SOLARIS) && defined(MAP_ALIGN) && !defined(JEMALLOC_NEVER_USES_MAP_ALIGN)
-+#if defined(MOZ_MEMORY_SOLARIS) && defined(MAP_ALIGN) && !defined(JEMALLOC_NEVER_USES_MAP_ALIGN) || defined(MOZ_MEMORY_LINUX)
- #define JEMALLOC_USES_MAP_ALIGN	 /* Required on Solaris 10. Might improve performance elsewhere. */
- #endif
- 
-@@ -2238,6 +2238,7 @@
- 	 * We don't use MAP_FIXED here, because it can cause the *replacement*
- 	 * of existing mappings, and we only want to create new mappings.
- 	 */
-+#ifdef MOZ_MEMORY_SOLARIS
- #ifdef MALLOC_PAGEFILE
- 	if (pfd != -1) {
- 		ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
-@@ -2252,6 +2253,31 @@
- 
- 	if (ret == MAP_FAILED)
- 		ret = NULL;
-+#else /* !MOZ_MEMORY_SOLARIS */
-+#ifdef MALLOC_PAGEFILE
-+	if (pfd != -1) {
-+		ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
-+		    MAP_NOSYNC, pfd, 0);
-+	} else
-+#endif
-+	       {
-+		ret = mmap(NULL, size + alignment, PROT_READ | PROT_WRITE, MAP_PRIVATE |
-+		    MAP_NOSYNC | MAP_ANON, -1, 0);
-+	}
-+	assert(ret != NULL);
-+
-+	if (ret == MAP_FAILED)
-+		return NULL;
-+	
-+	uintptr_t aligned_ret;
-+	size_t extra_size;
-+	aligned_ret = (uintptr_t)ret + alignment - 1;
-+	aligned_ret &= ~(alignment - 1);
-+	extra_size = aligned_ret - (uintptr_t)ret;
-+	munmap(ret, extra_size);
-+	munmap(ret + extra_size + size, alignment - extra_size);
-+	ret = (void*)aligned_ret;
-+#endif /* ifdef MOZ_MEMORY_SOLARIS*/
- 	return (ret);
- }
- #endif
diff --git a/www-plugins/gnash/gnash-0.8.10-r2.ebuild b/www-plugins/gnash/gnash-0.8.10_p20120903-r1.ebuild
index 94bb8a1cf8c6..b8bbd2538dc9 100644
--- a/www-plugins/gnash/gnash-0.8.10-r2.ebuild
+++ b/www-plugins/gnash/gnash-0.8.10_p20120903-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.10 2012/11/04 04:38:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.10_p20120903-r1.ebuild,v 1.1 2013/03/28 22:06:54 chithanh Exp $
 
-EAPI=4
+EAPI=5
 CMAKE_REQUIRED="never"
 KDE_REQUIRED="optional"
 AT_M4DIR="cygnal"
@@ -21,13 +21,13 @@ if [[ ${PV} = 9999* ]]; then
 else
 # Release tarball is b0rked, upstream #35612
 #	SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2"
-	SRC_URI="mirror://gentoo/${P}.tar.gz"
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
 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"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X +agg cairo cygnal dbus directfb doc dump egl fbcon +ffmpeg gconf gnome gstreamer gtk harden kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi"
 REQUIRED_USE="dump? ( agg ffmpeg )
 	fbcon? ( agg )
 	nsplugin? ( gtk )
@@ -124,6 +124,12 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	default
+	# rename git snapshot directory to what portage expects
+	mv ${PN}-*/ ${P} || die
+}
+
 src_prepare() {
 	# Fix paths for klash, bug #339610
 	epatch "${FILESDIR}"/${PN}-0.8.9-klash.patch
@@ -146,11 +152,13 @@ src_prepare() {
 	# 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
+	# Allow building against boost-1.50, bug #425442
+	epatch "${FILESDIR}"/${PN}-0.8.10-boost-1.50.patch
 
-	# Fix security bug bug #408209
-	epatch "${FILESDIR}"/${PN}-0.8.10-cve-2012-1175.patch
+	# fix build with ffmpeg-1 / libav-9, bug #443184
+	epatch "${FILESDIR}/${P}-ffmpeg1.patch" \
+		"${FILESDIR}/${P}-libav9.patch" \
+		"${FILESDIR}/${P}-bytesfmt.patch"
 
 	eautoreconf
 }
@@ -183,7 +191,8 @@ src_configure() {
 			--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-servicesdir=${KDEDIR}/share/kde4/services
+			--with-kde4-plugindir=${KDEDIR}/$(get_libdir)/kde4"
 	fi
 
 	# Set media handler.
@@ -225,6 +234,7 @@ src_configure() {
 		$(use_enable cygnal cgibins) \
 		$(use_enable doc docbook) \
 		$(use_enable gnome ghelp) \
+		$(use_enable harden) \
 		$(use_enable kde kparts4) \
 		$(use_enable nls) \
 		$(use_enable nsplugin npapi) \
@@ -262,7 +272,12 @@ src_install() {
 		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 \
+	use nsplugin && inst_plugin /usr/$(get_libdir)/gnash/npapi/libgnashplugin.so
+
+	# Remove eglinfo, bug #463654
+	if use egl; then
+		rm -f "${D}"/usr/bin/eglinfo || die
+	fi
 
 	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
 }
diff --git a/www-plugins/gnash/gnash-0.8.10_p20120903.ebuild b/www-plugins/gnash/gnash-0.8.10_p20120903.ebuild
index 7f46419a4243..3a62ad71ea1d 100644
--- a/www-plugins/gnash/gnash-0.8.10_p20120903.ebuild
+++ b/www-plugins/gnash/gnash-0.8.10_p20120903.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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_p20120903.ebuild,v 1.6 2013/03/09 17:37:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.10_p20120903.ebuild,v 1.7 2013/03/28 22:06:54 chithanh Exp $
 
 EAPI=4
 CMAKE_REQUIRED="never"
@@ -61,6 +61,7 @@ RDEPEND=">=dev-libs/boost-1.41.0
 	)
 	egl? (
 		media-libs/mesa[egl]
+		!x11-apps/mesa-progs[egl]
 	)
 	fbcon? (
 		x11-libs/tslib
@@ -272,7 +273,7 @@ src_install() {
 		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 \
+	use nsplugin && inst_plugin /usr/$(get_libdir)/gnash/npapi/libgnashplugin.so
 
 	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
 }