Tb - Version bump, misc bug fixes

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

5 files changed, 100 insertions, 353 deletions

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index 9ad973a561c9..e9360865f4c3 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/thunderbird
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.86 2011/08/04 13:26:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.87 2011/08/21 17:55:30 anarchy Exp $
+
+*thunderbird-6.0 (21 Aug 2011)
+
+  21 Aug 2011; Jory A. Pratt <anarchy@gentoo.org>
+  -thunderbird-3.3_alpha3-r2.ebuild, -thunderbird-5.0.ebuild,
+  +thunderbird-6.0.ebuild, +files/fix-thunderbird-calender-support.patch:
+  Version bump, misc bug fixes
 
   04 Aug 2011; Lars Wendler <polynomial-c@gentoo.org>
   files/icon/thunderbird.desktop, files/icon/thunderbird-unbranded.desktop:
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 45daeb2ece55..a01e00f0c296 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX 1001-xulrunner_fix_jemalloc_vs_aslr.patch 1936 RMD160 4edd9e5ab5082f86cb66ad1fc158e4c105f861ce SHA1 20df285bac8e0704559c0479f7dfe02f030afa8a SHA256 0beb08f2b3fc504897b1024caabcf2887b55fae31c021341c66d3491dc63e32b
 AUX 1002_fix-system-hunspell-dict-detections.patch 3466 RMD160 f8fa846e5d7c80a15d0abf0c6aedb7302ead1f83 SHA1 091febd913c09c86c9242b1be8960fb012ee7c8d SHA256 7ce51cae6bbd6655c8bc543365370627e37d2fc5aa7f7e1270671f7482df344a
 AUX 2000-thunderbird_gentoo_install_dirs.patch 813 RMD160 802697aab947df43693d7330f5d83700a62a6b50 SHA1 d2621bc80130239d7d65562ce8de8488dcbf60e2 SHA256 f663f3e59ac1752d681ed5d09bd599693009a65f603c89fa6d2e851b3487a8c4
 AUX bug-606109.patch 1259 RMD160 6d3f5d354524268e34293e9ce2d8b173c47163af SHA1 e1488807cc61ec04b2caa50019c000ba5d077450 SHA256 f2e645dfaa03cabcf46703be5bdeff8ee021694896465d3d263b038682dc0395
 AUX cups-1.4.4-fixup.patch 5439 RMD160 e907f65012a88b0810979c0beda4244e817835e6 SHA1 4099626a22b61802c958faad8171d506a95f9fca SHA256 501f95e278c2fdf3dec2b5586a2dc5ae35d78557a0db9939a1501c4782e54be5
 AUX enigmail-1.1.2-20110124-locale-fixup.diff 125 RMD160 8704469817cd93c99665a35655fa626b74253920 SHA1 708e101ae0576f99d6f10ac778fbc2b76c3ff6ea SHA256 60627ed65b032e33935d14eea4c7224f940641c4a11ab8bdf2c5d6056a76bfda
+AUX fix-thunderbird-calender-support.patch 1394 RMD160 34689aa60cc384295cc411e670b1101efc301c2d SHA1 aa3eb53cf21321f5c9a76c79aaba74b45278e0a1 SHA256 a001450f8cf6b66d7b88d36d4c77254a33dad2dd4edb5067b079417860ca2e88
 AUX icon/thunderbird-icon-unbranded.png 13280 RMD160 1654b2cfa39631e2084da982001113972eb41c09 SHA1 2fdca79e57c79d2485eb56d31de7afb05337898e SHA256 28b605529bee4d8245afdbb2cab5a705d8fa8977a11635b54c7bc5a7d6a9619c
 AUX icon/thunderbird-icon.png 6499 RMD160 1aeece7719c1c1629b98fc11870641769681a048 SHA1 651d244e96fa0edf13f68f5ef9047432eb6ed3bf SHA256 ff9749e42b82b80425bb52883d63baa53298af7be98870ee6b73f0a6cf0ab22d
 AUX icon/thunderbird-unbranded.desktop 228 RMD160 dff5e383ee0cc08752f77321b78ef6d021884e1d SHA1 6fe848fcd6a9916caefd274f863d4c766920615c SHA256 9c3486c4944c7a7471ae5d5f6ab8b716a9e51ad677d140b7ef58de99b9a7f334
@@ -20,8 +18,7 @@ AUX thunderbird-gentoo-default-prefs.js 494 RMD160 9eed5d9ac1f7953bb563354176a36
 AUX thunderbird-respect-ldflags.patch 1640 RMD160 889a63b2fb04878e99b2a14d47713e47621ab334 SHA1 fec674ca325de52a547af336864b66e113fb2df7 SHA256 3db9aea0cdfc77c6c7de20591a44b92eecb9636fdb6c45676a173905a8bd7ae1
 AUX thunderbird-xul-1.9.2-arm-fixes.patch 603 RMD160 952db59f2c3d526b04323fec830cf04c28dfb84d SHA1 b1e2f12c0b204bf2c6434303c0638750dcb1b73d SHA256 19d230805cb5d62a99fef32dfc373661dcc3361bf8d1f6077854120a5e9a9821
 AUX xulrunner-1.9.2-gtk+-2.21.patch 679 RMD160 060d514faa98768312d047985c81934342935745 SHA1 d672469ce9f8271a4788639a7fa36c7d606ef442 SHA256 25432a427c70fcaf929e45312ff9e4a617d709d59efa89932a77b42c3f7b0230
