Add new version 2.0.1, fix bug #317105

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 31 insertions, 48 deletions

diff --git a/games-simulation/secondlife-bin/ChangeLog b/games-simulation/secondlife-bin/ChangeLog
index a0b55d95c061..7fb005f5dcaa 100644
--- a/games-simulation/secondlife-bin/ChangeLog
+++ b/games-simulation/secondlife-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-simulation/secondlife-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/ChangeLog,v 1.28 2010/01/17 21:37:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/ChangeLog,v 1.29 2010/04/25 13:31:06 lavajoe Exp $
+
+*secondlife-bin-2.0.1 (25 Apr 2010)
+
+  25 Apr 2010; Joe Peterson <lavajoe@gentoo.org>
+  -secondlife-bin-1.23_rc4.ebuild,
+  -files/secondlife-bin-1.23_rc4-amd64-audio-streaming-fix.patch,
+  secondlife-bin-1.23.5.ebuild, +secondlife-bin-2.0.1.ebuild:
+  Add new version 2.0.1, fix bug #317105
 
   17 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
   secondlife-bin-1.23_rc4.ebuild, secondlife-bin-1.23.5.ebuild:
diff --git a/games-simulation/secondlife-bin/files/secondlife-bin-1.23_rc4-amd64-audio-streaming-fix.patch b/games-simulation/secondlife-bin/files/secondlife-bin-1.23_rc4-amd64-audio-streaming-fix.patch
deleted file mode 100644
index 5d5f3486b21f..000000000000
--- a/games-simulation/secondlife-bin/files/secondlife-bin-1.23_rc4-amd64-audio-streaming-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- secondlife.old	2009-06-09 08:53:20.000000000 -0600
-+++ secondlife	2009-06-14 12:16:32.000000000 -0600
-@@ -5,7 +5,7 @@
- ## testing phase; you should not usually need to touch them.
- 
- ## - Avoids using any OpenAL audio driver.
--#export LL_BAD_OPENAL_DRIVER=x
-+export LL_BAD_OPENAL_DRIVER=x
- ## - Avoids using any FMOD audio driver.
- #export LL_BAD_FMOD_DRIVER=x
- 
-@@ -48,10 +48,10 @@
- ## - GStreamer is automatically disabled - for now - on 64-bit systems due
- ##   to common fatal incompatibilities; remove/comment these lines if you want
- ##   to try anyway.
--if [ "`uname -m`" = "x86_64" ]; then
--    export LL_DISABLE_GSTREAMER=x
--    echo '64-bit Linux detected: Disabling GStreamer (streaming video and music) by default; edit ./secondlife to re-enable.'
--fi
-+#if [ "`uname -m`" = "x86_64" ]; then
-+#    export LL_DISABLE_GSTREAMER=x
-+#    echo '64-bit Linux detected: Disabling GStreamer (streaming video and music) by default; edit ./secondlife to re-enable.'
-+#fi
- 
- ## Everything below this line is just for advanced troubleshooters.
- ##-------------------------------------------------------------------
diff --git a/games-simulation/secondlife-bin/secondlife-bin-1.23.5.ebuild b/games-simulation/secondlife-bin/secondlife-bin-1.23.5.ebuild
index 500afc4f729e..623aea91d23a 100644
--- a/games-simulation/secondlife-bin/secondlife-bin-1.23.5.ebuild
+++ b/games-simulation/secondlife-bin/secondlife-bin-1.23.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/secondlife-bin-1.23.5.ebuild,v 1.2 2010/01/17 21:37:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/secondlife-bin-1.23.5.ebuild,v 1.3 2010/04/25 13:31:06 lavajoe Exp $
 
 inherit eutils multilib games versionator
 
@@ -9,8 +9,9 @@ MY_P="SecondLife-i686-${PV}.${SECONDLIFE_REVISION}"
 
 DESCRIPTION="The Second Life (an online, 3D virtual world) viewer"
 HOMEPAGE="http://secondlife.com/"
-SRC_URI="http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-frozen/${SECONDLIFE_REVISION}/${MY_P}.tar.bz2"
-RESTRICT="mirror strip"
+#SRC_URI="http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-frozen/${SECONDLIFE_REVISION}/${MY_P}.tar.bz2"
+SRC_URI="http://download.cloud.secondlife.com/${MY_P}.tar.bz2"
+RESTRICT="strip"
 
 LICENSE="GPL-2-with-Linden-Lab-FLOSS-exception"
 SLOT="0"
