Update to 0.7.3 for security meta-bug 59419. This is the first of the mozilla ebuilds to use mozilla.eclass. Remove unused amd64 patch which exceeds repoman's filesize limit.

5 files changed, 180 insertions, 1289 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 52f62f8d6758..c332d1c3e0a3 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,256 +1,12 @@
 # ChangeLog for mail-client/mozilla-thunderbird
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.20 2004/08/03 21:21:36 gustavoz Exp $
+# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.21 2004/08/04 23:49:53 agriffis Exp $
 
-  03 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
-  mozilla-thunderbird-0.7.1.ebuild:
-  Stable on sparc
+*mozilla-thunderbird-0.7.3 (04 Aug 2004)
 
-*mozilla-thunderbird-0.7.1-r1 (03 Aug 2004)
-
-  03 Aug 2004; Aron Griffis <agriffis@gentoo.org>
-  -mozilla-thunderbird-0.5-r1.ebuild, -mozilla-thunderbird-0.5.ebuild,
-  -mozilla-thunderbird-0.6.ebuild, +mozilla-thunderbird-0.7.1-r1.ebuild:
-  Update to enigmail-0.85 for thunderbird-0.7.1; older versions of enigmail
-  don't work #56814 #57250
-
-  29 Jul 2004; Aron Griffis <agriffis@gentoo.org>
-  mozilla-thunderbird-0.7.1.ebuild:
-  stable on x86 and ia64
-
-  14 Jul 2004; Brad Laue <brad@gentoo.org> mozilla-thunderbird-0.7.1.ebuild:
-  No longer leaving the option to install a menu icon as exclusive to GNOME. As
-  we're installing to a Freedesktop standard location, both KDE and GNOME, as
-  well as other desktop environments can make use of this icon, and it should be
-  installed by default.
-
-  02 Jul 2004; Jason Wever <weeve@gentoo.org>
-  mozilla-thunderbird-0.6-r2.ebuild:
-  Stable on sparc.
-
-  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  mozilla-thunderbird-0.5-r1.ebuild, mozilla-thunderbird-0.5.ebuild:
-  virtual/glibc -> virtual/libc
-
-*mozilla-thunderbird-0.7.1 (29 Jun 2004)
-
-  29 Jun 2004; Aron Griffis <agriffis@gentoo.org>
-  mozilla-thunderbird-0.6-r2.ebuild, +mozilla-thunderbird-0.7.1.ebuild:
-  Bump to 0.7.1, re-use the init files from 0.7 since they seem to work. Mark
-  0.6-r2 stable on x86 finally
-
-  24 Jun 2004; Aron Griffis <agriffis@gentoo.org>
-  mozilla-thunderbird-0.5.ebuild:
-  QA - fix use invocation
-
-  18 Jun 2004; Aron Griffis <agriffis@gentoo.org>
-  files/icon/mozillathunderbird.desktop, mozilla-thunderbird-0.7.ebuild:
-  - Fix bug 54179: Install mozillathunderbird.desktop to
-    /usr/share/applications instead of /usr/share/gnome/apps/Internet.
-    This also necessitated some changes to the .desktop file which I
-    based on balsa.desktop
-  - Fix bug 54295: Move init file unpacking from pkg_postinst to
-    src_install
-  - Get rid of the stupid perl dependency; it was only being used to
-    edit the .desktop file, and sed would have sufficed in any case
-
-*mozilla-thunderbird-0.6-r2 (17 Jun 2004)
-
-  17 Jun 2004; Aron Griffis <agriffis@gentoo.org>
-  +mozilla-thunderbird-0.6-r2.ebuild, mozilla-thunderbird-0.7.ebuild:
-  - Fix bug 54100: export MOZ_THUNDERBIRD=1 at the top level instead
-    of in pkg_setup so that thunderbird will build.
-  - Fix bug 53092: Update 0.6 to -r2 to backport makemake from 0.7
-    ebuild.  Also use mozilla-launcher eclass for compatibility with the
-    -bin-0.7 release.
-  - Fix bug 54158: enigmail upstream changed the tarball content without
-    bumping the version. Use the new tarball on mirror://gentoo to solve
-    the problem. When the next version of enigmail is released, plan to
-    switch back to the upstream tarball.
-
-*mozilla-thunderbird-0.7 (16 Jun 2004)
-
-  16 Jun 2004; Aron Griffis <agriffis@gentoo.org>
-  +files/ipc-1.0.6-nsPipeChannel.patch, +files/thunderbird-0.7-init.tar.bz2,
-  +mozilla-thunderbird-0.7.ebuild:
-  First commit of version 0.7, but it doesn't completely build yet, so it's
-  package.masked
-
-  10 Jun 2004; Brad Laue <brad@gentoo.org>
-  +files/icon/mozillathunderbird.desktop, +files/icon/thunderbird-icon.png:
-  Return the icons to their rightful place.
-
-  09 Jun 2004; Brad Laue <brad@gentoo.org> mozilla-thunderbird-0.5-r1.ebuild,
-  mozilla-thunderbird-0.5.ebuild, mozilla-thunderbird-0.6-r1.ebuild,
-  mozilla-thunderbird-0.6.ebuild:
-  Added gnome to IUSE, as we're using it here. We may not have to optionalize
-  this if we place an icon in a location compliant with fd.o standards.
-
-  07 Jun 2004; Travis Tilley <lv@gentoo.org>
-  mozilla-thunderbird-0.6-r1.ebuild:
-  stable on amd64
-
-  07 Jun 2004; Aron Griffis <agriffis@gentoo.org>
-  -mozilla-thunderbird-0.3-r1.ebuild, -mozilla-thunderbird-0.4.ebuild,
-  mozilla-thunderbird-0.5-r1.ebuild, mozilla-thunderbird-0.5.ebuild:
-  Trim old ebuilds and fix use invocation
-
-  02 Jun 2004; Seemant Kulleen <seemant@gentoo.org>
-  +files/enigmail/Makefile-enigmail, +files/enigmail/Makefile-ipc:
-  added the missing enigmail dir into FILESDIR -- for some reason epkgmove
-  didn't move it
-
-  07 May 2004; Aron Griffis <agriffis@gentoo.org>
-  mozilla-thunderbird-0.6-r1.ebuild:
-  Depend on mozilla-launcher-1.7-r1 which installs in /usr/libexec
-
-*mozilla-thunderbird-0.6-r1 (04 May 2004)
-
-  04 May 2004; Aron Griffis <agriffis@gentoo.org>
-  +mozilla-thunderbird-0.6-r1.ebuild:
-  Switch to mozilla-launcher since version 1.6 supports thunderbird
-
-  04 May 2004; Aron Griffis <agriffis@gentoo.org>
-  mozilla-thunderbird-0.6.ebuild:
-  Clean up this ebuild, heading toward convergence with mozilla and
-  mozilla-firefox ebuilds.
-
-*mozilla-thunderbird-0.6 (04 May 2004)
-
-  04 May 2004; Brad Laue <brad@gentoo.org> +mozilla-thunderbird-0.6.ebuild:
-  Bump to 0.6. Clean up some dependency problems.
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
-  mozilla-thunderbird-0.4.ebuild, mozilla-thunderbird-0.5-r1.ebuild,
-  mozilla-thunderbird-0.5.ebuild:
-  Add inherit eutils
-
-  26 Apr 2004; Aron Griffis <agriffis@gentoo.org>
-  mozilla-thunderbird-0.5-r1.ebuild:
-  Fix bug 48364 (QA/Ebuild Violations: net-mail/mozilla-thunderbird) by moving
-  sparc and ppc support into src_compile where they belong.
-
-  11 Apr 2004; Travis Tilley <lv@gentoo.org> mozilla-thunderbird-0.5.ebuild:
-  marked stable on amd64
-
-  25 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
-  mozilla-thunderbird-0.3-r1.ebuild, mozilla-thunderbird-0.4.ebuild,
-  mozilla-thunderbird-0.5-r1.ebuild, mozilla-thunderbird-0.5.ebuild:
-  don't use deprecated ? : use syntax
-
-*mozilla-thunderbird-0.5-r1 (07 Mar 2004)
-
-  07 Mar 2004; Brad Laue <brad@gentoo.org> mozilla-thunderbird-0.5-r1.ebuild:
-  New version of enigmail, add Xinerama support.
-
-  24 Feb 2004; Sven Blumenstein <bazik@gentoo.org>
-  mozilla-thunderbird-0.5.ebuild:
-  Gave it some sparc keyword love ;)
-
-  19 Feb 2004; Brad Laue <brad@gentoo.org> mozilla-thunderbird-0.5.ebuild:
-  Stable on x86, at long last.
-
-  19 Feb 2004; Brad Laue <brad@gentoo.org> mozilla-thunderbird-0.5.ebuild:
-  Add dependency on pkgconfig, as this is needed for GTK+2 building.
-
-*mozilla-thunderbird-0.5 (15 Feb 2004)
-
-  15 Feb 2004; Brad Laue <brad@gentoo.org> mozilla-thunderbird-0.5.ebuild,
-  files/thunderbird:
-  Bump to version 0.5.
-
-  25 Dec 2003; Sven Blumenstein <bazik@gentoo.org>
-  mozilla-thunderbird-0.4.ebuild:
-  Stable on sparc.
-
-  22 Dec 2003; Sven Blumenstein <bazik@gentoo.org>
-  mozilla-thunderbird-0.3.ebuild:
-  Marked stable on sparc.
-
-*mozilla-thunderbird-0.4 (07 Dec 2003)
-
-  07 Dec 2003; Brad Laue <brad@gentoo.org> mozilla-thunderbird-0.4.ebuild:
-  Bump to 0.4 - now supports URL handling under Linux, and other improvements.
-
-  18 Nov 2003; Luca Barbato <lu_zero@gentoo.org>
-  mozilla-thunderbird-0.3-r1.ebuild:
-  Filtered problematic cflags
-
-  17 Nov 2003; Brad Laue <brad@gentoo.org> :
-  Fix bad md5sum. Truncated file was in distfiles while I generated a digest.
-  D'oh!
-
-*mozilla-thunderbird-0.3-r1 (16 Nov 2003)
-
-  16 Nov 2003; Brad Laue <brad@gentoo.org> mozilla-thunderbird-0.3-r1.ebuild:
-  New enigmail version - now changing the filename of the upstream tarball so
-  that md5 errors are avoided.
-
-  20 Oct 2003; Brad Laue <brad@gentoo.org> mozilla-thunderbird-0.3.ebuild:
-  Add spellcheck support
-
-*mozilla-thunderbird-0.3 (17 Oct 2003)
-
-  17 Oct 2003; Brad Laue <brad@gentoo.org> mozilla-thunderbird-0.3.ebuild:
-  Update to 0.3
-
-  16 Oct 2003; Brad Laue <brad@gentoo.org> :
-  Update enigmail in preparation for the impending new Thunderbird
-
-  13 Sep 2003; Luca Barbato <lu_zero@gentoo.org> mozilla-thunderbird.ebuild:
-  Added a ppc related fix
-
-*mozilla-thunderbird-0.2 (04 Sep 2003)
-
-  04 Sep 2003; Brad Laue <brad@gentoo.org> mozilla-thunderbird-0.2.ebuild:
-  Introducing Mozilla Thunderbird 0.2, with enigmail support - since this is an
-  actual release and not a CVS snapshot, bugs filed will now be treated
-  officially.
-
-*mozilla-thunderbird-0.2_alpha20030826 (01 Sep 2003)
-
-  01 Sep 2003; Brad Laue <brad@gentoo.org>
-  mozilla-thunderbird-0.2_alpha20030826.ebuild,
-  files/enigmail/Makefile-enigmail, files/enigmail/Makefile-ipc:
-  New snapshot - now featuring enigmail support, at long last.
-
-*mozilla-thunderbird-0.2_alpha20030813 (17 Aug 2003)
-
-  17 Aug 2003; Brad Laue <brad@gentoo.org>
-  mozilla-thunderbird-0.2_alpha20030813.ebuild:
-  Add 2003/08/13 snapshot - purported to function more completely than the last
-  snapshot.
-
-*mozilla-thunderbird-0.2_alpha20030807 (09 Aug 2003)
-
-  09 Aug 2003; Brad Laue <brad@gentoo.org>
-  mozilla-thunderbird-0.2_alpha20030807.ebuild:
-  New snapshot release, now 0.2 alpha. Cosmetic as well as feature improvements
-  - refer to http://forums.mozillazine.org/viewtopic.php?p=143826#143826 for
-  details.
-
-  01 Aug 2003; Brad Laue <brad@gentoo.org> :
-  Mask 20030727, its broken.
-
-*mozilla-thunderbird-0.1_alpha20030727 (29 Jul 2003)
-
-  29 Jul 2003; Brad Laue <brad@gentoo.org>
-  mozilla-thunderbird-0.1_alpha20030727.ebuild:
-  Version bump. This is the same trunk date as the 0.1 release, so it should be
-  identical to that. Waiting on thunderbird developers to roll their own
-  tarball.
-
-*mozilla-thunderbird-0.1_alpha20030723 (26 Jul 2003)
-
-  26 Jul 2003; Brad Laue <brad@gentoo.org>
-  mozilla-thunderbird-0.1_alpha20030723.ebuild:
-  New snapshot of thunderbird. Introduces minor folder prefix bug with IMAP.
-  Specify trailing slash if specifying folder prefix.
-
-*mozilla-thunderbird-0.1_alpha20030708 (20 Jul 2003)
-
-  20 Jul 2003; Brad Laue <brad@gentoo.org>
-  mozilla-thunderbird-0.1_alpha20030708.ebuild, files/MozillaThunderbird:
-  Introducing Mozilla Thunderbird, Mozilla's freestanding mail client. 20030708
-  Trunk.
+  04 Aug 2004; Aron Griffis <agriffis@gentoo.org>
+  -files/mozilla-thunderbird-amd64.patch, +mozilla-thunderbird-0.7.3.ebuild:
+  Update to 0.7.3 for security meta-bug 59419. This is the first of the mozilla
+  ebuilds to use mozilla.eclass. Remove unused amd64 patch which exceeds
+  repoman's filesize limit.
 
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 35df8d7c151e..44f2d7455b64 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,21 +1,22 @@
-MD5 b424cfae7fffcf601281884ec556f87f ChangeLog 9918
-MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
-MD5 7bb30b61e2e9161924ef4716efaa9ccf mozilla-thunderbird-0.6-r1.ebuild 8173
 MD5 581fe6cf90a85277fa118f7461b82612 mozilla-thunderbird-0.6-r2.ebuild 8561