-DIST enigmail-1.2.tar.gz 1326482 RMD160 868c73aa28566895d4b6c6b9cbf4602d75df0a73 SHA1 05fb80a99544f95bfa2531e6cd5cac8cf1e78780 SHA256 e5e51685d09eb5a87bd21f80b4b64eeb8d75d6424b21cfeaea7b9c16723c9cc4
-DIST enigmail-1.2a1-20110316.tar.bz2 905604 RMD160 57bb867f70f6b37ee11d426a8e155f2ccf5d56d2 SHA1 371e3c8bd7157ed8aee7648a271df591db75f8c2 SHA256 113db06ab1621328635c5394174afe02bef9c154c46b62ea7c605ac0a0b2beba
+DIST enigmail-1.3.tar.gz 1379908 RMD160 bb925bea4eb6b782ac7ce3c36e14fa7da6b0859d SHA1 cee3ce90d1ec38021212c23a8af7feb7c7a9093f SHA256 4345722ef178d177ccdd1cbaf32497357d63e9cf0d4d11e5a579edd2f208307e
 DIST thunderbird-3.1-patches-1.2.tar.bz2 3427 RMD160 354d9003e8132e0aaf7069aec84459ff28237f61 SHA1 36ad5f9af77eaacc02c7df744b5d2563fb54bed8 SHA256 6586cf569b035bd1b9179036678a0cbedbf3def88ca7d69852451542b52693a0
 DIST thunderbird-3.1.10-af.xpi 210557 RMD160 6a0f2dc1241cae8e25f79de456b63fe659072b3f SHA1 398f1dde23d8a8b9870c033ff636738539c115b0 SHA256 e5ceb7e160596e632df8c43c58706158e0440896b517178b0c3506990443b08d
 DIST thunderbird-3.1.10-ar.xpi 230315 RMD160 2d5e9e197efa21e89a91e51c7e93823758387fcd SHA1 bbfbef4860149027756da262d4596d39d5872a7e SHA256 a7d0ca5a275ee934d96943c22de55b0885c49cd0a25e57508b3fad8e2b500338
@@ -115,68 +112,46 @@ DIST thunderbird-3.1.11-uk.xpi 244808 RMD160 2172220c5ae67fd9cebc8267dd2dd0c1a5b
 DIST thunderbird-3.1.11-zh-CN.xpi 219649 RMD160 33d1f1c34aaeb52b110c54f136066bb9fddc4944 SHA1 84987ffbcb2103f6f366c173f9fe664c8ffd178b SHA256 c8c3b092a4a999bb30d47797f9c0850634282ad561a233132f28ced48a0be01f
 DIST thunderbird-3.1.11-zh-TW.xpi 220607 RMD160 9d5e191913300c6919a951deeaea2959b07cca55 SHA1 8acc959dc88247bffd83f5eb868b1f78e747ccdc SHA256 5719a75ab55111a2adfff2c982aa7fba6dae91e0977479060f2bf259c2de9024
 DIST thunderbird-3.1.11.source.tar.bz2 68716700 RMD160 d37f4b4c015df7ed24adc252ab99d10196e1799e SHA1 9d67fab73fee9ab815d69d419e89d410cb1558b8 SHA256 3e78284661b1be1d35753550b7a183d583d7ee68c8bac683283d3931f90fdd1a
