Bump to 5.0, major release as well as security bump. XULRunner has been merged back into Firefox with this release, and there is no corresponding net-libs/xulrunner release since upstream has dropped official support for it. Packages that want libmozjs should use dev-lang/spidermonkey, which will be updated soon.

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

5 files changed, 427 insertions, 20 deletions

diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index a5b2d8706b58..7744fa0a696d 100644
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-client/firefox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.73 2011/06/23 11:08:17 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.74 2011/06/24 09:55:00 nirbheek Exp $
+
+*firefox-5.0 (24 Jun 2011)
+
+  24 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org> +firefox-5.0.ebuild,
+  files/gentoo-default-prefs.js, metadata.xml:
+  Bump to 5.0, major release as well as security bump. XULRunner has been
+  merged back into Firefox with this release, and there is no corresponding
+  net-libs/xulrunner release since upstream has dropped official support for
+  it. Packages that want libmozjs should use dev-lang/spidermonkey, which will
+  be updated soon.
 
 *firefox-3.6.18 (23 Jun 2011)
 
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index c2ccb7212b73..df0d3937911c 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX 137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch 2473 RMD160 cfbed88e1813f4880dabb18b6a9540cf3747f7f4 SHA1 5e0d98b3e3bf3ffb5f88eef30b1af095a6f0057d SHA256 be069b468eff7f06bb0fe160dea947c081cb00e1a8cbde2bd39c52ebf9aa2984
 AUX 801-enable-x86_64-tracemonkey.patch 501 RMD160 e8341671a9ab7f05cf58735a2b862ded55d82829 SHA1 d0c194c79993c3c47a8c46726d3f024e044766a0 SHA256 20f558efbf4ed1960b390c353c7eeb94108fcdb8aaf33f1fea6caf44468aeb7c
@@ -8,7 +8,7 @@ AUX firefox-default-prefs.js 95 RMD160 805cdfec6fb31c224322cb71125547ad7a515f49
 AUX firefox.1 2538 RMD160 4564007d7d5345e9ab09c941015e3cdb78913835 SHA1 8be1987451117820744ecc67fa411facdc653a12 SHA256 3483439a73c74b818bdde98c15223b6d3fcfe78e3ad974fb35f197cf3ad614e7
 AUX fix-preferences-gentoo.patch 426 RMD160 83075ec3c2e4c39ba298096bd08447bb94cad34d SHA1 ffff69bcff712483d1962ce04a700748fdab24f5 SHA256 7edae5ea1efb042412d02ef00c51f5e55c4499751c240b48c7b07f69cc420d94
 AUX fix_blocklist_support.patch 3194 RMD160 87254cfdbd7fae1ed5704ecfff4ad5c691b44dba SHA1 3da1bb6544bb1b07548faa1b94bbe9fd7350dcb6 SHA256 4e0de29d5dc65b3bd9a5bb7ad1adee92056af78da66c5c1c7153dec3026931f3
-AUX gentoo-default-prefs.js 598 RMD160 9ee952b88ebee3b47f6466e2d19674805d8529d2 SHA1 980bc21282021b8be5c420155d2126c86b174068 SHA256 ad533b62fcc7e0ebbafe039e74db68734c86077178b03d37a01868cf790c42f9
+AUX gentoo-default-prefs.js 677 RMD160 73ec130da332c1d6517a6f838d5fab0cc134289a SHA1 b9efc3ef5e95ad3081f6b68d771e32e848b4b9ac SHA256 53493080276f221f1619153c114caf268206a6fa107972b33a4eb7f1c1cf6fe8
 AUX icon/firefox-1.5-unbranded.desktop 303 RMD160 e9cb808302b7fbd7d4eb84aeb0a438e1f82f220b SHA1 cd5d0ce5162d9fd246360409b1af396b62c1bc6b SHA256 1d6ba1b322ba1bf3ab8e6ef92528bdbc1a2f5cbca3119df3f4380b8b73b5cb05
 AUX icon/firefox-1.5.desktop 300 RMD160 df437e79147897b0ec52b44edc42ad4ef270eda5 SHA1 b60d51629ba58992f6d9ae9ad8c29ffc6630de4d SHA256 bc6f84004032afab5c078d8dc7c4ffe36abc45738c119fad3fcfa5de89dd5dae
 AUX icon/firefox.desktop 276 RMD160 92a5671cd09e399b3330c4be31b7ac7583747031 SHA1 b757763670a00982f3cb38b8d41d7faa6eee3818 SHA256 06565ade11b6e4b448cf10339696c43f31e73cb6824491094bb6e0ab902c7cf5
@@ -315,26 +315,103 @@ DIST firefox-4.0.1-uk.xpi 260131 RMD160 7a4ea1bd3728037b6a72f2bffea2691433472429
 DIST firefox-4.0.1-vi.xpi 239967 RMD160 15bcdf411cd432329d743c060c68d1cce16d7e56 SHA1 ff34a6697c4c02485d592da9849dbbcabdb87689 SHA256 78408acdada24372e27a2b0bc162d49b70accdcda506f56e6e700168c2434c2b
 DIST firefox-4.0.1-zu.xpi 227606 RMD160 4341384271eb8c3341f55512c301dcd9dc9fc542 SHA1 d171ff639bbcd5173e3dfd185fd7902da70815ad SHA256 6c8575e740f4058ee54be0f89a25994c25fca691499762b4036e190d03c24698
 DIST firefox-4.0.1.source.tar.bz2 65980273 RMD160 63faaae78b56db407a34454986361212382c838e SHA1 c89bc5106266aa0097a7be15be84555bd2649f03 SHA256 cf3a39877facc229a67760915341fe95095cca647faab3a7adcb70046105199c
