replace mozbranding with bindist and enable by default, bug 168409, some cleanup, and add linguas. Modify the patchset without bzipped patches and add desktop and icon file for unbranded, drop old

Package-Manager: portage-2.1.2-r14

8 files changed, 227 insertions, 361 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index e072fda17fb6..5b38edd0a961 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.173 2007/03/03 15:43:03 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.174 2007/03/03 19:24:14 armin76 Exp $
+
+  03 Mar 2007; Raúl Porcel <armin76@gentoo.org>
+  +files/icon/mozilla-thunderbird-unbranded.desktop,
+  +files/icon/thunderbird-icon-unbranded.png,
+  -mozilla-thunderbird-2.0_beta1.ebuild,
+  mozilla-thunderbird-2.0_beta2.ebuild:
+  replace mozbranding with bindist and enable by default, bug 168409, some
+  cleanup, and add linguas. Modify the patchset without bzipped patches and
+  add desktop and icon file for unbranded, drop old
 
   03 Mar 2007; Steve Dibb <beandog@gentoo.org>
   mozilla-thunderbird-1.5.0.10.ebuild:
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 3addcc5f5caa..004ed4d61e17 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,7 +1,15 @@
+AUX icon/mozilla-thunderbird-unbranded.desktop 194 RMD160 9c241832bd2bd9613c337ff912e2e666940c52b8 SHA1 b3692e9b5b2ea789b966c0d81bb32fa55f2a3830 SHA256 f5e3c2af5e202098ea21cfc13d5040391b23be357985aebf1236cdcfba148221
+MD5 ddbcb4c58988b1fa50640938b3abd05f files/icon/mozilla-thunderbird-unbranded.desktop 194
+RMD160 9c241832bd2bd9613c337ff912e2e666940c52b8 files/icon/mozilla-thunderbird-unbranded.desktop 194
+SHA256 f5e3c2af5e202098ea21cfc13d5040391b23be357985aebf1236cdcfba148221 files/icon/mozilla-thunderbird-unbranded.desktop 194
 AUX icon/mozilla-thunderbird.desktop 184 RMD160 77953b3d9f191b94611a9953464ffd04d3e4148b SHA1 a19de7fcabb5be6339731d12e2f469d13e2a3ea2 SHA256 46dce3eb853408a169f5755faf63d973d69c21b47c641442a0e7c666e213aab3
 MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozilla-thunderbird.desktop 184
 RMD160 77953b3d9f191b94611a9953464ffd04d3e4148b files/icon/mozilla-thunderbird.desktop 184
 SHA256 46dce3eb853408a169f5755faf63d973d69c21b47c641442a0e7c666e213aab3 files/icon/mozilla-thunderbird.desktop 184
+AUX icon/thunderbird-icon-unbranded.png 13280 RMD160 1654b2cfa39631e2084da982001113972eb41c09 SHA1 2fdca79e57c79d2485eb56d31de7afb05337898e SHA256 28b605529bee4d8245afdbb2cab5a705d8fa8977a11635b54c7bc5a7d6a9619c
+MD5 c8a323956081eaebdb24d198f846777c files/icon/thunderbird-icon-unbranded.png 13280
+RMD160 1654b2cfa39631e2084da982001113972eb41c09 files/icon/thunderbird-icon-unbranded.png 13280
+SHA256 28b605529bee4d8245afdbb2cab5a705d8fa8977a11635b54c7bc5a7d6a9619c files/icon/thunderbird-icon-unbranded.png 13280
 AUX icon/thunderbird-icon.png 6499 RMD160 1aeece7719c1c1629b98fc11870641769681a048 SHA1 651d244e96fa0edf13f68f5ef9047432eb6ed3bf SHA256 ff9749e42b82b80425bb52883d63baa53298af7be98870ee6b73f0a6cf0ab22d
 MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
 RMD160 1aeece7719c1c1629b98fc11870641769681a048 files/icon/thunderbird-icon.png 6499
@@ -72,12 +80,37 @@ DIST mozilla-thunderbird-1.5.0.9-sl.xpi 187718 RMD160 c201ff14f58a809c829adef335
 DIST mozilla-thunderbird-1.5.0.9-sv-SE.xpi 191056 RMD160 6dc72c31b91654d49147b3e855bdd1048289c2c8 SHA1 06df6018131bf9fd4e03ee94430b05221bbd412a SHA256 824e9236b2bf53483e2848b1f4dd84c6087e0362ec78ec3f529b4e34d69d0bad
 DIST mozilla-thunderbird-1.5.0.9-tr.xpi 155699 RMD160 bafcede36083016ae2162bfa4d1b11a2965db585 SHA1 f77e486dd77af171613f2d37c775944834df5904 SHA256 8b926cb8daf516697025cf81d5a9f0e2b89dcb8f74c4771e84300e8d11c91618
 DIST mozilla-thunderbird-1.5.0.9-zh-CN.xpi 155476 RMD160 244b1652982d6bb27a83fcf948b747de2bc068c7 SHA1 4724214130fabc67735e5fc4226116c0ba11cbd7 SHA256 b977acf12e07b39751ea10dae7668bbf3b476f5efe73ed4c5cb9d337f4e71d98