-DIST thunderbird-3.3-patches-0.2.tar.bz2 4404 RMD160 2bc1a86867f01cb5bf8f29b4e3d65bf662279bf7 SHA1 11f37a4b53bc59e767768d793f126129e8666abf SHA256 3ddd4a086f19b4871160fe72dc920eaed8ef6ed872ac22f8d6759e84a8e4d1f8
-DIST thunderbird-3.3a3.source.tar.bz2 83692340 RMD160 79ec91e73d6f1e64f16efae9c6ec333a2e54b220 SHA1 416c085e92a04c12c49b7f1ad41effb7ef24ece9 SHA256 7f5487449023a68784d800fdd38c25d30356972b27b0a23c2ba162c149161618
-DIST thunderbird-5.0-ar.xpi 426291 RMD160 c0779e7112724d9b9856a30b3e35922e324d381b SHA1 674032a3a1d71966bc0e044fa353b1b62bcdcaf2 SHA256 bb3f5afa529bb9ad91004d57c2e4ae77266c4fceaac3af13e69b25756c926eec
-DIST thunderbird-5.0-bg.xpi 444151 RMD160 589e3f4bd7dbab3cd4aed9f2d266845b9ce9fccb SHA1 030777724120d5b6ea56ad0d670dcf334e5a4a99 SHA256 c19da2505f426dc8d2190db5b6dc3723e92b7f44a48ff03a3b7942b5668a27a7
-DIST thunderbird-5.0-ca.xpi 407700 RMD160 6d29c73cfa913e800e9e73035c9f345615478b19 SHA1 862bcfd6385d8675de8267d03515e3d3675707f6 SHA256 0e1aedbe17a62ae8b6588ef76aeee7468743835857b13b6fa11dc96ca23ca4aa
-DIST thunderbird-5.0-cs.xpi 407837 RMD160 645361880e1bb9af60e471786c94047c0266badd SHA1 ef663667dab46368cfea47a39afdb14fa7dd14c9 SHA256 af1c3be0944244dff7f35c7d335b2e28385d83e0ea572c4a43e4dfb3cc4d692c
-DIST thunderbird-5.0-da.xpi 350465 RMD160 e752b14631acec5e27d7901ce68eca15504a5d30 SHA1 49a34444acac863076ffc0f66fa9e5070d76f8eb SHA256 92514d7df29168123279a0b486264d25fdac8ea984d9ea53c1158e0f850fc304
-DIST thunderbird-5.0-de.xpi 406252 RMD160 84ec5918dad8ef96cf0ae846c79f2a627deb9e6e SHA1 dd4850c9d09c3ec015da1dd153683e3336bea10b SHA256 fcd373a837dcb615b64635d1d2583d55ca5fe36e5dd32f11cdf1c6e50dc656c0
-DIST thunderbird-5.0-en-GB.xpi 381468 RMD160 7411ad0e627fd347b404458fce0223015fd422a6 SHA1 4790c0f84adf1e4fa1942971a30e2c9dde6962c2 SHA256 f7dbb262115a52d4cb6fe2e7119861241b285d08fbdc2a481bc2648bf9bca591
-DIST thunderbird-5.0-es-AR.xpi 399330 RMD160 d7856e343b84f2856e267399a6ad4359bccfc311 SHA1 8b8b548540ae2ded2cf4e32d8c7da2157706c440 SHA256 4249e4dd9e39bcfb1d08ce2ebd042fd4ee332b949dadc5b706026130c178523b
-DIST thunderbird-5.0-es-ES.xpi 343865 RMD160 faa6f22aba8d1e4c24cb124520b3c25ea50744cd SHA1 95a12a571d40fa28a06e0ab2dcb93d76b58e0723 SHA256 a952b2c5f098a9685b22b72176575c8d8ba70c8415a24fab2b0a7414242690be
-DIST thunderbird-5.0-et.xpi 399580 RMD160 f8878baa68859157a56d4d0537d18ce740463b95 SHA1 f87cd0d592171c341605c15c2ef15d081b79b132 SHA256 2dcb8d5086963964889b07d268baa681abc7744fef01219bc8f35db5184822e9
-DIST thunderbird-5.0-eu.xpi 395631 RMD160 da4bcb87d044915642d1c29edabc5a54d65dc3a2 SHA1 c52c78730e5ae5d510cfafa5714f57a96c6876fe SHA256 7c940255e7e5dae14fdd725a9a722f13d5aa38eee98ab0f0ff2cca96db98b7cd
-DIST thunderbird-5.0-fi.xpi 400828 RMD160 3308436eccb62f27e7e52d5647f07c9f4699deac SHA1 f4c48f0b4034b31af0e2905faabff5993d082292 SHA256 ff2a8aae8c48be298d3fdd7b0dc5621eff9af2c43a4a9e42c961fb8ecd9c3db7
-DIST thunderbird-5.0-fr.xpi 403253 RMD160 32f3f2daaac779ee1085a86f25af818de6dd564a SHA1 7a61ed0c30cf6eca5b3c7428f098f6be0374d724 SHA256 49f54a41e64d53cf78b6576e89341672f16e629e25b3ffe689a71431fc796768
-DIST thunderbird-5.0-fy-NL.xpi 403075 RMD160 c7b0e524f3dff06fbce58fe82bf3ab6dfeca8e11 SHA1 173a97320a5e50321bc7ab6a46f208e535deb4bd SHA256 8f0e32f4bcd7b097d746f7ed376e3ff01a28d2f2e8e02be1a3015853888f7fb0
-DIST thunderbird-5.0-ga-IE.xpi 411750 RMD160 a9e85d7281dc9acc2e27739d4b2022c732c96683 SHA1 2c30f2bbf3e2b474ffd9dd3e5e4b11cf300fbd2b SHA256 a69b3a0818b5ab7a6c27298884cb415dec7dc3f96ad4a8b78ef8d6a3d851d2d7
-DIST thunderbird-5.0-he.xpi 415116 RMD160 e4390c683757294695c120d3ff2512b8e5fb6313 SHA1 0bc6ff79cab559a0d564e5ab69913b94fe91eadf SHA256 3f49799adfe9e65d39639402a7a9ce6f8bcf036fbe25aa4aadd483007172f864
-DIST thunderbird-5.0-hu.xpi 415270 RMD160 70f2e0319fb6e62a1d2e4b00671eeb12bb4ee4bf SHA1 79774610fb0b02d71f188cb510ab1ca457371346 SHA256 8ea419595e4ef5034296485290cf89dc6091361b8f785be8e137ac37e934ed7e
-DIST thunderbird-5.0-is.xpi 401557 RMD160 a4accb009915e956b63902f04d41904d23ff12a0 SHA1 756fdf60837c805c98365ca95e604ff33b3847d5 SHA256 8cdf6ddaa75c09ed31e57031f242eb56f0bb87dfc3965f019642a0b035664a44
-DIST thunderbird-5.0-it.xpi 337738 RMD160 2252a4df0b67e46eb190601473776de4073e1970 SHA1 12871a5109d34f1e96d5b025ba18f992f1237930 SHA256 d995d24b281c79f36026d302ceb73638d156c619c8a29f7eeaa09c05a6edf89d
-DIST thunderbird-5.0-ja.xpi 446749 RMD160 629167eb0f700903d3f297c1f3093e9332039577 SHA1 4d1ba7fdcfa39a8f288d6514712153aedcfdf09c SHA256 a582214664357c360e2c8aaae8dab7fdd735e9827c8e3f9190542ca85fd89a04
-DIST thunderbird-5.0-ko.xpi 358753 RMD160 cac786f0b0308bc6e1fb4674c3fedd38077ff84e SHA1 3440b89e3602989964222b774228f5a2b32e0ad8 SHA256 cc629295d61ea7c9f7103a0ddd096af438bd0ef049a6d6d3aef28c1c4104f0b6
-DIST thunderbird-5.0-lt.xpi 523993 RMD160 f916af95f6bcda6831022979fd166b5545b8f7a5 SHA1 88e9245a7069b33f9349b75acd8f95b50ed35f05 SHA256 bb3e3dde6f71b303cc6a26fc92db9f724c186ab16932cf1532d740decd62a168
-DIST thunderbird-5.0-nb-NO.xpi 396958 RMD160 0e5e81b785d794766473d0ebfd46358804cd6ae6 SHA1 c8e12c9a142c37309dd72ec251512c8316981264 SHA256 222f84d8e0b791e2b66e76ada384efca190a0cf4c1262d9cb203b506969ae769
-DIST thunderbird-5.0-nl.xpi 397102 RMD160 ac339806a0b17afc2d29e10b6fa93d9bbef6a167 SHA1 cddc5cf321702dabe772819f40367f5767239b93 SHA256 b4fd06c5ea15d7ad769f380ce25cd8e2b867f88d49761bc23e1f8e9150a9afa9
-DIST thunderbird-5.0-nn-NO.xpi 398579 RMD160 ad203f997702bc99d6042f03f47a317e8392a7b3 SHA1 c886d26aaea8eaa3e8f6e0651e1306a489d97447 SHA256 2a8c106becb4d730cd9dc10588ec87fbbb85f55b15575b98a592ae1c63e9eb95
-DIST thunderbird-5.0-pa-IN.xpi 434024 RMD160 91fdb4004629a641627378a67aeac1fcb6c8f625 SHA1 338cac17fc4e2eac6702e8f0820c4b00bbb54b5b SHA256 9f8214b81a7e850cfb1dc977072638578f8fd1cf65b1f6b9235258b86d353c2f
 DIST thunderbird-5.0-patches-0.1.tar.bz2 2660 RMD160 6a09ee90ace5c19a99f1dcd8041adc62b7003976 SHA1 a52d2bc593bf5f905cb61a3279fe61aee2a14247 SHA256 89ac374408b4c8350cf09af5ce844ea1173546187018f588992a8ee48f339e36
