revision bump, changed out a few patches

(Portage version: 2.1_pre3-r1)

10 files changed, 877 insertions, 244 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 61172e60f600..ef4feb500d64 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for mail-client/mozilla-thunderbird
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.98 2005/12/24 02:52:07 anarchy Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.99 2006/01/12 07:31:21 anarchy Exp $
+
+*mozilla-thunderbird-1.5 (12 Jan 2006)
+
+  12 Jan 2006; Jory A. Pratt <anarchy@gentoo.org>
+  +files/firefox-1.1-uriloader-1.patch,
+  +files/firefox-1.5-visibility-check.patch,
+  +files/firefox-1.5-visibility-fix.patch, +files/pango-cairo-1.patch,
+  -mozilla-thunderbird-1.5_rc1-r1.ebuild,
+  -mozilla-thunderbird-1.5_rc2.ebuild, +mozilla-thunderbird-1.5.ebuild:
+  revision bump, arch's will need to be added back as some will have issues in
+  this release
 
 *mozilla-thunderbird-1.5_rc2 (24 Dec 2005)
 
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 2def94947465..9fc2d5716dc0 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,18 +1,21 @@
-MD5 8052c51ed668de9a3a6c801ef2c33a9f ChangeLog 14920
+MD5 a6cebf5b9236dc65a7ed6da56b644433 ChangeLog 15375
 MD5 b84b32e9963589c0f2f76d98019b44d7 files/digest-mozilla-thunderbird-1.0.7 303
 MD5 34fc13a505bfb805c539a3b4f0b1bcbf files/digest-mozilla-thunderbird-1.0.7-r1 303
 MD5 106701e2f4e5e9e73301f95dd92c3306 files/digest-mozilla-thunderbird-1.0.7-r2 227
 MD5 34fc13a505bfb805c539a3b4f0b1bcbf files/digest-mozilla-thunderbird-1.0.7-r3 303
-MD5 ed1976eae02ff1d7ea4409be6be9be78 files/digest-mozilla-thunderbird-1.5_rc1-r1 228
-MD5 a3574ae6610e094463d540bb77b535e7 files/digest-mozilla-thunderbird-1.5_rc2 228
+MD5 9766549a184a8638b6c01f717801b294 files/digest-mozilla-thunderbird-1.5 225
+MD5 b92734c051b7734d459e23f7c4a01b63 files/firefox-1.1-uriloader-1.patch 13902
 MD5 2bd0dd9035dcb875b8340be358347e8d files/firefox-1.1-uriloader.patch 15300
 MD5 cc5756b8c7af5c88b248b86c73fc5c8d files/firefox-1.1-visibility.patch 930
+MD5 c00ea2b2717491804ceababb4c14cc5b files/firefox-1.5-visibility-check.patch 10955
+MD5 9c2b48ceea1c5ec25a32bf5225946f7b files/firefox-1.5-visibility-fix.patch 485
 MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
 MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
 MD5 07a5a1ce0146f1badc4e04849a9b1830 files/mozilla-thunderbird-1.0.6-gcc4.patch 6131
 MD5 30b381b5ba910ec5ffa7b9eafbfe86ef files/mozilla-thunderbird-1.0.7-draft-template.patch 761
 MD5 1783f8e4678fb4731ccc67b4bfba1981 files/mozilla-thunderbird-1.0.7-gcc-4.0.2.patch 6861
+MD5 d2386bbbf480062153de1b154cb63e6c files/pango-cairo-1.patch 4372
 MD5 7847d262e628dcac303586fe02f2e8c4 files/thunderbird-cairo-canvas.patch 446
 MD5 91661761f2f232b08b74f5adc4f1eff0 files/thunderbird-nopangoxft.patch 839
 MD5 07f9a980afa2dde67554657c00b8be18 files/thunderbird-rpath-1.patch 1716
@@ -21,5 +24,4 @@ MD5 2896cc99ffbb38fe463d98feb1e954f0 mozilla-thunderbird-1.0.7-r1.ebuild 5640
 MD5 feb3d5b0156f6a9f1af491b50907e32e mozilla-thunderbird-1.0.7-r2.ebuild 6156
 MD5 778b71cc8a385fabd02a28033fa1f4a1 mozilla-thunderbird-1.0.7-r3.ebuild 6378
 MD5 55697b53bd932c2ea9c20d3d5e3b771e mozilla-thunderbird-1.0.7.ebuild 5632
-MD5 0173684748ffb0e547d084132d847457 mozilla-thunderbird-1.5_rc1-r1.ebuild 6442
-MD5 42537c2b4150c17cb6bb391ae128f6cf mozilla-thunderbird-1.5_rc2.ebuild 6439
+MD5 6cfdb80c897ef5e0369d703656abda1f mozilla-thunderbird-1.5.ebuild 5540
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5_rc1-r1 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5
index 5e7545aa5c90..bc868fbd00de 100644
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5_rc1-r1
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5
@@ -1,3 +1,3 @@
 MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
 MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
