version bumped.

svn path=/secondlife/; revision=82

8 files changed, 195 insertions, 351 deletions

diff --git a/games-simulation/secondlife/Manifest b/games-simulation/secondlife/Manifest
index 16ec3af..ffb7b49 100644
--- a/games-simulation/secondlife/Manifest
+++ b/games-simulation/secondlife/Manifest
@@ -1,15 +1,13 @@
 AUX VWR-3480.patch 1167 RMD160 6a03c6217f58ef93883a1051c249739a383dd838 SHA1 60c41ce545436f9bb05e208d26cf93b5d6a33efa SHA256 aee57a7bdfd039daa776b20476b1cd8836979301f16e07842d6f1b1f1e63ab74
-AUX secondlife-1.17.2.0-size_t.patch 462 RMD160 07db64e519f9a4fffbd03fcc6ce975470fed4f52 SHA1 f2e38d9ca34b234c940fa2fd5abcfe1f22d7084a SHA256 b1fb3ef3d60e803cca87ed660f0ea02cbb6b98bc75170fa0de7008f7eab7f96e
-AUX secondlife-1.18.5.3-gentoo.patch 3479 RMD160 6a6a245b955ea528a838889f6058536354371eb3 SHA1 a547768f2605d593e6415c240ef4d0d66d7b7a41 SHA256 c958409f8c97b9e8aff24fb1e0d25318c54e6d73eab064cb6da9da047dba1ab6
 AUX secondlife-1.19.1.4-gentoo.patch 2873 RMD160 4b65726e8f79529e97b893b63fbb35df07f7b855 SHA1 ca0547cd518f5f10039af643ba4706194c254b16 SHA256 ed66ff5858dc14458fa1a518e033f5b44e0206658ee3aed0c7c59003ac58cf9a
-DIST slviewer-artwork-1.18.5.3.zip 25590813 RMD160 2bc9b015ca906036ee34d80cd722956eec7da57f SHA1 863fbb1515edbd7d6c0443661d6fb568a55f8d50 SHA256 2ba1190ceba8111d75aa57dcea87c69dc2cc001e28f2923f4c49f33042cda355
+AUX secondlife-1.20.15-gentoo.patch 6639 RMD160 911a311c880e25b9bc921e6d51d666babd41f3c4 SHA1 87ab5324377a0489ce7d4415d3ce77895e7f2018 SHA256 52e4b0674da9acefd089a1f94276cc8fed65d65dd7b6637b562839e23a0449c1
 DIST slviewer-artwork-Branch_1-19-1-Viewer-r84244.zip 25864603 RMD160 aef3080d55ba569696a9f0b2a460993b3caa2806 SHA1 0a945aee49f907d7e583b46fb7da26a88ec29ee1 SHA256 1a194cd0ab0dd8dada1b09baf6162d98f81ebc860974143101e1e9f215c9669a
-DIST slviewer-linux-libs-1.18.5.3.tar.gz 31481574 RMD160 71438c61ae8c168d0b52e98908055f4e1174e10c SHA1 e3ee127b778fb733511436f5bc246822c1fcb62e SHA256 fd44314ac1205c6d3d723d0a8184c4c5239be1049aaa8747509dd9a32f4e50aa
+DIST slviewer-artwork-Branch_1-20-Viewer-2-r92456.zip 25879203 RMD160 089b82dfb11103d8acdf8e34617187f4eb368276 SHA1 a88c474427284dc3357b4f55b2cd012872871ea0 SHA256 782f3b50aa1479f24c00f80681c05af4bf76af9cd9078ae337b9dafe55e9a579
 DIST slviewer-linux-libs-Branch_1-19-1-Viewer-r84244.tar.gz 34922331 RMD160 7958c3c79450760915d7ab4802443d0b135fa9cc SHA1 cf9b463a98cf0aeef2e9c69eb72079cb56336be4 SHA256 e0ba0cb3cf51795cf5066a3c301dadc5a67ee8769124369df693b971e4b9b395
