Bump to 3.6.21, certificate blacklisting security release. Fix SRC_URI, bug 375197.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

6 files changed, 308 insertions, 26 deletions

diff --git a/www-client/firefox-bin/ChangeLog b/www-client/firefox-bin/ChangeLog
index 2c4091e8d650..ab520742f535 100644
--- a/www-client/firefox-bin/ChangeLog
+++ b/www-client/firefox-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/firefox-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.65 2011/08/29 21:37:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.66 2011/08/31 20:03:14 nirbheek Exp $
+
+*firefox-bin-3.6.21 (31 Aug 2011)
+
+  31 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  firefox-bin-3.6.17.ebuild, firefox-bin-3.6.18.ebuild,
+  firefox-bin-3.6.20.ebuild, +firefox-bin-3.6.21.ebuild:
+  Bump to 3.6.21, certificate blacklisting security release. Fix SRC_URI, bug
+  375197.
 
   29 Aug 2011; Markos Chandras <hwoarang@gentoo.org> firefox-bin-3.6.20.ebuild:
   Stable on amd64 wrt bug #380913
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index c86d9da7def6..67da23d76e77 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX 10firefox-bin 32 RMD160 0820c9d33296942b9d49f381ffd19e5bea4e5564 SHA1 ec1c6c8583e7252222815c0d6c161310d25b2f3e SHA256 3163273068698dfc7da0a2edf8e558bb31d30eece410960672674a0eb019dc08
 AUX firefox-bin-prefs.js 305 RMD160 c717f25e140d244844f18bc84644183cfdf7ddc9 SHA1 794edb0a7ff1c6efeadc0b89044eeb5b7d108280 SHA256 786fbfc99425ed9ba32d3e99af6b482226539a86e762197cc10e2b491c7b9d72
@@ -226,6 +226,80 @@ DIST firefox-3.6.20-vi.xpi 129024 RMD160 fe32149beb75bc3cf75a5f6e3985af1515dc32e
 DIST firefox-3.6.20-zh-CN.xpi 127092 RMD160 b6b1da97c5b6b60df6bc3e660bec8ab04f26f0e8 SHA1 0de62007e5491c49981b30ab321798b30ccc5594 SHA256 c8b90c078dbfa497040662566b00c6fe54a80c3781b1c840c71adc11f8e335bc
 DIST firefox-3.6.20-zh-TW.xpi 128541 RMD160 7601481099e115840096e5289de7956cefbf87a4 SHA1 e1c8cb9c1c5341c220660da301e82c8399fdcac5 SHA256 521b0964814ce374e758e046dffc9980c5d7ab1eae3253942705fb3ce5fcd1a2
 DIST firefox-3.6.20.tar.bz2 10755714 RMD160 cfea246e516bca60ac636d051e5aa82cfd8724a6 SHA1 28872ce4d0880e965e5e8d20005ed98fbf507e22 SHA256 46b2c529736d84cd19865ff30722ead0425753517b302bf4aab7276c0e544859