-MD5 658015fd2e271c24a6133a1f4525d22c mozilla-thunderbird-0.7.1-r1.ebuild 8943
-MD5 b4f35fd5c0f308d527d81ec8c6446a1e mozilla-thunderbird-0.7.1.ebuild 8937
 MD5 0c306f55804cc4922b77c9012c691818 mozilla-thunderbird-0.7.ebuild 9379
-MD5 1adb062c6ed356e75ec53d1e35c9d350 files/MozillaThunderbird 302
+MD5 b4f35fd5c0f308d527d81ec8c6446a1e mozilla-thunderbird-0.7.1.ebuild 8937
+MD5 7bb30b61e2e9161924ef4716efaa9ccf mozilla-thunderbird-0.6-r1.ebuild 8173
+MD5 9ce7d67fd8ea136607934f24c3342815 mozilla-thunderbird-0.7.3.ebuild 5078
+MD5 b424cfae7fffcf601281884ec556f87f ChangeLog 9918
+MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
 MD5 b8e2d94130909e157cb9797c7bad7807 files/digest-mozilla-thunderbird-0.7.1-r1 207
-MD5 0f0c19fd0806629d146784983456665e files/digest-mozilla-thunderbird-0.6-r1 205
 MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-thunderbird-amd64.patch 35052