-DIST thunderbird-5.0-pl.xpi 383672 RMD160 4ee68efd32824c052346f56967d4b1d333823c93 SHA1 fede26c4fa46920615872c9b7094c0a2d8e33df6 SHA256 54586577f86b4d2c39c909c90e80075e9ff521227bd5c4dc5b947ed84d0152da
-DIST thunderbird-5.0-pt-BR.xpi 406009 RMD160 69174d906461595898fb79734bfb18b142d8fe93 SHA1 ab2ff07c7f5026a112a7187e1cd7080b691761d5 SHA256 c3a827b736e999b24098b6bfa37e4442ae835d66d567bba9b50634aff40ec3f7
-DIST thunderbird-5.0-pt-PT.xpi 402739 RMD160 6ef923998175835694d70aaa37e8807c66b2aaf3 SHA1 ac25afabf69601ffa2b38a2e59bc071089b5811f SHA256 76ee0e9bccf2a225b7ead1259ad82ece574d4db64d383bbf540733c202865f0e
-DIST thunderbird-5.0-ru.xpi 398261 RMD160 0811ff16e6b6986f057559eda125d92df7b3ac3a SHA1 2d2ad0081aaad62835f731e067ade20456e35ad7 SHA256 561e74bae50a7c8a7e436bf70a3188d0e35f8890387d0091178de6c362a3054b
-DIST thunderbird-5.0-si.xpi 443551 RMD160 104c52901d2d5d8a621b826ebc7a81e04632dcfe SHA1 573acc6e2380c29c2d7edefb5e3311a58b467ed3 SHA256 36b97239a8b87c0bb5f3ef50ea51ea485f0a9976fb9cd1dbc0cf09c8382375ef
-DIST thunderbird-5.0-sk.xpi 413255 RMD160 39e5ce9743a6b7435404d0b264438deeba1a1829 SHA1 2383a27132cbcd794e3f5d1fc525a35167e63c45 SHA256 f8d0f45a365df808d2dc9e7d14037440a9883cef4eadb98bfc5048eb089090ed
-DIST thunderbird-5.0-sl.xpi 399391 RMD160 9c55451443197b93a2fb7567a0d860c2c6d52759 SHA1 1839336a79e1bd6a7194c5309ad0848c36f4e247 SHA256 bed8303d78a69d19f403e881e85756945b06e542a53e2371c7667cd2f5784576
-DIST thunderbird-5.0-sq.xpi 347151 RMD160 e52d3f75d6c3f4b711f887b49238c2cadaf6dfb4 SHA1 181b2b628ee7993e64a9bd537b36a34741c553b5 SHA256 de288e144e65f46d7b6954e828b434cf2fef10444cdc3bdfd09ff015d68a350b
-DIST thunderbird-5.0-sv-SE.xpi 467630 RMD160 445fbc983e4240740a4a63c56160877a3a996b4c SHA1 3dd02c3ab4fc8542c90010fe8b9848fc5b418365 SHA256 0e388da663b96521c0f5b1b7942bbbe65073a82cbf4e3e9852baa081decc3f37
-DIST thunderbird-5.0-tr.xpi 402358 RMD160 37b6026429036bd94bb31363ef19b65fe8493ed1 SHA1 380ae73adf6cf8aef0f6f5dbb64310a5cb1f9578 SHA256 0f202abbd2758dc8b995f69be7f3c355ffb8fbf42b54382759930274a9917d36
-DIST thunderbird-5.0-uk.xpi 451686 RMD160 b49ed3cc5e99e6d378a20dac682c1c8184daf036 SHA1 bb1be4bc25f8acb12d9ea80f843d0e1352040f08 SHA256 63af2eed2f83137928019105f737f3512a1cd0d150f4ff47f903644d08455d3a
-DIST thunderbird-5.0-zh-TW.xpi 419985 RMD160 8f9c23c8090f359a83c9be2561a212ab2e93fc2e SHA1 465033f206f921adbab8527e9047cc0c3db91a94 SHA256 48d0ec4797b8ee021e947828d872e682ec56234fba8de6cba5d16ff8cdd7bbc2
-DIST thunderbird-5.0.source.tar.bz2 86637589 RMD160 68e83071e8ba00a20f056d64be9c861dcb8e60ea SHA1 392c3e0ef70b62c29a543f88b2b8d5a51bfe69a7 SHA256 bb1858dc44e1e9f92b44a1eaf9456190d55b485cf65435266848300ac2b7c5de
+DIST thunderbird-6.0-ar.xpi 427494 RMD160 4532e9315bc6fe5793b80314b235f016035a4c2b SHA1 c8104bdcc654388ea744cf1d17a5e3df374d6936 SHA256 3a451c2f0d127a9d27b8a350b08e4e081ad355465f11340d20cc0e451e8b8a89
+DIST thunderbird-6.0-ca.xpi 408682 RMD160 a752d1fbf7129ab61babbca8a251c14e8b6b52d1 SHA1 0845c857e5d78a278eb19ef923bfe303f669c1f8 SHA256 9fc006759723c597b6263ba57b84cf295008ebb84bf77c11c16bb585bd2f1b2e
+DIST thunderbird-6.0-cs.xpi 409069 RMD160 e0257d9638ccaeed152242d24b7e777a0a4ce8c2 SHA1 a96ab64f254d0ee83688312be451236c35dc79a6 SHA256 8251b8f6968ff6c4a085fbc49ad771ec560f6c380477da70d7a05e9076149d1f
+DIST thunderbird-6.0-da.xpi 351543 RMD160 f114e5206e585422b8f901fc67faafad245ad08b SHA1 d0b052f76a7de05bca3c038a3ee884d39f7a487b SHA256 c5146a29b714fb9ce0f6b1ee026c17875219b2e65aec3142764f0ee0c36e2bc6
+DIST thunderbird-6.0-de.xpi 407453 RMD160 e8bc6bb0e952db8668b2eff81b6e5e32fdcf8637 SHA1 6467cb81334a88a8e8c71b6d52dc1fe64c446843 SHA256 4e37fdc9e08acdd8c89e896db7d1bcfb0adcd50d95e96723beda486c26c6f6ca
+DIST thunderbird-6.0-en-GB.xpi 382371 RMD160 9ad2eded77c080e18fee100f1ef4b98be367dd1b SHA1 c1bf054b086dfcb6d241bb617579db64eb4edd91 SHA256 0caf4a881992c2d96a37398bc0be126133a2f0a297b9955293bc362885c23889
+DIST thunderbird-6.0-es-AR.xpi 400278 RMD160 70e8372159f140bec712792bc097d0956085ed14 SHA1 936d8671058548fca4bcee3db40dcd6c84a8d8fa SHA256 9042e7533f8d3e86f586907581c2d22710848fe46c26cccfa667a4f2963d35e6
+DIST thunderbird-6.0-es-ES.xpi 344500 RMD160 c6d5c990010f559d8ca2f15ea1520d834a70b3bf SHA1 90671a883dc3b058133a94dae9f46c8c0fcb61df SHA256 97fa112a00644fd8b0ae94fc4638501855876e8270aa14ee739191935d3fa801
+DIST thunderbird-6.0-et.xpi 400758 RMD160 d13b265330f9c2df8ce05ea31920674b48398df7 SHA1 8fbe3aad1c9625dee166d4f8864ca18bb27e236b SHA256 cb2aa30dbd8e3df24ab43bedc7689d12cf529fd44448b93e2080bb13d7b68edd
+DIST thunderbird-6.0-eu.xpi 396653 RMD160 f313f0ba8ca1d57e71f1133edc5c4832fa1c0e4a SHA1 a8aa903da2d09debf7666ea09285883e1b6924ef SHA256 648eb6a6e6260be9de9ab0a4cbd23d40f3c7ff965039c5d332acf1b0a7924ac8
+DIST thunderbird-6.0-fi.xpi 401789 RMD160 6c6dac856190d5441b079853cc0c40d689f135f4 SHA1 8f5e40e671a9cefde16a56db10a63ad92662c7c1 SHA256 86a4fde30c122031b7806107069d9fef605a2f590fc66efb7b456de11af7e42e
+DIST thunderbird-6.0-fr.xpi 404210 RMD160 dd91f9af4c1dd8abdf07d3a4c209c0caa363f85c SHA1 9455f7636970cf730d17e0859dd21c2cbc81797d SHA256 d357085563e0edd71241a09ad3d7c63c0737ae3e70cf07692884ae176a648378
+DIST thunderbird-6.0-fy-NL.xpi 404129 RMD160 d6d8e19e194cff2e768b0ca38742d364577e5d22 SHA1 ebadc1b566eab17fe22337abc2e5fc7e5494de26 SHA256 d9cab2a49a76da9d421b6969c6f3abf565bd37340c0a69a396a8f6e515db1837
+DIST thunderbird-6.0-ga-IE.xpi 412669 RMD160 cfd5bee0afe85faf5bf372fd05ab2e02443dad70 SHA1 bb81d7c5dd14ab8a5457c23bdb9b16ca0f27e173 SHA256 9e2d5dd92cf1dec950f791e2dfb396da860ca5e666d31b972e6e02613f2c279b
+DIST thunderbird-6.0-he.xpi 415986 RMD160 4dfe258f23e9afbebd8083730a3e0394167375e2 SHA1 1f6d423ef3fad4a2a6ca96b56f5ccf1662bfcc96 SHA256 f330351e4f2810da09d08a8332529337484b04512c87e69b70ea815636e423ed
+DIST thunderbird-6.0-hu.xpi 416271 RMD160 85329b820e94f42a0ebb65f606cf20736413e787 SHA1 97b1dfbf3d14a3841df20649f89a9a3d5d767e54 SHA256 6e5aec41df3d9fcbb7671d5ed0264be96d8a3f3c5d3a18f2cc4db0059fc1d742
+DIST thunderbird-6.0-is.xpi 402535 RMD160 2da7bed1da4d92ec2c24154c9a708b16eca30bf3 SHA1 bbe5ea4b784964049838c3b0d29551559e501263 SHA256 05afdf13888edef7fa6e95ac5b088e6828b1ca7d196cced5f13f79090dbd49f5
+DIST thunderbird-6.0-it.xpi 336843 RMD160 3ded50e7419ee492f4a7dcdb7ebddc7e17b8514c SHA1 ef1a21292fb570fab3df0dc308ff991508fe7e51 SHA256 e301f259468f0d2f42813fade0942be0d8968db71aaecf89de59be8ec06d6431
+DIST thunderbird-6.0-ja.xpi 448030 RMD160 7c8a225e77aa0b21ec64638499652cea316941d6 SHA1 34df3a16b883e5e1d465bfe4a8ea22e2cc93d638 SHA256 1c44d010f91bc71584f4b1551cc6f042f2f54eb23627b733747f346594017330
+DIST thunderbird-6.0-ko.xpi 359873 RMD160 4be7414100791cf9f76de1c8f6c55c21818acf8c SHA1 1333c2e36c027d84e2acc4b807717a372bb55403 SHA256 1cfecb7fa95016d4063df2fb79c4ba6e25b500074a4535b9fd258804101bf8d7
+DIST thunderbird-6.0-lt.xpi 525096 RMD160 9bd23db121f42f69319dca5c90ad00114cfef3dc SHA1 c0dd370e5e250631f8ce64acec14f1a7d4c32eab SHA256 be7c7e1b88a30b7108c1d3852f22442060d5a358279fe3fa74051f94cb5850e6
+DIST thunderbird-6.0-nb-NO.xpi 397892 RMD160 451d86b0a5b4d6dbb4806261dca43e40411a1f2e SHA1 bdd67167d2a0e250d26e019f47ee34e606b5a246 SHA256 9d0330d71dcab318d34caa04757ee53baadaf33ab84a2485028e2d7df276d31e
+DIST thunderbird-6.0-nl.xpi 398169 RMD160 96af11810446ad668863834ad1afb186737bb00e SHA1 a2ba0ef0c6cdf29059283cd7faa59af78ca2fb1d SHA256 f8de141b8eac6c098265c5835cb3477ebb82ce8c98f45bd0df2a13f16d9294c5
+DIST thunderbird-6.0-nn-NO.xpi 399482 RMD160 476753b8f96a6405fd4190407c49e7dfadced064 SHA1 16b7266d60eb25c51aab2ab34dc1ae45fa5c61ed SHA256 45644c01a20167fea279a9a44f94a37d6e69208ff4adf9fda7ed3007a1aae314
+DIST thunderbird-6.0-pl.xpi 384740 RMD160 3ba3f5e32b6c02746ff3c0215647616ffc7ec75e SHA1 e555588ddaba5c3c36b814b029088c95ab0dac66 SHA256 abffe09ca4f72c19d17e6dcbd1d9c2b64bf77170e1c54153a45b2dadb7159250
+DIST thunderbird-6.0-pt-BR.xpi 406991 RMD160 6ac65ea049545b492911fb05067fc81086298c18 SHA1 dbf86f56f3a39f333ef56b2ae5d7e77da503fb90 SHA256 3fa4331317435d3cb4376f79dcef4c0af4c820221ac03a456111ce92db17b9c8
+DIST thunderbird-6.0-pt-PT.xpi 403984 RMD160 e7498d36330ee4f9b426c169269ffaf703070de1 SHA1 b12c245b4100358c6f5cfcc5796e450038a222a9 SHA256 60d724aed7550840d7dfcc7de405117b704f7fdfbec8a34f2ff7999b8569a039
+DIST thunderbird-6.0-ru.xpi 398962 RMD160 2b1b01d1b60347b0cc66543c54ec806d1aff49de SHA1 73be3f0b48111aa6f188fbfffe4351a5cf970fc8 SHA256 b0fc8d5d7ff89f1ccc9d662da7e9a3120900e50003a2281f056abfce3708903e
+DIST thunderbird-6.0-si.xpi 446393 RMD160 de92990ba0117bbc5dbec09595047b1ecc4b2c94 SHA1 489d90f5495757cb22223c94b64333287bc696c3 SHA256 f9618dcd779b0a6d3f33d77777e400acf547237ae14269150764df259fb9045a
+DIST thunderbird-6.0-sk.xpi 414265 RMD160 1d3a5c567ae1c047697af0940d1e37306260a580 SHA1 48d05fff22c1864adae2e5f7d5e613511ef6bb1a SHA256 1f18758211c456335ee335b135c4ad06a20ed734d2abe6541caac589395337ad
+DIST thunderbird-6.0-sl.xpi 400275 RMD160 3eb120d378d87c4f597fd01265a653986434627b SHA1 3ace222f610930541a864e575960a983fa820ee6 SHA256 4fc68f3a7f5b15c4e3314c81ad2945be0881d32da94aa9b118c4911031353ed1
+DIST thunderbird-6.0-sq.xpi 348955 RMD160 e329886e3e9778125da4dd6f7d3b0c32f7d189c1 SHA1 6294e733d7eed976d7e1439a29f249d2eb10244e SHA256 e7ef33b2802aa983e3985f6162490f7be6a0ca32d82d2540ea71cbc80102d0b0
+DIST thunderbird-6.0-sv-SE.xpi 468587 RMD160 63139d49daa44d05036f7bcb657beab5c3d6051e SHA1 7c94cda659c110027af6e8e37653d7c54f15c01e SHA256 6d5b5c1a48c6a2d5918f534800777ddf5e61b5b81374ccc3bb2cc09fc75a2c52
+DIST thunderbird-6.0-tr.xpi 403273 RMD160 0a1bbbae82a0378016d0dd6185d604b5b608da15 SHA1 5d44b1a3e50015e5a92f672aac6882025b61af99 SHA256 595b22151201dc4b9d08a0321530c1f1f2494d5b6edb5527cd56648b245f1493
+DIST thunderbird-6.0-uk.xpi 452775 RMD160 f1915e4ae3fa8f667540dde3d31c3e36749c0b57 SHA1 54e21c3baff6bf833d18df047cc849d2b9258c65 SHA256 a7030f7f6aa9d52b4a39c344ef1d5aeae9114dca9590e2eabf24b3c2849601ec
+DIST thunderbird-6.0-zh-TW.xpi 420983 RMD160 739aaf7ce018f0bcf938436d324ab75f4559869e SHA1 462357caafdcd7dcea824d3d2958e545a9101422 SHA256 5c07cc4f35a827e9b533888cdfb482b44f8cebd2a079b5b370ce656e8ecc8de0
+DIST thunderbird-6.0.source.tar.bz2 86286245 RMD160 758a274ec2b12aba52574922cd9526fd3596a505 SHA1 7a9ea62aa11522230327574b245a2f793015b5f4 SHA256 3c56af448ebd4805c7997d8e0e41f4333d110ad2c4ad4873204bd4d68bbd8189
 EBUILD thunderbird-3.1.10.ebuild 8099 RMD160 9e2ec0d45a430372381aa16c73310f71828de468 SHA1 ad55471c15be6a3654547885ef52451b75b1ec4f SHA256 ea88b5e990a738390f05e098868dada49b8d77d120f27320b0f403770121d039
 EBUILD thunderbird-3.1.11.ebuild 8110 RMD160 9169e25659f945d5bd85f00e04e868a0a2492b80 SHA1 8b007af3541a8f566e5b4d58632adfee1ba380ca SHA256 b1f28e28a42c70b0516d928b8bbe43bb67547639abb898199532ff037386442b