-DIST mozilla-thunderbird-2.0_alpha1-patches-1.2.tar.bz2 63079 RMD160 ae0610540b2815594e870bc0bc2009be9f7bac3d SHA1 a052730f08e1098341ed94588d1e0beb072c9576 SHA256 92cfc062125efb5769f5b9d6a7e03c57323b39fb87c28b64636cffbcbab4100e
-DIST mozilla-thunderbird-2.0_beta2-patches-0.1.tar.bz2 31961 RMD160 d827aecf75158bc0a4dd23149caba7d79bc4e57b SHA1 77eaa42af3011159a71609bae8cdf54cd2383de3 SHA256 bfcaa6b4992993dc6323a3d4a102eef673c8cef99d2b1a6498049d26ae59edbe
+DIST mozilla-thunderbird-2.0_beta2-ca.xpi 182595 RMD160 b8b0560009a55861ac2ef166852096879ecbb431 SHA1 3513e4074d428d40f09dcea74aea33cdfd1a9e3f SHA256 efb810b27cab29373a92f23fb05e459ddcdfc4f0765939ee40c6df810798a92d
+DIST mozilla-thunderbird-2.0_beta2-cs.xpi 184397 RMD160 6e1f567b7e5f1f754b8c0f95d6ed89f07c7d5212 SHA1 82ced0bcdfbad4f337224aba32ab1239bd7113f3 SHA256 c7675e21b14a6df6bf217243f1153b308db3b918b6f38b573b9830b4b5e8d431
+DIST mozilla-thunderbird-2.0_beta2-de.xpi 156345 RMD160 82ba0a766eb29afa24d557f2262fdf03fc8e475a SHA1 6d2893b1b4d467c6e5781ec651a3fc49818a8cb5 SHA256 f75d2c5cf2e37bbbfbaabf9cde20f2f089dea6ca1421f5f32323d3ae917518b4
+DIST mozilla-thunderbird-2.0_beta2-el.xpi 181451 RMD160 a0fcf3ebcde6535c953e679abddc4d61cff4b66b SHA1 8cf102d8728009f674bfdf0692080f1f75af2ff8 SHA256 2767b88b4f6c7df874557e83737a47e6cabbbe3ea36c093ac024ed4a7e90e1c1
+DIST mozilla-thunderbird-2.0_beta2-en-GB.xpi 171407 RMD160 7b83678b3b958e6a52c23c42a33c7dfea3dc6056 SHA1 d270faf16dd7113aebfdd813129efd5d0fe61c39 SHA256 acb71be48e7b77b8c8d98c8268904ef30c25da7565160f7829a0b93d05d73c27
+DIST mozilla-thunderbird-2.0_beta2-es-AR.xpi 183049 RMD160 0c36e103e1ed3b059f59d78285677b46cd3d181f SHA1 61847be430d34b037a5bf003c9830f3535cb04b3 SHA256 cac24c9b7a9114dae3725d2ea49071c64187a5d7f7095839016d4cea6da375c0
+DIST mozilla-thunderbird-2.0_beta2-es-ES.xpi 145831 RMD160 b8d0ece073952d6e7b6fb19be7ec3d965c6e6438 SHA1 a9bfac85852e7a92ab4df977c949fabfacf505b4 SHA256 a47e6b7442b6684c3939ce4566792184f5533116a4ab5094f3adcd20f098b568
+DIST mozilla-thunderbird-2.0_beta2-eu.xpi 180040 RMD160 0a704cc00fca5c2e90d15e7f317da7b2f3bbf930 SHA1 c12a1fb7d0b2fa15870f08cfd1a257477793de77 SHA256 9009e95c7bbf5d23b47a277db60109221ee33182489754838121525c6be906bb
+DIST mozilla-thunderbird-2.0_beta2-fi.xpi 185546 RMD160 8b12badcf5b3a44563e3696bb2365d6d585b30d2 SHA1 8bb0246f81b2e2af894fba9eeef9a4706e5eb9fd SHA256 1ca57e2d9e8076216a1a518ed6ffd303acc0a91f9e22e8bbe3d966d37f3ba109
+DIST mozilla-thunderbird-2.0_beta2-fr.xpi 189298 RMD160 9ce5da895d87857e6180af393ec3adf8cc9f2b10 SHA1 79bfb3a2e79b7afe90a38db38901e498a6890df9 SHA256 3e7b9fb44a62309a988644c4a65330847582b94fd546ad50ff07461cb4291e94
+DIST mozilla-thunderbird-2.0_beta2-gu-IN.xpi 210522 RMD160 94f5a66504aa649cf9dd54fe9033dfb94f2458af SHA1 b8f66bee7f36241f3ad032881eb67eeefb05d6a0 SHA256 2f9ec5236b901b4199efed043e6ca47f25e5ad1afbd09857ff1ce92d733df3a2
+DIST mozilla-thunderbird-2.0_beta2-he.xpi 156014 RMD160 d78e2f78ab61db25e1f229c16d7d9829dd0b26cf SHA1 f29cc4503db2e1a6011ab02d25ebdee5442e3b6f SHA256 5dc3fb3115028f44d295ec06a5192861335ed819e83d76b380f2357ef3554799
+DIST mozilla-thunderbird-2.0_beta2-hu.xpi 189864 RMD160 f874a62b72fd62418db09455a617c45dbd91c4be SHA1 dc9f730be870dbb52d7681fb461375866bf338f8 SHA256 469181d9480b18007d265d5f2b25a9e1e600ba1fbeec8d776cd241eb8ad30722
+DIST mozilla-thunderbird-2.0_beta2-it.xpi 150967 RMD160 8942fd6cc390e430783453ef563b77bc4694a7ef SHA1 b2083b1f1b662de28f328646d06dd470a1af5671 SHA256 dccf41c24c4ec6644239a1563a4f98360e5e25ca22fdfce544d1848f20e6724a
+DIST mozilla-thunderbird-2.0_beta2-ja.xpi 197126 RMD160 40e23ab7d9d4333db412ea9db3a4dadfd7839e47 SHA1 634e6b524d2b3046446e31835ac04da65ab5e8c8 SHA256 e72f12a24e19d8aa9594ebce760d2c8a072f9561ce63bafb637621c774acce12
+DIST mozilla-thunderbird-2.0_beta2-ko.xpi 168293 RMD160 1700147ce833f85447b28e96d10d11f3c4806513 SHA1 dbd6978657dd5f9b0a943a4b0feb4db24b3b4c0d SHA256 520dfa0d1673f959b5256d21dde1360b3439b72f7ac1516912142ae44161dad1
+DIST mozilla-thunderbird-2.0_beta2-nb-NO.xpi 181673 RMD160 a22dfebb4f2e4a90fe9dbf40f21bdd4064fef90f SHA1 b5e16f95ef84700d3abfceff22dcb0d6e8cd92f3 SHA256 c14d04ad998cc716d81b471a36681db2b6f4acbadf0c6650be01516ff0165d17
+DIST mozilla-thunderbird-2.0_beta2-nl.xpi 182500 RMD160 75ad50964c0f7bdc689bbbb88877488935353665 SHA1 033d84ddff18581f023cdc61690f12969eb06d64 SHA256 b68b1904cb573172ecc5b9e67b76a4676c128df1e08b4a2d753f05fe02839785
+DIST mozilla-thunderbird-2.0_beta2-pa-IN.xpi 203098 RMD160 ba1b80f96f3456948cb6b6be9b0c818bc0114f0e SHA1 a682d02e74b2c0d29a9a62027f2f48617fca5f95 SHA256 9868763cd83d946b436ac1646bb23e44130346bbabc14e89d35f467084adb18e
+DIST mozilla-thunderbird-2.0_beta2-patches-0.2.tar.bz2 26151 RMD160 69590103844c3b8f2869843b4781ee2d37520ed1 SHA1 0ee3ccc8b72243872492da92bae2925a46140a4c SHA256 87d107b17745d1be1cfe488276bb9c70afdfbebb9d02a52ecdac43559e3324c8
+DIST mozilla-thunderbird-2.0_beta2-pl.xpi 176180 RMD160 05e2892cd1a6c94d09f1cf4ae53c4c5dba5afa5e SHA1 cf2c65a2730bd6aaca77048f8e2cc7a223af8d12 SHA256 396352ba86ea7a749f1f629cf412b4a829f82f0c0bce3da340337c54da0a7cfc
+DIST mozilla-thunderbird-2.0_beta2-pt-BR.xpi 181404 RMD160 a5002fbcfb22bbe13ca84f714a54e91ce4b387ef SHA1 a0b931a4c9ee93f80c39c8fd4bd022b3bbb9fb92 SHA256 d048a9bdf05c3257407f2e008c4f2feaa4db36ab59d789972def14025b290fcd
+DIST mozilla-thunderbird-2.0_beta2-ru.xpi 170946 RMD160 9721b80b65020d7da01cce1b87116907eb67f9d8 SHA1 6fb98a3f0722699ac23899e37b9ca5ff320c6962 SHA256 3030e7852a211d158f54c7f18dae983c8c1d7e67a845055c178c2b823157ce12
+DIST mozilla-thunderbird-2.0_beta2-sk.xpi 190062 RMD160 fe7d4c9435c24efae891e71fa921a8bbcc38f18c SHA1 a968aaa389e4a1332676df7d2ca5a7641e8d9ed6 SHA256 c33c863efacd79a0b6e730d1746cf9d4f3a37720d8c05488b2e28158dba66656
+DIST mozilla-thunderbird-2.0_beta2-sl.xpi 186273 RMD160 392170d018ae84ecb3c846a020dba3102817f6dd SHA1 c125c624e8af068ea183e4fde5f577e924d21e4f SHA256 144cbe3fb75d52e28cc40eb33c84e5261c28eb27ca54b2d75caaa52cd9c62aaa
+DIST mozilla-thunderbird-2.0_beta2-sv-SE.xpi 190210 RMD160 d9662bc214d1982d962a8be93525753a44f31e68 SHA1 935804169fbe988f83d358b5e9943b5c79ea1212 SHA256 5c3038bec73cdc5119b5fad742694a3163ace3f307bc23141f3a822b77eda2b8
+DIST mozilla-thunderbird-2.0_beta2-tr.xpi 156291 RMD160 7f39759148acdb85230ac2949f7a0a096ae9205d SHA1 a754ead20d6f38e95002fcb61e0c98761d92d69e SHA256 301f85cf0f3b6be675fcbd32d6f051ca0f7e5b23549984c6457c3b808e4161f3
+DIST mozilla-thunderbird-2.0_beta2-zh-CN.xpi 154085 RMD160 62615cfe29c8830c396b271b2fe494bff9b26726 SHA1 e33ba933ae192759ffcc931c8af6f1a0cb6bcb5f SHA256 db837730f88d8112bf9145dea6ff374e6ba4149699856efadfe69a343a23e6ea
 DIST thunderbird-1.5.0.10-source.tar.bz2 36159990 RMD160 926484cd1880e7921bf10ba0774064e43acc9283 SHA1 a6467c946f9e668bcf7b3a06dcaeceb601b98fce SHA256 9b6a5a2b893594180863d4cb412a6920c698d68d8ea047c0eb38c9794e74338d
 DIST thunderbird-1.5.0.8-source.tar.bz2 35984263 RMD160 b383c05050fba58f922eb897687f2be86f70c39a SHA1 25dd00161e2b4a5bc2968ef4b9547e4431296a33 SHA256 dbe85085d627875f44984529f160bd53e9b7667a134b42c295cba2e6d4691bcb
 DIST thunderbird-1.5.0.9-source.tar.bz2 35970591 RMD160 d1efc6bd0585ce2222d0bc3065a4f748a2f0f635 SHA1 ff1b900861422b5c657a5302d9b1deb0601a42e2 SHA256 db61537e9fa38cf00f2c28cbda48b2f6885571b9b171b543963c3ae1a3b6dffe