+DIST firefox-5.0-af.xpi 221342 RMD160 31320b3c5153cf238a3813aacf18b61f18714862 SHA1 23d7a9fcc74e5921905dd76013092fb98fefdc53 SHA256 a2e8b93b72193ec4eeca255a1cc735f548e77cb90a459b8c55eb4908a8f9f6b0
+DIST firefox-5.0-ak.xpi 222856 RMD160 e84906af76f560745de2e70c666f6716bba0ee5c SHA1 8d93f48f9be4ffaa835765f717b94c5c083b8026 SHA256 dffb31551d27180204aa74509f36a0b31faf67a7bd46a38ce5783ecf38890652
+DIST firefox-5.0-ar.xpi 242499 RMD160 61333da522d19e8733a7b2c68e10c31fd33a6030 SHA1 200192bc71f728225c2d816d13fd35dbe3f9b270 SHA256 f40d36aa041dd5e6fb378ab7385a6c593513b07b6d18dcb1a347ddb0ae80d31c
+DIST firefox-5.0-ast.xpi 218875 RMD160 c581011ce792b42fefc0ce579367a0083489c30a SHA1 90a09bbdd437eaa5758bdae9e0b67a559b5ce5ad SHA256 c5cdb9fccd6889cc81e935c3657fabf32ade2c0e633dfb117d439b662144b298
+DIST firefox-5.0-be.xpi 232148 RMD160 7c77e51f85f3b6c022cdcd4f934b0559d1f791ee SHA1 4eaed469858563abfab88f954edb33980e3508ba SHA256 39c2a84ec5b87b87d43bdd5fb853419496bac5a3468065b248d070bb72a6b346
+DIST firefox-5.0-bg.xpi 255712 RMD160 fed499045d9d588986d9af24a9379b97f659bbab SHA1 0a485a828e39a5479b7be6ee38b9fc5a6905d234 SHA256 1359fc832811e1bd58e99a441aef1e97573b44ef1a8f4f644ef611f9684b8708
+DIST firefox-5.0-bn-BD.xpi 264307 RMD160 40ea253194c1a5ac64dd97bad7c6d676222926c1 SHA1 3f3b3da09d16627b8c7d1e4537aeba2c53d68ec2 SHA256 5c3da96b4f16783b1dcfea19d1359924ec315c4478f38f226675a11b598ac637
+DIST firefox-5.0-bn-IN.xpi 294137 RMD160 46bbc26eb7e9a448cc79e94559090bc0a51bc62c SHA1 f22544c9f8f8466a9038b1b958a340006c11b529 SHA256 25f88327fb65b9854425b19d0d36aabfddf08e367aeebf40930f969d02a286cd
+DIST firefox-5.0-br.xpi 229699 RMD160 c341c98cdaf43a8e2f58017da9e72ef6475e7e5c SHA1 eff97ec91c05e2482ab6fc3009d3d981d8b1ebc2 SHA256 7c7f8097edbefc427c21c97030bf9d8f4434f6530b95d75bf2b07450e3c154d0
+DIST firefox-5.0-bs.xpi 227566 RMD160 b3ddfd5e984560d0248ab135a63cbae78e9a9678 SHA1 834ead188d60c121bca368f5c8003de7bcccb69d SHA256 2a3b36f5795d8cf596a522b0da4eaadf6f9f5fe08e08d96e084e0bd56f76dc5a
+DIST firefox-5.0-ca.xpi 228977 RMD160 3f94a9f7195ef006779f0df0c0a7d87f7fbe59a1 SHA1 346cabcbe132217cde58702f61da81208059676c SHA256 cf6968da5dcf725427d167f4ec66341c29f787be9f39bccce7829fafa5ae74c5
+DIST firefox-5.0-cs.xpi 27048 RMD160 035bdefc7904e56ef86c266970d7c162e3e00dc3 SHA1 182767e0ecf6116e39b3752a27de09dee2c4cf21 SHA256 1f5c728bc16bbf5c56a06045cf21c04da252852a3db35cc0957ddef4bb52fad8
+DIST firefox-5.0-cy.xpi 222565 RMD160 5212deadf584228547d2eeb4969d62194a25be6b SHA1 4eb054e3d5f4b8b9a264bfd95f4c57ede7ba870c SHA256 929378c8ec2859ecf5dd539e678f520459489cdc1c770847ed0ab5822582bca4
+DIST firefox-5.0-da.xpi 222498 RMD160 281a55a73d720c8b671a92cee8e21b70d030ef11 SHA1 9da83e1d8cfc823830d6f85da09f1e1351cbbd0c SHA256 f7e4f0c488ba5a0a1da3895372b5087bcad8db5d0e7b48b53a856cce0f60adf5
+DIST firefox-5.0-de.xpi 230248 RMD160 468287b0eea9aacf3acaa297172a213ce80cd7b0 SHA1 88ecc06a7931fe11cca8a9d852ee8efc2880e3b8 SHA256 e112cee3947ffa02c9709a701404979a0098632b6813bd9278490d80351d0cba
+DIST firefox-5.0-el.xpi 244653 RMD160 8d6085f368980847f702123339d03c8e80571c96 SHA1 ea04c58cfa113e810db22136b6a2c33094146f0f SHA256 3eb3d6a8f869242aa449afc040035bcaf1f3db901b5030ed6280fb091e78c25d
+DIST firefox-5.0-eo.xpi 223122 RMD160 bc605b0d95516bfb6e2df15627e09aefaa65d741 SHA1 59f680eaa7a7fd8f6522f684dbe1fff0da986129 SHA256 ea1d78e00db6eac107fe2352dedee06c59a704157493c92dcb0435cde5193c8b
+DIST firefox-5.0-es-ES.xpi 202968 RMD160 b17fa58f8f8f0efb90012362c6203e298ed53673 SHA1 e5b42232553a7b14715c5aff29a99004d5e95aef SHA256 f28a77f348ac0697f772b12a57eed3ac1d453f068d4b1908db85b14034f989a2
+DIST firefox-5.0-et.xpi 224313 RMD160 47dd12ba2e6ca7006e5310a8ea78a83c7b3f4182 SHA1 85ffd665fafb0912f6a5c97f671853b3b6bef50c SHA256 b026307d175afa1aaa554a3c922f038af1807f850b732db08e4977e990ef7c91
+DIST firefox-5.0-eu.xpi 222260 RMD160 3c2482795801e2f82b553b465f20bed36e74adc5 SHA1 6072b29f940bc38ba38addb518c90527e4d48f61 SHA256 92d585c82509b1dfb6f9f37d6507a74e2c70246db28542452ebf53cd790aac2e
+DIST firefox-5.0-fa.xpi 249669 RMD160 15e66d7121ad752596e6379a64a8ee66495a852d SHA1 e499d8f9454a53c0bf21bbbe14dc0addb3be24ab SHA256 4e323228d73084bfe9640e259b87461837783679cafb9345c07d824d707e1b69
+DIST firefox-5.0-fi.xpi 225413 RMD160 6d763cc997259aa5b735d02c1312b511154fac7e SHA1 6f06630093f19ee00aadd02c01ef8b387fa73e3e SHA256 ea3ab6729e77ac12e1c0f63c29cd58d985aebf8a211953fe66121c76a76d3444
+DIST firefox-5.0-fr.xpi 231107 RMD160 6e229bf41a86f94c47b57d5f516b8b26a8ace62b SHA1 9c9dc84805da02d323b5c05ade82a05857a927a6 SHA256 7174a6cd2bda7ac1ca2fb990fefdc056204c16b2a72d212a6273709a2ed6a90f
+DIST firefox-5.0-fy-NL.xpi 228490 RMD160 65603b150dd8c1a967faf11655cc7e3516741c15 SHA1 bb20dfe86a00ee193e31e365b2de1c1f4cacbb2f SHA256 664ffc517c326307a24ae5e81b599fa527bca1b4704473b19fc406f256ab4cce
+DIST firefox-5.0-ga-IE.xpi 233448 RMD160 772da22dade22419eb20139884f1a6dc85070955 SHA1 e642f205a1d374714ab956fcfab19d419729e1e6 SHA256 11591862978c1475a83102500270596f0c4b1a18e234a6ac8ed5e2fc1ead1c95
+DIST firefox-5.0-gd.xpi 234763 RMD160 d390965895d119be15ddaedec58dc3195ab0a5d2 SHA1 c0c52cfe4f4db3441e455923fab4e7685777abbb SHA256 e59d81fdc684a753dca1ec838d14c5140e134e747fdf7a9348ba950f88fcaba2
+DIST firefox-5.0-gl.xpi 225236 RMD160 c9255a6d277f5f1a2bd1dc96e3958fddedca925f SHA1 676fe3e12e1e4d1144f2ddcc4bd5da94e1d04bb6 SHA256 e645891f96c31e832bb12bc23e7b8d1819ddd642c26720cb151541d342d8aede
+DIST firefox-5.0-gu-IN.xpi 253576 RMD160 bbbee16baef5ff85f6d7ac1f71ab83cefe2f938d SHA1 49141c33fe1dc3320fef09ec774ad6781d8a3458 SHA256 f426ca547c83be254ae3e110c6fb0c919c74a2bc99fc46942705286e36197849
+DIST firefox-5.0-he.xpi 235116 RMD160 41f743a21cb1bad0b4deadd7e3d1575ad1659aab SHA1 c044e6779b97b5be6409cac2151eb0c00a86f3da SHA256 75338fc5821e688d6dd113089cebe5321cf961b25d465abd623f09273200c470
+DIST firefox-5.0-hi-IN.xpi 258506 RMD160 4fdae9c1dfe4322b373aaa230a661bedea5f184d SHA1 e62aa165b8763fd57c40a37966318766ed84f9f5 SHA256 1a54f1a8693ac489e6422d2d99db5d8bf5804b7d131d594a3dda0f4a0cada9d6
+DIST firefox-5.0-hr.xpi 235177 RMD160 606627644326138577866f75a5614007c3a32b47 SHA1 e6fa840c994d742b67694fdba7bea7640178e29e SHA256 0b5f555cf3218a8dea482862ef9c0fe21f48fb15c42b7b00822267d6dbed315f
+DIST firefox-5.0-hu.xpi 235650 RMD160 0b0d1df38a7b2cd38610c1d2b13236a7e5986385 SHA1 e9284ff58d964b42e5e5623ae7e5342c39eaca9c SHA256 c7d0a9cb17fec754758241ec977d4fcfc8cd50fc61a19f36f749de045b87f02a
+DIST firefox-5.0-hy-AM.xpi 420343 RMD160 3cb1dfad0c582e875a811de9d238252d074937ff SHA1 bc2c8d9a33ec84bd206b1d7e7336a9c531cdee7d SHA256 5f89db48c14c1c88ae3d34e28416804f9b758185711fe0755349b1d00ae73ff4
+DIST firefox-5.0-id.xpi 219287 RMD160 2731ed0164ac75ddb068c725c0b709a9020b7dc1 SHA1 69706c6c972cde4c1ce1fa67a7740292643976c7 SHA256 6d2f2918a5628ae0f06fd64007448e7884704718921ad2e9cd3b1fb602d7934e
+DIST firefox-5.0-is.xpi 225064 RMD160 e1b4ddf7ff3eef29f63142def4258bd462051f6b SHA1 67659f3c5ae59412246db2a8f9557d60d43d22be SHA256 d606131a39efcae6cbc082cda5a95366f8c443993027f2d84d3c1c77a0258c8b
+DIST firefox-5.0-it.xpi 200504 RMD160 f3b21716f1eaf8ac81d924c7d756b9760b5e2c9f SHA1 8afc72ac03976dee4e7f9cf989629e768851f0af SHA256 788fbc67421c1e2e3a681cfb7a9c6ca333f39631803109e63c1537ce4997f763
+DIST firefox-5.0-ja.xpi 253532 RMD160 26782acd17c3fb47d63a960cda9fb1a588aad6b8 SHA1 698a052c4a6fa38d4520ccfa9c5daa492d926087 SHA256 fd2940c200de8271c055b4eed20798a18408b7473109bfb4a672376f2c95b212
+DIST firefox-5.0-kk.xpi 257652 RMD160 2c830c00d9382e514c5e00446c705a1c24288d83 SHA1 b8fd3b66402e74ce76958bbc4c3df9566fb49ee1 SHA256 db1cea7c63226275a7e8ded104222f6cff37d8d94cedff7a3095db0d73a93bb3
+DIST firefox-5.0-kn.xpi 275000 RMD160 ce671b92e147d31c6caebb9cb00a43f74ce5f158 SHA1 029e8b5c97a7ca9dc36c1f0b3b8402ab19c3df14 SHA256 dd658af2b106ed1ae292afc7d3009def4f9d9c7745ccd6e6429b56df0872204d
+DIST firefox-5.0-ko.xpi 207948 RMD160 0f18562fec2104aa6de5cedc6e2710f49f47253b SHA1 7297884e2ec3ef00ce21d883bc2a49824c4e41aa SHA256 18637412840d5bc0caf55f08034ca908c5efb84e32e38a3d5e3662fdbd775040
+DIST firefox-5.0-ku.xpi 232519 RMD160 8fbc1bcbba4ff49efa64534750e7d57edaee80e7 SHA1 6e55aa3911847cc80a968b1b7cbdbe6afb7b600d SHA256 8f9fbd41b099ae99aa4c2f88957636f0fcf2ba84f0d622d4f95ae0184ea0fd57
+DIST firefox-5.0-lg.xpi 229749 RMD160 53dcbb7d9eff4030b8caf343f42d429ad77178d4 SHA1 21871ff986ad9ee25f91d8f1c2cccf32e2e031f0 SHA256 8f4823299cd377231e528f56e04d1e7fa653604fd36a33bd6001959983a89215
+DIST firefox-5.0-lt.xpi 314962 RMD160 1130da927aaf9144faa595da638384e5bc1e74c5 SHA1 9f94db3d40798121a80a127f94b8efa614b326a5 SHA256 f46ea7371becead269e7dc7441601f2bca5920d1ee8a4f6b1ebfd67b2034903e
+DIST firefox-5.0-lv.xpi 226467 RMD160 5b67c2c884865a9de72a2176f60232f13b7d2eff SHA1 d9371ea4044060a1c4a03c693a2dd7932605c5ce SHA256 5fde2474f968b20b5876f7f49c228ba0948e00f2fcefcd25f1ac343d4c2b5b1a
+DIST firefox-5.0-mai.xpi 258290 RMD160 3ed0b1036fea51d11a03a50d5b1d84b03d205be0 SHA1 2fca9faab19a6bc9591778284f438b0da064e269 SHA256 61f64a1634c74a8618e75b42e50f730775db1e9bfbcab33b8187f89282fb8f3a
+DIST firefox-5.0-mk.xpi 251524 RMD160 8f8a7b263b0e3b16ade2196b820b44f47ce8232e SHA1 47ce7a5353bca22ef8f637a01fbcd4e2c7983a29 SHA256 0bfab372a3a79503a3d06dba43acd462caf1971f90b72d21d82e068c8da82029
+DIST firefox-5.0-ml.xpi 283533 RMD160 f45d31452d1759afbbc0ce8306320d864fcdb86d SHA1 4e98a5a01e8d8990597346c8edbd92c9cd46e99b SHA256 b8efc38640f4b1e7b3046800c9d0b23ac8ca4bc08572450c9450cba55d832d41
+DIST firefox-5.0-mr.xpi 258813 RMD160 e1c4fdc563844a27f2dc4042438d530f3537de5e SHA1 9a9965f2f3bd1793ad85d25e7cabdc4e2da8d71f SHA256 e177b3506d5255e4127fd76dec257262a5ab9cebc70d853f46d437bbfb783432
+DIST firefox-5.0-nb-NO.xpi 223346 RMD160 bf413f7380b19aacc61d86e8be4f7c2110e63583 SHA1 12105ade3eec003c31214109d479696295b065cc SHA256 129eb4174605c4ccfd4bebb3cd583ff812d26008bae76f714f8150dd8678fd9b
+DIST firefox-5.0-nl.xpi 224641 RMD160 c192e12fcee74ecf8b7e044cbfcdae82b1d67ac0 SHA1 8a85d968db849cde222de3ebffc75a24111a1fb0 SHA256 aaf5e3cdbd604ab2bc8fc399825bcad48d48bc08067e5a340ed18a53a63737ff
+DIST firefox-5.0-nn-NO.xpi 224672 RMD160 f48f9f0952288861fab03da22e9f82d8a91f88ec SHA1 01b23c95924f18a9e7f02f2c18005e9702b90ae6 SHA256 1a7c2d87d3179acd3d694261f301e86379b58d8669a8ef89b16b2608948d10e4
+DIST firefox-5.0-nso.xpi 227969 RMD160 13c486ed130821893de16cea32d2cf4e980e6d73 SHA1 7438e060c35e6b1721971cd1db178526417581f9 SHA256 3aff12e9447a2f4db5bc79c99b55e9db43a2c4308dd37a281c0e729868138ec5
+DIST firefox-5.0-or.xpi 262339 RMD160 c0eb570125e222ba3790a5e18775a187da0896fd SHA1 5d07413e5ce7c08bada53d0da4109434dec68c05 SHA256 a4c9d21982037242531587823aa1eaecac139c653f88b3d8029048d805e12182
+DIST firefox-5.0-pa-IN.xpi 260036 RMD160 fd646a70a967ef79bff57ea1503ea85343020486 SHA1 670a0015b38ca97cab387caf4aeb06acc0cf16f1 SHA256 759f7d9642a28cbb1798407725988e459eaeca569a94ed94f0b023bfa9d30d6a
+DIST firefox-5.0-patches-0.4.tar.bz2 3023 RMD160 c296f117d8c707c64cc040b576b9cd0e7d88d58c SHA1 de580422001657d0dcece33c5304e3343c1e3e7f SHA256 351449cd2cc63f7c91d9a3be587cc6aa7e1971e823cb7314f7e061bc5d7a0629
+DIST firefox-5.0-pl.xpi 233164 RMD160 9a14ff535f026c50d65acd92a339f5fc0f387dd2 SHA1 18e8fc4ca1b5dfc52e5b0faa04fc3f7f6c0d673c SHA256 363fcc2c6e9f04bf683ce9fe06564f30a0d4e02416f6903e382f40555833a236
+DIST firefox-5.0-pt-PT.xpi 228030 RMD160 4f938c51755d792994e3c707af38a525b52cad64 SHA1 7596933bafe8e6cbbe617d7bdb8a4f6189668192 SHA256 ec9bba62e2646d01d33c5d18396980d0c7e45ae35e1b035acf993c4b43db9916
+DIST firefox-5.0-rm.xpi 227680 RMD160 16b43c2c0a1114d99efeb566a00b06ca781cdb18 SHA1 550dfa671e8d44826c9404f8e0fd2b10795a2120 SHA256 76108978d4b9d816f1fcbb76c36159f8c75f5314cd3cd6329b2e247e5e6b10cf
+DIST firefox-5.0-ro.xpi 230861 RMD160 9a15bdfea854bfb86f45c32c1d1635720c2e9da8 SHA1 3b151f65a7fa47d9245659d609a4757505c22645 SHA256 97a2644d9a5103d9694209a7fde031ec54087a9ab89ee1e375a29f71a42abf43
+DIST firefox-5.0-ru.xpi 240318 RMD160 db74b015d4b822c0d95e20cc8f519e343ec25cef SHA1 f89b816df73307c25d676fc41a0eac1ac31ea36b SHA256 31f7d8a72337a0dcbff611d13825f39e0845354d4b413e6296aeaa5bc6b54bd3
+DIST firefox-5.0-si.xpi 252297 RMD160 f171e228bd0f5232d273a799efb303511db8c62c SHA1 f11157326c96aa85a58222a15b8369ccce9df004 SHA256 85ad3f3bb028fe27696ef340a47760a8e261e7a2b0a2e5a1d22f14a0284d3b4c
+DIST firefox-5.0-sk.xpi 235237 RMD160 5334bc43449e88e98a10280f1e0ee21d176589f8 SHA1 2521c430663b3884f3a6fde8e8f2c2c689b2b2bc SHA256 249427c900e5be9d6a485be9dc9811255f8434651e0e0446fcd42069d8b28bf0
+DIST firefox-5.0-sl.xpi 223110 RMD160 5be67fb6f93d14c748ecfee6e87f03fcc989000e SHA1 979bcceb2642c16c496f0992f5ab690451209e01 SHA256 9f10154128b19ee00e07990e98429a0c701f755f65d60c0537fee9a5903f14ee
+DIST firefox-5.0-son.xpi 221301 RMD160 7c19a03ed753e8cdcca905a9b046418fb912504b SHA1 8f694dff0d43be0c46a0f0ee54cbef61341448db SHA256 e412bac4ae30ca6c5a10577ff0b92adda666cd681a3ae7dd6c4b2b315037e00c
+DIST firefox-5.0-sq.xpi 208379 RMD160 f5ed287689067ff904a354f53565c47c285563e8 SHA1 7f6ba32f74033b50e5f8c78b43297c7691d853ee SHA256 4c473f7c4f7ff2d02475eb263e029d0bb36807140d658643e7e2af35a173639d
+DIST firefox-5.0-sr.xpi 204265 RMD160 6b164b3a523d3041a861bcdcb57d2bdf1e1a3fb5 SHA1 9e5046772530ffc73608411362c7dfc38dfff322 SHA256 448f085fa3448dc7a04214097a5e495a20047e08c23b5e7fb5a0b97d6222aad7
+DIST firefox-5.0-sv-SE.xpi 261675 RMD160 cccbeffb0332e782dadbb6816f42c776e55944ae SHA1 20a44829747f016b37308ffaff8a878231c2649c SHA256 1f5060773f8ca6ee30adae54dccc8b9b9b8bd79170f2716c5e1ff1f681a757c0
+DIST firefox-5.0-ta-LK.xpi 268411 RMD160 cbe8b54d150a3f7d60fd28e931c52e5cf22fc97b SHA1 bed18213e3e880ceac8cce90f5f828bd7880c33b SHA256 91be63dfdda892d304cace8c6b1e365f38161cff0f0effb996125b8a916936bf
+DIST firefox-5.0-ta.xpi 253294 RMD160 202d3207179ee23b2331da5df2480eacceb0a62d SHA1 a68546f36059e3a4dc1752013ad92ecbc5a3c7e7 SHA256 97bf49b15d9dfffbdac6106ceeefe15776fba9eeb5d024dba6fa46053d10eb89
+DIST firefox-5.0-te.xpi 267869 RMD160 3d509d8c21b48e4c529d607d7363d80c2ac68fec SHA1 a3c852c7864b451f6a279e53740eaac46d1401e4 SHA256 ee3dad3dd509519e5e433aa5313aadb2e1a795b0be504696b5595c2d69392d21
+DIST firefox-5.0-th.xpi 254357 RMD160 7370baace54630ca2f520ce05c75ba671beade8c SHA1 b120638ce0f1946348da5bfa8e99dc3a4358cd69 SHA256 cb4c0100e22c82a50a7bc05d8a9888235c4a67a9b4e66b10b6eeaae34063fac5
+DIST firefox-5.0-tr.xpi 227980 RMD160 d9e199a337b7e406f92c1b7b399f196f50ccbecc SHA1 6d261432ebcd3add1e2d5d5ce439afd8180708c8 SHA256 43e2ee2ca92d6992656b6b297b63b897a9a08fc20297a636e7793f1af4c6557a
+DIST firefox-5.0-uk.xpi 261247 RMD160 dbe10642f722c5b4aefd7bfecd806966f0a1d1a9 SHA1 b14931319ba1127010f6ebe9e1ce4baec236a6b5 SHA256 5bf6b7f1fca042015e75669e1baa1741b29db0e95d9f9e12da1c8066f482ea42
+DIST firefox-5.0-vi.xpi 240934 RMD160 539f6921f579db2f06e0c447b9b74bf783ce8545 SHA1 6e8415e5c9288fdfa23a07eb1e0be5206cfbbd5d SHA256 7b17b6bdd0d68a45a1fe6b6080fc266f33e501278895eb0735beec90e2e6f41e
+DIST firefox-5.0-zu.xpi 228727 RMD160 7a311515cc6a5ae12834a96172a69d4eeddc9fb3 SHA1 b5a9885127f1c2bbc0fd5b9562687271a29510cc SHA256 d5ba9b23b342502d2012b78405c1ba07307fe48f21f23542e38c2fd59a32c15b
+DIST firefox-5.0.source.tar.bz2 68782151 RMD160 93d97a01f572f3688b0065c903afc3d7f9260179 SHA1 22b7b4751173c2142a0f09cca1aebc717d97b45a SHA256 6bf97d80c8296f6ac576a07a87460e68066066de8bf23afe5f271cb7e1eedf44
 EBUILD firefox-3.6.12.ebuild 9508 RMD160 e6b40bd52e35691eb6555a907049a3e326cbeb48 SHA1 1731b8c48a318f7d3500237bac05ccbb3c00bfbc SHA256 ee8e7420526099ab8b91e41d3026ca330489fd5ed38f5604d593c2d71d2f7c56
 EBUILD firefox-3.6.17.ebuild 9453 RMD160 877c8bf7441925e36687e08e598ff290b25374f1 SHA1 18b1a63b6cece37c3b94139069d5520520738ba0 SHA256 495299be97ed6b650c6d8f5f0044ec2fc74c0bfb2dc8baa79ee9801dd09de92f
 EBUILD firefox-3.6.18.ebuild 9465 RMD160 06b69070b29ff7187bb663b1007a3db1c4dae06b SHA1 6e8a2da98abd0ab6419af3be02156ca9d04ac434 SHA256 dbae0686c9bd1a6b7e12222b9c13214e3902a7d6161d83ee2b2bcda9e763435b
 EBUILD firefox-4.0.1-r1.ebuild 7999 RMD160 744aa73bc524584610bd5086a9c74519b4ada62b SHA1 190d20749be4463b594d56922bd77e19993da690 SHA256 1b426e0ea6be5c55695fd89ecbe8834b3e6469e060bad034aecfc1faf7d37770
