Security bump. Removed old

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

4 files changed, 424 insertions, 292 deletions

diff --git a/www-client/icecat/ChangeLog b/www-client/icecat/ChangeLog
index d646d6c62ae6..21e32e7fba50 100644
--- a/www-client/icecat/ChangeLog
+++ b/www-client/icecat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/icecat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.102 2011/09/04 00:32:00 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.103 2011/09/26 15:58:51 polynomial-c Exp $
+
+*icecat-6.0.2 (26 Sep 2011)
+
+  26 Sep 2011; Lars Wendler <polynomial-c@gentoo.org> -icecat-3.6.16-r1.ebuild,
+  +icecat-6.0.2.ebuild:
+  Security bump. Removed old.
 
   04 Sep 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> icecat-3.6.16-r3.ebuild:
   x86 stable wrt security bug #379549
diff --git a/www-client/icecat/Manifest b/www-client/icecat/Manifest
index 0dd0f2d69d61..31abb9b7cbdd 100644
--- a/www-client/icecat/Manifest
+++ b/www-client/icecat/Manifest
@@ -163,17 +163,102 @@ DIST icecat-6.0-tr.xpi 240235 RMD160 af3b13de68cae0235e1dbd7c36b0f6f88142c112 SH
 DIST icecat-6.0-uk.xpi 274243 RMD160 9c6f82e9ba085e20aff6bcfd21c482cf2497e0f1 SHA1 0fda5f8e2dd29bf069e450f5699a9da76cc5bc06 SHA256 8536de0a54d79737c72a0fdb647ee1209685887d362125950ed599513cc68f8a
 DIST icecat-6.0-vi.xpi 253675 RMD160 f89a10d874df2ef445dbfd5feb0e1dea64e9838e SHA1 44ee3cbaceef3d7ba29e2f7785bf4a805ab3ae24 SHA256 34c35f511a6de8c6a47a4a12758fc4373e8e4645b24d49133c43cdf72cc01786
 DIST icecat-6.0-zu.xpi 241186 RMD160 ba4fd102ead5b229f841523c15bc1269c72fa247 SHA1 1e190c04da54c4977ee3bb34b75ec4bed293c859 SHA256 69c3254bc8e5e655f97b4407d16eb9914844eac98a9060fe626b2275c125ae1b