-DIST thunderbird-2.0b1-source.tar.bz2 37027006 RMD160 f1efeba3181c20e283f530f70bfca76abfd6317d SHA1 0edfe00dd32454b7e03c01c0eb773339fd74707a SHA256 da711ee9beaf0c1072ceb8e6e35984ae5b6c8f71cbe1255485a380ebde393f64
 DIST thunderbird-2.0b2-source.tar.bz2 37092627 RMD160 8c4a3c950bbe8a52a9a901a48fb0d5f248b578f7 SHA1 cb5ee6baa2087908da56044f601e0aa5ffaec573 SHA256 9556338b782c93e737dc084f5096352cb5500a7ae839fa2e6a2d46ebad433b16
 DIST thunderbird-bg-1.5.0.8.xpi 220781 RMD160 445c0ddd8484fee0a47665ecd8bb1ec56b98de0f SHA1 6c5579a5266fa13b9c0ec16534e7fc18e4b5009f SHA256 570287d21cfd7be8f4d3b5033bcd3f823e4ea8847bca0cb93729fa0f364256c2
 DIST thunderbird-ca-1.5.0.8.xpi 183257 RMD160 ba9022243550b147ecd9648d72666d90378f9a00 SHA1 a47328a29f494d23f12a65591ca6d427e3c58f37 SHA256 bde1013b545e4cb11501c82235cd0730a9fdd90c4d5187cf0a99fadfebae5be8
@@ -123,18 +156,14 @@ EBUILD mozilla-thunderbird-1.5.0.9.ebuild 8040 RMD160 ffb88e4e9ec241c202c4307bee
 MD5 3774ff8c43c05eecda6205f132f0905c mozilla-thunderbird-1.5.0.9.ebuild 8040
 RMD160 ffb88e4e9ec241c202c4307beea56ce09fa2919f mozilla-thunderbird-1.5.0.9.ebuild 8040
 SHA256 ecec9bb4911a852fce7edd5b1879a9fc7f399fba7a6e12589297f2d6857ce8ab mozilla-thunderbird-1.5.0.9.ebuild 8040
