revision bump to both 1.0.x and 1.5.x branch which includes security fixes

Package-Manager: portage-2.1_pre7-r5

7 files changed, 521 insertions, 4 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index aab6755241c2..36c7f057c8a4 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.104 2006/03/31 19:13:05 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.105 2006/04/23 03:48:13 anarchy Exp $
+
+*mozilla-thunderbird-1.5.0.2 (23 Apr 2006)
+*mozilla-thunderbird-1.0.8 (23 Apr 2006)
+
+  23 Apr 2006; Jory A. Pratt <anarchy@gentoo.org>
+  +files/mozilla-thunderbird-1.0.8-gcc-4.patch,
+  +mozilla-thunderbird-1.0.8.ebuild, +mozilla-thunderbird-1.5.0.2.ebuild:
+  revision bump to both 1.0.x and 1.5.x branch which includes security fixes
 
 *mozilla-thunderbird-1.5-r3 (31 Mar 2006)
 
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 77c221e0b204..b3f76c18e307 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,6 +1,6 @@
-MD5 d23354b4ea46fec01ad471a03f193ba6 ChangeLog 16149
-RMD160 3cdb6d81e493bcb64a21af2e5c3b1a6e3580a3a8 ChangeLog 16149
-SHA256 fa6d442e764b5b10d5fdaee98901337238c5531adcafd4508cf1337aef6d1053 ChangeLog 16149
+MD5 1f821291cb51f84a3b02a935cd63aaa1 ChangeLog 16484
+RMD160 36968f6405879ab27b21b3bceffa4df52d48c509 ChangeLog 16484
+SHA256 4175af8da01d7708254b5d281241d1d6bb2549bcada39b5fd58e6fd08eb247c0 ChangeLog 16484
 MD5 b84b32e9963589c0f2f76d98019b44d7 files/digest-mozilla-thunderbird-1.0.7 303
 RMD160 8d65b90bc9cbd304906877f4524efb44db8357be files/digest-mozilla-thunderbird-1.0.7 303
 SHA256 2190c4173d91d183ed761438b9ef316b5ce25dc0061d48d298a98a6ee85edb0c files/digest-mozilla-thunderbird-1.0.7 303
@@ -13,9 +13,15 @@ SHA256 43cc7857be3cc41bf2aaa4e3214989717c6db891a0650f3d8eed1ad5f0babdfe files/di
 MD5 34fc13a505bfb805c539a3b4f0b1bcbf files/digest-mozilla-thunderbird-1.0.7-r3 303
 RMD160 613754942fa67f94c4ec6f6efaddbc69aa424e07 files/digest-mozilla-thunderbird-1.0.7-r3 303
 SHA256 bd23e6fbbb4a6af5dfc758cbece7ddc501f9c8f72f9ed19763e5c19650c4bdc0 files/digest-mozilla-thunderbird-1.0.7-r3 303
+MD5 35e419fa9bfece22ff8faf4996199ffe files/digest-mozilla-thunderbird-1.0.8 1093
+RMD160 b8ef4b33b9a70062425b66ace39595de53058ced files/digest-mozilla-thunderbird-1.0.8 1093
+SHA256 c1e9d6144c5a135bcc76113357dfe7237bd902f024caea57ad09f0fb7bed70b9 files/digest-mozilla-thunderbird-1.0.8 1093
 MD5 5748e9c3b3cf0e8667d9177fba436388 files/digest-mozilla-thunderbird-1.5-r3 584
 RMD160 525130f7c3a06c3b0fef26cc581f9f654c3b80da files/digest-mozilla-thunderbird-1.5-r3 584
 SHA256 9f414b8ba38ca26a507f74a62c8991410cdf976e0074cfa38c4c2874203d8728 files/digest-mozilla-thunderbird-1.5-r3 584
+MD5 4def1bbb7639fe7d95a25ac00dec3d29 files/digest-mozilla-thunderbird-1.5.0.2 608
+RMD160 60de6dfca63be5605fc38819817b0b96fb81008b files/digest-mozilla-thunderbird-1.5.0.2 608
+SHA256 24eb2c65285dfbd1c627e802ee989cdfd8061d986fb17f67019b5b142432aa9c files/digest-mozilla-thunderbird-1.5.0.2 608
 MD5 b92734c051b7734d459e23f7c4a01b63 files/firefox-1.1-uriloader-1.patch 13902
 RMD160 cb816967a91e0a60a238ad11736eec5ac5da3754 files/firefox-1.1-uriloader-1.patch 13902
 SHA256 ac9ef7ec790856d35609a051596579b0cc5a327542614ab420505a2669b388bb files/firefox-1.1-uriloader-1.patch 13902