-MD5 0df70073cc6ac9f6772f82bc9e024543 thunderbird-1.5rc1-source.tar.bz2 35022501
+MD5 781c1cd1a01583d9b666d8c2fe4288e6 thunderbird-1.5-source.tar.bz2 35028308
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5_rc2 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5_rc2
deleted file mode 100644
index 4b010695b1d7..000000000000
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
-MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
-MD5 de9476d1a7807627985304bfa69085a3 thunderbird-1.5rc2-source.tar.bz2 35187072
diff --git a/mail-client/mozilla-thunderbird/files/firefox-1.1-uriloader-1.patch b/mail-client/mozilla-thunderbird/files/firefox-1.1-uriloader-1.patch
new file mode 100644
index 000000000000..588adab55e72
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/firefox-1.1-uriloader-1.patch
@@ -0,0 +1,419 @@
+Index: uriloader/exthandler/Makefile.in
+===================================================================
+RCS file: /cvsroot/mozilla/uriloader/exthandler/Makefile.in,v
+retrieving revision 1.60
+diff -d -u -p -r1.60 Makefile.in
+--- uriloader/exthandler/Makefile.in	2 May 2005 16:30:03 -0000	1.60
++++ uriloader/exthandler/Makefile.in	21 Jul 2005 03:07:39 -0000
+@@ -102,7 +102,7 @@ endif
+ LOCAL_INCLUDES = -I$(srcdir)
+ 
+ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+-OSHELPER	+= nsGNOMERegistry.cpp
++OSHELPER	+= nsMIMEInfoUnix.cpp nsGNOMERegistry.cpp
+ endif
+ 
+ ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
+Index: uriloader/exthandler/unix/nsGNOMERegistry.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp,v
+retrieving revision 1.10
+diff -d -u -p -r1.10 nsGNOMERegistry.cpp
+--- uriloader/exthandler/unix/nsGNOMERegistry.cpp	16 Oct 2004 13:46:17 -0000	1.10
++++ uriloader/exthandler/unix/nsGNOMERegistry.cpp	21 Jul 2005 03:07:40 -0000
+@@ -42,7 +42,7 @@
+ #include "nsString.h"
+ #include "nsIComponentManager.h"
+ #include "nsILocalFile.h"
+-#include "nsMIMEInfoImpl.h"
++#include "nsMIMEInfoUnix.h"
+ #include "nsAutoPtr.h"
+ 
+ #include <glib.h>
+@@ -56,12 +56,12 @@ typedef struct _GConfClient GConfClient;
+ typedef struct _GnomeProgram GnomeProgram;
+ typedef struct _GnomeModuleInfo GnomeModuleInfo;
+ 
+-typedef struct {
++struct GnomeVFSMimeApplication {
+   char *id;
+   char *name;
+   char *command;
+   /* there is more here, but we don't need it */
+-} GnomeVFSMimeApplication;
++};
+ 
+ typedef GConfClient * (*_gconf_client_get_default_fn)();
+ typedef gchar * (*_gconf_client_get_string_fn)(GConfClient *,
+@@ -264,7 +264,7 @@ nsGNOMERegistry::GetAppDescForScheme(con
+ }
+ 
+ 
+-/* static */ already_AddRefed<nsMIMEInfoBase>
++/* static */ already_AddRefed<nsMIMEInfoUnix>
+ nsGNOMERegistry::GetFromExtension(const char *aFileExt)
+ {
+   if (!gconfLib)
+@@ -286,7 +286,7 @@ nsGNOMERegistry::GetFromExtension(const 
+   return GetFromType(mimeType);
+ }
+ 
+-/* static */ already_AddRefed<nsMIMEInfoBase>
++/* static */ already_AddRefed<nsMIMEInfoUnix>
+ nsGNOMERegistry::GetFromType(const char *aMIMEType)
+ {
+   if (!gconfLib)
+@@ -296,9 +296,11 @@ nsGNOMERegistry::GetFromType(const char 
+   if (!handlerApp)
+     return nsnull;
+ 
+-  nsRefPtr<nsMIMEInfoImpl> mimeInfo = new nsMIMEInfoImpl(aMIMEType);
++  nsRefPtr<nsMIMEInfoUnix> mimeInfo = new nsMIMEInfoUnix(aMIMEType);
+   NS_ENSURE_TRUE(mimeInfo, nsnull);
+ 
++  mimeInfo->SetDefaultGnomeVFSMimeApplication(handlerApp);
++
+   // Get the list of extensions and append then to the mimeInfo.
+   GList *extensions = _gnome_vfs_mime_get_extensions_list(aMIMEType);
+   for (GList *extension = extensions; extension; extension = extension->next)
+@@ -320,11 +322,21 @@ nsGNOMERegistry::GetFromType(const char 
+     return nsnull;
+   }
+ 
+-  gchar *commandPath = g_find_program_in_path(nativeCommand);
++  gchar **argv;
++  gboolean res = g_shell_parse_argv(nativeCommand, NULL, &argv, NULL);
++  if (!res) {
++    NS_ERROR("Could not convert helper app command to filesystem encoding");
++    _gnome_vfs_mime_application_free(handlerApp);
++    return nsnull;
++  }
++
++  gchar *commandPath = g_find_program_in_path(argv[0]);
+ 
+   g_free(nativeCommand);
++  g_strfreev(argv);
+ 
+   if (!commandPath) {
++    NS_WARNING("could not find command in path");
+     _gnome_vfs_mime_application_free(handlerApp);
+     return nsnull;
+   }
+@@ -342,7 +354,7 @@ nsGNOMERegistry::GetFromType(const char 
+ 
+   _gnome_vfs_mime_application_free(handlerApp);
+ 
+-  nsMIMEInfoBase* retval;
++  nsMIMEInfoUnix* retval;
+   NS_ADDREF((retval = mimeInfo));
+   return retval;
+ }
+Index: uriloader/exthandler/unix/nsGNOMERegistry.h
+===================================================================
+RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.h,v
+retrieving revision 1.3
+diff -d -u -p -r1.3 nsGNOMERegistry.h
+--- uriloader/exthandler/unix/nsGNOMERegistry.h	16 Oct 2004 13:46:17 -0000	1.3
++++ uriloader/exthandler/unix/nsGNOMERegistry.h	21 Jul 2005 03:07:40 -0000
+@@ -35,10 +35,13 @@
+  *
+  * ***** END LICENSE BLOCK ***** */
+ 
++#ifndef nsGNOMERegistry_h__
++#define nsGNOMERegistry_h__
++
+ #include "nsIURI.h"
+ #include "nsCOMPtr.h"
+ 
+-class nsMIMEInfoBase;
++class nsMIMEInfoUnix;
+ 
+ class nsGNOMERegistry
+ {
+@@ -52,7 +55,9 @@ class nsGNOMERegistry
+   static void GetAppDescForScheme(const nsACString& aScheme,
+                                   nsAString& aDesc);
+ 
+-  static already_AddRefed<nsMIMEInfoBase> GetFromExtension(const char *aFileExt);
++  static already_AddRefed<nsMIMEInfoUnix> GetFromExtension(const char *aFileExt);
+ 
+-  static already_AddRefed<nsMIMEInfoBase> GetFromType(const char *aMIMEType);
++  static already_AddRefed<nsMIMEInfoUnix> GetFromType(const char *aMIMEType);
+ };
++
++#endif // nsGNOMERegistry_h__
+Index: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+===================================================================
+RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	21 Jul 2005 03:07:40 -0000
+@@ -0,0 +1,196 @@
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.1
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is mozilla.org Code.
++ *
++ * The Initial Developer of the Original Code is
++ * Red Hat, Inc.
++ * Portions created by the Initial Developer are Copyright (C) 2005
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *   Christopher Aillon <caillon@redhat.com> (Original author)
++ *
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++#include "nsMIMEInfoUnix.h"
++#include "prlink.h"
++#include "prmem.h"
++#include <glib.h>
++#include <glib-object.h>
++
++static PRLibrary *gnomeLib;
++static PRLibrary *vfsLib;
++
++typedef struct _GnomeProgram GnomeProgram;
++typedef struct _GnomeModuleInfo GnomeModuleInfo;
++
++typedef enum {
++  GNOME_VFS_OK // there's more but we don't care about them.
++} GnomeVFSResult;
++
++typedef GnomeVFSResult (*_gnome_vfs_mime_application_launch_fn)
++                              (GnomeVFSMimeApplication *app,
++                               GList *uris);
++typedef void (*_gnome_vfs_mime_application_free_fn)(GnomeVFSMimeApplication *);
++typedef GnomeVFSMimeApplication * (*_gnome_vfs_mime_application_copy_fn)(GnomeVFSMimeApplication *);
++typedef GnomeProgram * (*_gnome_program_init_fn)(const char *, const char *,
++						 const GnomeModuleInfo *, int,
++						 char **, const char *, ...);
++typedef const char * (*_gnome_vfs_mime_application_get_name_fn)(GnomeVFSMimeApplication *);
++typedef const GnomeModuleInfo * (*_libgnome_module_info_get_fn)();
++typedef GnomeProgram * (*_gnome_program_get_fn)();
++typedef char * (*_gnome_vfs_make_uri_from_input_fn)(const char *);
++
++#define DECL_FUNC_PTR(func) static _##func##_fn _##func
++
++DECL_FUNC_PTR(gnome_vfs_mime_application_launch);
++DECL_FUNC_PTR(gnome_vfs_mime_application_free);
++DECL_FUNC_PTR(gnome_vfs_mime_application_copy);
++DECL_FUNC_PTR(gnome_vfs_mime_application_get_name);
++DECL_FUNC_PTR(gnome_program_init);
++DECL_FUNC_PTR(gnome_program_get);
++DECL_FUNC_PTR(libgnome_module_info_get);
++DECL_FUNC_PTR(gnome_vfs_make_uri_from_input);
++
++static PRLibrary *
++LoadVersionedLibrary(const char* libName, const char* libVersion)
++{
++  char *platformLibName = PR_GetLibraryName(nsnull, libName);
++  nsCAutoString versionLibName(platformLibName);
++  versionLibName.Append(libVersion);
++  PR_Free(platformLibName);
++  return PR_LoadLibrary(versionLibName.get());
++}
++
++static void
++Cleanup()
++{
++  // Unload all libraries
++  if (gnomeLib)
++    PR_UnloadLibrary(gnomeLib);
++  if (vfsLib)
++    PR_UnloadLibrary(vfsLib);
++
++  gnomeLib = vfsLib = nsnull;
++}
++
++static void
++InitGnomeVFS()
++{
++  static PRBool initialized = PR_FALSE;
++
++  if (initialized)
++    return;
++
++  #define ENSURE_LIB(lib) \
++    PR_BEGIN_MACRO \
++    if (!lib) { \
++      Cleanup(); \
++      return; \
++    } \
++    PR_END_MACRO
++
++  #define GET_LIB_FUNCTION(lib, func, failure) \
++    PR_BEGIN_MACRO \
++    _##func = (_##func##_fn) PR_FindFunctionSymbol(lib##Lib, #func); \
++    if (!_##func) { \
++      failure; \
++    } \
++    PR_END_MACRO
++
++  // Attempt to open libgnome
++  gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
++  ENSURE_LIB(gnomeLib);
++
++  GET_LIB_FUNCTION(gnome, gnome_program_init, return Cleanup());
++  GET_LIB_FUNCTION(gnome, libgnome_module_info_get, return Cleanup());
++  GET_LIB_FUNCTION(gnome, gnome_program_get, return Cleanup());
++
++  // Attempt to open libgnomevfs
++  vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
++  ENSURE_LIB(vfsLib);
++
++  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_launch, /* do nothing */);
++  GET_LIB_FUNCTION(vfs, gnome_vfs_make_uri_from_input, return Cleanup());
++  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_get_name, return Cleanup());
++  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_free, return Cleanup());
++  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_copy, return Cleanup());
++
++  // Initialize GNOME, if it's not already initialized.  It's not
++  // necessary to tell GNOME about our actual command line arguments.
++
++  if (!_gnome_program_get()) {
++    char *argv[1] = { "gecko" };
++    _gnome_program_init("Gecko", "1.0", _libgnome_module_info_get(),
++                        1, argv, NULL);
++  }
++
++  // Note: after GNOME has been initialized, do not ever unload these
++  // libraries.  They register atexit handlers, so if they are unloaded, we'll
++  // crash on exit.  
++}
++
++void
++nsMIMEInfoUnix::SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication* app)
++{
++  if (_gnome_vfs_mime_application_copy && _gnome_vfs_mime_application_free) {
++    mDefaultVFSApplication = _gnome_vfs_mime_application_copy(app);
++
++    mPreferredAction = nsIMIMEInfo::useSystemDefault;
++
++    const gchar * name = _gnome_vfs_mime_application_get_name(mDefaultVFSApplication);
++    if (name) 
++      mDefaultAppDescription = NS_ConvertUTF8toUCS2(name);
++  }
++}
++
++nsMIMEInfoUnix::~nsMIMEInfoUnix()
++{
++  if (mDefaultVFSApplication)
++    _gnome_vfs_mime_application_free(mDefaultVFSApplication);
++}
++
++nsresult
++nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile* aFile)
++{
++  NS_ENSURE_ARG_POINTER(aFile);
++
++  InitGnomeVFS();
++
++  if (_gnome_vfs_mime_application_launch && mDefaultVFSApplication) {
++    nsCAutoString nativePath;
++    aFile->GetNativePath(nativePath);
++
++    gchar *uri = _gnome_vfs_make_uri_from_input(nativePath.get());
++
++    GList *uris = NULL;
++    uris = g_list_append(uris, uri);
++
++    GnomeVFSResult result = _gnome_vfs_mime_application_launch(mDefaultVFSApplication, uris);
++
++    g_free(uri);
++    g_list_free(uris);
++
++    if (result != GNOME_VFS_OK)
++      return NS_ERROR_FAILURE;
++
++    return NS_OK;
++  }
++
++  if (!mDefaultApplication)
++    return NS_ERROR_FILE_NOT_FOUND;
++
++  return LaunchWithIProcess(mDefaultApplication, aFile);
++}
+Index: uriloader/exthandler/unix/nsMIMEInfoUnix.h
+===================================================================
+RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.h
+diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.h
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ uriloader/exthandler/unix/nsMIMEInfoUnix.h	21 Jul 2005 03:07:40 -0000
+@@ -0,0 +1,50 @@
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.1
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is mozilla.org Code.
++ *
++ * The Initial Developer of the Original Code is
++ * Red Hat, Inc.
++ * Portions created by the Initial Developer are Copyright (C) 2005
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *   Christopher Aillon <caillon@redhat.com> (Original author)
++ *
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++#ifndef nsMimeInfoUnix_h__
++#define nsMimeInfoUnix_h__
++
++#include "nsMIMEInfoImpl.h"
++
++struct GnomeVFSMimeApplication;
++
++class nsMIMEInfoUnix : public nsMIMEInfoImpl
++{
++public:
++  nsMIMEInfoUnix(const char* aType = "") : nsMIMEInfoImpl(aType), mDefaultVFSApplication(nsnull) {}
++  nsMIMEInfoUnix(const nsACString& aMIMEType) : nsMIMEInfoImpl(aMIMEType) {};
++
++  virtual ~nsMIMEInfoUnix();
++
++  void SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication *app);
++
++protected:
++  virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile);
++
++  GnomeVFSMimeApplication *mDefaultVFSApplication;
++};
++ 
++#endif // nsMimeInfoUnix_h__
+Index: uriloader/exthandler/unix/nsOSHelperAppService.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp,v
+retrieving revision 1.58
+diff -d -u -p -r1.58 nsOSHelperAppService.cpp
+--- uriloader/exthandler/unix/nsOSHelperAppService.cpp	25 Oct 2004 07:46:01 -0000	1.58
++++ uriloader/exthandler/unix/nsOSHelperAppService.cpp	21 Jul 2005 03:07:40 -0000
+@@ -44,6 +44,7 @@
+ #include "nsOSHelperAppService.h"
+ #ifdef MOZ_WIDGET_GTK2
+ #include "nsGNOMERegistry.h"
++#include "nsMIMEInfoUnix.h"
+ #endif
+ #include "nsISupports.h"
+ #include "nsString.h"
diff --git a/mail-client/mozilla-thunderbird/files/firefox-1.5-visibility-check.patch b/mail-client/mozilla-thunderbird/files/firefox-1.5-visibility-check.patch
new file mode 100644
index 000000000000..eda8ed458f9d
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/firefox-1.5-visibility-check.patch
@@ -0,0 +1,273 @@
+diff -Nur mozilla/configure.in mozilla.bug307168/configure.in
+--- mozilla/configure.in	2005-10-04 05:53:49.000000000 +0000
++++ mozilla.bug307168/configure.in	2005-12-06 16:42:46.000000000 +0000
+@@ -1036,9 +1036,9 @@
+ dnl GNU specific defaults
+ dnl ========================================================
+ if test "$GNU_CC"; then
+-    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+-    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+-    DSO_LDOPTS='-shared -Wl,-h -Wl,$@'
++    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
++    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
++    DSO_LDOPTS='-shared'
+     DSO_CFLAGS=''
+     DSO_PIC_CFLAGS='-fPIC'
+     _MOZ_RTTI_FLAGS_ON=${_COMPILER_PREFIX}-frtti
+@@ -1063,9 +1063,9 @@
+     _DEFINES_CFLAGS='-include $(DEPTH)/mozilla-config.h -DMOZILLA_CLIENT'
+     _USE_CPP_INCLUDE_FLAG=1
+ else
+-    MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
+-    MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
+-    DSO_LDOPTS='-shared -h $@'
++    MKSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@'
++    MKCSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@'
++    DSO_LDOPTS='-shared'
+     DSO_CFLAGS=''
+     DSO_PIC_CFLAGS='-KPIC'
+     _DEFINES_CFLAGS='$(ACDEFINES) -D_MOZILLA_CONFIG_H_ -DMOZILLA_CLIENT'
+@@ -1292,9 +1292,9 @@
+ 
+ *-beos*)
+     no_x=yes
+-    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
++    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
+     _PLATFORM_DEFAULT_TOOLKIT="beos"
+-    DSO_LDOPTS='-nostart -Wl,-h -Wl,$@'
++    DSO_LDOPTS='-nostart'
+     TK_LIBS='-lbe -lroot'
+     LIBS="$LIBS -lbe"
+     if test "$COMPILE_ENVIRONMENT"; then
+@@ -1379,16 +1379,16 @@
+ *-hpux*)
+     DLL_SUFFIX=".sl"
+     if test ! "$GNU_CC"; then
+-    	DSO_LDOPTS='-b -Wl,+s -L$(DIST)/bin'
++    	DSO_LDOPTS='-b -Wl,+s'
+     	DSO_CFLAGS=""
+     	DSO_PIC_CFLAGS="+Z"
+-    	MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
++    	MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -L$(DIST)/bin -o $@'
+     	MKCSHLIB='$(LD) -b +s -L$(DIST)/bin -o $@'
+         CXXFLAGS="$CXXFLAGS -Wc,-ansi_for_scope,on"
+     else
+-    	DSO_LDOPTS='-b -E +s -L$(DIST)/bin -L$(DIST)/lib'
+-    	MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
+-    	MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
++        DSO_LDOPTS='-b -E +s'
++        MKSHLIB='$(LD) $(DSO_LDOPTS) -L$(DIST)/bin -L$(DIST)/lib -o $@'
++        MKCSHLIB='$(LD) $(DSO_LDOPTS) -L$(DIST)/bin -L$(DIST)/lib -o $@'
+     fi
+     MOZ_POST_PROGRAM_COMMAND='chatr +s enable'
+     AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
+@@ -1397,11 +1397,16 @@
+ *-irix5*)
+     AC_DEFINE(IRIX)
+     DSO_LDOPTS='-elf -shared'
++
+     if test "$GNU_CC"; then
++       MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
++       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+        MKSHLIB_FORCE_ALL='-Wl,-all'
+        MKSHLIB_UNFORCE_ALL='-Wl,-none'
+        CXXFLAGS="$CXXFLAGS -D_LANGUAGE_C_PLUS_PLUS"
+     else
++       MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
++       MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
+        MKSHLIB_FORCE_ALL='-all'
+        MKSHLIB_UNFORCE_ALL='-none'
+     fi
+@@ -1755,7 +1760,7 @@
+     if $CC -E - -dM </dev/null | grep __ELF__ >/dev/null; then
+         DLL_SUFFIX=".so"
+         DSO_PIC_CFLAGS='-fPIC -DPIC'
+-        DSO_LDOPTS='-shared -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX)'
++        DSO_LDOPTS='-shared'
+ 	BIN_FLAGS='-Wl,--export-dynamic'
+     else
+     	DSO_PIC_CFLAGS='-fPIC -DPIC'
+@@ -1768,6 +1773,8 @@
+     if test "$LIBRUNPATH"; then
+ 	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
+     fi
++    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@'
++    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@'
+     ;;
+ 
+ *-nto*) 
+@@ -1931,17 +1938,19 @@
+ 
+ alpha*-*-osf*)
+     if test "$GNU_CC"; then
+-	DSO_LDOPTS='-shared -Wl,-soname -Wl,$@'
++      MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@'
++      MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@'
++
+     else
+ 	MOZ_DEBUG_FLAGS='-g'
+ 	ASFLAGS='-I$(topsrcdir)/xpcom/reflect/xptcall/public -g'
+ 	CFLAGS="$CFLAGS -ieee"
+ 	CXXFLAGS="$CXXFLAGS "'-noexceptions -ieee  -ptr $(DIST)/cxx_repository'
+-	DSO_LDOPTS='-shared -msym -expect_unresolved \* -soname $@ -update_registry $(DIST)/so_locations'
++	DSO_LDOPTS='-shared -msym -expect_unresolved \* -update_registry $(DIST)/so_locations'
+ 	DSO_CFLAGS=
+ 	DSO_PIC_CFLAGS=
+-	MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+-	MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
++	MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@'
++	MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@'
+ 	MKSHLIB_FORCE_ALL='-all'
+ 	MKSHLIB_UNFORCE_ALL='-none'
+ 	dnl Might fix the libxpcom.so breakage on this platform as well....
+@@ -1973,7 +1982,7 @@
+     AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
+     CXXFLAGS="$CXXFLAGS -I/usr/include/CC"
+     if test ! "$GNU_CC"; then
+-       DSO_LDOPTS='-G -h $@'
++       DSO_LDOPTS='-G'
+     fi
+     ;;
+ 
+@@ -1989,11 +1998,11 @@
+        CXXFLAGS="$CXXFLAGS -xbuiltin=%all -features=tmplife"
+        LDFLAGS="-xildoff -zlazyload -zcombreloc $LDFLAGS"
+        MOZ_OPTIMIZE_FLAGS="-xO4"
+-       MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -o $@'
+-       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
++       MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@'
++       KCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $@ -o $@'
+        MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
+        MKSHLIB_UNFORCE_ALL=''
+-       DSO_LDOPTS='-G -Qoption ld -z,muldefs -h $@'
++       DSO_LDOPTS='-G -Qoption ld -z,muldefs'
+        AR_LIST="$AR t"
+        AR_EXTRACT="$AR x"
+        AR_DELETE="$AR d"
+@@ -2019,7 +2028,7 @@
+         AC_MSG_RESULT([$_res])
+     else
+        ASFLAGS="$ASFLAGS -fPIC"
+-       DSO_LDOPTS='-G -h $@'
++       DSO_LDOPTS='-G'
+        _WARNINGS_CFLAGS=''
+        _WARNINGS_CXXFLAGS=''
+        if test "$OS_RELEASE" = "5.3"; then
+@@ -2378,8 +2387,25 @@
+                   fi
+                   rm -f conftest.[cs]
+                  ])
+-   if test "$ac_cv_visibility_hidden" = "yes"; then
+-      AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
++  if test "$ac_cv_visibility_hidden" = "yes"; then
++    AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
++
++    AC_CACHE_CHECK(for visibility(default) attribute,
++                   ac_cv_visibility_default,
++                   [cat > conftest.c <<EOF
++                    int foo __attribute__ ((visibility ("default"))) = 1;
++EOF
++                    ac_cv_visibility_default=no
++                    if ${CC-cc} -fvisibility=hidden -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
++                      if ! grep '\.hidden.*foo' conftest.s >/dev/null; then
++                        ac_cv_visibility_default=yes
++                      fi
++                    fi
++                    rm -f conftest.[cs]
++                   ])
++    if test "$ac_cv_visibility_default" = "yes"; then
++      AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE)
++
+       AC_CACHE_CHECK(for visibility pragma support,
+                      ac_cv_visibility_pragma,
+                      [cat > conftest.c <<EOF
+@@ -2399,12 +2425,35 @@
+                       rm -f conftest.[cs]
+                     ])
+       if test "$ac_cv_visibility_pragma" = "yes"; then
+-        AC_DEFINE(HAVE_VISIBILITY_PRAGMA)
+-        VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
+-        WRAP_SYSTEM_INCLUDES=1
+-      fi
+-   fi
+-fi     # GNU_CC
++        AC_CACHE_CHECK(For x86_64 gcc visibility bug with builtins (GCC bug 20297),
++                       ac_cv_have_visibility_builtin_bug,
++                       [cat > conftest.c <<EOF
++#pragma GCC visibility push(hidden)
++#pragma GCC visibility push(default)
++#include <string.h>
++#pragma GCC visibility pop
++
++__attribute__ ((visibility ("default"))) void Func() {
++  char c[[100]];
++  memset(c, 0, sizeof(c));
++}
++EOF
++                       ac_cv_have_visibility_builtin_bug=no
++                       if ! ${CC-cc} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -o conftest.so conftest.c >/dev/null 2>&1; then
++                         ac_cv_have_visibility_builtin_bug=yes
++                       fi
++                       rm -f conftest.{c,so}
++                       ])
++        if test "$ac_cv_have_visibility_builtin_bug" = "no"; then
++          VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
++          WRAP_SYSTEM_INCLUDES=1
++        else
++          VISIBILITY_FLAGS='-fvisibility=hidden -fvisibility-inlines-hidden'
++        fi # have visibility pragma bug
++      fi   # have visibility pragma
++    fi     # have visibility(default) attribute
++  fi       # have visibility(hidden) attribute
++fi         # GNU_CC
+ 
+ AC_SUBST(WRAP_SYSTEM_INCLUDES)
+ AC_SUBST(VISIBILITY_FLAGS)
+diff -Nur mozilla/js/src/jstypes.h mozilla.bug307168/js/src/jstypes.h
+--- mozilla/js/src/jstypes.h	2005-09-18 04:35:05.000000000 +0000
++++ mozilla.bug307168/js/src/jstypes.h	2005-12-06 16:35:57.000000000 +0000
+@@ -109,7 +109,7 @@
+ 
+ #else /* Unix */
+ 
+-#ifdef HAVE_VISIBILITY_PRAGMA
++#ifdef HAVE_VISIBILITY_ATTRIBUTE
+ #define JS_EXTERNAL_VIS __attribute__((visibility ("default")))
+ #else
+ #define JS_EXTERNAL_VIS
+diff -Nur mozilla/modules/libreg/include/NSReg.h mozilla.bug307168/modules/libreg/include/NSReg.h
+--- mozilla/modules/libreg/include/NSReg.h	2004-12-15 05:52:38.000000000 +0000
++++ mozilla.bug307168/modules/libreg/include/NSReg.h	2005-12-06 16:35:57.000000000 +0000
+@@ -129,7 +129,7 @@
+   #endif
+ #elif defined XP_MAC
+   #define VR_INTERFACE(__x)  __declspec(export) __x
+-#elif defined (HAVE_VISIBILITY_PRAGMA)
++#elif defined (HAVE_VISIBILITY_ATTRIBUTE)
+   #define VR_INTERFACE(type)     __attribute__ ((visibility ("default"))) type
+ #else
+   #define VR_INTERFACE(type)     type
+diff -Nur mozilla/modules/zlib/src/mozzconf.h mozilla.bug307168/modules/zlib/src/mozzconf.h
+--- mozilla/modules/zlib/src/mozzconf.h	2005-08-04 19:14:14.000000000 +0000
++++ mozilla.bug307168/modules/zlib/src/mozzconf.h	2005-12-06 16:35:57.000000000 +0000
+@@ -41,7 +41,7 @@
+ #undef ZLIB_DLL
+ #endif
+ 
+-#ifdef HAVE_VISIBILITY_PRAGMA
++#ifdef HAVE_VISIBILITY_ATTRIBUTE
+ #define ZEXTERN __attribute__((visibility ("default"))) extern
+ #endif
+ 
+diff -Nur mozilla/xpcom/base/nscore.h mozilla.bug307168/xpcom/base/nscore.h
+--- mozilla/xpcom/base/nscore.h	2005-07-21 22:15:00.000000000 +0000
++++ mozilla.bug307168/xpcom/base/nscore.h	2005-12-06 16:35:57.000000000 +0000
+@@ -105,7 +105,7 @@
+ #define NS_VISIBILITY_HIDDEN
+ #endif
+ 
+-#if defined(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) && defined(HAVE_VISIBILITY_PRAGMA)
++#if defined(HAVE_VISIBILITY_ATTRIBUTE)
+ #define NS_VISIBILITY_DEFAULT __attribute__ ((visibility ("default")))
+ #else
+ #define NS_VISIBILITY_DEFAULT
diff --git a/mail-client/mozilla-thunderbird/files/firefox-1.5-visibility-fix.patch b/mail-client/mozilla-thunderbird/files/firefox-1.5-visibility-fix.patch
new file mode 100644
index 000000000000..8beb92492923
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/firefox-1.5-visibility-fix.patch
@@ -0,0 +1,15 @@
+diff -u -r3.30 -r3.31
+--- nsprpub/pr/include/prtypes.h        29 Apr 2005 21:02:54 -0000      3.30
++++ nsprpub/pr/include/prtypes.h        13 Oct 2005 17:43:36 -0000      3.31
+@@ -178,7 +178,9 @@
+
+ #else /* Unix */
+
+-#ifdef HAVE_VISIBILITY_PRAGMA
++/* GCC 3.3 and later support the visibility attribute. */
++#if (__GNUC__ >= 4) || \
++    (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
+ #define PR_VISIBILITY_DEFAULT __attribute__((visibility("default")))
+ #else
+ #define PR_VISIBILITY_DEFAULT
+
diff --git a/mail-client/mozilla-thunderbird/files/pango-cairo-1.patch b/mail-client/mozilla-thunderbird/files/pango-cairo-1.patch
new file mode 100644
index 000000000000..73ebf8b56ad3
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/pango-cairo-1.patch
@@ -0,0 +1,135 @@
+Index: config/autoconf.mk.in
+===================================================================
+RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v
+retrieving revision 3.363.2.1
+diff -u -p -6 -r3.363.2.1 autoconf.mk.in
+--- config/autoconf.mk.in	17 Aug 2005 17:17:17 -0000	3.363.2.1
++++ config/autoconf.mk.in	27 Aug 2005 19:57:29 -0000
+@@ -456,12 +456,13 @@ MOZ_XFT_CFLAGS		= @MOZ_XFT_CFLAGS@
+ MOZ_XFT_LIBS		= @MOZ_XFT_LIBS@
+ MOZ_ENABLE_COREXFONTS	= @MOZ_ENABLE_COREXFONTS@
+ 
+ MOZ_ENABLE_PANGO        = @MOZ_ENABLE_PANGO@
+ MOZ_PANGO_CFLAGS        = @MOZ_PANGO_CFLAGS@
+ MOZ_PANGO_LIBS          = @MOZ_PANGO_LIBS@
++MOZ_PANGOCAIRO          = @MOZ_PANGOCAIRO@
+ 
+ MOZ_EXTRA_X11CONVERTERS	= @MOZ_EXTRA_X11CONVERTERS@
+ 
+ MOZ_ENABLE_XINERAMA	= @MOZ_ENABLE_XINERAMA@
+ MOZ_XINERAMA_LIBS	= @MOZ_XINERAMA_LIBS@
+ 
+Index: gfx/src/gtk/mozilla-decoder.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/gfx/src/gtk/mozilla-decoder.cpp,v
+retrieving revision 1.3
+diff -u -p -6 -r1.3 mozilla-decoder.cpp
+--- gfx/src/gtk/mozilla-decoder.cpp	7 Nov 2004 23:59:23 -0000	1.3
++++ gfx/src/gtk/mozilla-decoder.cpp	27 Aug 2005 19:57:49 -0000
+@@ -37,13 +37,17 @@
+  * ***** END LICENSE BLOCK ***** */
+ 
+ #define PANGO_ENABLE_BACKEND
+ #define PANGO_ENABLE_ENGINE
+ 
+ #include "mozilla-decoder.h"
++#ifdef MOZ_PANGOCAIRO
++#include <pango/pangocairo.h>
++#else
+ #include <pango/pangoxft.h>
++#endif
+ #include <pango/pangofc-fontmap.h>
+ #include <pango/pangofc-font.h>
+ #include <gdk/gdkx.h>
+ 
+ #include "nsString.h"
+ #include "nsIPersistentProperties2.h"
+@@ -205,13 +209,17 @@ mozilla_decoders_init(void)
+         }
+         else {
+             printf("unknown suffix used for mapping\n");
+         }
+     }
+ 
++#ifdef MOZ_PANGOCAIRO
++    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()),
++#else
+     pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
++#endif
+                                             mozilla_find_decoder,
+                                             NULL,
+                                             NULL);
+ 
+     initialized = PR_TRUE;
+ 
+Index: configure.in
+===================================================================
+RCS file: /cvsroot/mozilla/configure.in,v
+retrieving revision 1.1503.2.6
+diff -u -p -6 -r1.1503.2.6 configure.in
+--- configure.in	25 Aug 2005 19:05:34 -0000	1.1503.2.6
++++ configure.in	29 Aug 2005 08:03:32 -0000
+@@ -3707,14 +3707,14 @@ gtk)
+     ;;
+ 
+ gtk2)
+     MOZ_ENABLE_GTK2=1
+     MOZ_ENABLE_XREMOTE=1
+     MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-}
+-    TK_CFLAGS='$(MOZ_GTK2_CFLAGS)'
+-    TK_LIBS='$(MOZ_GTK2_LIBS)'
++    TK_CFLAGS='$(MOZ_GTK2_CFLAGS) $(MOZ_PANGO_CFLAGS)'
++    TK_LIBS='$(MOZ_GTK2_LIBS) $(MOZ_PANGO_LIBS)'
+     AC_DEFINE(MOZ_WIDGET_GTK2)
+     ;;
+ 
+ xlib)
+ 	MOZ_ENABLE_XLIB=1
+     if test "$_HAVE_FREETYPE2"; then
+@@ -4277,33 +4277,44 @@ if test "$MOZ_ENABLE_XFT" && test "$MOZ_
+ fi
+ 
+ if test "$MOZ_ENABLE_XFT"
+ then
+     AC_DEFINE(MOZ_ENABLE_XFT)
+     PKG_CHECK_MODULES(MOZ_XFT, xft)
+-    PKG_CHECK_MODULES(_PANGOCHK, pango >= 1.1.0)
++    PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.1.0 pangox)
+ fi
+ 
+ AC_SUBST(MOZ_ENABLE_XFT)
+ AC_SUBST(MOZ_XFT_CFLAGS)
+ AC_SUBST(MOZ_XFT_LIBS)
++AC_SUBST(MOZ_PANGO_CFLAGS)
++AC_SUBST(MOZ_PANGO_LIBS)
+ 
+ dnl ========================================================
+ dnl = pango font rendering
+ dnl ========================================================
+ MOZ_ARG_ENABLE_BOOL(pango,
+ [  --enable-pango          Enable Pango font rendering support],
+     MOZ_ENABLE_PANGO=1,
+     MOZ_ENABLE_PANGO=)
+ 
+ if test "$MOZ_ENABLE_PANGO"
+ then
+     AC_DEFINE(MOZ_ENABLE_PANGO)
+-    PKG_CHECK_MODULES(MOZ_PANGO, pango >= 1.6.0 pangoft2 >= 1.6.0)
++    PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.6.0)
++    PKG_CHECK_MODULES(PANGOCAIRO_CHK, pangocairo >= 1.10.0,
++    [ 
++      MOZ_PANGOCAIRO=1
++      AC_DEFINE(MOZ_PANGOCAIRO)
++      MOZ_PANGO_CFLAGS="$PANGOCAIRO_CHK_CFLAGS $MOZ_PANGO_CFLAGS"
++      MOZ_PANGO_LIBS="$PANGOCAIRO_CHK_LIBS $MOZ_PANGO_LIBS"
++    ],
++    [:])
+ 
+     AC_SUBST(MOZ_ENABLE_PANGO)
++    AC_SUBST(MOZ_PANGOCAIRO)
+     AC_SUBST(MOZ_PANGO_CFLAGS)
+     AC_SUBST(MOZ_PANGO_LIBS)
+ fi
+ 
+ dnl ========================================================
+ dnl = x11 core font support (default and ability to enable depend on toolkit)
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5_rc2.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.ebuild
index 41fb6b6e367e..115c1fdda071 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5_rc2.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.ebuild
@@ -1,20 +1,17 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5_rc2.ebuild,v 1.1 2005/12/24 02:52:07 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.ebuild,v 1.1 2006/01/12 07:31:21 anarchy Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib versionator
-
-MY_P="$(replace_version_separator 2 '')"
-TV=${MY_P/beta/b}
+inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib autotools
 
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${TV}/source/thunderbird-${TV}-source.tar.bz2
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/source/thunderbird-${PV}-source.tar.bz2
 	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
 	mirror://gentoo/mozilla-jslibmath-alpha.patch"
 