+DIST icecat-6.0.2-af.xpi 238366 RMD160 01f7a7b4e15786dfbde4e6e26056575b7aa792b9 SHA1 26316f66960e7a5d917cd68da041b6b148163381 SHA256 881dd4a19968ad9396a58e705e45e0be6e48fbf84e7d9088107a68ce8f86b7ca
+DIST icecat-6.0.2-ak.xpi 239945 RMD160 2100980b41cc4f8a57c4da0be30fd3c33ca55e07 SHA1 b7ee97904e0b83076132f92bd0e605fe485aca60 SHA256 7ae72114fa570a93adbec218a6b7f61a874854faa51002537824ddc53590a0bb
+DIST icecat-6.0.2-ar.xpi 259537 RMD160 b7ebc219c1610308db51009b17047a34c1400aba SHA1 55304d54a2703f25948169b519e2fdf755399237 SHA256 87fe07f8383df5cf81ba4875e80dc9b2b148db6da45bd33cc26ef51e9cbf7008
+DIST icecat-6.0.2-ast.xpi 234234 RMD160 aa4eb651aa6e8bb2655ebc3bcd621bfd867f0fe8 SHA1 6dd6be6f6be32ae4623f59acc331cdfafb2bf27a SHA256 e066ffbe7216b35b4d3579d65c60cb3388b90bfb41b4ee4e0a43f6df976eb9bb
+DIST icecat-6.0.2-be.xpi 247527 RMD160 99c9f9a1ff5437c6244d679e696fa1ec467e9507 SHA1 8ada9c4180d4ba9384d123e93bc6dbbe1909fbd1 SHA256 c8f1b66ad797c78aa7f18c824dbe4f560df9b4bb55e0f52dcf24823c95070a8a
+DIST icecat-6.0.2-bg.xpi 273392 RMD160 90dffb71546e75d023becf3d7d2eca9b5ef4ae8c SHA1 fb1962743583b86dd5a420c253c2f1e34e922e4f SHA256 4f51c8e5973832f1acae8999ffdce06309f547fcd2b16310b1f32db99d25eb5e
+DIST icecat-6.0.2-bn-BD.xpi 284807 RMD160 f87c205df543d50481b2f7f377effec431c3a3a5 SHA1 f6fc09184bf51e08d756577567ab4b4e37f8a301 SHA256 b84da2c7f568343af3cfa4fc8116afc1578f291326e9cb04c748e939cd2ebf6b
+DIST icecat-6.0.2-bn-IN.xpi 314379 RMD160 ec9299144a0b2135f374ef9c3f6267c826386858 SHA1 b36ed2f08e1fa42c2f9eb6e896739e155ad878ad SHA256 c3666d7bcce149816b676a571b60bddef36f09e20cdf1d827f8a58addefa79ad
+DIST icecat-6.0.2-br.xpi 246958 RMD160 486b778b91705625632d0dee333b70fc72974e92 SHA1 fa0e49eb8511248089f282139011d9b7768da949 SHA256 1ecdf1de85ca2c4f516f7fd88d498ec1a7b98c2d0a36f9af91333dd89f5cb994
+DIST icecat-6.0.2-bs.xpi 244848 RMD160 191dfde0cc5260bcd155fb305faaefaaf9d3dcaa SHA1 db002d7c05266951e6cce6bfc4327b97901e6706 SHA256 fb84cad2d1d7c105af76416358ec955110d7dbe37b05c242d1fd1868f2fac5bd
+DIST icecat-6.0.2-ca.xpi 246268 RMD160 9b2d84d81851e4cf091bda0a56c96bdc9f4a3eab SHA1 00e331b138e3215e98f57829552bbd813fca8e62 SHA256 5dd6070da8f7702962f8efff0e50a208ae8261121ecc632e8e21797227cc5908
+DIST icecat-6.0.2-cs.xpi 247515 RMD160 eea29d4c658f33ffc4c14f32dab326b40e122fc2 SHA1 bb43d67ac7e472e53d166ad7ee4597ad2857604b SHA256 b9f42a12298b030b8c6418eb7a0dc42417333d970e450c2a7b4b1b94e069f668
+DIST icecat-6.0.2-cy.xpi 240329 RMD160 4ba6b9a548eb73441a3939a9ea8917e228c34a4a SHA1 91bc8dc507c80b095eefc01b90a08f354f599cc5 SHA256 d9703c52d122d992b467c892ae75e225c08e827fa3341542aa9642d94896b370
+DIST icecat-6.0.2-da.xpi 239817 RMD160 14534c795fe455a79b37d91edd8a83e9e77f90bd SHA1 36735fecb4311115c7e62ad692a63eb24735375b SHA256 e58f5a7113d37349f94d367c0fe960e38b3415fad22b93f7fd0860fd8557dacb
+DIST icecat-6.0.2-de.xpi 247753 RMD160 3a4c5d03df615c2298f5eaf90e86f2b4edb6b8d7 SHA1 4fc7c64e05332e29c65af451881bb61023029768 SHA256 05485a91077594f883c834c59edd34bb3c76636dc9032f99e8669df67e455624
+DIST icecat-6.0.2-el.xpi 262415 RMD160 6128e72ea19a61cc11fac73122e4ffae82d26f5a SHA1 200d0e4f8e55712b78c718e026a1897f5d0308ba SHA256 dba0828d3a2c218a5907261c78c29b0efc3a1ca435fa498c80f376cd4cf5085b
+DIST icecat-6.0.2-eo.xpi 240401 RMD160 d358f1ef430a3810f75804ff00c8f77e94434de3 SHA1 f7bec6429d4e4ff5e3f22e52c298100cb6530db6 SHA256 7790abb5fa04b675cdf2b8e8963f3ce5089e26bbef7e599e1f717a9e962e779c
+DIST icecat-6.0.2-es-ES.xpi 218503 RMD160 bdc50d40e57cbf36a56c8a974bcdc602ff7b4b92 SHA1 622d76b96539a5473a1168ff43c38226ecfdde7e SHA256 6a37d6079269cc6650f29014d5a70c964398761f40f46e7d06d1ad66017d2270
+DIST icecat-6.0.2-et.xpi 241852 RMD160 bd99788c29ba67ca9bc72e4b4a94948b3035dfb6 SHA1 dd893bb8aa5784fdd3780de75c9632751f2f9f4f SHA256 52106f114f878273c6e67e90588421804d4205f25e5646643a89af9df49396d9
+DIST icecat-6.0.2-eu.xpi 239550 RMD160 90bb381697bf3489490c436151d1866e7e385785 SHA1 608e081778557d650d466009adc457fc90cd7c86 SHA256 cbb36c39bc0784359e8ac193258b9f28bf2309465bb88efd3754c82088bd447b
+DIST icecat-6.0.2-fa.xpi 267478 RMD160 b70af35e7bf179d00468277026eff27b5c0cad9b SHA1 89c86dcb9a0bbe18504bccfc9d0dacff692e7cb1 SHA256 b5bfa8f270be327fcb260fda9782efc613bd7f5cc370924292f054e274706ff9
+DIST icecat-6.0.2-fi.xpi 242726 RMD160 80457977fc64f1de9fa569a60a7d4c1bd7814485 SHA1 7e3db55dfd960b23e06d534d63505ea410e3b6d3 SHA256 f37453ab260103c7026dd98091af1ab596e4045d79456c4cd1afc9b69f21dccd
+DIST icecat-6.0.2-fr.xpi 248307 RMD160 9ec7955ed7b91d67ce40a4d0de6f0ebb8bdb4c47 SHA1 e917e47fae507f92cdb060690ed9c115007a23a6 SHA256 5b62a4bf353f85c6c73604c510aa7141517e4581fc6af2a3f91b6088fe829f35
+DIST icecat-6.0.2-fy-NL.xpi 246210 RMD160 41a4e93114252654f0860a4a6c16cc557bd08c8d SHA1 b1a4a4ec556d2a90863111e45ab24a56522588fd SHA256 805f38f3f040f084e52a20211a17790cf0d06dffc29a45b3b10ab762a9792251
+DIST icecat-6.0.2-ga-IE.xpi 250926 RMD160 d530ddd63f49b54f226643e49ea051c2272cf1f6 SHA1 abfe451886377622ab61a30237e94582e2e9cb59 SHA256 ce856386256ac8d04df3d4b5a69c3d8ee132bcce3079790f10721563a2e1ef74
+DIST icecat-6.0.2-gd.xpi 252211 RMD160 e0b8d3bfb72792c8d6ad6c96224f8f85a6c3f0cd SHA1 b0f6aeb2571bb8302a1f313aeb99e328b29e5411 SHA256 bf6409a2b24c3d7dd9b3e9fdc5e8b0ef1acaf668a7a510bfc55b615a100ccfa6
+DIST icecat-6.0.2-gl.xpi 242559 RMD160 a34d939fa4240a94df0e49e281fc4f4f927e88fa SHA1 a44c401435a870b2cbb1627f018371b21ed2bcba SHA256 ef2f90ccd3c0a2211b4b1f7bbae06ed13fc14f5018f90bda0371440ff18b0edd
+DIST icecat-6.0.2-gu-IN.xpi 271662 RMD160 1c6718dca45f1790df889167ad31918796de47a1 SHA1 12f7295ffda4600464bc0cc7b211a2f681611ca8 SHA256 a436effe66162abc1411a49288d171c2696cc313457c66929415d4c7f983763d
+DIST icecat-6.0.2-he.xpi 252336 RMD160 9cadfd36b13c68d8c8840f826173e756f2127c2b SHA1 1037c7d65f7f969c2eb59f284cc2e7ba2d7c9115 SHA256 ce8486d4f95c98e2e3c97f6a6163fe9cab21dd8a8734512d13fc20aed9bfa055
+DIST icecat-6.0.2-hi-IN.xpi 277029 RMD160 4b4e34a098e1058fc610677965cab35adef983e3 SHA1 e7ef129f38c6756d7bfde1cf60411efdf46ede44 SHA256 dbb4dc9b3f4d231a9307f517f1c4cf70b1d16e978b057784d19e63c98111402c
+DIST icecat-6.0.2-hr.xpi 253067 RMD160 03e0d902b74e130003997951f637723fafe6a762 SHA1 0db60fdf794a2986a7e1f151639c4a1dc3fa5312 SHA256 c4015d58c02eb6362e2b1f030266648a865db5276f9ee70cacf79fbd0026685a
+DIST icecat-6.0.2-hu.xpi 253117 RMD160 e1d716bcb18f9a72de293daaff55712016d88825 SHA1 9f6e519609218ebad5518fc7e27da6aea4947e89 SHA256 4e683b36371afb88397d8c9ff20f8ae956ad9d6512e1bb815b2a721f5ad5ba09
+DIST icecat-6.0.2-hy-AM.xpi 437651 RMD160 f61b7757e92f09339260e1b5661e090c147020ed SHA1 44f7ca15150537ea203d70aa1af262208e5f70ff SHA256 9168d049af31d1a11578035ef71e1e5f28f56cbd72352403cf29f7faa6bdd51b
+DIST icecat-6.0.2-id.xpi 236465 RMD160 e9eb18fc7d34d03ba8aab51b922608d0dfa43b8c SHA1 cc081151f7d8ba9e9a8e4eb29b93a2533f91c19d SHA256 5bf828925d90017cf16c4332294fba8b26f09d3b28770e034d3be30c4a12ca6c
+DIST icecat-6.0.2-is.xpi 242211 RMD160 7cb9c0ba86619d093c530ff9a89c8f5b47c00ade SHA1 ba6be10d5c9c2a333c03127c5f8609e756176262 SHA256 327995fe0a5db50bc23602b7821babacd5bfa8d1758cb3beb5939c0ecd22767b
+DIST icecat-6.0.2-it.xpi 215476 RMD160 f98edf78c02a028997ab668a7cacc7c94c67a65a SHA1 bf0e72e920ec9686b53bf3657aa755eacfe63b60 SHA256 4b57d41b80105727640264f471485c4142829a181214f8afa81548a1d77b87da
+DIST icecat-6.0.2-ja.xpi 271111 RMD160 0c3840f94f80b5404dedc83bb089c92c2bc9623c SHA1 93f5e9809a8caa43e0a4de1ed6c39c506be51a60 SHA256 a56c8e5abf26cae7f92b2d7aad0d00c35d9bfbca7ed9f7ed8541fa14f63ff585
+DIST icecat-6.0.2-kk.xpi 275010 RMD160 78a7d551ea21eebf43a2225d2ace5466813c79f9 SHA1 201e7cad591a196f2d9744cc9ce8af0d0657c805 SHA256 2aa38b441b1592584c6649e34572815676349839a9edf4887292be9944293e4e
+DIST icecat-6.0.2-kn.xpi 294663 RMD160 78f2583a4e2fb45890e4d7286c39c8413535b3d2 SHA1 82f40563de0dadd0786c1466286dff54874e6de3 SHA256 f299911e95a38f71af69183c58bd399e203469e79bfdeef1440f237a81ac164a
+DIST icecat-6.0.2-ko.xpi 225460 RMD160 e8eb8cea3a6f87f4604d55ea35e0e67c36a1178f SHA1 aba0bc61bca6ad3e1490d5456d9d67da2b125980 SHA256 afbf52b1e172e65ce2ee35e51366ba7e0e9d749ca18de52a0e22b31169ac1f9b
+DIST icecat-6.0.2-ku.xpi 249194 RMD160 fe53542b3941363f8c58db344f4f2a0b3c5c23a6 SHA1 8e8916cba9e38b56cb516bd0e3864f43615dfa40 SHA256 4ea7248f65c4e5137a3c154a8cdbd48c848ea50cdcc90efdb19d8d8bf22f33d8
+DIST icecat-6.0.2-lg.xpi 246913 RMD160 ab6adf3718b85768a9c893ece5bd09952a2ccb52 SHA1 503919dcfce8a71a4ed0cb446e2f69c9ba60fa37 SHA256 4af23d82f1acfa57e2baafb8dca48706c4b3de0b0ab264ed0a3c827172858cd9
+DIST icecat-6.0.2-lt.xpi 332564 RMD160 16d8734534b7ec2666489de4ab4f75cfef2885d2 SHA1 51247b6a397b3103d8bb985c863954f7d38ca333 SHA256 968106ee5596ac877638fd1b7a469cb3db60cba74a79f88174ab7a1f1391969d
+DIST icecat-6.0.2-lv.xpi 243149 RMD160 1bc2f1ee512d79e9eddb2593a3ba55803230cac7 SHA1 1825b414221d8bfc4a7158ebbc9d4575201c2fd9 SHA256 d65540f78fa902f9ecfbfd8e28a6dc51fe438ef81a8f24f53f0de5f1ca39f6d6
+DIST icecat-6.0.2-mai.xpi 276549 RMD160 f5149cd2fd050756873fa139da50e383bfda1192 SHA1 cd857149523dca4c3913ff3053bbe7d5c69dfe5d SHA256 4cb29bce7c3930e22c502fafcd4898bc5a889dd575c7e81243a7d3768330b5e8
+DIST icecat-6.0.2-mk.xpi 269309 RMD160 42cc512396f5b5c38932398d3f8c94f231c124e0 SHA1 fdfe02a9d688ff8fe6bc23924e386d532b037ec4 SHA256 a508b665cade6d34adf7c2e525809c1cabb332681885fd49e8aceef7e9726123
+DIST icecat-6.0.2-ml.xpi 301325 RMD160 ada9835e5170165031e80588f2b6d4b87be75850 SHA1 1d9aa5d7bbf402e5cde8139428a4f1a3a0509abf SHA256 78ce24d9026c96cc8dcb26db6d6686cfad14bc08f097d520a7d76281793d84f0
+DIST icecat-6.0.2-mr.xpi 276869 RMD160 ba29be896521d30369ef0dc18b6f81d365a2de18 SHA1 0828563f1c0604bc1113451d37a06001fbf6a57f SHA256 977afe8d3e491b72a9fd9769b056660aa1de36ae7a88a46ed1aa0c13440d4b4d
+DIST icecat-6.0.2-nb-NO.xpi 241005 RMD160 15309830eb5d3e4e637ac0a57f4afcbffded15ac SHA1 b7717c13e14ce9e9aa856ef9201609ba0dcaa8e9 SHA256 7d6084a8363e2928068c42140d0a92ac8c241fd84e9e1ad1105e6c1a49fb2399
+DIST icecat-6.0.2-nl.xpi 241912 RMD160 d7b8cd39e1f9dcc4d2574138ee3335f99b3e37c0 SHA1 bd40c67e614fe8a1e6d949e502f65eb5a18143a5 SHA256 40f3d4e3b022b61e8ac669712328515c5bf6cac4106a72afd6c8757be663a63a
+DIST icecat-6.0.2-nn-NO.xpi 242141 RMD160 7b24958bf320f1bb818dd0e5dddadb99acf92235 SHA1 6c31288ced1c5edb17eb2db6dd72d7bafae41b28 SHA256 73e61cd3cdb7bfb224f375e5901f86f0a54b61dab64c82009aa8f80fe705dff1
+DIST icecat-6.0.2-nso.xpi 245425 RMD160 6550a3c1f1ebf8fd16089f42065d32f680b540d1 SHA1 37e0bb822e53f664f8e93e82de9b052814e7a9da SHA256 cd2204f49b897ea1c29d747c747064fcbafa64e929e3e11b3c74c6a10d35e865
+DIST icecat-6.0.2-or.xpi 279854 RMD160 9328495cb3e988330e86f52c0330fbf6dddcd4d3 SHA1 9c7fffe25630af970ad0057ca378a900949bcefb SHA256 35d641c95cd4d0f0db5eea594cd7fd47a3e818343b6ddf94189bf3eb24edde36
+DIST icecat-6.0.2-pa-IN.xpi 278144 RMD160 b4e1957b5a437d4400a38316571676cc47838ff6 SHA1 c2e3933029d5e3a8973fd8bd31582d3a629d6c17 SHA256 a59992ecae7fcb0eedcaaaf4c6ee2fdcd59a0d49dbd6884216bf355b5b049bd7
+DIST icecat-6.0.2-pl.xpi 250778 RMD160 cdb9c4f094f92649133856830d2d261844d15953 SHA1 b22e71a2d13d68150a200c46efe66428e7f12b95 SHA256 0bbeee6ab0832b1007df8e1dcc399797ef8d35082691480dda89066c4cc11b64
+DIST icecat-6.0.2-pt-PT.xpi 245950 RMD160 c493f99ae3d91c525804772c547a2588eb7d51ff SHA1 d86c31b9bcef7403543bebc6bd0df3ae8877e93b SHA256 3d108ad93229517a037ab6b14f8eb3e3b77d54f34cd41b65c4142ba43aedd1b1
+DIST icecat-6.0.2-rm.xpi 244986 RMD160 4f12ab1f1528c64b81fb04f785948b4b19af9bb2 SHA1 9bcb590dedc9d99abdb788ce4a3b6259ec328b35 SHA256 0df24c0447824fa3d024021b5f681b4fa019a9fb4b88d1c0eac52dccb47a86f0
+DIST icecat-6.0.2-ro.xpi 248107 RMD160 bb399fe1e2348f4bfd02a5bfa1f1a001cd31e766 SHA1 de5168306084916ad93d93ecc739075593f1b462 SHA256 36210e76acd3438677402a901ade05412c996c2cc3bee06ce2877c2139cefa04
+DIST icecat-6.0.2-ru.xpi 255812 RMD160 770a16a1eb8b981197a84b6bb98f38cc2cf2cffd SHA1 05f76c134858b4eb8bb31f636811add941b89969 SHA256 904515f85645df37b5f3c5bfd437db3e65da7dfe4402f906a87c186740df134a
+DIST icecat-6.0.2-si.xpi 271159 RMD160 87d0f9d25b2c072e7134ea3605b968d1a898f0f9 SHA1 f715b9c927ef6fa5c885f11b1d554f87912b4ffe SHA256 7962ffb9d7457b4d3c5b53a9321eb8cd3dcd2b6a846a10d7714c1c8bceb08e2d
+DIST icecat-6.0.2-sk.xpi 252693 RMD160 87d317f72b065fced775fe5450118584000a0048 SHA1 e2f6dc0155b1af06d343b53acb551a1412fd3c19 SHA256 d687760d9a936ed9d15a69febed909408b8ffec6cb5ad48e2ca3855222050383
+DIST icecat-6.0.2-sl.xpi 240288 RMD160 87694c42810ca1ef5cf35dd30d1bd70d0faae6d6 SHA1 59a3a0610be8dd516da8acf44bd37f7a145bcbf6 SHA256 65415a2a822de6c2c77ba69b6f9da0555aaee69d62bfc2aefb0a2d9c27e96e2a
+DIST icecat-6.0.2-son.xpi 238695 RMD160 f2a20eecb6f559a2a28197b16479b7923223d3ef SHA1 f09a14b3fca29540bed506f04b6c286ea29ecd1d SHA256 371cecd1805ec0b8ce00992af58fe152427e466c8aa6a377ace8a106a0371ff2
+DIST icecat-6.0.2-sq.xpi 225749 RMD160 ba9ec3aae928810fc28fa57b7b707ae03ca505a2 SHA1 8e3fb6e55d8f582ace5d25f95a213a2313396372 SHA256 6da7beb7244b2b7d39aaab1b0b1c4c85fc15a5947b65af0204ff5766c52e9077
+DIST icecat-6.0.2-sr.xpi 274742 RMD160 ac0c5ff2281035ca2bf6a529d393420f57065ba5 SHA1 09f4590b0b637ca1c776ce78e71c859b20fed6aa SHA256 10913cf61c1294a7d773cc2a0626235cecbe69fdacb63aab9dd7b18095831e46
+DIST icecat-6.0.2-sv-SE.xpi 278625 RMD160 a1754fe08a1c337cb045d181ed68a41dc1477636 SHA1 9c21dfd8e745f33aed1dfb53ddbbf8277a82c1d0 SHA256 4a88c590ca2e440739f39a27396af379f6bcd4fa6cb323ccade824a23692559e
+DIST icecat-6.0.2-ta-LK.xpi 287448 RMD160 384ac6296090a559ac2cc3d3658f65c89901a6dc SHA1 6b02c7607dbc3e34abe017681ebd62d012fff62d SHA256 a4dd9d9238b18b59255d6f7459ee24d12859bb5f594ed643c5f4610467c56f5b
+DIST icecat-6.0.2-ta.xpi 270974 RMD160 526339c86b0d2f38a072629116b1f23b01929dac SHA1 e42f05b4678073a85beebd27d4b4d8899d4cc15d SHA256 a0b5af43a847404a3e44e7f7d4666191276f151e3ed9826b8aa00eb1dcf7a976
+DIST icecat-6.0.2-te.xpi 285643 RMD160 48160d34ff440563c941b70d524159858cc953b0 SHA1 c00ce69f36a318189255e663fafa3ae485b68ce3 SHA256 491427ed83ab04ee2d8db2407e4a6ede8f1c9fcdeb84b5f5df928ff1d81015df
+DIST icecat-6.0.2-th.xpi 271946 RMD160 57d710af3503eee048a7769fef4af9775ab9138f SHA1 c4a331fc1794f43b69f9b9f5f524b9d59e6d127c SHA256 2c1292fae85c052a89ee365625e4d0f57ae62bc166695f8b52cb73f1f8255114
+DIST icecat-6.0.2-tr.xpi 245040 RMD160 1755b042661fc54435bf1d0bac02f9cb87b3dc83 SHA1 3b273c5f7d5788959b88631eb4386391fcb4dc71 SHA256 848d5ba11660bc94bda7a401c02f15d9784041407ad1a5b07a1590ea066f4869
+DIST icecat-6.0.2-uk.xpi 279050 RMD160 36dd09bed4fc3e822b8b51e49605b199d48c03c4 SHA1 9258a4281d53fcf3324d49235a4c6901f2e25dad SHA256 eae2c1f1671d7e6be8975eb6129ac7788a5fe09a57d28a2e7dad9164ba244749
+DIST icecat-6.0.2-vi.xpi 258481 RMD160 1640eb13965932914e6c9392bccddb496f24f0b5 SHA1 e92bc05d6dab3fb7df5131d188993c18f3620dc8 SHA256 4b3d6d0449fd3430a259eb12c380145cbbee64a1abbd659cccc9e3a20686ebee
+DIST icecat-6.0.2-zu.xpi 245993 RMD160 14b52959e3564cc2ba2b7e0cba40b3cced796be3 SHA1 5c27d643bd345b86b724a3c95a8309f121b36471 SHA256 9132b1f826cfd54cced0607133e896acf889b5e5591a6c512fca6f5b15f38511
+DIST icecat-6.0.2.tar.bz2 66757748 RMD160 aa9446475f060e62ceb9901b7a9ad4368231fb65 SHA1 4acf240f33c27c871c9a73198e26eb6a31981783 SHA256 7555dc15973431665657756d8c872fc112f8b13712a4579e88ca60690f81ab92
 DIST icecat-6.0.tar.bz2 66743028 RMD160 08cd2576781e504e579a89d467bb0477ebf822e1 SHA1 a11b6cc470d5d9cf100317d92c21cafa6f629eb2 SHA256 32d3154f575c3b2a1971bf00bafb7a714121e630168ba96efd5f85b0a94cc806
