Version bumped.

svn path=/secondlife/; revision=29

5 files changed, 369 insertions, 5 deletions

diff --git a/games-simulation/secondlife/Manifest b/games-simulation/secondlife/Manifest
index 3949d97..5338028 100644
--- a/games-simulation/secondlife/Manifest
+++ b/games-simulation/secondlife/Manifest
@@ -10,20 +10,31 @@ AUX secondlife-1.18.3.5-gentoo.patch 3947 RMD160 d9ca2d64707d87ef69e1bf8aec5310c
 MD5 cde143ea26e8a0c40976e33142735475 files/secondlife-1.18.3.5-gentoo.patch 3947
 RMD160 d9ca2d64707d87ef69e1bf8aec5310cd593aeb00 files/secondlife-1.18.3.5-gentoo.patch 3947
 SHA256 5bb4f4abf0f514658db15fe1c4578a143d62b89393721b69931912ce27283638 files/secondlife-1.18.3.5-gentoo.patch 3947
+AUX secondlife-1.18.4.0-gentoo.patch 5539 RMD160 b8310f564e85840df2da65795e8db5513a136765 SHA1 2317b944ada889cf6bdc580e3490b8fe5391cade SHA256 f32eabea2f209e66761e5c0f18fa6b607acd4d59cd54fdb0a05c1bdcdefd4b50
+MD5 334fe0012829e9345524ce9d21413ee5 files/secondlife-1.18.4.0-gentoo.patch 5539
+RMD160 b8310f564e85840df2da65795e8db5513a136765 files/secondlife-1.18.4.0-gentoo.patch 5539
+SHA256 f32eabea2f209e66761e5c0f18fa6b607acd4d59cd54fdb0a05c1bdcdefd4b50 files/secondlife-1.18.4.0-gentoo.patch 5539
 DIST slviewer-artwork-1.18.2.0.zip 24702596 RMD160 aafc1966cb5c1ee7fbfda935efe29f37dbeef749 SHA1 d5ab2cfe7e1a1e7b0ef40f0e7e3095553757f7b0 SHA256 327fe454b2f6a596aa9d6446a827323f4800c62bcc7623010a2e880e23124ad7
 DIST slviewer-artwork-RC-1.18.3.5.zip 24659237 RMD160 019766a92a70f6a306300ca855f4dae2e9c9e268 SHA1 d865a7804c172dfd10cc1e561aa29e154462fc7a SHA256 829f66f523b2edae0054786d037bb16ba3d7f8fbecdd54a33d495ec54e28e4f1
+DIST slviewer-artwork-RC-1.18.4.0.zip 24602698 RMD160 5bbc5cfeeea74359251d071c0b22bee1c076d43d SHA1 65338cceff9f1a762ed1df334bfdede40bc74834 SHA256 edca90798fde3f1472641be2b7a82f922773d7a5d7ef0e1de1d341994b6bac65
 DIST slviewer-linux-libs-1.18.2.0.tar.gz 30598341 RMD160 9d64503ffab4d20ca6c79d88169a309d0b19431d SHA1 90b37a4b6754e0d860f4706e68664cd685078f34 SHA256 bc47e71d543ca1c152fd0c2771a028e353357d04b1cb80380976ca4bc40617cb
 DIST slviewer-linux-libs-RC-1.18.3.5.tar.gz 30624812 RMD160 b54f41ab6b9532af305c74ca6a1769ea92211053 SHA1 71a35a549fa8006a9050deec9f1c01e8faae13f2 SHA256 a93add097ca50a9a55836b236e24fd40fd90448ff55edddc1f45b6b2a55e7f7f