-MD5 1adb062c6ed356e75ec53d1e35c9d350 files/thunderbird 302
+MD5 0f0c19fd0806629d146784983456665e files/digest-mozilla-thunderbird-0.6-r1 205
 MD5 0f0c19fd0806629d146784983456665e files/digest-mozilla-thunderbird-0.6-r2 205
-MD5 01baaec335e2ea398d435042e5f32f88 files/digest-mozilla-thunderbird-0.7 208
+MD5 1adb062c6ed356e75ec53d1e35c9d350 files/MozillaThunderbird 302
+MD5 1adb062c6ed356e75ec53d1e35c9d350 files/thunderbird 302
 MD5 2f72a8b70f733c46b922c38c3d9afb46 files/ipc-1.0.6-nsPipeChannel.patch 614
+MD5 01baaec335e2ea398d435042e5f32f88 files/digest-mozilla-thunderbird-0.7 208
 MD5 f014f20584305e86670ed50e990745db files/thunderbird-0.7-init.tar.bz2 3345
 MD5 6efbd38338dcc7e43d21b85ae1990422 files/digest-mozilla-thunderbird-0.7.1 207
+MD5 63e247da983ffc7766b795be757e00e6 files/digest-mozilla-thunderbird-0.7.3 207
+MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
+MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
 MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
 MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
-MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
-MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.7.3 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.7.3
new file mode 100644
index 000000000000..c82aa550039c
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.7.3
@@ -0,0 +1,3 @@
+MD5 0a8f9384baecd42ad5c95fa2f2dfd660 thunderbird-0.7.3-source.tar.bz2 33936627
+MD5 7ad587bba6bdb002be2670ac94b09139 enigmail-0.85.0.tar.gz 326337
+MD5 f605ba029ff4c71dcc10c29635c1c79e ipc-1.0.7.tar.gz 104193
diff --git a/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-amd64.patch b/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-amd64.patch
deleted file mode 100644
index 5dd2cb2503ed..000000000000
--- a/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-amd64.patch
+++ /dev/null
@@ -1,1026 +0,0 @@
-diff -ruN mozilla.old/config/mkdepend/imakemdep.h mozilla/config/mkdepend/imakemdep.h
---- mozilla.old/config/mkdepend/imakemdep.h	1998-09-05 00:22:25.000000000 -0400
-+++ mozilla/config/mkdepend/imakemdep.h	2003-09-27 16:20:55.105322104 -0400
-@@ -277,6 +277,9 @@
- # ifdef __i386__
- 	"-D__i386__",
- # endif
-+# ifdef __x86_64__
-+	"-D__x86_64__",
-+# endif
- # ifdef __GNUC__
- 	"-traditional",
- # endif
-diff -ruN mozilla.old/directory/c-sdk/ldap/libraries/liblber/lber-int.h mozilla/directory/c-sdk/ldap/libraries/liblber/lber-int.h
---- mozilla.old/directory/c-sdk/ldap/libraries/liblber/lber-int.h	2002-03-26 16:53:23.000000000 -0500
-+++ mozilla/directory/c-sdk/ldap/libraries/liblber/lber-int.h	2003-09-27 16:20:55.104322256 -0400
-@@ -236,23 +236,22 @@
- 	     (((_l)&0xff0000)>>8) + (((_l)&0xff000000)>>24))
- #define LBER_NTOHL(_l) LBER_HTONL(_l)
- 
--#elif !defined(__alpha) || defined(VMS)
-+#elif !defined(__x86_64__) && (!defined(__alpha) || defined(VMS))
- 
- #define LBER_HTONL( l )	htonl( l )
- #define LBER_NTOHL( l )	ntohl( l )
- 
- #else /* __alpha */
- /*
-- * htonl and ntohl on the DEC Alpha under OSF 1 seem to only swap the
-- * lower-order 32-bits of a (64-bit) long, so we define correct versions
-- * here.
-+ * htonl and ntohl on the 64-bit UNIX platforms only swap the lower-order
-+ * 32-bits of a (64-bit) long, so we define correct versions here.
-  */
- #define LBER_HTONL( l )	(((long)htonl( (l) & 0x00000000FFFFFFFF )) << 32 \
-     			| htonl( ( (l) & 0xFFFFFFFF00000000 ) >> 32 ))
- 
- #define LBER_NTOHL( l )	(((long)ntohl( (l) & 0x00000000FFFFFFFF )) << 32 \
-     			| ntohl( ( (l) & 0xFFFFFFFF00000000 ) >> 32 ))
--#endif /* __alpha */
-+#endif /* __alpha || __x86_64__ */
- 
- 
- /* function prototypes */
-diff -ruN mozilla.old/nsprpub/configure mozilla/nsprpub/configure
---- mozilla.old/nsprpub/configure	2003-05-19 15:05:42.000000000 -0400
-+++ mozilla/nsprpub/configure	2003-09-27 16:20:55.085325144 -0400
-@@ -3729,6 +3729,9 @@
-     ia64)
-         PR_MD_ASFILES=os_Linux_ia64.s
-         ;;
-+    x86_64)
-+        PR_MD_ASFILES=os_Linux_x86_64.s
-+        ;;
-     m68k)
-         CFLAGS="$CFLAGS -m68020-60"
-         CXXFLAGS="$CXXFLAGS -m68020-60"
-diff -ruN mozilla.old/nsprpub/configure.in mozilla/nsprpub/configure.in
---- mozilla.old/nsprpub/configure.in	2003-05-19 15:05:48.000000000 -0400
-+++ mozilla/nsprpub/configure.in	2003-09-27 16:20:55.077326360 -0400
-@@ -1218,6 +1218,9 @@
-     ia64)
-         PR_MD_ASFILES=os_Linux_ia64.s
-         ;;
-+    x86_64)
-+        PR_MD_ASFILES=os_Linux_x86_64.s
-+        ;;
-     m68k)
-         CFLAGS="$CFLAGS -m68020-60"
-         CXXFLAGS="$CXXFLAGS -m68020-60"
-diff -ruN mozilla.old/nsprpub/pr/include/md/_linux.cfg mozilla/nsprpub/pr/include/md/_linux.cfg
---- mozilla.old/nsprpub/pr/include/md/_linux.cfg	2003-02-26 18:53:38.000000000 -0500
-+++ mozilla/nsprpub/pr/include/md/_linux.cfg	2003-09-27 16:20:55.053330008 -0400
-@@ -182,6 +182,52 @@
- #define PR_BYTES_PER_WORD_LOG2  3
- #define PR_BYTES_PER_DWORD_LOG2 3
- 
-+#elif defined(__x86_64__)
-+
-+#define IS_LITTLE_ENDIAN 1
-+#undef  IS_BIG_ENDIAN
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   8
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   8
-+#define PR_BYTES_PER_DWORD  8
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    64
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    64
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   6
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   6
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    8
-+#define PR_ALIGN_OF_INT64   8
-+#define PR_ALIGN_OF_FLOAT   4
-+#define PR_ALIGN_OF_DOUBLE  8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD    8
-+
-+#define PR_BYTES_PER_WORD_LOG2  3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
- #elif defined(__mc68000__)
- 
- #undef  IS_LITTLE_ENDIAN
-diff -ruN mozilla.old/nsprpub/pr/include/md/_linux.h mozilla/nsprpub/pr/include/md/_linux.h
---- mozilla.old/nsprpub/pr/include/md/_linux.h	2003-02-26 18:53:39.000000000 -0500
-+++ mozilla/nsprpub/pr/include/md/_linux.h	2003-09-27 16:20:55.053330008 -0400
-@@ -49,6 +49,8 @@
- #define _PR_SI_ARCHITECTURE "alpha"
- #elif defined(__ia64__)
- #define _PR_SI_ARCHITECTURE "ia64"
-+#elif defined(__x86_64__)
-+#define _PR_SI_ARCHITECTURE "x86-64"
- #elif defined(__mc68000__)
- #define _PR_SI_ARCHITECTURE "m68k"
- #elif defined(__sparc__)
-@@ -107,6 +109,19 @@
- #define _MD_ATOMIC_SET                _PR_ia64_AtomicSet
- #endif
- 
-+#if defined(__x86_64__)
-+#define _PR_HAVE_ATOMIC_OPS
-+#define _MD_INIT_ATOMIC()
-+extern PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val);
-+#define _MD_ATOMIC_INCREMENT          _PR_x86_64_AtomicIncrement
-+extern PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val);
-+#define _MD_ATOMIC_DECREMENT          _PR_x86_64_AtomicDecrement
-+extern PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
-+#define _MD_ATOMIC_ADD                _PR_x86_64_AtomicAdd
-+extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval);
-+#define _MD_ATOMIC_SET                _PR_x86_64_AtomicSet
-+#endif
-+
- #define USE_SETJMP
- #if defined(__GLIBC__) && __GLIBC__ >= 2
- #define _PR_POLL_AVAILABLE
-diff -ruN mozilla.old/nsprpub/pr/src/io/prprf.c mozilla/nsprpub/pr/src/io/prprf.c
---- mozilla.old/nsprpub/pr/src/io/prprf.c	2003-02-26 18:53:42.000000000 -0500
-+++ mozilla/nsprpub/pr/src/io/prprf.c	2003-09-27 16:20:55.068327728 -0400
-@@ -51,7 +51,10 @@
- ** Note: on some platforms va_list is defined as an array,
- ** and requires array notation.
- */
--#if (defined(LINUX) && defined(__powerpc__)) || \
-+#if (defined(LINUX) && defined(__x86_64__))
-+#include <stdarg.h>
-+#define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar))
-+#elif (defined(LINUX) && defined(__powerpc__)) || \
-     (defined(LINUX) && defined(__s390__)) || \
-     (defined(LINUX) && defined(__s390x__)) || \
-     defined(WIN16) || defined(QNX) || \
-diff -ruN mozilla.old/nsprpub/pr/src/md/unix/os_Linux_x86_64.s mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s
---- mozilla.old/nsprpub/pr/src/md/unix/os_Linux_x86_64.s	1969-12-31 19:00:00.000000000 -0500
-+++ mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s	2003-09-27 16:20:55.068327728 -0400
-@@ -0,0 +1,91 @@
-+/ -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+/ 
-+/ 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 the Netscape Portable Runtime (NSPR).
-+/ 
-+/ The Initial Developer of the Original Code is Netscape
-+/ Communications Corporation.  Portions created by Netscape are 
-+/ Copyright (C) 2000 Netscape Communications Corporation.  All
-+/ Rights Reserved.
-+/ 
-+/ Contributor(s):
-+/ 
-+/ Alternatively, the contents of this file may be used under the
-+/ terms of the GNU General Public License Version 2 or later (the
-+/ "GPL"), in which case the provisions of the GPL are applicable 
-+/ instead of those above.  If you wish to allow use of your 
-+/ version of this file only under the terms of the GPL and not to
-+/ allow others to use your version of this file under the MPL,
-+/ indicate your decision by deleting the provisions above and
-+/ replace them with the notice and other provisions required by
-+/ the GPL.  If you do not delete the provisions above, a recipient
-+/ may use your version of this file under either the MPL or the
-+/ GPL.
-+/ 
-+
-+/ PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val)
-+/
-+/ Atomically increment the integer pointed to by 'val' and return
-+/ the result of the increment.
-+/
-+    .text
-+    .globl _PR_x86_64_AtomicIncrement
-+    .align 4
-+_PR_x86_64_AtomicIncrement:
-+    movl $1, %eax
-+    lock
-+    xaddl %eax, (%rdi)
-+    incl %eax
-+    ret
-+
-+/ PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val)
-+/
-+/ Atomically decrement the integer pointed to by 'val' and return
-+/ the result of the decrement.
-+/
-+    .text
-+    .globl _PR_x86_64_AtomicDecrement
-+    .align 4
-+_PR_x86_64_AtomicDecrement:
-+    movl $-1, %eax
-+    lock
-+    xaddl %eax, (%rdi)
-+    decl %eax
-+    ret
-+
-+/ PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval)
-+/
-+/ Atomically set the integer pointed to by 'val' to the new
-+/ value 'newval' and return the old value.
-+    .text
-+    .globl _PR_x86_64_AtomicSet
-+    .align 4
-+_PR_x86_64_AtomicSet:
-+    movl %esi, %eax
-+    lock
-+    xchgl %eax, (%rdi)
-+    ret
-+
-+/ PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val)
-+/
-+/ Atomically add 'val' to the integer pointed to by 'ptr'
-+/ and return the result of the addition.
-+/
-+    .text
-+    .globl _PR_x86_64_AtomicAdd
-+    .align 4
-+_PR_x86_64_AtomicAdd:
-+    movl %esi, %eax
-+    lock
-+    xaddl %eax, (%rdi)
-+    addl %esi, %eax
-+    ret
-diff -ruN mozilla.old/security/coreconf/Linux.mk mozilla/security/coreconf/Linux.mk
---- mozilla.old/security/coreconf/Linux.mk	2003-04-30 20:31:20.000000000 -0400
-+++ mozilla/security/coreconf/Linux.mk	2003-09-27 16:20:55.093323928 -0400
-@@ -66,6 +66,10 @@
- 	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
- 	CPU_ARCH	= ia64
- else
-+ifeq ($(OS_TEST),x86_64)
-+	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
-+	CPU_ARCH	= x86_64
-+else
- ifeq ($(OS_TEST),sparc)
- 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
- 	CPU_ARCH        = sparc
-@@ -107,6 +111,7 @@
- endif
- endif
- endif
-+endif
- 
- 
- LIBC_TAG		= _glibc
-diff -ruN mozilla.old/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
---- mozilla.old/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2003-06-18 23:02:34.000000000 -0400
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2003-09-27 16:20:55.105322104 -0400
-@@ -55,6 +55,10 @@
- # Migrate other platforms here after testing
- #
- ifneq (,$(filter Linux,$(OS_ARCH)))
-+# Linux/x86-64
-+ifeq (x86_64,$(OS_TEST))
-+CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+else
- ifeq (86,$(findstring 86,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp
- endif
-@@ -66,6 +70,7 @@
- ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
- endif
- endif
-+endif
- #
- # BeOS/Intel (uses the same unixish_x86 code)
- #
-diff -ruN mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp
---- mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp	1969-12-31 19:00:00.000000000 -0500
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp	2003-09-27 16:20:55.105322104 -0400
-@@ -0,0 +1,174 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+// Platform specific code to invoke XPCOM methods on native objects
-+
-+#include "xptcprivate.h"
-+
-+// 6 integral parameters are passed in registers
-+const PRUint32 GPR_COUNT = 6;
-+
-+// 8 floating point parameters are passed in SSE registers
-+const PRUint32 FPR_COUNT = 8;
-+
-+// Remember that these 'words' are 64-bit long
-+static inline void
-+invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s,
-+                   PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack)
-+{
-+    nr_gpr = 1; // skip one GP register for 'that'
-+    nr_fpr = 0;
-+    nr_stack = 0;
-+
-+    /* Compute number of eightbytes of class MEMORY.  */
-+    for (uint32 i = 0; i < paramCount; i++, s++) {
-+        if (!s->IsPtrData()
-+            && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) {
-+            if (nr_fpr < FPR_COUNT)
-+                nr_fpr++;
-+            else
-+                nr_stack++;
-+        }
-+        else {
-+            if (nr_gpr < GPR_COUNT)
-+                nr_gpr++;
-+            else
-+                nr_stack++;
-+        }
-+    }
-+}
-+
-+static void
-+invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s,
-+                     PRUint64 * gpregs, double * fpregs)
-+{
-+    PRUint32 nr_gpr = 1; // skip one GP register for 'that'
-+    PRUint32 nr_fpr = 0;
-+    PRUint64 value;
-+
-+    for (uint32 i = 0; i < paramCount; i++, s++) {
-+        if (s->IsPtrData())
-+            value = (PRUint64) s->ptr;
-+        else {
-+            switch (s->type) {
-+            case nsXPTType::T_FLOAT:                                break;
-+            case nsXPTType::T_DOUBLE:                               break;
-+            case nsXPTType::T_I8:     value = s->val.i8;            break;
-+            case nsXPTType::T_I16:    value = s->val.i16;           break;
-+            case nsXPTType::T_I32:    value = s->val.i32;           break;
-+            case nsXPTType::T_I64:    value = s->val.i64;           break;
-+            case nsXPTType::T_U8:     value = s->val.u8;            break;
-+            case nsXPTType::T_U16:    value = s->val.u16;           break;
-+            case nsXPTType::T_U32:    value = s->val.u32;           break;
-+            case nsXPTType::T_U64:    value = s->val.u64;           break;
-+            case nsXPTType::T_BOOL:   value = s->val.b;             break;
-+            case nsXPTType::T_CHAR:   value = s->val.c;             break;
-+            case nsXPTType::T_WCHAR:  value = s->val.wc;            break;
-+            default:                  value = (PRUint64) s->val.p;  break;
-+            }
-+        }
-+
-+        if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) {
-+            if (nr_fpr < FPR_COUNT)
-+                fpregs[nr_fpr++] = s->val.d;
-+            else {
-+                *((double *)d) = s->val.d;
-+                d++;
-+            }
-+        }
-+        else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-+            if (nr_fpr < FPR_COUNT)
-+                // The value in %xmm register is already prepared to
-+                // be retrieved as a float. Therefore, we pass the
-+                // value verbatim, as a double without conversion.
-+                fpregs[nr_fpr++] = s->val.d;
-+            else {
-+                *((float *)d) = s->val.f;
-+                d++;
-+            }
-+        }
-+        else {
-+            if (nr_gpr < GPR_COUNT)
-+                gpregs[nr_gpr++] = value;
-+            else
-+                *d++ = value;
-+        }
-+    }
-+}
-+
-+extern "C"
-+XPTC_PUBLIC_API(nsresult)
-+XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex,
-+                   PRUint32 paramCount, nsXPTCVariant * params)
-+{
-+    PRUint32 nr_gpr, nr_fpr, nr_stack;
-+    invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack);
-+    
-+    // Stack, if used, must be 16-bytes aligned
-+    if (nr_stack)
-+        nr_stack = (nr_stack + 1) & ~1;
-+
-+    // Load parameters to stack, if necessary
-+    PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8);
-+    PRUint64 gpregs[GPR_COUNT];
-+    double fpregs[FPR_COUNT];
-+    invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs);
-+
-+    // Load FPR registers from fpregs[]
-+    register double d0 asm("xmm0");
-+    register double d1 asm("xmm1");
-+    register double d2 asm("xmm2");
-+    register double d3 asm("xmm3");
-+    register double d4 asm("xmm4");
-+    register double d5 asm("xmm5");
-+    register double d6 asm("xmm6");
-+    register double d7 asm("xmm7");
-+
-+    switch (nr_fpr) {
-+#define ARG_FPR(N) \
-+    case N+1: d##N = fpregs[N];
-+        ARG_FPR(7);
-+        ARG_FPR(6);
-+        ARG_FPR(5);
-+        ARG_FPR(4);
-+        ARG_FPR(3);
-+        ARG_FPR(2);
-+        ARG_FPR(1);
-+        ARG_FPR(0);
-+    case 0:;
-+#undef ARG_FPR
-+    }
-+    
-+    // Load GPR registers from gpregs[]
-+    register PRUint64 a0 asm("rdi");
-+    register PRUint64 a1 asm("rsi");
-+    register PRUint64 a2 asm("rdx");
-+    register PRUint64 a3 asm("rcx");
-+    register PRUint64 a4 asm("r8");
-+    register PRUint64 a5 asm("r9");
-+    
-+    switch (nr_gpr) {
-+#define ARG_GPR(N) \
-+    case N+1: a##N = gpregs[N];
-+        ARG_GPR(5);
-+        ARG_GPR(4);
-+        ARG_GPR(3);
-+        ARG_GPR(2);
-+        ARG_GPR(1);
-+    case 1: a0 = (PRUint64) that;
-+    case 0:;
-+#undef ARG_GPR
-+    }
-+
-+    // Ensure that assignments to SSE registers won't be optimized away
-+    asm("" ::
-+        "x" (d0), "x" (d1), "x" (d2), "x" (d3),
-+        "x" (d4), "x" (d5), "x" (d6), "x" (d7));
-+    
-+    // Get pointer to method
-+    PRUint64 methodAddress = *((PRUint64 *)that);
-+    methodAddress += 8 * methodIndex;
-+    methodAddress = *((PRUint64 *)methodAddress);
-+    
-+    typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64);
-+    PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5);
-+    return result;
-+}
-diff -ruN mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp
---- mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp	1969-12-31 19:00:00.000000000 -0500
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp	2003-09-27 16:20:55.106321952 -0400
-@@ -0,0 +1,206 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+
-+// Implement shared vtbl methods.
-+
-+#include "xptcprivate.h"
-+
-+// The Linux/x86-64 ABI passes the first 6 integral parameters and the
-+// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx,
-+// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the
-+// caller.  The rest of the parameters are passed in the callers stack
-+// area.
-+
-+const PRUint32 PARAM_BUFFER_COUNT   = 16;
-+const PRUint32 GPR_COUNT            = 6;
-+const PRUint32 FPR_COUNT            = 8;
-+
-+// PrepareAndDispatch() is called by SharedStub() and calls the actual method.
-+//
-+// - 'args[]' contains the arguments passed on stack
-+// - 'gpregs[]' contains the arguments passed in integer registers
-+// - 'fpregs[]' contains the arguments passed in floating point registers
-+// 
-+// The parameters are mapped into an array of type 'nsXPTCMiniVariant'
-+// and then the method gets called.
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex,
-+                   PRUint64 * args, PRUint64 * gpregs, double *fpregs)
-+{
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    nsIInterfaceInfo* iface_info = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint32 paramCount;
-+    PRUint32 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->GetInterfaceInfo(&iface_info);
-+    NS_ASSERTION(iface_info,"no interface info");
-+    if (! iface_info)
-+        return NS_ERROR_UNEXPECTED;
-+
-+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no method info");
-+    if (! info)
-+        return NS_ERROR_UNEXPECTED;
-+
-+    paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if(paramCount > PARAM_BUFFER_COUNT)
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    else
-+        dispatchParams = paramBuffer;
-+
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+    if (! dispatchParams)
-+        return NS_ERROR_OUT_OF_MEMORY;
-+
-+    PRUint64* ap = args;
-+    PRUint32 nr_gpr = 1;    // skip one GPR register for 'that'
-+    PRUint32 nr_fpr = 0;
-+    PRUint64 value;
-+
-+    for(i = 0; i < paramCount; i++) {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+	
-+        if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
-+            if (nr_fpr < FPR_COUNT)
-+                dp->val.d = fpregs[nr_fpr++];
-+            else
-+                dp->val.d = *(double*) ap++;
-+            continue;
-+        }
-+        else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
-+            if (nr_fpr < FPR_COUNT)
-+                // The value in %xmm register is already prepared to
-+                // be retrieved as a float. Therefore, we pass the
-+                // value verbatim, as a double without conversion.
-+                dp->val.d = *(double*) ap++;
-+            else
-+                dp->val.f = *(float*) ap++;
-+            continue;
-+        }
-+        else {
-+            if (nr_gpr < GPR_COUNT)
-+                value = gpregs[nr_gpr++];
-+            else
-+                value = *ap++;
-+        }
-+
-+        if (param.IsOut() || !type.IsArithmetic()) {
-+            dp->val.p = (void*) value;
-+            continue;
-+        }
-+
-+        switch (type) {
-+        case nsXPTType::T_I8:      dp->val.i8  = (PRInt8)   value; break;
-+        case nsXPTType::T_I16:     dp->val.i16 = (PRInt16)  value; break;
-+        case nsXPTType::T_I32:     dp->val.i32 = (PRInt32)  value; break;
-+        case nsXPTType::T_I64:     dp->val.i64 = (PRInt64)  value; break;
-+        case nsXPTType::T_U8:      dp->val.u8  = (PRUint8)  value; break;
-+        case nsXPTType::T_U16:     dp->val.u16 = (PRUint16) value; break;
-+        case nsXPTType::T_U32:     dp->val.u32 = (PRUint32) value; break;
-+        case nsXPTType::T_U64:     dp->val.u64 = (PRUint64) value; break;
-+        case nsXPTType::T_BOOL:    dp->val.b   = (PRBool)   value; break;
-+        case nsXPTType::T_CHAR:    dp->val.c   = (char)     value; break;
-+        case nsXPTType::T_WCHAR:   dp->val.wc  = (wchar_t)  value; break;
-+
-+        default:
-+            NS_ASSERTION(0, "bad type");
-+            break;
-+        }
-+    }
-+
-+    result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams);
-+
-+    NS_RELEASE(iface_info);
-+
-+    if (dispatchParams != paramBuffer)
-+        delete [] dispatchParams;
-+
-+    return result;
-+}
-+
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+// Linux/x86-64 uses gcc >= 3.1
-+#define STUB_ENTRY(n) \
-+asm(".section	\".text\"\n\t" \
-+    ".align	2\n\t" \
-+    ".if	" #n " < 10\n\t" \
-+    ".globl	_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
-+    ".type	_ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \
-+    "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \
-+    ".elseif	" #n " < 100\n\t" \
-+    ".globl	_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
-+    ".type	_ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \
-+    "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \
-+    ".elseif    " #n " < 1000\n\t" \
-+    ".globl     _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
-+    ".type      _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \
-+    "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \
-+    ".else\n\t" \
-+    ".err	\"stub number " #n " >= 1000 not yet supported\"\n\t" \
-+    ".endif\n\t" \
-+    "movl	$" #n ", %eax\n\t" \
-+    "jmp	SharedStub\n\t" \
-+    ".if	" #n " < 10\n\t" \
-+    ".size	_ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
-+    ".elseif	" #n " < 100\n\t" \
-+    ".size	_ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
-+    ".else\n\t" \
-+    ".size	_ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
-+    ".endif");
-+
-+// static nsresult SharedStub(PRUint32 methodIndex)
-+asm(".section   \".text\"\n\t"
-+    ".align     2\n\t"
-+    ".type      SharedStub,@function\n\t"
-+    "SharedStub:\n\t"
-+    // make room for gpregs (48), fpregs (64)
-+    "pushq      %rbp\n\t"
-+    "movq       %rsp,%rbp\n\t"
-+    "subq       $112,%rsp\n\t"
-+    // save GP registers
-+    "movq       %rdi,-112(%rbp)\n\t"
-+    "movq       %rsi,-104(%rbp)\n\t"
-+    "movq       %rdx, -96(%rbp)\n\t"
-+    "movq       %rcx, -88(%rbp)\n\t"
-+    "movq       %r8 , -80(%rbp)\n\t"
-+    "movq       %r9 , -72(%rbp)\n\t"
-+    "leaq       -112(%rbp),%rcx\n\t"
-+    // save FP registers
-+    "movsd      %xmm0,-64(%rbp)\n\t"
-+    "movsd      %xmm1,-56(%rbp)\n\t"
-+    "movsd      %xmm2,-48(%rbp)\n\t"
-+    "movsd      %xmm3,-40(%rbp)\n\t"
-+    "movsd      %xmm4,-32(%rbp)\n\t"
-+    "movsd      %xmm5,-24(%rbp)\n\t"
-+    "movsd      %xmm6,-16(%rbp)\n\t"
-+    "movsd      %xmm7, -8(%rbp)\n\t"
-+    "leaq       -64(%rbp),%r8\n\t"
-+    // rdi has the 'self' pointer already
-+    "movl       %eax,%esi\n\t"
-+    "leaq       16(%rbp),%rdx\n\t"
-+    "call       PrepareAndDispatch@plt\n\t"
-+    "leave\n\t"
-+    "ret\n\t"
-+    ".size      SharedStub,.-SharedStub");
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
-+#else
-+#error "can't find a compiler to use"
-+#endif /* __GNUC__ */
-diff -ruN mozilla.old/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp mozilla/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp
---- mozilla.old/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp	2003-02-22 23:41:18.000000000 -0500
-+++ mozilla/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp	2003-09-27 16:21:05.754703152 -0400
-@@ -87,6 +87,19 @@
-                                  float p17, float p18, float p19, float p20, 
-                                  float *retval) = 0;
- 
-+    NS_IMETHOD AddMixedInts(PRInt64 p1, PRInt32 p2, PRInt64 p3, PRInt32 p4,
-+			    PRInt32 p5, PRInt64 p6, PRInt32 p7, PRInt32 p8,
-+			    PRInt64 p9, PRInt32 p10, PRInt64* retval) = 0;
-+
-+    NS_IMETHOD AddMixedInts2(PRInt32 p1, PRInt64 p2, PRInt32 p3, PRInt64 p4,
-+			     PRInt64 p5, PRInt32 p6, PRInt64 p7, PRInt64 p8,
-+			     PRInt32 p9, PRInt64 p10, PRInt64* retval) = 0;
-+
-+    NS_IMETHOD AddMixedFloats(float p1, float p2, double p3, double p4,
-+                              float p5, float p6, double p7, double p8,
-+                              float p9, double p10, float p11,
-+                              double *retval) = 0;
-+
-     NS_IMETHOD PassTwoStrings(const char* s1, const char* s2, char** retval) = 0;
- 
- };
-@@ -114,6 +127,19 @@
-                              float p5, float p6, float p7, float p8,
-                              float p9, float p10, float* retval);
- 
-+    NS_IMETHOD AddMixedInts(PRInt64 p1, PRInt32 p2, PRInt64 p3, PRInt32 p4,
-+			    PRInt32 p5, PRInt64 p6, PRInt32 p7, PRInt32 p8,
-+			    PRInt64 p9, PRInt32 p10, PRInt64* retval);
-+
-+    NS_IMETHOD AddMixedInts2(PRInt32 p1, PRInt64 p2, PRInt32 p3, PRInt64 p4,
-+			     PRInt64 p5, PRInt32 p6, PRInt64 p7, PRInt64 p8,
-+			     PRInt32 p9, PRInt64 p10, PRInt64* retval);
-+
-+    NS_IMETHOD AddMixedFloats(float p1, float p2, double p3, double p4,
-+                              float p5, float p6, double p7, double p8,
-+                              float p9, double p10, float p11,
-+                              double *retval);
-+
-     NS_IMETHOD AddManyManyFloats(float p1, float p2, float p3, float p4,
-                                  float p5, float p6, float p7, float p8,
-                                  float p9, float p10, float p11, float p12, 
-@@ -211,6 +237,20 @@
- }
- 
- NS_IMETHODIMP
-+InvokeTestTarget::AddMixedFloats(float p1, float p2, double p3, double p4,
-+                                 float p5, float p6, double p7, double p8,
-+                                 float p9, double p10, float p11,
-+                                 double *retval)
-+{
-+#ifdef DEBUG_TESTINVOKE
-+    printf("%f, %f, %lf, %lf, %f, %f, %lf, %lf, %f, %lf, %f\n", 
-+           p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);
-+#endif
-+    *retval = p1 + p2 + p3 + p4 + p5 + p6 + p7 + p8 + p9 + p10 + p11;
-+    return NS_OK;
-+}
-+
-+NS_IMETHODIMP
- InvokeTestTarget::AddManyManyFloats(float p1, float p2, float p3, float p4,
-                                     float p5, float p6, float p7, float p8,
-                                     float p9, float p10, float p11, float p12, 
-@@ -230,6 +270,24 @@
- }
- 
- NS_IMETHODIMP
-+InvokeTestTarget::AddMixedInts(PRInt64 p1, PRInt32 p2, PRInt64 p3, PRInt32 p4,
-+			       PRInt32 p5, PRInt64 p6, PRInt32 p7, PRInt32 p8,
-+			       PRInt64 p9, PRInt32 p10, PRInt64* retval)
-+{
-+    *retval = p1 + p2 + p3 + p4 + p5 + p6 + p7 + p8 + p9 + p10;
-+    return NS_OK;
-+}
-+
-+NS_IMETHODIMP
-+InvokeTestTarget::AddMixedInts2(PRInt32 p1, PRInt64 p2, PRInt32 p3, PRInt64 p4,
-+				PRInt64 p5, PRInt32 p6, PRInt64 p7, PRInt64 p8,
-+				PRInt32 p9, PRInt64 p10, PRInt64* retval)
-+{
-+    *retval = p1 + p2 + p3 + p4 + p5 + p6 + p7 + p8 + p9 + p10;
-+    return NS_OK;
-+}
-+
-+NS_IMETHODIMP
- InvokeTestTarget::PassTwoStrings(const char* s1, const char* s2, char** retval)
- {
-     const char milk[] = "milk";
-@@ -309,14 +367,33 @@
-     else
-         printf("\tFAILED");
- 
--    if(NS_SUCCEEDED(test->PassTwoStrings("moo","cow",&outS))) {
--        printf(" = %s\n", outS);
-+    if(NS_SUCCEEDED(test->AddMixedInts(1,2,3,4,5,6,7,8,9,10,&out64)))
-+     {
-+         LL_L2I(tmp32, out64);
-+         printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n", (int)tmp32);
-+     }
-+     else
-+         printf("\tFAILED");
-+ 
-+     if(NS_SUCCEEDED(test->AddMixedInts2(1,2,3,4,5,6,7,8,9,10,&out64)))
-+     {
-+          LL_L2I(tmp32, out64);
-+         printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n", (int)tmp32);
-+     }
-+     else
-+         printf("\tFAILED");
-+
-+     if(NS_SUCCEEDED(test->AddMixedFloats(1,2,3,4,5,6,7,8,9,10,11,&outD)))
-+         printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 = %f\n", (double)outD);
-+     else
-+         printf("\tFAILED");
-+
-+     if (NS_SUCCEEDED(test->PassTwoStrings("moo","cow",&outS))) {
-+       printf(" = %s\n", outS);
-         nsMemory::Free(outS);
--    } else
-+      } else
-         printf("\tFAILED");
- 
--
--
-     printf("calling via invoke:\n");
- 
-     nsXPTCVariant var[21];
-@@ -388,8 +465,8 @@
-     var[2].flags = nsXPTCVariant::PTR_IS_DATA;
-     var[2].ptr = &var[2].val.i64;
- 
--     if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 6, 3, var)))
--         printf("\t2L * 2L = %d\n", (int)var[2].val.i64);
-+    if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 6, 3, var)))
-+        printf("\t2L * 2L = %d\n", (int)var[2].val.i64);
-     else
-         printf("\tFAILED");
- 
-@@ -559,6 +636,8 @@
-     if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 10, 11, var)))
-         printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %ff\n",
-                 (double) var[10].val.f);
-+    else
-+        printf("\tFAILED");
- 
-     var[0].val.f = 1.0f;
-     var[0].type = nsXPTType::T_FLOAT;
-@@ -649,6 +728,163 @@
-         printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 = %ff\n",
-                 (double) var[20].val.f);
- 
-+    var[0].val.i64 = 1;
-+    var[0].type = nsXPTType::T_I64;
-+    var[0].flags = 0;
-+
-+    var[1].val.i32 = 2;
-+    var[1].type = nsXPTType::T_I32;
-+    var[1].flags = 0;
-+
-+    var[2].val.i64 = 3;
-+    var[2].type = nsXPTType::T_I64;
-+    var[2].flags = 0;
-+
-+    var[3].val.i32 = 4;
-+    var[3].type = nsXPTType::T_I32;
-+    var[3].flags = 0;
-+
-+    var[4].val.i32 = 5;
-+    var[4].type = nsXPTType::T_I32;
-+    var[4].flags = 0;
-+
-+    var[5].val.i64 = 6;
-+    var[5].type = nsXPTType::T_I64;
-+    var[5].flags = 0;
-+
-+    var[6].val.i32 = 7;
-+    var[6].type = nsXPTType::T_I32;
-+    var[6].flags = 0;
-+
-+    var[7].val.i32 = 8;
-+    var[7].type = nsXPTType::T_I32;
-+    var[7].flags = 0;
-+
-+    var[8].val.i64 = 9;
-+    var[8].type = nsXPTType::T_I64;
-+    var[8].flags = 0;
-+
-+    var[9].val.i32 = 10;
-+    var[9].type = nsXPTType::T_I32;
-+    var[9].flags = 0;
-+
-+    var[10].val.i64 = 0;
-+    var[10].type = nsXPTType::T_I64;
-+    var[10].flags = nsXPTCVariant::PTR_IS_DATA;
-+    var[10].ptr = &var[10].val.i64;
-+
-+    if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 12, 11, var)))
-+        printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n",
-+	       (int)var[10].val.i64);
-+    else
-+        printf("\tFAILED");
-+
-+    var[0].val.i32 = 1;
-+    var[0].type = nsXPTType::T_I32;
-+    var[0].flags = 0;
-+
-+    var[1].val.i64 = 2;
-+    var[1].type = nsXPTType::T_I64;
-+    var[1].flags = 0;
-+
-+    var[2].val.i32 = 3;
-+    var[2].type = nsXPTType::T_I32;
-+    var[2].flags = 0;
-+
-+    var[3].val.i64 = 4;
-+    var[3].type = nsXPTType::T_I64;
-+    var[3].flags = 0;
-+
-+    var[4].val.i64 = 5;
-+    var[4].type = nsXPTType::T_I64;
-+    var[4].flags = 0;
-+
-+    var[5].val.i32 = 6;
-+    var[5].type = nsXPTType::T_I32;
-+    var[5].flags = 0;
-+
-+    var[6].val.i64 = 7;
-+    var[6].type = nsXPTType::T_I64;
-+    var[6].flags = 0;
-+
-+    var[7].val.i64 = 8;
-+    var[7].type = nsXPTType::T_I64;
-+    var[7].flags = 0;
-+
-+    var[8].val.i32 = 9;
-+    var[8].type = nsXPTType::T_I32;
-+    var[8].flags = 0;
-+
-+    var[9].val.i64 = 10;
-+    var[9].type = nsXPTType::T_I64;
-+    var[9].flags = 0;
-+
-+    var[10].val.i64 = 0;
-+    var[10].type = nsXPTType::T_I64;
-+    var[10].flags = nsXPTCVariant::PTR_IS_DATA;
-+    var[10].ptr = &var[10].val.i64;
-+
-+    if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 13, 11, var)))
-+        printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 = %d\n",
-+	       (int)var[10].val.i64);
-+    else
-+        printf("\tFAILED");
-+
-+    var[0].val.f = 1.0f;
-+    var[0].type = nsXPTType::T_FLOAT;
-+    var[0].flags = 0;
-+
-+    var[1].val.f = 2.0f;
-+    var[1].type = nsXPTType::T_FLOAT;
-+    var[1].flags = 0;
-+
-+    var[2].val.d = 3.0;
-+    var[2].type = nsXPTType::T_DOUBLE;
-+    var[2].flags = 0;
-+
-+    var[3].val.d = 4.0;
-+    var[3].type = nsXPTType::T_DOUBLE;
-+    var[3].flags = 0;
-+
-+    var[4].val.f = 5.0f;
-+    var[4].type = nsXPTType::T_FLOAT;
-+    var[4].flags = 0;
-+
-+    var[5].val.f = 6.0f;
-+    var[5].type = nsXPTType::T_FLOAT;
-+    var[5].flags = 0;
-+
-+    var[6].val.d = 7.0;
-+    var[6].type = nsXPTType::T_DOUBLE;
-+    var[6].flags = 0;
-+
-+    var[7].val.d = 8.0;
-+    var[7].type = nsXPTType::T_DOUBLE;
-+    var[7].flags = 0;
-+
-+    var[8].val.f = 9.0f;
-+    var[8].type = nsXPTType::T_FLOAT;
-+    var[8].flags = 0;
-+
-+    var[9].val.d = 10.0;
-+    var[9].type = nsXPTType::T_DOUBLE;
-+    var[9].flags = 0;
-+
-+    var[10].val.f = 11.0f;
-+    var[10].type = nsXPTType::T_FLOAT;
-+    var[10].flags = 0;
-+
-+    var[11].val.d = 0.0;
-+    var[11].type = nsXPTType::T_DOUBLE;
-+    var[11].flags = nsXPTCVariant::PTR_IS_DATA;
-+    var[11].ptr = &var[11].val.d;
-+
-+    if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 14, 12, var)))
-+        printf("\t1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 = %f\n",
-+                var[11].val.d);
-+    else
-+        printf("\tFAILED");
-+
-     var[0].val.p = (void*)"moo";
-     var[0].type = nsXPTType::T_CHAR_STR;
-     var[0].flags = 0;
-@@ -662,12 +898,11 @@
-     var[2].flags = nsXPTCVariant::PTR_IS_DATA;
-     var[2].ptr = &var[2].val.p;
-     
--    if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 12, 3, var)))
-+    if(NS_SUCCEEDED(XPTC_InvokeByIndex(test, 15, 3, var)))
-         printf(" = %s\n", var[2].val.p);
-     else
-         printf("\tFAILED");
- 
--
-     DoMultipleInheritenceTest();
-     DoMultipleInheritenceTest2();
-     // Disabled by default - takes too much time on slow machines
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.3.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.3.ebuild
new file mode 100644
index 000000000000..dbe54c8fba58
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.3.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.7.3.ebuild,v 1.1 2004/08/04 23:49:53 agriffis Exp $
+
+IUSE="crypt gtk2"
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic gcc eutils nsplugins mozilla mozilla-launcher
+
+EMVER="0.85.0"
+IPCVER="1.0.7"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/thunderbird-${PV}-source.tar.bz2
+	 crypt? ( http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
+	   		  http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+
+RDEPEND="crypt? ( >=app-crypt/gnupg-1.2.1 )"
+
+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 MOZ_THUNDERBIRD=1
+export MOZ_ENABLE_XFT=1
+
+src_unpack() {
+	unpack ${A} || die "unpack failed"
+	cd ${S} || die
+
+	# Unpack the enigmail plugin
+	if use crypt; then
+		for x in ipc enigmail; do
+			mv ${WORKDIR}/${x} ${S}/extensions || die
+			cd ${S}/extensions/${x} || die
+			makemake	# from mozilla.eclass
+		done
+	fi
+}
+
+src_compile() {
+	local myconf
+
+	####################################
+	#
+	# myconf, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	# mozilla_conf comes from mozilla.eclass
+	# It sets up CFLAGS, CXXFLAGS and myconf
+	mozilla_conf
+
+	myconf="${myconf} \
+		--with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
+		--enable-extensions=wallet,spellcheck"
+
+	####################################
+	#
+	#  Configure and build Thunderbird
+	#
+	####################################
+
+	econf ${myconf} || die
+
+	emake MOZ_THUNDERBIRD=1 || die
+
+	# Build the enigmail plugin
+	if use crypt; then
+		einfo "Building Enigmail plugin..."
+		cd ${S}/extensions/ipc || die "cd ipc failed"
+		make || die "make ipc failed"
+
+		cd ${S}/extensions/enigmail || die "cd enigmail failed"
+		make || die "make enigmail failed"
+	fi
+}
+
+src_install() {
+	dodir /usr/lib
+	dodir /usr/lib/MozillaThunderbird
+	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaThunderbird
+
+	# fix permissions
+	chown -R root:root ${D}/usr/lib/MozillaThunderbird
+
+	# use mozilla-launcher which supports thunderbird as of version 1.6.
+	# version 1.7-r1 moved the script to /usr/libexec
+	dodir /usr/bin
+	dosym /usr/libexec/mozilla-launcher /usr/bin/thunderbird
+
+	# 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
+
+	# Normally thunderbird-0.7.1 must be run as root once before it can
+	# be run as a normal user.  Drop in some initialized files to
+	# avoid this.
+	einfo "Extracting thunderbird-${PV} initialization files"
+	tar xjpf ${FILESDIR}/thunderbird-0.7-init.tar.bz2 \
+		-C ${D}/usr/lib/MozillaThunderbird
+}
+
+pkg_preinst() {
+	# Remove entire installed instance to solve various
+	# problems, for example see bug 27719
+	rm -rf ${ROOT}/usr/lib/MozillaThunderbird
+}
+
+pkg_postinst() {
+	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaThunderbird"
+
+	# Fix permissions on misc files
+	find ${MOZILLA_FIVE_HOME}/ -perm 0700 -exec chmod 0755 {} \; || :
+
+	# Needed to update the run time bindings for REGXPCOM
+	# (do not remove next line!)
+	env-update
+
+	# Register Components and Chrome
+	einfo "Registering Components and Chrome..."
+	LD_LIBRARY_PATH=${ROOT}/usr/lib/MozillaThunderbird ${MOZILLA_FIVE_HOME}/regxpcom
+	LD_LIBRARY_PATH=${ROOT}/usr/lib/MozillaThunderbird ${MOZILLA_FIVE_HOME}/regchrome
+
+	# Fix permissions of component registry
+	chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat
+
+	# Fix directory permissions
+	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || :
+
+	# Fix permissions on chrome files
+	find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || :
+
+	# 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
+
+	einfo
+	einfo "Please note that the binary name has changed from MozillaThunderbird"
+	einfo "to simply thunderbird"
+	einfo
+}
+
+pkg_postrm() {
+	update_mozilla_launcher_symlinks
+}