Bump to 3.0.5; bugfixes, security fixes, performance improvements

Package-Manager: portage-2.1.8.3/cvs/Linux i686

3 files changed, 219 insertions, 2 deletions

diff --git a/mail-client/thunderbird-bin/ChangeLog b/mail-client/thunderbird-bin/ChangeLog
index 6d7c4bec0bf2..1df2e843a9da 100644
--- a/mail-client/thunderbird-bin/ChangeLog
+++ b/mail-client/thunderbird-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/thunderbird-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.1 2010/05/16 17:28:46 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.2 2010/06/19 20:28:50 nirbheek Exp $
+
+*thunderbird-bin-3.0.5 (19 Jun 2010)
+
+  19 Jun 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +thunderbird-bin-3.0.5.ebuild:
+  Bump to 3.0.5; bugfixes, security fixes, performance improvements
 
 *thunderbird-bin-3.0.4 (16 May 2010)
 *thunderbird-bin-3.0.3 (16 May 2010)
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 58ddcf9d2d5f..fdefce784eba 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -73,7 +73,59 @@ DIST thunderbird-3.0.4-sk.xpi 213234 RMD160 2ae50f2245ce0d5246ee4780c4a2d1fb1bc2
 DIST thunderbird-3.0.4-sv-SE.xpi 210596 RMD160 ec3bd5cd21d4f1bcdc68b22cb10073c2257d245c SHA1 1c0b765ef3c042bf9f92101731a902855679de90 SHA256 9334e543e7b16ead6c15510be0c717efb73b3365d85b5cebb0500a654fbc1e27
 DIST thunderbird-3.0.4-uk.xpi 231347 RMD160 0e7886ef0b069ea124bf8815f730086d1a4ca36c SHA1 6db0b8e2ba46fc0cd1a4375bab3e66328b635fb5 SHA256 a35fad57ac46825a4764a4207b92ed1ee8e7e53c856e3b98f3c475983c1ad6cd
 DIST thunderbird-3.0.4.tar.bz2 10957015 RMD160 ddb7997d0883baac14c803f06adcd8783834e370 SHA1 ec7bcf44417e4460e4f62f03f32f19f0bc76653a SHA256 6b241dbb0d7d9c4f94e8fbf945d6857e019f5c64fa27331ad6d3778c02505076