-EBUILD thunderbird-3.3_alpha3-r2.ebuild 7818 RMD160 69614bda19a08d9853ae7721f4bfcd0ec424d69c SHA1 33029d1c1d68cd1e98b2bf773d43b684da50acf3 SHA256 c8a0db8840fc6a65195e2a70facf85d6fb4de725320329e6f74aeea982fd2df4
-EBUILD thunderbird-5.0.ebuild 8365 RMD160 34d3a7741acfeeda6d7f513c9d0cec582d943fac SHA1 6dd42d3b14d8e0063adcd09d05db3ebafddd339e SHA256 02c2da05829faa03f55083ace02ae82c60034b9fdd6434de6e544b8955629707
-MISC ChangeLog 63869 RMD160 a90e473998ef5376bb3f6c54d4585e86faba8e71 SHA1 8876003b6b98986a2813c875ef91b18f56a83fcf SHA256 2f781ea06dcae286cd3bce7b982119e5bc3fb61ddd6871774601cbd56eaf1276
+EBUILD thunderbird-6.0.ebuild 8421 RMD160 e2657c4ae3b89cd72d256f2fb351cdccd1b1df4a SHA1 5d865aa00a7665872137431962e037d2524d03a7 SHA256 822fb79a9746ef91645c9825d1059694299fdb9a9d3ba8153a71edf93b028839
+MISC ChangeLog 64114 RMD160 e4e92e08e7d48b0b71b911ff64fd46acdfd5be6f SHA1 565d30019ac0984e1dce004ed6880c6a28cde45e SHA256 77173c3f4ef118feeceac3633ee57e30dd2008efb7d99aca6fe8f9955d4e7ec3
 MISC metadata.xml 732 RMD160 87468b1b9c1c1ec539c026f04e05265a4dc32cdd SHA1 283661cc3d68f2f7c2a3b82455692f7239bed63b SHA256 3b0e7f6f49598b82aaeee92a5f96f99877713866fbbb73c797bfa65f2c0b4d75
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJOOp3wAAoJEPiazRVxLXTF0+QQAM+lqhs1W7q4A00bq257iCrG
-7toDG0PBtFvxBbHWvt2/+Owg43mE2fCoQnM0xICctyT7ekkSJ0dYhruynOlq0jlz
-6+EE+b5ismrmY0W90k3yMR8hcMcteIjPvilCewEYTPrqztRNniDleMUWIIceAw8p
-2d3ocNZ91O+O6sBfbH+Y03fkUid07mLIvkYWi2ujce/qUQeNTMA4Myq0NX58W9wW
-vR+ViABvZiWMn3d55Mv+Oxqv1RAIOiEBO4lnQ7DYHLzG1qdpBBukCfVIp/g5PGfV
-ZOngO3sgFiydF7XpIfmy/9voM7SGJONknOELL0eG8m+cLkVk/IpYDIogtVJx5/Ej
-vNdoaOyvRe3gJ6sZKuQlouviRUiKa19aGAw/EqKSCX8fBDfm1HE23xM0cnhd4Og6
-qAUkhLXhLCfBswuBgOzfWR5jiYrkExyi28kx+KNJU1zwuyG6jzlHIFrxDKMYG05o
-7d+geEWSVT2nsjvihyQghFxCrrgZesGsF6sjrxMOIB1znRn43X9p08CYY/5boEhr
-DWZSn6fy6sDwqZ5ALBdyA67ipue1Mfx4+esAhOvRoQ01GILV19kEND6vie8yQslB
-YVbAKh59O7ckG0koXDT6zV/izC541zEq2/tts7ac6NcQr89BOBGrizzQQi7WGAoC
-CO3L6KuLW1TBrm9h7ONK
-=D2WK
------END PGP SIGNATURE-----
diff --git a/mail-client/thunderbird/files/fix-thunderbird-calender-support.patch b/mail-client/thunderbird/files/fix-thunderbird-calender-support.patch
new file mode 100644
index 000000000000..8e6e85a1c0e3
--- /dev/null
+++ b/mail-client/thunderbird/files/fix-thunderbird-calender-support.patch
@@ -0,0 +1,33 @@
+--- a/calendar/lightning/install.rdf	2011-08-20 08:32:23.000000000 -0500
++++ b/calendar/lightning/install.rdf	2011-08-20 08:32:36.000000000 -0500
+@@ -12,7 +12,7 @@
+         <!-- thunderbird -->
+         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+         <em:minVersion>5.0b1</em:minVersion>
+-        <em:maxVersion>5.*</em:maxVersion>
++        <em:maxVersion>6.*</em:maxVersion>
+       </Description>
+     </em:targetApplication>
+ 
+--- a/calendar/providers/gdata/install.rdf	2011-08-20 08:32:58.000000000 -0500
++++ b/calendar/providers/gdata/install.rdf	2011-08-20 08:33:12.000000000 -0500
+@@ -59,7 +59,7 @@
+         <!-- Thunderbird -->
+         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+         <em:minVersion>5.0b1</em:minVersion>
+-        <em:maxVersion>5.*</em:maxVersion>
++        <em:maxVersion>6.*</em:maxVersion>
+       </Description>
+     </em:targetApplication>
+     <em:targetApplication>
+--- a/calendar/timezones/install.rdf	2011-08-20 08:33:26.000000000 -0500
++++ b/calendar/timezones/install.rdf	2011-08-20 08:33:45.000000000 -0500
+@@ -59,7 +59,7 @@
+         <!-- Thunderbird -->
+         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+         <em:minVersion>2.0</em:minVersion>
+-        <em:maxVersion>5.*</em:maxVersion>
++        <em:maxVersion>6.*</em:maxVersion>
+       </Description>
+     </em:targetApplication>
+     <em:targetApplication>
diff --git a/mail-client/thunderbird/thunderbird-3.3_alpha3-r2.ebuild b/mail-client/thunderbird/thunderbird-3.3_alpha3-r2.ebuild
deleted file mode 100644
index f279579f5dc5..000000000000
--- a/mail-client/thunderbird/thunderbird-3.3_alpha3-r2.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.3_alpha3-r2.ebuild,v 1.1 2011/05/16 02:23:33 anarchy Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools pax-utils python
-
-# This list can be updated using get_langs.sh from the mozilla overlay
-#LANGS="af ar be bg bn-BD ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr \
-#fy-NL ga-IE he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru si \
-#sk sl sq sv-SE tr uk zh-CN zh-TW"
-#NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
-
-MY_PV="${PV/_alpha/a}"
-MY_P="${P/_alpha/a}"
-EMVER="1.2a1"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="bindist gconf +crashreporter +crypt +ipc +lightning mozdom"
-PATCH="${PN}-3.3-patches-0.2"
-
-REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases"
-SRC_URI="${REL_URI}/${MY_PV}/source/${MY_P}.source.tar.bz2
-	crypt? ( http://dev.gentoo.org/~anarchy/mozilla/firefox/enigmail-${EMVER}-20110316.tar.bz2 )
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
-
-#for X in ${LANGS} ; do
-#	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
-#		SRC_URI="${SRC_URI}
-#			linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
-#	fi
-#	IUSE="${IUSE} linguas_${X/-/_}"
-#	# english is handled internally
-#	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
-#		if [ "${X}" != "en-US" ]; then
-#			SRC_URI="${SRC_URI}
-#				linguas_${X%%-*}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
-#		fi
-#		IUSE="${IUSE} linguas_${X%%-*}"
-#	fi
-#done
-
-RDEPEND=">=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.9
-	>=dev-libs/nspr-4.8.7
-	gconf? ( >=gnome-base/gconf-1.2.1:2 )
-	media-libs/libpng[apng]
-	!x11-plugins/lightning
-	!x11-plugins/enigmail
-	crypt?  ( || (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk]
-				app-crypt/pinentry[qt4]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	) )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/comm-central
-
-#linguas() {
-#	local LANG SLANG
-#	for LANG in ${LINGUAS}; do
-#		if has ${LANG} en en_US; then
-#			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
-#			continue
-#		elif has ${LANG} ${LANGS//-/_}; then
-#			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
-#			continue
-#		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
-#			for X in ${LANGS}; do
-#				if [[ "${X}" == "${LANG}-"* ]] && \
-#					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
-#					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
-#					continue 2
-#				fi
-#			done
-#		fi
-#		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
-#	done
-#}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	if ! use bindist; then
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-#	linguas
-#	for X in ${linguas}; do
-#		# FIXME: Add support for unpacking xpis to portage
-#		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
-#	done
-#	if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
-#		einfo "Selected language packs (first will be default): ${linguas}"
-#	fi
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	if use crypt ; then
-		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
-		cd "${S}"/mailnews/extensions/enigmail || die
-		epatch "${FILESDIR}"/enigmail-1.1.2-20110124-locale-fixup.diff
-		./makemake -r 2&> /dev/null
-		sed -i -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' Makefile.in
-		cd "${S}"
-	fi
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	eautoreconf
-
-	cd mozilla
-	eautoreconf
-	cd js/src
-	eautoreconf
-}
-
-src_configure() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS="default"
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	if use crypt ; then
-		# omni.jar breaks enigmail
-		mozconfig_annotate '' --enable-chrome-format=jar
-	fi
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}"
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-	mozconfig_annotate '' --with-system-png
-
-	# Use enable features
-	mozconfig_use_enable lightning calendar
-	mozconfig_use_enable gconf
-
-	# Bug #72667
-	if use mozdom; then
-		MEXTENSIONS="${MEXTENSIONS},inspector"
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Disable no-print-directory
-	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	# Ensure we do not fail on i{3,5,7} processors that support -mavx
-	append-flags -mno-avx
-
-	CPPFLAGS="${CPPFLAGS}" \
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-}
-
-src_compile() {
-	emake || die
-
-	# Only build enigmail extension if crypt enabled.
-	if use crypt ; then
-		emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
-		emake -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed"
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use crypt ; then
-		cd "${T}" || die
-		unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf || die
-		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		unzip "${S}"/mozilla/dist/bin/enigmail*.xpi || die
-	fi
-
-	if use lightning ; then
-		declare emid emd1 emid2
-
-		emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/mozilla/dist/xpi-stage/gdata-provider.xpi
-
-		emid1="calendar-timezones@mozilla.org"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid1}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid1}
-		unzip "${S}"/mozilla/dist/xpi-stage/calendar-timezones.xpi
-
-		emid2="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid2}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid2}
-		unzip "${S}"/mozilla/dist/xpi-stage/lightning.xpi
-	fi
-
-#	linguas
-#	for X in ${linguas}; do
-#		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
-#	done
-
-	if ! use bindist; then
-		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		newicon "${S}"/mail/branding/unofficial/content/icon48.png thunderbird-icon-unbranded.png
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:Lanikai:g" \
-			"${D}"/usr/share/applications/${PN}.desktop
-
-	fi
-
-	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
-
-	# Enable very specific settings for thunderbird-3
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js \
-		"${ED}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
-		die "failed to cp thunderbird-gentoo-default-prefs.js"
-}
diff --git a/mail-client/thunderbird/thunderbird-5.0.ebuild b/mail-client/thunderbird/thunderbird-6.0.ebuild
index 283a86eb61c2..05d979ce8975 100644
--- a/mail-client/thunderbird/thunderbird-5.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-5.0.ebuild,v 1.4 2011/07/31 14:58:39 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-6.0.ebuild,v 1.1 2011/08/21 17:55:30 anarchy Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -9,7 +9,7 @@ inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozext
 
 TB_PV="${PV/_beta/b}"
 TB_P="${PN}-${TB_PV}"
