Fixed compile issue on amd64.

svn path=/secondlife/; revision=11

7 files changed, 5 insertions, 540 deletions

diff --git a/games-simulation/secondlife/Manifest b/games-simulation/secondlife/Manifest
index c49b212..7771f13 100644
--- a/games-simulation/secondlife/Manifest
+++ b/games-simulation/secondlife/Manifest
@@ -6,18 +6,6 @@ AUX opensecondlife-svn41.patch 635 RMD160 4ff31d0a2e52c2ccfa6f5591e0e6e464716096
 MD5 23d4c1db16f9351dc2d190120d1962b4 files/opensecondlife-svn41.patch 635
 RMD160 4ff31d0a2e52c2ccfa6f5591e0e6e46471609690 files/opensecondlife-svn41.patch 635
 SHA256 100a42a60f46bc6abd8b2d77ae81ee2d4ea56edcfabb1ab00b589ce0d9314bce files/opensecondlife-svn41.patch 635
-AUX secondlife-1.13.3.2-llimagej2coj_debug.patch 3795 RMD160 4a0bd6cb16e1b35b445b2a61e7d7e372cdcd4450 SHA1 4ac6b96863d64c24f0708dc453cc2b48eb44883e SHA256 d1d16728aa2ebfac50b0563aa57a2f03d8e3dfd12f0fc10c2c2d3e99bcec28ca
-MD5 3b6706a0439c55c02e0d86acd4f495d1 files/secondlife-1.13.3.2-llimagej2coj_debug.patch 3795
-RMD160 4a0bd6cb16e1b35b445b2a61e7d7e372cdcd4450 files/secondlife-1.13.3.2-llimagej2coj_debug.patch 3795
-SHA256 d1d16728aa2ebfac50b0563aa57a2f03d8e3dfd12f0fc10c2c2d3e99bcec28ca files/secondlife-1.13.3.2-llimagej2coj_debug.patch 3795
-AUX secondlife-1.14.0.1-gentoo.patch 9631 RMD160 1a81ae51d8ade19f12c8130094210abe3979a91e SHA1 31a2b8c9cbec151bf9d6a56dabc1d488bcb864f3 SHA256 ccaa01b2ec2ae7375877c6f196efa46b00120babaa8b5ee490f11d8ddf20a4a4
-MD5 9e8042891190fac8c4812b9519f888df files/secondlife-1.14.0.1-gentoo.patch 9631
-RMD160 1a81ae51d8ade19f12c8130094210abe3979a91e files/secondlife-1.14.0.1-gentoo.patch 9631
-SHA256 ccaa01b2ec2ae7375877c6f196efa46b00120babaa8b5ee490f11d8ddf20a4a4 files/secondlife-1.14.0.1-gentoo.patch 9631
-AUX secondlife-1.14.0.1-llversion.patch 427 RMD160 d69a83076e4d43cb8f94753892c6bdb144d2823f SHA1 9bd25f84a2e022c4f6579bc47db7fc3e01b5b15e SHA256 90d6a6867ff8b62f302c9406aa1d4999dd5349cbf947a1eb8645435ef4bc3a7a
-MD5 f8808833fd80bb6221f6b669cf43c726 files/secondlife-1.14.0.1-llversion.patch 427
-RMD160 d69a83076e4d43cb8f94753892c6bdb144d2823f files/secondlife-1.14.0.1-llversion.patch 427
-SHA256 90d6a6867ff8b62f302c9406aa1d4999dd5349cbf947a1eb8645435ef4bc3a7a files/secondlife-1.14.0.1-llversion.patch 427
 AUX secondlife-1.15.0.2-gentoo.patch 8904 RMD160 d0286837a9be61eb2116902bceb3a6faf43a640a SHA1 cfb2a483c8ea1916d6a5f421ed1940b6dcdb6a50 SHA256 d1e442d29d60e87b9beae1c57d72b698b8bf6b9f16051d8915ce6dbc39a0fbf2
 MD5 7b1bbe9ce14f5bc4342cb7c749c06d57 files/secondlife-1.15.0.2-gentoo.patch 8904
 RMD160 d0286837a9be61eb2116902bceb3a6faf43a640a files/secondlife-1.15.0.2-gentoo.patch 8904
