Version bump, security bug #389923

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

4 files changed, 364 insertions, 6 deletions

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index 36451d95430e..f356594d5a05 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,11 @@
 # 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.99 2011/10/28 08:44:36 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.100 2011/11/11 01:46:45 anarchy Exp $
+
+*thunderbird-8.0 (11 Nov 2011)
+
+  11 Nov 2011; Jory A. Pratt <anarchy@gentoo.org> +thunderbird-8.0.ebuild:
+  Version bump, security bug #389923
 
   28 Oct 2011; Tony Vroon <chainsaw@gentoo.org> thunderbird-7.0.1-r1.ebuild:
   Marked stable on AMD64 based on arch testing by Elijah "Armageddon" El
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 3f18a67fce43..7e13699c83c5 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -21,7 +21,9 @@ AUX thunderbird-respect-ldflags.patch 1640 RMD160 889a63b2fb04878e99b2a14d47713e
 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.3.2.tar.gz 1371388 RMD160 f9320279e67767a8023ac863b8d089e370018201 SHA1 8bf39664f22e383d026c07d4acd714a1ccfd9d6d SHA256 46ffa074829472ba6714e1ada37b8cc083d0dd4e16c21ad0c2893c5eef68893d
+DIST enigmail-1.3.3.tar.gz 1367995 RMD160 4c7ab726052b566f913612cfbdd767714486bf9c SHA1 a6d61b6dbdcfdb0dc4eaa8aac1b6277fed65c8c5 SHA256 7110d2f0eea8a9a7580ddc13ab56c262bbd33776ebdc34ab19ec90143f010be6
 DIST firefox-7.0-patches-0.5.tar.xz 14652 RMD160 94593a3e01247b4e5fe9c01a80e902937ed3b32b SHA1 c9cfd5e46a18e4e6adfa8334936f854c3e14a687 SHA256 e2f1de9cfbb87cd982ed205b3b5f33e3bcd952b2093a9969281a761cc0a9e293
+DIST firefox-8.0-patches-0.2.tar.xz 8032 RMD160 221500ed4f56e9c139f563d598bf38df448e5652 SHA1 f41c04c659a253d464ab9bb2c169c1b99b22d443 SHA256 52d351133187dfb7b367950f4da543b06b9f0666f6c07b8bbb5b21cd3d40b0c3
 DIST thunderbird-3.1-patches-1.2.tar.bz2 3427 RMD160 354d9003e8132e0aaf7069aec84459ff28237f61 SHA1 36ad5f9af77eaacc02c7df744b5d2563fb54bed8 SHA256 6586cf569b035bd1b9179036678a0cbedbf3def88ca7d69852451542b52693a0
 DIST thunderbird-3.1.12-af.xpi 210617 RMD160 0d8a79d8066b6706090f6c0a55a0c89423542eab SHA1 abadfd892e896e87a8a394bdc5a1ee6c4aa7f65f SHA256 00d47a4b1443689a328d4903ccea06a058d2d847789442d4a044212bb6813b56
 DIST thunderbird-3.1.12-ar.xpi 230333 RMD160 a9ddde633984f2c431c960870e5d33eac78089ad SHA1 beeff8853f470b9c24f308ce0ad93a95686c7378 SHA256 706f67296c7058d694c712964239b44dcfc4a93ab1148b70fee22ed1056c6832
@@ -199,16 +201,60 @@ DIST thunderbird-7.0.1-tr.xpi 403127 RMD160 50dbfd65e13f604d0d88dc8c675fec9b36ba
 DIST thunderbird-7.0.1-uk.xpi 454368 RMD160 a3f00a485bd9236a02b466f34f1d0634df8a4499 SHA1 09163cc5347c1baf0c0b475a2c0b7b4a779f60a2 SHA256 b2d7ab67be708e4f3ed02d0701748c027250491f9aa41a0f60d150cd8fb41466
 DIST thunderbird-7.0.1-zh-TW.xpi 420847 RMD160 95095a3f45c4dd38983d9e5d9b6087e57600564e SHA1 defbc32b529699297e8f58642d0530ab2ee0d609 SHA256 7362f1cc5541006c06f1373d1cd90a4c04d496b5b79443524af7d1654a73d668
 DIST thunderbird-7.0.1.source.tar.bz2 87405591 RMD160 04d39464b5c7c3128a00b0eaff806b3307e0a22e SHA1 ccfc6fe3fe4ad07b214e20bc440d20e14d3ffbe5 SHA256 83f578bbfa0cb5d0f7faba6214993806050fab3e2039996344a11c9457525242