@@ -49,6 +55,9 @@ SHA256 de8df94dd6e8eda1743f22408826b282487ed0f4d4aa3ec83642ddb1074ed7aa files/mo
 MD5 1783f8e4678fb4731ccc67b4bfba1981 files/mozilla-thunderbird-1.0.7-gcc-4.0.2.patch 6861
 RMD160 7bb61b353a84ae5798fb4c5766e154fd7957e1cd files/mozilla-thunderbird-1.0.7-gcc-4.0.2.patch 6861
 SHA256 3dd142b65c76769f6781f296d02ee4222d3dc32df93395d307d4c94de7341711 files/mozilla-thunderbird-1.0.7-gcc-4.0.2.patch 6861
+MD5 7ee71876f41b10be9b68093bbd41817f files/mozilla-thunderbird-1.0.8-gcc-4.patch 5043
+RMD160 ed0cfa69d9660a410f0433d82ab0a2e40541beba files/mozilla-thunderbird-1.0.8-gcc-4.patch 5043
+SHA256 d5c449a59d336a0017183ed2daac6368c1f16ebc223cba15823d7e41c8f9f26d files/mozilla-thunderbird-1.0.8-gcc-4.patch 5043
 MD5 d2386bbbf480062153de1b154cb63e6c files/pango-cairo-1.patch 4372
 RMD160 53bb1177dcfed87152fc4114a29eaf606f90b931 files/pango-cairo-1.patch 4372
 SHA256 72569e102da702f102be32e70747ec28eb86625312954d9e99ec79f0f3a87930 files/pango-cairo-1.patch 4372
@@ -76,6 +85,12 @@ SHA256 ac325d486022d7dda7b935b55288725659b36ceda2b71ea7fb8869aab790ac7a mozilla-
 MD5 55697b53bd932c2ea9c20d3d5e3b771e mozilla-thunderbird-1.0.7.ebuild 5632
 RMD160 8bd50c2ff4f286eb3d8712bfe438ec9c9ef17864 mozilla-thunderbird-1.0.7.ebuild 5632
 SHA256 72668acde3d6f126b387f99b6ec45e23721618b4d1cd96dc728165d2f9a288c0 mozilla-thunderbird-1.0.7.ebuild 5632
+MD5 4647ac3fe42bbe46e0a74c071c7f942a mozilla-thunderbird-1.0.8.ebuild 6378
+RMD160 97e4ec8da5ff76b8282ef276fbc10c9258950094 mozilla-thunderbird-1.0.8.ebuild 6378
+SHA256 9343f4a271304d41fa8d5902a3de0d93ce43d69486d5cfb630042346ef60d46d mozilla-thunderbird-1.0.8.ebuild 6378
 MD5 57740a117c0daa2b629751d2bc471faa mozilla-thunderbird-1.5-r3.ebuild 5768
 RMD160 9273b90fd0afe2c89c444d30cee13fc939ddff6f mozilla-thunderbird-1.5-r3.ebuild 5768
 SHA256 6d3a0577d19ee1c7a21c4c2e4e3120e928c6b87317190fd21bc03fab691c47db mozilla-thunderbird-1.5-r3.ebuild 5768
