Bump to 3.1

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

3 files changed, 214 insertions, 12 deletions

diff --git a/mail-client/thunderbird-bin/ChangeLog b/mail-client/thunderbird-bin/ChangeLog
index 31e2ab18032c..cfe4b6e51b15 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.5 2010/06/24 00:47:01 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.6 2010/06/26 03:35:06 nirbheek Exp $
+
+*thunderbird-bin-3.1 (26 Jun 2010)
+
+  26 Jun 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +thunderbird-bin-3.1.ebuild:
+  Bump to 3.1
 
   24 Jun 2010; Christoph Mende <angelos@gentoo.org>
   thunderbird-bin-3.0.5.ebuild:
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 6e07da644440..1c5150257b4e 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 10thunderbird-bin 36 RMD160 a1b06f9b7f2833c253a71a99a3e6e0521487a813 SHA1 ea9ab715ceef5c61d75ae14e15ef52d61f5cbaa8 SHA256 6e49ce8f02cd128d353625d04c74103ae83c25baf41c76323c61465acb6ca116
 AUX 71thunderbird-bin 26 RMD160 d0356e1c96ba095cba239d34b36dd3af3a366ca9 SHA1 84f7c124ec2fe6f8f4456abeeae305e2599ed390 SHA256 7e655551b67757cfed6cabd6036390a5ce47c20d05d2c0839fb66a3506eb6f05
 AUX icon/thunderbird-bin-icon.png 6499 RMD160 1aeece7719c1c1629b98fc11870641769681a048 SHA1 651d244e96fa0edf13f68f5ef9047432eb6ed3bf SHA256 ff9749e42b82b80425bb52883d63baa53298af7be98870ee6b73f0a6cf0ab22d
@@ -127,15 +124,55 @@ DIST thunderbird-3.0.5-vi.xpi 209941 RMD160 aa06c9c6e26a27e2d5e4acdc22b22acc241b
 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