@@ -26,22 +14,13 @@ AUX secondlife-1.15.0.2-mozlib.patch 6060 RMD160 24ecb4ac17df2c8dd899129b57ce9e1
 MD5 8f75b5f0d2fe6913a46f6e760d7c02fe files/secondlife-1.15.0.2-mozlib.patch 6060
 RMD160 24ecb4ac17df2c8dd899129b57ce9e17d62f22dc files/secondlife-1.15.0.2-mozlib.patch 6060
 SHA256 4923747aefd3f271cb97db43d6a4a2e8f3a93a0cc578abe1635fd63befb72a4f files/secondlife-1.15.0.2-mozlib.patch 6060
-DIST slviewer-artwork-1.14.0.1.zip 20005643 RMD160 cb662db2692bcf7e3594104c6f2cf14b2c61dc66 SHA1 ecb5689d014e917de6fc774ce702023c20f2aaeb SHA256 e35fc5632d16e1a229e2d6bd353ca5ad50018c7397b724579a38b1dcddeca77c
 DIST slviewer-artwork-1.15.0.2.zip 24711017 RMD160 7a43bd0c72d20db701c4a9646dde41eae3cfc151 SHA1 97231fe3c589bc582390843ad997d0e1607b13fd SHA256 4c63d01a4377515a6030fdf1ed8ac11a66df93199c1eaf4087d1e9d9168e242d
 DIST slviewer-linux-libs-1.15.0.2.tar.gz 26593326 RMD160 45651188a6e15510fec85f9f15efd9b2eec56481 SHA1 ca6c25d111c77bef8525b3abc4318798c6d8a3dd SHA256 81ed4b90a65690916891d758fa72839c0aeb32bbecfe3af6416b009011bfc65f
-DIST slviewer-src-1.14.0.1.tar.gz 9750313 RMD160 c58d1b0b8800f9acabb8091935edce62c1742606 SHA1 c858c7c68611b74c8b550537ac1a1c0da10939dd SHA256 18905eab642cda5932f4dd6a792c402723c4fa655695b8b7d0ad1372ccad989e
 DIST slviewer-src-1.15.0.2.tar.gz 5048294 RMD160 2f15ff2a12935b5ac0bf59f90c026466f7037e4f SHA1 10a0f66a46376e669a4dab55d5a3ec0529e09bde SHA256 4904ce2a2e3036aabf73b4f6dabf5d51cad35b722245c44f9d59bf841599acd9
-EBUILD secondlife-1.14.0.1.ebuild 3190 RMD160 7e6d25aba74ff88ef6f474c5325eeeae3db1c27a SHA1 d28ba750be8f88bea7309fc803380ba95631ac64 SHA256 bb77fad600dfb61f04af8f518deceb6fd819d36ce5afb1af297078c5aa99c581
-MD5 d49c2868bbc2f015797e6c553a4b8786 secondlife-1.14.0.1.ebuild 3190
-RMD160 7e6d25aba74ff88ef6f474c5325eeeae3db1c27a secondlife-1.14.0.1.ebuild 3190
-SHA256 bb77fad600dfb61f04af8f518deceb6fd819d36ce5afb1af297078c5aa99c581 secondlife-1.14.0.1.ebuild 3190
-EBUILD secondlife-1.15.0.2.ebuild 3494 RMD160 b2490c78a693b215041648143b604f191bc85054 SHA1 11d68519cf8345127b428c6afe9ed3b8c7af157d SHA256 654738f86bc1537a4de1e9470284062623aa40e5b210281f84b731de5417b7d5
-MD5 d8e63347bcc3e1076ec1e2fda24ffa8f secondlife-1.15.0.2.ebuild 3494
-RMD160 b2490c78a693b215041648143b604f191bc85054 secondlife-1.15.0.2.ebuild 3494
-SHA256 654738f86bc1537a4de1e9470284062623aa40e5b210281f84b731de5417b7d5 secondlife-1.15.0.2.ebuild 3494
-MD5 7472ca696355573accfb942f3a18f0d7 files/digest-secondlife-1.14.0.1 542
-RMD160 530da94440cf00685dbb411cd7d2804afc129517 files/digest-secondlife-1.14.0.1 542
-SHA256 310216f9e613c4ae30ab57ce827877299b750e5dd38aa5c1b145e3708a0d807f files/digest-secondlife-1.14.0.1 542
+EBUILD secondlife-1.15.0.2.ebuild 3488 RMD160 c346ff3c9aa5b0910a11cf5ee4b7f1cef5968880 SHA1 a8bb5d49483f5f321b873b0d4d59343c50a8c26e SHA256 023c08341252a4e7a76827041e7ced866b387e93be6e5f99c0f37944212a3a7a
+MD5 f3ae37150239c669f6c066de7c520f8b secondlife-1.15.0.2.ebuild 3488
+RMD160 c346ff3c9aa5b0910a11cf5ee4b7f1cef5968880 secondlife-1.15.0.2.ebuild 3488
+SHA256 023c08341252a4e7a76827041e7ced866b387e93be6e5f99c0f37944212a3a7a secondlife-1.15.0.2.ebuild 3488
 MD5 593847c5a0066bc89031fea0d98cf6b7 files/digest-secondlife-1.15.0.2 834
 RMD160 35d441b65186f9514840d7e3e18a32e9db834c7a files/digest-secondlife-1.15.0.2 834
 SHA256 d85e3cf9e4a496c8e5f7927441194e23e08ebd1cb8c0483f15bb9bf6d2dad800 files/digest-secondlife-1.15.0.2 834