-EBUILD mozilla-thunderbird-2.0_beta1.ebuild 7797 RMD160 b8d4af6180512c4999523e34f00666bbcbc46e1f SHA1 189cf98e71529da2c0307296de423c36adab9a09 SHA256 a7ae77c88b5703058c8542e125a6ad6cc2190cb550c9c66fda7933bbbc95acab
-MD5 a0e105266ce466790c5b0ccf102a17ed mozilla-thunderbird-2.0_beta1.ebuild 7797
-RMD160 b8d4af6180512c4999523e34f00666bbcbc46e1f mozilla-thunderbird-2.0_beta1.ebuild 7797
-SHA256 a7ae77c88b5703058c8542e125a6ad6cc2190cb550c9c66fda7933bbbc95acab mozilla-thunderbird-2.0_beta1.ebuild 7797
-EBUILD mozilla-thunderbird-2.0_beta2.ebuild 7713 RMD160 9b0c60de34423bb72b49e7a02427885cdc146b2c SHA1 54a2110a97f61372e0c186f8a8d03cba110ff783 SHA256 4e7a2f963e5a4e338510ff36160f2d75d35486e8d04e79ad93a5c5e4ef5165a4
-MD5 7e371e45015acae9832cfc51e09c47cf mozilla-thunderbird-2.0_beta2.ebuild 7713
-RMD160 9b0c60de34423bb72b49e7a02427885cdc146b2c mozilla-thunderbird-2.0_beta2.ebuild 7713
-SHA256 4e7a2f963e5a4e338510ff36160f2d75d35486e8d04e79ad93a5c5e4ef5165a4 mozilla-thunderbird-2.0_beta2.ebuild 7713
-MISC ChangeLog 27368 RMD160 08cea3aad4329918e0760091beea5c24908c9ec0 SHA1 c119b6a0a321815ee19ba368ae9e7a7f77952c35 SHA256 09b784d4d7945be1b05ad3d854df29973a295766388a9e66685130fac15f2043
-MD5 8fd7be7e44d05726c348923d6391417b ChangeLog 27368
-RMD160 08cea3aad4329918e0760091beea5c24908c9ec0 ChangeLog 27368
-SHA256 09b784d4d7945be1b05ad3d854df29973a295766388a9e66685130fac15f2043 ChangeLog 27368
+EBUILD mozilla-thunderbird-2.0_beta2.ebuild 7909 RMD160 2c5b56d2325d78298b8ccefc50c49db41f7cc2fe SHA1 6162581843abb9739f2240e6c030febcccf44a65 SHA256 cf8a265c896856ff708507cd516d7c23dbc003d5456a9cd2b42cdef7947aac0b
+MD5 8f060d2c4da5878f522cd6fed28f4a79 mozilla-thunderbird-2.0_beta2.ebuild 7909
+RMD160 2c5b56d2325d78298b8ccefc50c49db41f7cc2fe mozilla-thunderbird-2.0_beta2.ebuild 7909
+SHA256 cf8a265c896856ff708507cd516d7c23dbc003d5456a9cd2b42cdef7947aac0b mozilla-thunderbird-2.0_beta2.ebuild 7909
+MISC ChangeLog 27801 RMD160 44953dd869c9c16ebde5b0d73e8f52e3fce58fd3 SHA1 2e830a6cbe7ad44056513c6336034ddb6f4c7b5b SHA256 2e82c35b9f56ff1fb6085326838bf255b7309c5a14bd0b48e27dd5e39a86bebc
+MD5 54c681603e0316345a8177546b4e2b44 ChangeLog 27801
+RMD160 44953dd869c9c16ebde5b0d73e8f52e3fce58fd3 ChangeLog 27801
+SHA256 2e82c35b9f56ff1fb6085326838bf255b7309c5a14bd0b48e27dd5e39a86bebc ChangeLog 27801
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
@@ -148,9 +177,6 @@ SHA256 06225888dbccef70140220a43a35f722e32594f333a02007d188ce658edd3d4f files/di
 MD5 5e97403c3402f75746479b345d88544b files/digest-mozilla-thunderbird-1.5.0.9 9754
 RMD160 ae8829eb6ac3eba347e944fc995702cdc498975f files/digest-mozilla-thunderbird-1.5.0.9 9754
 SHA256 9dab9c81c54681ae7c33250a964e9756348e77e3aa7ad97fde4f38fd3022cc99 files/digest-mozilla-thunderbird-1.5.0.9 9754