+DIST thunderbird-3.1-af.xpi 210605 RMD160 af4b84e4fedc14102acb7d726496cb9d0d1aa3d3 SHA1 190f9506460bc0771d88d7d203be5b47f16c5f64 SHA256 88f55b4707d2de5d391d99bf41e2572c7682c14e13ca0e2d3cc764daf5f30d59
+DIST thunderbird-3.1-ar.xpi 230324 RMD160 4194889b482fd444bdc3a9352e732cb6076fd9e0 SHA1 9a65441ccaba60f50559741b4a3fb52c13fa3da7 SHA256 8869b038a1caa5e316dea2eb34e1813ed07b94accc4438666e9c9f998ccf56fc
+DIST thunderbird-3.1-be.xpi 194419 RMD160 5ed01b3418d40a3c3b94c0df21b25e7b749519ea SHA1 9ebd53fd61fdc23cce837bb64b4ffe4b5b7db96a SHA256 d9f7ef4a86c47b2646c04e997a341ea80e0e6fe6f1ced564ecdfcbc98eec39e7
+DIST thunderbird-3.1-bg.xpi 235128 RMD160 95fc31ad2a77603a784ad776e391fbf06489a279 SHA1 7c1d73dc19c6cb7b29d0d27d655448c0ea2851fa SHA256 8a5c3499d64e910980610ebb4892fe550d2552d4afe66126a7a718604a2e0e27
+DIST thunderbird-3.1-bn-BD.xpi 244846 RMD160 43fc6fe919327a781857317e480dee35cb07af07 SHA1 723dca83fdfa443215a8526b8121326535b7e728 SHA256 c1f1c73d24fab30ff7df682cb5cdc7892d65696f8880a184b22c171b5783bef2
+DIST thunderbird-3.1-ca.xpi 219415 RMD160 93ba1e9c4550bca79ec5b097ec679c388e7b4a5c SHA1 e7ee0714747ac47f631338a4ef1599eba80f80ee SHA256 376ec9bd19807ee496ea38a03a29744181859359f08679ccd24dca6e7e7aec73
+DIST thunderbird-3.1-cs.xpi 218156 RMD160 a102e5ec810322503e4ab29c178ed34db2919f7c SHA1 dee9a6fb31f5e8803fea75286378ba806c90164e SHA256 f9a3bbac542283b0d9c67fffb29e1967e31d157c91daa3f7469c1ba716d83e14
+DIST thunderbird-3.1-da.xpi 203176 RMD160 c7c42e5bea83850ef660354f83783febd1dd4e88 SHA1 4d2ac8a1917dcb8ce349d4f3154fd2c0a76ed81e SHA256 e1c592cbc361b63f8104e03e13897a2a558c0305d26c5fe6128e98ce79cc3554
+DIST thunderbird-3.1-de.xpi 222787 RMD160 c19370bf668988b60f55a2ce0b6dc7d2186674d5 SHA1 f042dc0b3f653b11e37dfb802f1c3c434df961c0 SHA256 6e89da8cb65d152e4418726c57583d25dac0ee61d1c5e9297a9251942a2a3bf8
+DIST thunderbird-3.1-el.xpi 210123 RMD160 97cbeb4bea5e88983fa528dfd6bb0fe1ed001e92 SHA1 55ad0b047662aa27350977f5078541a8d438a9e1 SHA256 af6fee3a0a743e10e29889f70e717e42ccdafa917c241bc41c63953a67098a83
+DIST thunderbird-3.1-en-GB.xpi 203672 RMD160 92517f899314fb4e3587c03819b5e364130b5acf SHA1 cfe205b173469075ee49a235769c43c49f71c9c1 SHA256 15dbe9d273ef54008528e3a9c68b06f58a988f27e2860539549da4e1ba830f7d
+DIST thunderbird-3.1-es-AR.xpi 218631 RMD160 4f435e479f1f60e4c7dd0d3d8a0765f71d38bf85 SHA1 c75d10e3daffb33d11968a8cd8488723cbbb9d1c SHA256 caebbe4a6fa6997ab4a1599a2ad23bddfb7817f945d86479e698b4b373714cfc
+DIST thunderbird-3.1-es-ES.xpi 172933 RMD160 295d0f542f567bc844b56674efe1b7bd2868e7e8 SHA1 b7bf50aa9125e2b900e1e5d0ed0a95ced16c4592 SHA256 4bb8079ea322698b493f0c3f8130f34d6a1364a252fafa709702a149616ffc60
+DIST thunderbird-3.1-et.xpi 221756 RMD160 ccb787e28490ac54678eb73fdc28c32fbc9f6df0 SHA1 849aae8beb9104f07d4cc865216ca4145d50c5bb SHA256 cf8e4f90361e7b12ce55848ee35e8c9202a569a65c733dc252bd13ff79fea5ea
+DIST thunderbird-3.1-eu.xpi 211298 RMD160 68aed0eadb0960fe87fb2c5f464400d63091fc1a SHA1 21083b774085f351479372197bdd2ad11176bcbd SHA256 e5e3af57ad4d985b24edfa956fb97ce21a724deb5d8d6d6abfca12c4dc6e8316
+DIST thunderbird-3.1-fi.xpi 219524 RMD160 5fc37995323afa2f0c868248dc3c3a9422435954 SHA1 5760a77fb78c902d02aebab045e0ac59730fdc0e SHA256 9a5d4430441196ef7b78a22a008f3ff325ead98938b9852345177e64ea653c03
+DIST thunderbird-3.1-fr.xpi 221719 RMD160 6b8afa41671aa53d4d1b34fc18255b43884da5c3 SHA1 53a3ddcfaa26bf164acb64855db19398ca427c54 SHA256 37d23eee9ebb2831cbb8805eaf1141eacbc8096caa26cb352a0b4c9c2da49767
+DIST thunderbird-3.1-fy-NL.xpi 221121 RMD160 fc8b5eafabeb142f776402676dcdfc5b88adffd0 SHA1 eb4ce0c4c8c2d7ee9520f3f97912837f121a94ca SHA256 13969a28e21aa6814b3d475069a804569636ae46bfcda6bac1da0ec7d4927987
+DIST thunderbird-3.1-ga-IE.xpi 219455 RMD160 1f29ce79127b6114176115e15c0fbd9a9cefb4c7 SHA1 989436958228c8cbb3fc76d264404edaa207952e SHA256 1eb890bac43fed777ad499e7b9c22b47d8f6566067a2944ab78f92c9d6dc908f
+DIST thunderbird-3.1-he.xpi 204915 RMD160 e25e002b3096b1fcf5219b36efa17a1ede0bd763 SHA1 f37b8b6ac6ae600521fbbd0ca49837a396d1626b SHA256 13fac2a5deacf208235dfb2fccb38b160c996482678c4c410bf156dbc51d20c0
+DIST thunderbird-3.1-hu.xpi 226088 RMD160 cc07e13b1c1d08cbfa027624454b56c82c9ff296 SHA1 9441d5e9d311211b43c254ab34b1bd6af71db28c SHA256 6a9dd5e1fcf60fee8cbb3b0ab8ee17184098d67d9a913cd893c88850d72798bf
+DIST thunderbird-3.1-id.xpi 185831 RMD160 74fb31219cd1dfd667d83a2c863006a39f0169f1 SHA1 f5149dd9e5bf46ca06cf3e1785aca60790a723f3 SHA256 f00e7915bd3e85643691671a2e28a2209694d7f129a13df4be54cdfea9e3aaf3
+DIST thunderbird-3.1-is.xpi 213916 RMD160 d01586ba9729fac69879a6d2acd55985809b9426 SHA1 d4e3e125893652751373605a8c1cf3de7dc782d0 SHA256 3909ef72d2f06162b312dd536c0459bb98161d2a5458d01fe157a92c04f2a502
+DIST thunderbird-3.1-it.xpi 171437 RMD160 97199350faea79fc36f8601766893fe054fc7dd7 SHA1 2b3f9dc1875994f3f777511cc6faa1cdf4666932 SHA256 b1daa4e4638541ec0fba2a2ead091442f830124a77abecbe677fa044fb478bdf
+DIST thunderbird-3.1-ja.xpi 236544 RMD160 99b60ae8951694608e0ff6e2cf7982a9b84c49b0 SHA1 38f240bf1a2adedaab75c19e1665ce324e291fd7 SHA256 9b8dbe737ac89e229841df84a4f5de8e6a5dbe5e0d50a46a89d60017209a9f4b
+DIST thunderbird-3.1-ko.xpi 194776 RMD160 c65c2fc8b552d1f3ff4dcbe90193d19e50715e74 SHA1 c66f9807c61dec40a76ec95c6385ed6f76bc06b6 SHA256 d674ae717a289f6d782199f1d147b0a108cdfd5c5ea0c137240da5341b8b4cba
+DIST thunderbird-3.1-lt.xpi 235344 RMD160 a7639b04a00f268db16e2b38b5bf0f623867f98a SHA1 2cb92c71bb901da3dce17336c3566060e0a15d96 SHA256 dadc0e6b9452e872d6492315f8017409bade5231396321be17df5e7d83cb045a
+DIST thunderbird-3.1-nb-NO.xpi 213930 RMD160 04d3dcf5862d4db3c13330c6374d9195476895f4 SHA1 1f85e30eedba3fb3b876d365d3043d3e507f8616 SHA256 382ea064171c8f709eb42b74acdf3c0c26a4653f732db4dafdbadf9f37249da2
+DIST thunderbird-3.1-nl.xpi 216651 RMD160 d62db05b32f71c1e3dff0fd7db72171693ffa7ab SHA1 b1855f686c14b7fe05a6d126edce765c1328d21e SHA256 1c8bc50a5e0fd406bd0157f8b06b296f416c24d45b5023bbdfc73c8bca98b76f
+DIST thunderbird-3.1-nn-NO.xpi 215652 RMD160 82b3c925b09584b46b4fb5b627d320cb5021a13b SHA1 d551ca593f87f4883c474cd6f3dba2df175b71fc SHA256 56445543cea1c4acb2a88f226852965da59451be4193ed55a8a51d63f3031fd5
+DIST thunderbird-3.1-pa-IN.xpi 241065 RMD160 82dc24fdc333c9ec818bf07edd28de92622ce050 SHA1 754d7e92bbbb85706b45aa0fe1d5b31be8348998 SHA256 0f877a8c14a66b8ce80d38e37f9ee942340bc33c5047f98bed75bb479f12aa7c
+DIST thunderbird-3.1-pl.xpi 203963 RMD160 c6e07ce87b99b68bdc8b4a17b64060ff60f33f23 SHA1 d632bf70b52bfdaa95ab8ff68855ec97eaf9031d SHA256 028be3d3d5c53aff173a1c5be764c0b73d02069833bea631b11dbaf8c73b8c17
+DIST thunderbird-3.1-pt-BR.xpi 215013 RMD160 67acf880a063d3239d42553c9ca6af9ac859a065 SHA1 f3c2083c86d91e4345a12bee75d978c688e65acd SHA256 89076bf14f03497d47fd62dacd31789a15660920f9489c0b271c50b17d06bf78
+DIST thunderbird-3.1-pt-PT.xpi 214280 RMD160 36a25eaac7e2082175a5d4c50a5ebdfac2756759 SHA1 a2c5d821402560755837baf12f8cfc0ab1de6949 SHA256 dd1af1f6fa1244c0ef720fcf6ba85a4937c4b5c8ec7bf8c0fba3aacc66ba199a
+DIST thunderbird-3.1-ro.xpi 221248 RMD160 8e8772ad1283dfad6224f02dd83109b068e1e4f2 SHA1 7f2895a13d8196d0a0fedc55de9c7b5f03bf5171 SHA256 ba12fcdb8e8cd5496dc4566fe1a0a20c6aa0f8026f2aa478c383db6fd12cd132
+DIST thunderbird-3.1-ru.xpi 198124 RMD160 b48af798879813e52e54897d126e17c7f7e6b90b SHA1 4896959407f2713495bb76b413991d9a8c583053 SHA256 14f961ce4535f42464f548a15bdefb8e5cd26800566bdc4c3be6c553e2dc9f93
+DIST thunderbird-3.1-si.xpi 246122 RMD160 82309cd83d6e9b9ac94f706ce35d58b6b1c0fb31 SHA1 00403c18c2e1a0370a2804dc007e864a0ed247dc SHA256 6861ba96d5873457b704d80d66582e126e29737629d5e53d302ffdcef19f6152
+DIST thunderbird-3.1-sk.xpi 224552 RMD160 309bd77eb2cbe4dcbf7756e57429fc05c03ca5d6 SHA1 0d1ae1d6278dc24dae2df97550dd1cd9442ea29d SHA256 6e67bbc3773055e36e68936f20e2a0b71fa9cdff2aa755fb89fc8737c42663ec
+DIST thunderbird-3.1-sl.xpi 218480 RMD160 56fed9c213992a3889044cf06e940f58a4cbc46b SHA1 fcf4ad29bcd6e5a1fb4e2da3934766b343455cdf SHA256 ca59e896b4f5bcf1e8a4472a34c24ab7e0947add0473d3e82734815af2ee9013
+DIST thunderbird-3.1-sq.xpi 211279 RMD160 68413c214c012fd635779369c3213a4c5176f9d5 SHA1 61639ca28a4d997654d824f77589b5223af98cb0 SHA256 fe9fcb8d8f2c79d8c2656a736692c876fc1f7bac588b792a623c64f64559b1c5
+DIST thunderbird-3.1-sv-SE.xpi 221187 RMD160 8e56ac754fa43de5e293da9f1c102e563f30b841 SHA1 c64dfbae8b2e13fb8df55d2cda7f6b1d599d6a1b SHA256 fbc8c1e117d1a50dbf3a154f60222db275caaebcd590802833c9c2ef3ebd088e
+DIST thunderbird-3.1-tr.xpi 215791 RMD160 cc6c7aaedca7109284daf826d0c90964496ce070 SHA1 657a5fea7c11cb528bd0690de16d6d3629815fb3 SHA256 14dc3a6b6697c065c038fef586702ad09028a6923b083eb1cfb7c89086a67279
+DIST thunderbird-3.1-uk.xpi 244813 RMD160 7f424b4181212292592c33da2ebd80648c857491 SHA1 c689d02ca4933bc33ed0ed4da10c7ee47bc297fe SHA256 6606484b2d32d72491b0cf42dc58f0085aa97077ce214e7d905c4accd7702d83
+DIST thunderbird-3.1-zh-CN.xpi 219648 RMD160 c32269154cab4e037d5ad7424f4145e8b781428c SHA1 a61b4851c911a246da914032a9d2ff50396dee1b SHA256 ba5b98ecf9f88b0e07ea50f9e5eb56b3e0cc3e61636348caefc99c70b357f89e
+DIST thunderbird-3.1-zh-TW.xpi 220411 RMD160 c7aaa900aeaf7c0926d9ad793d9df5a9eca0c740 SHA1 95e9f34de79e2d5f0d098010e899f605a46f820d SHA256 1a16639f2a0dab40a5c14bbc4061bee45f6f553c551287a60575a3644141fe2d
+DIST thunderbird-3.1.tar.bz2 11446854 RMD160 b533fd4e2ea71d2c81c0a4e07e6a49351874c9f0 SHA1 1071b33eaaa4cf19148569e71fd8605a923c4a6e SHA256 7e146da089b47fd3401605d7e081662106202042e39743469ab46b30778fc6d2
 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
 EBUILD thunderbird-bin-3.0.5.ebuild 4484 RMD160 c681eb364fe69ac6b43df96b5dfa2ca87822e92e SHA1 2c60f4875c5fd5af3b58ee1a383b8fd0ea45ce33 SHA256 ecce634290ab7eb1855b6a6cf89a83803f6846d2c8de98375540dc1bed22a691
