Version bump. Drop old.

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

5 files changed, 39 insertions, 187 deletions

diff --git a/www-plugins/lightspark/ChangeLog b/www-plugins/lightspark/ChangeLog
index 08397845e8ba..6343fe5224a2 100644
--- a/www-plugins/lightspark/ChangeLog
+++ b/www-plugins/lightspark/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-plugins/lightspark
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.45 2012/08/14 13:51:17 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.46 2012/10/29 13:36:30 chithanh Exp $
+
+*lightspark-0.7.0 (29 Oct 2012)
+
+  29 Oct 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +lightspark-0.7.0.ebuild, -files/lightspark-0.5.7-llvm-3.1_0000.patch,
+  -files/lightspark-0.5.7-llvm-3.1_0002.patch,
+  -files/lightspark-0.6.0.1-gcc-4.5_0001.patch, -lightspark-0.5.7.ebuild:
+  Version bump. Drop old.
 
   14 Aug 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   lightspark-0.6.0.1.ebuild:
diff --git a/www-plugins/lightspark/files/lightspark-0.5.7-llvm-3.1_0000.patch b/www-plugins/lightspark/files/lightspark-0.5.7-llvm-3.1_0000.patch
deleted file mode 100644
index 292ace7f6497..000000000000
--- a/www-plugins/lightspark/files/lightspark-0.5.7-llvm-3.1_0000.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From eaed71005f8cfc1a421790ea2def20882e7d25c3 Mon Sep 17 00:00:00 2001
-From: Alessandro Pignotti <a.pignotti@sssup.it>
-Date: Mon, 21 May 2012 13:05:36 +0200
-Subject: [PATCH] Add support for LLVM 3.1
-
----
- CMakeLists.txt        |    9 ++++++---
- src/scripting/abc.cpp |   14 +++++++++++++-
- src/scripting/abc.h   |    2 +-
- 3 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index be30cb1..6de575b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -229,9 +229,12 @@ ENDIF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.9)
- IF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.8)
- 	ADD_DEFINITIONS(-DLLVM_28)
- ENDIF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.8)
--IF(${LLVM_STRING_VERSION} VERSION_GREATER 2.9)
--	ADD_DEFINITIONS(-DLLVM_3)
--ENDIF(${LLVM_STRING_VERSION} VERSION_GREATER 2.9)
-+IF(${LLVM_STRING_VERSION} VERSION_EQUAL 3.0)
-+	ADD_DEFINITIONS(-DLLVM_30)
-+ENDIF(${LLVM_STRING_VERSION} VERSION_EQUAL 3.0)
-+IF(${LLVM_STRING_VERSION} VERSION_GREATER 3.0)
-+	ADD_DEFINITIONS(-DLLVM_31)
-+ENDIF(${LLVM_STRING_VERSION} VERSION_GREATER 3.0)
- INCLUDE(FindZLIB REQUIRED)
- INCLUDE(FindFreetype REQUIRED)
- IF(NOT(ENABLE_GLES2))
-diff --git a/src/scripting/abc.cpp b/src/scripting/abc.cpp
-index 59700f6..e1d2834 100644
---- a/src/scripting/abc.cpp
-+++ b/src/scripting/abc.cpp
-@@ -23,7 +23,7 @@
- #include <llvm/ExecutionEngine/JIT.h>
- #include <llvm/LLVMContext.h>
- #include <llvm/Target/TargetData.h>
--#ifdef LLVM_3
-+#ifdef LLVM_30
- #include <llvm/Support/TargetSelect.h>
- #else
- #include <llvm/Target/TargetSelect.h>
-@@ -1442,14 +1442,26 @@ void ABCVm::Run(ABCVm* th)
- 
- 	if(th->m_sys->useJit)
- 	{
-+#ifdef LLVM_31
-+		llvm::TargetOptions Opts;
-+		Opts.JITExceptionHandling = true;
-+#else
- 		llvm::JITExceptionHandling = true;
-+#endif
- #ifndef NDEBUG
-+#ifdef LLVM_31
-+		Opts.JITEmitDebugInfo = true;
-+#else
- 		llvm::JITEmitDebugInfo = true;
- #endif
-+#endif
- 		llvm::InitializeNativeTarget();
- 		th->module=new llvm::Module(llvm::StringRef("abc jit"),th->llvm_context);
- 		llvm::EngineBuilder eb(th->module);
- 		eb.setEngineKind(llvm::EngineKind::JIT);
-+#ifdef LLVM_31
-+		eb.setTargetOptions(Opts);
-+#endif
- 		eb.setOptLevel(llvm::CodeGenOpt::Default);
- 		th->ex=eb.create();
- 		assert_and_throw(th->ex);
-diff --git a/src/scripting/abc.h b/src/scripting/abc.h
-index f56a2a7..d3adfeb 100644
---- a/src/scripting/abc.h
-+++ b/src/scripting/abc.h
-@@ -23,7 +23,7 @@
- #ifdef LLVM_28
- #define alignof alignOf
- #endif
--#ifdef LLVM_3
-+#ifdef LLVM_30
- #define LLVMTYPE llvm::Type*
- #define LLVMMAKEARRAYREF(T) makeArrayRef(T)
- #else
--- 
-1.7.10
-
diff --git a/www-plugins/lightspark/files/lightspark-0.5.7-llvm-3.1_0002.patch b/www-plugins/lightspark/files/lightspark-0.5.7-llvm-3.1_0002.patch
deleted file mode 100644
index 5fd6348b2b23..000000000000
--- a/www-plugins/lightspark/files/lightspark-0.5.7-llvm-3.1_0002.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 8381e86216b4cf23102cee566104cd38e5fb9208 Mon Sep 17 00:00:00 2001
-From: alex <devkral@web.de>
-Date: Sun, 27 May 2012 17:24:37 +0200
-Subject: [PATCH] fix second compile bug with llvm 3.1
-
----
- src/scripting/abc.h |    8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/src/scripting/abc.h b/src/scripting/abc.h
-index 8ec3e8c..c8839cf 100644
---- a/src/scripting/abc.h
-+++ b/src/scripting/abc.h
-@@ -22,13 +22,11 @@
- 
- #ifdef LLVM_28
- #define alignof alignOf
--#endif
--#ifdef LLVM_30
--#define LLVMTYPE llvm::Type*
--#define LLVMMAKEARRAYREF(T) makeArrayRef(T)
--#else
- #define LLVMTYPE const llvm::Type*
- #define LLVMMAKEARRAYREF(T) T
-+#else
-+#define LLVMTYPE llvm::Type*
-+#define LLVMMAKEARRAYREF(T) makeArrayRef(T)
- #endif
- 
- #include "compat.h"
--- 
-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/lightspark-0.5.7.ebuild b/www-plugins/lightspark/lightspark-0.7.0.ebuild
index bffb1ed5aab4..c6689757231a 100644
--- a/www-plugins/lightspark/lightspark-0.5.7.ebuild
+++ b/www-plugins/lightspark/lightspark-0.7.0.ebuild
@@ -1,9 +1,9 @@
 # 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.5.7.ebuild,v 1.2 2012/06/03 13:31:33 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.7.0.ebuild,v 1.1 2012/10/29 13:36:30 chithanh Exp $
 
 EAPI=4
-inherit cmake-utils nsplugins multilib versionator
+inherit cmake-utils nsplugins multilib
 
 DESCRIPTION="High performance flash player"
 HOMEPAGE="http://lightspark.sourceforge.net/"
@@ -12,59 +12,61 @@ SRC_URI="http://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="nsplugin profile pulseaudio rtmp sdl"
+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
-	virtual/ffmpeg
-	media-libs/fontconfig
-	media-libs/ftgl
-	>=media-libs/glew-1.5.3
+	media-libs/libpng
 	media-libs/libsdl
+	>=sys-devel/llvm-3
+	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
 	)
-	net-misc/curl
-	>=sys-devel/gcc-4.4
-	|| (
-		>=sys-devel/llvm-3
-		=sys-devel/llvm-2.8*
-	)
-	virtual/opengl
-	nsplugin? (
-		dev-libs/nspr
-		x11-libs/gtk+:2
-		x11-libs/gtkglext
-	)
-	x11-libs/libX11"
+	virtual/jpeg"
 DEPEND="${RDEPEND}
-	dev-lang/nasm
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/nasm )
 	virtual/pkgconfig"
 
 S=${WORKDIR}/${P/_rc*/}
 
-PATCHES=(
-	"${FILESDIR}"/${P}-llvm-3.1_0000.patch
-	"${FILESDIR}"/${P}-llvm-3.1_0001.patch
-	"${FILESDIR}"/${P}-llvm-3.1_0002.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=/usr/$(get_libdir)/${PN}/plugins
+		-DPLUGIN_DIRECTORY="${EPREFIX}"/usr/$(get_libdir)/${PN}/plugins
 	)
 
 	cmake-utils_src_configure