Add new version 2.0.1, fix bug #317105

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

5 files changed, 35 insertions, 63 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/Manifest b/games-simulation/secondlife-bin/Manifest
index 6528df3ecb80..804dec25be16 100644
--- a/games-simulation/secondlife-bin/Manifest
+++ b/games-simulation/secondlife-bin/Manifest
@@ -1,18 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX secondlife-bin-1.23.5-amd64-audio-streaming-fix.patch 1118 RMD160 d9511a049a7a58ceca82453c435c78ec592197b1 SHA1 ac2d593c36c2869e30764e09d519ae3d38fdf9e6 SHA256 8595595ce3690501adab819a7652b789ca6dbf088b5c42d9be4ae83020c22b2b
-AUX secondlife-bin-1.23_rc4-amd64-audio-streaming-fix.patch 1118 RMD160 d9511a049a7a58ceca82453c435c78ec592197b1 SHA1 ac2d593c36c2869e30764e09d519ae3d38fdf9e6 SHA256 8595595ce3690501adab819a7652b789ca6dbf088b5c42d9be4ae83020c22b2b
-DIST SecondLife-i686-1.23.4.123523.tar.bz2 42675704 RMD160 e9913b2cc353a315894c4eddfb39219c3df84508 SHA1 f20f2c60c6e88e9d5e67c9f4d9f66117d656aae3 SHA256 1a33ee51e917662c408fb723c2171e896d54f17e738fe96fd4c7540cddfb9151
 DIST SecondLife-i686-1.23.5.136262.tar.bz2 42674963 RMD160 92a7a63e94feaafeae8b58e38d13386ff6307031 SHA1 58a681850eb1def22e1ace2ab9e826a47bdfb20e SHA256 012396798902f7b92a0e13a34616dd38cf5571ccacb1dad0055033b9c62024e0
-EBUILD secondlife-bin-1.23.5.ebuild 3199 RMD160 67050eb57601b3f01022253813e5f0a7bd3964f0 SHA1 07e9c5f0fb7379ddd368ad7ff687ed0b40af18f5 SHA256 a5ad202fb56a7cc0538e6be85e76ce5ad86d3d55500045e95e28e5a75a638d1f
-EBUILD secondlife-bin-1.23_rc4.ebuild 3402 RMD160 3597b6575ae73600b5d73bd7e6fe868c66bdf4f3 SHA1 fb523d213bcaa3bcf093c8fd9b0f6ae4855b00e1 SHA256 aca81939d8282404465c95a640854275a12761a9cc3128af9c1a6354889cff9c
-MISC ChangeLog 6169 RMD160 98bd31aeafb37d4e8e680262b29dcf6c1f395e1b SHA1 e5bf8cc6e1ee18f9271652d0c24bfb876c2c82fc SHA256 6860b62cba76ff401f360dc500e3eeb4067d64271e5065fcba4a5a8525635e99
+DIST SecondLife-i686-2.0.1.203797.tar.bz2 39222582 RMD160 62bd5aa6c381ca56d3e013eab30ea5bbad1370c8 SHA1 3fb70fd38c9584c6b32b1c7aceb2996476a70039 SHA256 0947c9940bd3dc7dc5d9e120a97579900c93646d5a7d81d19a15b1059f5c6c63
+EBUILD secondlife-bin-1.23.5.ebuild 3254 RMD160 cb7117133ad9e3ca568774afec00703cfce24fd5 SHA1 e9e6a9214ad1a9b3ec64a2af936f32e4973cd15d SHA256 7840faae8bad01f4d3b18817fc0ec0b0312088990df4bdc31f56115f878d5d3e
+EBUILD secondlife-bin-2.0.1.ebuild 3146 RMD160 81cba8f2d95c68ff26cc99d1ec2d3368bf633f07 SHA1 e6c28ea9862de2ab19fd56f75f7c148138b7a644 SHA256 ddbcee09893ffee8f8a3f82f355f3cd96fc6766aac250bd0602f8b5c8b24f32b
+MISC ChangeLog 6458 RMD160 60db8542d5fa7b5ca1bbb1928b5d4b964e4162cc SHA1 8cc5320c337f5757042a811bae33e6a42b6f0452 SHA256 c4bb453b3f87ae1b32df1da0feade887959df01116f325bf2dfa091a993af996
 MISC metadata.xml 308 RMD160 b638ced5aef93d914a94a2222e1d151731827852 SHA1 4b341ddf1cad8b5c54a9a3288bb573700c5bdecf SHA256 9c6219ad6752dfbde589950d181980fa25100c4471388866a12d1cde331c3606
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAku7RXQACgkQdz7hIScOURExyQCfVjVsxSvmGmqfZC4elua1rS03
-RJgAnR85/L8UPE/XkIghRcCIgDrW7r6o
-=cBrB
------END PGP SIGNATURE-----
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