-MD5 0d75ba13e377d9e7b23eab9066eccd60 files/digest-mozilla-thunderbird-2.0_beta1 611
-RMD160 70b6338fcf48f3b7e6e148a59a69692be9d2c540 files/digest-mozilla-thunderbird-2.0_beta1 611
-SHA256 f2839082d663c6630a133b0b2bd8c87f1df565bc3994cab9eb724bccde8f51b7 files/digest-mozilla-thunderbird-2.0_beta1 611
-MD5 029b03a683fc014dd41163dab545c880 files/digest-mozilla-thunderbird-2.0_beta2 608
-RMD160 a4382ce9f5a8288cf81edec2e7597c1b930f3592 files/digest-mozilla-thunderbird-2.0_beta2 608
-SHA256 97b09d00e7f77f4632181296514336276b9ee486e619a05cf766422abfff72b1 files/digest-mozilla-thunderbird-2.0_beta2 608
+MD5 9fa00f5b090ce210077b8bb348aa1e70 files/digest-mozilla-thunderbird-2.0_beta2 8492
+RMD160 09a30ff3723d9574cf9d2057fea2a099263346e5 files/digest-mozilla-thunderbird-2.0_beta2 8492
+SHA256 0e77354a61b9d72fabd9a1a19b60e9389f0e04d9d68a07e99d7e19190b0b1e54 files/digest-mozilla-thunderbird-2.0_beta2 8492
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-2.0_beta1 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-2.0_beta1
deleted file mode 100644
index 8350b498001a..000000000000
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-2.0_beta1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c4faa5abf2c3dc68f09713d0418cd9bb mozilla-thunderbird-2.0_alpha1-patches-1.2.tar.bz2 63079
-RMD160 ae0610540b2815594e870bc0bc2009be9f7bac3d mozilla-thunderbird-2.0_alpha1-patches-1.2.tar.bz2 63079
-SHA256 92cfc062125efb5769f5b9d6a7e03c57323b39fb87c28b64636cffbcbab4100e mozilla-thunderbird-2.0_alpha1-patches-1.2.tar.bz2 63079
-MD5 9cb9b8f3a3f76f608f8bba919c92e6d1 thunderbird-2.0b1-source.tar.bz2 37027006
-RMD160 f1efeba3181c20e283f530f70bfca76abfd6317d thunderbird-2.0b1-source.tar.bz2 37027006
-SHA256 da711ee9beaf0c1072ceb8e6e35984ae5b6c8f71cbe1255485a380ebde393f64 thunderbird-2.0b1-source.tar.bz2 37027006
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-2.0_beta2 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-2.0_beta2
index 23633ecc0358..79e446d0b431 100644
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-2.0_beta2
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-2.0_beta2
@@ -1,6 +1,87 @@
-MD5 60a10c483711c4db0ca8a768fa9c6e4b mozilla-thunderbird-2.0_beta2-patches-0.1.tar.bz2 31961
-RMD160 d827aecf75158bc0a4dd23149caba7d79bc4e57b mozilla-thunderbird-2.0_beta2-patches-0.1.tar.bz2 31961
-SHA256 bfcaa6b4992993dc6323a3d4a102eef673c8cef99d2b1a6498049d26ae59edbe mozilla-thunderbird-2.0_beta2-patches-0.1.tar.bz2 31961
+MD5 c568b14177aaccbfe57610c3be8af4fa mozilla-thunderbird-2.0_beta2-ca.xpi 182595
+RMD160 b8b0560009a55861ac2ef166852096879ecbb431 mozilla-thunderbird-2.0_beta2-ca.xpi 182595
+SHA256 efb810b27cab29373a92f23fb05e459ddcdfc4f0765939ee40c6df810798a92d mozilla-thunderbird-2.0_beta2-ca.xpi 182595
+MD5 9b000eae371d20ee65b1653edd2fc657 mozilla-thunderbird-2.0_beta2-cs.xpi 184397
+RMD160 6e1f567b7e5f1f754b8c0f95d6ed89f07c7d5212 mozilla-thunderbird-2.0_beta2-cs.xpi 184397
+SHA256 c7675e21b14a6df6bf217243f1153b308db3b918b6f38b573b9830b4b5e8d431 mozilla-thunderbird-2.0_beta2-cs.xpi 184397
+MD5 c7d24951bdac629d0123c0b83193b13f mozilla-thunderbird-2.0_beta2-de.xpi 156345
+RMD160 82ba0a766eb29afa24d557f2262fdf03fc8e475a mozilla-thunderbird-2.0_beta2-de.xpi 156345
+SHA256 f75d2c5cf2e37bbbfbaabf9cde20f2f089dea6ca1421f5f32323d3ae917518b4 mozilla-thunderbird-2.0_beta2-de.xpi 156345
+MD5 40976e7abc6a60abf29260c77ae21ef2 mozilla-thunderbird-2.0_beta2-el.xpi 181451
+RMD160 a0fcf3ebcde6535c953e679abddc4d61cff4b66b mozilla-thunderbird-2.0_beta2-el.xpi 181451
+SHA256 2767b88b4f6c7df874557e83737a47e6cabbbe3ea36c093ac024ed4a7e90e1c1 mozilla-thunderbird-2.0_beta2-el.xpi 181451
+MD5 c90528d94899bcd88b8c7b41041759b8 mozilla-thunderbird-2.0_beta2-en-GB.xpi 171407
+RMD160 7b83678b3b958e6a52c23c42a33c7dfea3dc6056 mozilla-thunderbird-2.0_beta2-en-GB.xpi 171407
+SHA256 acb71be48e7b77b8c8d98c8268904ef30c25da7565160f7829a0b93d05d73c27 mozilla-thunderbird-2.0_beta2-en-GB.xpi 171407
+MD5 7e5efc800ed71f641e81a39cdc12d35f mozilla-thunderbird-2.0_beta2-es-AR.xpi 183049
+RMD160 0c36e103e1ed3b059f59d78285677b46cd3d181f mozilla-thunderbird-2.0_beta2-es-AR.xpi 183049
+SHA256 cac24c9b7a9114dae3725d2ea49071c64187a5d7f7095839016d4cea6da375c0 mozilla-thunderbird-2.0_beta2-es-AR.xpi 183049
+MD5 d457d8a545d2288d12833ab3df580ff2 mozilla-thunderbird-2.0_beta2-es-ES.xpi 145831
+RMD160 b8d0ece073952d6e7b6fb19be7ec3d965c6e6438 mozilla-thunderbird-2.0_beta2-es-ES.xpi 145831
+SHA256 a47e6b7442b6684c3939ce4566792184f5533116a4ab5094f3adcd20f098b568 mozilla-thunderbird-2.0_beta2-es-ES.xpi 145831
+MD5 79c68893bba0fa22a4830219801366b2 mozilla-thunderbird-2.0_beta2-eu.xpi 180040
+RMD160 0a704cc00fca5c2e90d15e7f317da7b2f3bbf930 mozilla-thunderbird-2.0_beta2-eu.xpi 180040
+SHA256 9009e95c7bbf5d23b47a277db60109221ee33182489754838121525c6be906bb mozilla-thunderbird-2.0_beta2-eu.xpi 180040
+MD5 174e174eb7551758ff5fae978d2e74c3 mozilla-thunderbird-2.0_beta2-fi.xpi 185546
+RMD160 8b12badcf5b3a44563e3696bb2365d6d585b30d2 mozilla-thunderbird-2.0_beta2-fi.xpi 185546
+SHA256 1ca57e2d9e8076216a1a518ed6ffd303acc0a91f9e22e8bbe3d966d37f3ba109 mozilla-thunderbird-2.0_beta2-fi.xpi 185546
+MD5 f2edfdafc4e2c8b407273adfa5d628e8 mozilla-thunderbird-2.0_beta2-fr.xpi 189298
+RMD160 9ce5da895d87857e6180af393ec3adf8cc9f2b10 mozilla-thunderbird-2.0_beta2-fr.xpi 189298
+SHA256 3e7b9fb44a62309a988644c4a65330847582b94fd546ad50ff07461cb4291e94 mozilla-thunderbird-2.0_beta2-fr.xpi 189298
+MD5 26a688686e2962730310ec6dd2073a3a mozilla-thunderbird-2.0_beta2-gu-IN.xpi 210522
+RMD160 94f5a66504aa649cf9dd54fe9033dfb94f2458af mozilla-thunderbird-2.0_beta2-gu-IN.xpi 210522
+SHA256 2f9ec5236b901b4199efed043e6ca47f25e5ad1afbd09857ff1ce92d733df3a2 mozilla-thunderbird-2.0_beta2-gu-IN.xpi 210522
+MD5 e69d067087d2c1135619e0f4cd35b2c2 mozilla-thunderbird-2.0_beta2-he.xpi 156014
+RMD160 d78e2f78ab61db25e1f229c16d7d9829dd0b26cf mozilla-thunderbird-2.0_beta2-he.xpi 156014
+SHA256 5dc3fb3115028f44d295ec06a5192861335ed819e83d76b380f2357ef3554799 mozilla-thunderbird-2.0_beta2-he.xpi 156014
+MD5 f20930bd06e34860c1d463b181f21219 mozilla-thunderbird-2.0_beta2-hu.xpi 189864
+RMD160 f874a62b72fd62418db09455a617c45dbd91c4be mozilla-thunderbird-2.0_beta2-hu.xpi 189864
+SHA256 469181d9480b18007d265d5f2b25a9e1e600ba1fbeec8d776cd241eb8ad30722 mozilla-thunderbird-2.0_beta2-hu.xpi 189864
+MD5 3fdac603258238242c9bdae4620707a8 mozilla-thunderbird-2.0_beta2-it.xpi 150967
+RMD160 8942fd6cc390e430783453ef563b77bc4694a7ef mozilla-thunderbird-2.0_beta2-it.xpi 150967
+SHA256 dccf41c24c4ec6644239a1563a4f98360e5e25ca22fdfce544d1848f20e6724a mozilla-thunderbird-2.0_beta2-it.xpi 150967
+MD5 ebc80b618e5374d494db99a8a397cc06 mozilla-thunderbird-2.0_beta2-ja.xpi 197126
+RMD160 40e23ab7d9d4333db412ea9db3a4dadfd7839e47 mozilla-thunderbird-2.0_beta2-ja.xpi 197126
+SHA256 e72f12a24e19d8aa9594ebce760d2c8a072f9561ce63bafb637621c774acce12 mozilla-thunderbird-2.0_beta2-ja.xpi 197126
+MD5 45b906e13c51ec3b63e71131c695e241 mozilla-thunderbird-2.0_beta2-ko.xpi 168293
+RMD160 1700147ce833f85447b28e96d10d11f3c4806513 mozilla-thunderbird-2.0_beta2-ko.xpi 168293
+SHA256 520dfa0d1673f959b5256d21dde1360b3439b72f7ac1516912142ae44161dad1 mozilla-thunderbird-2.0_beta2-ko.xpi 168293
+MD5 b5b8945f268cbff293a0192b5048b90e mozilla-thunderbird-2.0_beta2-nb-NO.xpi 181673
+RMD160 a22dfebb4f2e4a90fe9dbf40f21bdd4064fef90f mozilla-thunderbird-2.0_beta2-nb-NO.xpi 181673
+SHA256 c14d04ad998cc716d81b471a36681db2b6f4acbadf0c6650be01516ff0165d17 mozilla-thunderbird-2.0_beta2-nb-NO.xpi 181673
+MD5 740a74b6e44a5f328a6196efc7cdd606 mozilla-thunderbird-2.0_beta2-nl.xpi 182500
+RMD160 75ad50964c0f7bdc689bbbb88877488935353665 mozilla-thunderbird-2.0_beta2-nl.xpi 182500
+SHA256 b68b1904cb573172ecc5b9e67b76a4676c128df1e08b4a2d753f05fe02839785 mozilla-thunderbird-2.0_beta2-nl.xpi 182500
+MD5 7a5f1e4de4486d77f57171c845309481 mozilla-thunderbird-2.0_beta2-pa-IN.xpi 203098
+RMD160 ba1b80f96f3456948cb6b6be9b0c818bc0114f0e mozilla-thunderbird-2.0_beta2-pa-IN.xpi 203098
+SHA256 9868763cd83d946b436ac1646bb23e44130346bbabc14e89d35f467084adb18e mozilla-thunderbird-2.0_beta2-pa-IN.xpi 203098
+MD5 dcb39e065bd6820cc3d57dd654f1453c mozilla-thunderbird-2.0_beta2-patches-0.2.tar.bz2 26151
+RMD160 69590103844c3b8f2869843b4781ee2d37520ed1 mozilla-thunderbird-2.0_beta2-patches-0.2.tar.bz2 26151
+SHA256 87d107b17745d1be1cfe488276bb9c70afdfbebb9d02a52ecdac43559e3324c8 mozilla-thunderbird-2.0_beta2-patches-0.2.tar.bz2 26151
+MD5 300156225fac803cfca3efc39e4dcc22 mozilla-thunderbird-2.0_beta2-pl.xpi 176180
+RMD160 05e2892cd1a6c94d09f1cf4ae53c4c5dba5afa5e mozilla-thunderbird-2.0_beta2-pl.xpi 176180
+SHA256 396352ba86ea7a749f1f629cf412b4a829f82f0c0bce3da340337c54da0a7cfc mozilla-thunderbird-2.0_beta2-pl.xpi 176180
+MD5 bac96bc2500c3f85a45107b83600bd13 mozilla-thunderbird-2.0_beta2-pt-BR.xpi 181404
+RMD160 a5002fbcfb22bbe13ca84f714a54e91ce4b387ef mozilla-thunderbird-2.0_beta2-pt-BR.xpi 181404
+SHA256 d048a9bdf05c3257407f2e008c4f2feaa4db36ab59d789972def14025b290fcd mozilla-thunderbird-2.0_beta2-pt-BR.xpi 181404
+MD5 e1a9a3221d75e79cee116ed3854010e2 mozilla-thunderbird-2.0_beta2-ru.xpi 170946
+RMD160 9721b80b65020d7da01cce1b87116907eb67f9d8 mozilla-thunderbird-2.0_beta2-ru.xpi 170946
+SHA256 3030e7852a211d158f54c7f18dae983c8c1d7e67a845055c178c2b823157ce12 mozilla-thunderbird-2.0_beta2-ru.xpi 170946
+MD5 c62eb18570fcdd3e065b5e89a7b07699 mozilla-thunderbird-2.0_beta2-sk.xpi 190062
+RMD160 fe7d4c9435c24efae891e71fa921a8bbcc38f18c mozilla-thunderbird-2.0_beta2-sk.xpi 190062
+SHA256 c33c863efacd79a0b6e730d1746cf9d4f3a37720d8c05488b2e28158dba66656 mozilla-thunderbird-2.0_beta2-sk.xpi 190062
+MD5 2b83f983e879fb1d325e08a7d15b1e6a mozilla-thunderbird-2.0_beta2-sl.xpi 186273
+RMD160 392170d018ae84ecb3c846a020dba3102817f6dd mozilla-thunderbird-2.0_beta2-sl.xpi 186273
+SHA256 144cbe3fb75d52e28cc40eb33c84e5261c28eb27ca54b2d75caaa52cd9c62aaa mozilla-thunderbird-2.0_beta2-sl.xpi 186273
+MD5 64e4c5b5584c9d1031782455c81013b0 mozilla-thunderbird-2.0_beta2-sv-SE.xpi 190210
+RMD160 d9662bc214d1982d962a8be93525753a44f31e68 mozilla-thunderbird-2.0_beta2-sv-SE.xpi 190210
+SHA256 5c3038bec73cdc5119b5fad742694a3163ace3f307bc23141f3a822b77eda2b8 mozilla-thunderbird-2.0_beta2-sv-SE.xpi 190210
+MD5 8f0d0f6f5f41c3d67ce4ac3c673ae926 mozilla-thunderbird-2.0_beta2-tr.xpi 156291
+RMD160 7f39759148acdb85230ac2949f7a0a096ae9205d mozilla-thunderbird-2.0_beta2-tr.xpi 156291
+SHA256 301f85cf0f3b6be675fcbd32d6f051ca0f7e5b23549984c6457c3b808e4161f3 mozilla-thunderbird-2.0_beta2-tr.xpi 156291
+MD5 ac36817b92dc911685b6cd6338c3510f mozilla-thunderbird-2.0_beta2-zh-CN.xpi 154085
+RMD160 62615cfe29c8830c396b271b2fe494bff9b26726 mozilla-thunderbird-2.0_beta2-zh-CN.xpi 154085
+SHA256 db837730f88d8112bf9145dea6ff374e6ba4149699856efadfe69a343a23e6ea mozilla-thunderbird-2.0_beta2-zh-CN.xpi 154085
 MD5 b633623c460ffef9ba805dd071729890 thunderbird-2.0b2-source.tar.bz2 37092627
 RMD160 8c4a3c950bbe8a52a9a901a48fb0d5f248b578f7 thunderbird-2.0b2-source.tar.bz2 37092627
 SHA256 9556338b782c93e737dc084f5096352cb5500a7ae839fa2e6a2d46ebad433b16 thunderbird-2.0b2-source.tar.bz2 37092627