-EBUILD icecat-3.6.16-r1.ebuild 8933 RMD160 b4f309a540f47008fecbe07c84fc13a5e9e54c52 SHA1 638cfb637748fb1683494dd720b4524d4bc45e43 SHA256 035e1264b03870c8cbbce8e4be1bd4efcb270c1206ef9a829dc69c8710568ed8
 EBUILD icecat-3.6.16-r3.ebuild 9115 RMD160 e70a3e23a2d6474cf42a71c4e83a5772f6a870db SHA1 20f6d591be59a3afc36ff57e329db245f363818d SHA256 3aad416e07f379553b74d15a7570a8760a872c43d528426dd19f60c8fa690ba8
 EBUILD icecat-3.6.16-r4.ebuild 9213 RMD160 56755ebb14999e01b2a078b8d6a7caf85862b8b1 SHA1 26b48038af1b393e3756e803e02d736134d2a80c SHA256 81934db382b5d8237c43e83f1930b6f3c00b075692022931a5ba9fc75af96cf3
+EBUILD icecat-6.0.2.ebuild 9713 RMD160 8868e2c2d395ea0c9567574589939eb3115fb0bc SHA1 739b71cb4c66c061d47d28542894b9db01aa8f06 SHA256 9f02cb090ea253912d83c5bb587d1bd4b7e727a97d174323ec0aead629cf969c
 EBUILD icecat-6.0.ebuild 9711 RMD160 25e55050f160033cba4cc4368e0b24f1492b8e7d SHA1 c329812c9aa2c9ea3d60b30a199d734619fc0815 SHA256 31bb71f3ccfc96d76b7b48aed5f80678353351df51a65bf34599cd522323fa6f
