"Add new 1.23.5; remove old"

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

7 files changed, 63 insertions, 143 deletions

diff --git a/games-simulation/secondlife-bin/ChangeLog b/games-simulation/secondlife-bin/ChangeLog
index 07516b296dcb..da6db9bdbdf1 100644
--- a/games-simulation/secondlife-bin/ChangeLog
+++ b/games-simulation/secondlife-bin/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for games-simulation/secondlife-bin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/ChangeLog,v 1.26 2009/09/13 13:10:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/ChangeLog,v 1.27 2009/12/06 19:59:26 lavajoe Exp $
+
+*secondlife-bin-1.23.5 (06 Dec 2009)
+
+  06 Dec 2009; Joe Peterson <lavajoe@gentoo.org>
+  -secondlife-bin-1.22.11.ebuild,
+  -files/secondlife-bin-1.22.11-amd64-audio-streaming-fix.patch,
+  -secondlife-bin-1.23_rc2.ebuild, +secondlife-bin-1.23.5.ebuild,
+  +files/secondlife-bin-1.23.5-amd64-audio-streaming-fix.patch,
+  -files/secondlife-bin-1.23_rc2-amd64-audio-streaming-fix.patch:
+  Add new 1.23.5; remove old
 
   13 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
   secondlife-bin-1.22.11.ebuild, secondlife-bin-1.23_rc2.ebuild,
diff --git a/games-simulation/secondlife-bin/Manifest b/games-simulation/secondlife-bin/Manifest
index fdf7a2f6267c..a3eb813db63a 100644
--- a/games-simulation/secondlife-bin/Manifest
+++ b/games-simulation/secondlife-bin/Manifest
@@ -1,11 +1,8 @@
-AUX secondlife-bin-1.22.11-amd64-audio-streaming-fix.patch 367 RMD160 048e8f7ee08839fe735c4a141b0ff4a51063df81 SHA1 36c602075e99c15d69de05ee4fd7f2d8be9b17af SHA256 b9c7918de7b168168a81bf59619aad901afaadb88670aa674bc493e2da752b53
-AUX secondlife-bin-1.23_rc2-amd64-audio-streaming-fix.patch 367 RMD160 048e8f7ee08839fe735c4a141b0ff4a51063df81 SHA1 36c602075e99c15d69de05ee4fd7f2d8be9b17af SHA256 b9c7918de7b168168a81bf59619aad901afaadb88670aa674bc493e2da752b53
+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.22.11.113941.tar.bz2 41676047 RMD160 54e10734b8289efd379fe1d3dcd56b90a4898a3b SHA1 c84363b6e53a8c47a6d48cec7c6d65780811e6d1 SHA256 9763c346dcd4ee7085f5a1b927e980eacbf75753a2566072b46bcb0a34bb50a2
-DIST SecondLife-i686-1.23.2.120719.tar.bz2 39129954 RMD160 06296ad1a29ee9d3aeed2daf7dff42950c0635e0 SHA1 cef30f9f4c78d60edcd59e6b83807dce8609762a SHA256 f755c3e1076348fc4fc34838452f06e5149ea0a0d845ddc100db2a9172f47ef7
 DIST SecondLife-i686-1.23.4.123523.tar.bz2 42675704 RMD160 e9913b2cc353a315894c4eddfb39219c3df84508 SHA1 f20f2c60c6e88e9d5e67c9f4d9f66117d656aae3 SHA256 1a33ee51e917662c408fb723c2171e896d54f17e738fe96fd4c7540cddfb9151
-EBUILD secondlife-bin-1.22.11.ebuild 2908 RMD160 bc73c11c930ff0e761186a6c4f1a2b2154c0ff7a SHA1 ab49b134bfdfad248341888bc3c5509f57253b80 SHA256 e71a77e1cb6617743b119b6288b59909e1d9b6116019e44a1ca0c49af4a69341
-EBUILD secondlife-bin-1.23_rc2.ebuild 3124 RMD160 89e01ece985399609f27122f57828991f767b24e SHA1 c20e38075ddd8df6ad7cc4f23dab11f77c3d1238 SHA256 d3745b026a513734818a15e3ae855bcc33b77c7d7196b5e8e066a2c75cc94e1c
+DIST SecondLife-i686-1.23.5.136262.tar.bz2 42674963 RMD160 92a7a63e94feaafeae8b58e38d13386ff6307031 SHA1 58a681850eb1def22e1ace2ab9e826a47bdfb20e SHA256 012396798902f7b92a0e13a34616dd38cf5571ccacb1dad0055033b9c62024e0
+EBUILD secondlife-bin-1.23.5.ebuild 3227 RMD160 87a8bc93bb8610eb88529900b781359735ad4122 SHA1 2b80c4761aeaaf187f01dd6eb0d8f6e95eed7307 SHA256 33c2fa397f789114b933f1b0b3409e8b5cd1daa30f2b6d6c1b4fe709956d73a4
 EBUILD secondlife-bin-1.23_rc4.ebuild 3432 RMD160 2bb2de72ac1b371f8b915e405a5e4f2ebdc3c823 SHA1 2dcfd9375489e3b21c5074c695d5d73f7dfaf545 SHA256 5e0820cd7623f4b2f186db2d8dffc9cf3eac77261aec6b0fb023c7879e4eff73