-KEYWORDS="-*"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 IUSE="ldap"
@@ -45,10 +42,10 @@ src_unpack() {
 	#
 	####################################
 
-	# amd64 visibility patch
-	if [[ ${ARCH} == amd64 ]] && [[ $(gcc-major-version) -ge 3 ]]; then
-		epatch ${FILESDIR}/firefox-1.1-visibility.patch
-	fi
+	# addresses visibility issues on ppc and amd64
+	# will not hurt to apply on other archs as well.
+	epatch ${FILESDIR}/firefox-1.5-visibility-check.patch
+	epatch ${FILESDIR}/firefox-1.5-visibility-fix.patch
 
 	# patch to fix math operations on alpha, makes maps.google.com work!
 	epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
@@ -60,13 +57,13 @@ src_unpack() {
 	####################################
 
 	# patch from fedora to remove the pangoxft things
-	epatch ${FILESDIR}/thunderbird-nopangoxft.patch
+	epatch ${FILESDIR}/pango-cairo-1.patch
 	#cairo-canvas patch
 	# epatch ${FILESDIR}/thunderbird-cairo-canvas.patch
 
 	# rpath fix
 	epatch ${FILESDIR}/thunderbird-rpath-1.patch
-	epatch ${FILESDIR}/firefox-1.1-uriloader.patch
+	epatch ${FILESDIR}/firefox-1.1-uriloader-1.patch
 
 	# Fix a compilation issue using the 32-bit userland with 64-bit kernel on
 	# PowerPC, because with that configuration, it detects a ppc64 system.
@@ -78,12 +75,7 @@ src_unpack() {
 			${S}/security/coreconf/arch.mk
 	fi
 
-	echo  ""
-	ewarn "This thunderbird-1.5rc1 ebuild is provided for your convenience,"
-	ewarn "the use of this ebuild is not supported by gentoo developers. "
-	ewarn "Please file bugs related to firefox-1.5 with upstream developers."
-	ewarn "Bugs should be filed @ https://bugzilla.mozilla.org."
-	ewarn "Thank you Anarchy"
+	eautoreconf || die "failed running autoreconf"
 }
 
 src_compile() {
@@ -182,17 +174,8 @@ pkg_postinst() {
 	update_mozilla_launcher_symlinks
 
 	echo  ""
-	ewarn "Enigmail Support has been dropped since it doesn't work on fresh install."
-	ewarn "The Gentoo Mozilla team is working on making enigmail its own build,"
-	ewarn "sorry for the inconvenience.  For now, you can download enigmail from"
-	ewarn "http://enigmail.mozdev.org"
-
-	echo  ""
-	ewarn "This thunderbird-1.5rc1 ebuild is provided for your convenience,"
-	ewarn "the use of this ebuild is not supported by gentoo developers. "
-	ewarn "Please file bugs related to firefox-1.5 with upstream developers."
-	ewarn "Bugs should be filed @ https://bugzilla.mozilla.org."
-	ewarn "Thank you Anarchy"
+	einfo "enigmail support is in the tree, simply emerge enigmail"
+	einfo "for all your crypto needs!"
 }
 
 pkg_postrm() {
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5_rc1-r1.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5_rc1-r1.ebuild
deleted file mode 100644
index 46dbc36f1c79..000000000000
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5_rc1-r1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5_rc1-r1.ebuild,v 1.3 2005/12/06 01:54:38 anarchy Exp $
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib versionator
-
-MY_P="$(replace_version_separator 2 '')"
-TV=${MY_P/beta/b}
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${TV}/source/thunderbird-${TV}-source.tar.bz2
-	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
-	mirror://gentoo/mozilla-jslibmath-alpha.patch"
-
-KEYWORDS="-*"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-IUSE="ldap"
-
-RDEPEND=">=www-client/mozilla-launcher-1.39"
-
-S=${WORKDIR}/mozilla
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-export MOZ_CO_PROJECT=mail
-
-src_unpack() {
-	declare x
-
-	for x in ${A}; do
-		[[ $x == *.tar.* ]] || continue
-		unpack $x || die "unpack failed"
-	done
-	cd ${S} || die "cd failed"
-
-	####################################
-	#
-	# architecture patches
-	#
-	####################################
-
-	# amd64 visibility patch
-	if [[ ${ARCH} == amd64 ]] && [[ $(gcc-major-version) -ge 3 ]]; then
-		epatch ${FILESDIR}/firefox-1.1-visibility.patch
-	fi
-
-	# patch to fix math operations on alpha, makes maps.google.com work!
-	epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
-
-	####################################
-	#
-	# general compilation and run-time fixes
-	#
-	####################################
-
-	# patch from fedora to remove the pangoxft things
-	epatch ${FILESDIR}/thunderbird-nopangoxft.patch
-	#cairo-canvas patch
-	# epatch ${FILESDIR}/thunderbird-cairo-canvas.patch
-
-	# rpath fix
-	epatch ${FILESDIR}/thunderbird-rpath-1.patch
-	epatch ${FILESDIR}/firefox-1.1-uriloader.patch
-
-	# Fix a compilation issue using the 32-bit userland with 64-bit kernel on
-	# PowerPC, because with that configuration, it detects a ppc64 system.
-	# -- hansmi, 2005-11-13
-	if use ppc && [[ "${PROFILE_ARCH}" == ppc64 ]]; then
-		sed -i -e "s#OS_TEST=\`uname -m\`\$#OS_TEST=${ARCH}#" \
-			${S}/configure
-		sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \
-			${S}/security/coreconf/arch.mk
-	fi
-
-	echo  ""
-	ewarn "This thunderbird-1.5rc1 ebuild is provided for your convenience,"
-	ewarn "the use of this ebuild is not supported by gentoo developers. "
-	ewarn "Please file bugs related to firefox-1.5 with upstream developers."
-	ewarn "Bugs should be filed @ https://bugzilla.mozilla.org."
-	ewarn "Thank you Anarchy"
-}
-
-src_compile() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# tb-specific settings
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_annotate '' --enable-extensions=default
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, which breaks us
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-
-	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
-	# to econf, but the quotes cause configure to fail.
-	sed -i -e \
-		's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
-		${S}/config/autoconf.mk \
-		${S}/nsprpub/config/autoconf.mk \
-		${S}/xpfe/global/buildconfig.html
-
-	# Fixup the RPATH
-	sed -i -e \
-		's|#RPATH_FIXER|'"${MOZILLA_FIVE_HOME}"'|' \
-		${S}/config/rules.mk \
-		${S}/nsprpub/config/rules.mk \
-		${S}/security/coreconf/rules.mk \
-		${S}/security/coreconf/rules.mk
-
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake || die
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Most of the installation happens here
-	dodir ${MOZILLA_FIVE_HOME}
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
-
-	# Create directory structure to support portage-installed extensions.
-	# See update_chrome() in mozilla-launcher
-	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
-	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
-	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
-		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
-
-	# Create /usr/bin/thunderbird
-	install_mozilla_launcher_stub thunderbird ${MOZILLA_FIVE_HOME}
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/thunderbird-icon.png
-
-	# Fix bug 54179: Install .desktop file into /usr/share/applications
-	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozillathunderbird.desktop
-}
-
-pkg_postinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# This should be called in the postinst and postrm of all the
-	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
-	# thunderbird-bin ebuilds.
-	update_mozilla_launcher_symlinks
-
-	echo  ""
-	ewarn "Enigmail Support has been dropped since it doesn't work on fresh install."
-	ewarn "The Gentoo Mozilla team is working on making enigmail its own build,"
-	ewarn "sorry for the inconvenience.  For now, you can download enigmail from"
-	ewarn "http://enigmail.mozdev.org"
-
-	echo  ""
-	ewarn "This thunderbird-1.5rc1 ebuild is provided for your convenience,"
-	ewarn "the use of this ebuild is not supported by gentoo developers. "
-	ewarn "Please file bugs related to firefox-1.5 with upstream developers."
-	ewarn "Bugs should be filed @ https://bugzilla.mozilla.org."
-	ewarn "Thank you Anarchy"
-}
-
-pkg_postrm() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	update_mozilla_launcher_symlinks
-}