-MISC ChangeLog 15440 RMD160 e2e5a187534254be335f894c15855f447d431430 SHA1 f585f7d095fd05dad3692cc80a6ad1689dcbe7a0 SHA256 62285edc968f4ba1d6b746498a5bc16272bfa951aef6345f2f34f56037f731da
+MISC ChangeLog 15606 RMD160 6881985e7ed0052e86717ab5a7c4c1badf0d18f3 SHA1 5e31d74db863a7337a8ddba47d133058bbcdff4e SHA256 7e22c4b33f4144b44b6ec161324100723d0c07e30b07ab1d864bf0e7887f53b0
 MISC metadata.xml 1112 RMD160 5f4c7bc9d0c8b5da0e42523f7f074744659aed6c SHA1 a7203c260f7ca93f0f13674a73a9ff64f2c49aa3 SHA256 bb92956495443ca7fdc0b2f37cfaafd436e155e075768c41ee5b3744b9a48f98
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk5ixwkACgkQuUQtlDBCeQL/SwCePDtQXQoMpR55xKJ9C8Vfsiw2
-sTQAnjC8BB738gjbIjjJp+x+xPPBw0Su
-=v+bY
+iQIcBAEBCgAGBQJOgKFBAAoJEPiazRVxLXTFlu8P/3O78uMYJSYEg+caeCqmpRlF
+fNspne/H8xLZ5NwqY5KotVtdpOnxuloTur0tmvGzuuTt/WcPiT72lyEWgPg1UCVO
+ODn5r8+XiHXQwN9/5QH6DQGTD0g2VpXMA4b79IE/wZVAoxLSeAas/bhxdwo6ZZTe
+SOhK274qwaN/6AIaal5J+fDe3L30szQKNHq5VSlYyxYHnjtEcez9CaHk+qU6stbC
+HsVUBWjhkuRhlhQTjMs+1FEHvVa/nbsvbWtfnF/5SspZLSL/7JyY8pEJD/m2M6Ye
+J4j8Sff1KsnZTOeI27h1RQd1h64I5IYYpQhk3oYXuk/gOe1QU1dDcU6r3SE1sto8
+OMqubOoKPhEDyJZ+M77SFYaQGGNmliEpCJvfpGKy3YqzkpW8fTRvqmRvfO/3MaJI
+Sa+TLu0wjVgBdIjVaJtZ0lL6iojpUuPx82Ai7xSUhfHur9ktruL0CxT5GFWJULVR
+MRaP1LPETvlmhYjK6rXqyCf4GU2hlMDFq9iBz/v8paM+zECuK2+V3meP5vOVNfaB
+PVq4qvaCrW1Qq2a5fSWr50lV9vcPDHcR+bZQQ4XdUXka/7k/RL+6TZxLh++UvUpc
+qEq/TGUaEUArqEF2eEBPFKlSMBZ/0EvgNvHIAnN/470vGI4/21u6i4nbAHoawUO6
+mzfNW06ZofboD+ZzCBwQ
+=d2Wu
 -----END PGP SIGNATURE-----