-EMVER="1.2"
+EMVER="1.3"
 
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
@@ -20,30 +20,30 @@ LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="bindist gconf +crashreporter +crypt +ipc +lightning mozdom"
 PATCH="${PN}-5.0-patches-0.1"
 
-REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases"
-SRC_URI="${REL_URI}/${TB_PV}/source/${TB_P}.source.tar.bz2
+FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
+SRC_URI="${FTP_URI}/${TB_PV}/source/${TB_P}.source.tar.bz2
 	crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )
 	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
 
 if ! [[ ${PV} =~ alpha|beta ]]; then
 	# This list can be updated using get_langs.sh from the mozilla overlay
-	# Not supported yet bn-BD ro id zh-CN be af el
-	LANGS="ar bg ca cs da de en en-GB en-US es-AR es-ES et eu fi fr \
-	fy-NL ga-IE he hu is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ru si \
+	# Not supported yet bn-BD ro id zh-CN be af el pa-IN bg
+	LANGS="ar ca cs da de en en-GB en-US es-AR es-ES et eu fi fr \
+	fy-NL ga-IE he hu is it ja ko lt nb-NO nl nn-NO pl pt-BR pt-PT ru si \
 	sk sl sq sv-SE tr uk zh-TW"
 	NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
 
 	for X in ${LANGS} ; do
 		if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
 			SRC_URI="${SRC_URI}