+DIST thunderbird-3.0.5-af.xpi 200321 RMD160 cee5e59195acb0635daaefe56986736b9e32ef50 SHA1 4670ad35ef4208bcfad8fc0ec7e9e71d8bc8438e SHA256 b79ba11f68722d767c63b5c036e911acb39bb83bb8085426d94abd6f06af3c2c
+DIST thunderbird-3.0.5-ar.xpi 218279 RMD160 52cba5a0aaec887a9e26025a2f41e2fdf3b604df SHA1 c79d1d0378e862f9b621ff9621918c39bfb60a7b SHA256 afa33f2d0e550f9755f2cd0be11426e181fc37d436a1b5b12aa533a0e4c8535c
+DIST thunderbird-3.0.5-be.xpi 189166 RMD160 5012d053cefc66390f1bd31aef2b7c6fe2db561a SHA1 cc2b901a85edbb41555e3fdfaa952916b425756a SHA256 be7387bf1c48014ca1b5da6d04c1d75907dfd49258a38cd41518eae72771e527
+DIST thunderbird-3.0.5-bg.xpi 222582 RMD160 0c392774c4117b16213ea6e05242159c47510ed3 SHA1 5edf5e6aeb0acf7cddf3679b4bf8cc1073bdb0d3 SHA256 80cbff57f06d5e0dfb0b60ef77074de6942b0daa96b555a0168f1796c72475c4
+DIST thunderbird-3.0.5-bn-BD.xpi 231495 RMD160 f92922d0f21b801f67e361ccb0f19807735091d4 SHA1 9c0b02ebaba1e6cef2691ce61c047e4a0fc92d90 SHA256 49d4d82b5bbd1a0d0b06b8dd20b0369e6d1811e7c77c8f18600d1ca01817e237
+DIST thunderbird-3.0.5-ca.xpi 207480 RMD160 071bdb3e83427b5b55d7657069527b2e8462275b SHA1 e148e1ee0b69c0fb3e520ad83785300de7cab8f4 SHA256 56359238c3b7dcf99453c3693900aac02f9e20333656ff27f1b684aed18dfd41
+DIST thunderbird-3.0.5-cs.xpi 207791 RMD160 3d238e30ee3eec2ff93ee63af0a72a3fcb51d953 SHA1 cbcf7f5d0c3a62691e35c93a689a505b2c25c134 SHA256 780d58b9292b03424cb9490ed859a395148e6837e933ef3ea09f824186f4cf18
+DIST thunderbird-3.0.5-da.xpi 192236 RMD160 6f7df3a500ff1ff93b2f48fe28bb092e94119a38 SHA1 224b39480617a2b38e0c71c351eba7036bf4c4b4 SHA256 67f4cb665acc68a70a692a59f6e65e43ea2525836af931a6876df21b7d3a320f
+DIST thunderbird-3.0.5-de.xpi 211360 RMD160 6c46a389bdc91370047c0e417a60a6c199f46d2c SHA1 8a162c0141f97846b41d93a2dd67422a80b8f662 SHA256 d8ee6f96133ad38f3e2fb973de3c7bf648659b7b463a23c409c3c696a54f34d6
+DIST thunderbird-3.0.5-el.xpi 226834 RMD160 cd037866c7a5b13217207e258e39019b61a53fd7 SHA1 f6f45a45486efadd73d756840aed20b99131c135 SHA256 3d3f0da5192e06573bdccf939d429f3abd936ebf69f65766d76ce27688a73645
+DIST thunderbird-3.0.5-en-GB.xpi 193345 RMD160 64c9a08633bb4dfdb47770502d1bf462bd2c1b0c SHA1 e25852c3998948e82cea54311fbc4925be2fa364 SHA256 ac17496856dc737c8628178eeaa71888eb9e6557b16b4ec24cd54001a6505f76
+DIST thunderbird-3.0.5-es-AR.xpi 207569 RMD160 cea2bb0aef2dd30f31cfe79c8c710dad3e7b555f SHA1 f15a2267d02f9a093d6fec87f5cce34ed82b9df3 SHA256 c1e0d76a62cf1509e8b15ffc4c71aa5e11ccab95c973101f9707b7877653adac
+DIST thunderbird-3.0.5-es-ES.xpi 168081 RMD160 ed4c9c3a7013e54682c613892d18cc27854c30e8 SHA1 a64eedf555352f8b5d44db1f53877a3b4f189935 SHA256 1b5acfc7d86e9c6aea7f4e82ef14b2d89b4ffb1160dc729e782a33808354edb4
+DIST thunderbird-3.0.5-et.xpi 210546 RMD160 370db541d5730e6fe74027c8172d605072054057 SHA1 e91592a1f12ffdb457114e293755f9ab25e99c9e SHA256 1462ecbab26c6d143d74910ce562914b4c4c58da46c95d25edfde453910c4309
+DIST thunderbird-3.0.5-eu.xpi 200842 RMD160 59de9c8648303e14f06220bb1cb48d709174cd9f SHA1 c0519cb31e8b5158d685a9a897c3bbca82bd749a SHA256 524798127970085d6ff7c3406e92888987b73e4bada1bd139a1431fdb7882723
+DIST thunderbird-3.0.5-fi.xpi 208364 RMD160 a8a996fff67e3c50c9efc80fe22d5f6e430cc881 SHA1 1d348157b1edf583c73052df5513f960fe30e778 SHA256 8b447902d7720309d801a21458bf7bb5343f965efc22195678c3c1d3542733bd
+DIST thunderbird-3.0.5-fr.xpi 210301 RMD160 0b59f6b8c7fb2dab83df0ef41c58ee756252b21d SHA1 79ff9d4a9836b2e2f2b91d6f75923e50811ed6f5 SHA256 eed7eb8a81f6884da553f6765a429fe75bb0f34219858d48531f3d7c9631ffa0
+DIST thunderbird-3.0.5-fy-NL.xpi 209935 RMD160 98c1a371d3171d9fb0b29b1d34a0a13b2ddc4570 SHA1 9862f6d797c408cbf9a241202a1449087dfcdb0f SHA256 3dcf23d8cd1c587e2ed11f05f45497acc2ca9ea8eacc8399e06da7b1ffa39b0d
+DIST thunderbird-3.0.5-ga-IE.xpi 208894 RMD160 e3ecc91d1963c8eb5877ccd81c865064eac23484 SHA1 7b7c7b63a8d03ed418c0aebbf69643d879de9844 SHA256 c66e28db48b9a44f295712537745c1de345e815475bc8262c1610a6011029357
+DIST thunderbird-3.0.5-gl.xpi 204303 RMD160 e6cdde03c2fe2a94e3e1ed6132d47b87056f62b8 SHA1 ba79cc35444a188cdc8e42af882e200ac1e659ee SHA256 25ffe6966cb7c3bf58e5c0c1b02673ccd4720ca5681c1006bd00d8e39f6f13a4
+DIST thunderbird-3.0.5-he.xpi 192154 RMD160 32d6960621a9f9822db6ef09b621f307a3457171 SHA1 c0eb4b4a4647ca8996ccfc7177af2bf2c6a02264 SHA256 65db6c456de574f12454cc6b74c2407b7e6d25016e0396f227a4409c1e62baa6
+DIST thunderbird-3.0.5-hu.xpi 215537 RMD160 6e2d569af451052a7d67fffe218a5080f377148d SHA1 0a515e773cf27efd0b9e613add49ab1357cf5b96 SHA256 ed84fe29be717c3987b5cbe6d6388357e72debf72a221442a13bb66dc6103fb6
+DIST thunderbird-3.0.5-id.xpi 168196 RMD160 37dec16e59f8145ffb3ea9bf56f44b0541771dfc SHA1 8a704421ba52b272f8781212c6ddab5363abc834 SHA256 0f04f63daceeb766dd6d07437e4c2f9c266681ae27a95275939d7dc62617bd7c
+DIST thunderbird-3.0.5-is.xpi 203529 RMD160 6b4e741ad64d9d78784bb3e79e9c4836edba44d7 SHA1 33daaa2102ed7b7c101e5fcba7d41310aca768b5 SHA256 c870d61fe1bc3238764aff432ae152f9da451cc30e3501cd49ab02e9b1c4dc0a
+DIST thunderbird-3.0.5-it.xpi 166869 RMD160 c6d3f1b04b1c14ceef5ce62a39d5f39cf78560f2 SHA1 65628c8b69dbb4644c8dfb7f15f1e6ab1ec3f9a3 SHA256 4b3eab1fc4a2838e2e065c05082541477d02ae7eca38dedbf22e12c23194b5e4
+DIST thunderbird-3.0.5-ja.xpi 224453 RMD160 1c3d0f5d09b414f3505b1d2a723cfc87aec1c61a SHA1 9268b8e1fd77c5e642bb254ec9895132b3173eb7 SHA256 2991114b861052a98151cf88392da42b926178bc57f27f134756c244ca8070a1
+DIST thunderbird-3.0.5-ka.xpi 249030 RMD160 409d77ef7ce77f8b66f9089e4b69fa6595595992 SHA1 f3ccce68a95324c22f7c0ee6d1d07c3e81dc3fd1 SHA256 a059ee8882750f93c9eb5d4749f94897d5ca3d840bcb2377d8c4cedc2c7f41b6
+DIST thunderbird-3.0.5-ko.xpi 186302 RMD160 5d6798232d4fa9a9002e4c3e40cfb0eb0febc024 SHA1 fcc0a2a4314ad2e7ea54c6e191cbaee5c60b70cc SHA256 cc32459eb7d901b759739314acf99d138dfd7a4e89206b1d526c3fc087a25bb5
+DIST thunderbird-3.0.5-lt.xpi 224280 RMD160 21a66d75c1ffcd2a042e5024a2dde2862be71cff SHA1 f7d7548b4930e77f9bbcd4940e768c6ed7354cb4 SHA256 610349358a582ff8ee7c852e3b66ffae4af0b07ca7edf5aa8ace96c9978fdeb8
+DIST thunderbird-3.0.5-nb-NO.xpi 202656 RMD160 3e85c61a7bfc51e1911a0eb8101fe65ad9b9282b SHA1 a3128eba48468d2ef1c0c90de6f5c5419e618a93 SHA256 44bee3087c4bc8cac35868d4f390f894961537b1927b27a9fb11e68da0c8d76f
+DIST thunderbird-3.0.5-nl.xpi 205707 RMD160 60c2b9996cdacbd50a4fd6a2263d181887c1bd80 SHA1 f5e9feb1d97e9ca2636185f25f2b8ed47825ef00 SHA256 41135889140b5b04fe5d82520bece1dda1a981bd09c70980ff5e97cfc459a5dd
+DIST thunderbird-3.0.5-nn-NO.xpi 204507 RMD160 6eab246c1253c47864726c76aeba5bee78a41a6f SHA1 4d5228d9cd2c0f1450d99ae82cc928c5fa9c95d6 SHA256 0b598c7ddca0b37a8d5547863f88bedfe79138c7e159bfbbe6b80da45d16d5a2
+DIST thunderbird-3.0.5-pa-IN.xpi 230403 RMD160 fd59648cd31afa47600d6ebb99f948232979d345 SHA1 a476341e6610176d67f386de2ff7ea91d02430a6 SHA256 1e08bb2ebda18afdf2aa343cdc0690e6a4b5335141ec1391c1506d702e1ece61
+DIST thunderbird-3.0.5-pl.xpi 197858 RMD160 fcbdb476f5be8465effa991d2da0cf18fb6fabde SHA1 f707151105b6ef6e522a035100f62f803f0f6363 SHA256 0bec1df886018acd38635c0c604687f29b821dbf63d351488f97d73bca877745
+DIST thunderbird-3.0.5-pt-BR.xpi 204072 RMD160 34562c86d9d6c69fbea44b8e4f5c44303d242aeb SHA1 770624e4e1110803ec886224971cf013abaccc88 SHA256 721f8a34922ca860031d1c66d6a0964e200ce196a16d5b210d7dcdcbb73747a9
+DIST thunderbird-3.0.5-pt-PT.xpi 204135 RMD160 bb9f00df337cea3d29db7a378f6d36034b394a31 SHA1 b8c5275d3f9af6cfe251a4493055f7c4298e74d3 SHA256 dd32c973d1e9bcd29bcc240e062c5c58169506575e3d87645c5c03d27ac4240b
+DIST thunderbird-3.0.5-ro.xpi 210194 RMD160 6c27be7b2e253bc41d7f9168998a592f54a48295 SHA1 59fbeed61b7a865060a5200ccde9a8f31f34f8c4 SHA256 311e95febbebf2bc196a11503f112301243c8a9999f1dd634a9960424ed7c07f
+DIST thunderbird-3.0.5-ru.xpi 192105 RMD160 59a91878b053f5b86cb19593d6dc10e44f15b7c7 SHA1 48710e7fe6d9b237696e1bcadde1592dcf0b8b64 SHA256 a7398d0f70ed641c30d1b80f6cb553fe1bcea96e043be402e9f3b67c7c574256
+DIST thunderbird-3.0.5-si.xpi 233865 RMD160 6abcf7e2807774deff12095805d31578cef41e2d SHA1 0e6f355a300935f124871b679d46a22470ba1bc3 SHA256 a17361e17bfd91493f78a4171c20a64c925117f515d6da2ff568312af7bcae6d
+DIST thunderbird-3.0.5-sk.xpi 213263 RMD160 5ce4c5cf498f391ab56decce14bc2561174ceb7b SHA1 e0fc8f1de15473d9170641dc7da1ea7a75163721 SHA256 58ee1bd38cbbf1db7bfe4997e10bb524d0bf04a71b38aa5e5cd62cf394208991
+DIST thunderbird-3.0.5-sl.xpi 207578 RMD160 b81eed94340e2a03ac15c253e6fbdbd7047e2332 SHA1 d40be40002901f19acbe020288ba81530d76c103 SHA256 e94044e7b4ece0bde813fcca466fb20193497f0c2c3581f7bb49d1ed875b9fd9
+DIST thunderbird-3.0.5-sq.xpi 199477 RMD160 d234ef691131813934350e52a6b02cfbcbdd3224 SHA1 f5c8f4d644d8949611f0d39944816efbabc6b227 SHA256 c96c72b114ea8f1ac294159b24c70dc1f463a49b702b349d806e6ea90632268e
+DIST thunderbird-3.0.5-sr.xpi 224299 RMD160 09a54b4256441c2326597e85ed57c7237cb8b27a SHA1 4b276629baf2a5475cf62bc68207ee6a26ffb564 SHA256 26ee198f55de6eb3a8603697f6b16c603b08e6f29d9ebdb29591bbb49c0310e1
+DIST thunderbird-3.0.5-sv-SE.xpi 210600 RMD160 3b8db6a759659a7f4213e93b5db79cb8bb53e031 SHA1 48e2709f28b750108466d7be89fa4534b07acc03 SHA256 8ba2abdb197c6943f6ff62359cba007fa1dd281269e4f4ff01b45723cb07b39c
+DIST thunderbird-3.0.5-ta-LK.xpi 240878 RMD160 e75de21565884b3c236f364850ace158ae41e224 SHA1 250bd32346a14aa75379479af0732a1cb34b8548 SHA256 821d899f6787d6c50ecc94c9b9db1f84fae9efd8765b97d7a052ad6af833d29d
+DIST thunderbird-3.0.5-tr.xpi 205407 RMD160 cb0d64a4fde81c6087af82caaf099128ef3f4773 SHA1 150da0e964b81dfd7d616d681cb93b90abefbda5 SHA256 9742e640e9ff388822c0d5be026e942c708504399de3e912f776c1a781cb1484
+DIST thunderbird-3.0.5-uk.xpi 231294 RMD160 9fbb258c6e9e0e8b7d53ba49329bc1ed0d4ef7fb SHA1 e52a8a2b8d2acc35094056af2ad2ff9bf1f09e10 SHA256 ab21d57fbc7d037c285712d9b91c11572d08d13a7bf0d0f62be875ad2aa8156a
+DIST thunderbird-3.0.5-vi.xpi 209941 RMD160 aa06c9c6e26a27e2d5e4acdc22b22acc241bd3c9 SHA1 6f7cc4edf0711654984008f448de975151f1952b SHA256 a5616edc0a32db5589f44b1d4ed85d7997a8e6475bbe8af001ec75d13f4cf922
+DIST thunderbird-3.0.5-zh-CN.xpi 208235 RMD160 a1111421d74b25f07eafd3c0ebdf3f614d543c17 SHA1 a71e715a82d34ea70604d2fc3300319548687ffa SHA256 2c382ac699912f04b06eaf3e878b96a566a53f8d25fbfd967130661454e4f6c1
+DIST thunderbird-3.0.5-zh-TW.xpi 208644 RMD160 14a2b34715bab0c5063c63ed1e71980f223d3e06 SHA1 137268253f0262329912515e3df0491d642b2c61 SHA256 0c6d7bb602c89ac886972b33de38c34f9c8e0371ffd8027bbda98f0ae12def54
+DIST thunderbird-3.0.5.tar.bz2 10965753 RMD160 e99ee76dda19eab52afe2a1846e0481393f2709e SHA1 a4faa0f2a29cc28232832c24c9349d9a2a7ab589 SHA256 ff7aa28257d297487c71a07bd5b583b96842043b1e9dce53021901e1140063ce
 EBUILD thunderbird-bin-3.0.3.ebuild 4350 RMD160 7a0d68d25d5abac27d0e33df44fd8cbce7f98047 SHA1 f420042a1b87f3795c0391f868740ea0fc067baf SHA256 1697f2c96e50f61f536285fa6c109f04209e63ac1b2628e027b6248c24cf708a
 EBUILD thunderbird-bin-3.0.4.ebuild 4350 RMD160 b35a1d2b43508bf05225a8a67da7afbd02aba00c SHA1 fe362df029e280983d6dc75e1dcfb04ce5e0f735 SHA256 7be05b96fd2499e19cc8612c8e2d30c8dcfa6f00505d65ef4afb0985f5fcdbe7
