Version bump, restrict llvm version due to upstream #1157158.

(Portage version: 2.1.11.52/cvs/Linux x86_64, unsigned Manifest commit)

14 files changed, 22 insertions, 698 deletions

diff --git a/www-plugins/lightspark/ChangeLog b/www-plugins/lightspark/ChangeLog
index a40e81f9dc1c..171948638f6c 100644
--- a/www-plugins/lightspark/ChangeLog
+++ b/www-plugins/lightspark/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for www-plugins/lightspark
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.51 2013/03/04 17:29:26 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.52 2013/03/19 13:45:04 chithanh Exp $
+
+*lightspark-0.7.2 (19 Mar 2013)
+
+  19 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +lightspark-0.7.2.ebuild, -files/lightspark-0.5.7-llvm-3.1_0001.patch,
+  -files/lightspark-0.6.0.1-gcc-4.5_0000.patch,
+  -files/lightspark-0.6.0.1-gcc-4.5_0001.patch,
+  -files/lightspark-0.6.0.1-gcc-4.5_0002.patch,
+  -files/lightspark-0.6.0.1-gcc-4.5_0003.patch,
+  -files/lightspark-0.6.0.1-gcc-4.5_0004.patch,
+  -files/lightspark-0.6.0.1-gcc-4.5_0005.patch,
+  -files/lightspark-0.6.0.1-gcc-4.5_0006.patch,
+  -files/lightspark-0.7.0-libxmlpp-gles.patch,
+  -files/lightspark-0.7.0-llvm-3.2.patch, -lightspark-0.6.0.1.ebuild,
+  -lightspark-0.7.0.ebuild, lightspark-0.7.1.ebuild:
+  Version bump, restrict llvm version due to upstream #1157158.
 
 *lightspark-0.7.1 (04 Mar 2013)
 