-				linguas_${X/-/_}? ( ${REL_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
+				linguas_${X/-/_}? ( ${FTP_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
 		fi
 		IUSE="${IUSE} linguas_${X/-/_}"
 		# english is handled internally
 		if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
 			if [ "${X}" != "en-US" ]; then
 				SRC_URI="${SRC_URI}
-					linguas_${X%%-*}? ( ${REL_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
+					linguas_${X%%-*}? ( ${FTP_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
 			fi
 			IUSE="${IUSE} linguas_${X%%-*}"
 		fi
@@ -51,8 +51,8 @@ if ! [[ ${PV} =~ alpha|beta ]]; then
 fi
 
 RDEPEND=">=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.9
-	>=dev-libs/nspr-4.8.7
+	>=dev-libs/nss-3.12.10
+	>=dev-libs/nspr-4.8.8
 	gconf? ( >=gnome-base/gconf-1.2.1:2 )
 	media-libs/libpng[apng]
 	!x11-plugins/lightning
@@ -70,7 +70,7 @@ RDEPEND=">=sys-devel/binutils-2.16.1
 
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}"/comm-miramar
+S="${WORKDIR}"/comm-release
 
 linguas() {
 	local LANG SLANG
@@ -126,6 +126,8 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"
 
+	epatch "${FILESDIR}"/fix-thunderbird-calender-support.patch
+
 	if use crypt ; then
 		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
 		cd "${S}"/mailnews/extensions/enigmail || die
@@ -200,11 +202,10 @@ src_configure() {
 
 	if [[ $(gcc-major-version) -lt 4 ]]; then
 		append-cxxflags -fno-stack-protector
-	fi
-
-	# Ensure we do not fail on i{3,5,7} processors that support -mavx
-	if use amd64 || use x86; then
-		append-flags -mno-avx
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then
+		if use amd64 || use x86; then
+			append-flags -mno-avx
+		fi
 	fi
 
 	CPPFLAGS="${CPPFLAGS}" \