+DIST slviewer-linux-libs-RC-1.18.4.0.tar.gz 31170227 RMD160 1e51dc2114e30d94f217ef56c8a04b11631ec46a SHA1 bd326a4ef35bded6c6fa1c79ab8fc2d421853693 SHA256 b3ec656453586c40c308eef9506a78284a792f883ad50df1b778aa313d3f9aa8
 DIST slviewer-src-1.18.2.0.tar.gz 5403670 RMD160 370a5a6822f93095d81e109d6c3eb918a70817b8 SHA1 1693566a0f39b5d6d94b417de746b6d19899f72e SHA256 3b0f39315f6dade48d8020326dc2c51466bcade4d753a8c0b266586ac93f271d
 DIST slviewer-src-RC-1.18.3.5.tar.gz 5421257 RMD160 83507a8ebe5dcf14fc80fea21e9f157a570b87cb SHA1 f58a288438eaccd7545f4a73f5e3982730b9552c SHA256 125063329f543d244697dd38f2e5d54b85f1e61eaa90c89adaa34e3ae544eeb7
+DIST slviewer-src-RC-1.18.4.0.tar.gz 5597690 RMD160 0fbd4e8e30382199846667fde6805b7f24caf077 SHA1 72af9028efada48d5897f0cb8666c1693769595b SHA256 912be161c0e7e06b49796e5dcd6e303ff2cdd95e31f7fc8d9c2e81b7afb74a03
 EBUILD secondlife-1.18.2.0.ebuild 4165 RMD160 87d0dc42f99db1b8a2cc1b42f3e58c1082e2cc01 SHA1 b849b097fa57f51906a3c69cc80f51b877928b6f SHA256 d062cccf35b79d659086b0205a1073400e30f667292ec9a72dbf29234eb842c2
 MD5 152f5039522f5d0a613cb966219deeb1 secondlife-1.18.2.0.ebuild 4165
 RMD160 87d0dc42f99db1b8a2cc1b42f3e58c1082e2cc01 secondlife-1.18.2.0.ebuild 4165
 SHA256 d062cccf35b79d659086b0205a1073400e30f667292ec9a72dbf29234eb842c2 secondlife-1.18.2.0.ebuild 4165
-EBUILD secondlife-1.18.3.5.ebuild 4740 RMD160 d08da019fa870e376c1eb4a89a3c09b2219b5df1 SHA1 2d18e46ae6b2a08cfd7b24d0f5a9467b01c101d6 SHA256 08a27814d59a4e4df6660bec8b1764b581caddee355d599ff0308e57455f3ada
-MD5 865c487b3eb12688017e1ed8c71e5063 secondlife-1.18.3.5.ebuild 4740
-RMD160 d08da019fa870e376c1eb4a89a3c09b2219b5df1 secondlife-1.18.3.5.ebuild 4740
-SHA256 08a27814d59a4e4df6660bec8b1764b581caddee355d599ff0308e57455f3ada secondlife-1.18.3.5.ebuild 4740
+EBUILD secondlife-1.18.3.5.ebuild 4841 RMD160 251d1ac7cd053252b0538b6adb05f69d8675a696 SHA1 4e54bf441df6b4237fd7fe534bd5067efa476b72 SHA256 4d775105be62ae895f8a0dd0b2d459f623ebb4f5654a2eee1d4a779236d053d1
+MD5 0f7500d8bbbf18818aa22fd495dc55fa secondlife-1.18.3.5.ebuild 4841
+RMD160 251d1ac7cd053252b0538b6adb05f69d8675a696 secondlife-1.18.3.5.ebuild 4841
+SHA256 4d775105be62ae895f8a0dd0b2d459f623ebb4f5654a2eee1d4a779236d053d1 secondlife-1.18.3.5.ebuild 4841
+EBUILD secondlife-1.18.4.0.ebuild 4851 RMD160 6a98b88dfa6770ffed732b9ad935b66a7bdf97ab SHA1 0814cd3b80829cbc8ddae41983c2f453bad0a713 SHA256 7c302918b9ecd32a8c201858312f5325b09978ab3f182ec34de1d23934256cf9
+MD5 3ffaaeb732d05493cd4ae0b9ee0e51b8 secondlife-1.18.4.0.ebuild 4851
+RMD160 6a98b88dfa6770ffed732b9ad935b66a7bdf97ab secondlife-1.18.4.0.ebuild 4851
+SHA256 7c302918b9ecd32a8c201858312f5325b09978ab3f182ec34de1d23934256cf9 secondlife-1.18.4.0.ebuild 4851
 MISC ChangeLog 397 RMD160 63706792a2ef7f9f6415e659f853b285deae8b2f SHA1 17e67ab90c2e9e9498546dea1e697fff4757555c SHA256 cfd4bfd6466fb3e1db42817b34283356390a43f1e54f0b8217847a6d78a15dc6
 MD5 f098b81a2533118dabb62f9f470dbad1 ChangeLog 397
 RMD160 63706792a2ef7f9f6415e659f853b285deae8b2f ChangeLog 397
