cleanup of old ebuild/files, additions made for gcc-4 patch

Package-Manager: portage-2.0.53_rc6

17 files changed, 158 insertions, 887 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 84a175c5e03b..b642909b1bb2 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.89 2005/10/15 20:18:44 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.90 2005/10/22 14:52:14 anarchy Exp $
+
+*mozilla-thunderbird-1.0.7-r1 (23 Oct 2005)
+
+  23 Oct 2005; <anarchy@gentoo.org> -files/thunderbird-0.7-init.tar.bz2,
+  -files/mozilla-thunderbird-1.0.2-gcc4.patch,
+  +files/mozilla-thunderbird-1.0.7-gcc-4.0.2.patch,
+  -mozilla-thunderbird-1.0.5.ebuild, -mozilla-thunderbird-1.0.5-r1.ebuild,
+  -mozilla-thunderbird-1.0.6-r2.ebuild,
+  -mozilla-thunderbird-1.0.6-r3.ebuild,
+  -mozilla-thunderbird-1.0.6-r4.ebuild,
+  -mozilla-thunderbird-1.0.6-r5.ebuild,
+  +mozilla-thunderbird-1.0.7-r1.ebuild:
+  cleanup of old ebuild/files additional fix added to gcc-4 patch
 
   15 Oct 2005; Joseph Jezak <josejx@gentoo.org>
   mozilla-thunderbird-1.0.7.ebuild:
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index b7ce4f6805a6..1f1a74f2ac21 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,33 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 483ceec60027da236b48ad4a0e976e5c ChangeLog 12687
-MD5 360f4688625a7f73f782b59d4b9575bd files/digest-mozilla-thunderbird-1.0.5 156
-MD5 360f4688625a7f73f782b59d4b9575bd files/digest-mozilla-thunderbird-1.0.5-r1 156
-MD5 7bb4144812a01ca4baebba3acc63b143 files/digest-mozilla-thunderbird-1.0.6-r2 307
-MD5 7bb4144812a01ca4baebba3acc63b143 files/digest-mozilla-thunderbird-1.0.6-r3 307
-MD5 211f98642c8ef130f420c3ee2242a3a0 files/digest-mozilla-thunderbird-1.0.6-r4 303
-MD5 211f98642c8ef130f420c3ee2242a3a0 files/digest-mozilla-thunderbird-1.0.6-r5 303
+MD5 4f0986be300de1b60d7c7a258c20ae3d ChangeLog 13247
 MD5 b84b32e9963589c0f2f76d98019b44d7 files/digest-mozilla-thunderbird-1.0.7 303
+MD5 34fc13a505bfb805c539a3b4f0b1bcbf files/digest-mozilla-thunderbird-1.0.7-r1 303
 MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
 MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
-MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-thunderbird-1.0.2-gcc4.patch 1818
 MD5 07a5a1ce0146f1badc4e04849a9b1830 files/mozilla-thunderbird-1.0.6-gcc4.patch 6131