+DIST firefox-3.6.21-af.xpi 121625 RMD160 b8ff3c1a8c60c968ac12247610db9ade7058f7fd SHA1 620ad884cda95d95e8770cd315ea62b1b6c98641 SHA256 917f6ddf21a1cf5b5309f2c3fcd1a736872ed04613e21abacb96547776711941
+DIST firefox-3.6.21-ar.xpi 132122 RMD160 b0d9438a5cdd07bd42d1dd0bba12fb6f7eccce8d SHA1 3f40a5772f0a50149eabdcc7ccd98652c6e8ac8b SHA256 80b7dc997f99bcedb46e62aa3db66c46050c2316c87764fbd42e310f5c723122
+DIST firefox-3.6.21-as.xpi 134265 RMD160 55ed86072446a0a76d14908b43041d283b4b08af SHA1 94c81cb46a49463b4e81b66b2e7704f2b6ef2489 SHA256 912ab96de3f0a8053df107bd726b22ff747c8b2113c337bba998d13069b4efc1
+DIST firefox-3.6.21-be.xpi 122272 RMD160 8ae9f22b31e573f1bf7d144f0114a13735c8dd0c SHA1 a3328d066fb2f7cc71742882cfa468e96dd0a1ee SHA256 b307835f14708b854f0b249ea9ca88c8c9ed44295e89db79c9a0195069aa28f9
+DIST firefox-3.6.21-bg.xpi 134109 RMD160 8f145961ce2d6de2c136e9dcf9b2914b317a294f SHA1 35aba935f67b22160d13cd4bfe71d960b2692248 SHA256 71a5a81e8ed7e4cea212e140ad913e24ee116556ed73137bf5b8331b992859dc
+DIST firefox-3.6.21-bn-BD.xpi 141143 RMD160 dc649ac367ba80185edf1c82a15b6af17a93394b SHA1 f06aa41cbdf80c475b592e9072a1c11edef89190 SHA256 a6584706760cf4548fb6a68a4cf914de90ca89f5b0d690fc6fa4ed6a736ac259
+DIST firefox-3.6.21-bn-IN.xpi 160112 RMD160 d0add21dad7fd9b1e1300659d481f82c800af1fe SHA1 7f19ec766508b55117fa4fbd64fbb223882f9424 SHA256 092add8b426ce178a81af8127e146ddca62048b728833902a852b559f5585781
+DIST firefox-3.6.21-ca.xpi 127932 RMD160 02ad81d1ddac7d1995b5fc0b6a4af64355ea478e SHA1 bc11ae46818b59cb68c27c75fe03f520c221a72b SHA256 33db4f1bfa89a487e83a6732d414f286daa80d46a7c44a5101d0a870b9951bdb
+DIST firefox-3.6.21-cs.xpi 126762 RMD160 de2e29aed0b5d0080d4702980e94e4de5be80ad8 SHA1 4fbe35e53eef374005d676d6899c65746e6a0b7b SHA256 81b3b656cf316330c11fdb2e00342401e58c4b071dc8e761fbbf1a822d522249
+DIST firefox-3.6.21-cy.xpi 121979 RMD160 1d0c9433b06f5afa26061b11de4ee728cc9631a2 SHA1 696c90a4c9396ffbc51a6934b7febfd91234ff57 SHA256 13d1c9f57b2a3868a0bcf95d863e1ddfc8fe01c773d02efe52932275f04c61a8
+DIST firefox-3.6.21-da.xpi 125599 RMD160 5a26c9621449b700fd63bdc38a79b18208b0ead0 SHA1 89fcfd08a37946f5e65c5384eefcd47cb017f413 SHA256 e8de41e409fd61044d4b26c1b6190725d121f60256577b7ddbcc7e3313596ef0
+DIST firefox-3.6.21-de.xpi 128971 RMD160 9c94da6f81b782d7902877872b4da27bdd0d166b SHA1 31d29ea67a283b820d5a6d7103481208f20db7cb SHA256 7094f0d36289e49090b1a11fcd420ebc4f539a8b03b2475d5867e74ffd7b140c
+DIST firefox-3.6.21-el.xpi 135178 RMD160 98663e691046783a9dbdf64716b9dcabaf5537f4 SHA1 ebab2dc5143d7eaf102239febf3a2b52124afa6e SHA256 ceb29d681707b2f1cbbe73399872c164e833c0db777e64cecd1af77ef8a11964
+DIST firefox-3.6.21-en-GB.xpi 119208 RMD160 913ebb407a4aa8550eb80f025c3f80339f7e9333 SHA1 485c73d5d4fff28a72ea02cae135695a6988826e SHA256 9038444d0eb9cbbe286bf2a2aa7f11a48d6ec6fefb1ea00be880d69afdcc197d
+DIST firefox-3.6.21-eo.xpi 121848 RMD160 29fb0c4caec515a84cfe8176c8e8e110d8ea566d SHA1 e179f47f1ea01da63e2557ace6684c2a26245adf SHA256 d3c510dfa2b323a1ee00d88a505d7f3f25aaf9244bc59417151b8d8d3ecbfb55
+DIST firefox-3.6.21-es-AR.xpi 127786 RMD160 252da9de3c03a523bffd7c7fbd90f6d131d53c81 SHA1 a32a1593cc5c3f3cfc5ac117cf1e295c408f2779 SHA256 8e09e751d26f0df946f2eb41471305a8247d2ee5078538bb8685dbbbd59c911c
+DIST firefox-3.6.21-es-CL.xpi 129469 RMD160 ccb460507c3c9cc46fecdd582be0463f03f6a648 SHA1 69e5d485cf7d3d1efa1687b9c172783d5ecefad7 SHA256 1cbfe772b3e130ca06346ac139a1498592b407c0f5db66f1f31951f4d4cb2489
+DIST firefox-3.6.21-es-ES.xpi 108668 RMD160 204197d4485de93217a47a265230b9a8c01b4452 SHA1 571449af7d9e291484bc2959eb4be24c198855f7 SHA256 db3cc042bd85edf2f3d7a21a920116e63049265de426e7fbd17a72d49c3483d3
+DIST firefox-3.6.21-es-MX.xpi 127397 RMD160 68a38828b7e8ace5cb274759e6d9afcc92d56dc4 SHA1 6347fde3ad61a1708b7814272f0167eda1621849 SHA256 08a2e4b60f11de20af3aebef3825932f2f770c29932212385055161bef6e451a
+DIST firefox-3.6.21-et.xpi 127372 RMD160 5507517f47de1b379289a111e8b515dc3b4c651b SHA1 e4477f5f68d65ea7e306c2fffcf1c1352d6e836f SHA256 0facf713cc20d8427aa8141e2bcbc4846fac8c2cc1d0a17001f8e65124b658d0
+DIST firefox-3.6.21-eu.xpi 121825 RMD160 0d20e8c2ea44b97635d772d4fb3ccd12b51ad11c SHA1 99677a452936ece12ca62d428536761036b5b19e SHA256 354efd8136cbcc5c6e1d25f7488ce27839f659aa7283f145c4afbe49c704d93d
+DIST firefox-3.6.21-fa.xpi 138406 RMD160 06afbb2b4473dce760d90d883504f9955f3ccef3 SHA1 898f13f81d188016f04bd5a4e93693b1b394f6fa SHA256 b200d4cc49c322a0061122f96e124bd06358846f21f5e6bc43fea5a53541c9ac
+DIST firefox-3.6.21-fi.xpi 126796 RMD160 5e1eed19abb7bba983a46bfa1efb0a624c8b9db4 SHA1 1115dd2e996cbb647314d029f9756ee85d0381a1 SHA256 82cc596b7dde5e78f24f93c10171e743d8046115116932aaf6b2f1c7870989a3
+DIST firefox-3.6.21-fr.xpi 129007 RMD160 73f48e0ebc05cc6ffbed8550b60f4f8037c5a7f0 SHA1 d5c8c33642d55f16ed5747ce1baebf18637d82bd SHA256 667ae4af94c663548f68bef048dff527b0ffe6363bd2955113ecd4ece465e775
+DIST firefox-3.6.21-fy-NL.xpi 129191 RMD160 94c389d0872617130e5eb3d723cde282705eb065 SHA1 e10929c94f2100a7dcba655c301faaf8b7637ae6 SHA256 e6c7c4fbd8fd050693d873e55d19eeaef4f02b8bcec4aacaa7fa2e10bfe4ed29
+DIST firefox-3.6.21-ga-IE.xpi 127752 RMD160 8e3dea0f65617d30e059bbe52d934f4d2270be90 SHA1 830430811301f2b3204867a2b418802010208ec5 SHA256 a4ba905d98d377200675bc4073cd33c4ce93219f76d5c2a72ee31a8dfe75c31c
+DIST firefox-3.6.21-gl.xpi 124832 RMD160 ca7288780bd2ad1b20d42867df8cdd576832077b SHA1 fbb26c26339a2cdaa3af6fb99cd6fc73dec01e05 SHA256 49fc143205fc0db192228de96f14f66b8491fddfbe0afee23717d6cd730c573a
+DIST firefox-3.6.21-gu-IN.xpi 146301 RMD160 53ad18f4122aa89010c9d9b40647f0f53dbb4f9a SHA1 a2f93fc9a6c4eae7c23ee8ca8171d37daa3c76a5 SHA256 da06a4d908f338709d7afc0864bb6e66e30389614ce9c1be4c88912aea1c4864
+DIST firefox-3.6.21-he.xpi 123136 RMD160 aa8ec39f1a1ad36cbc054db58480b6027e8d49c3 SHA1 65d9ed880ba571f465ab35e4f16ce2326b9125cd SHA256 0e76a3bc9fa995cd4b14025f151a4b8cc04f78e2ce542ba640a40d433ea6afb6
+DIST firefox-3.6.21-hi-IN.xpi 141887 RMD160 8882c5dd577563c4018b178835625188d3fde40b SHA1 6161108f309fc1ad0b78f9d731f24c90557bcaf0 SHA256 5e8387a10d0f3201b8d9c4207d7d4324b1049ae51e648c0f31bb6dc3e1b8523c
+DIST firefox-3.6.21-hr.xpi 126978 RMD160 fb1660e54b2b5d4895e67700e876bebf409b4b67 SHA1 011ff53fda7356d2dc61a596adb1fa8ae50a64bf SHA256 a2a1221086f2f786ffaf4904def91f19b8e1921a66719f7fc608a9822f7bb39a
+DIST firefox-3.6.21-hu.xpi 131099 RMD160 e7aed0f6e76e332a09e73fec752d8c52d885b737 SHA1 5e15aa7335dff238807ecaf1ab7dfb961ff5b2bf SHA256 b3403e86f363c238956af8a9582a27f008247575f7f415702b54941774c92157
+DIST firefox-3.6.21-id.xpi 103922 RMD160 239e588b825a38610da7fc7d5b9df7c0c8d2934e SHA1 381783ba885886ec69997701c72e3e91065ac8e3 SHA256 04c25265242d46f33d9261daccc3af84a444c9c5766364fe81b32236800cee89
+DIST firefox-3.6.21-is.xpi 123390 RMD160 21e7fab6ade5a6ec300ed1d291c854be56e7ec09 SHA1 a61f093bcbdd88b649de66a8457f6519fee704d6 SHA256 2364909b2f8a11dd2fe1998c59c43476335ba352bc37326ae92e65263b1f9a32
+DIST firefox-3.6.21-it.xpi 107940 RMD160 b986a67c2f6469e447c5b33dc5adffb98c29a394 SHA1 b32bcf26b794bf43a64c36dc1532b64ce6dabe31 SHA256 5d662a537b8e40caca9b9a8c5b5100323f39b71cd18aab3fe6db97f39763cd2d
+DIST firefox-3.6.21-ja.xpi 137013 RMD160 d7295f0257626d1a7793b2123cd6165a02e77498 SHA1 dc549eda2eb9750ec38be0a42527f84e9e6faab5 SHA256 6cf740f55c78f1d390c4d9a025fa44c16994d7fbb03012090500883a361b7cda
+DIST firefox-3.6.21-ka.xpi 154119 RMD160 f7f4d66ab1d0b29f6cf1f9852d8c749decce3f7b SHA1 25b9b92dac9ae0b021fdd36565d81e57a949d999 SHA256 6a690339b37e2d0aba86d8e1f4cf5cb398493a310159350dd7fffb663f008e10
+DIST firefox-3.6.21-kk.xpi 137751 RMD160 4e2ebe00db8d5ebb7586fc0753af4327e2e70e34 SHA1 5be0e93d4320760bbdd88ccc80899a8874bb898d SHA256 ec4cb7f1f816b1effecbf24952a6788c3a385695bea59cd487b40018138e1d12
+DIST firefox-3.6.21-kn.xpi 148709 RMD160 1655d70fd2062ce6ccd1f2e811a1e118afaebc79 SHA1 2899e5cbafebc4e04b61431b53604b55ea572e90 SHA256 b4b11a7ce83c165fb6a1dc2b3c6f9c150608b822983e119c9a11b481f58e0311
+DIST firefox-3.6.21-ko.xpi 115633 RMD160 ded63df5d112363b79ce469c48dc99b93632cd17 SHA1 37535bd757d7dbe48132590329093e193594330f SHA256 730013e230b4867159acb9871d00bad10e9bec17b85187be19ea7fde5d3b0b93
+DIST firefox-3.6.21-ku.xpi 130836 RMD160 b413886aea3eee4276255d79885bc713a7f3856f SHA1 8626b0b78e2376ee214acd02c0561a9b5612ae09 SHA256 1ca8cadb8ec398b83817f20c44ef141852270fa0a122c52cafea4e00979adfb0
+DIST firefox-3.6.21-lt.xpi 139711 RMD160 6b02038ba40cb5d4d697bfffb1ad5697e390df3c SHA1 7f503602138e21878621459027822cd944f38185 SHA256 520853122d85ed1f1f0849d0ad3507232cc3a52dfe6dee8a43fd0b45b76a2592
+DIST firefox-3.6.21-lv.xpi 124832 RMD160 71ab551b95e80a494ade6fbce02325d2cf5482e9 SHA1 01ae25448ebd68a626e50fca80f71f40d0d5a18c SHA256 4ef537916f341634f57ddef47042fc7d567b2aee5831b406281c8f7c0acbed8f
+DIST firefox-3.6.21-mk.xpi 128236 RMD160 e734dc3cd524ffd9b743c9fde3b02e302512b8b0 SHA1 58ed94154bea1bcea3419808954c640896780b3e SHA256 e52d37d1da0195ff07cdcfc2037025ccadf6745c2ae0ca2ff09011356dfc115f
+DIST firefox-3.6.21-ml.xpi 152170 RMD160 dd751637e8f1916162d84efcf5e0467ce9e6eaab SHA1 0eb22dcb23d2a628e3e97d6f64915c3fbaff3c69 SHA256 151d060944065661592300eefaa158602d2fe064960e30471106f62975d02f20
+DIST firefox-3.6.21-mr.xpi 141119 RMD160 b3a87bde7e09b65608bdbbcfe6f0f8d20d641a48 SHA1 d787298672a2089476ddd85e425ccf56abb06f1e SHA256 96d12d661b662d771e36f847fd660868566591c3b03ab27976a9a57444e01a9d
+DIST firefox-3.6.21-nb-NO.xpi 124129 RMD160 cbaededb89ee93fea92d7409db4afd73f2a7be66 SHA1 af4bc60d9106d0c1631e5979f30c72349befc65c SHA256 4cea5ef890e27f8bf94d39385b4f4987b0e5a916de982bceeb5712546699b081
+DIST firefox-3.6.21-nl.xpi 126412 RMD160 8c6bec16820e5ddcb85f42bf24ff4956dcb1759d SHA1 41f12b4650b809a23afb537af26e204f47087359 SHA256 d1f58fbe9264be5c53b1f1de4b0ece78b60855c4c1bb73a2dd8f21504a2acc6e
+DIST firefox-3.6.21-nn-NO.xpi 125106 RMD160 26b8dc3fa0e16cf6ea447bb4f6bfca6c03568758 SHA1 24e79ce753601131716cdb15124996ab38a8b916 SHA256 9b0225a2b5d4cf3db7bd670d8dd8545c6164589fb866461326278eb9d1830482
+DIST firefox-3.6.21-oc.xpi 108342 RMD160 5d476e3fe5aee8c266a29f7b4b27a76b3ca9cc74 SHA1 faebeca0f181e99a958e946faf49ce015677c3fd SHA256 a8c9485b73b28fdc6cb8c5777cb324e9ada1bca707dc0121838c2c81d10f396c
+DIST firefox-3.6.21-or.xpi 142444 RMD160 21965a3d3a3e9f6ccac2607296cadff7887c370c SHA1 fd0eff23fdb74ca3684bc3f0bc58420887be137d SHA256 84e33cf69c2ba57dcde275c37924a2b3de2b71f57cce877e503901d265656f90
+DIST firefox-3.6.21-pa-IN.xpi 142120 RMD160 2b8aa4d38c46bb73d8c06e9744c8d37bc3ca4b38 SHA1 6e96b2f9c55f5be0896576302f4d2ddbb943a4c3 SHA256 6e9c4b2ae88eee33da3b003f8962953f86cc76ffa625cbd6bc37a9a0f4ec4348
+DIST firefox-3.6.21-pl.xpi 131041 RMD160 cbdc88fe304d77b90bacacd3641d11a108fbd8e7 SHA1 6377e5dff892aee6cf56af0f8f94b00a481531a1 SHA256 1c4f594feeb12c65ebb572fb65d834d20e00cedfaf0d828a5a12a04c182469ed
+DIST firefox-3.6.21-pt-BR.xpi 125361 RMD160 2d2ea3815b2002e34c1b806f1ef88d653b5cd52c SHA1 b9eae30067e21a71232f06e78f109bc77d49886d SHA256 6e1952e49eb3b77f53947c9bc1e70ef99edabdf9dd0f6a2771f7790f9e091576
+DIST firefox-3.6.21-pt-PT.xpi 125418 RMD160 ef172f48de86feb57daca0bb10e941bf17fc5cf7 SHA1 b5025cd420c5ce00063e7255b9d1536a841331f6 SHA256 fc05c7c7695aae25b11a57fcd6efa44f395781a1e2dbf038d9a2cf53b2384df1
+DIST firefox-3.6.21-rm.xpi 127397 RMD160 9eb9a466a0d024071da342d32ad26f50fbb31052 SHA1 40a793d65f0535d293cbbd616a21359b75a52374 SHA256 f80022c655e1488864de1eb8cb3d68d90a46e2217ee12b265253933fb53cb65c
+DIST firefox-3.6.21-ro.xpi 129142 RMD160 cbcde91e63c86b9a2faca534ce7f7027decc8554 SHA1 62deef0af027ccdddefe915d7f56752385a599aa SHA256 8bfe80dc7eaf2b0dfd76aab7720e53c9a5cd35b38ae670a1b6049af9151e4a1b
+DIST firefox-3.6.21-ru.xpi 124937 RMD160 27e5c51bcdc4e556d701beba1e52f653ead06385 SHA1 a6849d9d8a5d2ab81003590f98d347a3a32aa977 SHA256 3c26c0623d51339f7ab45bb6af62acbeeb4086ddb04e99477553943e805ef4fd
+DIST firefox-3.6.21-si.xpi 142190 RMD160 9f8996541030ef1649f6b31f35046d30c044a5dc SHA1 d3716df7e3f81d13e7b286ab227a0365e02452cb SHA256 2f013c38dab4981c83283cf6fc0cec843ffeef44a5a868b233fe5d5c1438aec3
+DIST firefox-3.6.21-sk.xpi 131106 RMD160 c5e2c6c6bd2d65cd0eb6d9a6c32887fedbedc8a7 SHA1 5067ed237f6bda9460ce81cbadb5c2d693c7195e SHA256 f8dc524db72029c6b014906f9e3106cda23eb60c1ad6322aeeeebfe79568375f
+DIST firefox-3.6.21-sl.xpi 124263 RMD160 77088337d580507768ce820f51d3feed26fc052a SHA1 95914d4166d41fdc34a18bfae278d38bc84acebe SHA256 deab79a67ca057d6361bdc861002a2a8dc8454d48aeeda5c761a81f84aabccf8
+DIST firefox-3.6.21-sq.xpi 121260 RMD160 a6e7ecca5ad43c66edc83feb1569461b3bddddb6 SHA1 f9b80a287049a5560d91aa0eb41224518f9be7c1 SHA256 1e24863eb04478a83b79d416f5e9d00be03943e710d174dfcc5b01ff0f738ebc
+DIST firefox-3.6.21-sr.xpi 135962 RMD160 1b9f2318bd685809babc03bebb6e1f3f9c42a61c SHA1 612aef05485187457ba02035fa3b95564bd0be8b SHA256 2a3975b5497a2e878d63b68b0de92028b043ad484d55a7c23085eb1ca1c88a5f
+DIST firefox-3.6.21-sv-SE.xpi 128439 RMD160 d6783011a6fe6fc960d337075c18bf0f62a8d8a8 SHA1 4fe7a2d8e553468036747e41ec35cfa0ef497fa9 SHA256 e3bd6f858937f590376b1cc2a584f9e571b596e8b2ae00133d88912b51c872ae
+DIST firefox-3.6.21-ta-LK.xpi 149308 RMD160 e270384779529826c1b968d5dbcb14ad191bd0f5 SHA1 b6ee438ab95dc9cb7a340bb2d426fc64e0a960e8 SHA256 2bb40663c0275ea54943f1f2c6de2fa6e9bfe100e025f6fdd10d0ffe91164d7b
+DIST firefox-3.6.21-ta.xpi 137264 RMD160 65f0fbc2c5f6899382bc5e2d40b9adb73111cd36 SHA1 621abc4d116b8267399b49c7b1557536b8fee46f SHA256 8243c48e190fff5cfc382fc6f0db770a2147c2bab6be3e610b593d6605f5b08d
+DIST firefox-3.6.21-te.xpi 147865 RMD160 0ca8ab249b767af1645a5f1b7395438b35bd1123 SHA1 e67fc873e581438e42c4e9c33e0c00f96cfce1e6 SHA256 368794175dacf1dedeeb709c47d8d91ae86723ae1d35e1194db8972754d0ff08
+DIST firefox-3.6.21-th.xpi 134362 RMD160 d647405eedccfbaee8cd17c026561417dcf93b29 SHA1 2d58ea9a13e53e69bd58ac49c4b29b9366ca91cf SHA256 468297da143db2c437e1fe392368d332b48b680a482c89b4c8e1b19596781454
+DIST firefox-3.6.21-tr.xpi 125336 RMD160 90fcdc219155b5787d65b435e92e69c667912178 SHA1 3e13a2db5bf5c0252ad7e0ec20a401411837405d SHA256 220ad6b3a8eccb85903f54998cc57bf5699dfdf53d563a21f38fd6aa6d75a763
+DIST firefox-3.6.21-uk.xpi 143217 RMD160 8d3835a66cddd4966948b021e24e6b93968b5a94 SHA1 3603d205197bfda4f8283a4184e800b5ef047d8c SHA256 f08bfddb823e30011fb060053a73c6eb98b4ca8662a607e606ac92023400f23b
+DIST firefox-3.6.21-vi.xpi 129024 RMD160 caaf9217be353e311e8b408fd9b232c873b1d98d SHA1 ef3d1d74fdee7e06926c63b6f8dec03df6607759 SHA256 90ada8e6d4ff5520443ea4da8bcf56d3d1892ab659b9d71a9051e57110c289a4
+DIST firefox-3.6.21-zh-CN.xpi 127093 RMD160 dfe69884ea6a1b4cd065e38144d793b054362ef7 SHA1 3512698d3af18db1acfbe3885bb803316956fb6f SHA256 87b27c74513c27364d53d357304906be1490495cc46dec9e0f1c72266aa89440
+DIST firefox-3.6.21-zh-TW.xpi 128516 RMD160 7813af91f2ef62ec3e6387034478e763e4889f49 SHA1 19abbe2044daf57e3189978fc523e3173c78f6af SHA256 8945e580d28732de1d072f1c9040cdd5913ff9822a298c0c65e90040fe2ad11a
+DIST firefox-3.6.21.tar.bz2 10755216 RMD160 09bd8225be02be2cbffbc728619a907024dfbae9 SHA1 62ba31c79ee47fb63f8aa5c094f6d89809f2a85d SHA256 d11f1d4ba90c4c15d0e9dc9a0f66c409d1203fd86ef549af92df56356dbc6d99
 DIST firefox-6.0-af.xpi 225575 RMD160 854808d026a5c912fae8102693e175ccb4d916b2 SHA1 656018aa93d8bfdf34f2a5b16e5aaf29be53774a SHA256 a6e372754cfa913dd04b1d75f202a548a9d4de3939e122db88dc34f6ea43d7b8
 DIST firefox-6.0-ak.xpi 227074 RMD160 4d7b4839127d402f30c1491518ce60295b314601 SHA1 ac65469a13d89913d32646f8da665202144821f2 SHA256 dc82d5c1a5ed8ca5029e162783900090a8221616d415bfee950d5c6ee048fc25
 DIST firefox-6.0-ar.xpi 246750 RMD160 c3f7f8a57e1b1d5a6d30ee39a57137ad58ddfa30 SHA1 e26b8db88fad88106903a9064243d3a6d6bbb039 SHA256 97201c6c93b03cf5a6decfaa0ccc17c2f8c04806fcc9bc1799bf64e4b1350acf