+DIST thunderbird-8.0-ar.xpi 429682 RMD160 ac02f62b746232efcbbf622e7d2a84269194441f SHA1 da148179119926bfb2305e2157ccbe6edee86e79 SHA256 ac50815d26c950b51a930239facf46c1225f8c052dc7610106fa74573b187b96
+DIST thunderbird-8.0-ca.xpi 407844 RMD160 f0860202c3b3ca2117373a657f08585e79b8fb23 SHA1 676c0b2904b282649323ee8287eede0fd011f31d SHA256 f9cbd66875016bf18e84d0ffcae1b394d020c6166f1626b95cdb04ea431c20b8
+DIST thunderbird-8.0-cs.xpi 410932 RMD160 efb7559493f30a25d0707b36240d28c4fb5e9647 SHA1 4a1efdaa8b7cc497a48dc91d35e69464cfa2695c SHA256 1fd879a3802d455a10db9b94c74449663920b6dd9e7dec487c9a782898fc4c6e
+DIST thunderbird-8.0-da.xpi 353524 RMD160 ef82b894d5c104f20a301f498e4ecb778343c50f SHA1 f60819da07a43405faf6d88a9163ed964ac5095f SHA256 db28f6e245304488923e153e5e692b3ade8d736bc42c2fd8c1af065c973370ef
+DIST thunderbird-8.0-de.xpi 409617 RMD160 65e0a6ff2e8f1dd192ae06235def1d269bef7202 SHA1 514cc2f40cca34be61a0e4287f1f01a00c96def8 SHA256 d8047dafbcf85f520ec268c633e0a704bd276b0e46d972302d54356f558883f2
+DIST thunderbird-8.0-en-GB.xpi 384202 RMD160 37331b2e48c0fc12c25d1e290c352187ab326332 SHA1 95dbc9cd72a58d6d2b6cc7e6d38846eef15ff6cc SHA256 77a53b255f1a526166415eb2c7398a6d7a07a23f46d2737714bfbded8972bb8f
+DIST thunderbird-8.0-es-AR.xpi 402208 RMD160 7f9cb8d89f54e5b8e022b152f69a542d978c3612 SHA1 83dba6b048b1fd6132bf9ff286e3e492208b1dc9 SHA256 3d23032bc87e257a749ce7a877897ee4e05c64930ebec9e743eec07c52ac26dc
+DIST thunderbird-8.0-es-ES.xpi 345966 RMD160 87b19f178bcd1dae36dc2896b1e751efb934a7af SHA1 9f9e2965fb1786f44a9e4998d4bbceb6ffb2eb30 SHA256 9e4d21fa3b1387977ae4a6bf69395b48de8560e0330ee964c210a06fbf0c0327
+DIST thunderbird-8.0-et.xpi 402614 RMD160 f8b05fbb5b6a84da11fd7827c3400b9d8fb91916 SHA1 c6c9d8a80d7bff3e909a955f7e8653a65b306439 SHA256 7e866bb4f163e8aac567266414e20877bb9c6d0525d6621d717cdef1a9715ed2
+DIST thunderbird-8.0-eu.xpi 398556 RMD160 71c8a71728fb9bfa9b71fcb682aa145d7e64ec7a SHA1 1fcb6c067f2d5355b6940fc9693ff584eca81741 SHA256 af1a9e5cd29befc818ab5b93ce3b5058766f80fe0feeaedd261a702e56d1853c
+DIST thunderbird-8.0-fi.xpi 403666 RMD160 0889d030e832d3f1a894bf3641ef3b98af3c7265 SHA1 fb984fbcbb0cbbc97779bc3abf87ebfefad24782 SHA256 e2c94b11072377e3ce6758a6f3b607e03fa7a0073e167b31ee097e0363b6c50c
+DIST thunderbird-8.0-fr.xpi 406258 RMD160 8e6684d7cb942b34c69d467619c42599dd1f02cd SHA1 55d3d5117f36bb5451cf3e040317cdd67b444487 SHA256 5384e5e75061ab504ea3f6284d9f6232826f596d6785c392e795dbf27a2139b2
+DIST thunderbird-8.0-fy-NL.xpi 406182 RMD160 18b02278929414909101c8d550a05ef5407484ac SHA1 b1df077e7fe68ebb69133655821f640915ea4a79 SHA256 fbf0e7e59f36aa2770ddc129b0da453c5ccec1fc26ab08c1d37bb2ea1baec890
+DIST thunderbird-8.0-ga-IE.xpi 414791 RMD160 5f5843a6fdfcbb47c84266ed57aa03bed0d197f0 SHA1 e8f77908d61f82796fa80c974b821aed7a82f421 SHA256 6f193c7ab8d86e01bd305cb480ce4d1d3c40952b29d451ad53a87f7d25c399db
+DIST thunderbird-8.0-he.xpi 429157 RMD160 cbcd11073637c0a8ffb4200ca7b93caf6a78f1fc SHA1 d58b666d5a7ec7cd8c3ea6215f9a48a84fde8316 SHA256 15049fbc3a1d41d4c69013ab18679994e6530a65c47051388dd51ec605e82562
+DIST thunderbird-8.0-hu.xpi 418308 RMD160 d5c39902eb580bfe74cb0d9f8fd50927c52418b3 SHA1 47bd74822aafe1326d4a86bc998edafcec9bf45e SHA256 2ba9485a7d3ed1fc7962f5776ab02856a7b6c847345b03fd54c6bb80e10a8e08
+DIST thunderbird-8.0-is.xpi 404491 RMD160 4b3f8f95b25bfcd49e1a58f90d0f1138a1134820 SHA1 88336dc416de62a1f021233fee8c66e9c88e07cc SHA256 60110ee7c61ccfeca0560a49eacb50423f73f183a964f58b74ae37d8e564443c
+DIST thunderbird-8.0-it.xpi 338611 RMD160 f5e5a492c30dcafa6d8858419dec3adb2f551d88 SHA1 acdba9e5a105d855e18e244b73c7e6c348421e33 SHA256 61c243264edee5bb95bc947b0732401f189b184863d2640128e00a19fac426b2
+DIST thunderbird-8.0-ja.xpi 450381 RMD160 71cafc3ebe76704b22a976d446cecd0c82fdecb9 SHA1 40f500176e13716c2f74ddb620be3d3681a89751 SHA256 1ffc9c291893601172be91f50b25b651c18ea008def94b858a12147872da2ce9
+DIST thunderbird-8.0-ko.xpi 362650 RMD160 9a55eea99af12cc333b3aceff54a6e2e1d45057a SHA1 5d55df5d8451c875ccafd8247f0e971102fae5c9 SHA256 b7063cad1f6ebe4c21dce881eb748a88aa906d23f248593d9bb53ba14381efba
+DIST thunderbird-8.0-lt.xpi 527185 RMD160 eab4cf6c9dba554aecd83647df27f79d217d9939 SHA1 727ae314f34aedbeda861ed3df7a93466810b901 SHA256 fcd2c44bdebe7866f087b088ce5103366e2241bc341cc24b771684bc1d06d253
+DIST thunderbird-8.0-nb-NO.xpi 399860 RMD160 b959cdbe5e5e5e061c9e414f5719c76e4f0e9d80 SHA1 a37e40e894e4f1dfaf5b77555d533c000087a667 SHA256 83b800ea6ddcf098f309a8e71f3de741973d0177c145be9b8bf896d23df5204d
+DIST thunderbird-8.0-nl.xpi 399870 RMD160 aa6068ebf5370de95b8118823b90e76d08b820ae SHA1 d9b71812e16505867c3d64a48d91cf203a3c6ed8 SHA256 bce99a6e95ae72bf6040d38c7fdfc5cd222b3362dd97e79e5af90f2e752adfcf
+DIST thunderbird-8.0-nn-NO.xpi 401462 RMD160 547fc9ea77a2e43c9c58f24f5c9299db9f793c50 SHA1 a91a42860fa6ab81e3ba381a2dd32bd16be8aa5a SHA256 7e93e1e0ed7c6e942c6858b4e003be1e9a7180822a251436cc8349be1784d5f9
+DIST thunderbird-8.0-patches-0.1.tar.xz 532 RMD160 4fd95b36f692fe6852eb65fe8bb8052913132047 SHA1 61eb8c40ad4b31025cd21b096c00a45ab8483193 SHA256 7dfee7ee0289645a5de7e3132d16412cd93713188d86a0a1ff4570a25cbe92c4
+DIST thunderbird-8.0-pl.xpi 386210 RMD160 9f393faab5504a98c876ac42fb6562a5115fd270 SHA1 5aa92c952156673ef354a2763f59430622447221 SHA256 040b62774df7f1e66b8af5d42031ac3bcd148c3646ee7815504aa2cc89322c4a
+DIST thunderbird-8.0-pt-BR.xpi 408964 RMD160 f53215aa67880eacea3108063b3ec0d14895c202 SHA1 eed871c5b8af96bc7c36391d3796ae6feb7acaeb SHA256 669f7ad7db9b02e8dd9e41be42cac56ff9a2826c971f656d17f0fee0a22bc397
+DIST thunderbird-8.0-pt-PT.xpi 405968 RMD160 29121ec74b43cd321a94eb83f761b091c4e272c2 SHA1 b2889c50eac0c0b583dd3f20e5d6d4f641f00397 SHA256 b2ff74fa2f888b8e29ae158d55ded0ce7660498460930ff0697f17e6e481a91f
+DIST thunderbird-8.0-ru.xpi 400687 RMD160 8ad0c810a54131cc344edf662c34b208f4e9c842 SHA1 823c97ed7a93c0c10c8cf2555ef4bb0556e0027a SHA256 a412dd6f6763972727007d76f837b5f1d8dd32ec35afc9490a3722437330dee6
+DIST thunderbird-8.0-si.xpi 448334 RMD160 7340edc0cf0326213dc7832931779f186fa76eaf SHA1 c48cace01c7659a87dfcf9beb045728b958767fc SHA256 fce2b953375d5b6fcf58d94bc4b676ae843103b5899fd3f5af5c5f7275e75631
+DIST thunderbird-8.0-sk.xpi 416338 RMD160 573654a59aa83e083182b00b4c81603d0ea5c83a SHA1 53b0146da50a8a5cbc3bbd9c4c3077c294e337af SHA256 e09edb3471eb06d3e21d85cbf2b889ccb041680150b28f43db2f46ae21ba6dff
+DIST thunderbird-8.0-sl.xpi 402625 RMD160 3da5c058d1953947b4fdb1f30371db296c3dc892 SHA1 34ac589a09b759507ef7a58e9e81d5a8fa367a66 SHA256 91c6151d3c9c74ff937539c2c59a4f04f381403d72e43402a9466fffbdda5a71
+DIST thunderbird-8.0-sq.xpi 351703 RMD160 9fe4bd4663d1c9eee57eb31feb98ff32e7e68f43 SHA1 775103b7eac89e52ad2600462146c20d16841da0 SHA256 f14b7ca5d4049ee6218fd6377759bd6cfc32d37d180204510737ad4814c56893
+DIST thunderbird-8.0-sv-SE.xpi 470499 RMD160 edfe10d92fec7767b62782f34d0148a89608721c SHA1 4ecb7e9462fd43bb2665d6ed8dbdb6dc3d1fa0f2 SHA256 c7cc27527961c0435fa8bb1563fe04edee234188b0abe001e10159c48bda8a2b
+DIST thunderbird-8.0-tr.xpi 405974 RMD160 4f80a26fc871135b850851bb06ddbd7b8de60574 SHA1 12c21c981fb65ee8c8d7a1720e567c1166da4177 SHA256 984f7bcae3a51a3dcbe83b2098037c43fe929d14713f8b0818c362122f507a2d
+DIST thunderbird-8.0-uk.xpi 456674 RMD160 95c1009e180d50940e8ecedc1d373c834c278bc1 SHA1 59cd3d8a0b47ba087d4493374bd6ba8b233758e8 SHA256 cdf663bdc0f85857cd41ead2c058abf01f6542089da94ada9f5a2bcf95214dbe
+DIST thunderbird-8.0-zh-CN.xpi 422519 RMD160 ef881e92de682aa3d807a53a7f536f51e6740b94 SHA1 564f90305e0458f57cd27a876f90e8c12b5ade8f SHA256 bb46c2b4d395488104528ac225f2c129e9c4ddb500e6f44082df549560013132
+DIST thunderbird-8.0-zh-TW.xpi 423019 RMD160 3326d286df45aee39ea4dc9303c6e4459b41dba2 SHA1 a81c24ab001eb521a1b4e49da16c8f6914676641 SHA256 a6c78df16a242b1731709fdacae8fcfde630fe10469abfd6a696b46076e9059a
+DIST thunderbird-8.0.source.tar.bz2 89435206 RMD160 373420ec009a7f28f12a64a0d55e9d959573974e SHA1 18b77e44f1653eb3d59056870f535e3c373d99fd SHA256 f728bd2dbc04e6c3a096d79a9ee320740f53794a28be307da8655c8fd90f77f5
 EBUILD thunderbird-3.1.12.ebuild 8098 RMD160 738570bba05f5b2c8e87aeb765acc1159075f6dd SHA1 4a338ecb561b992ab9eb07eccff8fef66190be62 SHA256 358d9dc0abdaf153609110c32236c255f8d1680499d5b21a88373946471da1ca
 EBUILD thunderbird-3.1.13.ebuild 8110 RMD160 e38bcc178fdb3a37e049f40eec24688fa67a6167 SHA1 41f4aa135e7f8e9830c9faf00879cfc0b04d17f9 SHA256 7422b283e991b58950fb84c0e09920e0b0236617df8f9eef2e07a4c8bde2f429
 EBUILD thunderbird-3.1.14.ebuild 8110 RMD160 f50c19f939b81b9ee4c0a68dbb0ebf50386ec0d3 SHA1 bbfe47a8ec85f9d7fbcbd193d8f2db8c49a23256 SHA256 aa0a28a177630cf332f3c4f242506db2dfceb9370b9d69e66c9c5ab74acc7ae1
 EBUILD thunderbird-7.0.1-r1.ebuild 9116 RMD160 d95c9e5e7bd56290be69921c204a6490eb8b9037 SHA1 ceb57f19351cd4148f4178ce499d8b880f064acf SHA256 77753fa96df7e1973f928922fbb70f3b6b416da68c602e99e8046d2d5487496a