-MD5 f014f20584305e86670ed50e990745db files/thunderbird-0.7-init.tar.bz2 3345
+MD5 1783f8e4678fb4731ccc67b4bfba1981 files/mozilla-thunderbird-1.0.7-gcc-4.0.2.patch 6861
 MD5 07f9a980afa2dde67554657c00b8be18 files/thunderbird-rpath-1.patch 1716
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 9f8a30a5db14358d2dc4415696e127af mozilla-thunderbird-1.0.5-r1.ebuild 4322
-MD5 4bc9516d4d3a8f835aedb450aa72caf4 mozilla-thunderbird-1.0.5.ebuild 4259
-MD5 0de78038591c16287d68ca07e9336d1e mozilla-thunderbird-1.0.6-r2.ebuild 5292
-MD5 7af0edf12380cd3fe97d8d2ea3859b32 mozilla-thunderbird-1.0.6-r3.ebuild 5290
-MD5 b2a1a98869c68c2eb081a7705bc54d25 mozilla-thunderbird-1.0.6-r4.ebuild 5636
-MD5 122a626a770d7ddddfa9c6e6683e5bd9 mozilla-thunderbird-1.0.6-r5.ebuild 5710
+MD5 2896cc99ffbb38fe463d98feb1e954f0 mozilla-thunderbird-1.0.7-r1.ebuild 5640
 MD5 55697b53bd932c2ea9c20d3d5e3b771e mozilla-thunderbird-1.0.7.ebuild 5632
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDUWQ6csIHjyDViGQRAu2gAJ92geYrb4/Kj+Ikb20aPx9zveqwDACdHyAW
-WzTXd/0y8G6Aa7L+7WaXeoE=
-=LFF2
------END PGP SIGNATURE-----
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.5 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.5
deleted file mode 100644
index 2e37e5ce21f9..000000000000
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e69e5ae8c8cc163ddc073061ad0c3cfa thunderbird-1.0.5-source.tar.bz2 33366136
-MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.5-r1 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.5-r1
deleted file mode 100644
index 2e37e5ce21f9..000000000000
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.5-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e69e5ae8c8cc163ddc073061ad0c3cfa thunderbird-1.0.5-source.tar.bz2 33366136
-MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6-r2 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6-r2
deleted file mode 100644
index 13ea2738b58e..000000000000
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 a0ddcc8bd5ee2c9be724b6963ad27111 thunderbird-1.0.6-source.tar.bz2 33366077
-MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
-MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
-MD5 9dfe0379cb62cc623c7f5752fb4dd849 mozilla-firefox-1.0.6-nsplugins.patch 1167
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6-r3 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6-r3
deleted file mode 100644
index 13ea2738b58e..000000000000
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6-r3
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 a0ddcc8bd5ee2c9be724b6963ad27111 thunderbird-1.0.6-source.tar.bz2 33366077
-MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
-MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
-MD5 9dfe0379cb62cc623c7f5752fb4dd849 mozilla-firefox-1.0.6-nsplugins.patch 1167
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6-r5 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6-r5
deleted file mode 100644
index 34c6e9b6b699..000000000000
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6-r5
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 a0ddcc8bd5ee2c9be724b6963ad27111 thunderbird-1.0.6-source.tar.bz2 33366077
-MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
-MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
-MD5 a120cd14ade242622387f76875ca9c39 mozilla-1.7.10-nsplugins-v2.patch 1968
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6-r4 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.7-r1
index 34c6e9b6b699..5d565135f775 100644
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6-r4
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.7-r1
@@ -1,4 +1,4 @@
-MD5 a0ddcc8bd5ee2c9be724b6963ad27111 thunderbird-1.0.6-source.tar.bz2 33366077
+MD5 a120cd14ade242622387f76875ca9c39 mozilla-1.7.10-nsplugins-v2.patch 1968
 MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
 MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
