Security bump, bug #357057

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

3 files changed, 216 insertions, 12 deletions

diff --git a/mail-client/thunderbird-bin/ChangeLog b/mail-client/thunderbird-bin/ChangeLog
index 66006cdfd535..ead494166d60 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.26 2011/01/14 17:19:49 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.27 2011/03/06 00:40:35 anarchy Exp $
+
+*thunderbird-bin-3.1.9 (06 Mar 2011)
+
+  06 Mar 2011; Jory A. Pratt <anarchy@gentoo.org>
+  +thunderbird-bin-3.1.9.ebuild:
+  Security bump, bug #357057
 
   14 Jan 2011; Markos Chandras <hwoarang@gentoo.org>
   thunderbird-bin-3.1.7.ebuild:
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index b44aa6fd4ae9..16caf057496b 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 10thunderbird-bin 36 RMD160 a1b06f9b7f2833c253a71a99a3e6e0521487a813 SHA1 ea9ab715ceef5c61d75ae14e15ef52d61f5cbaa8 SHA256 6e49ce8f02cd128d353625d04c74103ae83c25baf41c76323c61465acb6ca116
 AUX icon/thunderbird-bin-icon.png 6499 RMD160 1aeece7719c1c1629b98fc11870641769681a048 SHA1 651d244e96fa0edf13f68f5ef9047432eb6ed3bf SHA256 ff9749e42b82b80425bb52883d63baa53298af7be98870ee6b73f0a6cf0ab22d
 AUX icon/thunderbird-bin.desktop 187 RMD160 964953d1d9f84f4b65adc44fd1db3f3759647c92 SHA1 b4004e682134e603e65d3194d6b3517ce53b821b SHA256 250ca3bbd93dd7505d73c9d29bb85be9cb73619327947bea838ccf6ee69fb972
@@ -51,13 +48,53 @@ DIST thunderbird-3.1.7-uk.xpi 244865 RMD160 82f2870914e11354dbabbc50afd3d6f7dbc3
 DIST thunderbird-3.1.7-zh-CN.xpi 219645 RMD160 373e89d87879c26c1eced73c74cfc5e2fb5d1ad4 SHA1 7e4c21e53c99479aa7d1b947fe72af361fd34f29 SHA256 31372d3c8f2b184536592ad68b0603c4eac076300ba531d6f63ebd14f6f4ff09
 DIST thunderbird-3.1.7-zh-TW.xpi 220637 RMD160 0b4268075f3e625f0f3a1ebc87605fd545cee493 SHA1 31ec9c985f607ea7fcb9c31628fea5acfdfb5b38 SHA256 651023dfef22a2c1a284d9e1b314f885140d153efa7efac4a2c4928f66cf511e
 DIST thunderbird-3.1.7.tar.bz2 11536334 RMD160 bcab4589fc0c287e640f0a1e1eb06bed7de54bfd SHA1 baa317eb8a0eb38c7d4b380d57219ea11c379900 SHA256 1411153af3df78fcd2ecac447e4d9c546ca534fd8a861ac09a3f11613314e1e8