-MISC ChangeLog 26228 RMD160 b5b9200d3df07e916c53438bf85483571ea603b8 SHA1 8524f002bb7e591c5898f54670fd269fe924a67b SHA256 ad5a830de600d273921988bcd38a05d3f10acbeade6e1f01f566cf0b0f73d6e0
+EBUILD thunderbird-bin-3.0.5.ebuild 4487 RMD160 f08b01d90751e16f8c45e5155ece8f7e3729d1bf SHA1 9173fca1d41c1775a06c51e52d3b396eee9c17e2 SHA256 b88848bb3e4268d9052229eb3bb7dc492a784efc08189f28407b689e7e0f2dd2
+MISC ChangeLog 26422 RMD160 6b899c2e7afecbad3c559afa95f3097106c997dd SHA1 50632188eb1a2673913a8fa922b882e41fbeb50d SHA256 d8182a51e1d9d037db0c447c66423749f1341e2d88c2bc0c11c83dae9735197d
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-3.0.5.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-3.0.5.ebuild
new file mode 100644
index 000000000000..0965ac217d7d
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-3.0.5.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-3.0.5.ebuild,v 1.1 2010/06/19 20:28:50 nirbheek Exp $
+
+EAPI="2"
+
+inherit eutils multilib mozextension
+
+# Can be updated using scripts/get_langs.sh from 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 gl he hu id is it ja ka ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro
+ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW"
+NOSHORTLANGS="es-AR"
+
+MY_PN="${PN/-bin}"
+MY_PV="${PV/_beta/b}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Thunderbird Mail Client"
+REL_URI="http://releases.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
+SRC_URI="${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2"
+HOMEPAGE="http://www.mozilla.com/thunderbird"
+RESTRICT="strip"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE=""
+
+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/-bin/}-${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/-bin/}-${X}.xpi )"
+		fi
+		IUSE="${IUSE} linguas_${X%%-*}"
+	fi
+done
+
+DEPEND="app-arch/unzip"
+RDEPEND="x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXmu
+	x86? (
+		>=x11-libs/gtk+-2.2
+		net-misc/curl[nss]
+	)
+	amd64? (
+		app-emulation/emul-linux-x86-baselibs
+		app-emulation/emul-linux-x86-gtklibs
+	)"
+
+S="${WORKDIR}/thunderbird"
+
+pkg_setup() {
+	# This is a binary x86 package => ABI=x86
+	# Please keep this in future versions
+	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
+	has_multilib_profile && ABI="x86"
+}
+
+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
+}
+
+src_unpack() {
+	unpack ${A}
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != en ]] && xpi_unpack "${P/-bin}-${X}.xpi"
+	done
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/opt/${MY_PN}"
+
+	# Install thunderbird in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != en ]] && xpi_install ${WORKDIR}/${P/-bin}-${X}
+	done
+
+	# Create /usr/bin/thunderbird-bin
+	dodir /usr/bin/
+	cat <<EOF >"${D}"/usr/bin/${PN}
+#!/bin/sh
+unset LD_PRELOAD
+LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}"
+exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
+EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# Install icon and .desktop for menu entry
+	doicon "${FILESDIR}"/icon/${PN}-icon.png
+	domenu "${FILESDIR}"/icon/${PN}.desktop
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10${PN}
+
+	# Enable very specific settings for thunderbird-3
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
+		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
+		die "failed to cp thunderbird-gentoo-default-prefs.js"
+}
+
+pkg_postinst() {
+	#elog "For enigmail, please see instructions at"
+	#elog "  http://enigmail.mozdev.org/"
+
+	if use x86; then
+		if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' ; then
+			einfo
+			einfo "For using the crashreporter, you need gnome-base/gconf,"
+			einfo "gnome-base/orbit and net-misc/curl emerged."
+			einfo
+		fi
+	else
+		einfo
+		einfo "NB: You just installed a 32-bit thunderbird"
+		einfo
+		einfo "Crashreporter won't work on amd64"
+		einfo
+	fi
+
+	einfo
+	elog 'We have moved away from mozilla-launcher, as it has major design flaws.'
+	elog 'You will need to update your symlinks to use thunderbird-bin as the executable'
+	elog 'to launch thunderbird-bin. If you are used to just typing thunderbird to start, you'
+	elog 'can create an alias in your ${HOME}/.bashrc. Example: alias thunderbird="thunderbird-bin"'
+}