diff --git a/www-client/icecat/icecat-3.6.16-r1.ebuild b/www-client/icecat/icecat-3.6.16-r1.ebuild
deleted file mode 100644
index 2430b1a5b28e..000000000000
--- a/www-client/icecat/icecat-3.6.16-r1.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.16-r1.ebuild,v 1.7 2011/08/23 19:32:15 polynomial-c Exp $
-EAPI="3"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension java-pkg-opt-2 python
-
-LANGS="af ar as ast 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"
-# Malformed install.rdf: ta-LK
-
-NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW"
-
-MAJ_XUL_PV="1.9.2"
-MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff
-DESKTOP_PV="3.6"
-MY_PV="${PV/_rc/rc}" # Handle beta for SRC_URI
-#XUL_PV="${MAJ_XUL_PV}${MAJ_PV/${DESKTOP_PV}/}" # Major + Minor version no.s
-XUL_PV="${MAJ_XUL_PV}.17"
-FIREFOX_PN="firefox"
-FIREFOX_P="${FIREFOX_PN}-${PV}"
-PATCH="${FIREFOX_PN}-3.6-patches-0.4"
-
-DESCRIPTION="GNU project's edition of Mozilla Firefox"
-HOMEPAGE="http://www.gnu.org/software/gnuzilla/"
-
-KEYWORDS="amd64 ppc ppc64 x86"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa +ipc gnome java libnotify system-sqlite wifi"
-
-SRC_URI="mirror://gnu/gnuzilla/${MY_PV}/${PN}-${MY_PV}.tar.bz2
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2
-	http://dev.gentoo.org/~polynomial-c/mozilla/ff3617.diff.xz"
-LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/${MY_PV}"
-
-for X in ${LANGS} ; do
-	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
-		SRC_URI="${SRC_URI}
-			linguas_${X/-/_}? ( ${LANGPACK_URI}/${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%%-*}? ( ${LANGPACK_URI}/${X}.xpi -> ${P}-${X}.xpi )"
-		fi
-		IUSE="${IUSE} linguas_${X%%-*}"
-	fi
-done
-
-RDEPEND="
-	>=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.8
-	>=dev-libs/nspr-4.8.6
-	>=app-text/hunspell-1.2
-	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] )
-	alsa? ( media-libs/alsa-lib )
-	>=x11-libs/cairo-1.8.8[X]
-	gnome? ( >=gnome-base/gnome-vfs-2.16.3
-		>=gnome-base/libgnomeui-2.16.1
-		>=gnome-base/gconf-2.16.0
-		>=gnome-base/libgnome-2.16.0 )
-	wifi? ( net-wireless/wireless-tools )
-	libnotify? ( >=x11-libs/libnotify-0.4 )
-	~net-libs/xulrunner-${XUL_PV}[ipc=,java=,wifi=,libnotify=,system-sqlite=]"
-
-DEPEND="${RDEPEND}
-	java? ( >=virtual/jdk-1.4 )
-	=dev-lang/python-2*[threads]
-	dev-util/pkgconfig"
-
-RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.4 )"
-
-# This is a copy of the launcher program installed as part of xulrunner, so has
-# already been stripped. Bug #332071 for details.
-QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/${PN}"
-
-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
-}
-
-pkg_setup() {
-	# Ensure we always build with C locale.
-	export LANG="C"
-	export LC_ALL="C"
-	export LC_MESSAGES="C"
-	export LC_CTYPE="C"
-
-	java-pkg-opt-2_pkg_setup
-
-	python_set_active_version 2
-}
-
-src_unpack() {
-	#xz -dc -- "${DISTDIR}/icecat-${MY_PV}.tar.xz" | tar xof - || die "failed to unpack"
-	unpack ${A} #${PATCH}.tar.bz2
-
-	linguas
-	for X in ${linguas}; do
-		# FIXME: Add support for unpacking xpis to portage
-		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
-	done
-}
-
-src_prepare() {
-	# Make this a 3.6.17 version
-	epatch "${DISTDIR}"/ff3617.diff.xz
-
-	epatch "${FILESDIR}"/${PN}-3.6.16-curl7217-includes-fix.patch
-
-	# Integrate rebranding
-	sed -i "s|/firefox|/icecat|" \
-		"${WORKDIR}"/001-firefox_gentoo_install_dirs.patch
-
-	# Fix preferences location
-	sed -i 's|defaults/pref/|defaults/preferences/|' browser/installer/packages-static || die "sed failed"
-
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	# Fix rebranding
-	sed -i 's|\$(DIST)/bin/firefox|\$(DIST)/bin/icecat|' browser/app/Makefile.in
-
-	eautoreconf
-
-	cd js/src
-	eautoreconf
-}
-
-src_configure() {
-	# We will build our own .mozconfig
-	rm "${S}"/.mozconfig
-
-	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"
-
-	# Specific settings for icecat
-	echo "export MOZ_PHOENIX=1" >> "${S}"/.mozconfig
-	echo "mk_add_options MOZ_PHOENIX=1" "${S}"/.mozconfig
-	mozconfig_annotate '' --with-branding=browser/branding/unofficial
-	mozconfig_annotate '' --disable-official-branding
-	mozconfig_annotate '' --with-user-appdir=.icecat
-
-	mozconfig_annotate '' --enable-crypto
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --enable-application=browser
-	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate 'broken' --disable-crashreporter
-	mozconfig_annotate '' --enable-image-encoder=all
-	mozconfig_annotate '' --enable-canvas
-	mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
-	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
-	# regardless of java setting.
-	mozconfig_annotate '' --enable-oji --enable-mathml
-	mozconfig_annotate 'places' --enable-storage --enable-places
-	mozconfig_annotate '' --enable-safe-browsing
-
-	# Build mozdevelop permately
-	mozconfig_annotate ''  --enable-jsd --enable-xpctools
-
-	# System-wide install specs
-	mozconfig_annotate '' --disable-installer
-	mozconfig_annotate '' --disable-updater
-	mozconfig_annotate '' --disable-strip
-	mozconfig_annotate '' --disable-install-strip
-
-	# Use system libraries
-	mozconfig_annotate '' --enable-system-cairo
-	mozconfig_annotate '' --enable-system-hunspell
-	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-bz2
-	mozconfig_annotate '' --with-system-libxul
-	mozconfig_annotate '' --with-libxul-sdk="${EPREFIX}"/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV}
-
-	mozconfig_use_enable gnome gnomevfs
-	mozconfig_use_enable gnome gnomeui
-	mozconfig_use_enable ipc # +ipc, upstream default
-	mozconfig_use_enable libnotify
-	mozconfig_use_enable java javaxpcom
-	mozconfig_use_enable wifi necko-wifi
-	mozconfig_use_enable alsa ogg
-	mozconfig_use_enable alsa wave
-	mozconfig_use_enable system-sqlite
-
-	# Other browser-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
-}
-
-src_compile() {
-	# Should the build use multiprocessing? Not enabled by default, as it tends to break
-	[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
-	emake ${jobs} || die
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
-	done
-
-	# Install icon and .desktop for menu entry
-	newicon "${S}"/browser/branding/unofficial/default48.png icecat-icon.png
-	newmenu "${FILESDIR}"/icon/icecat.desktop ${PN}-${DESKTOP_PV}.desktop
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${ED}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop
-	fi
-
-	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/${PN}
-
-	# Enable very specific settings not inherited from xulrunner
-	cp "${FILESDIR}"/firefox-default-prefs.js \
-		"${ED}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \
-		die "failed to cp icecat-default-prefs.js"
-	# Plugins dir
-	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
-		|| die "failed to symlink"
-}
-
-pkg_postinst() {
-	ewarn "All the packages built against ${PN} won't compile,"
-	ewarn "any package that fails to build warrants a bug report."
-	elog
-
-	# Update mimedb for the new .desktop file
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/icecat/icecat-6.0.2.ebuild b/www-client/icecat/icecat-6.0.2.ebuild
new file mode 100644
index 000000000000..c2d6341eb772
--- /dev/null
+++ b/www-client/icecat/icecat-6.0.2.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-6.0.2.ebuild,v 1.1 2011/09/26 15:58:51 polynomial-c Exp $
+
+EAPI="3"
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python virtualx
+
+MAJ_FF_PV="$(get_version_component_range 1-2)" # 3.5, 3.6, 4.0, 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
+PATCH="firefox-6.0-patches-0.1"
+
+DESCRIPTION="GNU project's edition of Mozilla Firefox"
+HOMEPAGE="http://www.gnu.org/software/gnuzilla/"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="+crashreporter +methodjit +ipc pgo system-sqlite +webm"
+
+# More URIs appended below...
+SRC_URI="mirror://gnu/gnuzilla/${FF_PV}/${PN}-${FF_PV}.tar.bz2
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
+LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/${FF_PV}"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+# Mesa 7.10 needed for WebGL + bugfixes
+RDEPEND="
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12.10
+	>=dev-libs/nspr-4.8.8
+	>=dev-libs/glib-2.26
+	>=media-libs/mesa-7.10
+	media-libs/libpng[apng]
+	dev-libs/libffi
+	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )
+	webm? ( media-libs/libvpx
+		media-libs/alsa-lib )
+	crashreporter? ( net-misc/curl )"
+# We don't use PYTHON_DEPEND/PYTHON_USE_WITH for some silly reason
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	pgo? (
+		=dev-lang/python-2*[sqlite]
+		>=sys-devel/gcc-4.5 )
+	webm? ( x86? ( ${ASM_DEPEND} )
+		amd64? ( ${ASM_DEPEND} ) )"
+
+# 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/-/_}? ( ${LANGPACK_URI}/${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%%-*}? ( ${LANGPACK_URI}/${X}.xpi -> ${P}-${X}.xpi )"
+			fi
+			IUSE="${IUSE} linguas_${X%%-*}"
+		fi
+	done
+fi
+
+QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/${PN}"
+
+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
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use methodjit ; then
+		einfo
+		ewarn "You are disabling the method-based JIT in JägerMonkey."
+		ewarn "This will greatly slowdown JavaScript in ${PN}!"
+	fi
+
+	if use pgo ; then
+		einfo
+		ewarn "You will do a double build for profile guided optimization."
+		ewarn "This will result in your 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() {
+	# Fix preferences location
+	sed -i 's|defaults/pref/|defaults/preferences/|' browser/installer/packages-static || die "sed failed"
+
+	# Apply our patches
+	#
+	EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch" \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
+
+	epatch "${FILESDIR}"/2000-icecat-6_gentoo_install_dirs.patch \
+		"${FILESDIR}"/${PN}-5.0-curl7217-includes-fix.patch
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	# Fix rebranding
+	sed -i 's|\$(DIST)/bin/firefox|\$(DIST)/bin/icecat|' browser/app/Makefile.in
+
+	# 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!"
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/js/src/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| die
+
+	eautoreconf
+
+	cd js/src
+	eautoreconf
+}
+
+src_configure() {
+	# We will build our own .mozconfig
+	rm "${S}"/.mozconfig
+
+	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"
+
+	# Specific settings for icecat
+	echo "export MOZ_PHOENIX=1" >> "${S}"/.mozconfig
+	echo "mk_add_options MOZ_PHOENIX=1" "${S}"/.mozconfig
+	mozconfig_annotate '' --with-branding=browser/branding/unofficial
+	mozconfig_annotate '' --disable-official-branding
+	mozconfig_annotate '' --with-user-appdir=.icecat
+
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --disable-mailnews
+	mozconfig_annotate '' --enable-canvas
+	mozconfig_annotate '' --enable-safe-browsing
+	mozconfig_annotate '' --with-system-png
+
+	# Other browser-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_enable methodjit
+
+	# Allow for a proper pgo build
+	if use pgo ; then
+		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
+	fi
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then
+		if use amd64 || use x86; then
+			append-flags -mno-avx
+		fi
+	fi
+}
+
+src_compile() {
+	if use pgo; then
+		addpredict /root
+		addpredict /etc/gconf
+		addpredict /dev/dri
+		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 || 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
+	sizes="16 32 48"
+	icon_path="${S}/browser/branding/unofficial"
+
+	# 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" "${PN}.png" || die
+	done
+	# The 128x128 icon has a different name
+	insinto "/usr/share/icons/hicolor/128x128/apps"
+	newins "${icon_path}/mozicon128.png" "${PN}.png" || die
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}/content/icon48.png" "${PN}.png" || die
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop" || die
+	sed -e "/^Icon/s:${PN}-icon:${PN}:" -i \
+		"${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}/${PN}
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/plugin-container
+
+	# Plugins dir
+	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
+		|| die "failed to symlink"
+
+}
+
+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
+}