diff --git a/mail-client/mozilla-thunderbird/files/icon/mozilla-thunderbird-unbranded.desktop b/mail-client/mozilla-thunderbird/files/icon/mozilla-thunderbird-unbranded.desktop
new file mode 100644
index 000000000000..9e45fdeb0ca8
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/icon/mozilla-thunderbird-unbranded.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Mozilla Thunderbird
+Comment=Mail & News Reader
+Exec=/usr/bin/thunderbird
+Icon=thunderbird-icon-unbranded.png
+Terminal=false
+Type=Application
+Categories=Application;Network;
diff --git a/mail-client/mozilla-thunderbird/files/icon/thunderbird-icon-unbranded.png b/mail-client/mozilla-thunderbird/files/icon/thunderbird-icon-unbranded.png
new file mode 100644
index 000000000000..27265e08a7ca
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/icon/thunderbird-icon-unbranded.png
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta1.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta1.ebuild
deleted file mode 100644
index ad1873d54d55..000000000000
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta1.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta1.ebuild,v 1.7 2007/02/21 15:17:16 armin76 Exp $
-
-#
-# There are no linguas supported in alpha builds
-# Anarchy ( Jory A. Pratt )
-#
-
-unset ALLOWED_FLAGS	# stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib autotools mozextension
-
-#LANGS="bg ca cs da de el en-GB es-AR es-ES eu fi fr ga-IE gu-IN he hu it ja ko lt mk nb-NO nl pa-IN pl pt-BR ru sk sl sv-SE tr zh-CN"
-#SHORTLANGS="es-ES ga-IE nb-NO sv-SE"
-PVER="1.2"
-MY_PV=${PV/_beta1/b1}
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/${MY_PV}-candidates/rc2/thunderbird-${MY_PV}-source.tar.bz2
-	mirror://gentoo/${PN}-2.0_alpha1-patches-${PVER}.tar.bz2"
-
-KEYWORDS="~amd64 ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-SLOT="0"
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="ldap crypt mozbranding mozdom replytolist"
-
-#for X in ${LANGS} ; do
-#	SRC_URI="${SRC_URI} linguas_${X/-/_}? ( mirror://gentoo/thunderbird-${X}-${PV}.xpi )"
-#	IUSE="${IUSE} linguas_${X/-/_}"
-#done
-
-#for X in ${SHORTLANGS} ; do
-#	SRC_URI="${SRC_URI} linguas_${X%%-*}? ( mirror://gentoo/thunderbird-${X}-${PV}.xpi )"
-#	IUSE="${IUSE} linguas_${X%%-*}"
-#done
-
-RDEPEND=">=www-client/mozilla-launcher-1.39
-	>=dev-libs/nss-3.10
-	>=dev-libs/nspr-4.6.1
-	~sys-devel/autoconf-2.13"
-
-PDEPEND="crypt? ( x11-plugins/enigmail )
-		replytolist? ( x11-plugins/replytolist )"
-
-S=${WORKDIR}/mozilla
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-export MOZ_CO_PROJECT=mail
-
-#linguas() {
-#	linguas=
-#	local LANG
-#	for LANG in ${LINGUAS}; do
-#		if hasq ${LANG} en en_US; then
-#			hasq en ${linguas} || \
-#				linguas="${linguas:+"${linguas} "}en"
-#			continue
-#		elif hasq ${LANG} ${LANGS//-/_}; then
-#			hasq ${LANG//_/-} ${linguas} || \
-#				linguas="${linguas:+"${linguas} "}${LANG//_/-}"
-#			continue
-#		else
-#			local SLANG
-#			for SLANG in ${SHORTLANGS}; do
-#				if [[ ${LANG} == ${SLANG%%-*} ]]; then
-#					hasq ${SLANG} ${linguas} || \
-#						linguas="${linguas:+"${linguas} "}${SLANG}"
-#					continue 2
-#				fi
-#			done
-#		fi
-#		ewarn "Sorry, but mozilla-thunderbird does not support the ${LANG} LINGUA"
-#	done
-#}
-
-pkg_setup() {
-	use moznopango && warn_mozilla_launcher_stub
-}
-
-src_unpack() {
-	unpack thunderbird-${MY_PV}-source.tar.bz2 ${PN}-2.0_alpha1-patches-${PVER}.tar.bz2
-
-#	linguas
-#	for X in ${linguas}; do
-#		[[ ${X} != en ]] && xpi_unpack thunderbird-${X}-${PV}.xpi
-#	done
-
-	cd ${S} || die "cd failed"
-
-	# Apply our patches
-	EPATCH_FORCE="yes" epatch "${WORKDIR}"/patch
-
-	# Fix a compilation issue using the 32-bit userland with 64-bit kernel on
-	# PowerPC, because with that configuration, it detects a ppc64 system.
-	# -- hansmi, 2005-11-13
-	if use ppc && [[ "${PROFILE_ARCH}" == ppc64 ]]; then
-		sed -i -e "s#OS_TEST=\`uname -m\`\$#OS_TEST=${ARCH}#" \
-			${S}/configure
-		sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \
-			${S}/security/coreconf/arch.mk
-	fi
-
-	WANT_AUTOCONF="2.1" \
-		eautoreconf || die "failed running autoreconf"
-}
-
-src_compile() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# tb-specific settings
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-	mozconfig_annotate '' --with-system-nspr
-	mozconfig_annotate '' --with-system-nss
-
-	# Bug #72667
-	if use mozdom; then
-		mozconfig_annotate '' --enable-extensions=default,inspector
-	else
-		mozconfig_annotate '' --enable-extensions=default
-	fi
-
-	if use mozbranding; then
-		mozconfig_annotate '' --enable-official-branding
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, which breaks us
-	gcc-specs-ssp && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-	append-flags -freorder-blocks -fno-reorder-functions
-
-	CPPFLAGS="${CPPFLAGS}" \
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake -j1 || die
-}
-
-pkg_preinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	echo ""
-	einfo "Removing old installs though some really ugly code.  It potentially"
-	einfo "eliminates any problems during the install, however suggestions to"
-	einfo "replace this are highly welcome.  Send comments and suggestions to"
-	einfo "mozilla@gentoo.org"
-	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
-	echo ""
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Most of the installation happens here
-	dodir ${MOZILLA_FIVE_HOME}
-	cp -RL "${S}/dist/bin/"* "${D}${MOZILLA_FIVE_HOME}" || die "Copy of files failed"
-
-#	linguas
-#	for X in ${linguas}; do
-#		[[ ${X} != en ]] && xpi_install ${WORKDIR}/thunderbird-${X}-${PV}
-#	done
-
-#	local LANG=${linguas%% *}
-#	if [[ ${LANG} != "" && ${LANG} != "en" ]]; then
-#		ebegin "Setting default locale to ${LANG}"
-#		sed -i "s:pref(\"general.useragent.locale\", \"en-US\"):pref(\"general.useragent.locale\", \"${LANG}\"):" \
-#			${D}${MOZILLA_FIVE_HOME}/defaults/pref/all-thunderbird.js \
-#			${D}${MOZILLA_FIVE_HOME}/defaults/pref/all-l10n.js
-#		eend $? || die "sed failed to change locale"
-#	fi
-
-	# 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/${PN}.desktop
-
-	####################################
-	#
-	# Install files necessary for applications to build against firefox
-	#
-	####################################
-
-	ewarn "Installing includes and idl files..."
-	dodir ${MOZILLA_FIVE_HOME}/idl ${MOZILLA_FIVE_HOME}/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include || die "failed to copy"
-	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/idl || die "failed to copy"
-
-	# Dirty hack to get some applications using this header running
-	dosym ${MOZILLA_FIVE_HOME}/include/necko/nsIURI.h \
-		/usr/$(get_libdir)/${MOZILLA_FIVE_HOME##*/}/include/nsIURI.h
-
-	# Warn user that remerging enigmail is neccessary on USE=crypt
-	use crypt && ewarn "Please remerge x11-plugins/enigmail after updating mozilla-thunderbird."
-
-}
-
-pkg_postinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# This should be called in the postinst and postrm of all the
-	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
-	# thunderbird-bin ebuilds.
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	update_mozilla_launcher_symlinks
-}
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta2.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta2.ebuild
index 91560b4312ea..554665ef63c2 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta2.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta2.ebuild
@@ -1,39 +1,44 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta2.ebuild,v 1.4 2007/02/21 15:17:16 armin76 Exp $
-
-#
-# There are no linguas supported in alpha builds
-# Anarchy ( Jory A. Pratt )
-#
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0_beta2.ebuild,v 1.5 2007/03/03 19:24:14 armin76 Exp $
 
 unset ALLOWED_FLAGS	# stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib autotools mozextension
 