@@ -311,26 +385,27 @@ DIST firefox-6.0-zu.xpi 233159 RMD160 64e3f5fdb78c9f343d3de05f8604e531b67f8f8c S
 DIST firefox-bin_i686-6.0.tar.bz2 15083240 RMD160 94609058521506e9b22b2f59a9513cc8dcf0078e SHA1 ffd94a44731a9bb06d77ddc0e58f0fa5a2a0e3c2 SHA256 b333cd3e680417fcc48d0a81104a545f6f07e89eed2e5e6a22d09d787be56a3d
 DIST firefox-bin_x86_64-6.0.tar.bz2 16667227 RMD160 f471fde83070c6e3c44f4746e8d23a0c231e888b SHA1 77ab35ed01a93c66c9eec251ac0dbedbc423ffaa SHA256 bd44209a1823685eb8e3b728561b41019bf6571d151e552e6ff58618fd69cdcd
 DIST libnotify.so.1.bz2 11228 RMD160 459dd9f8de3a4a421348c3ad0e793e868a09c228 SHA1 6b6aeff3e4a55b09d6791c2c9cde767a0659efae SHA256 fa0082cf266108da8ef9ef366de1ac044d2df5d4799e359f009c5a5c58f38395
-EBUILD firefox-bin-3.6.17.ebuild 5691 RMD160 671dbcbd16842f3282428ad8931c01d66ad85470 SHA1 d82868521c9d78f17cea3585bdd9b0ab24f0994c SHA256 decf0112ed90e8a7db8c539b26e9339bb4f52b7668581b59e935edb7e2cddeb9
-EBUILD firefox-bin-3.6.18.ebuild 5695 RMD160 c7674a9c989ebf7ee7770cc57400ea42746af29e SHA1 edefc371294b168061578e2013c1556f71c8cfa2 SHA256 c2cfc4d98f0f30ed8d70bc7332948c359c385be25bd2d12a30a0cb83bf5a74bf
-EBUILD firefox-bin-3.6.20.ebuild 5690 RMD160 46926aef9c412c803b1426d04ef06f12d562adaa SHA1 4491db6116bbb26c659289498ac942bfb5b4c542 SHA256 59ed8b68c4160a0e6a57489d3f2033eb009a407a5c92311faefbc1c2b271aea0
+EBUILD firefox-bin-3.6.17.ebuild 5683 RMD160 bb5d807bde86eebcd6c3e7c1a7008a616020cc1f SHA1 729072b7a1cd80ba787eafbd954547e4cab999da SHA256 f6b771a9adae5a28af5f4fdff3c032b1e996214cd872fc026b9c568fcdd6165a
+EBUILD firefox-bin-3.6.18.ebuild 5685 RMD160 01c5fa32951cde892491d7708d7f12730f4855f2 SHA1 c2b59649c5352b9f01c22578f49a4c35f9bd77d4 SHA256 c644d75fa73c6af60f271c381362abc8abcf68c1fc6031e8b01250ea35e99a84
+EBUILD firefox-bin-3.6.20.ebuild 5684 RMD160 9b65b6b51f14e11bdd4f4bbf11f68d45e48838fd SHA1 91809278f78ec484f8c391559182ee94d3b101c0 SHA256 81e5e4ccdad822fcbe6805b48b3567ab4c408fd11b403d958645437c32a8e746
+EBUILD firefox-bin-3.6.21.ebuild 5685 RMD160 8c3a638b5f984075c5ce867b9975f50ff2548e82 SHA1 2f41c32a49093cf04338e1b8e9126abe512baef1 SHA256 0c9816f77b02bdd685f19787867fc113d2b428e037906c6fc9430dc7a50b63c3
 EBUILD firefox-bin-6.0.ebuild 5208 RMD160 e06a9c572a7c0b27e0b687c2476bacef648c96ed SHA1 27b225c9b872e411d58f5173b8098bb28e4afed0 SHA256 53b9ca9c06409f74937ea54a499f771c111e72d92e798ba683bacb0d5bd5ba3a