+DIST thunderbird-3.1.9-af.xpi 210605 RMD160 c2d36af032e89c3422ffed329c81119a6323c1dc SHA1 c4c63c458ff0ee3ac159e6993cb3895deaf471d6 SHA256 e7c10eec1f1d75f4daf010d721aba50766a8be3e2c90248c69d412c2c3468255
+DIST thunderbird-3.1.9-ar.xpi 230363 RMD160 82cd47a2d3caa37442ba0734bc8958cfb0ab0ffb SHA1 14fe03fa047f764fc43dfb9853c48494c65d26b5 SHA256 88ebac284316a33b8a97a7528cde1b1b476cc2c8ec3804c53f1b6bd1f8f9b74c
+DIST thunderbird-3.1.9-be.xpi 194405 RMD160 68694e68eeacbf837e40f643a652a714cb00a35b SHA1 11cb3c542ee233bf52ff27b340dd3b1cbe85e34f SHA256 b082f4b12d565d465b062d28bf5f41a763cc2602cc706beab89c8f2bdaeca1a6
+DIST thunderbird-3.1.9-bg.xpi 235177 RMD160 479d1478f2f2e72ad40cbaa851783a2f1f5f7632 SHA1 8db7ab7219b3dfa4cb82a4c25f591521f90c88d9 SHA256 e26e6e2aa084744327073f5ce04c43c1723c4db1e75fb3641d1edf7b0aa00bb7
+DIST thunderbird-3.1.9-bn-BD.xpi 244795 RMD160 e254f4141f7ce2c0636467bf9c176d09bfeb915d SHA1 654db9ddd1feab8c03f1645c39d6803593592046 SHA256 d267ccaeb36cf64c8993f1492544e75652bc397d333b8e9ff5d512cf542e9fd8
+DIST thunderbird-3.1.9-ca.xpi 219304 RMD160 62eb12134a3e15a4f0126d4a3ce1b743f8a08538 SHA1 0d5fc7c0c11ee837116ffd1878b13a1cb59f6d75 SHA256 e35cf1156f1413d650d66103239e263e71b63ccdfde96edaf1b8e31a0c62e79f
+DIST thunderbird-3.1.9-cs.xpi 218173 RMD160 c0b82b64d49174e3c4d7830fc49d0a2c1993fd39 SHA1 579757beee8e1b3734e92daa4dbdbe7db39baf73 SHA256 90108dec5cecdefcd04ea86c1e57cdaa684f5353a2ddbdef56922229bcde1438
+DIST thunderbird-3.1.9-da.xpi 203183 RMD160 b3a8685a600d4263ddf33ca118ec39ec5f0b5361 SHA1 8176f12ecf7e680d649138d4711415aab60a3a5a SHA256 fc580a0740c38f924cdabbfa0005c344809375cc4f5e033e95f38d0c053e2aec
+DIST thunderbird-3.1.9-de.xpi 222766 RMD160 023f25533f30b3eb8f4ef0f7738a2cace5ab6d65 SHA1 cde1e01e9b174ab49f027465181a7b03869382ad SHA256 d8e65f743c842a0696ca51eef59ce9b3fcf7bf6181382569ee269f05aa810f52
+DIST thunderbird-3.1.9-el.xpi 210118 RMD160 0fdf49e4a3122c1f35ef474c99eecb9d68e4a34a SHA1 72e172d02553e0cacd8809d1605492ff9a1a2fcd SHA256 5e0ca68be63e3ac6faf0e39fd193e4ee71fd50dfc15c97ef01bc183c347a1e8b
+DIST thunderbird-3.1.9-en-GB.xpi 203621 RMD160 5b1ad9f6dfe7a037df86a3392ac9fc04ca5b3206 SHA1 39ba6b47464cfb5aed7444f4144e5ca2991c4d4d SHA256 35c7493a5e3e8cfea0a3ef49ef3591527dbe593a73e0faf27d5d59cd16408d88
+DIST thunderbird-3.1.9-es-AR.xpi 218630 RMD160 40a7d9589b40f036ea7f2706d751d0f45c6e5d6c SHA1 ffab52a9a90561882e1d27b4b550b6e5d7da705d SHA256 3a1a530035bdba2231ba29bdafd3fa36edbb13322d3aeddbead73ac007a08f3e
+DIST thunderbird-3.1.9-es-ES.xpi 172870 RMD160 f43a8b84dcb81e4276ceb83ea091a4eaa1c7d7e1 SHA1 3b26cb059fc554fa7365c6350d0b4607b2ba5c5c SHA256 27925c8fcb67381449304f6aa31a1406e4269d711ee74435f5aabf9131c9275e
+DIST thunderbird-3.1.9-et.xpi 221750 RMD160 15503f606389cad008515bbbf725caff5ba10298 SHA1 34ccb3cda1711909c521ea51a851ededa2761f37 SHA256 c75b3fe61301c189cb3179907eb508a672069abaff3d61a11aa64302974fe64e
+DIST thunderbird-3.1.9-eu.xpi 211280 RMD160 bc98a7b5aa8d6a1caa7bed5ad6faa32d8b83dd4c SHA1 3a01f921bf6a9df8772963c40c0ae02fcf896836 SHA256 332ce6aafd91e9d705fc9546a67cf277a03f78d600f6f891f498933d8b71618d
+DIST thunderbird-3.1.9-fi.xpi 219472 RMD160 b6a39c444668b8fa2094ceaae756281101e0d893 SHA1 e7c3a08da578dfd3e38a8007cd0e98c7e8233dc0 SHA256 db3881dfbb88f5648df2b826e0fce6db96ff6dfd7e75805d25c537e89ebf874f
+DIST thunderbird-3.1.9-fr.xpi 221707 RMD160 e9c9bec1f6f937485f8ee25fe37f4f043dd1d825 SHA1 4d8ad3b37a4c6a86017b68b164f27b521fb0067a SHA256 3da6453df46698984f9f7dbcbf0d2ca7cab819f2e6a51cc1882bb235d70371c4
+DIST thunderbird-3.1.9-fy-NL.xpi 220851 RMD160 ab8015f80f1a3cf2483eb00246084ee13d58ca1a SHA1 4549a80493409b0d26947ce8b02b8a769f2f1f0a SHA256 c9e6dc651480689f7a4ad70bbee8f828c7f858952c60dc61b66d43fda912c754
+DIST thunderbird-3.1.9-ga-IE.xpi 219424 RMD160 e2243bd59e8d38a0f4e93f3c182c4fdb81001be4 SHA1 1c6a1b8106286576030982c3f41116bc4466fc3a SHA256 3f15932c1b121ce03c72d2f60ea61fad171d0664277b4eec02cb05042598873b
+DIST thunderbird-3.1.9-he.xpi 204911 RMD160 18a4a551ed4ac4dcbf049dd927709f9dd42b80d8 SHA1 f6604002db2dcad339040e4548fb4841129d794d SHA256 1456b8319fb4e88ea0251699d7425e276e1a1ceaea9d889b86380ee350f05e0a
+DIST thunderbird-3.1.9-hu.xpi 226082 RMD160 9459b6762b0c6208330baaf01ad3fc0656aedba7 SHA1 d6d7023a2b09925d01d84a0cca83ec6454cd1673 SHA256 5fbceab200f0c59387582a5b341eadf3c842bd036141c354c151621a31878771
+DIST thunderbird-3.1.9-id.xpi 185890 RMD160 3f7825be46b926ab4711d26a0d51d5d799320969 SHA1 c97042852c5d6d53c8a0690d6054bb979a9e67f1 SHA256 830eb15912381c11446e52610e30c14194f9554c79f7eb81ae32a8195a8afa0b
+DIST thunderbird-3.1.9-is.xpi 214006 RMD160 cee5d4f3f26750ecab796036d626d065e016500d SHA1 4cef4c87f8197f7db94c6cd549da50ffc2e4b281 SHA256 dd4ece5d22e028520cc8889fa0d25b32229d935a7f4f3b43844164230fa0eb17
+DIST thunderbird-3.1.9-it.xpi 171390 RMD160 57711be79446d5e6742c7531a822f1ddcfe5baa9 SHA1 bf762028135bf55202f50d0fa454de51541b8f5f SHA256 3e1356acf6f6ae390050983a53513c585f3853ea9ca2c69ee766bb0a87a6cab2
+DIST thunderbird-3.1.9-ja.xpi 236562 RMD160 01049ca8e0d507e520410a6aac8448e8dedb7886 SHA1 437bf425c87461584424141d7030191148a523f5 SHA256 a3a5ddb49abbbfa5a6cd10f9d0943a529fc9737d669570e54012a3475faab570
+DIST thunderbird-3.1.9-ko.xpi 194723 RMD160 ed272bc9886519831466d37ae6a2719a480107e3 SHA1 b7e1c8a57f1f2ba4a12a40d3600d8f2cc424b611 SHA256 8125525b3f5f4632094a36ed124327d8fec0adbc358c0caacbe82f25588636aa
+DIST thunderbird-3.1.9-lt.xpi 235289 RMD160 f8df4fab497a1942bf1f264f15120302198f820e SHA1 1c08e652eedd5ce9a6cca729bd2565a5345a830a SHA256 5dd8935581ad778f9d265847d3840e82e433fdb92df92d18644b79e5214ffc2f
+DIST thunderbird-3.1.9-nb-NO.xpi 213870 RMD160 bfcd987ecd21db617b9a36ba05663bf7645c1923 SHA1 c01da35297885d21fd32424165d746208b25cc74 SHA256 6efd6cf6f030ec71a5cb32423815f4e7bb0782e866d8e8d62eeef89cc6dc25a7
+DIST thunderbird-3.1.9-nl.xpi 216627 RMD160 41025cbbb2cf439bfff94cd7094822963f40b1e8 SHA1 1695bcfffe6ee3e6d332c5ca253dccf44d5a3743 SHA256 47a39bbb1bbad0609f639d530184887061d1388aa16eb5593e884e8ac6facc8a
+DIST thunderbird-3.1.9-nn-NO.xpi 215631 RMD160 08aebe614c21135e25280e7244026dfcfe83a8e8 SHA1 f381a468471930fa40793d57aa3d019fd2246dd7 SHA256 af1771f8a8bd02120e841c4e112202958ae4feef3aeb532c738b3618360ca002
+DIST thunderbird-3.1.9-pa-IN.xpi 241097 RMD160 50c8ddfcf4f92a188c9448123688db3f3762fb2c SHA1 b9622a3bf85e5f20fa7c7c1b129a7423c5986cc9 SHA256 b7ac5f93603f89752a070688dad3eeb2dfbcc259a5a93b20243855e9c66963cd
+DIST thunderbird-3.1.9-pl.xpi 203928 RMD160 73ab4c18464a8dd1b508562f74ecb0e7b8ad1b5c SHA1 ffa7ac89aed5168b1203e2460e882a3ffbb65caf SHA256 cc0db5cd192624d19db3356dd7a2a4a121469c524641475255f08268eb968947
+DIST thunderbird-3.1.9-pt-BR.xpi 215015 RMD160 32703934ade8e0617eaa8db9e7b8bc158b37750a SHA1 cd8238b164c20a4533253aa335cc2a63f257ad19 SHA256 205cfd565a98a5155d6f9a6e0d52c4edf53e3974b2a72450d8a2efb7eddcba02
+DIST thunderbird-3.1.9-pt-PT.xpi 214278 RMD160 b3781bc650602f5e4003b6ab96b71a021be18c76 SHA1 213d21d63bc01491b1484e99c28e433f906dbeaa SHA256 9bbd81d0ab439ecf8c96ca3bbff758c539f94894a4013b4c0aafa8abbfafddd4
+DIST thunderbird-3.1.9-ro.xpi 221192 RMD160 acdcdbca982ac386f49fb6c08eae0c5239e368b2 SHA1 9f0a21893431c115b9010f40185df7088dd16821 SHA256 9df61bedf440a1d4b83d47cb7e45d9cdd22ec47e3f4f73b9f24f95878c603e38
+DIST thunderbird-3.1.9-ru.xpi 198135 RMD160 24d05d112707aaeece1d34cdab0e09765b309748 SHA1 ebd615f1b99d713484c05733867e0e4067fb242e SHA256 0ecf1ddec6ee8abe6b425c8dd9d7c132fa611413a5734d717ab1835bb23859d1
+DIST thunderbird-3.1.9-si.xpi 246147 RMD160 217a55bc273de84cf84a97e09f289936c7e45cbc SHA1 b19a9f9cdcbf1c3fdb996e9a91979a4fd9d2c122 SHA256 701e21102b04883bcc6a398d85b54a1c218f93e322d9563a496d05aea6c62f90
+DIST thunderbird-3.1.9-sk.xpi 224544 RMD160 6abf5e623d6bd573c65fb5d55a4ea258177bbb26 SHA1 dfae35b86280aa57bc9a1e774f4beef98b3e9b15 SHA256 82a6286bbe7fb28d294b1d05ab416d10e529fb2de80934035079981bb3753599
+DIST thunderbird-3.1.9-sl.xpi 218470 RMD160 30222dcd01e9a3575feee3446ae75e91ebe64b9b SHA1 c4d38c5277c8cad4cf49ceee57d8ff5c0655ec9e SHA256 67f2c184889df341f3174dc5e455f81b5a18587f243d84b51e6466955bd77dd1
+DIST thunderbird-3.1.9-sq.xpi 211241 RMD160 5c966d5e0cd414684628bc16a30a5ff8c4ccfd34 SHA1 e4eec499a7368a72197553fe7ad14bee468d9b88 SHA256 099372c70d4b01d94ae3406a65dba1eca0f4164f874e3b96cbeef86debac9bf7
+DIST thunderbird-3.1.9-sv-SE.xpi 221165 RMD160 1d988d15ba87ae402961bdea1d152ae91e9dbdce SHA1 c7ea922d053b1c99077dc87db08e2019b330ae0a SHA256 99306080067b73b0af98e26659513dad7b9c9e27bc13fe2574373fff9d56199c
+DIST thunderbird-3.1.9-tr.xpi 215742 RMD160 f02292921c5121b879d6e8f4280759b4171f0081 SHA1 d7e0561f906649072ca5bf4e116aff7f93115d80 SHA256 6f16ac87bbe6fceec53da967522d2ddcc5d02f00500e22d8942c39b98b6cc97d
+DIST thunderbird-3.1.9-uk.xpi 244831 RMD160 87f7f8ab4c93cc4afb10ae8b95e3402c3ce4ce4f SHA1 bd64d0ae92d19231d292d9bba62a87b721a2b825 SHA256 5198224eede7e5a9364c416fdff8e70b53a4df0c135ab6ee15bab73bc74d482e
+DIST thunderbird-3.1.9-zh-CN.xpi 219646 RMD160 a48694168186adec3841840390bbffd772e7211a SHA1 469270dd5b5f4c6efdfd9856b1cb438ae4806337 SHA256 c700b7b46fd66142a0b8afe979dc7eed86354a2d1f996aabb7f649e19511172a
+DIST thunderbird-3.1.9-zh-TW.xpi 220577 RMD160 d13efbae626df159e32e17b40134f082451d013d SHA1 41f064ed29960c57f4e0d2c9676d3e8557f43a2b SHA256 029e44c508e71056c9e6ce9045cc935cba40c714840755dff99bc9efc131a70a
+DIST thunderbird-3.1.9.tar.bz2 11599478 RMD160 2b1b6204747c9cb812acdcf657611868914fbf49 SHA1 9db1b9ea1111bc9a16afd1c0c9ffe6d5728acbbe SHA256 31ed2b16e26f16a9ea22ddb34f7affb81ecc84530a2ac551048c7f0b4249868a
 EBUILD thunderbird-bin-3.1.7.ebuild 4593 RMD160 3d82752ccbd704c38fbd423bc20483d945bfcd7c SHA1 b2a0c8f5897c88a2422e4c65af25b6d93ca0b04a SHA256 02f6cf7d100aef8d32a7e19814769972b1bce4fa31bc239d3ce2ec2577e9533b