diff --git a/www-plugins/lightspark/files/lightspark-0.5.7-llvm-3.1_0001.patch b/www-plugins/lightspark/files/lightspark-0.5.7-llvm-3.1_0001.patch
deleted file mode 100644
index 6b778c089e34..000000000000
--- a/www-plugins/lightspark/files/lightspark-0.5.7-llvm-3.1_0001.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1d9004f0cc14bff0a4f35590fa94e51c4723174d Mon Sep 17 00:00:00 2001
-From: Alessandro Pignotti <a.pignotti@sssup.it>
-Date: Sun, 27 May 2012 16:15:07 +0200
-Subject: [PATCH] Fix support for LLVM 3.1
-
----
- src/scripting/abc.cpp |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/scripting/abc.cpp b/src/scripting/abc.cpp
-index 5fdae55..de7e0f3 100644
---- a/src/scripting/abc.cpp
-+++ b/src/scripting/abc.cpp
-@@ -23,10 +23,10 @@
- #include <llvm/ExecutionEngine/JIT.h>
- #include <llvm/LLVMContext.h>
- #include <llvm/Target/TargetData.h>
--#ifdef LLVM_30
--#include <llvm/Support/TargetSelect.h>
--#else
-+#ifdef LLVM_28
- #include <llvm/Target/TargetSelect.h>
-+#else
-+#include <llvm/Support/TargetSelect.h>
- #endif
- #include <llvm/Target/TargetOptions.h>
- #include <llvm/Analysis/Verifier.h>
--- 
-1.7.10
-
diff --git a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0000.patch b/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0000.patch
deleted file mode 100644
index be2e1ae813b3..000000000000
--- a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0000.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ef5b6b87f200a3cdf1cd9fd936724677e70c568d Mon Sep 17 00:00:00 2001
-From: Alessandro Pignotti <a.pignotti@sssup.it>
-Date: Sun, 10 Jun 2012 18:57:48 +0200
-Subject: [PATCH] [Build] Avoid new for each syntax to keep GCC 4.5
- compatibility
-
----
- src/swf.cpp |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/swf.cpp b/src/swf.cpp
-index b735081..8501407 100644
---- a/src/swf.cpp
-+++ b/src/swf.cpp
-@@ -83,8 +83,8 @@ ParseThread* lightspark::getParseThread()
- 
- RootMovieClip::~RootMovieClip()
- {
--	for(DictionaryTag* it: dictionary)
--		delete it;
-+	for(auto it=dictionary.begin();it!=dictionary.end();++it)
-+		delete *it;
- }
- 
- void RootMovieClip::parsingFailed()
--- 
-1.7.10
-
diff --git a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0001.patch b/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0001.patch
deleted file mode 100644
index 7d409b5bfe6f..000000000000
--- a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0001.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 83f57ba569eab78581b3a682edca70592b2b2577 Mon Sep 17 00:00:00 2001
-From: Alessandro Pignotti <a.pignotti@sssup.it>
-Date: Sun, 10 Jun 2012 19:32:22 +0200
-Subject: [PATCH] Restore NullRef instead of std::nullptr_t
-
-std::nullptr is ambiguos since it's acceptable also as Ref constructor
-
-This reverts commit 3d243ec18be069b27774b5cef10305b48156fc1c.
----
- src/smartrefs.h |    7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/smartrefs.h b/src/smartrefs.h
-index d7f51bd..5087b2f 100644
---- a/src/smartrefs.h
-+++ b/src/smartrefs.h
-@@ -119,15 +119,14 @@ class Ref
- 	return Ref<T>(a);
- }
- 
--#if defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ < 6)
-+//#if defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ < 6)
- /* Fallback for gcc < 4.6 not supporting nullptr */
- class NullRef_t {};
- extern NullRef_t NullRef;
--#else
--/* This is needed for MSVC and can be used on gcc >= 4.6 */
-+/*#else
- typedef std::nullptr_t NullRef_t;
- #define NullRef (nullptr)
--#endif
-+#endif*/
- 
- template<class T>
- class NullableRef
--- 
-1.7.10
-
diff --git a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0002.patch b/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0002.patch
deleted file mode 100644
index dc7d165161f6..000000000000
--- a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0002.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From ea52ebb26e6b3923c6ac9b7492e67cfcc9039d4b Mon Sep 17 00:00:00 2001
-From: Alessandro Pignotti <a.pignotti@sssup.it>
-Date: Sun, 10 Jun 2012 19:35:49 +0200
-Subject: [PATCH] Restore NullRef instead of std::nullptr_t
-
-std::nullptr is ambiguos since it's acceptable also as Ref constructor
-
-This reverts commit 95fc48d50e8ae28a43585d9aa4d275ec84e4a4cf.
----
- src/scripting/abc.cpp |    2 +-
- src/smartrefs.h       |    9 +--------
- 2 files changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/src/scripting/abc.cpp b/src/scripting/abc.cpp
-index 0bad425..8110666 100644
---- a/src/scripting/abc.cpp
-+++ b/src/scripting/abc.cpp
-@@ -170,7 +170,7 @@ void ScriptLimitsTag::execute(RootMovieClip* root) const
- 
- void ABCVm::registerClasses()
- {
--	Global* builtin=Class<Global>::getInstanceS((ABCContext*)0, 0);
-+	Global* builtin=Class<Global>::getInstanceS(nullptr, 0);
- 	//Register predefined types, ASObject are enough for not implemented classes
- 	builtin->registerBuiltin("Object","",Class<ASObject>::getRef());
- 	builtin->registerBuiltin("Class","",Class_object::getRef());
-diff --git a/src/smartrefs.h b/src/smartrefs.h
-index 5087b2f..09ce760 100644
---- a/src/smartrefs.h
-+++ b/src/smartrefs.h
-@@ -119,14 +119,7 @@ class Ref
- 	return Ref<T>(a);
- }
- 
--//#if defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ < 6)
--/* Fallback for gcc < 4.6 not supporting nullptr */
--class NullRef_t {};
--extern NullRef_t NullRef;
--/*#else
--typedef std::nullptr_t NullRef_t;
- #define NullRef (nullptr)
--#endif*/
- 
- template<class T>
- class NullableRef
-@@ -136,7 +129,7 @@ class NullableRef
- public:
- 	NullableRef(): m(NULL) {}
- 	explicit NullableRef(T* o):m(o){}
--	NullableRef(NullRef_t):m(NULL){}
-+	NullableRef(std::nullptr_t):m(NULL){}
- 	NullableRef(const NullableRef& r):m(r.m)
- 	{
- 		if(m)
--- 
-1.7.10
-
diff --git a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0003.patch b/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0003.patch
deleted file mode 100644
index 9b3087e91284..000000000000
--- a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0003.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From bc81ca2f4330d2a287289317837b7ad8058cb591 Mon Sep 17 00:00:00 2001
-From: Alessandro Pignotti <a.pignotti@sssup.it>
-Date: Sun, 10 Jun 2012 19:54:54 +0200
-Subject: [PATCH] [BitmapContainer] Add ::reset
-
----
- src/scripting/flash/display/BitmapContainer.cpp |    9 +++++++++
- src/scripting/flash/display/BitmapContainer.h   |    1 +
- 2 files changed, 10 insertions(+)
-
-diff --git a/src/scripting/flash/display/BitmapContainer.cpp b/src/scripting/flash/display/BitmapContainer.cpp
-index fa480a0..e057db2 100644
---- a/src/scripting/flash/display/BitmapContainer.cpp
-+++ b/src/scripting/flash/display/BitmapContainer.cpp
-@@ -80,3 +80,12 @@ bool BitmapContainer::fromPNG(std::istream &s)
- 	return fromRGB(rgb, (int32_t)w, (int32_t)h, false);
- }
- 
-+void BitmapContainer::reset()
-+{
-+	data.clear();
-+	data.shrink_to_fit();
-+	stride=0;
-+	dataSize=0;
-+	width=0;
-+	height=0;
-+}
-diff --git a/src/scripting/flash/display/BitmapContainer.h b/src/scripting/flash/display/BitmapContainer.h
-index fb0912d..69a363d 100644
---- a/src/scripting/flash/display/BitmapContainer.h
-+++ b/src/scripting/flash/display/BitmapContainer.h
-@@ -45,6 +45,7 @@ class BitmapContainer
- 	bool fromPNG(std::istream& s);
- 	int getWidth() const { return width; }
- 	int getHeight() const { return height; }
-+	void reset();
- };
- 
- };
--- 
-1.7.10
-
diff --git a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0004.patch b/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0004.patch
deleted file mode 100644
index 65d21d3ad934..000000000000
--- a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0004.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From eded7abeb7d70a5d8dd7454c64812c49721a96d6 Mon Sep 17 00:00:00 2001
-From: Alessandro Pignotti <a.pignotti@sssup.it>
-Date: Sun, 10 Jun 2012 19:55:17 +0200
-Subject: [PATCH] Reintroduce NullRef and add comparison operators against it
-
----
- src/smartrefs.h |   16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/src/smartrefs.h b/src/smartrefs.h
-index 09ce760..85b7e06 100644
---- a/src/smartrefs.h
-+++ b/src/smartrefs.h
-@@ -119,7 +119,11 @@ class Ref
- 	return Ref<T>(a);
- }
- 
--#define NullRef (nullptr)
-+class NullRef_t
-+{
-+};
-+
-+extern NullRef_t NullRef;
- 
- template<class T>
- class NullableRef
-@@ -129,7 +133,7 @@ class NullableRef
- public:
- 	NullableRef(): m(NULL) {}
- 	explicit NullableRef(T* o):m(o){}
--	NullableRef(std::nullptr_t):m(NULL){}
-+	NullableRef(NullRef_t):m(NULL){}
- 	NullableRef(const NullableRef& r):m(r.m)
- 	{
- 		if(m)
-@@ -187,6 +191,10 @@ class NullableRef
- 	{
- 		return m==r;
- 	}
-+	bool operator==(NullRef_t) const
-+	{
-+		return m==NULL;
-+	}
- 	template<class D> bool operator!=(const NullableRef<D>& r) const
- 	{
- 		return m!=r.getPtr();
-@@ -199,6 +207,10 @@ class NullableRef
- 	{
- 		return m!=r;
- 	}
-+	bool operator!=(NullRef_t) const
-+	{
-+		return m!=NULL;
-+	}
- 	/*explicit*/ operator bool() const
- 	{
- 		return m != NULL;
--- 
-1.7.10
-
diff --git a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0005.patch b/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0005.patch
deleted file mode 100644
index 4dcbf51baa4d..000000000000
--- a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0005.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 631cb37ae66c0150a148a29df7a3c3e26dc03fb4 Mon Sep 17 00:00:00 2001
-From: Alessandro Pignotti <a.pignotti@sssup.it>
-Date: Sun, 10 Jun 2012 19:55:40 +0200
-Subject: [PATCH] Fix a couple of stale reference assignment
-
----
- src/swftypes.cpp |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/swftypes.cpp b/src/swftypes.cpp
-index 69de488..a2d05e9 100644
---- a/src/swftypes.cpp
-+++ b/src/swftypes.cpp
-@@ -761,13 +761,13 @@ inline RGBA medianColor(const RGBA& a, const RGBA& b, float factor)
- 			{
- 				//Thrown if the bitmapId does not exists in dictionary
- 				LOG(LOG_ERROR,"Exception in FillStyle parsing: " << e.what());
--				v.bitmap=NullRef;
-+				v.bitmap.reset();
- 			}
- 		}
- 		else
- 		{
- 			//The bitmap might be invalid, the style should not be used
--			v.bitmap=NullRef;
-+			v.bitmap.reset();
- 		}
- 	}
- 	else
--- 
-1.7.10
-
diff --git a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0006.patch b/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0006.patch
deleted file mode 100644
index 47ee6fb7f5d8..000000000000
--- a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0006.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2f54ea1ee730c8bb250d360949badb500d4e1687 Mon Sep 17 00:00:00 2001
-From: Alessandro Pignotti <a.pignotti@sssup.it>
-Date: Sun, 10 Jun 2012 20:20:01 +0200
-Subject: [PATCH] Do not use nullptr for compatibility with GCC 4.5
-
----
- src/scripting/abc.cpp |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/scripting/abc.cpp b/src/scripting/abc.cpp
-index 8110666..8c71a07 100644
---- a/src/scripting/abc.cpp
-+++ b/src/scripting/abc.cpp
-@@ -170,7 +170,7 @@ void ScriptLimitsTag::execute(RootMovieClip* root) const
- 
- void ABCVm::registerClasses()
- {
--	Global* builtin=Class<Global>::getInstanceS(nullptr, 0);
-+	Global* builtin=Class<Global>::getInstanceS((ABCContext*)NULL, 0);
- 	//Register predefined types, ASObject are enough for not implemented classes
- 	builtin->registerBuiltin("Object","",Class<ASObject>::getRef());
- 	builtin->registerBuiltin("Class","",Class_object::getRef());
--- 
-1.7.10
-
diff --git a/www-plugins/lightspark/files/lightspark-0.7.0-libxmlpp-gles.patch b/www-plugins/lightspark/files/lightspark-0.7.0-libxmlpp-gles.patch
deleted file mode 100644
index 523f550b189e..000000000000
--- a/www-plugins/lightspark/files/lightspark-0.7.0-libxmlpp-gles.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-diff -ur a/src/backends/netutils.cpp b/src/backends/netutils.cpp
---- a/src/backends/netutils.cpp	2012-10-28 16:49:04.000000000 +0100
-+++ b/src/backends/netutils.cpp	2012-10-30 01:05:26.947904601 +0100
-@@ -18,13 +18,13 @@
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- **************************************************************************/
- 
-+#include "backends/security.h"
- #include "scripting/abc.h"
- #include "swf.h"
- #include "backends/config.h"
- #include "backends/netutils.h"
- #include "backends/rtmputils.h"
- #include "compat.h"
--#include "backends/security.h"
- #include <string>
- #include <algorithm>
- #include <cctype>
-diff -ur a/src/main.cpp b/src/main.cpp
---- a/src/main.cpp	2012-10-28 16:49:04.000000000 +0100
-+++ b/src/main.cpp	2012-10-30 01:29:12.446786100 +0100
-@@ -18,9 +18,9 @@
- **************************************************************************/
- 
- #include "version.h"
-+#include "backends/security.h"
- #include "swf.h"
- #include "logger.h"
--#include "backends/security.h"
- #include "platforms/engineutils.h"
- #ifndef _WIN32
- #	include <sys/resource.h>
-diff -ur a/src/plugin/plugin.cpp b/src/plugin/plugin.cpp
---- a/src/plugin/plugin.cpp	2012-10-28 16:49:04.000000000 +0100
-+++ b/src/plugin/plugin.cpp	2012-10-30 01:29:26.328790120 +0100
-@@ -19,6 +19,7 @@
- **************************************************************************/
- 
- #include "version.h"
-+#include "backends/security.h"
- #include "plugin/plugin.h"
- #include "logger.h"
- #include "compat.h"
-@@ -28,7 +29,6 @@
- #	include <gdk/gdkwin32.h>
- #endif
- #include "backends/urlutils.h"
--#include "backends/security.h"
- 
- #include "plugin/npscriptobject.h"
- 
-diff -ur a/src/scripting/flash/display/flashdisplay.cpp b/src/scripting/flash/display/flashdisplay.cpp
---- a/src/scripting/flash/display/flashdisplay.cpp	2012-10-28 16:49:04.000000000 +0100
-+++ b/src/scripting/flash/display/flashdisplay.cpp	2012-10-30 01:12:42.780140945 +0100
-@@ -19,6 +19,7 @@
- 
- #include <list>
- 
-+#include "backends/security.h"
- #include "scripting/abc.h"
- #include "scripting/flash/display/flashdisplay.h"
- #include "swf.h"
-@@ -33,7 +34,6 @@
- #include "scripting/flash/display/BitmapData.h"
- #include "scripting/argconv.h"
- #include "scripting/toplevel/Vector.h"
--#include "backends/security.h"
- 
- using namespace std;
- using namespace lightspark;
-diff -ur a/src/scripting/flash/net/flashnet.cpp b/src/scripting/flash/net/flashnet.cpp
---- a/src/scripting/flash/net/flashnet.cpp	2012-10-28 16:49:04.000000000 +0100
-+++ b/src/scripting/flash/net/flashnet.cpp	2012-10-30 01:15:37.158273078 +0100
-@@ -18,6 +18,7 @@
- **************************************************************************/
- 
- #include <map>
-+#include "backends/security.h"
- #include "scripting/abc.h"
- #include "scripting/flash/net/flashnet.h"
- #include "scripting/flash/net/URLRequestHeader.h"
-@@ -27,7 +28,6 @@
- #include "backends/audio.h"
- #include "backends/builtindecoder.h"
- #include "backends/rendering.h"
--#include "backends/security.h"
- #include "scripting/argconv.h"
- 
- using namespace std;
-diff -ur a/src/scripting/flash/net/URLStream.cpp b/src/scripting/flash/net/URLStream.cpp
---- a/src/scripting/flash/net/URLStream.cpp	2012-10-28 16:49:04.000000000 +0100
-+++ b/src/scripting/flash/net/URLStream.cpp	2012-10-30 01:20:27.202448798 +0100
-@@ -18,10 +18,10 @@
- **************************************************************************/
- 
- #include <map>
-+#include "backends/security.h"
- #include "scripting/abc.h"
- #include "scripting/flash/net/URLStream.h"
- #include "scripting/flash/net/flashnet.h"
--#include "backends/security.h"
- #include "scripting/argconv.h"
- 
- /**
-diff -ur a/src/scripting/flash/net/XMLSocket.cpp b/src/scripting/flash/net/XMLSocket.cpp
---- a/src/scripting/flash/net/XMLSocket.cpp	2012-10-28 16:49:04.000000000 +0100
-+++ b/src/scripting/flash/net/XMLSocket.cpp	2012-10-30 01:23:19.454574585 +0100
-@@ -18,13 +18,13 @@
- **************************************************************************/
- 
- #include "XMLSocket.h"
-+#include "backends/security.h"
- #include "abc.h"
- #include "toplevel/Error.h"
- #include "class.h"
- #include "argconv.h"
- #include "swf.h"
- #include "flash/errors/flasherrors.h"
--#include "backends/security.h"
- #include <sys/types.h>
- #ifdef _WIN32
- #	define _WIN32_WINNT 0x0501
-diff -ur a/src/scripting/flash/sensors/flashsensors.cpp b/src/scripting/flash/sensors/flashsensors.cpp
---- a/src/scripting/flash/sensors/flashsensors.cpp	2012-10-28 16:49:04.000000000 +0100
-+++ b/src/scripting/flash/sensors/flashsensors.cpp	2012-10-30 01:20:46.299454329 +0100
-@@ -18,13 +18,13 @@
- **************************************************************************/
- 
- #include <map>
-+#include "backends/security.h"
- #include "scripting/abc.h"
- #include "scripting/flash/sensors/flashsensors.h"
- #include "scripting/class.h"
- #include "scripting/flash/system/flashsystem.h"
- #include "compat.h"
- #include "backends/audio.h"
--#include "backends/security.h"
- 
- using namespace std;
- using namespace lightspark;
-diff -ur a/src/swf.cpp b/src/swf.cpp
---- a/src/swf.cpp	2012-10-28 16:49:04.000000000 +0100
-+++ b/src/swf.cpp	2012-10-30 01:02:34.015821784 +0100
-@@ -19,6 +19,7 @@
- 
- #include <string>
- #include <algorithm>
-+#include "backends/security.h"
- #include "scripting/abc.h"
- #include "scripting/flash/events/flashevents.h"
- #include "scripting/flash/utils/flashutils.h"
-@@ -31,7 +32,6 @@
- #include "backends/config.h"
- #include "backends/pluginmanager.h"
- #include "backends/rendering.h"
--#include "backends/security.h"
- #include "backends/image.h"
- #include "backends/extscriptobject.h"
- #include "memory_support.h"
diff --git a/www-plugins/lightspark/files/lightspark-0.7.0-llvm-3.2.patch b/www-plugins/lightspark/files/lightspark-0.7.0-llvm-3.2.patch
deleted file mode 100644
index 0db5901b0cc6..000000000000
--- a/www-plugins/lightspark/files/lightspark-0.7.0-llvm-3.2.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 9a9a270423820ae87d54935d60dcb35ac2bf9ea5 Mon Sep 17 00:00:00 2001
-From: Antti Ajanki <antti.ajanki@iki.fi>
-Date: Tue, 20 Nov 2012 21:50:44 +0200
-Subject: [PATCH] Fix compilation on LLVM 3.2
-
-LP #1080123
----
- conf/FindLLVM.cmake            |   17 +++++++++++++++++
- src/scripting/abc.cpp          |   10 +++++++++-
- src/scripting/abc_codesynt.cpp |   18 +++++++++++++++---
- 3 files changed, 41 insertions(+), 4 deletions(-)
-
-diff --git a/conf/FindLLVM.cmake b/conf/FindLLVM.cmake
-index 32d32b4..7bd52e2 100644
---- a/conf/FindLLVM.cmake
-+++ b/conf/FindLLVM.cmake
-@@ -156,6 +156,23 @@ else (LLVM_INCLUDE_DIR)
-   IF(HAVE_SUPPORT_TARGETSELECT_H)
-     ADD_DEFINITIONS(-DHAVE_SUPPORT_TARGETSELECT_H)
-   ENDIF(HAVE_SUPPORT_TARGETSELECT_H)
-+
-+  set(CMAKE_REQUIRED_INCLUDES ${LLVM_INCLUDE_DIR})
-+  set(CMAKE_REQUIRED_DEFINITIONS -D__STDC_LIMIT_MACROS=1 -D__STDC_CONSTANT_MACROS=1)
-+  check_include_file_cxx("llvm/IRBuilder.h" HAVE_IRBUILDER_H)
-+  unset(CMAKE_REQUIRED_INCLUDES)
-+  MESSAGE(STATUS "HAVE_IRBUILDER_H: " ${HAVE_IRBUILDER_H})
-+  IF(HAVE_IRBUILDER_H)
-+    ADD_DEFINITIONS(-DHAVE_IRBUILDER_H)
-+  ENDIF(HAVE_IRBUILDER_H)
-+
-+  set(CMAKE_REQUIRED_INCLUDES ${LLVM_INCLUDE_DIR})
-+  check_include_file_cxx("llvm/DataLayout.h" HAVE_DATALAYOUT_H)
-+  unset(CMAKE_REQUIRED_INCLUDES)
-+  MESSAGE(STATUS "HAVE_DATALAYOUT_H: " ${HAVE_DATALAYOUT_H})
-+  IF(HAVE_DATALAYOUT_H)
-+    ADD_DEFINITIONS(-DHAVE_DATALAYOUT_H)
-+  ENDIF(HAVE_DATALAYOUT_H)
-   
-   exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --cxxflags  OUTPUT_VARIABLE LLVM_COMPILE_FLAGS )
-   MESSAGE(STATUS "LLVM CXX flags: " ${LLVM_COMPILE_FLAGS})
-diff --git a/src/scripting/abc.cpp b/src/scripting/abc.cpp
-index 962cb0e..3fef0aa 100644
---- a/src/scripting/abc.cpp
-+++ b/src/scripting/abc.cpp
-@@ -28,7 +28,11 @@
- #include <llvm/ExecutionEngine/JIT.h>
- #include <llvm/PassManager.h>
- #include <llvm/LLVMContext.h>
--#include <llvm/Target/TargetData.h>
-+#ifdef HAVE_DATALAYOUT_H
-+#  include <llvm/DataLayout.h>
-+#else
-+#  include <llvm/Target/TargetData.h>
-+#endif
- #ifdef HAVE_SUPPORT_TARGETSELECT_H
- #include <llvm/Support/TargetSelect.h>
- #else
-@@ -1459,7 +1463,11 @@ void ABCVm::Run(ABCVm* th)
- 		assert_and_throw(th->ex);
- 
- 		th->FPM=new llvm::FunctionPassManager(th->module);
-+#ifdef HAVE_DATALAYOUT_H
-+		th->FPM->add(new llvm::DataLayout(*th->ex->getDataLayout()));
-+#else
- 		th->FPM->add(new llvm::TargetData(*th->ex->getTargetData()));
-+#endif
- #ifdef EXPENSIVE_DEBUG
- 		//This is pretty heavy, do not enable in release
- 		th->FPM->add(llvm::createVerifierPass());
-diff --git a/src/scripting/abc_codesynt.cpp b/src/scripting/abc_codesynt.cpp
-index d00521b..83c1d5f 100644
---- a/src/scripting/abc_codesynt.cpp
-+++ b/src/scripting/abc_codesynt.cpp
-@@ -29,10 +29,18 @@
- #include <llvm/DerivedTypes.h>
- #include <llvm/ExecutionEngine/ExecutionEngine.h>
- #include <llvm/PassManager.h>
--#include <llvm/Constants.h> 
--#include <llvm/Support/IRBuilder.h> 
-+#include <llvm/Constants.h>
-+#ifdef HAVE_IRBUILDER_H
-+#  include <llvm/IRBuilder.h>
-+#else
-+#  include <llvm/Support/IRBuilder.h>
-+#endif
- #include <llvm/LLVMContext.h>
--#include <llvm/Target/TargetData.h>
-+#ifdef HAVE_DATALAYOUT_H
-+#  include <llvm/DataLayout.h>
-+#else
-+#  include <llvm/Target/TargetData.h>
-+#endif
- #include <sstream>
- #include "scripting/abc.h"
- #include "swftypes.h"
-@@ -271,7 +279,11 @@ void ABCVm::registerFunctions()
- 	llvm::FunctionType* FT=NULL;
- 
- 	//Create types
-+#ifdef HAVE_DATALAYOUT_H
-+	ptr_type=ex->getDataLayout()->getIntPtrType(llvm_context());
-+#else
- 	ptr_type=ex->getTargetData()->getIntPtrType(llvm_context());
-+#endif
- 	//Pointer to 8 bit type, needed for pointer arithmetic
- 	voidptr_type=llvm::IntegerType::get(getVm()->llvm_context(),8)->getPointerTo();
- 	number_type=llvm::Type::getDoubleTy(llvm_context());
--- 
-1.7.10
-
diff --git a/www-plugins/lightspark/lightspark-0.6.0.1.ebuild b/www-plugins/lightspark/lightspark-0.6.0.1.ebuild
deleted file mode 100644
index 77559ac3a953..000000000000
--- a/www-plugins/lightspark/lightspark-0.6.0.1.ebuild
+++ /dev/null
@@ -1,108 +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/lightspark/lightspark-0.6.0.1.ebuild,v 1.2 2012/08/14 13:51:17 chithanh Exp $
-
-EAPI=4
-inherit cmake-utils nsplugins multilib
-
-DESCRIPTION="High performance flash player"
-HOMEPAGE="http://lightspark.sourceforge.net/"
-SRC_URI="http://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl ffmpeg gles nsplugin profile pulseaudio rtmp sdl"
-
-RDEPEND=">=dev-cpp/libxmlpp-2.33.1:2.6
-	>=dev-libs/boost-1.42
-	dev-libs/libpcre[cxx]
-	media-fonts/liberation-fonts
-	media-libs/libsdl
-	|| (
-		>=sys-devel/llvm-3
-		=sys-devel/llvm-2.8*
-	)
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/pango
-	curl? (
-		net-misc/curl
-	)
-	ffmpeg? (
-		virtual/ffmpeg
-	)
-	!gles? (
-		>=media-libs/glew-1.5.3
-		virtual/opengl
-	)
-	gles? (
-		media-libs/mesa[gles2]
-	)
-	pulseaudio? (
-		media-sound/pulseaudio
-	)
-	rtmp? (
-		media-video/rtmpdump
-	)"
-DEPEND="${RDEPEND}
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P/_rc*/}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-4.5_0000.patch
-	"${FILESDIR}"/${P}-gcc-4.5_0001.patch
-	"${FILESDIR}"/${P}-gcc-4.5_0002.patch
-	"${FILESDIR}"/${P}-gcc-4.5_0003.patch
-	"${FILESDIR}"/${P}-gcc-4.5_0004.patch
-	"${FILESDIR}"/${P}-gcc-4.5_0005.patch
-	"${FILESDIR}"/${P}-gcc-4.5_0006.patch
-)
-
-src_configure() {
-	local audiobackends
-	use pulseaudio && audiobackends+="pulse"
-	use sdl && audiobackends+="sdl"
-
-	local mycmakeargs=(
-		$(cmake-utils_use curl ENABLE_CURL)
-		$(cmake-utils_use gles ENABLE_GLES2)
-		$(cmake-utils_use ffmpeg ENABLE_LIBAVCODEC)
-		$(cmake-utils_use nsplugin COMPILE_PLUGIN)
-		$(cmake-utils_use profile ENABLE_MEMORY_USAGE_PROFILING)
-		$(cmake-utils_use profile ENABLE_PROFILING)
-		$(cmake-utils_use rtmp ENABLE_RTMP)
-		-DAUDIO_BACKEND="${audiobackends}"
-		-DPLUGIN_DIRECTORY="${EPREFIX}"/usr/$(get_libdir)/${PN}/plugins
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use nsplugin && inst_plugin /usr/$(get_libdir)/${PN}/plugins/liblightsparkplugin.so
-
-	# default to sdl audio if pulseaudio plugin is not built, bug #406197
-	if use sdl && ! use pulseaudio; then
-		sed -i 's/backend = pulseaudio/backend = sdl/' "${ED}/etc/xdg/${PN}.conf" || die
-	fi
-}
-
-pkg_postinst() {
-	if use nsplugin && ! has_version www-plugins/gnash; then
-		elog "Lightspark now supports gnash fallback for its browser plugin."
-		elog "Install www-plugins/gnash to take advantage of it."
-	fi
-	if use nsplugin && has_version www-plugins/gnash[nsplugin]; then
-		elog "Having two plugins installed for the same MIME type may confuse"
-		elog "Mozilla based browsers. It is recommended to disable the nsplugin"
-		elog "USE flag for either gnash or lightspark. For details, see"
-		elog "https://bugzilla.mozilla.org/show_bug.cgi?id=581848"
-	fi
-}
diff --git a/www-plugins/lightspark/lightspark-0.7.1.ebuild b/www-plugins/lightspark/lightspark-0.7.1.ebuild
index 5b9cb7753624..95fbcb7a732d 100644
--- a/www-plugins/lightspark/lightspark-0.7.1.ebuild
+++ b/www-plugins/lightspark/lightspark-0.7.1.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/lightspark/lightspark-0.7.1.ebuild,v 1.1 2013/03/04 17:29:26 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.7.1.ebuild,v 1.2 2013/03/19 13:45:04 chithanh Exp $
 
 EAPI=4
 inherit cmake-utils nsplugins multilib toolchain-funcs
@@ -22,6 +22,7 @@ RDEPEND=">=dev-cpp/libxmlpp-2.33.1:2.6
 	media-libs/libsdl
 	>=sys-devel/gcc-4.6.0[cxx]
 	>=sys-devel/llvm-3
+	<sys-devel/llvm-3.3
 	x11-libs/cairo
 	x11-libs/gtk+:2
 	x11-libs/libX11
diff --git a/www-plugins/lightspark/lightspark-0.7.0.ebuild b/www-plugins/lightspark/lightspark-0.7.2.ebuild
index afd09234b6a7..d38b9438aef8 100644
--- a/www-plugins/lightspark/lightspark-0.7.0.ebuild
+++ b/www-plugins/lightspark/lightspark-0.7.2.ebuild
@@ -1,6 +1,6 @@
-# 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/lightspark/lightspark-0.7.0.ebuild,v 1.4 2012/12/22 21:15:39 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.7.2.ebuild,v 1.1 2013/03/19 13:45:04 chithanh Exp $
 
 EAPI=4
 inherit cmake-utils nsplugins multilib toolchain-funcs
@@ -22,6 +22,7 @@ RDEPEND=">=dev-cpp/libxmlpp-2.33.1:2.6
 	media-libs/libsdl
 	>=sys-devel/gcc-4.6.0[cxx]
 	>=sys-devel/llvm-3
+	<sys-devel/llvm-3.3
 	x11-libs/cairo
 	x11-libs/gtk+:2
 	x11-libs/libX11
@@ -53,11 +54,6 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P/_rc*/}
 
-PATCHES=(
-	"${FILESDIR}"/${P}-libxmlpp-gles.patch
-	"${FILESDIR}"/${P}-llvm-3.2.patch
-)
-
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 6 || $(gcc-major-version) -lt 4 ]] ; then