-MISC ChangeLog 49380 RMD160 984ab0c61e5e7aac9e134e3d13ced60200e6fb05 SHA1 0edf4c33780e7c4f7225adccf23a7a3366535699 SHA256 c6fbe372174bdd544ad215feef605af143f8edaeb570c4eafe907674e3acf2bc
+MISC ChangeLog 49671 RMD160 48ac78d26a5c0181cc32083ffbd11e245911a5f2 SHA1 7d6a42842bad5e5ad0b5587b1cb65015c122fd80 SHA256 0df77bd6c1e1df801bda87dafd84fd2bd562f24ec93b8339bd1e38ce134fbddd
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOXAZfAAoJEPqDWhW0r/LCtIYP/RE4Djzu+tYghJTEZHVljNYX
-oq8NyP3jg5bSX+nwV1mFPGyUdMzXsGDqmKfHQ3hYOqek/r9zKIfx+3FEdWQRovEd
-AF6W21odL2YSnXWiK5wsutwvQbCugrPvTn4Aalz9kP6R1eE767C+GCtnQVRepWU+
-8dk3d0ngrDXeDbrlzrWP/GdocmK/qsxVZ0OE2WU6TLJwPnBtMC7quBo06DGcuPZw
-dpiWz8TXSP13lY3xgMWU2vpEcs8kktnsERubVk8WfiIwswDy2T1YRoSL3zn4TqZy
-T8KarwUsNJWCrw5cl4oP78mJg7bNQlRIHwBh6c2HWH5darEc9UyNDX13S9aTc7Lj
-83/8hE0IOWREtvZwG0FlPF9P+jrveDWfRUROgHmtlAnPHrskVoawaOSEDjIFkRnj
-vGxD8rxbfHoJij8+TI5j3A9fzs+qNK7QM/zzD3G1gQ4jpp8EhtXAscqLiXbi6L9e
-ww00f3xv2lWHdyl470zXXEH8EzO05GqHQ+nJwE++7S7u2uMofMO+o7u1/swEHjmR
-PJetr2ZUHNJF0fKOkBMmMVX12iVs4ZUu+WiJ9gkEMVq+hiAUTITY/E6rNdwQ4Uhn
-rCZbuvAQhYgOPvB0OWLWxLDNS9cfPPfp68yJfRUb2Gv/0uVlhKZKe+CEQ21ppHji
-4lu8NaN1cx/XXC7HzZcy
-=WhG6
+iQIcBAEBAgAGBQJOXpOJAAoJEO/kOhxWD91kLIIQAKhnYCSjBiJNfeAqwOy2cv3C
+16p60Owkdzwie+fboymidOIimc+qWlD535rQhCt/OpZLmLCjZqt97R0pDoNDhvfB
+D+M+McTY0QYZObDFFAuA97FuDH06huj56Js/QJI//F7ynHJXO51TrkegU0I72+eW
+O6xOY8fAtlzDV/uoGiaaaNSdIBSdST9BgajqKCIkvMf8t5I9r/YRF/pWVoVA83SV
+IAeQ+mYQzVXNlBohMQVHXxPDH1XGZmKEnddt9QWLXa3e+xTKpoFSZsbA855y7lDb
+nC9QJCuW6Popk3uDrbxQAKVxX0vMdtSYDJJHwrCHC35nXa7yM3Ijp8AnhExzsiL/
+cljzRVrH9k366ZrzfiuSxO7HigIpwIC4Zej05q0agX2H8jitShvLq/2x2QkQspYo
+fJs5M7wT2QPucOTN3DTvoOCUlSInfvWbKgDAUIWgRU1g5HHhqe4FEFDbRlW0R+TW
+6mix4XPy1NhvHp8Dg6HMEBeZj/Cr3UPmrdqw63bA9b6I2njuF30jAXICUA52oiwO
+zly6Pu1BNuaDztu0vxR3zF72Ygt/JgW8pl9Rx3vRkidHqtwgm+x5pLt9emAPqBhv
+S5Ots5wSpmnl2ql/4Bd1JKiRg8FhtlqPBtlhkcv79yZs0IaPC1PRWv39COZVGLxa
+VjC7NQePy522hO8Vo2yg
+=G/tc
 -----END PGP SIGNATURE-----