-MISC ChangeLog 5594 RMD160 940b1e7b307a01e83f1144ee5a91bafd7d4dd410 SHA1 6267361d20accf93a45be23dd547619fd4154f4d SHA256 aa7b0444d7e9b850838a8a9f9463254c655ed838fa0481886413d71e0013f301
+MISC ChangeLog 6004 RMD160 2b262fbf3fbd4dde8df327f5da1a44f3b3a8c4cc SHA1 87ad82ba95d2261e6251c58debd7e7f1c1a52982 SHA256 fd30d5493c035d4f24c78645a24c46a15b36dfaf98638ae96799a0e9ab8aff2a
 MISC metadata.xml 310 RMD160 6387721976b5a6d1d20ea38eae46fe73a71b02f6 SHA1 f9b48d99a6501d5f3334885520749ccca91e0f1a SHA256 202d025172afc259b392b962d75fb5fab535a4810a7ef90dcb26b1de74f961e0
diff --git a/games-simulation/secondlife-bin/files/secondlife-bin-1.22.11-amd64-audio-streaming-fix.patch b/games-simulation/secondlife-bin/files/secondlife-bin-1.22.11-amd64-audio-streaming-fix.patch
deleted file mode 100644
index 3341f4306c24..000000000000
--- a/games-simulation/secondlife-bin/files/secondlife-bin-1.22.11-amd64-audio-streaming-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- secondlife.old	2009-03-06 16:05:19.000000000 -0700
-+++ secondlife	2009-04-16 12:21:50.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
- 
diff --git a/games-simulation/secondlife-bin/files/secondlife-bin-1.23.5-amd64-audio-streaming-fix.patch b/games-simulation/secondlife-bin/files/secondlife-bin-1.23.5-amd64-audio-streaming-fix.patch
new file mode 100644
index 000000000000..5d5f3486b21f
--- /dev/null
+++ b/games-simulation/secondlife-bin/files/secondlife-bin-1.23.5-amd64-audio-streaming-fix.patch
@@ -0,0 +1,26 @@
+--- 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/files/secondlife-bin-1.23_rc2-amd64-audio-streaming-fix.patch b/games-simulation/secondlife-bin/files/secondlife-bin-1.23_rc2-amd64-audio-streaming-fix.patch
deleted file mode 100644
index 3341f4306c24..000000000000
--- a/games-simulation/secondlife-bin/files/secondlife-bin-1.23_rc2-amd64-audio-streaming-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- secondlife.old	2009-03-06 16:05:19.000000000 -0700
-+++ secondlife	2009-04-16 12:21:50.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
- 
diff --git a/games-simulation/secondlife-bin/secondlife-bin-1.22.11.ebuild b/games-simulation/secondlife-bin/secondlife-bin-1.22.11.ebuild
deleted file mode 100644
index 624f450a88d9..000000000000
--- a/games-simulation/secondlife-bin/secondlife-bin-1.22.11.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2009 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.22.11.ebuild,v 1.3 2009/09/13 13:10:45 ssuominen Exp $
-
-inherit eutils multilib games
-
-SECONDLIFE_REVISION=113941
-MY_P="SecondLife-i686-${PV}.${SECONDLIFE_REVISION}"
-
-DESCRIPTION="The Second Life (an online, 3D virtual world) viewer"
-HOMEPAGE="http://secondlife.com/"
-SRC_URI="http://download-secondlife-com.s3.amazonaws.com/${MY_P}.tar.bz2"
-RESTRICT="mirror strip"
-
-LICENSE="GPL-2-with-Linden-Lab-FLOSS-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Note, used to RDEPEND on:
-# media-fonts/kochi-substitute
-RDEPEND="sys-libs/glibc
-	sys-apps/dbus
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	dev-libs/libgcrypt
-	dev-libs/libgpg-error
-	dev-libs/openssl
-	media-libs/freetype
-	media-libs/libogg
-	media-libs/libsdl
-	media-libs/libvorbis
-	media-libs/gstreamer
-	net-libs/gnutls
-	net-misc/curl
-	sys-libs/zlib
-	virtual/glu
-	virtual/opengl
-	x86? ( || ( media-libs/jpeg-compat <media-libs/jpeg-7 ) )
-	amd64? (
-		app-emulation/emul-linux-x86-sdl
-		app-emulation/emul-linux-x86-gtklibs
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-SECONDLIFE_HOME="${GAMES_PREFIX_OPT}/secondlife"
-
-QA_TEXTRELS="${SECONDLIFE_HOME:1}/bin/libllkdu.so
-	${SECONDLIFE_HOME:1}/lib/libkdu_v42R.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"
-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_v42R.so
-	${SECONDLIFE_HOME:1}/lib/libfmod-3.75.so
-	${SECONDLIFE_HOME:1}/app_settings/mozilla-runtime-linux-i686/libxul.so"
-
-pkg_setup() {
-	games_pkg_setup
-
-	# x86 binary package, ABI=x86
-	has_multilib_profile && ABI="x86"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# On 64-bit systems, we need to uncomment LL_BAD_OPENAL_DRIVER=x
-	# to fix streaming audio.
-	use amd64 && epatch "${FILESDIR}"/${P}-amd64-audio-streaming-fix.patch
-}
-
-src_install() {
-	exeinto "${SECONDLIFE_HOME}"
-	doexe launch_url.sh linux-crash-logger.bin secondlife || die
-	rm -rf launch_url.sh linux-crash-logger.bin secondlife
-
-	exeinto "${SECONDLIFE_HOME}"/bin
-	doexe bin/* || die
-	rm -rf bin
-
-	exeinto "${SECONDLIFE_HOME}"/lib
-	doexe lib/* || die
-	rm -rf lib
-
-	insinto "${SECONDLIFE_HOME}"
-	doins -r * || die "doins * failed"
-
-	#dosym /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf "${SECONDLIFE_HOME}"/unicode.ttf
-
-	games_make_wrapper secondlife-bin "./secondlife --set VersionChannelName Gentoo" "${SECONDLIFE_HOME}" "${SECONDLIFE_HOME}"/lib
-	make_desktop_entry secondlife-bin "Second Life (binary distribution)" /opt/secondlife/secondlife_icon.png
-
-	prepgamesdirs
-}
diff --git a/games-simulation/secondlife-bin/secondlife-bin-1.23_rc2.ebuild b/games-simulation/secondlife-bin/secondlife-bin-1.23.5.ebuild
index 5e7ab9bcbebc..cab3c1dbec2a 100644
--- a/games-simulation/secondlife-bin/secondlife-bin-1.23_rc2.ebuild
+++ b/games-simulation/secondlife-bin/secondlife-bin-1.23.5.ebuild
@@ -1,14 +1,11 @@
 # Copyright 1999-2009 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_rc2.ebuild,v 1.3 2009/09/13 13:10:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/secondlife-bin-1.23.5.ebuild,v 1.1 2009/12/06 19:59:26 lavajoe Exp $
 
 inherit eutils multilib games versionator
 
-SECONDLIFE_REVISION=120719
-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=136262
+MY_P="SecondLife-i686-${PV}.${SECONDLIFE_REVISION}"
 
 DESCRIPTION="The Second Life (an online, 3D virtual world) viewer"
 HOMEPAGE="http://secondlife.com/"
@@ -28,20 +25,34 @@ RDEPEND="sys-libs/glibc
 	x11-libs/libXau
 	x11-libs/libXdmcp
 	x11-libs/libXext
+	>=x11-libs/gtk+-2.0
+	x11-libs/libXinerama
 	dev-libs/libgcrypt
 	dev-libs/libgpg-error
 	dev-libs/openssl
+	dev-libs/apr
+	dev-libs/apr-util
+	dev-libs/boost
+	dev-libs/elfio
+	dev-libs/expat
 	media-libs/freetype
 	media-libs/libogg
 	media-libs/libsdl
 	media-libs/libvorbis
 	media-libs/gstreamer
+	media-plugins/gst-plugins-meta
+	media-libs/fmod
+	x86? ( || ( media-libs/jpeg-compat <media-libs/jpeg-7 ) )
+	media-libs/openjpeg
 	net-libs/gnutls
 	net-misc/curl
+	net-dns/c-ares
 	sys-libs/zlib
+	~virtual/libstdc++-3.3
 	virtual/glu
 	virtual/opengl
-	x86? ( || ( media-libs/jpeg-compat <media-libs/jpeg-7 ) )
+	media-libs/openal
+	media-libs/freealut
 	amd64? (
 		app-emulation/emul-linux-x86-sdl
 		app-emulation/emul-linux-x86-gtklibs
@@ -52,7 +63,7 @@ S="${WORKDIR}/${MY_P}"
 SECONDLIFE_HOME="${GAMES_PREFIX_OPT}/secondlife"
 
 QA_TEXTRELS="${SECONDLIFE_HOME:1}/bin/libllkdu.so
-	${SECONDLIFE_HOME:1}/lib/libkdu_v42R.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"
@@ -60,7 +71,7 @@ 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_v42R.so
+	${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"
 
@@ -76,8 +87,8 @@ src_unpack() {
 	cd "${S}"
 
 	# On 64-bit systems, we need to uncomment LL_BAD_OPENAL_DRIVER=x
-	# to fix streaming audio.
-	use amd64 && epatch "${FILESDIR}"/${P}-amd64-audio-streaming-fix.patch
+	# and comment out the amd64 streaming disable to fix streaming audio.
+	use amd64 && epatch "${FILESDIR}/${P}-amd64-audio-streaming-fix.patch"
 }
 
 src_install() {