-DIST slviewer-src-1.18.5.3.tar.gz 5529567 RMD160 66d2f20bbb94d69dfa8294e3cfa5495d13299457 SHA1 fb7bd6959bc59305677e10d8f0c958ccf82b4e60 SHA256 6030f5d78fa8f38f7e58c89aae45b1b6e10ed364979fafa4a3ec83b0cfc0ffd7
+DIST slviewer-linux-libs-Branch_1-20-Viewer-2-r92456.tar.gz 35656862 RMD160 e6b155d3c28a35cc5b959aebfdb86746ba9a519b SHA1 240115fe46013d34967613a407fd8fba315c4275 SHA256 d9429c7ea7cb5d1455701f3f2df150744adc73ac6086f306be5c11e010918ece
 DIST slviewer-src-Branch_1-19-1-Viewer-r84244.tar.gz 5810319 RMD160 a4946a30edd65b72d619329c9c855e8739c22816 SHA1 551730f5d426bcb8b0faa01cbc8aeaab71b494f5 SHA256 88260d1efd0ba7583efcbaeac768b0e9e3c99031304aaa6b9c1df3c81488307c
-EBUILD secondlife-1.18.5.3.ebuild 4848 RMD160 405c062ed0a85aa4298264dac872274e6a69db2e SHA1 4b671cdb4e591686a5e8ce806ec8f3617b7b29e9 SHA256 e7b35a1e4f8097bb874d698d164928341694f19cc62b81ce78aa223f4fe3e935
+DIST slviewer-src-Branch_1-20-Viewer-2-r92456.tar.gz 5978670 RMD160 5714b58cd359b146d7c77b754e58034a7e312291 SHA1 11a17028586f819bf6b908f039de2ec411da4564 SHA256 90170c5be51516240289d0cfdbca7c7858e39c94e1fd8c88483b965dad03dd7e
 EBUILD secondlife-1.19.1.4-r1.ebuild 4898 RMD160 5c9fa376b3371b56104b7eb44f6ef73c5567b8f9 SHA1 62aebb465f20204b3ac3b0c55324d18978d26d4a SHA256 e66e148ab4ce1ef0845d82234442eb721752a7cd07018e5f71635b4f1404771e
-EBUILD secondlife-1.19.1.4.ebuild 4861 RMD160 3dbbf028a1a13b4763b0c21d593870e80131fe83 SHA1 e09e13e86bfe56529583499dc710f64d18ecd6b6 SHA256 a60d6a8a704f9d929df2547269e8caf9b0f733b48096d28890ae3a7358162891
+EBUILD secondlife-1.20.15.ebuild 5005 RMD160 495f81cc02c514ddf7d89a24df2ff4a6ff9455b8 SHA1 54c23dab525e701c8fd33897d60860f80d004aa5 SHA256 87e9bacf35c25c22be2cdb0e9e8c884fa7d94e6bf517a6bbe4417ccca0df916f
 MISC ChangeLog 397 RMD160 63706792a2ef7f9f6415e659f853b285deae8b2f SHA1 17e67ab90c2e9e9498546dea1e697fff4757555c SHA256 cfd4bfd6466fb3e1db42817b34283356390a43f1e54f0b8217847a6d78a15dc6
 MISC metadata.xml 248 RMD160 ade4235c4b35539d6cccd6005afba23a7c9d2afd SHA1 e6af7cb4622744522ecc176d800015b77cd75d81 SHA256 5d0b7e035a2cb76eeb00ece66b18b59060068ea76dd196e6cd4f4524c92cde17