@@ -38,3 +49,6 @@ SHA256 0391c9464ac4602ab2ea7d01230cb769725edc04f9cc7af9e71ec3c5161f3060 files/di
 MD5 636af5db2df13181095cfe0c56b50946 files/digest-secondlife-1.18.3.5 861
 RMD160 3200252ac195c96500812aaff55fbbbecb6ac87f files/digest-secondlife-1.18.3.5 861
 SHA256 08c8afa966f886f35d92249481550ce59f25f5dd072e03f6ffab792a12aa4703 files/digest-secondlife-1.18.3.5 861
+MD5 9fa270cda38c7277bfd8386a0ac36ffd files/digest-secondlife-1.18.4.0 861
+RMD160 00500df5ee09f76a03ec2e0c3be688370cfee8db files/digest-secondlife-1.18.4.0 861
+SHA256 5495f75ac7bc14669aa6fe297e3ca5227d125ca71b11746c945c9298a81498bd files/digest-secondlife-1.18.4.0 861
diff --git a/games-simulation/secondlife/files/digest-secondlife-1.18.4.0 b/games-simulation/secondlife/files/digest-secondlife-1.18.4.0
new file mode 100644
index 0000000..47cd8ac
--- /dev/null
+++ b/games-simulation/secondlife/files/digest-secondlife-1.18.4.0
@@ -0,0 +1,9 @@
+MD5 6cec0e059e4f25e1c3577e7532da0a24 slviewer-artwork-RC-1.18.4.0.zip 24602698
+RMD160 5bbc5cfeeea74359251d071c0b22bee1c076d43d slviewer-artwork-RC-1.18.4.0.zip 24602698
+SHA256 edca90798fde3f1472641be2b7a82f922773d7a5d7ef0e1de1d341994b6bac65 slviewer-artwork-RC-1.18.4.0.zip 24602698
+MD5 8e4a40e487f15485588d1a23295273c4 slviewer-linux-libs-RC-1.18.4.0.tar.gz 31170227
+RMD160 1e51dc2114e30d94f217ef56c8a04b11631ec46a slviewer-linux-libs-RC-1.18.4.0.tar.gz 31170227
+SHA256 b3ec656453586c40c308eef9506a78284a792f883ad50df1b778aa313d3f9aa8 slviewer-linux-libs-RC-1.18.4.0.tar.gz 31170227
+MD5 537880994c0fce24b888c806ede1d366 slviewer-src-RC-1.18.4.0.tar.gz 5597690
+RMD160 0fbd4e8e30382199846667fde6805b7f24caf077 slviewer-src-RC-1.18.4.0.tar.gz 5597690
+SHA256 912be161c0e7e06b49796e5dcd6e303ff2cdd95e31f7fc8d9c2e81b7afb74a03 slviewer-src-RC-1.18.4.0.tar.gz 5597690
diff --git a/games-simulation/secondlife/files/secondlife-1.18.4.0-gentoo.patch b/games-simulation/secondlife/files/secondlife-1.18.4.0-gentoo.patch
new file mode 100644
index 0000000..422e834
--- /dev/null
+++ b/games-simulation/secondlife/files/secondlife-1.18.4.0-gentoo.patch
@@ -0,0 +1,146 @@
+diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct
+--- linden.orig/indra/SConstruct	2007-10-20 08:45:51.000000000 +0900
++++ linden/indra/SConstruct	2007-10-22 01:56:46.000000000 +0900
+@@ -112,7 +112,7 @@
+ channel = optenv['CHANNEL']
+ standalone = optenv['STANDALONE']
+ opensource = standalone or optenv['OPENSOURCE']
+-enable_fmod = not opensource and optenv['FMOD']
++enable_fmod = optenv['FMOD']
+ elfio = optenv['ELFIO']
+ 
+ targets = [ target_param ]
+@@ -135,6 +135,7 @@
+     'gdk-pixbuf-2.0',
+     'glib-2.0',
+     'gmodule-2.0',
++    'gthread-2.0',
+     'gtk+-2.0',
+     'libpng',
+     'pango',
+@@ -155,6 +156,9 @@
+     'libssl',
+     ]
+ 
++if enable_gstreamer:
++    standalone_pkgs += [ 'gstreamer-0.10' ]
++
+ def pkgconfig(opt, pkgs=None):
+     if pkgs is None:
+         pkgs = standalone_pkgs + standalone_net_pkgs
+@@ -602,7 +606,7 @@
+         net_external_libs = [ 'curl', 'ssl', 'crypto', 'aprutil-1', 'apr-1' ]
+     net_external_libs += [ 'cares', 'expat' ]
+ 
+-    common_external_libs = net_external_libs + [ 'xmlrpc-epi', 'z' ]
++    common_external_libs = net_external_libs + [ 'xmlrpc', 'z' ]
+ 
+     if build_target == 'client':
+         if platform == 'linux':
+@@ -742,7 +746,7 @@
+                             internal_libs + external_libs)
+ 
+         # Rpcserver
+-        external_libs = common_external_libs + ['xmlrpc-epi', 'mysqlclient']
++        external_libs = common_external_libs + ['xmlrpc', 'mysqlclient']
+         internal_libs = ['llscene', 'llmessage', 'lldatabase', 'llvfs', 
+                 'llmath', 'llcommon']
+         create_executable('rpcserver/rpcserver' + file_suffix, 'rpcserver',
+diff -Naur linden.orig/indra/llimagej2coj/llimagej2coj.cpp linden/indra/llimagej2coj/llimagej2coj.cpp
+--- linden.orig/indra/llimagej2coj/llimagej2coj.cpp	2007-10-20 08:45:55.000000000 +0900
++++ linden/indra/llimagej2coj/llimagej2coj.cpp	2007-10-22 01:57:53.000000000 +0900
+@@ -33,7 +33,7 @@
+ #include "llimagej2coj.h"
+ 
+ // this is defined so that we get static linking.
+-#include "openjpeg/openjpeg.h"
++#include "openjpeg.h"
+ 
+ #include "lltimer.h"
+ #include "llmemory.h"
+diff -Naur linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp linden/indra/llmessage/llfiltersd2xmlrpc.cpp
+--- linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp	2007-10-20 08:45:58.000000000 +0900
++++ linden/indra/llmessage/llfiltersd2xmlrpc.cpp	2007-10-22 01:56:46.000000000 +0900
+@@ -80,7 +80,7 @@
+ 
+ #include <sstream>
+ #include <iterator>
+-#include <xmlrpc-epi/xmlrpc.h>
++#include <xmlrpc.h>
+ #include "apr-1/apr_base64.h"
+ 
+ #include "llbuffer.h"
+diff -Naur linden.orig/indra/llwindow/llgl.cpp linden/indra/llwindow/llgl.cpp
+--- linden.orig/indra/llwindow/llgl.cpp	2007-10-20 08:46:00.000000000 +0900
++++ linden/indra/llwindow/llgl.cpp	2007-10-22 08:56:36.000000000 +0900
+@@ -64,7 +64,7 @@
+ # include "GL/glxext.h"
+ // Use glXGetProcAddressARB instead of glXGetProcAddress - the ARB symbol
+ // is considered 'legacy' but works on more machines.
+-# define GLH_EXT_GET_PROC_ADDRESS(p) glXGetProcAddressARB((const GLubyte*)(p)) 
++# define GLH_EXT_GET_PROC_ADDRESS(p) glXGetProcAddress((const GLubyte*)(p)) 
+ #endif // LL_LINUX && !LL_MESA_HEADLESS
+ 
+ 
+diff -Naur linden.orig/indra/newview/llfloaterhtml.cpp linden/indra/newview/llfloaterhtml.cpp
+--- linden.orig/indra/newview/llfloaterhtml.cpp	2007-10-20 08:46:29.000000000 +0900
++++ linden/indra/newview/llfloaterhtml.cpp	2007-10-22 08:40:54.000000000 +0900
+@@ -228,7 +228,9 @@
+ // static
+ void LLFloaterHtml::onCommitUrlEdit(LLUICtrl* ctrl, void* user_data)
+ {
++#if LL_LIBXUL_ENABLED
+ 	LLFloaterHtml* self = (LLFloaterHtml*)user_data;
++#endif
+ 
+ 	LLLineEditor* editor = (LLLineEditor*)ctrl;
+ 	std::string url = editor->getText();
+diff -Naur linden.orig/indra/newview/llurldispatcher.cpp linden/indra/newview/llurldispatcher.cpp
+--- linden.orig/indra/newview/llurldispatcher.cpp	2007-10-20 08:46:31.000000000 +0900
++++ linden/indra/newview/llurldispatcher.cpp	2007-10-23 01:28:02.000000000 +0900
+@@ -151,7 +151,9 @@
+ {
+ 	if (matchPrefix(url, SLURL_SL_HELP_PREFIX))
+ 	{
++#if LL_LIBXUL_ENABLED
+ 		gViewerHtmlHelp.show();
++#endif	// LL_LIBXUL_ENABLED
+ 		return true;
+ 	}
+ 	return false;
+diff -Naur linden.orig/indra/newview/lluserauth.cpp linden/indra/newview/lluserauth.cpp
+--- linden.orig/indra/newview/lluserauth.cpp	2007-10-20 08:46:30.000000000 +0900
++++ linden/indra/newview/lluserauth.cpp	2007-10-22 01:56:46.000000000 +0900
+@@ -45,7 +45,7 @@
+ 
+ // NOTE: MUST include these after otherincludes since queue gets redefined!?!!
+ #include <curl/curl.h>
+-#include <xmlrpc-epi/xmlrpc.h>
++#include <xmlrpc.h>
+ 
+ 
+ 
+diff -Naur linden.orig/indra/newview/llvoiceclient.cpp linden/indra/newview/llvoiceclient.cpp
+--- linden.orig/indra/newview/llvoiceclient.cpp	2007-10-20 08:46:31.000000000 +0900
++++ linden/indra/newview/llvoiceclient.cpp	2007-10-22 01:56:46.000000000 +0900
+@@ -39,7 +39,7 @@
+ #include "llvoavatar.h"
+ #include "llbufferstream.h"
+ #include "llfile.h"
+-#include "expat/expat.h"
++#include "expat.h"
+ #include "llcallbacklist.h"
+ #include "llviewerregion.h"
+ #include "llviewernetwork.h"		// for gUserServerChoice
+diff -Naur linden.orig/indra/newview/llxmlrpctransaction.cpp linden/indra/newview/llxmlrpctransaction.cpp
+--- linden.orig/indra/newview/llxmlrpctransaction.cpp	2007-10-20 08:46:31.000000000 +0900
++++ linden/indra/newview/llxmlrpctransaction.cpp	2007-10-22 01:56:46.000000000 +0900
+@@ -37,7 +37,7 @@
+ 
+ // Have to include these last to avoid queue redefinition!
+ #include <curl/curl.h>
+-#include <xmlrpc-epi/xmlrpc.h>
++#include <xmlrpc.h>
+ 
+ #include "viewer.h"
+ 
diff --git a/games-simulation/secondlife/secondlife-1.18.3.5.ebuild b/games-simulation/secondlife/secondlife-1.18.3.5.ebuild
index bacfaa4..e445302 100644
--- a/games-simulation/secondlife/secondlife-1.18.3.5.ebuild
+++ b/games-simulation/secondlife/secondlife-1.18.3.5.ebuild
@@ -90,7 +90,8 @@ src_unpack() {
 	sed -i -e "s|gcc_bin = .*$|gcc_bin = '$(tc-getCXX)'|" "${S}"/SConstruct || die
 
 	# "${S}"/newview/viewer_manifest.py
-	touch "${S}"/newview/gridargs.dat
+	#touch "${S}"/newview/gridargs.dat
+	echo '-settings settings_default.xml -channel "Second Life default"' > "${S}"/newview/gridargs.dat
 }
 
 src_compile() {
diff --git a/games-simulation/secondlife/secondlife-1.18.4.0.ebuild b/games-simulation/secondlife/secondlife-1.18.4.0.ebuild
new file mode 100644
index 0000000..3f50b03
--- /dev/null
+++ b/games-simulation/secondlife/secondlife-1.18.4.0.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit games toolchain-funcs
+
+DESCRIPTION="A 3D MMORPG virtual world entirely built and owned by its residents"
+HOMEPAGE="http://secondlife.com/"
+SRC_URI="http://secondlife.com/developers/opensource/downloads/2007/10/slviewer-src-RC-${PV}.tar.gz
+	http://secondlife.com/developers/opensource/downloads/2007/10/slviewer-artwork-RC-${PV}.zip
+	http://secondlife.com/developers/opensource/downloads/2007/10/slviewer-linux-libs-RC-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug elfio fmod gstreamer"
+#IUSE="debug elfio fmod gstreamer kdu mozlib"
+RESTRICT="mirror"
+
+RDEPEND=">=x11-libs/gtk+-2
+	=dev-libs/apr-1*
+	=dev-libs/apr-util-1*
+	dev-libs/boost
+	>=net-misc/curl-7.15.4
+	dev-libs/openssl
+	media-libs/freetype
+	media-libs/jpeg
+	media-libs/libsdl
+	media-libs/mesa
+	media-libs/libogg
+	media-libs/libvorbis
+	fmod? ( x86? ( =media-libs/fmod-3.75* ) )
+	=sys-libs/db-4.2*
+	dev-libs/expat
+	sys-libs/zlib
+	>=dev-libs/xmlrpc-epi-0.51
+	elfio? ( dev-libs/elfio )
+	>=media-libs/openjpeg-1.1.1
+	media-fonts/kochi-substitute
+	net-dns/c-ares
+	gstreamer? ( >=media-libs/gstreamer-0.10 )
+	debug? ( dev-libs/google-perftools )"
+#	mozlib? ( net-libs/llmozlib-xulrunner )
+
+DEPEND="${RDEPEND}
+	>=dev-util/scons-0.97
+	dev-util/pkgconfig
+	sys-devel/flex
+	sys-devel/bison"
+
+S="${WORKDIR}/linden/indra"
+
+dir="${GAMES_DATADIR}/${PN}"
+
+pkg_config() {
+	if [ "${ARCH}" != "x86" ] ; then
+		if use fmod ; then
+			ewarn "fmod USE flag is only available on x86."
+		fi
+#		if use kdu ; then
+#			ewarn "kdu USE flag is only available on x86."
+#		fi
+#		if use mozlib ; then
+#			ewarn "mozlib USE flag is only available on x86."
+#		fi
+	fi
+}
+
+src_unpack() {
+	# unpack font files
+	unpack slviewer-linux-libs-RC-${PV}.tar.gz
+
+#	if use kdu ; then
+#		find linden/libraries -type f -a ! -name '*kdu*' | xargs rm -f || die
+#	else
+		rm -rf linden/libraries
+#	fi
+
+#	if ! use mozlib ; then
+		rm -rf linden/indra/newview/app_settings
+#	fi
+
+	unpack slviewer-src-RC-${PV}.tar.gz
+	unpack slviewer-artwork-RC-${PV}.zip
+
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-1.17.2.0-size_t.patch
+
+	sed -i -e "s|gcc_bin = .*$|gcc_bin = '$(tc-getCXX)'|" "${S}"/SConstruct || die
+
+	# "${S}"/newview/viewer_manifest.py
+	#touch "${S}"/newview/gridargs.dat
+	echo '-settings settings_default.xml -channel "Second Life default"' > "${S}"/newview/gridargs.dat
+}
+
+src_compile() {
+	local myarch
+	local myopts="BUILD=release BTARGET=client DISTCC=no"
+
+	if use debug ; then
+		myopts="${myopts} BUILD=debug"
+	else
+		myopts="${myopts} BUILD=release"
+	fi
+
+	if use elfio ; then
+		myopts="${myopts} ELFIO=yes"
+	else
+		myopts="${myopts} ELFIO=no"
+	fi
+
+	if use gstreamer ; then
+		myopts="${myopts} GSTREAMER=yes"
+	else
+		myopts="${myopts} GSTREAMER=no"
+	fi
+
+	case ${ARCH} in
+		x86)
+			myopts="${myopts} ARCH=i686"
+			;;
+		amd64)
+			myopts="${myopts} ARCH=x86_64"
+			;;
+		ppc|ppc64)
+			myopts="${myopts} ARCH=powerpc"
+			;;
+		*)
+			myopts="${myopts} ARCH=i686"
+			;;
+	esac
+
+	if [ "${ARCH}" == "x86" ] ; then
+		if use fmod; then
+			myopts="${myopts} FMOD=yes OPENSOURCE=no"
+		else
+			myopts="${myopts} FMOD=no OPENSOURCE=yes"
+		fi
+
+#		if use mozlib ; then
+#			myopts="${myopts} MOZLIB=yes STANDALONE=no"
+#		else
+			myopts="${myopts} MOZLIB=no STANDALONE=yes"
+#		fi
+	else
+		myopts="${myopts} FMOD=no MOZLIB=no STANDALONE=yes OPENSOURCE=yes"
+	fi
+
+	CLIENT_CPPFLAGS="${CXXFLAGS}" TEMP_BUILD_DIR= scons ${myopts} || die
+}
+
+src_install() {
+	cd "${S}"/newview/
+
+	insinto "${dir}"
+	doins gpu_table.txt gridargs.dat secondlife-i686.supp featuretable_linux.txt || die
+	doins -r app_settings character fonts skins res-sdl || die
+
+	doins lsl_guide.html releasenotes.txt || die
+	newins licenses-linux.txt licenses.txt || die
+	newins linux_tools/client-readme.txt README-linux.txt || die
+	newins res/ll_icon.ico secondlife.ico || die
+
+	insinto "${dir}"/app_settings/
+	doins "${WORKDIR}"/linden/scripts/messages/message_template.msg || die
+	doins "${WORKDIR}"/linden/etc/message.xml || die
+
+	exeinto "${dir}"
+	doexe linux_tools/launch_url.sh || die
+	newexe linux_tools/wrapper.sh secondlife || die
+	newexe ../linux_crash_logger/linux-crash-logger-*-bin* linux-crash-logger.bin || die
+
+	exeinto "${dir}"/bin/
+	newexe secondlife-*-bin do-not-directly-run-secondlife-bin || die
+
+	exeinto "${dir}"/lib
+	doexe ../lib_*_client/*-linux/lib* || die
+
+	dosym /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf /usr/share/games/secondlife/unicode.ttf
+
+	games_make_wrapper secondlife ./secondlife "${dir}"
+	newicon res/ll_icon.ico secondlife.ico || die
+	make_desktop_entry secondlife "Second Life" secondlife.ico
+
+	dodoc releasenotes.txt
+	newdoc licenses-linux.txt licenses.txt
+	newdoc linux_tools/client-readme.txt README-linux.txt
+
+	dohtml lsl_guide.html
+
+	prepgamesdirs
+}