Version bump, bug #346841. Now builds against llvm-2.8, bug #340437.

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

4 files changed, 37 insertions, 8 deletions

diff --git a/www-plugins/lightspark/ChangeLog b/www-plugins/lightspark/ChangeLog
index e75c3f6beecf..0b42bd0febba 100644
--- a/www-plugins/lightspark/ChangeLog
+++ b/www-plugins/lightspark/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-plugins/lightspark
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.19 2010/10/18 16:20:16 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.20 2010/12/12 16:09:37 chithanh Exp $
+
+*lightspark-0.4.5 (12 Dec 2010)
+
+  12 Dec 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -lightspark-0.4.4.3.ebuild, +lightspark-0.4.5.ebuild,
+  +files/lightspark-0.4.5-allow-disabling-pulseaudio.patch:
+  Version bump, bug #346841. Now builds against llvm-2.8, bug #340437.
 
 *lightspark-0.4.4.3 (18 Oct 2010)
 
diff --git a/www-plugins/lightspark/Manifest b/www-plugins/lightspark/Manifest
index ae923402e270..171bde340c5e 100644
--- a/www-plugins/lightspark/Manifest
+++ b/www-plugins/lightspark/Manifest
@@ -1,5 +1,6 @@
 AUX lightspark-0.4.4.3-cmakelists.patch 1455 RMD160 5ed9cf666c416b39f6d4cb0efb5c96ac14b72144 SHA1 1aed7959cd4591aa2d05df63624a6614abf47fb3 SHA256 88ca299c41502a0d1aa170c78983142e15a3388bef133fafca00d0255058ab5d
-DIST lightspark-0.4.4.3.tar.gz 455697 RMD160 442a7412ac82df6e07bc003c3004ccd7097b580e SHA1 f13617d78185e500e11e6eb626a99e6b4113d850 SHA256 8269713c244e38703af88bf26cc41359fe4546713a8c56d855fffd26fa48f5cc
-EBUILD lightspark-0.4.4.3.ebuild 2113 RMD160 2c99900a318c3526ad7c387f0eef75ccee2c641b SHA1 d04909abb6d58013e6dd133d707d66701e537cd9 SHA256 8c6ef4c0e37ea877671c58535efa7444f6c4e0696a712a66b619e33302a82f01
-MISC ChangeLog 4404 RMD160 d033b9640c63d8b8607109141b5baa91ddfbda17 SHA1 0624a36221b7c51ba10c04a2fe96b2cc119f6e33 SHA256 3bfd186cb4abda5596e5a1264943b057d8159b46d856d2c991a8975bea6aa3e9
+AUX lightspark-0.4.5-allow-disabling-pulseaudio.patch 1163 RMD160 1b28a590198b737914450e4dd30044ea22b04801 SHA1 8e4ebfaa96d47738683b51efc61bb90502425b4d SHA256 74db9388a411ba480a1b688be1ede8f11ba119c5deb48e02b775bf0e94ddf460
+DIST lightspark-0.4.5.tar.gz 470186 RMD160 50269b5e10befb53eb43e4dc47b2926c940754a8 SHA1 3b0db70c20b67ed3e758b75fe31d885e916a3870 SHA256 b6d9dbd57d61f7ca5b645e290c1ec4b21c739ab8f6601ff75400b89a65226404
+EBUILD lightspark-0.4.5.ebuild 2087 RMD160 cf9370c03de302121dde847a3e10a6400d2e7e63 SHA1 c55e177b1703857d0ece26fed349d6ed570f1afa SHA256 f7c6b9a487fd3dd845f3d0be21e7f84e65bb515480fbea3962d27d1bc51d5910
+MISC ChangeLog 4694 RMD160 c1c47bc5c84d5ed648b6ed8764f935319319cacc SHA1 4628be81d0adf30b65ef3304923e4a1d58735c50 SHA256 edcbe0edc098b0f4ab1166fef7fac6fe59b780801703cbe9bf4d1c03bf086d54
 MISC metadata.xml 275 RMD160 1b1d48ace7eb30ee16b7cd1c33dd9fa695817f08 SHA1 8e66ce36ba12401c927e1b7394b652962a979a52 SHA256 9fcd14bdea1cdbac9fa4d44a3c9728877d7b87266c3553f6519a7aaec9795009