-MISC ChangeLog 29946 RMD160 4e587b226bb5cb52e40bd34d10dc325d13148c2a SHA1 8ba7f219037ceaadec4f1fdc200f73ac64c7b582 SHA256 d5f3ca45461fb7c7c4f552a6d5fb8674b3e263d952541e13a99d731b753a2ef5
+EBUILD thunderbird-bin-3.1.9.ebuild 4594 RMD160 f98b5224c17462b612280a380d48d7974467caa7 SHA1 39d2dc7bbc762c4cbe550d27eba7f8ae6913bd6d SHA256 8158954587bf4ba714771031710d5b8be0129bdbce28c061409274258ac05d75
+MISC ChangeLog 30096 RMD160 9b1cb106e560fa880cbff10ac8377dc8b87c8c54 SHA1 c4afb59a0f8d75814eeafa5ffb3d5cfa62c8af49 SHA256 6c8017f7a625b8c218fda82308aa4a25aa795f65f74b51620efb0640d2d2a2c2
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk0whawACgkQ9/cejkQaxBChLACeJLsRMmGoWSMNA18qO2+U2AYG
-+z8An2KH16tbZa26hGTP+yZ8selVLHcF
-=mKXz
------END PGP SIGNATURE-----
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-3.1.9.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-3.1.9.ebuild
new file mode 100644
index 000000000000..c8204a0dbaef
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-3.1.9.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2011 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.9.ebuild,v 1.1 2011/03/06 00:40:35 anarchy Exp $
+
+EAPI="2"
+
+inherit eutils multilib mozextension
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+# '\' at EOL is needed for ${LANG} matching in linguas() below
+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
+		app-emulation/emul-linux-x86-soundlibs
+	)"
+
+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"'
+}