diff --git a/www-client/firefox-bin/firefox-bin-3.6.17.ebuild b/www-client/firefox-bin/firefox-bin-3.6.17.ebuild
index bb18ad4eec93..014568854f12 100644
--- a/www-client/firefox-bin/firefox-bin-3.6.17.ebuild
+++ b/www-client/firefox-bin/firefox-bin-3.6.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.17.ebuild,v 1.3 2011/05/01 16:47:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.17.ebuild,v 1.4 2011/08/31 20:03:14 nirbheek Exp $
 
 EAPI="2"
 
@@ -19,7 +19,7 @@ MY_PN="${PN/-bin}"
 MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="Firefox Web Browser"
-REL_URI="http://releases.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
+REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
 SRC_URI="${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2
 	mirror://gentoo/libnotify.so.1.bz2"
 HOMEPAGE="http://www.mozilla.com/firefox"
diff --git a/www-client/firefox-bin/firefox-bin-3.6.18.ebuild b/www-client/firefox-bin/firefox-bin-3.6.18.ebuild
index f3dd131ce3f2..bbbb568fc7bf 100644
--- a/www-client/firefox-bin/firefox-bin-3.6.18.ebuild
+++ b/www-client/firefox-bin/firefox-bin-3.6.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.18.ebuild,v 1.1 2011/06/23 14:12:11 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.18.ebuild,v 1.2 2011/08/31 20:03:14 nirbheek Exp $
 
 EAPI="2"
 