-MD5 a120cd14ade242622387f76875ca9c39 mozilla-1.7.10-nsplugins-v2.patch 1968
+MD5 e6388feb0ffcd189af779f165c124b4d thunderbird-1.0.7-source.tar.bz2 33385665
diff --git a/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.2-gcc4.patch b/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.2-gcc4.patch
deleted file mode 100644
index 2d0a04949072..000000000000
--- a/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.2-gcc4.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ur mozilla-orig/security/nss/lib/pki1/oiddata.h mozilla/security/nss/lib/pki1/oiddata.h
---- mozilla-orig/security/nss/lib/pki1/oiddata.h	2005-03-13 19:12:25.000000000 -0500
-+++ mozilla/security/nss/lib/pki1/oiddata.h	2005-03-13 19:15:19.000000000 -0500
-@@ -43,12 +43,6 @@
- #include "nsspki1t.h"
- #endif /* NSSPKI1T_H */
- 
--extern const NSSOID nss_builtin_oids[];
--extern const PRUint32 nss_builtin_oid_count;
--
--/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
--/*extern const PRUint32 nss_attribute_type_alias_count;*/
--
- extern const NSSOID *NSS_OID_RFC1274_UID;
- extern const NSSOID *NSS_OID_RFC1274_EMAIL;
- extern const NSSOID *NSS_OID_RFC2247_DC;
-diff -ur mozilla-orig/security/nss/lib/pki1/oidgen.perl mozilla/security/nss/lib/pki1/oidgen.perl
---- mozilla-orig/security/nss/lib/pki1/oidgen.perl	2005-03-13 19:12:25.000000000 -0500
-+++ mozilla/security/nss/lib/pki1/oidgen.perl	2005-03-13 19:15:19.000000000 -0500
-@@ -233,12 +233,6 @@
- #include "nsspki1t.h"
- #endif /* NSSPKI1T_H */
- 
--extern const NSSOID nss_builtin_oids[];
--extern const PRUint32 nss_builtin_oid_count;
--
--/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
--/*extern const PRUint32 nss_attribute_type_alias_count;*/
--
- EOD
-     ;
- 
-diff -ur mozilla-orig/security/nss/lib/pki1/pki1.h mozilla/security/nss/lib/pki1/pki1.h
---- mozilla-orig/security/nss/lib/pki1/pki1.h	2005-03-13 19:12:25.000000000 -0500
-+++ mozilla/security/nss/lib/pki1/pki1.h	2005-03-13 19:15:19.000000000 -0500
-@@ -55,7 +55,9 @@
- 
- PR_BEGIN_EXTERN_C
- 
--/* fgmr 19990505 moved these here from oiddata.h */
-+extern const NSSOID nss_builtin_oids[];
-+extern const PRUint32 nss_builtin_oid_count;
-+
- extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];
- extern const PRUint32 nss_attribute_type_alias_count;
- 
diff --git a/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.7-gcc-4.0.2.patch b/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.7-gcc-4.0.2.patch
new file mode 100644
index 000000000000..e97ffa804529
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.7-gcc-4.0.2.patch
@@ -0,0 +1,136 @@
+diff -ur mozilla-orig/security/nss/lib/pki1/oiddata.h mozilla/security/nss/lib/pki1/oiddata.h
+--- mozilla-orig/security/nss/lib/pki1/oiddata.h	2005-03-13 19:12:25.000000000 -0500
++++ mozilla/security/nss/lib/pki1/oiddata.h	2005-03-13 19:15:19.000000000 -0500
+@@ -43,12 +43,6 @@
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */
+ 
+-extern const NSSOID nss_builtin_oids[];
+-extern const PRUint32 nss_builtin_oid_count;
+-
+-/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
+-/*extern const PRUint32 nss_attribute_type_alias_count;*/
+-
+ extern const NSSOID *NSS_OID_RFC1274_UID;
+ extern const NSSOID *NSS_OID_RFC1274_EMAIL;
+ extern const NSSOID *NSS_OID_RFC2247_DC;
+diff -ur mozilla-orig/security/nss/lib/pki1/oidgen.perl mozilla/security/nss/lib/pki1/oidgen.perl
+--- mozilla-orig/security/nss/lib/pki1/oidgen.perl	2005-03-13 19:12:25.000000000 -0500
++++ mozilla/security/nss/lib/pki1/oidgen.perl	2005-03-13 19:15:19.000000000 -0500
+@@ -233,12 +233,6 @@
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */
+ 
+-extern const NSSOID nss_builtin_oids[];
+-extern const PRUint32 nss_builtin_oid_count;
+-
+-/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
+-/*extern const PRUint32 nss_attribute_type_alias_count;*/
+-
+ EOD
+     ;
+ 
+diff -ur mozilla-orig/security/nss/lib/pki1/pki1.h mozilla/security/nss/lib/pki1/pki1.h
+--- mozilla-orig/security/nss/lib/pki1/pki1.h	2005-03-13 19:12:25.000000000 -0500
++++ mozilla/security/nss/lib/pki1/pki1.h	2005-03-13 19:15:19.000000000 -0500
+@@ -55,7 +55,9 @@
+ 
+ PR_BEGIN_EXTERN_C
+ 
+-/* fgmr 19990505 moved these here from oiddata.h */
++extern const NSSOID nss_builtin_oids[];
++extern const PRUint32 nss_builtin_oid_count;
++
+ extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];
+ extern const PRUint32 nss_attribute_type_alias_count;
+ 
+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/files/thunderbird-0.7-init.tar.bz2 b/mail-client/mozilla-thunderbird/files/thunderbird-0.7-init.tar.bz2
deleted file mode 100644
index 09cbe31cf2df..000000000000
--- a/mail-client/mozilla-thunderbird/files/thunderbird-0.7-init.tar.bz2
+++ /dev/null
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.5-r1.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.5-r1.ebuild
deleted file mode 100644
index c37960c6d536..000000000000
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.5-r1.ebuild,v 1.3 2005/07/21 22:02:13 agriffis Exp $
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils nsplugins 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"
-
-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.35"
-
-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() {
-	unpack ${A} || die "unpack failed"
-	cd ${S} || die "cd failed"
-
-	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 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
-
-	# GCC 4 compile patch ; bug #87800
-	epatch ${FILESDIR}/${PN}-1.0.2-gcc4.patch
-}
-
-src_compile() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/thunderbird
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	# tb-specific settings
-	mozconfig_use_enable mozcalendar calendar
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_annotate '' \
-		--with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} \
-		--with-user-appdir=.thunderbird
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, and this breaks
-	# thunderbird
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build Thunderbird
-	#
-	####################################
-
-	econf || die "econf failed"
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/thunderbird
-
-	# Most of the installation happens here
-	dodir ${MOZILLA_FIVE_HOME}
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
-
-	# Chromes will live in /var, registered in pkg_postinst
-	keepdir ${MOZILLA_FIVE_HOME/usr/var}
-
-	# 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_preinst() {
-	# Remove entire installed instance to solve various
-	# problems, for example see bug 27719
-	rm -rf ${ROOT}/usr/$(get_libdir)/thunderbird
-}
-
-pkg_postinst() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/thunderbird"
-
-	# 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() {
-	update_mozilla_launcher_symlinks
-}
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.5.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.5.ebuild
deleted file mode 100644
index 447d07d44c53..000000000000
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.5.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.5.ebuild,v 1.11 2005/07/21 22:02:13 agriffis Exp $
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils nsplugins 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"
-
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-IUSE="ldap"
-
-RDEPEND=">=www-client/mozilla-launcher-1.35"
-
-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() {
-	unpack ${A} || die "unpack failed"
-	cd ${S} || die "cd failed"
-
-	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 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
-
-	# GCC 4 compile patch ; bug #87800
-	epatch ${FILESDIR}/${PN}-1.0.2-gcc4.patch
-}
-
-src_compile() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/thunderbird
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	# tb-specific settings
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_annotate '' \
-		--with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} \
-		--with-user-appdir=.thunderbird
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, and this breaks
-	# thunderbird
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build Thunderbird
-	#
-	####################################
-
-	econf || die "econf failed"
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/thunderbird
-
-	# Most of the installation happens here
-	dodir ${MOZILLA_FIVE_HOME}
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
-
-	# Chromes will live in /var, registered in pkg_postinst
-	keepdir ${MOZILLA_FIVE_HOME/usr/var}
-
-	# 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_preinst() {
-	# Remove entire installed instance to solve various
-	# problems, for example see bug 27719
-	rm -rf ${ROOT}/usr/$(get_libdir)/thunderbird
-}
-
-pkg_postinst() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/thunderbird"
-
-	# 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() {
-	update_mozilla_launcher_symlinks
-}
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r2.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r2.ebuild
deleted file mode 100644
index badf31d19f16..000000000000
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r2.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r2.ebuild,v 1.6 2005/07/23 13:29:48 gustavoz 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
-	mirror://gentoo/mozilla-firefox-1.0.6-nsplugins.patch
-	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0.6-nsplugins.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}/${PN}-1.0.2-gcc4.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
-
-	# look in /usr/lib/nsplugins for plugins, in addition to the usual places
-	epatch ${DISTDIR}/mozilla-firefox-1.0.6-nsplugins.patch
-}
-
-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
-	#
-	####################################
-
-	LD="$(tc-getLD)" CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-	econf || die
-
-	# 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.0.6-r3.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r3.ebuild
deleted file mode 100644
index a4e49e639f4d..000000000000
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r3.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r3.ebuild,v 1.1 2005/07/31 02:21:03 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
-	mirror://gentoo/mozilla-firefox-1.0.6-nsplugins.patch
-	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0.6-nsplugins.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}-gcc4.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
-
-	# look in /usr/lib/nsplugins for plugins, in addition to the usual places
-	epatch ${DISTDIR}/mozilla-firefox-1.0.6-nsplugins.patch
-}
-
-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
-	#
-	####################################
-
-	LD="$(tc-getLD)" CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-	econf || die
-
-	# 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.0.6-r5.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r5.ebuild
deleted file mode 100644
index 1f637699571b..000000000000
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r5.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r5.ebuild,v 1.1 2005/08/19 05:24:51 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}-gcc4.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
-
-	# look in /usr/lib/nsplugins for plugins, in addition to the usual places
-	epatch ${DISTDIR}/mozilla-1.7.10-nsplugins-v2.patch
-
-	# rpath inclusion
-	cd ${S}
-	epatch ${FILESDIR}/thunderbird-rpath-1.patch
-}
-
-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.
-	grep -Flre -DARON_WAS_HERE --exclude=config.\* . | xargs sed -i -e \
-	's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|'
-
-	# 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.0.6-r4.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.7-r1.ebuild
index 3833084c930d..d5ef7360ecc4 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r4.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r4.ebuild,v 1.2 2005/08/03 13:55:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.7-r1.ebuild,v 1.1 2005/10/22 14:52:14 anarchy Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
@@ -60,7 +60,7 @@ src_unpack() {
 	####################################
 
 	# GCC4 compile fix, bug #87800
-	epatch ${FILESDIR}/${P}-gcc4.patch
+	epatch ${FILESDIR}/${P}-gcc-4.0.2.patch
 
 	# patch out ft caching code since the API changed between releases of
 	# freetype; this enables freetype-2.1.8+ compat.