diff --git a/games-simulation/secondlife/files/secondlife-1.17.2.0-size_t.patch b/games-simulation/secondlife/files/secondlife-1.17.2.0-size_t.patch
deleted file mode 100644
index 06ca2f6..0000000
--- a/games-simulation/secondlife/files/secondlife-1.17.2.0-size_t.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur linden.orig/indra/newview/viewer.cpp linden/indra/newview/viewer.cpp
---- linden.orig/indra/newview/viewer.cpp	2007-06-26 08:48:31.000000000 +0900
-+++ linden/indra/newview/viewer.cpp	2007-07-02 23:57:04.000000000 +0900
-@@ -2368,7 +2368,7 @@
- 	size_t btpos;
- 	for (btpos = 0; btpos < btsize; ++btpos)
- 	{
--		fprintf(StraceFile, "%d:\t", btpos);
-+		fprintf(StraceFile, "%zd:\t", btpos);
- 		int symidx;
- 		for (symidx = 0; symidx < nSymNo; ++symidx)
- 		{
diff --git a/games-simulation/secondlife/files/secondlife-1.18.5.3-gentoo.patch b/games-simulation/secondlife/files/secondlife-1.18.5.3-gentoo.patch
deleted file mode 100644
index 7c8c6e2..0000000
--- a/games-simulation/secondlife/files/secondlife-1.18.5.3-gentoo.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct
---- linden.orig/indra/SConstruct	2007-11-30 07:47:10.000000000 +0900
-+++ linden/indra/SConstruct	2008-01-29 00:35:06.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
-@@ -243,7 +247,7 @@
-     ##############
- 
-     # Generic GCC flags
--    cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -Werror -fexceptions '
-+    cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -fexceptions '
-     cxxflags = ''
-     cppflags = '-D_FORTIFY_SOURCE=2 '
-     if standalone:
-diff -Naur linden.orig/indra/llimagej2coj/llimagej2coj.cpp linden/indra/llimagej2coj/llimagej2coj.cpp
---- linden.orig/indra/llimagej2coj/llimagej2coj.cpp	2007-11-30 07:47:11.000000000 +0900
-+++ linden/indra/llimagej2coj/llimagej2coj.cpp	2008-01-29 00:34:21.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/llmath/llquaternion.cpp linden/indra/llmath/llquaternion.cpp
---- linden.orig/indra/llmath/llquaternion.cpp	2007-11-30 07:47:11.000000000 +0900
-+++ linden/indra/llmath/llquaternion.cpp	2008-01-29 00:34:21.000000000 +0900
-@@ -698,22 +698,22 @@
- 	{
- 	default:
- 	case LLQuaternion::XYZ:
--		p = "XYZ";
-+		strcpy(p, "XYZ");
- 		break;
- 	case LLQuaternion::YZX:
--		p = "YZX";
-+		strcpy(p, "YZX");
- 		break;
- 	case LLQuaternion::ZXY:
--		p = "ZXY";
-+		strcpy(p, "ZXY");
- 		break;
- 	case LLQuaternion::XZY:
--		p = "XZY";
-+		strcpy(p, "XZY");
- 		break;
- 	case LLQuaternion::YXZ:
--		p = "YXZ";
-+		strcpy(p, "YXZ");
- 		break;
- 	case LLQuaternion::ZYX:
--		p = "ZYX";
-+		strcpy(p, "ZYX");
- 		break;
- 	}
- 	return p;
-diff -Naur linden.orig/indra/llwindow/llgl.cpp linden/indra/llwindow/llgl.cpp
---- linden.orig/indra/llwindow/llgl.cpp	2007-11-30 07:47:12.000000000 +0900
-+++ linden/indra/llwindow/llgl.cpp	2008-01-29 00:34:21.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/llvoiceclient.cpp linden/indra/newview/llvoiceclient.cpp
---- linden.orig/indra/newview/llvoiceclient.cpp	2007-11-30 07:47:17.000000000 +0900
-+++ linden/indra/newview/llvoiceclient.cpp	2008-01-29 00:34:21.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 --git a/games-simulation/secondlife/files/secondlife-1.20.15-gentoo.patch b/games-simulation/secondlife/files/secondlife-1.20.15-gentoo.patch
new file mode 100644
index 0000000..c7d1d60
--- /dev/null
+++ b/games-simulation/secondlife/files/secondlife-1.20.15-gentoo.patch
@@ -0,0 +1,158 @@
+diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct
+--- linden.orig/indra/SConstruct	2008-08-01 01:16:43.000000000 +0900
++++ linden/indra/SConstruct	2008-08-29 01:00:19.000000000 +0900
+@@ -118,7 +118,7 @@
+ standalone = optenv['STANDALONE']
+ runtests = optenv['RUNTESTS']
+ opensource = standalone or optenv['OPENSOURCE']
+-enable_fmod = not opensource and optenv['FMOD']
++enable_fmod = optenv['FMOD']
+ elfio = optenv['ELFIO']
+ 
+ targets = [ target_param ]
+@@ -163,6 +163,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
+@@ -303,9 +306,9 @@
+             if standalone:
+                 include_dirs += [d[2:] for d in
+                                  pkgconfig('--cflags-only-I').split()]
+-		client_external_libs += [ 'boost_program_options-gcc34-mt', 'boost_signals-gcc34-mt', 'boost_regex-gcc34-mt']
++		client_external_libs += [ 'boost_program_options-mt', 'boost_signals-mt', 'boost_regex-mt']
+             else:
+-                client_external_libs += [ 'fontconfig', 'gtk-x11-2.0', 'atk-1.0', 'gmodule-2.0', 'gdk-x11-2.0', 'gdk_pixbuf-2.0', 'pango-1.0', 'pangoft2-1.0', 'pangox-1.0', 'pangoxft-1.0', 'Xinerama', 'boost_program_options-gcc34-mt', 'boost_signals-gcc34-mt', 'boost_regex-gcc34-mt' ]
++                client_external_libs += [ 'fontconfig', 'gtk-x11-2.0', 'atk-1.0', 'gmodule-2.0', 'gdk-x11-2.0', 'gdk_pixbuf-2.0', 'pango-1.0', 'pangoft2-1.0', 'pangox-1.0', 'pangoxft-1.0', 'Xinerama', 'boost_program_options-mt', 'boost_signals-mt', 'boost_regex-mt' ]
+                 incdirs = [ 'ELFIO', 'atk-1.0', 'glib-2.0', 'gtk-2.0',
+                             'llfreetype2', 'pango-1.0' ]
+                 include_dirs += ['../libraries/' + system_str + '/include/' + d
+@@ -648,7 +651,7 @@
+                                   pkgconfig('--libs-only-l', ['gtk+-2.0']).split()]
+             else:
+                 external_libs = net_external_libs + [ 'db-4.2', 'gtk-x11-2.0' ]
+-            external_libs += ['boost_signals-gcc34-mt']
++            external_libs += ['boost_signals-mt']
+             internal_libs = [ 'llui', 'llxml', 'llmessage', 'llvfs', 'llmath', 'llcommon' ]
+             create_executable(output_crashlogger_bin + '-globalsyms',
+                               'linux_crash_logger',
+diff -Naur linden.orig/indra/llcommon/llhash.h linden/indra/llcommon/llhash.h
+--- linden.orig/indra/llcommon/llhash.h	2008-08-01 01:16:43.000000000 +0900
++++ linden/indra/llcommon/llhash.h	2008-08-27 08:53:56.000000000 +0900
+@@ -38,7 +38,9 @@
+ #include <hash_map>
+ #include <algorithm>
+ #elif LL_DARWIN || LL_LINUX
+-#  if GCC_VERSION >= 30400 // gcc 3.4 and up
++#  if GCC_VERSION >= 40300 // gcc 4.3 and up
++#    include <backward/hashtable.h>
++#  elif GCC_VERSION >= 30400 // gcc 3.4 and up
+ #    include <ext/hashtable.h>
+ #  elif __GNUC__ >= 3
+ #    include <ext/stl_hashtable.h>
+diff -Naur linden.orig/indra/llimagej2coj/llimagej2coj.cpp linden/indra/llimagej2coj/llimagej2coj.cpp
+--- linden.orig/indra/llimagej2coj/llimagej2coj.cpp	2008-08-01 01:16:44.000000000 +0900
++++ linden/indra/llimagej2coj/llimagej2coj.cpp	2008-08-24 18:08:31.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/llmath/llmath.h linden/indra/llmath/llmath.h
+--- linden.orig/indra/llmath/llmath.h	2008-08-01 01:16:44.000000000 +0900
++++ linden/indra/llmath/llmath.h	2008-08-27 02:10:52.000000000 +0900
+@@ -34,6 +34,7 @@
+ 
+ #include <cmath>
+ //#include <math.h>
++#include <cstdlib>
+ //#include <stdlib.h>
+ #include "lldefs.h"
+ 
+diff -Naur linden.orig/indra/llmath/llquaternion.cpp linden/indra/llmath/llquaternion.cpp
+--- linden.orig/indra/llmath/llquaternion.cpp	2008-08-01 01:16:44.000000000 +0900
++++ linden/indra/llmath/llquaternion.cpp	2008-08-24 18:08:31.000000000 +0900
+@@ -796,22 +796,22 @@
+ 	{
+ 	default:
+ 	case LLQuaternion::XYZ:
+-		p = "XYZ";
++		strcpy(p, "XYZ");
+ 		break;
+ 	case LLQuaternion::YZX:
+-		p = "YZX";
++		strcpy(p, "YZX");
+ 		break;
+ 	case LLQuaternion::ZXY:
+-		p = "ZXY";
++		strcpy(p, "ZXY");
+ 		break;
+ 	case LLQuaternion::XZY:
+-		p = "XZY";
++		strcpy(p, "XZY");
+ 		break;
+ 	case LLQuaternion::YXZ:
+-		p = "YXZ";
++		strcpy(p, "YXZ");
+ 		break;
+ 	case LLQuaternion::ZYX:
+-		p = "ZYX";
++		strcpy(p, "ZYX");
+ 		break;
+ 	}
+ 	return p;
+diff -Naur linden.orig/indra/llmedia/llmediaimplexample1.cpp linden/indra/llmedia/llmediaimplexample1.cpp
+--- linden.orig/indra/llmedia/llmediaimplexample1.cpp	2008-08-01 01:16:44.000000000 +0900
++++ linden/indra/llmedia/llmediaimplexample1.cpp	2008-08-27 10:23:20.000000000 +0900
+@@ -35,6 +35,7 @@
+ // register this impl with media manager factory
+ static LLMediaImplRegister sLLMediaImplExample1Reg( "LLMediaImplExample1", new LLMediaImplExample1Maker() );
+ 
++#include <cstring>
+ #include <iostream>
+ 
+ #include <time.h>
+diff -Naur linden.orig/indra/llmedia/llmediaimplexample2.cpp linden/indra/llmedia/llmediaimplexample2.cpp
+--- linden.orig/indra/llmedia/llmediaimplexample2.cpp	2008-08-01 01:16:44.000000000 +0900
++++ linden/indra/llmedia/llmediaimplexample2.cpp	2008-08-27 10:24:12.000000000 +0900
+@@ -35,6 +35,7 @@
+ // register this impl with media manager factory
+ static LLMediaImplRegister sLLMediaImplExample2Reg( "LLMediaImplExample2", new LLMediaImplExample2Maker() );
+ 
++#include <cstring>
+ #include <iostream>
+ #include <time.h>
+ 
+diff -Naur linden.orig/indra/newview/llmutelist.cpp linden/indra/newview/llmutelist.cpp
+--- linden.orig/indra/newview/llmutelist.cpp	2008-08-01 01:16:49.000000000 +0900
++++ linden/indra/newview/llmutelist.cpp	2008-08-28 01:09:29.000000000 +0900
+@@ -451,7 +451,7 @@
+ 
+ void notify_automute_callback(const LLUUID& agent_id, const char* first_name, const char* last_name, BOOL is_group, void* user_data)
+ {
+-	U32 temp_data = (U32)user_data;
++	U32 temp_data = (U32)(uintptr_t)user_data;
+ 	LLMuteList::EAutoReason reason = (LLMuteList::EAutoReason)temp_data;
+ 	LLUIString auto_message;
+ 
+diff -Naur linden.orig/indra/newview/llvoiceclient.cpp linden/indra/newview/llvoiceclient.cpp
+--- linden.orig/indra/newview/llvoiceclient.cpp	2008-08-01 01:16:49.000000000 +0900
++++ linden/indra/newview/llvoiceclient.cpp	2008-08-24 18:08:31.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 gGridChoice
diff --git a/games-simulation/secondlife/secondlife-1.18.5.3.ebuild b/games-simulation/secondlife/secondlife-1.18.5.3.ebuild
deleted file mode 100644
index 1fc5cf1..0000000
--- a/games-simulation/secondlife/secondlife-1.18.5.3.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit games toolchain-funcs
-
-MY_PV="${PV/*_rc/RC-${PV/_rc}}"
-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/11/slviewer-src-${MY_PV}.tar.gz
-	http://secondlife.com/developers/opensource/downloads/2007/11/slviewer-artwork-${MY_PV}.zip
-	http://secondlife.com/developers/opensource/downloads/2007/11/slviewer-linux-libs-${MY_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-r1
-	elfio? ( dev-libs/elfio )
-	>=media-libs/openjpeg-1.1.1
-	media-fonts/kochi-substitute
-	net-dns/c-ares
-	gstreamer? ( >=media-libs/gst-plugins-base-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-${MY_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-${MY_PV}.tar.gz
-	unpack slviewer-artwork-${MY_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)'|" \
-		-e "/_cflags =/s|-O2|${CFLAGS}|" \
-		-e "/_cxxflags =/s|-O2|${CXXFLAGS}|" \
-		"${S}"/SConstruct || die
-
-	# "${S}"/newview/viewer_manifest.py
-	touch "${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
-
-	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
-}
diff --git a/games-simulation/secondlife/secondlife-1.19.1.4.ebuild b/games-simulation/secondlife/secondlife-1.20.15.ebuild
index 2964836..f3bfdb7 100644
--- a/games-simulation/secondlife/secondlife-1.19.1.4.ebuild
+++ b/games-simulation/secondlife/secondlife-1.20.15.ebuild
@@ -4,8 +4,8 @@
 
 inherit games toolchain-funcs
 
-MY_PV="Branch_1-19-1-Viewer-r84244"
-MY_DATE="2008/04"
+MY_PV="Branch_1-20-Viewer-2-r92456"
+MY_DATE="2008/07"
 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/${MY_DATE}/slviewer-src-${MY_PV}.tar.gz
@@ -15,7 +15,7 @@ SRC_URI="http://secondlife.com/developers/opensource/downloads/${MY_DATE}/slview
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug elfio fmod gstreamer kdu llmozlib2"
+IUSE="debug elfio fmod gstreamer kdu vivox"
 RESTRICT="mirror"
 
 RDEPEND=">=x11-libs/gtk+-2
@@ -37,12 +37,11 @@ RDEPEND=">=x11-libs/gtk+-2
 	>=dev-libs/xmlrpc-epi-0.51-r1
 	elfio? ( dev-libs/elfio )
 	>=media-libs/openjpeg-1.1.1
-	media-fonts/kochi-substitute
-	<net-dns/c-ares-1.15
+	net-dns/c-ares
 	x11-libs/pango
+	net-libs/llmozlib2
 	gstreamer? ( >=media-libs/gst-plugins-base-0.10 )
 	debug? ( dev-libs/google-perftools )"
-#	llmozlib2? ( net-libs/llmozlib2 )
 
 DEPEND="${RDEPEND}
 	>=dev-util/scons-0.97
@@ -62,8 +61,8 @@ pkg_config() {
 		if use kdu ; then
 			ewarn "kdu USE flag is only available on x86."
 		fi
-		if use llmozlib2 ; then
-			ewarn "llmozlib2 USE flag is only available on x86."
+		if use vivox ; then
+			ewarn "vivox USE flag is only available on x86."
 		fi
 	fi
 }
@@ -78,9 +77,7 @@ src_unpack() {
 		rm -rf linden/libraries
 	fi
 
-	if ! use llmozlib2 ; then
-		rm -rf linden/indra/newview/app_settings
-	fi
+	rm -rf linden/indra/newview/app_settings
 
 	unpack slviewer-src-${MY_PV}.tar.gz
 	unpack slviewer-artwork-${MY_PV}.zip
@@ -88,11 +85,13 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/VWR-3480.patch
 
 	sed -i \
 		-e "s|gcc_bin = .*$|gcc_bin = '$(tc-getCXX)'|" \
 		-e "/_cflags =/s|-O2|${CFLAGS}|" \
 		-e "/_cxxflags =/s|-O2|${CXXFLAGS}|" \
+		-e "/lib_path =/s|$| + ['/usr/$(get_libdir)/llmozlib2']|" \
 		"${S}"/SConstruct || die
 
 	# "${S}"/newview/viewer_manifest.py
@@ -101,7 +100,7 @@ src_unpack() {
 
 src_compile() {
 	local myarch
-	local myopts="BUILD=release BTARGET=client DISTCC=no STANDALONE=yes"
+	local myopts="BTARGET=client DISTCC=no STANDALONE=yes MOZLIB2=yes"
 
 	if use debug ; then
 		myopts="${myopts} BUILD=debug"
@@ -149,13 +148,8 @@ src_compile() {
 			myopts="${myopts} OPENSOURCE=yes"
 		fi
 
-		if use llmozlib2 ; then
-			myopts="${myopts} MOZLIB2=yes"
-		else
-			myopts="${myopts} MOZLIB2=no"
-		fi
 	else
-		myopts="${myopts} FMOD=no MOZLIB2=no OPENSOURCE=yes"
+		myopts="${myopts} FMOD=no OPENSOURCE=yes"
 	fi
 
 	TEMP_BUILD_DIR= scons ${myopts} || die
@@ -165,13 +159,14 @@ 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 gpu_table.txt gridargs.dat featuretable_linux.txt || die
+	doins -r app_settings character fonts skins res* || 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
+	newins linux_tools/client-readme-voice.txt README-linux-voice.txt || die
+	newins res/ll_icon.png secondlife_icon.png || die
 
 	insinto "${dir}"/app_settings/
 	doins "${WORKDIR}"/linden/scripts/messages/message_template.msg || die
@@ -179,6 +174,7 @@ src_install() {
 
 	exeinto "${dir}"
 	doexe linux_tools/launch_url.sh || die
+	doexe linux_tools/*_secondlifeprotocol.sh || die
 	newexe linux_tools/wrapper.sh secondlife || die
 	newexe ../linux_crash_logger/linux-crash-logger-*-bin* linux-crash-logger.bin || die
 
@@ -188,15 +184,21 @@ src_install() {
 	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
+	if use vivox ; then
+		exeinto "${dir}"
+		doexe vivox-runtime/i686-linux/SLVoice || die
+		exeinto "${dir}/vivox-runtime/i686-linux"
+		doexe vivox-runtime/i686-linux/lib* || die
+	fi
 
 	games_make_wrapper secondlife ./secondlife "${dir}"
-	newicon res/ll_icon.ico secondlife.ico || die
-	make_desktop_entry secondlife "Second Life" secondlife.ico
+	newicon res/ll_icon.png secondlife_icon.png || die
+	make_desktop_entry secondlife "Second Life" secondlife_icon.png
 
 	dodoc releasenotes.txt
 	newdoc licenses-linux.txt licenses.txt
 	newdoc linux_tools/client-readme.txt README-linux.txt
+	newdoc linux_tools/client-readme-voice.txt README-linux-voice.txt
 
 	dohtml lsl_guide.html
 
diff --git a/net-libs/llmozlib2/Manifest b/net-libs/llmozlib2/Manifest
index 55c0174..b263331 100644
--- a/net-libs/llmozlib2/Manifest
+++ b/net-libs/llmozlib2/Manifest
@@ -1 +1 @@
-EBUILD llmozlib2-9999.ebuild 1413 RMD160 df8a73862ee2ae6d6c2d117ac20f51e361945e35 SHA1 a08e1319748fa8a43965565b9f48d08a96d3a051 SHA256 e42b7b59abf1724113195bb62c66e7644c5d17f27078b0d43e04568df17569ef
+EBUILD llmozlib2-9999.ebuild 1526 RMD160 d54292a3176f5b0f9ffc7b0e164969ab91765791 SHA1 136b82acd9524590ae541c40acdfa59710301ac9 SHA256 1d31ddbb6d25a2b4e9d99c2b6c8945bd47c30791bfdc17b19e3927d591b45497
diff --git a/net-libs/llmozlib2/llmozlib2-9999.ebuild b/net-libs/llmozlib2/llmozlib2-9999.ebuild
index 68515f0..0e10834 100644
--- a/net-libs/llmozlib2/llmozlib2-9999.ebuild
+++ b/net-libs/llmozlib2/llmozlib2-9999.ebuild
@@ -14,9 +14,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=sys-devel/binutils-2.16.1
+RDEPEND=">=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.11.8
 	>=dev-libs/nspr-4.6.8"
+DEPEND="${RDEPEND}
+	dev-util/cvs"
 
 src_unpack() {
 	subversion_src_unpack
@@ -50,13 +52,14 @@ src_compile() {
 src_install() {
 	local MOZARCH="$(uname -m)-linux"
 
-	dolib.a libllmozlib2.a || die
+	dolib.a libllmozlib2.a  || die
 
 	insopts -m0755
 	insinto "/usr/$(get_libdir)/${PN}"
 	for f in "${S}"/libraries/${MOZARCH}/runtime_release/*; do 
 		doins -r "${f}"
 	done
+	doins "${S}"/libraries/${MOZARCH}/lib_release/libprofdirserviceprovider_s.a
 
 	dodoc README-linux*
 }