-#LANGS="bg ca cs da de el en-GB es-AR es-ES eu fi fr ga-IE gu-IN he hu it ja ko lt mk nb-NO nl pa-IN pl pt-BR ru sk sl sv-SE tr zh-CN"
-#SHORTLANGS="es-ES ga-IE nb-NO sv-SE"
-PVER="0.1"
+LANGS="ca cs de el en-GB es-AR es-ES eu fi fr gu-IN he hu it ja ko nb-NO nl pa-IN pl pt-BR ru sk sl sv-SE tr zh-CN"
+SHORTLANGS="es-ES nb-NO sv-SE"
+PATCH="${P}-patches-0.2"
 MY_PV=${PV/_beta2/b2}
 
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/${MY_PV}-candidates/rc1/thunderbird-${MY_PV}-source.tar.bz2
-	mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
+
+MOZ_URI="http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${MY_PV}"
+SRC_URI="${MOZ_URI}/source/thunderbird-${MY_PV}-source.tar.bz2
+	mirror://gentoo/${PATCH}.tar.bz2"
 
 KEYWORDS="~amd64 ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="ldap crypt mozbranding mozdom replytolist"
+IUSE="ldap crypt bindist mozdom replytolist"
 
-#for X in ${LANGS} ; do
-#	SRC_URI="${SRC_URI} linguas_${X/-/_}? ( mirror://gentoo/thunderbird-${X}-${PV}.xpi )"
-#	IUSE="${IUSE} linguas_${X/-/_}"
-#done
-
-#for X in ${SHORTLANGS} ; do
-#	SRC_URI="${SRC_URI} linguas_${X%%-*}? ( mirror://gentoo/thunderbird-${X}-${PV}.xpi )"
-#	IUSE="${IUSE} linguas_${X%%-*}"
-#done
+# These are in
+#
+#  http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${MY_PV}/linux-i686/xpi/
+#
+# for i in $LANGS $SHORTLANGS; do wget $i.xpi -O ${P}-$i.xpi; done
+
+for X in ${LANGS} ; do
+	SRC_URI="${SRC_URI}
+		linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )"
+	IUSE="${IUSE} linguas_${X/-/_}"
+	# english is handled internally
+	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
+		SRC_URI="${SRC_URI}
+			linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )"
+		IUSE="${IUSE} linguas_${X%%-*}"
+	fi
+done
 
 RDEPEND=">=www-client/mozilla-launcher-1.39
 	>=dev-libs/nss-3.10