diff --git a/games-simulation/secondlife-bin/secondlife-bin-1.23_rc4.ebuild b/games-simulation/secondlife-bin/secondlife-bin-2.0.1.ebuild
index 83afa8134276..e3a2285b91ba 100644
--- a/games-simulation/secondlife-bin/secondlife-bin-1.23_rc4.ebuild
+++ b/games-simulation/secondlife-bin/secondlife-bin-2.0.1.ebuild
@@ -1,19 +1,16 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/secondlife-bin-1.23_rc4.ebuild,v 1.6 2010/01/17 21:37:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/secondlife-bin-2.0.1.ebuild,v 1.1 2010/04/25 13:31:06 lavajoe Exp $
 
 inherit eutils multilib games versionator
 
-SECONDLIFE_REVISION=123523
-SECONDLIFE_MAJOR_VER=$(get_version_component_range 1-2)
-SECONDLIFE_MINOR_VER=$(get_version_component_range 3)
-SECONDLIFE_MINOR_VER=${SECONDLIFE_MINOR_VER/rc/}
-MY_P="SecondLife-i686-${SECONDLIFE_MAJOR_VER}.${SECONDLIFE_MINOR_VER}.${SECONDLIFE_REVISION}"
+SECONDLIFE_REVISION=203797
+MY_P="SecondLife-i686-${PV}.${SECONDLIFE_REVISION}"
 
 DESCRIPTION="The Second Life (an online, 3D virtual world) viewer"
 HOMEPAGE="http://secondlife.com/"
-SRC_URI="http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-frozen/${SECONDLIFE_REVISION}/${MY_P}.tar.bz2"
-RESTRICT="mirror strip"
+SRC_URI="http://download.cloud.secondlife.com/Viewer-2/${MY_P}.tar.bz2"
+RESTRICT="strip"
 
 LICENSE="GPL-2-with-Linden-Lab-FLOSS-exception"
 SLOT="0"
@@ -69,14 +66,13 @@ QA_TEXTRELS="${SECONDLIFE_HOME:1}/bin/libllkdu.so
 	${SECONDLIFE_HOME:1}/lib/libkdu.so
 	${SECONDLIFE_HOME:1}/lib/libfmod-3.75.so
 	${SECONDLIFE_HOME:1}/lib/libvivoxsdk.so
-	${SECONDLIFE_HOME:1}/app_settings/mozilla-runtime-linux-i686/libxul.so"
+	${SECONDLIFE_HOME:1}/lib/libvivoxplatform.so
+	${SECONDLIFE_HOME:1}/lib/libllcommon.so
+	${SECONDLIFE_HOME:1}/lib/libortp.so
+	${SECONDLIFE_HOME:1}/bin/llplugin/libmedia_plugin_gstreamer.so
+	${SECONDLIFE_HOME:1}/bin/llplugin/libmedia_plugin_webkit.so"
 QA_EXECSTACK="${SECONDLIFE_HOME:1}/bin/do-not-directly-run-secondlife-bin
-	${SECONDLIFE_HOME:1}/bin/libllkdu.so
-	${SECONDLIFE_HOME:1}/lib/libSDL-1.2.so.0
-	${SECONDLIFE_HOME:1}/lib/libcrypto.so.0.9.7
-	${SECONDLIFE_HOME:1}/lib/libkdu.so
-	${SECONDLIFE_HOME:1}/lib/libfmod-3.75.so
-	${SECONDLIFE_HOME:1}/app_settings/mozilla-runtime-linux-i686/libxul.so"
+	${SECONDLIFE_HOME:1}/bin/libllkdu.so"
 
 pkg_setup() {
 	games_pkg_setup
@@ -91,13 +87,17 @@ src_unpack() {
 
 	# On 64-bit systems, we need to uncomment LL_BAD_OPENAL_DRIVER=x
 	# and comment out the amd64 streaming disable to fix streaming audio.
-	use amd64 && epatch "${FILESDIR}/${P}-amd64-audio-streaming-fix.patch"
+	#use amd64 && epatch "${FILESDIR}/${P}-amd64-audio-streaming-fix.patch"
 }
 
 src_install() {
 	exeinto "${SECONDLIFE_HOME}"
-	doexe launch_url.sh secondlife || die
-	rm -rf launch_url.sh secondlife
+	doexe secondlife || die
+	rm -rf secondlife
+
+	exeinto "${SECONDLIFE_HOME}"/bin/llplugin
+	doexe bin/llplugin/* || die
+	rm -rf bin/llplugin
 
 	exeinto "${SECONDLIFE_HOME}"/bin
 	doexe bin/* || die