@@ -19,7 +19,7 @@ MY_PN="${PN/-bin}"
 MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="Firefox Web Browser"
-REL_URI="http://releases.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
+REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
 SRC_URI="${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2
 	mirror://gentoo/libnotify.so.1.bz2"
 HOMEPAGE="http://www.mozilla.com/firefox"
diff --git a/www-client/firefox-bin/firefox-bin-3.6.20.ebuild b/www-client/firefox-bin/firefox-bin-3.6.20.ebuild
index 0a5aa4d79079..b21a55b7419e 100644
--- a/www-client/firefox-bin/firefox-bin-3.6.20.ebuild
+++ b/www-client/firefox-bin/firefox-bin-3.6.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.20.ebuild,v 1.2 2011/08/29 21:37:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.20.ebuild,v 1.3 2011/08/31 20:03:14 nirbheek Exp $
 
 EAPI="2"
 
@@ -19,7 +19,7 @@ MY_PN="${PN/-bin}"
 MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="Firefox Web Browser"
-REL_URI="http://releases.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
+REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
 SRC_URI="${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2
 	mirror://gentoo/libnotify.so.1.bz2"
 HOMEPAGE="http://www.mozilla.com/firefox"
diff --git a/www-client/firefox-bin/firefox-bin-3.6.21.ebuild b/www-client/firefox-bin/firefox-bin-3.6.21.ebuild
new file mode 100644
index 000000000000..7abb1b577c45
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-3.6.21.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.21.ebuild,v 1.1 2011/08/31 20:03:14 nirbheek Exp $
+
+EAPI="2"
+
+inherit eutils mozilla-launcher 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 as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo es-AR \
+es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id is it \
+ja ka kk kn ko ku lt lv mk ml mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-PT rm \
+ro ru si sk sl sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW"
+NOSHORTLANGS="en-GB es-AR pt-BR zh-CN"
+
+MY_PV="${PV/_rc/rc}"
+MY_PN="${PN/-bin}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Firefox Web Browser"
+REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
+SRC_URI="${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2
+	mirror://gentoo/libnotify.so.1.bz2"
+HOMEPAGE="http://www.mozilla.com/firefox"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="startup-notification"
+
+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="dev-libs/dbus-glib
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXmu
+	x86? (
+		>=x11-libs/gtk+-2.2:2
+		 >=media-libs/alsa-lib-1.0.16
+	)
+	amd64? (
+		>=app-emulation/emul-linux-x86-baselibs-20081109
+		>=app-emulation/emul-linux-x86-gtklibs-20081109
+		>=app-emulation/emul-linux-x86-soundlibs-20081109
+	)"
+
+S="${WORKDIR}/${MY_PN}"
+
+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 ${MY_P}.tar.bz2
+	unpack libnotify.so.1.bz2
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_unpack "${P/-bin/}-${X}.xpi"
+	done
+	if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
+		einfo "Selected language packs (first will be default): ${linguas}"
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/${MY_PN}
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png
+	domenu "${FILESDIR}"/${PN}.desktop
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification; then
+		echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}.desktop
+	fi
+
+	# Install firefox 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
+
+	local LANG=${linguas%% *}
+	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
+		elog "Setting default locale to ${LANG}"
+		sed -e "s:general.useragent.locale\", \"en-US\":general.useragent.locale\", \"${LANG}\":" \
+			-i "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${MY_PN}.js \
+			-i "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${MY_PN}-l10n.js || \
+			die "sed failed to change locale"
+	fi
+
+		# Create /usr/bin/firefox-bin
+if use amd64 ; then
+		dodir /usr/bin/
+		cat <<EOF >"${D}"/usr/bin/${PN}
+#!/bin/sh
+unset LD_PRELOAD
+LD_LIBRARY_PATH="/opt/firefox/"
+GTK_PATH=/usr/lib32/gtk-2.0/
+exec /opt/${MY_PN}/${MY_PN} "\$@"
+EOF
+else
+		dodir /usr/bin/
+		cat <<EOF >"${D}"/usr/bin/${PN}
+#!/bin/sh
+unset LD_PRELOAD
+LD_LIBRARY_PATH="/opt/firefox/"
+GTK_PATH=/usr/lib32/gtk-2.0/
+exec /opt/${MY_PN}/${MY_PN} "\$@"
+EOF
+fi
+		fperms 0755 /usr/bin/${PN}
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10${PN} || die
+
+	rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins
+	dosym /usr/"$(get_libdir)"/nsbrowser/plugins ${MOZILLA_FIVE_HOME}/plugins || die
+
+	# This is a copy of 32bit libnotify.so.1 from app-emulation/emul-linux-x86-gtklibs-20110129.
+	# http://bugs.gentoo.org/show_bug.cgi?id=360443.
+	exeinto /opt/firefox
+	doexe "${WORKDIR}"/libnotify.so.1 || die
+}
+
+pkg_postinst() {
+	if use x86; then
+		if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+			|| ! has_version 'net-misc/curl'; then
+			einfo
+			einfo "For using the crashreporter, you need gnome-base/gconf,"
+			einfo "gnome-base/orbit and net-misc/curl emerged."
+			einfo
+		fi
+		if has_version 'net-misc/curl[nss]'; then
+			einfo
+			einfo "Crashreporter won't be able to send reports"
+			einfo "if you have curl emerged with the nss USE-flag"
+			einfo
+		fi
+	else
+		einfo
+		einfo "NB: You just installed a 32-bit ${MY_P}"
+		einfo
+		einfo "Crashreporter won't work on amd64"
+		einfo
+	fi
+}
+
+pkg_postrm() {
+	update_mozilla_launcher_symlinks
+}