+MD5 a6297b3cca11c8c371e7fabb23337fd9 mozilla-thunderbird-1.5.0.2.ebuild 5819
+RMD160 8c30dab7a90ce4e963f8f36154275167d33c8173 mozilla-thunderbird-1.5.0.2.ebuild 5819
+SHA256 1a36a5886e90851a82f6d394b2b60a7b40781d8960338a8eb6a00307dd86c666 mozilla-thunderbird-1.5.0.2.ebuild 5819
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.8 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.8
new file mode 100644
index 000000000000..5912ac221c02
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.8
@@ -0,0 +1,12 @@
+MD5 a120cd14ade242622387f76875ca9c39 mozilla-1.7.10-nsplugins-v2.patch 1968
+RMD160 42f20651c93d904829fd80d4bf6bf8f07456124d mozilla-1.7.10-nsplugins-v2.patch 1968
+SHA256 bd5ce9f3b58496ce66852f7decec1e9531966568c9530bf4d7c1cc6d97ea0a06 mozilla-1.7.10-nsplugins-v2.patch 1968
+MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
+RMD160 b3ea2512d641d4aa0af4925ddab75351889c3c35 mozilla-firefox-1.0-4ft2.patch.bz2 5601
+SHA256 10b20c0acf58650992c01e5481478304ebb709298d42748033cb252b40525b7f mozilla-firefox-1.0-4ft2.patch.bz2 5601
+MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
+RMD160 25215a45e8c97259666252dcfb3ad90c547d632f mozilla-jslibmath-alpha.patch 625
+SHA256 5b2b47453bdcaba6970d3773a2d9882688c3e26e2f6d5a96192977c8b3cd5569 mozilla-jslibmath-alpha.patch 625
+MD5 53506f2a9ff4fd60e34686dd75ee3be1 thunderbird-1.0.8-source.tar.bz2 33357944
+RMD160 98efe27732b7a0a991dca1ca3c36a7cb63aad30f thunderbird-1.0.8-source.tar.bz2 33357944
+SHA256 997e60291e891ff68714c41b545273486915fb33ba36fb1c571cdae089b9a820 thunderbird-1.0.8-source.tar.bz2 33357944
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5.0.2 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5.0.2
new file mode 100644
index 000000000000..2769440df195
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.5.0.2
@@ -0,0 +1,6 @@
+MD5 25081844ca4292c4eeb8f55b1c8e3660 mozilla-thunderbird-1.5.0.2-patches-1.1.tar.bz2 29990
+RMD160 ad7078bf82757bc2503861ead0e64b83a579fe7b mozilla-thunderbird-1.5.0.2-patches-1.1.tar.bz2 29990
+SHA256 cb911773dba65fc17ccf55267dcc024c3da1a1b45424b575293bbdaa6ba309bf mozilla-thunderbird-1.5.0.2-patches-1.1.tar.bz2 29990
+MD5 3f32b847330c9d58297147be19714962 thunderbird-1.5.0.2-source.tar.bz2 35880369
+RMD160 8aaf02c205b131a38fa0384fe6126eec325c3e9e thunderbird-1.5.0.2-source.tar.bz2 35880369
+SHA256 d01a4edef782ea0d86e7ed5899ffdd48998211d5e134e3e93b1a0f9e56198151 thunderbird-1.5.0.2-source.tar.bz2 35880369
diff --git a/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.8-gcc-4.patch b/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.8-gcc-4.patch
new file mode 100644
index 000000000000..ab8b031069f7
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.8-gcc-4.patch
@@ -0,0 +1,90 @@
+diff -ur mozilla-orig/xpcom/base/nscore.h mozilla/xpcom/base/nscore.h
+--- mozilla-orig/xpcom/base/nscore.h	2005-07-24 05:07:54.627311840 +0000
++++ mozilla/xpcom/base/nscore.h	2005-07-24 05:13:02.327534296 +0000
+@@ -365,8 +365,9 @@
+  * Use these macros to do 64bit safe pointer conversions.
+  */
+ 
+-#define NS_PTR_TO_INT32(x) ((char *)(x) - (char *)0)
+-#define NS_INT32_TO_PTR(x) ((void *)((char *)0 + (x)))
++#define NS_PTR_TO_INT32(x)  ((PRInt32)  (PRWord) (x))
++#define NS_PTR_TO_UINT32(x) ((PRUint32) (PRWord) (x))
++#define NS_INT32_TO_PTR(x)  ((void *)   (PRWord) (x))
+ 
+ /*
+  * These macros allow you to give a hint to the compiler about branch
+diff -ur mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp
+--- mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp	2005-07-24 05:07:51.199832896 +0000
++++ mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp	2005-07-24 05:13:08.302625944 +0000
+@@ -834,8 +834,8 @@
+ void
+ nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param)
+ {
+-    PRUint16 name  = (PRUint32(param) & 0xFFFF0000) >> 16;
+-    PRUint16 value =  PRUint32(param) & 0x0000FFFF;
++    PRUint16 name  = (NS_PTR_TO_UINT32(param) & 0xFFFF0000) >> 16;
++    PRUint16 value =  NS_PTR_TO_UINT32(param) & 0x0000FFFF;
+ 
+     switch (name) {
+     case MAX_CONNECTIONS:
+diff -ur mozilla-orig/widget/src/gtk2/nsDragService.cpp mozilla/widget/src/gtk2/nsDragService.cpp
+--- mozilla-orig/widget/src/gtk2/nsDragService.cpp	2005-07-24 05:08:57.666728392 +0000
++++ mozilla/widget/src/gtk2/nsDragService.cpp	2005-07-24 05:13:33.910732920 +0000
+@@ -838,7 +838,7 @@
+             (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+         listTarget->target = g_strdup(gMimeListType);
+         listTarget->flags = 0;
+-        listTarget->info = (guint)listAtom;
++        listTarget->info = GPOINTER_TO_UINT(listAtom);
+         PR_LOG(sDragLm, PR_LOG_DEBUG,
+                ("automatically adding target %s with id %ld\n",
+                listTarget->target, listAtom));
+@@ -877,7 +877,7 @@
+                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                             listTarget->target = g_strdup(gTextUriListType);
+                             listTarget->flags = 0;
+-                            listTarget->info = (guint)listAtom;
++                            listTarget->info = GPOINTER_TO_UINT(listAtom);
+                             PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                    ("automatically adding target %s with \
+                                    id %ld\n", listTarget->target, listAtom));
+@@ -914,7 +914,7 @@
+                           (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                         target->target = g_strdup(flavorStr);
+                         target->flags = 0;
+-                        target->info = (guint)atom;
++                        target->info = GPOINTER_TO_UINT(atom);
+                         PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                ("adding target %s with id %ld\n",
+                                target->target, atom));
+@@ -931,7 +931,7 @@
+                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                             plainTarget->target = g_strdup(kTextMime);
+                             plainTarget->flags = 0;
+-                            plainTarget->info = (guint)plainAtom;
++                            plainTarget->info = GPOINTER_TO_UINT(plainAtom);
+                             PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                    ("automatically adding target %s with \
+                                    id %ld\n", plainTarget->target, plainAtom));
+@@ -948,7 +948,7 @@
+                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                             urlTarget->target = g_strdup(gMozUrlType);
+                             urlTarget->flags = 0;
+-                            urlTarget->info = (guint)urlAtom;
++                            urlTarget->info = GPOINTER_TO_UINT(urlAtom);
+                             PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                    ("automatically adding target %s with \
+                                    id %ld\n", urlTarget->target, urlAtom));
+
+diff -urN mozilla-orig/gfx/src/freetype/nsFreeType.cpp mozilla/gfx/src/freetype/nsFreeType.cpp
+--- mozilla-orig/gfx/src/freetype/nsFreeType.cpp	2005-10-22 13:17:35.151589250 -0500
++++ mozilla/gfx/src/freetype/nsFreeType.cpp	2005-10-22 13:23:07.672370500 -0500
+@@ -96,7 +96,7 @@
+ // Define the FreeType2 functions we resolve at run time.
+ // see the comment near nsFreeType2::DoneFace() for more info
+ //
+-#define NS_FT2_OFFSET(f) (int)&((nsFreeType2*)0)->f
++#define NS_FT2_OFFSET(f) (NS_PTR_TO_INT32(&((nsFreeType2*)0)->f))
+ FtFuncList nsFreeType2::FtFuncs [] = {
+   {"FT_Done_Face",            NS_FT2_OFFSET(nsFT_Done_Face),            PR_TRUE},
+   {"FT_Done_FreeType",        NS_FT2_OFFSET(nsFT_Done_FreeType),        PR_TRUE},
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.8.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.8.ebuild
new file mode 100644
index 000000000000..945aba970eeb
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.8.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.8.ebuild,v 1.1 2006/04/23 03:48:13 anarchy Exp $
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/source/thunderbird-${PV}-source.tar.bz2
+	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
+	mirror://gentoo/mozilla-jslibmath-alpha.patch
+	http://dev.gentoo.org/~agriffis/dist/mozilla-1.7.10-nsplugins-v2.patch"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="mozcalendar ldap"
+
+RDEPEND=">=www-client/mozilla-launcher-1.39"
+
+S=${WORKDIR}/mozilla
+
+# Needed by src_compile() and src_install().
+# Would do in pkg_setup but that loses the export attribute, they
+# become pure shell variables.
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+export MOZ_THUNDERBIRD=1
+
+src_unpack() {
+	declare x
+
+	for x in ${A}; do
+		[[ $x == *.tar.* ]] || continue
+		unpack $x || die "unpack failed"
+	done
+	cd ${S} || die "cd failed"
+
+	####################################
+	#
+	# architecture patches
+	#
+	####################################
+
+	if [[ $(gcc-major-version) -eq 3 ]]; then
+		# ABI Patch for alpha/xpcom for gcc-3.x
+		if [[ ${ARCH} == alpha ]]; then
+			epatch ${FILESDIR}/mozilla-alpha-xpcom-subs-fix.patch
+		fi
+	fi
+
+	# patch to fix math operations on alpha, makes maps.google.com work!
+	epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
+
+	####################################
+	#
+	# general compilation and run-time fixes
+	#
+	####################################
+
+	# GCC4 compile fix, bug #87800
+	epatch ${FILESDIR}/${P}-gcc-4.patch
+	#Fixes draft/template folders upstream bug#197228
+	epatch ${FILESDIR}/${PN}-1.0.7-draft-template.patch
+
+	# patch out ft caching code since the API changed between releases of
+	# freetype; this enables freetype-2.1.8+ compat.
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
+	epatch ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
+
+	# rpath fix
+	epatch ${FILESDIR}/thunderbird-rpath-1.patch
+	epatch ${DISTDIR}/mozilla-1.7.10-nsplugins-v2.patch
+
+	# Fix a compilation issue using the 32-bit userland with 64-bit kernel on
+	# PowerPC, because with that configuration, it detects a ppc64 system.
+	# -- hansmi, 2005-11-13
+	if use ppc && [[ "${PROFILE_ARCH}" == ppc64 ]]; then
+		sed -i -e "s#OS_TEST=\`uname -m\`\$#OS_TEST=${ARCH}#" \
+			${S}/configure
+		sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \
+			${S}/security/coreconf/arch.mk
+	fi
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+
+	# tb-specific settings
+	mozconfig_use_enable ldap
+	mozconfig_use_enable ldap ldap-experimental
+	mozconfig_use_enable mozcalendar calendar
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# hardened GCC uses -fstack-protector-all by default, which breaks us
+	has_hardened && append-flags -fno-stack-protector-all
+	replace-flags -fstack-protector-all -fstack-protector
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	econf || die
+
+	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
+	# to econf, but the quotes cause configure to fail.
+	sed -i -e \
+		's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
+		${S}/config/autoconf.mk \
+		${S}/nsprpub/config/autoconf.mk \
+		${S}/xpfe/global/buildconfig.html
+
+	# Fixup the RPATH
+	sed -i -e \
+		's|#RPATH_FIXER|'"${MOZILLA_FIVE_HOME}"'|' \
+		${S}/config/rules.mk \
+		${S}/nsprpub/config/rules.mk \
+		${S}/security/coreconf/rules.mk \
+		${S}/security/coreconf/rules.mk
+
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake || die
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Most of the installation happens here
+	dodir ${MOZILLA_FIVE_HOME}
+	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
+
+	# Create directory structure to support portage-installed extensions.
+	# See update_chrome() in mozilla-launcher
+	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
+	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
+	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
+		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
+
+	# Create /usr/bin/thunderbird
+	install_mozilla_launcher_stub thunderbird ${MOZILLA_FIVE_HOME}
+
+	# Install icon and .desktop for menu entry
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/icon/thunderbird-icon.png
+
+	# Fix bug 54179: Install .desktop file into /usr/share/applications
+	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
+	insinto /usr/share/applications
+	doins ${FILESDIR}/icon/mozillathunderbird.desktop
+}
+
+pkg_postinst() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Update the component registry
+	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=thunderbird \
+		/usr/libexec/mozilla-launcher -register
+
+	# This should be called in the postinst and postrm of all the
+	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
+	# thunderbird-bin ebuilds.
+	update_mozilla_launcher_symlinks
+
+	ewarn "Enigmail Support has been dropped since it doesn't work on fresh install."
+	ewarn "The Gentoo Mozilla team is working on making enigmail its own build,"
+	ewarn "sorry for the inconvenience.  For now, you can download enigmail from"
+	ewarn "http://enigmail.mozdev.org"
+}
+
+pkg_postrm() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Update the component registry
+	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=thunderbird \
+		/usr/libexec/mozilla-launcher -register
+
+	update_mozilla_launcher_symlinks
+}
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.2.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.2.ebuild
new file mode 100644
index 000000000000..087f692d4170
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.2.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.5.0.2.ebuild,v 1.1 2006/04/23 03:48:13 anarchy Exp $
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib autotools
+
+PVER="1.1"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/source/thunderbird-${PV}-source.tar.bz2
+	mirror://gentoo/${P}-patches-${PVER}.tar.bz2
+	http://dev.gentoo.org/~anarchy/dist/${P}-patches-${PVER}.tar.bz2"
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="ldap crypt"
+
+RDEPEND=">=www-client/mozilla-launcher-1.39
+	>=dev-libs/nss-3.10
+	>=dev-libs/nspr-4.6.1"
+
+PDEPEND="crypt? ( x11-plugins/enigmail ) "
+
+S=${WORKDIR}/mozilla
+
+# Needed by src_compile() and src_install().
+# Would do in pkg_setup but that loses the export attribute, they
+# become pure shell variables.
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+export MOZ_CO_PROJECT=mail
+
+src_unpack() {
+	declare x
+
+	for x in ${A}; do
+		[[ $x == *.tar.* ]] || continue
+		unpack $x || die "unpack failed"
+	done
+	cd ${S} || die "cd failed"
+
+	# Apply our patches
+	EPATCH_FORCE="yes" epatch ${WORKDIR}/patch
+
+	# Fix a compilation issue using the 32-bit userland with 64-bit kernel on
+	# PowerPC, because with that configuration, it detects a ppc64 system.
+	# -- hansmi, 2005-11-13
+	if use ppc && [[ "${PROFILE_ARCH}" == ppc64 ]]; then
+		sed -i -e "s#OS_TEST=\`uname -m\`\$#OS_TEST=${ARCH}#" \
+			${S}/configure
+		sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \
+			${S}/security/coreconf/arch.mk
+	fi
+
+	WANT_AUTOCONF="2.13" \
+		WANT_AUTOMAKE="2.13" \
+		eautoreconf || die "failed running autoreconf"
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# tb-specific settings
+	mozconfig_use_enable ldap
+	mozconfig_use_enable ldap ldap-experimental
+	mozconfig_annotate '' --enable-extensions=default
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+	mozconfig_annotate '' --with-system-nspr
+	mozconfig_annotate '' --with-system-nss
+	mozconfig_annotate '' --enable-official-branding
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# hardened GCC uses -fstack-protector-all by default, which breaks us
+	has_hardened && append-flags -fno-stack-protector-all
+	replace-flags -fstack-protector-all -fstack-protector
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+	append-flags -freorder-blocks -fno-reorder-functions
+
+	# Export CPU_ARCH_TEST  as it is not exported by default.
+	case $(tc-arch) in
+	amd64) [[ ${ABI} == "x86" ]] && CPU_ARCH_TEST="x86" || CPU_ARCH_TEST="x86_64" ;;
+	ia64) CPU_ARCH_TEST="ia64" ;;
+	ppc) CPU_ARCH_TEST="ppc" ;;
+	*) CPU_ARCH_TEST=$(tc-arch) ;;
+	esac
+
+	export CPU_ARCH_TEST
+
+	CPPFLAGS="${CPPFLAGS}" \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	econf || die
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake || die
+}
+
+pkg_preinst() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	echo ""
+	einfo "We are removing old install before we continue. This is to help"
+	einfo "eliminate any problems during the install, sorry for those of you"
+	einfo "who disagree with this but this will ensure a sane build for everyone"
+	einfo "Comments and suggestion should be addressed to mozilla@gentoo.org"
+	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Most of the installation happens here
+	dodir ${MOZILLA_FIVE_HOME}
+	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
+
+	# Create directory structure to support portage-installed extensions.
+	# See update_chrome() in mozilla-launcher
+	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
+	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
+	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
+		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
+
+	# Create /usr/bin/thunderbird
+	install_mozilla_launcher_stub thunderbird ${MOZILLA_FIVE_HOME}
+
+	# Install icon and .desktop for menu entry
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/icon/thunderbird-icon.png
+
+	# Fix bug 54179: Install .desktop file into /usr/share/applications
+	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
+	insinto /usr/share/applications
+	doins ${FILESDIR}/icon/mozillathunderbird.desktop
+
+	####################################
+	#
+	# Install files necessary for applications to build against firefox
+	#
+	####################################
+
+	ewarn "Installing includes and idl files..."
+	dodir ${MOZILLA_FIVE_HOME}/idl ${MOZILLA_FIVE_HOME}/include
+	cd ${S}/dist
+	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include || die "failed to copy"
+	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/idl || die "failed to copy"
+
+	# Dirty hack to get some applications using this header running
+	dosym ${MOZILLA_FIVE_HOME}/include/necko/nsIURI.h \
+		/usr/$(get_libdir)/${MOZILLA_FIVE_HOME##*/}/include/nsIURI.h
+}
+
+pkg_postinst() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# This should be called in the postinst and postrm of all the
+	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
+	# thunderbird-bin ebuilds.
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	update_mozilla_launcher_symlinks
+}