@@ -52,31 +57,28 @@ export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 export MOZ_CO_PROJECT=mail
 
-#linguas() {
-#	linguas=
-#	local LANG
-#	for LANG in ${LINGUAS}; do
-#		if hasq ${LANG} en en_US; then
-#			hasq en ${linguas} || \
-#				linguas="${linguas:+"${linguas} "}en"
-#			continue
-#		elif hasq ${LANG} ${LANGS//-/_}; then
-#			hasq ${LANG//_/-} ${linguas} || \
-#				linguas="${linguas:+"${linguas} "}${LANG//_/-}"
-#			continue
-#		else
-#			local SLANG
-#			for SLANG in ${SHORTLANGS}; do
-#				if [[ ${LANG} == ${SLANG%%-*} ]]; then
-#					hasq ${SLANG} ${linguas} || \
-#						linguas="${linguas:+"${linguas} "}${SLANG}"
-#					continue 2
-#				fi
-#			done
-#		fi
-#		ewarn "Sorry, but mozilla-thunderbird does not support the ${LANG} LINGUA"
-#	done
-#}
+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 mozilla-firefox does not support the ${LANG} LINGUA"
+	done
+	einfo "Selected language packs (first will be default): $linguas"
+}
 
 pkg_setup() {
 	use moznopango && warn_mozilla_launcher_stub
@@ -85,15 +87,16 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-#	linguas
-#	for X in ${linguas}; do
-#		[[ ${X} != en ]] && xpi_unpack thunderbird-${X}-${PV}.xpi
-#	done
-
-	cd ${S} || die "cd failed"
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
+	done
 
 	# Apply our patches
-	EPATCH_FORCE="yes" epatch "${WORKDIR}"/patch
+	cd "${S}" || die "cd failed"
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"/patch
 
 	# Fix a compilation issue using the 32-bit userland with 64-bit kernel on
 	# PowerPC, because with that configuration, it detects a ppc64 system.
@@ -136,7 +139,7 @@ src_compile() {
 		mozconfig_annotate '' --enable-extensions=default
 	fi
 
-	if use mozbranding; then
+	if ! use bindist; then
 		mozconfig_annotate '' --enable-official-branding
 	fi
 
@@ -184,19 +187,19 @@ src_install() {
 	dodir ${MOZILLA_FIVE_HOME}
 	cp -RL "${S}/dist/bin/"* "${D}${MOZILLA_FIVE_HOME}" || die "Copy of files failed"
 
-#	linguas
-#	for X in ${linguas}; do
-#		[[ ${X} != en ]] && xpi_install ${WORKDIR}/thunderbird-${X}-${PV}
-#	done
-
-#	local LANG=${linguas%% *}
-#	if [[ ${LANG} != "" && ${LANG} != "en" ]]; then
-#		ebegin "Setting default locale to ${LANG}"
-#		sed -i "s:pref(\"general.useragent.locale\", \"en-US\"):pref(\"general.useragent.locale\", \"${LANG}\"):" \
-#			${D}${MOZILLA_FIVE_HOME}/defaults/pref/all-thunderbird.js \
-#			${D}${MOZILLA_FIVE_HOME}/defaults/pref/all-l10n.js
-#		eend $? || die "sed failed to change locale"
-#	fi
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
+	done
+
+	local LANG=${linguas%% *}
+	if [[ ${LANG} != "" && ${LANG} != "en" ]]; then
+		ebegin "Setting default locale to ${LANG}"
+		sed -i "s:pref(\"general.useragent.locale\", \"en-US\"):pref(\"general.useragent.locale\", \"${LANG}\"):" \
+			${D}${MOZILLA_FIVE_HOME}/defaults/pref/all-thunderbird.js \
+			${D}${MOZILLA_FIVE_HOME}/defaults/pref/all-l10n.js
+		eend $? || die "sed failed to change locale"
+	fi
 
 	# Create directory structure to support portage-installed extensions.
 	# See update_chrome() in mozilla-launcher
@@ -208,15 +211,14 @@ src_install() {
 	# 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/${PN}.desktop
-
+	if ! use bindist; then
+		doicon "${FILESDIR}"/icon/thunderbird-icon.png
+		domenu "${FILESDIR}"/icon/${PN}.desktop
+	else
+		doicon "${FILESDIR}"/icon/thunderbird-icon-unbranded.png
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+	fi
 	####################################
 	#
 	# Install files necessary for applications to build against firefox