diff --git a/www-plugins/lightspark/files/lightspark-0.4.5-allow-disabling-pulseaudio.patch b/www-plugins/lightspark/files/lightspark-0.4.5-allow-disabling-pulseaudio.patch
new file mode 100644
index 000000000000..f09e3552293e
--- /dev/null
+++ b/www-plugins/lightspark/files/lightspark-0.4.5-allow-disabling-pulseaudio.patch
@@ -0,0 +1,22 @@
+diff -ur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2010-12-08 17:55:46.000000000 +0100
++++ b/CMakeLists.txt	2010-12-12 16:46:50.496000030 +0100
+@@ -108,6 +108,7 @@
+ SET(COMPILE_LIGHTSPARK TRUE CACHE BOOL "Compile Lightspark?")
+ SET(COMPILE_TIGHTSPARK TRUE CACHE BOOL "Compile Tightspark?")
+ SET(COMPILE_PLUGIN FALSE CACHE BOOL "Compile the browser plugin?")
++SET(AUDIO_BACKEND "pulse" CACHE STRING "Choose audio backend: none pulse alsa, default is pulse")
+ SET(ENABLE_CURL TRUE CACHE BOOL "Enable CURL? (Required for Downloader functionality)")
+ SET(ENABLE_LIBAVCODEC TRUE CACHE BOOL "Enable libavcodec and dependent functionality?")
+ SET(PLUGIN_DIRECTORY "${LIBDIR}/mozilla/plugins" CACHE STRING "Directory to install Firefox plugin to")
+@@ -371,7 +372,9 @@
+ GETTEXT_CREATE_TRANSLATIONS(i18n/lightspark.pot ALL i18n/pl.po i18n/fr.po
+         i18n/zh_CN.po)
+ 
+-ADD_SUBDIRECTORY(backends/interfaces/audio/pulse)
++IF(${AUDIO_BACKEND} MATCHES "pulse")
++  ADD_SUBDIRECTORY(backends/interfaces/audio/pulse)
++ENDIF(${AUDIO_BACKEND} MATCHES "pulse")
+ #ADD_SUBDIRECTORY(backends/interfaces/audio/alsa)
+ #ADD_SUBDIRECTORY(backends/interfaces/audio/openal)
+ 
diff --git a/www-plugins/lightspark/lightspark-0.4.4.3.ebuild b/www-plugins/lightspark/lightspark-0.4.5.ebuild
index 8ea241f7537c..3fd1c2e0b621 100644
--- a/www-plugins/lightspark/lightspark-0.4.4.3.ebuild
+++ b/www-plugins/lightspark/lightspark-0.4.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.4.4.3.ebuild,v 1.1 2010/10/18 16:20:16 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.4.5.ebuild,v 1.1 2010/12/12 16:09:36 chithanh Exp $
 
 EAPI=3
 inherit cmake-utils nsplugins multilib
 
 DESCRIPTION="High performance flash player"
 HOMEPAGE="https://launchpad.net/lightspark/"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PN}-0.4.4/+download/${P}.tar.gz"
+SRC_URI="http://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
@@ -36,9 +36,7 @@ RDEPEND="dev-cpp/libxmlpp:2.6
 		x11-libs/gtkglext
 	)
 	x11-libs/libX11"
-# Require sys-devel/llvm-2.7 during build, bug #340437
 DEPEND="${RDEPEND}
-	=sys-devel/llvm-2.7*
 	dev-lang/nasm
 	dev-util/pkgconfig"
 
@@ -46,6 +44,7 @@ S=${WORKDIR}/${P/_rc*/}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.4.4.3-cmakelists.patch
+	"${FILESDIR}"/${PN}-0.4.5-allow-disabling-pulseaudio.patch
 )
 
 src_configure() {