-MISC ChangeLog 128084 RMD160 5570e9805f2272ce00e404cfd9a383bb77bdb70f SHA1 387cf3788565fb26ac02390d9923291a9a65166b SHA256 0b96801ee5af8fd35b7ca8c2f0ebe25edfaef0f0392ff39e88b7e644bd50750b
-MISC metadata.xml 591 RMD160 4e13e501ffacdd9001cbc15bc92e3e901463454b SHA1 9ddb97472d099fb3f65193bc7cbfcbb26e6281dc SHA256 e91f4670e55c264903dbbd321565e1d817e510dfabadaa81c9e15c7317864b23
+EBUILD firefox-5.0.ebuild 9372 RMD160 0f68e3b5cfbe84190b3e477e3672fdc0df1d9e1b SHA1 01351435c2e88a41caadc6d57eb7cc2936f0910d SHA256 5bf92e8101567e4a1ffb158229298ac0931a855e91c80e7e0344de374ceaed39
+MISC ChangeLog 128556 RMD160 7cfd7778c64fc3bd3b4b8d0fe043e4f92f8c279c SHA1 801be71f268b3129e581ed11b4a9db5ed3f36bc1 SHA256 5a2def085257d65a4c8e2df91a914d274ed9196504e1aedc37d65e27a1be883c
+MISC metadata.xml 938 RMD160 c224cd3636922ebff41f85dbfaebe10288c4e40f SHA1 6b5a9820d19c046a9d657470bcc800d29587ad9a SHA256 3a2d3c374034f884382fc1cecba69b93608d899fafacf37da4c02c3a3e880fba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOAx6nAAoJEPiazRVxLXTFYc8P/1wikc2LSlyt0eorv6G9lb1E
-XrDX1+6x7JR523OgXtYYb2UGHYFoZFVnHcpmoqjsSa+Ys5RAJC6jM8qIXPeZ8wTy
-BcN7ajUUGAjqF/pcEI4d1x0x1JeuM3l6Gt+mUo/zYixcoIzQI4xbgyjH8j4eZgTw
-e2bTU7CQTYPgor2eYKLHcQjNziAaPXGurlv6aiIad4tbfS+Qb8+e+fZFGPFe5O8p
-BKV8MqLVCEogdA0R5WLtjSf1dlKHxve2RbYEe7kU/SPcHp1CaYJ9uoLeaL63C4Ds
-SOG9ESwBT6cISBHWX13Xl4vp4NEkWPOJyX6Oo7sIjePV9f5FdXo7QannvANKTLFF
-QCkISJ2oMFsFpFFFCmvjlwv3hCX/VTVeGqzWZM+1/pzim1PTFClXNOC66Yz/3060
-qD1I184aSDdxjZJKPko0G+5MVVM1CRaUueW2OAVE0G7q2FiT4ECk53LSTTcz3nYv
-1SDDtRNHj/P+lLzJpQSNP4n653yM6LF5eXAY7/1KiT9vI1FSozDcYBkUQhEY7owh
-6Dgz6zwGlURsuMKS8ToBGB1icKJQfrsxWSfT4r9QEhIqe6niVVWYwueh3017KBSt
-3EWy2h8VGDh3jLQ3xQJhwNfXiIgiZy42JGqTcJumh6hLlE924UX/XTS9H+sclQfv
-8hkhVGmU1WzEtY0OtpUT
-=kCuy
+iQIcBAEBAgAGBQJOBF70AAoJEO/kOhxWD91krcsP/ReovhqU/6jby2QrQVwBSODo
+misdRRkr4ZxN1xCNPALD3tYEno31ChoK3rNcMJvGnjPJ9KBFCV0L83CC+ck3vVvp
+t9qFciKN0IYjH6MBJD86kwTCxf6rzI9RRBOWGoQrx/dARZvpv6xn5CjcNWlkOisN
+wXq59qq8BHFYdl4dz5OXfsOnKa1I+rfyuUZk2ym7paxi2xtB6UTw1bQlxLToEk1g
+KfCGHwSTNYsK71rmN9trh/K2Q8+m4wGniQ8EmwLIPCaX6rWFc5UIe1MOHN1mo4R+
+VSjZZnxXHnybUx7YmA8dSkyfOoQfR76EJt5j2Rlb65NmW6DpYO/KMXqoMclLB7Fw
+YHnHOjbzrJ+U/fpweXyGG7IbJ9y3jlJJrZrlPv2oJhrHXhacPqXhseBCzmZw5Aj3
+x95hhuFI7W6q9kdZmGfcJgkhPjMoAM4FQBpW96ebN4QF0gOHCg1Xh2bwiwvn0Cc2
+BkjcrZqoHXHTgx48FZLtUJByDIYlhxQ2cRO396IixouuRJpje1tJtLHqcPMIogS2
+YJVEgcWhI39pbyTolAM3QoP+BvYP9+dfq5M7lPmAKyCP4BBAR9ZLT3y80qglmTfQ
+/IQsqfTVPFb/gF4d79Ub4dwxEACJvM5qjQOJVUrFDMWQFIGHG1EIVwKYrEVmVI6k
+H+2ttU1fCL+1urlKjo/y
+=6vnv
 -----END PGP SIGNATURE-----
