missing files added

author: Seemant Kulleen <seemant@gentoo.org> 2004-05-30 19:41:09 +0000
committer: Seemant Kulleen <seemant@gentoo.org> 2004-05-30 19:41:09 +0000
commit: e1f3473e173398a665384ab6964fe978dcf8c272 (patch)
tree: 1e1bcaa5642d7fe69b8ba91f284ccb5a197a4599 /mail-client
parent: fixed gtkmm deps (diff)
download: historical-e1f3473e173398a665384ab6964fe978dcf8c272.tar.gz
historical-e1f3473e173398a665384ab6964fe978dcf8c272.tar.bz2
historical-e1f3473e173398a665384ab6964fe978dcf8c272.zip
30 files changed, 3045 insertions, 0 deletions
diff --git a/mail-client/mozilla-thunderbird-bin/ChangeLog b/mail-client/mozilla-thunderbird-bin/ChangeLog
new file mode 100644
index 000000000000..1d9263426725
--- /dev/null
+++ b/mail-client/mozilla-thunderbird-bin/ChangeLog
@@ -0,0 +1,32 @@
+# ChangeLog for net-mail/mozilla-thunderbird-bin
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/ChangeLog,v 1.1 2004/05/30 19:41:09 seemant Exp $
+
+*mozilla-thunderbird-bin-0.6 (04 May 2004)
+
+  04 May 2004; Brad Laue <brad@gentoo.org>
+  +files/0.6/icon/mozillathunderbird.desktop,
+  +files/0.6/icon/thunderbird-icon.png, +mozilla-thunderbird-bin-0.6.ebuild:
+  Version bump.
+
+  14 Feb 2004; Brad Laue <brad@gentoo.org> mozilla-thunderbird-bin-0.5.ebuild:
+  Stable on x86
+
+*mozilla-thunderbird-bin-0.5 (12 Feb 2004)
+
+  12 Feb 2004; Brad Laue <brad@gentoo.org> mozilla-thunderbird-bin-0.5.ebuild,
+  files/thunderbird, files/0.5/icon/mozillathunderbird.desktop,
+  files/0.5/icon/thunderbird-icon.png:
+  Bump to 0.5
+
+  08 Dec 2003; Brad Laue <brad@gentoo.org> mozilla-thunderbird-bin-0.4.ebuild:
+  Remove spurious dependency on gnupg.
+
+*mozilla-thunderbird-bin-0.4 (06 Dec 2003)
+
+  06 Dec 2003; Brad Laue <brad@gentoo.org> metadata.xml,
+  mozilla-thunderbird-bin-0.4.ebuild, files/MozillaThunderbird,
+  files/thunderbird-0.3-antialiasing-patch,
+  files/icon/mozillathunderbird.desktop, files/icon/thunderbird-icon.png:
+  Import of mozilla-thunderbird-bin to the tree, starting with 0.4.
+
diff --git a/mail-client/mozilla-thunderbird-bin/Manifest b/mail-client/mozilla-thunderbird-bin/Manifest
new file mode 100644
index 000000000000..558475bfb87c
--- /dev/null
+++ b/mail-client/mozilla-thunderbird-bin/Manifest
@@ -0,0 +1,17 @@
+MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
+MD5 3ee87f6fba0b0647585ebdfd5cb7111e ChangeLog 1279
+MD5 539c6f2c50ba2904b002f37882f3d987 mozilla-thunderbird-bin-0.4.ebuild 1985
+MD5 095026fb8c613fddc20a7c56f221dd73 mozilla-thunderbird-bin-0.5.ebuild 2123
+MD5 f2438544ae4ee3a355dbc30ef89d8e1c mozilla-thunderbird-bin-0.6.ebuild 1904
+MD5 7dd2dac40d6bb1cad39c82742ac7a949 files/MozillaThunderbird 294
+MD5 409c1fb9a49f402540b3ffa017bb3636 files/thunderbird-0.3-antialiasing-patch 1246
+MD5 680f6e780814d352113bbd3fc58b4052 files/digest-mozilla-thunderbird-bin-0.4 93
+MD5 7dd2dac40d6bb1cad39c82742ac7a949 files/thunderbird 294
+MD5 d0ef06cd650e3b818c4654b87a6848b8 files/digest-mozilla-thunderbird-bin-0.5 93
+MD5 654ea1f7dbed8ebc5f0de9832c31c349 files/digest-mozilla-thunderbird-bin-0.6 89
+MD5 b9be05290589c28967a757bdede2c601 files/icon/mozillathunderbird.desktop 155
+MD5 4513b2f650df9b907c09257373a9f879 files/icon/thunderbird-icon.png 2537
+MD5 4513b2f650df9b907c09257373a9f879 files/0.5/icon/thunderbird-icon.png 2537
+MD5 bb431eebb28f85d1c07957846fd3e4d2 files/0.5/icon/mozillathunderbird.desktop 148
+MD5 bb431eebb28f85d1c07957846fd3e4d2 files/0.6/icon/mozillathunderbird.desktop 148
+MD5 04115f0e204444eac76a092a63c89027 files/0.6/icon/thunderbird-icon.png 6499
diff --git a/mail-client/mozilla-thunderbird-bin/files/MozillaThunderbird b/mail-client/mozilla-thunderbird-bin/files/MozillaThunderbird
new file mode 100644
index 000000000000..625e23d936d1
--- /dev/null
+++ b/mail-client/mozilla-thunderbird-bin/files/MozillaThunderbird
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# This is the Gentoo Thunderbird startup script
+# Additions, suggestions?
+# contact astralstorm <astralstorm@gorzow.mm.pl>
+
+export MOZILLA_FIVE_HOME="/opt/MozillaThunderbird"
+THUNDERBIRD_PATH="/opt/MozillaThunderbird"
+
+# No MozillaFirebird running
+${THUNDERBIRD_PATH}/thunderbird $@
diff --git a/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-0.4 b/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-0.4
new file mode 100644
index 000000000000..72b4f07e522e
--- /dev/null
+++ b/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-0.4
@@ -0,0 +1 @@
+MD5 ed121921fe68be9a5be0de479a530943 thunderbird-0.4-i686-pc-linux-gtk2-gnu.tar.bz2 10330376
diff --git a/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-0.5 b/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-0.5
new file mode 100644
index 000000000000..819592c97389
--- /dev/null
+++ b/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-0.5
@@ -0,0 +1 @@
+MD5 4e04516597cbe8d3b3d8b058e7d6b5e4 thunderbird-0.5-i686-pc-linux-gtk2-gnu.tar.bz2 11002467
diff --git a/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-0.6 b/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-0.6
new file mode 100644
index 000000000000..ccc22b8b5735
--- /dev/null
+++ b/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-0.6
@@ -0,0 +1 @@
+MD5 c16fd1e1f3a40b80a98842f6d65d3b1c thunderbird-0.6-i686-linux-gtk2+xft.tar.gz 10151022
diff --git a/mail-client/mozilla-thunderbird-bin/files/thunderbird b/mail-client/mozilla-thunderbird-bin/files/thunderbird
new file mode 100644
index 000000000000..625e23d936d1
--- /dev/null
+++ b/mail-client/mozilla-thunderbird-bin/files/thunderbird
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# This is the Gentoo Thunderbird startup script
+# Additions, suggestions?
+# contact astralstorm <astralstorm@gorzow.mm.pl>
+
+export MOZILLA_FIVE_HOME="/opt/MozillaThunderbird"
+THUNDERBIRD_PATH="/opt/MozillaThunderbird"
+
+# No MozillaFirebird running
+${THUNDERBIRD_PATH}/thunderbird $@
diff --git a/mail-client/mozilla-thunderbird-bin/files/thunderbird-0.3-antialiasing-patch b/mail-client/mozilla-thunderbird-bin/files/thunderbird-0.3-antialiasing-patch
new file mode 100644
index 000000000000..4400c7422f5d
--- /dev/null
+++ b/mail-client/mozilla-thunderbird-bin/files/thunderbird-0.3-antialiasing-patch
@@ -0,0 +1,28 @@
+--- unix.js	2003-06-19 08:00:23.000000000 +0000
++++ unix.js~	2003-10-15 22:43:48.000000000 +0000
+@@ -233,21 +233,20 @@
+ pref("font.scale.outline.min",      6);
+ 
+ // TrueType
+-pref("font.FreeType2.enable", false);
++pref("font.FreeType2.enable", true);
+ pref("font.freetype2.shared-library", "libfreetype.so.6");
+ // if libfreetype was built without hinting compiled in
+ // it is best to leave hinting off
+ pref("font.FreeType2.autohinted", false);
+-pref("font.FreeType2.unhinted", true);
++pref("font.FreeType2.unhinted", false);
+ // below a certian pixel size anti-aliased fonts produce poor results
+ pref("font.antialias.min",        10);
+ pref("font.embedded_bitmaps.max", 1000000);
+ pref("font.scale.tt_bitmap.dark_text.min", 64);
+ pref("font.scale.tt_bitmap.dark_text.gain", "0.8");
+ // sample prefs for TrueType font dirs
+-//pref("font.directory.truetype.1", "/u/sam/tt_font1");
+-//pref("font.directory.truetype.2", "/u/sam/tt_font2");
+-//pref("font.directory.truetype.3", "/u/sam/tt_font3");
++pref("font.directory.truetype.1", "/usr/X11R6/lib/X11/fonts/truetype");
++pref("font.directory.truetype.2", "/usr/X11R6/lib/X11/fonts/TTF");
+ pref("font.FreeType2.printing", true);
+ 
+ // below a certian pixel size anti-aliased bitmat scaled fonts 
diff --git a/mail-client/mozilla-thunderbird-bin/metadata.xml b/mail-client/mozilla-thunderbird-bin/metadata.xml
new file mode 100644
index 000000000000..d5323ace524a
--- /dev/null
+++ b/mail-client/mozilla-thunderbird-bin/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+<herd>mozilla</herd>
+</pkgmetadata>
diff --git a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.4.ebuild b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.4.ebuild
new file mode 100644
index 000000000000..b7923d3f5610
--- /dev/null
+++ b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.4.ebuild,v 1.1 2004/05/30 19:41:09 seemant Exp $
+
+inherit nsplugins eutils
+
+IUSE="gnome"
+
+MY_PN=${PN/-bin/}
+S=${WORKDIR}/thunderbird
+
+DESCRIPTION="The Mozilla Thunderbird Mail & News Reader"
+SRC_URI="http://ftp.mozilla.org/pub/thunderbird/releases/${PV}/thunderbird-${PV}-i686-pc-linux-gtk2-gnu.tar.bz2"
+
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird"
+RESTRICT="nostrip"
+
+KEYWORDS="~x86 -ppc -sparc -alpha"
+SLOT="0"
+LICENSE="MPL-1.1 | NPL-1.1"
+IUSE="gtk2 crypt"
+
+DEPEND="virtual/glibc"
+RDEPEND="virtual/x11
+	>=dev-libs/libIDL-0.8.0
+	>=gnome-base/ORBit-0.5.10-r1
+	>=x11-libs/gtk+-2.1.1
+	virtual/xft
+	>=media-libs/jpeg-6b
+	>=media-libs/libmng-1.0.0
+	>=media-libs/libpng-1.2.1
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	!net-mail/mozilla-thunderbird"
+
+src_install() {
+	dodir /opt
+
+	mv ${S} ${D}/opt/MozillaThunderbird
+
+	# Fixing permissions
+	chown -R root:root ${D}/opt/MozillaThunderbird
+
+	# Truetype fonts
+	cd ${D}/opt/MozillaThunderbird/defaults/pref
+	einfo "Enabling truetype fonts. Filesdir is ${FILESDIR}"
+	epatch ${FILESDIR}/thunderbird-0.3-antialiasing-patch
+
+	# Misc stuff
+	dobin ${FILESDIR}/MozillaThunderbird
+
+	# Install icon and .desktop for menu entry
+	if [ "`use gnome`" ]
+	then
+		insinto /usr/share/pixmaps
+		doins ${FILESDIR}/icon/thunderbird-icon.png
+
+		insinto /usr/share/gnome/apps/Internet
+		doins ${FILESDIR}/icon/mozillathunderbird.desktop
+	fi
+}
+
+pkg_postinst() {
+	einfo "To enable Enigmail, you must install the Enigmail and Enigmime"
+	einfo "extensions as root.  Go to Tools / Options / Extensions and click"
+	einfo "on Install Extension to install Enigmail in your Thunderbird build."
+	einfo "Restart Thunderbird after having installed both extensions."
+	einfo ""
+	einfo "The extensions are located at http://enigmail.mozdev.org/."
+	einfo ""
+}
diff --git a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.5.ebuild b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.5.ebuild
new file mode 100644
index 000000000000..187ce006f293
--- /dev/null
+++ b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.5.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.5.ebuild,v 1.1 2004/05/30 19:41:09 seemant Exp $
+
+inherit nsplugins eutils
+
+IUSE="gnome"
+
+MY_PN=${PN/-bin/}
+S=${WORKDIR}/thunderbird
+
+DESCRIPTION="The Mozilla Thunderbird Mail & News Reader"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/thunderbird-${PV}-i686-pc-linux-gtk2-gnu.tar.bz2"
+
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird"
+RESTRICT="nostrip"
+
+KEYWORDS="x86 -ppc -sparc -alpha"
+SLOT="0"
+LICENSE="MPL-1.1 | NPL-1.1"
+IUSE="gtk2 crypt"
+
+DEPEND="virtual/glibc"
+RDEPEND="virtual/x11
+	>=dev-libs/libIDL-0.8.0
+	>=gnome-base/ORBit-0.5.10-r1
+	>=x11-libs/gtk+-2.1.1
+	virtual/xft
+	>=media-libs/jpeg-6b
+	>=media-libs/libmng-1.0.0
+	>=media-libs/libpng-1.2.1
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	!net-mail/mozilla-thunderbird"
+
+src_install() {
+	dodir /opt
+
+	mv ${S} ${D}/opt/MozillaThunderbird
+
+	# Fixing permissions
+	chown -R root:root ${D}/opt/MozillaThunderbird
+
+	# Truetype fonts
+	cd ${D}/opt/MozillaThunderbird/defaults/pref
+	einfo "Enabling truetype fonts. Filesdir is ${FILESDIR}"
+	epatch ${FILESDIR}/thunderbird-0.3-antialiasing-patch
+
+	# Misc stuff
+	dobin ${FILESDIR}/thunderbird
+
+	# Install icon and .desktop for menu entry
+	if [ "`use gnome`" ]
+	then
+		insinto /usr/share/pixmaps
+		doins ${FILESDIR}/${PV}/icon/thunderbird-icon.png
+
+		insinto /usr/share/gnome/apps/Internet
+		doins ${FILESDIR}/${PV}/icon/mozillathunderbird.desktop
+	fi
+}
+
+pkg_postinst() {
+	einfo "To enable Enigmail, you must install the Enigmail and Enigmime"
+	einfo "extensions as root.  Go to Tools / Options / Extensions and click"
+	einfo "on Install Extension to install Enigmail in your Thunderbird build."
+	einfo "Restart Thunderbird after having installed both extensions."
+	einfo ""
+	einfo "The extensions are located at http://enigmail.mozdev.org/."
+	einfo ""
+	einfo "Please note that the binary name has changed from MozillaThunderbird"
+	einfo "to simply 'thunderbird'."
+	einfo ""
+}
diff --git a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.6.ebuild b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.6.ebuild
new file mode 100644
index 000000000000..758794142191
--- /dev/null
+++ b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-0.6.ebuild,v 1.1 2004/05/30 19:41:09 seemant Exp $
+
+inherit nsplugins eutils
+
+MY_PN=${PN/-bin/}
+S=${WORKDIR}/thunderbird
+
+DESCRIPTION="The Mozilla Thunderbird Mail & News Reader"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/thunderbird-${PV}-i686-linux-gtk2+xft.tar.gz"
+
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird"
+RESTRICT="nostrip"
+
+KEYWORDS="~x86 -ppc -sparc -alpha"
+SLOT="0"
+LICENSE="MPL-1.1 | NPL-1.1"
+IUSE="gnome gtk2 crypt"
+
+DEPEND="virtual/glibc"
+RDEPEND="virtual/x11
+	>=dev-libs/libIDL-0.8.0
+	>=x11-libs/gtk+-2.1.1
+	virtual/xft
+	>=media-libs/jpeg-6b
+	>=media-libs/libmng-1.0.0
+	>=media-libs/libpng-1.2.1
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	!net-mail/mozilla-thunderbird"
+
+src_install() {
+	dodir /opt
+
+	mv ${S} ${D}/opt/MozillaThunderbird
+
+	# Fixing permissions
+	chown -R root:root ${D}/opt/MozillaThunderbird
+
+	# Misc stuff
+	dobin ${FILESDIR}/thunderbird
+
+	# Install icon and .desktop for menu entry
+	if [ "`use gnome`" ]
+	then
+		insinto /usr/share/pixmaps
+		doins ${FILESDIR}/${PV}/icon/thunderbird-icon.png
+
+		insinto /usr/share/gnome/apps/Internet
+		doins ${FILESDIR}/${PV}/icon/mozillathunderbird.desktop
+	fi
+}
+
+pkg_postinst() {
+	einfo "To enable Enigmail, you must install the Enigmail and Enigmime"
+	einfo "extensions as root.  Go to Tools / Options / Extensions and click"
+	einfo "on Install Extension to install Enigmail in your Thunderbird build."
+	einfo "Restart Thunderbird after having installed both extensions."
+	einfo ""
+	einfo "The extensions are located at http://enigmail.mozdev.org/."
+	einfo ""
+	einfo "Please note that the binary name has changed from MozillaThunderbird"
+	einfo "to simply 'thunderbird'."
+	einfo ""
+}
diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
new file mode 100644
index 000000000000..9df05176f4f3
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -0,0 +1,158 @@
+# ChangeLog for net-mail/mozilla-thunderbird
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.1 2004/05/30 19:41:09 seemant Exp $
+
+  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.
+
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
new file mode 100644
index 000000000000..ea916487b5de
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -0,0 +1,21 @@
+MD5 a5eb789eee13a43f9f0b3e4b5c957425 mozilla-thunderbird-0.5.ebuild 6314
+MD5 7d186bae1a6171fc2c5bb36b8d6ee9ee mozilla-thunderbird-0.3-r1.ebuild 6038
+MD5 68b8f1891ce2ded4081d4bf80f35b13b mozilla-thunderbird-0.6-r1.ebuild 8091
+MD5 1dd8753b68bf185d3ac4a80f0ca0965f mozilla-thunderbird-0.4.ebuild 6121
+MD5 26df4b1364befcc37b92ea00eec1224e mozilla-thunderbird-0.6.ebuild 7889
+MD5 24fca473c529fd55802e57a2451689b9 mozilla-thunderbird-0.5-r1.ebuild 6490
+MD5 55192dc4abd66089a94cd141d6b2ff3e ChangeLog 5759
+MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
+MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-thunderbird-amd64.patch 35052
+MD5 beae854b9d4ea6dd5507f36d8ceaf4a6 files/digest-mozilla-thunderbird-0.3-r1 205
+MD5 f981a963a4840e1880440f1f77ea54b2 files/digest-mozilla-thunderbird-0.5-r1 205
+MD5 0f0c19fd0806629d146784983456665e files/digest-mozilla-thunderbird-0.6-r1 205
+MD5 1adb062c6ed356e75ec53d1e35c9d350 files/MozillaThunderbird 302
+MD5 1adb062c6ed356e75ec53d1e35c9d350 files/thunderbird 302
+MD5 64eb8d1ba171c75896ced1eddd4e42ba files/digest-mozilla-thunderbird-0.4 205
+MD5 157a0b64fbfa81bff58ed90c9590ae79 files/digest-mozilla-thunderbird-0.5 205
+MD5 0f0c19fd0806629d146784983456665e files/digest-mozilla-thunderbird-0.6 205
+MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
+MD5 bb431eebb28f85d1c07957846fd3e4d2 files/icon/mozillathunderbird.desktop 148
+MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
+MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
diff --git a/mail-client/mozilla-thunderbird/files/MozillaThunderbird b/mail-client/mozilla-thunderbird/files/MozillaThunderbird
new file mode 100644
index 000000000000..fe77f36ced8d
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/MozillaThunderbird
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# This is the Gentoo Thunderbird startup script
+# Additions, suggestions?
+# contact astralstorm <astralstorm@gorzow.mm.pl>
+
+export MOZILLA_FIVE_HOME="/usr/lib/MozillaThunderbird"
+THUNDERBIRD_PATH="/usr/lib/MozillaThunderbird"
+
+# No MozillaFirebird running
+${THUNDERBIRD_PATH}/thunderbird $@
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.3-r1 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.3-r1
new file mode 100644
index 000000000000..1091020a9b19
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.3-r1
@@ -0,0 +1,3 @@
+MD5 63bfc18db94e605a25a222e417d3a69d thunderbird-source-0.3.tar.bz2 30518769
+MD5 7fff5f1f5e9757eec09fd81051c34db4 enigmail-0.82.2.tar.gz 254794
+MD5 6cd6efb8cea6bb24fde3e02ba7f46676 ipc-1.0.4.tar.gz 134269
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.4 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.4
new file mode 100644
index 000000000000..2edfc1c19787
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.4
@@ -0,0 +1,3 @@
+MD5 2de7805fcb3ca4a08b6062b426dfdad3 thunderbird-source-0.4.tar.bz2 30968925
+MD5 8ec2a2156cb5b646e9ce78dcdaab2d0a enigmail-0.82.4.tar.gz 270240
+MD5 457f8277b12f3e37defa71dc186f83b4 ipc-1.0.5.tar.gz 137083
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.5 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.5
new file mode 100644
index 000000000000..bdef69336f56
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.5
@@ -0,0 +1,3 @@
+MD5 dbbb30f8e6976fbc716c377182e5a11e thunderbird-0.5-source.tar.bz2 31180197
+MD5 de3f63e322c5dbc50783adf21d3caf00 enigmail-0.83.2.tar.gz 287436
+MD5 457f8277b12f3e37defa71dc186f83b4 ipc-1.0.5.tar.gz 137083
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.5-r1 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.5-r1
new file mode 100644
index 000000000000..75dca779af64
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.5-r1
@@ -0,0 +1,3 @@
+MD5 dbbb30f8e6976fbc716c377182e5a11e thunderbird-0.5-source.tar.bz2 31180197
+MD5 70d1b085d8b2ed7c82b6666fa1d537af enigmail-0.83.3.tar.gz 325747
+MD5 457f8277b12f3e37defa71dc186f83b4 ipc-1.0.5.tar.gz 137083
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.6 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.6
new file mode 100644
index 000000000000..fb2fb7c743e6
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.6
@@ -0,0 +1,3 @@
+MD5 1096cea8373f94636a4b2fdeb7c13a4f thunderbird-source-0.6.tar.bz2 32442259
+MD5 fe851d3a95cb32a906a3e6cb6b4b5552 enigmail-0.83.6.tar.gz 281677
+MD5 457f8277b12f3e37defa71dc186f83b4 ipc-1.0.5.tar.gz 137083
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.6-r1 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.6-r1
new file mode 100644
index 000000000000..fb2fb7c743e6
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.6-r1
@@ -0,0 +1,3 @@
+MD5 1096cea8373f94636a4b2fdeb7c13a4f thunderbird-source-0.6.tar.bz2 32442259
+MD5 fe851d3a95cb32a906a3e6cb6b4b5552 enigmail-0.83.6.tar.gz 281677
+MD5 457f8277b12f3e37defa71dc186f83b4 ipc-1.0.5.tar.gz 137083
diff --git a/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-amd64.patch b/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-amd64.patch
new file mode 100644
index 000000000000..5dd2cb2503ed
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-amd64.patch
@@ -0,0 +1,1026 @@
+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/files/thunderbird b/mail-client/mozilla-thunderbird/files/thunderbird
new file mode 100644
index 000000000000..fe77f36ced8d
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/thunderbird
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# This is the Gentoo Thunderbird startup script
+# Additions, suggestions?
+# contact astralstorm <astralstorm@gorzow.mm.pl>
+
+export MOZILLA_FIVE_HOME="/usr/lib/MozillaThunderbird"
+THUNDERBIRD_PATH="/usr/lib/MozillaThunderbird"
+
+# No MozillaFirebird running
+${THUNDERBIRD_PATH}/thunderbird $@
diff --git a/mail-client/mozilla-thunderbird/metadata.xml b/mail-client/mozilla-thunderbird/metadata.xml
new file mode 100644
index 000000000000..d5323ace524a
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+<herd>mozilla</herd>
+</pkgmetadata>
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.3-r1.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.3-r1.ebuild
new file mode 100644
index 000000000000..fa593843209a
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.3-r1.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.3-r1.ebuild,v 1.1 2004/05/30 19:41:09 seemant Exp $
+
+inherit makeedit flag-o-matic gcc nsplugins
+
+# Added to get thunderbird to compile on sparc.
+replace-sparc64-flags
+if [ "`use ppc`" -a "$(gcc-major-version)" -eq "3" -a "$(gcc-minor-version)" -eq "3" ]
+then
+
+append-flags -fno-strict-aliasing
+
+fi
+
+
+S=${WORKDIR}/mozilla
+
+EMVER="0.82.2"
+IPCVER="1.0.4"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
+SRC_URI="http://ftp.mozilla.org/pub/thunderbird/releases/${PV}/thunderbird-source-${PV}.tar.bz2
+	 crypt? ( mirror://gentoo/enigmail-${EMVER}.tar.gz
+	   		  http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+SLOT="0"
+LICENSE="MPL-1.1 | NPL-1.1"
+IUSE="gtk2 ipv6 crypt"
+
+RDEPEND="virtual/x11
+	>=dev-libs/libIDL-0.8.0
+	>=gnome-base/ORBit-0.5.10-r1
+	virtual/xft
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/jpeg-6b
+	>=media-libs/libmng-1.0.0
+	>=media-libs/libpng-1.2.1
+	>=sys-apps/portage-2.0.36
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	gtk2? ( >=x11-libs/gtk+-2.1.1 )
+	!gtk2? ( =x11-libs/gtk+-1.2* )
+	crypt? ( >=app-crypt/gnupg-1.2.1 )"
+
+DEPEND="${RDEPEND}
+	virtual/glibc
+	dev-lang/perl"
+
+# needed by src_compile() and src_install()
+export MOZ_THUNDERBIRD=1
+export MOZ_ENABLE_XFT=1
+
+pkg_setup() {
+	einfo "Please unmerge previous installs of Mozilla Thunderbird before"
+	einfo "merging this. Running emerge unmerge mozilla-thunderbird && rm -rf"
+	einfo "/usr/lib/MozillaThunderbird will ensure that all files are"
+	einfo "removed. If you need to do this, please press ctrl-c now and"
+	einfo "resume emerging once you're done."
+	sleep 5
+}
+
+src_unpack() {
+
+	unpack thunderbird-source-${PV}.tar.bz2
+
+	# Unpack the enigmail plugin
+	if use crypt
+		then
+			unpack ipc-${IPCVER}.tar.gz
+			unpack enigmail-${EMVER}.tar.gz
+
+			mv -f ${WORKDIR}/ipc ${S}/extensions/
+			mv -f ${WORKDIR}/enigmail ${S}/extensions/
+			cp ${FILESDIR}/enigmail/Makefile-ipc ${S}/extensions/ipc/Makefile
+			cp ${FILESDIR}/enigmail/Makefile-enigmail ${S}/extensions/enigmail/Makefile
+	fi
+
+}
+
+src_compile() {
+	local myconf="--with-x \
+		--with-system-jpeg \
+		--with-system-zlib \
+		--with-system-png \
+		--with-system-mng \
+		--disable-calendar \
+		--enable-xft \
+		--disable-pedantic \
+		--disable-svg \
+		--enable-mathml \
+		--without-system-nspr \
+		--enable-nspr-autoconf \
+		--enable-xsl \
+		--enable-crypto \
+		--enable-xinerama=no \
+		--with-pthreads \
+		--with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
+		--with-user-appdir=.thunderbird \
+		--disable-jsd \
+		--disable-accessibility \
+		--disable-profilesharing \
+		--disable-necko-disk-cache \
+		--disable-activex-scripting \
+		--disable-installer \
+		--disable-activex \
+		--disable-tests \
+		--disable-debug \
+		--disable-dtd-debug \
+		--disable-logging \
+		--enable-reorder \
+		--enable-optimize="-O2" \
+		--enable-strip \
+		--enable-strip-libs \
+		--enable-cpp-rtti \
+		--enable-xterm-updates \
+		--disable-toolkit-qt \
+		--disable-toolkit-xlib \
+		--enable-extensions=wallet,spellcheck \
+		--enable-necko-protocols=http,file,jar,viewsource,res,data \
+		--enable-image-decoders=png,gif,jpeg"
+
+	if [ -n "`use gtk2`" ] ; then
+		myconf="${myconf} --enable-toolkit-gtk2 \
+							--enable-default-toolkit=gtk2 \
+							--disable-toolkit-gtk"
+	else
+		myconf="${myconf} --enable-toolkit-gtk \
+							--enable-default-toolkit=gtk \
+							--disable-toolkit-gtk2"
+	fi
+
+	if [ -n "`use ipv6`" ] ; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+	# Crashes on start when compiled with -fomit-frame-pointer
+	filter-flags -fomit-frame-pointer -mpowerpc-gfxopt
+	filter-flags -ffast-math
+	append-flags -s -fforce-addr
+
+	if [ "$(gcc-major-version)" -eq "3" ]; then
+		# Currently gcc-3.2 or older do not work well if we specify "-march"
+		# and other optimizations for pentium4.
+		if [ "$(gcc-minor-version)" -lt "3" ]; then
+			replace-flags -march=pentium4 -march=pentium3
+			filter-flags -msse2
+		fi
+
+	fi
+
+	econf ${myconf} || die
+
+	edit_makefiles
+	emake MOZ_THUNDERBIRD=1 || die
+
+	# Build the enigmail plugin
+	if use crypt
+	then
+		einfo "Building Enigmail plugin..."
+		cd ${S}/extensions/ipc
+		make || die
+
+		cd ${S}/extensions/enigmail
+		make || die
+	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
+
+	dobin ${FILESDIR}/MozillaThunderbird
+
+	# Install icon and .desktop for menu entry
+	if [ "`use gnome`" ]
+	then
+		insinto /usr/share/pixmaps
+		doins ${S}/build/package/rpm/SOURCES/mozilla-icon.png
+
+		# Fix comment of menu entry
+		cd ${S}/build/package/rpm/SOURCES
+		cp mozilla.desktop mozillathunderbird.desktop
+		perl -pi -e 's:Name=Mozilla:Name=Mozilla Thunderbird:' mozillathunderbird.desktop
+		perl -pi -e 's:Comment=Mozilla:Comment=Mozilla Thunderbird Mail Client:' mozillathunderbird.desktop
+		perl -pi -e 's:Exec=/usr/bin/mozilla:Exec=/usr/bin/MozillaThunderbird:' mozillathunderbird.desktop
+		cd ${S}
+		insinto /usr/share/gnome/apps/Internet
+		doins ${S}/build/package/rpm/SOURCES/mozillathunderbird.desktop
+	fi
+}
+
+pkg_postinst() {
+	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaThunderbird"
+
+	# 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=/usr/lib/MozillaThunderbird ${MOZILLA_FIVE_HOME}/regxpcom
+	LD_LIBRARY_PATH=/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 {} \; || :
+}
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.4.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.4.ebuild
new file mode 100644
index 000000000000..74bf25f15378
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.4.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.4.ebuild,v 1.1 2004/05/30 19:41:09 seemant Exp $
+
+inherit makeedit flag-o-matic gcc nsplugins eutils
+
+# Added to get thunderbird to compile on sparc.
+replace-sparc64-flags
+if [ "`use ppc`" -a "$(gcc-major-version)" -eq "3" -a "$(gcc-minor-version)" -eq "3" ]
+then
+
+append-flags -fno-strict-aliasing
+
+fi
+
+
+S=${WORKDIR}/mozilla
+
+EMVER="0.82.4"
+IPCVER="1.0.5"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
+SRC_URI="http://ftp.mozilla.org/pub/thunderbird/releases/${PV}/thunderbird-source-${PV}.tar.bz2
+	 crypt? ( mirror://gentoo/enigmail-${EMVER}.tar.gz
+	   		  http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )"
+
+KEYWORDS="~x86 ~ppc sparc ~alpha ~amd64"
+SLOT="0"
+LICENSE="MPL-1.1 | NPL-1.1"
+IUSE="gtk2 ipv6 crypt"
+
+RDEPEND="virtual/x11
+	>=dev-libs/libIDL-0.8.0
+	>=gnome-base/ORBit-0.5.10-r1
+	virtual/xft
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/jpeg-6b
+	>=media-libs/libmng-1.0.0
+	>=media-libs/libpng-1.2.1
+	>=sys-apps/portage-2.0.36
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	gtk2? ( >=x11-libs/gtk+-2.1.1 )
+	!gtk2? ( =x11-libs/gtk+-1.2* )
+	crypt? ( >=app-crypt/gnupg-1.2.1 )"
+
+DEPEND="${RDEPEND}
+	virtual/glibc
+	dev-lang/perl"
+
+# needed by src_compile() and src_install()
+export MOZ_THUNDERBIRD=1
+export MOZ_ENABLE_XFT=1
+
+#pkg_setup() {
+#	einfo "Please unmerge previous installs of Mozilla Thunderbird before"
+#	einfo "merging this. Running emerge unmerge mozilla-thunderbird && rm -rf"
+#	einfo "/usr/lib/MozillaThunderbird will ensure that all files are"
+#	einfo "removed. If you need to do this, please press ctrl-c now and"
+#	einfo "resume emerging once you're done."
+#	sleep 5
+#}
+
+src_unpack() {
+
+	unpack thunderbird-source-${PV}.tar.bz2
+
+	# Unpack the enigmail plugin
+	if use crypt
+		then
+			unpack ipc-${IPCVER}.tar.gz
+			unpack enigmail-${EMVER}.tar.gz
+
+			mv -f ${WORKDIR}/ipc ${S}/extensions/
+			mv -f ${WORKDIR}/enigmail ${S}/extensions/
+			cp ${FILESDIR}/enigmail/Makefile-ipc ${S}/extensions/ipc/Makefile
+			cp ${FILESDIR}/enigmail/Makefile-enigmail ${S}/extensions/enigmail/Makefile
+	fi
+
+	use amd64 && epatch ${FILESDIR}/mozilla-thunderbird-amd64.patch
+}
+
+src_compile() {
+	local myconf="--with-x \
+		--with-system-jpeg \
+		--with-system-zlib \
+		--with-system-png \
+		--with-system-mng \
+		--disable-calendar \
+		--enable-xft \
+		--disable-pedantic \
+		--disable-svg \
+		--enable-mathml \
+		--without-system-nspr \
+		--enable-nspr-autoconf \
+		--enable-xsl \
+		--enable-crypto \
+		--enable-xinerama=no \
+		--with-pthreads \
+		--with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
+		--with-user-appdir=.thunderbird \
+		--disable-jsd \
+		--disable-accessibility \
+		--disable-profilesharing \
+		--disable-necko-disk-cache \
+		--disable-activex-scripting \
+		--disable-installer \
+		--disable-activex \
+		--disable-tests \
+		--disable-debug \
+		--disable-dtd-debug \
+		--disable-logging \
+		--enable-reorder \
+		--enable-optimize="-O2" \
+		--enable-strip \
+		--enable-strip-libs \
+		--enable-cpp-rtti \
+		--enable-xterm-updates \
+		--disable-toolkit-qt \
+		--disable-toolkit-xlib \
+		--enable-extensions=wallet,spellcheck \
+		--enable-necko-protocols=http,file,jar,viewsource,res,data \
+		--enable-image-decoders=png,gif,jpeg"
+
+	if [ -n "`use gtk2`" ] ; then
+		myconf="${myconf} --enable-toolkit-gtk2 \
+							--enable-default-toolkit=gtk2 \
+							--disable-toolkit-gtk"
+	else
+		myconf="${myconf} --enable-toolkit-gtk \
+							--enable-default-toolkit=gtk \
+							--disable-toolkit-gtk2"
+	fi
+
+	if [ -n "`use ipv6`" ] ; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+	# Crashes on start when compiled with -fomit-frame-pointer
+	filter-flags -fomit-frame-pointer -mpowerpc-gfxopt
+	filter-flags -ffast-math
+	append-flags -s -fforce-addr
+
+	if [ "$(gcc-major-version)" -eq "3" ]; then
+		# Currently gcc-3.2 or older do not work well if we specify "-march"
+		# and other optimizations for pentium4.
+		if [ "$(gcc-minor-version)" -lt "3" ]; then
+			replace-flags -march=pentium4 -march=pentium3
+			filter-flags -msse2
+		fi
+
+	fi
+
+	econf ${myconf} || die
+
+	edit_makefiles
+	emake MOZ_THUNDERBIRD=1 || die
+
+	# Build the enigmail plugin
+	if use crypt
+	then
+		einfo "Building Enigmail plugin..."
+		cd ${S}/extensions/ipc
+		make || die
+
+		cd ${S}/extensions/enigmail
+		make || die
+	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
+
+	dobin ${FILESDIR}/MozillaThunderbird
+
+	# Install icon and .desktop for menu entry
+	if [ "`use gnome`" ]
+	then
+		insinto /usr/share/pixmaps
+		doins ${S}/build/package/rpm/SOURCES/mozilla-icon.png
+
+		# Fix comment of menu entry
+		cd ${S}/build/package/rpm/SOURCES
+		cp mozilla.desktop mozillathunderbird.desktop
+		perl -pi -e 's:Name=Mozilla:Name=Mozilla Thunderbird:' mozillathunderbird.desktop
+		perl -pi -e 's:Comment=Mozilla:Comment=Mozilla Thunderbird Mail Client:' mozillathunderbird.desktop
+		perl -pi -e 's:Exec=/usr/bin/mozilla:Exec=/usr/bin/MozillaThunderbird:' mozillathunderbird.desktop
+		cd ${S}
+		insinto /usr/share/gnome/apps/Internet
+		doins ${S}/build/package/rpm/SOURCES/mozillathunderbird.desktop
+	fi
+}
+
+pkg_postinst() {
+	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaThunderbird"
+
+	# 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=/usr/lib/MozillaThunderbird ${MOZILLA_FIVE_HOME}/regxpcom
+	LD_LIBRARY_PATH=/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 {} \; || :
+}
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5-r1.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5-r1.ebuild
new file mode 100644
index 000000000000..2c4c8dc0736f
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5-r1.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5-r1.ebuild,v 1.1 2004/05/30 19:41:09 seemant Exp $
+
+inherit makeedit flag-o-matic gcc nsplugins eutils
+
+S=${WORKDIR}/mozilla
+
+EMVER="0.83.3"
+IPCVER="1.0.5"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
+SRC_URI="mirror://gentoo/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"
+SLOT="0"
+LICENSE="MPL-1.1 | NPL-1.1"
+IUSE="gtk2 ipv6 crypt xinerama"
+
+RDEPEND="virtual/x11
+	>=dev-libs/libIDL-0.8.0
+	>=gnome-base/ORBit-0.5.10-r1
+	virtual/xft
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/jpeg-6b
+	>=media-libs/libmng-1.0.0
+	>=media-libs/libpng-1.2.1
+	>=sys-apps/portage-2.0.36
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	gtk2? ( >=x11-libs/gtk+-2.1.1 )
+	!gtk2? ( =x11-libs/gtk+-1.2* )
+	crypt? ( >=app-crypt/gnupg-1.2.1 )"
+
+DEPEND="${RDEPEND}
+	virtual/glibc
+	dev-util/pkgconfig
+	dev-lang/perl"
+
+# needed by src_compile() and src_install()
+export MOZ_THUNDERBIRD=1
+export MOZ_ENABLE_XFT=1
+
+#pkg_setup() {
+#	einfo "Please unmerge previous installs of Mozilla Thunderbird before"
+#	einfo "merging this. Running emerge unmerge mozilla-thunderbird && rm -rf"
+#	einfo "/usr/lib/MozillaThunderbird will ensure that all files are"
+#	einfo "removed. If you need to do this, please press ctrl-c now and"
+#	einfo "resume emerging once you're done."
+#	sleep 5
+#}
+
+src_unpack() {
+
+	unpack thunderbird-${PV}-source.tar.bz2
+
+	# Unpack the enigmail plugin
+	if use crypt
+		then
+			unpack ipc-${IPCVER}.tar.gz
+			unpack enigmail-${EMVER}.tar.gz
+
+			mv -f ${WORKDIR}/ipc ${S}/extensions/
+			mv -f ${WORKDIR}/enigmail ${S}/extensions/
+			cp ${FILESDIR}/enigmail/Makefile-ipc ${S}/extensions/ipc/Makefile
+			cp ${FILESDIR}/enigmail/Makefile-enigmail ${S}/extensions/enigmail/Makefile
+	fi
+
+	use amd64 && epatch ${FILESDIR}/mozilla-thunderbird-amd64.patch
+}
+
+src_compile() {
+	local myconf="--with-x \
+		--with-system-jpeg \
+		--with-system-zlib \
+		--with-system-png \
+		--with-system-mng \
+		--disable-calendar \
+		--enable-xft \
+		--disable-pedantic \
+		--disable-svg \
+		--enable-mathml \
+		--without-system-nspr \
+		--enable-nspr-autoconf \
+		--enable-xsl \
+		--enable-crypto \
+		--with-pthreads \
+		--with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
+		--with-user-appdir=.thunderbird \
+		--disable-jsd \
+		--disable-accessibility \
+		--disable-profilesharing \
+		--disable-necko-disk-cache \
+		--disable-activex-scripting \
+		--disable-installer \
+		--disable-activex \
+		--disable-tests \
+		--disable-debug \
+		--disable-dtd-debug \
+		--disable-logging \
+		--enable-reorder \
+		--enable-optimize="-O2" \
+		--enable-strip \
+		--enable-strip-libs \
+		--enable-cpp-rtti \
+		--enable-xterm-updates \
+		--disable-toolkit-qt \
+		--disable-toolkit-xlib \
+		--enable-extensions=wallet,spellcheck \
+		--enable-necko-protocols=http,file,jar,viewsource,res,data \
+		--enable-image-decoders=png,gif,jpeg"
+
+	if [ -n "`use gtk2`" ] ; then
+		myconf="${myconf} --enable-toolkit-gtk2 \
+							--enable-default-toolkit=gtk2 \
+							--disable-toolkit-gtk"
+	else
+		myconf="${myconf} --enable-toolkit-gtk \
+							--enable-default-toolkit=gtk \
+							--disable-toolkit-gtk2"
+	fi
+
+	if [ -n "`use ipv6`" ] ; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+	# Check for xinerama - closes #19369
+	if [ -n "`use xinerama`" ] ; then
+		myconf="${myconf} --enable-xinerama=yes"
+	else
+		myconf="${myconf} --enable-xinerama=no"
+	fi
+
+	# Crashes on start when compiled with -fomit-frame-pointer
+	filter-flags -fomit-frame-pointer -mpowerpc-gfxopt
+	filter-flags -ffast-math
+	append-flags -s -fforce-addr
+
+	if [ "$(gcc-major-version)" -eq "3" ]; then
+		# Currently gcc-3.2 or older do not work well if we specify "-march"
+		# and other optimizations for pentium4.
+		if [ "$(gcc-minor-version)" -lt "3" ]; then
+			replace-flags -march=pentium4 -march=pentium3
+			filter-flags -msse2
+		fi
+	fi
+
+	# Added to get thunderbird to compile on sparc.
+	replace-sparc64-flags
+
+	if use ppc && [[ $(gcc-major-version) == 3 && $(gcc-minor-version) == 3 ]]
+	then
+		append-flags -fno-strict-aliasing
+	fi
+
+	econf ${myconf} || die
+
+	edit_makefiles
+	emake MOZ_THUNDERBIRD=1 || die
+
+	# Build the enigmail plugin
+	if use crypt
+	then
+		einfo "Building Enigmail plugin..."
+		cd ${S}/extensions/ipc
+		make || die
+
+		cd ${S}/extensions/enigmail
+		make || die
+	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
+
+	dobin ${FILESDIR}/thunderbird
+
+	# Install icon and .desktop for menu entry
+	if [ "`use gnome`" ]
+	then
+		insinto /usr/share/pixmaps
+		doins ${S}/build/package/rpm/SOURCES/mozilla-icon.png
+
+		# Fix comment of menu entry
+		cd ${S}/build/package/rpm/SOURCES
+		cp mozilla.desktop mozillathunderbird.desktop
+		perl -pi -e 's:Name=Mozilla:Name=Mozilla Thunderbird:' mozillathunderbird.desktop
+		perl -pi -e 's:Comment=Mozilla:Comment=Mozilla Thunderbird Mail Client:' mozillathunderbird.desktop
+		perl -pi -e 's:Exec=/usr/bin/mozilla:Exec=/usr/bin/thunderbird:' mozillathunderbird.desktop
+		cd ${S}
+		insinto /usr/share/gnome/apps/Internet
+		doins ${S}/build/package/rpm/SOURCES/mozillathunderbird.desktop
+	fi
+}
+
+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 {} \; || :
+
+	einfo "Please note that the binary name has changed from MozillaThunderbird"
+	einfo "to simply 'thunderbird'."
+}
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5.ebuild
new file mode 100644
index 000000000000..820a18013d1f
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.5.ebuild,v 1.1 2004/05/30 19:41:09 seemant Exp $
+
+inherit makeedit flag-o-matic gcc nsplugins eutils
+
+# Added to get thunderbird to compile on sparc.
+replace-sparc64-flags
+if [ "`use ppc`" -a "$(gcc-major-version)" -eq "3" -a "$(gcc-minor-version)" -eq "3" ]
+then
+
+append-flags -fno-strict-aliasing
+
+fi
+
+
+S=${WORKDIR}/mozilla
+
+EMVER="0.83.2"
+IPCVER="1.0.5"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
+SRC_URI="mirror://gentoo/thunderbird-${PV}-source.tar.bz2
+	 crypt? ( mirror://gentoo/enigmail-${EMVER}.tar.gz
+	   		  http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )"
+
+KEYWORDS="x86 ~ppc sparc ~alpha amd64"
+SLOT="0"
+LICENSE="MPL-1.1 | NPL-1.1"
+IUSE="gtk2 ipv6 crypt"
+
+RDEPEND="virtual/x11
+	>=dev-libs/libIDL-0.8.0
+	>=gnome-base/ORBit-0.5.10-r1
+	virtual/xft
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/jpeg-6b
+	>=media-libs/libmng-1.0.0
+	>=media-libs/libpng-1.2.1
+	>=sys-apps/portage-2.0.36
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	gtk2? ( >=x11-libs/gtk+-2.1.1 )
+	!gtk2? ( =x11-libs/gtk+-1.2* )
+	crypt? ( >=app-crypt/gnupg-1.2.1 )"
+
+DEPEND="${RDEPEND}
+	virtual/glibc
+	dev-util/pkgconfig
+	dev-lang/perl"
+
+# needed by src_compile() and src_install()
+export MOZ_THUNDERBIRD=1
+export MOZ_ENABLE_XFT=1
+
+#pkg_setup() {
+#	einfo "Please unmerge previous installs of Mozilla Thunderbird before"
+#	einfo "merging this. Running emerge unmerge mozilla-thunderbird && rm -rf"
+#	einfo "/usr/lib/MozillaThunderbird will ensure that all files are"
+#	einfo "removed. If you need to do this, please press ctrl-c now and"
+#	einfo "resume emerging once you're done."
+#	sleep 5
+#}
+
+src_unpack() {
+
+	unpack thunderbird-${PV}-source.tar.bz2
+
+	# Unpack the enigmail plugin
+	if use crypt
+		then
+			unpack ipc-${IPCVER}.tar.gz
+			unpack enigmail-${EMVER}.tar.gz
+
+			mv -f ${WORKDIR}/ipc ${S}/extensions/
+			mv -f ${WORKDIR}/enigmail ${S}/extensions/
+			cp ${FILESDIR}/enigmail/Makefile-ipc ${S}/extensions/ipc/Makefile
+			cp ${FILESDIR}/enigmail/Makefile-enigmail ${S}/extensions/enigmail/Makefile
+	fi
+
+	use amd64 && epatch ${FILESDIR}/mozilla-thunderbird-amd64.patch
+}
+
+src_compile() {
+	local myconf="--with-x \
+		--with-system-jpeg \
+		--with-system-zlib \
+		--with-system-png \
+		--with-system-mng \
+		--disable-calendar \
+		--enable-xft \
+		--disable-pedantic \
+		--disable-svg \
+		--enable-mathml \
+		--without-system-nspr \
+		--enable-nspr-autoconf \
+		--enable-xsl \
+		--enable-crypto \
+		--enable-xinerama=no \
+		--with-pthreads \
+		--with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
+		--with-user-appdir=.thunderbird \
+		--disable-jsd \
+		--disable-accessibility \
+		--disable-profilesharing \
+		--disable-necko-disk-cache \
+		--disable-activex-scripting \
+		--disable-installer \
+		--disable-activex \
+		--disable-tests \
+		--disable-debug \
+		--disable-dtd-debug \
+		--disable-logging \
+		--enable-reorder \
+		--enable-optimize="-O2" \
+		--enable-strip \
+		--enable-strip-libs \
+		--enable-cpp-rtti \
+		--enable-xterm-updates \
+		--disable-toolkit-qt \
+		--disable-toolkit-xlib \
+		--enable-extensions=wallet,spellcheck \
+		--enable-necko-protocols=http,file,jar,viewsource,res,data \
+		--enable-image-decoders=png,gif,jpeg"
+
+	if [ -n "`use gtk2`" ] ; then
+		myconf="${myconf} --enable-toolkit-gtk2 \
+							--enable-default-toolkit=gtk2 \
+							--disable-toolkit-gtk"
+	else
+		myconf="${myconf} --enable-toolkit-gtk \
+							--enable-default-toolkit=gtk \
+							--disable-toolkit-gtk2"
+	fi
+
+	if [ -n "`use ipv6`" ] ; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+	# Crashes on start when compiled with -fomit-frame-pointer
+	filter-flags -fomit-frame-pointer -mpowerpc-gfxopt
+	filter-flags -ffast-math
+	append-flags -s -fforce-addr
+
+	if [ "$(gcc-major-version)" -eq "3" ]; then
+		# Currently gcc-3.2 or older do not work well if we specify "-march"
+		# and other optimizations for pentium4.
+		if [ "$(gcc-minor-version)" -lt "3" ]; then
+			replace-flags -march=pentium4 -march=pentium3
+			filter-flags -msse2
+		fi
+
+	fi
+
+	econf ${myconf} || die
+
+	edit_makefiles
+	emake MOZ_THUNDERBIRD=1 || die
+
+	# Build the enigmail plugin
+	if use crypt
+	then
+		einfo "Building Enigmail plugin..."
+		cd ${S}/extensions/ipc
+		make || die
+
+		cd ${S}/extensions/enigmail
+		make || die
+	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
+
+	dobin ${FILESDIR}/thunderbird
+
+	# Install icon and .desktop for menu entry
+	if [ "`use gnome`" ]
+	then
+		insinto /usr/share/pixmaps
+		doins ${S}/build/package/rpm/SOURCES/mozilla-icon.png
+
+		# Fix comment of menu entry
+		cd ${S}/build/package/rpm/SOURCES
+		cp mozilla.desktop mozillathunderbird.desktop
+		perl -pi -e 's:Name=Mozilla:Name=Mozilla Thunderbird:' mozillathunderbird.desktop
+		perl -pi -e 's:Comment=Mozilla:Comment=Mozilla Thunderbird Mail Client:' mozillathunderbird.desktop
+		perl -pi -e 's:Exec=/usr/bin/mozilla:Exec=/usr/bin/thunderbird:' mozillathunderbird.desktop
+		cd ${S}
+		insinto /usr/share/gnome/apps/Internet
+		doins ${S}/build/package/rpm/SOURCES/mozillathunderbird.desktop
+	fi
+}
+
+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 {} \; || :
+
+	einfo "Please note that the binary name has changed from MozillaThunderbird"
+	einfo "to simply 'thunderbird'."
+}
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.6-r1.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.6-r1.ebuild
new file mode 100644
index 000000000000..5e81714b3977
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.6-r1.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.6-r1.ebuild,v 1.1 2004/05/30 19:41:09 seemant Exp $
+
+IUSE="gtk2 ipv6 ldap crypt xinerama"
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic gcc eutils nsplugins
+
+EMVER="0.83.6"
+IPCVER="1.0.5"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/thunderbird-source-${PV}.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="virtual/x11
+	virtual/xft
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/jpeg-6b
+	>=media-libs/libmng-1.0.0
+	>=media-libs/libpng-1.2.1
+	>=sys-apps/portage-2.0.36
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	gtk2? (
+		>=x11-libs/gtk+-2.2.0
+		>=dev-libs/libIDL-0.8.0 )
+	!gtk2? (
+		=x11-libs/gtk+-1.2*
+		>=gnome-base/ORBit-0.5.10-r1 )
+	crypt? ( >=app-crypt/gnupg-1.2.1 )
+	>=net-www/mozilla-launcher-1.7-r1"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-lang/perl"
+
+S=${WORKDIR}/mozilla
+
+# needed by src_compile() and src_install()
+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
+		mv -f ${WORKDIR}/ipc ${S}/extensions/
+		mv -f ${WORKDIR}/enigmail ${S}/extensions/
+		cp ${FILESDIR}/enigmail/Makefile-enigmail ${S}/extensions/enigmail/Makefile
+		cp ${FILESDIR}/enigmail/Makefile-ipc ${S}/extensions/ipc/Makefile
+	fi
+
+	use amd64 && epatch ${FILESDIR}/mozilla-thunderbird-amd64.patch
+}
+
+src_compile() {
+	####################################
+	#
+	# myconf setup
+	#
+	####################################
+
+	local myconf
+
+	# NOTE: QT and XLIB toolkit seems very unstable, leave disabled until
+	#       tested ok -- azarah
+	if use gtk2; then
+		myconf="${myconf}
+			--enable-toolkit-gtk2 \
+			--enable-default-toolkit=gtk2 \
+			--disable-toolkit-qt \
+			--disable-toolkit-xlib \
+			--disable-toolkit-gtk"
+	else
+		myconf="${myconf}
+			--enable-toolkit-gtk \
+			--enable-default-toolkit=gtk \
+			--disable-toolkit-qt \
+			--disable-toolkit-xlib \
+			--disable-toolkit-gtk2"
+	fi
+
+	if ! use debug; then
+		myconf="${myconf} \
+			--disable-dtd-debug \
+			--disable-debug \
+			--disable-tests \
+			--enable-reorder \
+			--enable-strip \
+			--enable-strip-libs"
+#			--enable-cpp-rtti"
+
+		# Currently --enable-elf-dynstr-gc only works for x86 and ppc,
+		# thanks to Jason Wever <weeve@gentoo.org> for the fix.
+		if use x86 || use ppc; then
+			myconf="${myconf} --enable-elf-dynstr-gc"
+		fi
+	fi
+
+	####################################
+	#
+	# CFLAGS setup and ARCH support
+	#
+	####################################
+
+	local enable_optimize
+
+	# Set optimization level based on CFLAGS
+	if is-flag -O0; then
+		enable_optimize=-O0
+	elif [[ ${ARCH} == alpha || ${ARCH} == amd64 || ${ARCH} == ia64 ]]; then
+		# Anything more than this causes segfaults on startup on 64-bit
+		# (bug 33767)
+		enable_optimize=-O1
+		append-flags -fPIC
+	elif is-flag -O1; then
+		enable_optimize=-O1
+	else
+		enable_optimize=-O2
+	fi
+
+	# Now strip optimization from CFLAGS so it doesn't end up in the
+	# compile string
+	filter-flags '-O*'
+
+	# Strip over-aggressive CFLAGS - Mozilla supplies its own
+	# fine-tuned CFLAGS and shouldn't be interfered with..  Do this
+	# AFTER setting optimization above since strip-flags only allows
+	# -O -O1 and -O2
+	strip-flags
+
+	# Who added the following line and why?  It doesn't really hurt
+	# anything, but is it necessary??  (28 Apr 2004 agriffis)
+	append-flags -fforce-addr
+
+	# Additional ARCH support
+	case "${ARCH}" in
+	alpha)
+		# Mozilla won't link with X11 on alpha, for some crazy reason.
+		# set it to link explicitly here.
+		sed -i 's/\(EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS).*$\)/\1 -L/usr/X11R6/lib -lX11/' \
+			${S}/gfx/src/gtk/Makefile.in
+		;;
+
+	ppc)
+		# Fix to avoid gcc-3.3.x micompilation issues.
+		if [[ $(gcc-major-version).$(gcc-minor-version) == 3.3 ]]; then
+			append-flags -fno-strict-aliasing
+		fi
+		;;
+
+	sparc)
+		# Sparc support ...
+		replace-sparc64-flags
+		;;
+
+	x86)
+		if [[ $(gcc-major-version) -eq 3 ]]; then
+			# gcc-3 prior to 3.2.3 doesn't work well for pentium4
+			# see bug 25332
+			if [[ $(gcc-minor-version) -lt 2 ||
+				( $(gcc-minor-version) -eq 2 && $(gcc-micro-version) -lt 3 ) ]]
+			then
+				replace-flags -march=pentium4 -march=pentium3
+				filter-flags -msse2
+			fi
+			# Enable us to use flash, etc plugins compiled with gcc-2.95.3
+			myconf="${myconf} --enable-old-abi-compat-wrappers"
+		fi
+		;;
+	esac
+
+	# Needed to build without warnings on gcc-3
+	CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
+
+	####################################
+	#
+	#  Configure and build Thunderbird
+	#
+	####################################
+
+	cd ${S}
+	einfo "Configuring Thunderbird..."
+	econf \
+		--with-x \
+		--with-system-jpeg \
+		--with-system-mng \
+		--with-system-png \
+		--with-system-zlib \
+		--enable-xft \
+		$(use_enable ipv6) \
+		$(use_enable ldap) \
+		--disable-calendar \
+		$(use_enable xinerama) \
+		--disable-pedantic \
+		--disable-svg \
+		--enable-mathml \
+		--without-system-nspr \
+		--enable-nspr-autoconf \
+		--enable-xsl \
+		--enable-crypto \
+		--enable-extensions=wallet,spellcheck \
+		--enable-optimize="${enable_optimize}" \
+		--with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
+		--with-pthreads \
+		--with-user-appdir=.thunderbird \
+		--disable-jsd \
+		--disable-accessibility \
+		--disable-profilesharing \
+		--disable-necko-disk-cache \
+		--disable-activex-scripting \
+		--disable-installer \
+		--disable-activex \
+		--disable-logging \
+		--enable-xterm-updates \
+		--enable-necko-protocols=http,file,jar,viewsource,res,data \
+		--enable-image-decoders=png,gif,jpeg \
+		${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
+	if use gnome; then
+		insinto /usr/share/pixmaps
+		doins ${FILESDIR}/icon/thunderbird-icon.png
+
+		# Fix comment of menu entry
+		insinto /usr/share/gnome/apps/Internet
+		doins ${FILESDIR}/icon/mozillathunderbird.desktop
+	fi
+}
+
+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 {} \; || :
+
+	einfo "Please note that the binary name has changed from MozillaThunderbird"
+	einfo "to simply 'thunderbird'."
+}
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.6.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.6.ebuild
new file mode 100644
index 000000000000..e291329997b4
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.6.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.6.ebuild,v 1.1 2004/05/30 19:41:09 seemant Exp $
+
+IUSE="gtk2 ipv6 ldap crypt xinerama"
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic gcc eutils nsplugins
+
+EMVER="0.83.6"
+IPCVER="1.0.5"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/thunderbird-source-${PV}.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="virtual/x11
+	virtual/xft
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/jpeg-6b
+	>=media-libs/libmng-1.0.0
+	>=media-libs/libpng-1.2.1
+	>=sys-apps/portage-2.0.36
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	gtk2? (
+		>=x11-libs/gtk+-2.2.0
+		>=dev-libs/libIDL-0.8.0 )
+	!gtk2? (
+		=x11-libs/gtk+-1.2*
+		>=gnome-base/ORBit-0.5.10-r1 )
+	crypt? ( >=app-crypt/gnupg-1.2.1 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-lang/perl"
+
+S=${WORKDIR}/mozilla
+
+# needed by src_compile() and src_install()
+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
+		mv -f ${WORKDIR}/ipc ${S}/extensions/
+		mv -f ${WORKDIR}/enigmail ${S}/extensions/
+		cp ${FILESDIR}/enigmail/Makefile-enigmail ${S}/extensions/enigmail/Makefile
+		cp ${FILESDIR}/enigmail/Makefile-ipc ${S}/extensions/ipc/Makefile
+	fi
+
+	use amd64 && epatch ${FILESDIR}/mozilla-thunderbird-amd64.patch
+}
+
+src_compile() {
+	####################################
+	#
+	# myconf setup
+	#
+	####################################
+
+	local myconf
+
+	# NOTE: QT and XLIB toolkit seems very unstable, leave disabled until
+	#       tested ok -- azarah
+	if use gtk2; then
+		myconf="${myconf}
+			--enable-toolkit-gtk2 \
+			--enable-default-toolkit=gtk2 \
+			--disable-toolkit-qt \
+			--disable-toolkit-xlib \
+			--disable-toolkit-gtk"
+	else
+		myconf="${myconf}
+			--enable-toolkit-gtk \
+			--enable-default-toolkit=gtk \
+			--disable-toolkit-qt \
+			--disable-toolkit-xlib \
+			--disable-toolkit-gtk2"
+	fi
+
+	if ! use debug; then
+		myconf="${myconf} \
+			--disable-dtd-debug \
+			--disable-debug \
+			--disable-tests \
+			--enable-reorder \
+			--enable-strip \
+			--enable-strip-libs"
+#			--enable-cpp-rtti"
+
+		# Currently --enable-elf-dynstr-gc only works for x86 and ppc,
+		# thanks to Jason Wever <weeve@gentoo.org> for the fix.
+		if use x86 || use ppc; then
+			myconf="${myconf} --enable-elf-dynstr-gc"
+		fi
+	fi
+
+	####################################
+	#
+	# CFLAGS setup and ARCH support
+	#
+	####################################
+
+	local enable_optimize
+
+	# Set optimization level based on CFLAGS
+	if is-flag -O0; then
+		enable_optimize=-O0
+	elif [[ ${ARCH} == alpha || ${ARCH} == amd64 || ${ARCH} == ia64 ]]; then
+		# Anything more than this causes segfaults on startup on 64-bit
+		# (bug 33767)
+		enable_optimize=-O1
+		append-flags -fPIC
+	elif is-flag -O1; then
+		enable_optimize=-O1
+	else
+		enable_optimize=-O2
+	fi
+
+	# Now strip optimization from CFLAGS so it doesn't end up in the
+	# compile string
+	filter-flags '-O*'
+
+	# Strip over-aggressive CFLAGS - Mozilla supplies its own
+	# fine-tuned CFLAGS and shouldn't be interfered with..  Do this
+	# AFTER setting optimization above since strip-flags only allows
+	# -O -O1 and -O2
+	strip-flags
+
+	# Who added the following line and why?  It doesn't really hurt
+	# anything, but is it necessary??  (28 Apr 2004 agriffis)
+	append-flags -fforce-addr
+
+	# Additional ARCH support
+	case "${ARCH}" in
+	alpha)
+		# Mozilla won't link with X11 on alpha, for some crazy reason.
+		# set it to link explicitly here.
+		sed -i 's/\(EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS).*$\)/\1 -L/usr/X11R6/lib -lX11/' \
+			${S}/gfx/src/gtk/Makefile.in
+		;;
+
+	ppc)
+		# Fix to avoid gcc-3.3.x micompilation issues.
+		if [[ $(gcc-major-version).$(gcc-minor-version) == 3.3 ]]; then
+			append-flags -fno-strict-aliasing
+		fi
+		;;
+
+	sparc)
+		# Sparc support ...
+		replace-sparc64-flags
+		;;
+
+	x86)
+		if [[ $(gcc-major-version) -eq 3 ]]; then
+			# gcc-3 prior to 3.2.3 doesn't work well for pentium4
+			# see bug 25332
+			if [[ $(gcc-minor-version) -lt 2 ||
+				( $(gcc-minor-version) -eq 2 && $(gcc-micro-version) -lt 3 ) ]]
+			then
+				replace-flags -march=pentium4 -march=pentium3
+				filter-flags -msse2
+			fi
+			# Enable us to use flash, etc plugins compiled with gcc-2.95.3
+			myconf="${myconf} --enable-old-abi-compat-wrappers"
+		fi
+		;;
+	esac
+
+	# Needed to build without warnings on gcc-3
+	CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
+
+	####################################
+	#
+	#  Configure and build Thunderbird
+	#
+	####################################
+
+	cd ${S}
+	einfo "Configuring Thunderbird..."
+	econf \
+		--with-x \
+		--with-system-jpeg \
+		--with-system-mng \
+		--with-system-png \
+		--with-system-zlib \
+		--enable-xft \
+		$(use_enable ipv6) \
+		$(use_enable ldap) \
+		--disable-calendar \
+		$(use_enable xinerama) \
+		--disable-pedantic \
+		--disable-svg \
+		--enable-mathml \
+		--without-system-nspr \
+		--enable-nspr-autoconf \
+		--enable-xsl \
+		--enable-crypto \
+		--enable-extensions=wallet,spellcheck \
+		--enable-optimize="${enable_optimize}" \
+		--with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
+		--with-pthreads \
+		--with-user-appdir=.thunderbird \
+		--disable-jsd \
+		--disable-accessibility \
+		--disable-profilesharing \
+		--disable-necko-disk-cache \
+		--disable-activex-scripting \
+		--disable-installer \
+		--disable-activex \
+		--disable-logging \
+		--enable-xterm-updates \
+		--enable-necko-protocols=http,file,jar,viewsource,res,data \
+		--enable-image-decoders=png,gif,jpeg \
+		${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
+
+	dobin ${FILESDIR}/thunderbird
+
+	# Install icon and .desktop for menu entry
+	if use gnome; then
+		insinto /usr/share/pixmaps
+		doins ${FILESDIR}/icon/thunderbird-icon.png
+
+		# Fix comment of menu entry
+		insinto /usr/share/gnome/apps/Internet
+		doins ${FILESDIR}/icon/mozillathunderbird.desktop
+	fi
+}
+
+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 {} \; || :
+
+	einfo "Please note that the binary name has changed from MozillaThunderbird"
+	einfo "to simply 'thunderbird'."
+}
author	Seemant Kulleen <seemant@gentoo.org>	2004-05-30 19:41:09 +0000
committer	Seemant Kulleen <seemant@gentoo.org>	2004-05-30 19:41:09 +0000
commit	e1f3473e173398a665384ab6964fe978dcf8c272 (patch)
tree	1e1bcaa5642d7fe69b8ba91f284ccb5a197a4599 /mail-client
parent	fixed gtkmm deps (diff)
download	historical-e1f3473e173398a665384ab6964fe978dcf8c272.tar.gz historical-e1f3473e173398a665384ab6964fe978dcf8c272.tar.bz2 historical-e1f3473e173398a665384ab6964fe978dcf8c272.zip