-MISC ChangeLog 26777 RMD160 56601fa3e8083748f0f7faab32bb6705f5166360 SHA1 32345dc9414c8e25e9fa6df155f445c18fb3406f SHA256 2ef58657bec160a41653f4c8373fa43ed612e8d40c35faf71cfcf338712f27a7
+EBUILD thunderbird-bin-3.1.ebuild 4485 RMD160 cac18859d095908a71d86daaeac39b28b7024558 SHA1 cfd883508fa6581d9863b1a402de0b26ac547f34 SHA256 75598f99ed5ce492519be88fa7b9d5d4655bf94380dc33469cf03cef725a6cb2
+MISC ChangeLog 26914 RMD160 7577c961fac84322c68df1d113fcae6c43d62293 SHA1 3b9a5f27e0bc4fd66f3f72315ce44b99d3f2fc8a SHA256 b098277b80229f289953ddc59ab662213f0ad5ac098b482b357bbe50827832e2
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iF4EAREIAAYFAkwiqyUACgkQmWq1bYTyC0M50wD/SRESqM0RhK1bY35//ElQypNL
-99CXkrtP9qy9IgrOnVUA/Rs4FjgkshKSiRqe3XJEC1VCFt1/0gAc0uL3iY1u5QDU
-=Ils8
------END PGP SIGNATURE-----
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-3.1.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-3.1.ebuild
new file mode 100644
index 000000000000..fe02f74920ad
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-3.1.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.1.ebuild,v 1.1 2010/06/26 03:35:06 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 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_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"'
+}