-MISC ChangeLog 66256 RMD160 1851b8b72713ee1e285cf06b600efd127a0ac2bc SHA1 834017ea7aec153748d205a3424198caf9a1c450 SHA256 44196095aa55017a7551b51ca671a23b5c4add8b0afd1821628fe2a477256662
-MISC metadata.xml 732 RMD160 87468b1b9c1c1ec539c026f04e05265a4dc32cdd SHA1 283661cc3d68f2f7c2a3b82455692f7239bed63b SHA256 3b0e7f6f49598b82aaeee92a5f96f99877713866fbbb73c797bfa65f2c0b4d75
+EBUILD thunderbird-8.0.ebuild 9165 RMD160 2f74bc2e6bfc6c958911513d4caec0720c5646e8 SHA1 38b96d909a660a95520c13374d3bf33b3e4d072f SHA256 fd7cd7a05ed1469830368dc1d0504ccfc48d17bab03a98ae1646e426be9b1b34
+MISC ChangeLog 66401 RMD160 8a520c9ce271279e8f3112bd7d079d23beac4f90 SHA1 fc377b6355dace58735b41ccdc230a703b2b20b5 SHA256 a9edfe3b67dde9fc24d5f39fdef009f5c01263e9e92e5c956bfa2ed13813b3ff
+MISC metadata.xml 830 RMD160 3d39ed1f7c9159182b747acbdc1854a7fd6bbd46 SHA1 6e22a48ca98944a15d3a4ddcd10c9494884bbd8e SHA256 8b073e19b5cc6b8a6332e9873ac937bb129833195007f0bf06c4bbb872bf267f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6qa4YACgkQp5vW4rUFj5obegCfa2WMXVyk9+fGZ/T8pVl49nC1
-iLYAnRvyqHa++RmKpnws/m61KmHgZYcP
-=7++x
+iQEcBAEBAgAGBQJOvH6QAAoJEIXV9xahDnCo5LsH/RaXdgmrAFtxJourQecCvr7j
+ationVBw9aRM0WfcNedDhMmXHiFBlaKDHjJDfWcgAbXfUzP0J6sp8VIouhtVsMZh
+jl3XAoP5dpB0/o0Sdplslm7TE4Eyh0nQ4zU5VMuJ91s55KtTt8TcefJghbNzQoH5
+9n8othbooFyePd5HLBFXNKGZmikyVJ3WIhtWYWJ+rsa8PME0z20fVuvEN746aSx7
+7ROjXgzKTiGDfq366/nfo7aOb7wQJBN0NxAqllRrLz/QUC9rU8TlAT4QfDrUGYNn
+PE9mUSji/4YMDaw8VcocZF9N+vSb5bx1J0i6xTTZprjNU+MVZdG9BfjYmn3cuzI=
+=1MEb
 -----END PGP SIGNATURE-----
diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml
index 4322881dbfd0..7b99aacb386a 100644
--- a/mail-client/thunderbird/metadata.xml
+++ b/mail-client/thunderbird/metadata.xml
@@ -12,5 +12,7 @@
 		Allows for greater stability in case of plugin crashes</flag>
 	<flag name="crashreporter">Enable crash reporter for bugs</flag>
 	<flag name="gconf">Enable gnome2 gconf support</flag>
+	<flag name="webm">Use system <pkg>media-libs/libvpx</pkg> for HTML5 WebM
+		video support.</flag>
 </use>
 </pkgmetadata>
diff --git a/mail-client/thunderbird/thunderbird-8.0.ebuild b/mail-client/thunderbird/thunderbird-8.0.ebuild
new file mode 100644
index 000000000000..d91b2a560fad
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-8.0.ebuild
@@ -0,0 +1,305 @@
+# 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-8.0.ebuild,v 1.1 2011/11/11 01:46:45 anarchy Exp $
+
+EAPI="3"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib mozextension autotools pax-utils python check-reqs
+
+TB_PV="${PV/_beta/b}"
+TB_P="${PN}-${TB_PV}"
+EMVER="1.3.3"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~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 +webm"
+PATCH="${PN}-${PV}-patches-0.1"
+PATCHFF="firefox-${PV}-patches-0.2"
+
+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.xz
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz"
+
+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 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 zh-CN"
+	NOSHORTLANGS="en-GB es-AR pt-BR zh-TW zh-CN"
+
+	for X in ${LANGS} ; do
+		if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
+			SRC_URI="${SRC_URI}
+				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%%-*}? ( ${FTP_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
+			fi
+			IUSE="${IUSE} linguas_${X%%-*}"
+		fi
+	done
+fi
+
+RDEPEND=">=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12.10
+	>=dev-libs/nspr-4.8.8
+	gconf? ( >=gnome-base/gconf-1.2.1:2 )
+	media-libs/libpng[apng]
+	webm? ( media-libs/libvpx
+		media-libs/alsa-lib )
+	virtual/libffi
+	!x11-plugins/lightning
+	!x11-plugins/enigmail
+	system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] )
+	crypt?  ( || (
+		( >=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk]
+				app-crypt/pinentry[qt4]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	) )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/comm-release
+
+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
+
+	# Ensure we have enough disk space to compile
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if ! [[ ${PV} =~ alpha|beta ]]; then
+		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
+	fi
+}
+
+src_prepare() {
+	# Apply our Thunderbird patchset
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/thunderbird"
+
+	# Apply our patchset from firefox to thunderbird as well
+	pushd "${S}"/mozilla &>/dev/null || die
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/firefox"
+	popd &>/dev/null || die
+
+	if use crypt ; then
+		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
+		cd "${S}"/mailnews/extensions/enigmail || die
+		./makemake -r 2&> /dev/null
+		sed -i -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' Makefile.in
+		cd "${S}"
+	fi
+
+	#Fix compilation with curl-7.21.7 bug 376027
+	sed -e '/#include <curl\/types.h>/d'  \
+		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
+		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
+		-i "${S}"/mozilla/config/system-headers \
+		-i "${S}"/mozilla/js/src/config/system-headers || die "Sed failed"
+
+	# 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
+	mozconfig_annotate '' --enable-system-ffi
+
+	# 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
+	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}" \
+	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}"
+	declare emid
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	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" \
+			"${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	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
+		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
+
+		emid="calendar-timezones@mozilla.org"
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+		unzip "${S}"/mozilla/dist/xpi-stage/calendar-timezones.xpi
+
+		emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+		unzip "${S}"/mozilla/dist/xpi-stage/lightning.xpi
+
+		# Fix mimetype so it shows up as a calendar application in GNOME 3
+		# This requires that the .desktop file was already installed earlier
+		sed -e "s:^\(MimeType=\):\1text/calendar;:" \
+			-e "s:^\(Categories=\):\1Calendar;:" \
+			-i "${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	if ! [[ ${PV} =~ alpha|beta ]]; then
+		linguas
+		for X in ${linguas}; do
+			[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
+		done
+	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"
+}