diff --git a/games-simulation/secondlife/files/digest-secondlife-1.14.0.1 b/games-simulation/secondlife/files/digest-secondlife-1.14.0.1
deleted file mode 100644
index b551626..0000000
--- a/games-simulation/secondlife/files/digest-secondlife-1.14.0.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 b85927ee629c3287259ed21f7738888a slviewer-artwork-1.14.0.1.zip 20005643
-RMD160 cb662db2692bcf7e3594104c6f2cf14b2c61dc66 slviewer-artwork-1.14.0.1.zip 20005643
-SHA256 e35fc5632d16e1a229e2d6bd353ca5ad50018c7397b724579a38b1dcddeca77c slviewer-artwork-1.14.0.1.zip 20005643
-MD5 65f3201a07bbd24d5253d3e5f82de4af slviewer-src-1.14.0.1.tar.gz 9750313
-RMD160 c58d1b0b8800f9acabb8091935edce62c1742606 slviewer-src-1.14.0.1.tar.gz 9750313
-SHA256 18905eab642cda5932f4dd6a792c402723c4fa655695b8b7d0ad1372ccad989e slviewer-src-1.14.0.1.tar.gz 9750313
diff --git a/games-simulation/secondlife/files/secondlife-1.13.3.2-llimagej2coj_debug.patch b/games-simulation/secondlife/files/secondlife-1.13.3.2-llimagej2coj_debug.patch
deleted file mode 100644
index e66a198..0000000
--- a/games-simulation/secondlife/files/secondlife-1.13.3.2-llimagej2coj_debug.patch
+++ /dev/null
@@ -1,121 +0,0 @@
---- linden/indra/llimagej2coj/llimagej2coj.cpp.orig	2007-02-04 09:52:40.000000000 +0100
-+++ linden/indra/llimagej2coj/llimagej2coj.cpp	2007-02-05 21:09:53.000000000 +0100
-@@ -66,7 +66,8 @@
- sample debug callback expecting no client object
- */
- void info_callback(const char *msg, void *client_data) {
--	fprintf(stdout, "[INFO] %s", msg);
-+	FILE *stream = (FILE*)client_data;
-+	fprintf(stream, "[INFO] %s", msg);
- }
- 
- 
-@@ -86,21 +87,23 @@
- 	// FIXME: Get the comment field out of the texture
- 	//
- 
--	LLTimer decode_timer;
--
- 	opj_dparameters_t parameters;	/* decompression parameters */
-+#ifdef _DEBUG
- 	opj_event_mgr_t event_mgr;		/* event manager */
-+#endif
- 	opj_image_t *image = NULL;
- 
- 	opj_dinfo_t* dinfo = NULL;	/* handle to a decompressor */
- 	opj_cio_t *cio = NULL;
- 
- 
-+#ifdef _DEBUG
- 	/* configure the event callbacks (not required) */
- 	memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
- 	event_mgr.error_handler = error_callback;
- 	event_mgr.warning_handler = warning_callback;
- 	event_mgr.info_handler = info_callback;
-+#endif
- 
- 	/* set decoding parameters to default values */
- 	opj_set_default_decoder_parameters(&parameters);
-@@ -116,7 +119,11 @@
- 	dinfo = opj_create_decompress(CODEC_J2K);
- 
- 	/* catch events using our callbacks and give a local context */
--	opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);			
-+#ifdef _DEBUG
-+	opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
-+#else
-+	opj_set_event_mgr((opj_common_ptr)dinfo, NULL, stderr);
-+#endif
- 
- 	/* setup the decoder decoding parameters using user parameters */
- 	opj_setup_decoder(dinfo, &parameters);
-@@ -181,10 +188,10 @@
- {
- 	const S32 MAX_COMPS = 5;
- 	opj_cparameters_t parameters;	/* compression parameters */
-+#ifdef _DEBUG
- 	opj_event_mgr_t event_mgr;		/* event manager */
- 
--
--	/* 
-+	/*
- 	configure the event callbacks (not required)
- 	setting of each callback is optional 
- 	*/
-@@ -192,6 +199,7 @@
- 	event_mgr.error_handler = error_callback;
- 	event_mgr.warning_handler = warning_callback;
- 	event_mgr.info_handler = info_callback;
-+#endif
- 
- 	/* set encoding parameters to default values */
- 	opj_set_default_encoder_parameters(&parameters);
-@@ -264,7 +272,11 @@
- 	opj_cinfo_t* cinfo = opj_create_compress(CODEC_J2K);
- 
- 	/* catch events using our callbacks and give a local context */
--	opj_set_event_mgr((opj_common_ptr)cinfo, &event_mgr, stderr);			
-+#ifdef _DEBUG
-+	opj_set_event_mgr((opj_common_ptr)cinfo, &event_mgr, stderr);
-+#else
-+	opj_set_event_mgr((opj_common_ptr)cinfo, NULL, stderr);
-+#endif
- 
- 	/* setup the encoder parameters using the current image and using user parameters */
- 	opj_setup_encoder(cinfo, &parameters, image);
-@@ -309,18 +321,22 @@
- 	base.updateRawDiscardLevel();
- 
- 	opj_dparameters_t parameters;	/* decompression parameters */
-+#ifdef _DEBUG
- 	opj_event_mgr_t event_mgr;		/* event manager */
-+#endif
- 	opj_image_t *image = NULL;
- 
- 	opj_dinfo_t* dinfo = NULL;	/* handle to a decompressor */
- 	opj_cio_t *cio = NULL;
- 
- 
-+#ifdef _DEBUG
- 	/* configure the event callbacks (not required) */
- 	memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
- 	event_mgr.error_handler = error_callback;
- 	event_mgr.warning_handler = warning_callback;
- 	event_mgr.info_handler = info_callback;
-+#endif
- 
- 	/* set decoding parameters to default values */
- 	opj_set_default_decoder_parameters(&parameters);
-@@ -336,7 +352,11 @@
- 	dinfo = opj_create_decompress(CODEC_J2K);
- 
- 	/* catch events using our callbacks and give a local context */
--	opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);			
-+#ifdef _DEBUG
-+	opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
-+#else
-+	opj_set_event_mgr((opj_common_ptr)dinfo, NULL, stderr);
-+#endif
- 
- 	/* setup the decoder decoding parameters using user parameters */
- 	opj_setup_decoder(dinfo, &parameters);
diff --git a/games-simulation/secondlife/files/secondlife-1.14.0.1-gentoo.patch b/games-simulation/secondlife/files/secondlife-1.14.0.1-gentoo.patch
deleted file mode 100644
index 39c539e..0000000
--- a/games-simulation/secondlife/files/secondlife-1.14.0.1-gentoo.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct
---- linden.orig/indra/SConstruct	2007-04-04 00:40:46.000000000 +0900
-+++ linden/indra/SConstruct	2007-04-04 18:32:46.000000000 +0900
-@@ -63,6 +63,8 @@
- opts.Add(EnumOption('OPENSOURCE', 'Build using only non-proprietary dependencies',
- 			'yes',# OPENSOURCE: do not edit this line
- 			allowed_values=('yes', 'no')))
-+opts.Add(EnumOption('FMOD', 'Enabled fmod support', 'yes',
-+			allowed_values=('yes', 'no')))
- helpenv = Environment(options = opts)
- Help(opts.GenerateHelpText(helpenv))
- 
-@@ -75,6 +77,7 @@
- grid = ARGUMENTS.get('GRID', 'default')
- # OPENSOURCE: do not edit the following line:
- opensource = ARGUMENTS.get('OPENSOURCE', 'yes')
-+enable_fmod = ARGUMENTS.get('FMOD', 'yes')
- 
- targets = [ target_param ]
- 
-@@ -184,16 +187,22 @@
- 		flags += '-DLL_LINUX=1 '
- 		if build_target == 'client':
- 			flags += '-DAPPID=secondlife -DLL_SDL=1 '
--			if arch == 'x86_64' or arch == 'x86_64cross':
-+			if enable_fmod == 'no' or arch == 'x86_64' or arch == 'x86_64cross':
- 				flags += '-DLL_FMOD=0 '
- 			flags += '-DLL_X11=1 -DLL_GTK=1 '
--			client_external_libs += [ 'gtk-x11-2.0', 'elfio' ]
-+			client_external_libs += [ 'gtk-x11-2.0', 'ELFIO' ]
- 			include_dirs += [ '../libraries/' + system_str + '/include/gtk-2.0' ]
- 			include_dirs += [ '../libraries/' + system_str + '/include/glib-2.0']
- 			include_dirs += [ '../libraries/' + system_str + '/include/pango-1.0' ]
- 			include_dirs += [ '../libraries/' + system_str + '/include/atk-1.0' ]
- 			include_dirs += [ '../libraries/' + system_str + '/include/ELFIO' ]
- 			include_dirs += [ '../libraries/' + system_str + '/include/llfreetype2' ]
-+ 			pipe = os.popen('pkg-config gtk+-2.0 --cflags')
-+ 			flags += pipe.read().rstrip('\n') + ' '
-+ 			pipe.close()
-+ 			pipe = os.popen('freetype-config --cflags')
-+ 			flags += pipe.read().rstrip('\n') + ' '
-+ 			pipe.close()
- 
- 			# llmozlib stuff
- 			if enable_mozlib == 'yes':
-@@ -209,7 +218,7 @@
- 	### Build type-specific flags ###
- 
- 	debug_opts = flags + '-fno-inline -O0 -D_DEBUG -DLL_DEBUG=1 '
--	release_opts = flags + '-O2 -DNDEBUG -DLL_RELEASE=1 '
-+	release_opts = flags + '-DNDEBUG -DLL_RELEASE=1 '
- 	releasenoopt_opts = flags + '-O0 -DNDEBUG -DLL_RELEASE=1 '
- 	releasefordownload_opts = flags + '-O2 -DNDEBUG -DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 '
- 
-@@ -419,7 +428,7 @@
- 
- 		external_libs = client_external_libs + common_external_libs + [ 'freetype', 'jpeg', 'SDL', 'GL', 'GLU', 'ogg', 'vorbisenc', 'vorbisfile', 'vorbis', 'db-4.2', 'openjpeg' ]
- 
--		if arch != 'x86_64' and arch != 'x86_64cross':
-+		if enable_fmod == 'yes' and arch != 'x86_64' and arch != 'x86_64cross':
- 			external_libs += [ 'fmod-3.75' ]
- 
- 		external_libs.remove('cares')
-diff -Naur linden.orig/indra/llcommon/llsdserialize_xml.cpp linden/indra/llcommon/llsdserialize_xml.cpp
---- linden.orig/indra/llcommon/llsdserialize_xml.cpp	2007-04-04 00:40:49.000000000 +0900
-+++ linden/indra/llcommon/llsdserialize_xml.cpp	2007-04-04 17:49:58.000000000 +0900
-@@ -35,7 +35,7 @@
- 
- extern "C"
- {
--#include "expat/expat.h"
-+#include "expat.h"
- }
- 
- /**
-diff -Naur linden.orig/indra/llcommon/llsys.cpp linden/indra/llcommon/llsys.cpp
---- linden.orig/indra/llcommon/llsys.cpp	2007-04-04 00:40:49.000000000 +0900
-+++ linden/indra/llcommon/llsys.cpp	2007-04-04 17:49:58.000000000 +0900
-@@ -30,7 +30,7 @@
- #include "llsys.h"
- 
- #include <iostream>
--#include <zlib/zlib.h>
-+#include <zlib.h>
- #include "processor.h"
- 
- #if LL_WINDOWS
-diff -Naur linden.orig/indra/llimage/llimagejpeg.h linden/indra/llimage/llimagejpeg.h
---- linden.orig/indra/llimage/llimagejpeg.h	2007-04-04 00:40:49.000000000 +0900
-+++ linden/indra/llimage/llimagejpeg.h	2007-04-04 17:49:58.000000000 +0900
-@@ -33,9 +33,8 @@
- #include "llimage.h"
- 
- extern "C" {
--#include "jpeglib/jinclude.h"
--#include "jpeglib/jpeglib.h"
--#include "jpeglib/jerror.h"
-+#include "jpeglib.h"
-+#include "jerror.h"
- }
- 
- class LLImageJPEG : public LLImageFormatted
-diff -Naur linden.orig/indra/llimagej2coj/llimagej2coj.cpp linden/indra/llimagej2coj/llimagej2coj.cpp
---- linden.orig/indra/llimagej2coj/llimagej2coj.cpp	2007-04-04 00:40:50.000000000 +0900
-+++ linden/indra/llimagej2coj/llimagej2coj.cpp	2007-04-04 17:49:58.000000000 +0900
-@@ -30,7 +30,7 @@
- 
- // this is defined so that we get static linking.
- #define OPJ_STATIC
--#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-04-04 00:40:52.000000000 +0900
-+++ linden/indra/llmessage/llfiltersd2xmlrpc.cpp	2007-04-04 17:49:58.000000000 +0900
-@@ -76,7 +76,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/llmessage/llhttpassetstorage.cpp linden/indra/llmessage/llhttpassetstorage.cpp
---- linden.orig/indra/llmessage/llhttpassetstorage.cpp	2007-04-04 00:40:53.000000000 +0900
-+++ linden/indra/llmessage/llhttpassetstorage.cpp	2007-04-04 17:49:58.000000000 +0900
-@@ -36,7 +36,7 @@
- #include "llvfile.h"
- #include "llvfs.h"
- 
--#include "zlib/zlib.h"
-+#include "zlib.h"
- 
- const U32 MAX_RUNNING_REQUESTS = 4;
- const F32 MAX_PROCESSING_TIME = 0.005f;
-diff -Naur linden.orig/indra/llrender/llfont.cpp linden/indra/llrender/llfont.cpp
---- linden.orig/indra/llrender/llfont.cpp	2007-04-04 00:40:54.000000000 +0900
-+++ linden/indra/llrender/llfont.cpp	2007-04-04 17:49:58.000000000 +0900
-@@ -30,11 +30,11 @@
- #include "llfont.h"
- 
- // Freetype stuff
--#if LL_LINUX   // I had to do some work to avoid the system-installed FreeType headers... --ryan.
--#include "llfreetype2/freetype/ft2build.h"
--#else
-+// #if LL_LINUX   // I had to do some work to avoid the system-installed FreeType headers... --ryan.
-+// #include "llfreetype2/freetype/ft2build.h"
-+// #else
- #include <ft2build.h>
--#endif
-+// #endif
- 
- // For some reason, this won't work if it's not wrapped in the ifdef
- #ifdef FT_FREETYPE_H
-diff -Naur linden.orig/indra/llxml/llxmlnode.h linden/indra/llxml/llxmlnode.h
---- linden.orig/indra/llxml/llxmlnode.h	2007-04-04 00:40:56.000000000 +0900
-+++ linden/indra/llxml/llxmlnode.h	2007-04-04 17:49:58.000000000 +0900
-@@ -29,7 +29,7 @@
- #define LL_LLXMLNODE_H
- 
- #define XML_STATIC
--#include "expat/expat.h"
-+#include "expat.h"
- #include <map>
- 
- #include "indra_constants.h"
-diff -Naur linden.orig/indra/llxml/llxmlparser.h linden/indra/llxml/llxmlparser.h
---- linden.orig/indra/llxml/llxmlparser.h	2007-04-04 00:40:56.000000000 +0900
-+++ linden/indra/llxml/llxmlparser.h	2007-04-04 17:49:58.000000000 +0900
-@@ -29,7 +29,7 @@
- #define LL_LLXMLPARSER_H
- 
- #define XML_STATIC
--#include "expat/expat.h"
-+#include "expat.h"
- 
- class LLXmlParser
- {
-diff -Naur linden.orig/indra/newview/llfloaterpostcard.cpp linden/indra/newview/llfloaterpostcard.cpp
---- linden.orig/indra/newview/llfloaterpostcard.cpp	2007-04-04 00:41:09.000000000 +0900
-+++ linden/indra/newview/llfloaterpostcard.cpp	2007-04-04 17:49:58.000000000 +0900
-@@ -237,7 +237,7 @@
- 	{	
- 	}
- 	// *TODO define custom uploadFailed here so it's not such a generic message
--	void LLSendPostcardResponder::uploadComplete(const LLSD& content)
-+	void uploadComplete(const LLSD& content)
- 	{
- 		// we don't care about what the server returns from this post, just clean up the UI
- 		LLUploadDialog::modalUploadFinished();
-diff -Naur linden.orig/indra/newview/lluserauth.cpp linden/indra/newview/lluserauth.cpp
---- linden.orig/indra/newview/lluserauth.cpp	2007-04-04 00:41:05.000000000 +0900
-+++ linden/indra/newview/lluserauth.cpp	2007-04-04 17:49:58.000000000 +0900
-@@ -40,7 +40,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/llviewerobjectlist.cpp linden/indra/newview/llviewerobjectlist.cpp
---- linden.orig/indra/newview/llviewerobjectlist.cpp	2007-04-04 00:41:08.000000000 +0900
-+++ linden/indra/newview/llviewerobjectlist.cpp	2007-04-04 17:49:58.000000000 +0900
-@@ -60,7 +60,7 @@
- #include "u64.h"
- #include "llviewerimagelist.h"
- #include "lldatapacker.h"
--#include <zlib/zlib.h>
-+#include <zlib.h>
- #include "object_flags.h"
- 
- extern BOOL gVelocityInterpolate;
-diff -Naur linden.orig/indra/newview/llwebbrowserctrl.h linden/indra/newview/llwebbrowserctrl.h
---- linden.orig/indra/newview/llwebbrowserctrl.h	2007-04-04 00:41:01.000000000 +0900
-+++ linden/indra/newview/llwebbrowserctrl.h	2007-04-04 17:49:58.000000000 +0900
-@@ -91,6 +91,7 @@
- #include "lldynamictexture.h"
- #include "llmozlib.h"
- 
-+class LLUICtrlFactory;
- class LLViewBorder;
- class LLWebBrowserTexture;
- 
-@@ -239,7 +240,7 @@
- class LLWebBrowserTexture : public LLDynamicTexture
- {
- 	public:
--		LLWebBrowserTexture::LLWebBrowserTexture( S32 width, S32 height, LLWebBrowserCtrl* browserCtrl, int browserWindow );
-+		LLWebBrowserTexture( S32 width, S32 height, LLWebBrowserCtrl* browserCtrl, int browserWindow );
- 		virtual ~LLWebBrowserTexture();
- 
- 		virtual void preRender( BOOL clear_depth = TRUE ) {};
-diff -Naur linden.orig/indra/newview/llxmlrpctransaction.cpp linden/indra/newview/llxmlrpctransaction.cpp
---- linden.orig/indra/newview/llxmlrpctransaction.cpp	2007-04-04 00:41:06.000000000 +0900
-+++ linden/indra/newview/llxmlrpctransaction.cpp	2007-04-04 17:49:58.000000000 +0900
-@@ -33,7 +33,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/files/secondlife-1.14.0.1-llversion.patch b/games-simulation/secondlife/files/secondlife-1.14.0.1-llversion.patch
deleted file mode 100644
index 8e73a8e..0000000
--- a/games-simulation/secondlife/files/secondlife-1.14.0.1-llversion.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur linden.orig/indra/llcommon/llversion.h linden/indra/llcommon/llversion.h
---- linden.orig/indra/llcommon/llversion.h	2007-04-04 00:40:48.000000000 +0900
-+++ linden/indra/llcommon/llversion.h	2007-04-05 00:12:31.000000000 +0900
-@@ -34,7 +34,7 @@
- const S32 LL_VERSION_MAJOR = 1;
- const S32 LL_VERSION_MINOR = 14;
- const S32 LL_VERSION_PATCH = 0;
--const S32 LL_VERSION_BUILD = 0;
-+const S32 LL_VERSION_BUILD = 1;
- 
- 
- 
diff --git a/games-simulation/secondlife/secondlife-1.14.0.1.ebuild b/games-simulation/secondlife/secondlife-1.14.0.1.ebuild
deleted file mode 100644
index 71fa658..0000000
--- a/games-simulation/secondlife/secondlife-1.14.0.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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/04/slviewer-src-${PV}.tar.gz
-	http://secondlife.com/developers/opensource/downloads/2007/04/slviewer-artwork-${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-#IUSE="fmod llmozlib"
-IUSE="fmod"
-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
-	dev-libs/elfio
-	>=media-libs/openjpeg-1.1.1
-	media-fonts/kochi-substitute"
-#	llmozlib? ( net-libs/llmozlib-xulrunner )
-
-DEPEND="${RDEPEND}
-	dev-util/scons
-	dev-util/pkgconfig
-	sys-devel/flex
-	sys-devel/bison"
-
-S="${WORKDIR}/linden/indra"
-
-dir="${GAMES_DATADIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# VWR-100
-	epatch "${FILESDIR}"/${PN}-1.13.3.2-llimagej2coj_debug.patch
-	# opensecondlife.com
-	epatch "${FILESDIR}"/opensecondlife-svn41.patch
-
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-llversion.patch
-
-	sed -i -e "s|gcc_bin = .*$|gcc_bin = '$(tc-getCXX)'|" SConstruct || die
-
-	# "${S}"/newview/viewer_manifest.py
-	touch newview/gridargs.dat
-}
-
-src_compile() {
-	local myopts="BUILD=release BTARGET=client DISTCC=no"
-
-	# if use llmozlib ; then
-	#	myopts="${myopts} MOZLIB=yes"
-	#else
-		myopts="${myopts} MOZLIB=no"
-	#fi
-
-	if use fmod && [ "${ARCH}" == "x86" ] ; then
-		myopts="${myopts} FMOD=yes"
-	else
-		myopts="${myopts} FMOD=no"
-	fi
-
-	CLIENT_CPPFLAGS="${CXXFLAGS}" TEMP_BUILD_DIR=/ scons ${myopts} || die
-}
-
-src_install() {
-	cd "${S}"/newview/
-
-	insinto "${dir}"
-	doins featuretable.txt gpu_table.txt gridargs.dat || 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
-
-	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
-
-	keepdir "${dir}"/lib
-
-	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
-}
diff --git a/games-simulation/secondlife/secondlife-1.15.0.2.ebuild b/games-simulation/secondlife/secondlife-1.15.0.2.ebuild
index 1768116..3b8dbff 100644
--- a/games-simulation/secondlife/secondlife-1.15.0.2.ebuild
+++ b/games-simulation/secondlife/secondlife-1.15.0.2.ebuild
@@ -52,7 +52,7 @@ dir="${GAMES_DATADIR}/${PN}"
 src_unpack() {
 	# unpack font files
 	unpack slviewer-linux-libs-${PV}.tar.gz
-	rm -rf linden/indra/libraries
+	rm -rf linden/libraries
 	rm -rf linden/indra/newview/app_settings
 
 	unpack slviewer-src-${PV}.tar.gz