diff --git a/www-client/firefox/files/gentoo-default-prefs.js b/www-client/firefox/files/gentoo-default-prefs.js
index 5c4a653cb677..4546d3f80ea7 100644
--- a/www-client/firefox/files/gentoo-default-prefs.js
+++ b/www-client/firefox/files/gentoo-default-prefs.js
@@ -10,3 +10,5 @@ pref("browser.urlbar.hideGoButton",        true);
 pref("accessibility.typeaheadfind",        true);
 pref("browser.shell.checkDefaultBrowser",  false); 
 pref("browser.EULA.override",              true); 
+pref("general.useragent.vendor", "Gentoo");
+pref("intl.locale.matchOS", true);
diff --git a/www-client/firefox/firefox-5.0.ebuild b/www-client/firefox/firefox-5.0.ebuild
new file mode 100644
index 000000000000..68e70ce22eab
--- /dev/null
+++ b/www-client/firefox/firefox-5.0.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-5.0.ebuild,v 1.1 2011/06/24 09:55:00 nirbheek Exp $
+
+EAPI="3"
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension versionator python virtualx
+
+MAJ_XUL_PV="5.0"
+MAJ_FF_PV="$(get_version_component_range 1-2)" # 3.5, 3.6, 4.0, etc.
+XUL_PV="${MAJ_XUL_PV}${PV/${MAJ_FF_PV}/}" # 1.9.3_alpha6, 1.9.2.3, etc.
+FF_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI
+FF_PV="${FF_PV/_rc/rc}" # Handle rc for SRC_URI
+CHANGESET="e56ecd8b3a68"
+PATCH="${PN}-5.0-patches-0.4"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="bindist gconf +ipc pgo system-sqlite +webm"
+
+REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
+FTP_URI="ftp://ftp.mozilla.org/pub/firefox/releases/"
+# More URIs appended below...
+SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+RDEPEND="
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12.9
+	>=dev-libs/nspr-4.8.7
+	gconf? ( >=gnome-base/gconf-1.2.1:2 )
+	>=dev-libs/glib-2.26
+	media-libs/libpng[apng]
+	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )
+	webm? ( media-libs/libvpx
+		media-libs/alsa-lib )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	pgo? ( >=sys-devel/gcc-4.5 )
+	webm? ( x86? ( ${ASM_DEPEND} )
+		amd64? ( ${ASM_DEPEND} ) )"
+
+# No source releases for alpha|beta
+if [[ ${PV} =~ alpha ]]; then
+	SRC_URI="${SRC_URI}
+		http://dev.gentoo.org/~anarchy/mozilla/firefox/firefox-${FF_PV}_${CHANGESET}.source.tar.bz2"
+	S="${WORKDIR}/mozilla-central"
+elif [[ ${PV} =~ beta ]]; then
+	SRC_URI="${SRC_URI}
+		${FTP_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2"
+	S="${WORKDIR}/mozilla-beta"
+else
+	SRC_URI="${SRC_URI}
+		${REL_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2"
+	S="${WORKDIR}/mozilla-release"
+fi
+
+# No language packs for alphas
+if ! [[ ${PV} =~ alpha|beta ]]; then
+	# This list can be updated with scripts/get_langs.sh from mozilla overlay
+	LANGS="af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de
+	el en eo es-ES et eu fa fi fr fy-NL ga-IE gd gl gu-IN
+	he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk
+	ml mr nb-NO nl nn-NO nso or pa-IN pl pt-PT rm ro ru si sk sl
+	son sq sr sv-SE ta ta-LK te th tr uk vi zu"
+	NOSHORTLANGS="en-GB en-ZA es-AR es-CL es-MX pt-BR zh-CN zh-TW"
+
+	for X in ${LANGS} ; do
+		if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
+			SRC_URI="${SRC_URI}
+				linguas_${X/-/_}? ( ${REL_URI}/${FF_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${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}/${FF_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
+			fi
+			IUSE="${IUSE} linguas_${X%%-*}"
+		fi
+	done
+fi
+
+QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
+
+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 ${P} does not support the ${LANG} LINGUA"
+	done
+}
+
+pkg_setup() {
+	moz_pkgsetup
+
+	if ! use bindist ; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+	fi
+
+	if use pgo; then
+		einfo
+		ewarn "You will do a double build for profile guided optimization. This will result in your"
+		ewarn "build taking at least twice as long as before."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	linguas
+	for X in ${linguas}; do
+		# FIXME: Add support for unpacking xpis to portage
+		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
+	done
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Disable gnomevfs extension
+	sed -i -e "s:gnomevfs::" "${S}/"browser/confvars.sh \
+		-e "s:gnomevfs::" "${S}/"xulrunner/confvars.sh \
+		|| die "Failed to remove gnomevfs extension"
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!"
+
+	eautoreconf
+
+	cd js/src
+	eautoreconf
+}
+
+src_configure() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	mozconfig_annotate '' --prefix=/usr
+	mozconfig_annotate '' --libdir=/usr/$(get_libdir)
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-mailnews
+	mozconfig_annotate '' --enable-canvas
+	mozconfig_annotate '' --enable-safe-browsing
+	mozconfig_annotate '' --with-system-png
+
+	# Other ff-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_enable gconf
+
+	# Allow for a proper pgo build
+	use pgo && echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	if use amd64 || use x86; then
+		append-flags -mno-avx
+	fi
+}
+
+src_compile() {
+	if use pgo; then
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+		Xemake -f client.mk profiledbuild || die "Xemake failed"
+	else
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+		emake -f client.mk realbuild || die "emake failed"
+	fi
+
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# MOZ_BUILD_ROOT, and hence OBJ_DIR change depending on arch, compiler, pgo, etc.
+	local obj_dir="$(echo */config.log)"
+	obj_dir="${obj_dir%/*}"
+	cd "${S}/${obj_dir}"
+
+	# Add our default prefs for firefox + xulrunner
+	cp "${FILESDIR}"/gentoo-default-prefs.js \
+		"${S}/${obj_dir}/dist/bin/defaults/pref/all-gentoo.js" || die
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}/${P}-${X}"
+	done
+
+	local size sizes icon_path icon name
+	if use bindist; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/unofficial"
+		# Firefox's new rapid release cycle means no more codenames
+		# Let's just stick with this one...
+		icon="tumucumaque"
+		name="Tumucumaque"
+	else
+		sizes="16 22 24 32 256"
+		icon_path="${S}/other-licenses/branding/firefox"
+		icon="${PN}"
+		name="Mozilla Firefox"
+	fi
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png" || die
+	done
+	# The 128x128 icon has a different name
+	insinto "/usr/share/icons/hicolor/128x128/apps"
+	newins "${icon_path}/mozicon128.png" "${icon}.png" || die
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}/content/icon48.png" "${icon}.png" || die
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop" || die
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}/usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true" >> "${ED}/usr/share/applications/${PN}.desktop"
+	fi
+
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/firefox
+
+	# Plugins dir
+	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
+		|| die "failed to symlink"
+
+	# very ugly hack to make firefox not sigbus on sparc
+	# FIXME: is this still needed??
+	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
+					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" || \
+					 die "sparc sed failed"; }
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml
index 925701aa9687..463738be4eef 100644
--- a/www-client/firefox/metadata.xml
+++ b/www-client/firefox/metadata.xml
@@ -4,11 +4,16 @@
 <herd>mozilla</herd>
 <use>
 	<flag name='custom-optimization'>Fine-tune custom compiler
-		optimizations</flag>
+		optimizations, setting this is not recommended.</flag>
+	<flag name="gconf">Add support for setting of default browser using 
+		<pkg>gnome-base/gconf</pkg>. Useful only for GNOME 2 users.</flag>
 	<flag name="ipc">Use inter-process communication between tabs and plugins.
 		Allows for greater stability in case of plugin crashes</flag>
+	<flag name="pgo">Add support for profile-guided optimization using gcc-4.5,
+		for faster binaries. This option will double the compile time.</flag>
 	<flag name='system-sqlite'>Use the system-wide <pkg>dev-db/sqlite</pkg>
 		installation with secure-delete enabled</flag>
-	<flag name="webm">Use system libvpx <pkg>media-libs/libvpx</pkg></flag>
+	<flag name="webm">Use system <pkg>media-libs/libvpx</pkg> for HTML5 WebM
+		video support.</flag>
 </use>
 </pkgmetadata>