[gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, www-client/firefox/, eclass/

[Jory Pratt]

commit:     7fd038244e31663a722524320e4bc9a8e4514041
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 30 23:35:53 2012 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Dec 30 23:35:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=7fd03824

Update patchset to support all archs with webrtc

---
 eclass/mozconfig-3.eclass                          |    2 +-
 mail-client/thunderbird/Manifest                   |   61 +---
 mail-client/thunderbird/thunderbird-17.0-r2.ebuild |  338 -----------------
 .../thunderbird/thunderbird-18.0_beta1.ebuild      |    2 +-
 www-client/firefox/Manifest                        |   92 +-----
 www-client/firefox/firefox-17.0.1.ebuild           |  383 --------------------
 www-client/firefox/firefox-18.0_beta6.ebuild       |    2 +-
 7 files changed, 7 insertions(+), 873 deletions(-)

diff --git a/eclass/mozconfig-3.eclass b/eclass/mozconfig-3.eclass
index 4ab0045..0a9cca9 100644
--- a/eclass/mozconfig-3.eclass
+++ b/eclass/mozconfig-3.eclass
@@ -90,7 +90,7 @@ mozconfig_config() {
 	fi
 
 	# Disable webrtc for arches that it doesn't support, bug 444780
-	if $(mozversion_is_new_enough) ; then
+	if [[ ${PN} != seamonkey ]] && $(mozversion_is_new_enough) ; then
 		if ! use x86 && ! use amd64 ; then
 			mozconfig_annotate '' --disable-webrtc
 		fi

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index cc66751..d777890 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -2,64 +2,7 @@ AUX icon/thunderbird-unbranded.desktop 280 SHA256 3693d0b91739c01f838d53955f8c3f
 AUX icon/thunderbird.desktop 270 SHA256 e8756ac8a421ac18f28b3620b2a021199f3bc4a3a9c566479a9b6697a5305dea SHA512 0241d04d95eb8defe6c3e875bb3de8821c0f101e98d53779551c3e6ef379d36483ca8f37e50394da8e53e45535597df1c3a6fed91f5efc5fdb9bf5da75e0e586 WHIRLPOOL 46e643eb58698cc9d9d9488e65e222f2ab6061ef91a025d29b67b29cbb9a5f5994e58460b0ad6b40162a80b7f71122148830affdcc29aa79f149c3fc4f74143d
 AUX thunderbird-gentoo-default-prefs-1.js-1 426 SHA256 b5aba51045c700ae4d465e079f3e776600d4950806212f7c2fe1841fa25cf9d6 SHA512 b40e7b4789b7f43c382589f7d0eaa6043072bce86ab79fb3dda4800e9ab6a43af11f43b0cb3b6ab1c71d887aa1cf9356ac858f0a81dad013cef5b8a4b2107983 WHIRLPOOL cc3535e9a710d55c5386db51d7bd6ca24f6b36685a54e42d049a806fe99fd0b08afe7998d1478036bfa306129616778b8ac1386e14649646fc0a7ae4d37b830d
 DIST enigmail-1.4.6.tar.gz 1262280 SHA256 f3771d1faa26676818bab5e2c50dce85013b9de30b82de526159eaa7ca34f036 SHA512 4e4e6c1a8529b1125671be5c10b72c206864ab719a721b184d082c53cfad294925bdfe24bbc50b67ec6f2cf1f7b61a843ab381eef328488ec52e29c190858092 WHIRLPOOL 1c9dc7b47ca1c7e9ea6cab0112ff5efa8725477e5d3c18ef4b8fc4b51c19c79e5e0786ba85b17dc01ba1f63b619cb1a2f545a6773a46e1bea273f98c4473c04c
-DIST firefox-17.0-patches-0.3.tar.xz 50988 SHA256 9baf32d80fb3353bccb1e79d2dc6f4c5f41847e04b5d18435cb37aeb99f16826 SHA512 8b0fb92caf93f5384b172c5d261f469b52a4b3398e6caafeab823901aae6601b4c16582ae00c71e5f6a56ce266720ce2080950aed9426180211a0d6bdea8666b WHIRLPOOL 1482c0e92caa72bcb645bdf0d0f2ff82bff4a1dd1aea4eb855579f39aec507d630f2a438d7fd417d15a15b2368518fe3abfbfd948d50f31aca33a1b316590edc
-DIST firefox-18.0-patches-0.4.tar.xz 51676 SHA256 353dd5a9d583d468c6998facb474b03de50cfe281b532990094c2a2128689488 SHA512 e32118edfdfcd07edd35e9f6aea8788b0328d573e96270b43541b07f62ff873c74125ce210e7f3ceb588220fd728acbfa7582074f266e234e7ff2b7e598a9849 WHIRLPOOL 19a8b95fd0eccaf2b867c3c66bcb944368436d3d98c1b87a68cb3f8079c7b5acb7c50454cb75a91ebaf70da5945149afb93c799f4f532330d437b775eb06a8a6
-DIST thunderbird-17.0-ar.xpi 445976 SHA256 3cbb52aa92794274c01df21f297bca44c194cbf3aa61df29f2070688eb17023f SHA512 ca52227441233b43cd1b4e8f191ba42eeb9fc30856d80f183ed2dfa3c9e96eef0cec608b653ccd7fa024d2b49ea109bb28fde57095ea48009d9787d5e37e211a WHIRLPOOL 731506d4030f91c6126af60a520ed9fd6b23f05b88a102c86357529b2baa4c351966b32ca9de21e3c981304e193ac2e34090ee10f593aeff1c0b89ba40960393
-DIST thunderbird-17.0-ast.xpi 388038 SHA256 526fe6fe0beea31c9d5ec6d6f35035a85b955db43a83a3c1b16e2b550db4d1eb SHA512 abda7334449badd5be52f61b395b08e688be55752e2696b1f2f3f6483f9c870a3eb5d7cadcf2a73a0a2128abc58ff94624ceb7e820225fc0a40a0d52dab0e609 WHIRLPOOL b099a94b9fde3b401813bef9e396e7626a52c8ce0357d86a7ff8c4deab41c0dd4f8aa331c7482ef6f6ec30883790bea9358bfc22e3d6d0bad7bcd1e661b233dd
-DIST thunderbird-17.0-be.xpi 426694 SHA256 1275c0c2719cc38bd8b982c3880aed39a22167844f47260fef0682f2e97e3827 SHA512 a75d294fbef13133a3dd7641785c0dcec4cd4c5ff6775d7aacce61917c5499c7b88fe02fb1961f5375a34dbc54b469fee93a1ee121b0e5f0da622bfeb9177a42 WHIRLPOOL 94a3ec350d5ea4ae41320e257d154909e80ae08fc92de31a117a57ea8cb21b1283582fccfa8ea0f0ded6ad3ac1f86efaf59b9b8b638d8e4c99ebf98f2de1c758
-DIST thunderbird-17.0-bg.xpi 467637 SHA256 6a7328a3d557c7bb11b260091aee8812aec758f840aebadd294ae9b95ff2bae8 SHA512 18ca785d3de547637c9451fd4a11fbd1fd6fc34f4670cc607aef764e304a9405c3c7b39241fc503cb1a8e263484619aa7c11895ef532dd6fd7f53cbd7301d39c WHIRLPOOL 76daa38ee6a89207bc4c0e5974dc5dc00d3c22ef79268b0cba98cca6353e7984b825eed2226a8cdfe03c6c66a081a32ef83742a02f67067fb38a8661688f3897
-DIST thunderbird-17.0-bn-BD.xpi 520600 SHA256 e77f6bde0748350e1ee77144beaf7d7b145ac0c1d93a7da714aca8147c379be4 SHA512 dc6e0fd616e3b84592a223597b08bebfc33567e7062d0c272063abf51745e52ee1e899b21a54539c25f0eda8818a2712fd2d101be857ada15a563a069173c425 WHIRLPOOL 777cb1ad6f9429768dc130b12ac92af219726cb3e8abd79d3c9d217426012d0a9fe02470a0ced187666c7cbc9c2c8d16ad08f64d66c6b0fff6a5652b26248cf9
-DIST thunderbird-17.0-br.xpi 417071 SHA256 95a712c61d138f23238b78507dbd451284ccf960618e8b9ad283296f7f4778ca SHA512 9dfaf9a40867b8049057f91d484101756b41b530ea6f7daeeb49066cfa86ba043dfaa23cd9c0696e471da41c344bff9f56837926c2925989b2e899e05dd6c5c7 WHIRLPOOL 71086f3e5252a648180f2d5f6065a1e0f13f3eef925a0e7b2ab94f729626d6df2f0566694428ed5b23a93462e6d8af2b4ffabf5c87440368f4b7ee9be1dc12d7
-DIST thunderbird-17.0-ca.xpi 418407 SHA256 35a492c0947ec56401091df14ce9ae6b538084a47ca18c4051182d8a112276af SHA512 9ed9d8cf59cbdc664447bab6c982ddfe4d7ef558ed12afa072ac69a0e05dc3bed806177db4c04d1baaa901771119ce9c8f20ed36ae739a44eef4811145680a2a WHIRLPOOL 759ef09c7b7c407cfe0f4645aeea7f2aa58fd383f273a22f563de04720f83a9bff80d8966bf0df2b0eadecc29c57d77ab5b4c78ae959bfd3fbda9c0d9a5aa261
-DIST thunderbird-17.0-cs.xpi 420626 SHA256 448aac32037936288df8ad000cc1824fdb0d135ea20a7b2e83ea83c96dd87423 SHA512 19ceeff15e4524b48a9dc91a704ad3c290571009cfbbe98bbb5d865198471eb6e007a9a45f9625b6ed5cf1516893e6902ba4cfe094d497e81d4a2c2f046117e0 WHIRLPOOL 91c7c9361592709a43a1c64547a267def8e3f5cc26eef7a439cee684e0f1ef850c8de93e3d5a385626ff1230bd9203fe54c75b621f8d40c165d43670034b62a5
-DIST thunderbird-17.0-da.xpi 398979 SHA256 399c1fc72af166f4c143f0d78617ae6940bf59b905fb6d1dde9450c3c15275a7 SHA512 b3ee1fe23edd8874ce9426e3b1047fc378ba42c587e1bc1563e288f44a178a85c5199ea0da48217cf7c8b2cc61bc7d4b6c602f95bdf2f98bbff864b48fa8cc61 WHIRLPOOL 8ee0d25b9a32d52c7c4f6ce30efe52630aac4f04b54fd074203a5241c936ca0c397b5bf161b378af00503d062a2fd03b9ca69eb5ade56a3066b79ff00f961abb
-DIST thunderbird-17.0-de.xpi 393631 SHA256 29e12f0b2b6596e9323ef179a71d1ecccc1c3670327c9f43b314a864cb39eb3c SHA512 ba64e27478138275332874bdd2c0ccf4eb506b5a73a0856cdc2343ec103c3cf4c6d65be69e91ba50d54839953112f75bd186169e6b01c418ec4e7842f360a25b WHIRLPOOL 19845d5483e3aabe46ae99b1a9d1c07cb0e1dd53992fa68738741d7c7df54e014a22e7af70d5bb32fa77d6cfb7b97c50f3ae2585df064d9ba254d616bbe80a2b
-DIST thunderbird-17.0-el.xpi 447924 SHA256 68514c1a1b28d942461afd0687fe1da533e93da7820936f2c662b30726ed2e94 SHA512 dab4e9104652d9bb5c500cc5a559e37a5f415078f445adaa22f08fd40aa6f4727fcd59a1b5c9c1a69960861a6a5420deffe6ae9766ca4ff7bbabf9d7a7b23a47 WHIRLPOOL 44eeab6e17d1c79633f6cb32d840540d6434f1a8d47dd7e076a79f5b1cd145d3edcc5fb7995688060601617d4584a9b98acff6c7826f6fcdca3b00269c434ad0
-DIST thunderbird-17.0-en-GB.xpi 390694 SHA256 44fda66cd063874f187288a574233b3b7596ec0032413f9b65428e7a5fdd3148 SHA512 56ddd1763315d753c859878ea9439886eb2a72c7607965c46df4b16f4cee6b4728a762d37147291727fe30c68de4451ea40956a37a1924a2de36119e5790443d WHIRLPOOL a5fd08338216744e3bf3ba3d942242d371b7c9d9cbeb7447f7a04ffedbf324237a0661b795ce80dccc62607fe96f170f1feaa8c530d4cf7e28f19444fe4fbbfa
-DIST thunderbird-17.0-es-AR.xpi 415498 SHA256 d85e90163ca833ed812cc309dfabbf677d5dffa0ab3ae36e3442eaf68073e9c4 SHA512 507ed4a9eb0487b9630fc4f16356af838cd2aa2c78321df5785832d87900af509266d7f52adb049ed946d32afdc1c75a7d3f9cf9ca284f914802a6865f9f0e83 WHIRLPOOL b219812cc12c74bc19eb19a1dcd725f55557a278601f3aff20bc1f2cd370998863d26138dc54f55e76592bc44339fefb543ce316e80ce37fa427ba7d0a812b7a
-DIST thunderbird-17.0-es-ES.xpi 356862 SHA256 a726eacaed870c0c3ffbdc855d069fcd09f281b54a18c5c6a170a9d5420951d7 SHA512 bfb7e1b1e7077cd8589a034359b5e91fd75e0d9bbc4cfd50227e403d3c86a788d8714f4e8ae1ae9d87e1bb2bf62935b6220274d154c6c0ae657bc29e54bd45dd WHIRLPOOL 40ed368fe388a8193a3bf2ff6b42e020e77680c660d144d4a3b55a8dc6ae2bad4447e2f55d07161f3c7c7b2a5d6d79bdcdaf36d39f2663f7a7561158584122f6
-DIST thunderbird-17.0-et.xpi 411892 SHA256 71bc739da6643a3efbbb3f9aefdd31c3d7f02fe3043793a6381dd2aacfc5a5f1 SHA512 ac0119bcd83355ccf025a2ff459ad4c03d9d3744fb4398953a8200a68695abb5cc8ed49fd9909e3ebcd032ad0cd82dfc3c91ff6fa873679ec638e6d94f1b354d WHIRLPOOL a35500637902c14b02e4734caec2aa12d96546295410ecc31ce20f5f139a0e72b6d859ae1cbfc921f66e8fdc1c0cbce2c9951bb97fb4360dee27a7b588e2acbe
-DIST thunderbird-17.0-eu.xpi 407189 SHA256 4f6b2a98069611e53881dec4e849e99dccc83b795c6cba04a80c28496c096616 SHA512 fb420cf38f255898e34871eec003448f80f5ea098b51c8016d4d964ec0a3872ba732c7219d5976de61dd67332267cb114607607560e4107bd3eccceded38f36b WHIRLPOOL 114786803f8b8ba0f360d8348a7f8ea386e58d44d0cefadbf3f63035c6f5215695f3391ee3aaac8c906edc9985b54ede154e26883598d95fe84beb5bd4c4fcdf
-DIST thunderbird-17.0-fi.xpi 413620 SHA256 6f0a2eb8b06d930fcbb7d76cfddb0539b145dc63d17fdac35d3c8a1bb3487cc5 SHA512 3e5975e2cd22b74f154382222b8eac3337b0a4122789b61beafada83520b1205283409882b078839ecc176e7be451456453a920e3705ae3aa71d9cbb035e88fc WHIRLPOOL ca9a41d57b9c0e5c506f934ed353db6574b9f9f49aca59fdc399cfec1ce97c9332b3d72b4d2aa18c3379baa0ef401736975a12d38dc164951db50c938f253ada
-DIST thunderbird-17.0-fr.xpi 420825 SHA256 cac814b56a688f6e32c1a0df2f850f16c81cef842723558320e5662cc40caf2e SHA512 b3fbd98202d9c958c978b0206c14a6ca1dd8276cfa98ce3adc4d41a67604fbd82950bbc2af5548226ecbdbfa5927b95726cf1744952afd2d468fa6960f4f60bf WHIRLPOOL 805d16c0fc6b319a10fe6575f50d8f9548cf230acedd68b7c75ead68e3646b07eb07ee43cd0a7aedff0016bdc467f216549a22401c69090ed904ca2771efaec9
-DIST thunderbird-17.0-fy-NL.xpi 415712 SHA256 0ed63752d63422477c635dddf38e897f90852570af82b1e95330cffd65810135 SHA512 96ee4e777f04a861b29919bcb9f0f0948cad1bc8957ae19af2cd666c536c9a7a5207986b93afa445fc6c19595c6940685d75ace590396707192b220533866604 WHIRLPOOL 724d3fff452e8add05b92fb89b6d7ade951becf51b9c26d7a5aaf1bd6f24e2f5ecdbb1ac8c97edb76bd95b2375211af5edf3db0710e14286aaa0ae6553c13448
-DIST thunderbird-17.0-ga-IE.xpi 425395 SHA256 4a159fa1fdab98dee2e6c64282f5ebd7d6e4cc3ca0f516a86de152e7eb57a77a SHA512 c1102a8b89850537b1432aa02fdd83282e5b48ac22df7b467f8892f3b1f8a73ddd273d9fc28ff90b5cdba27f0158a94a2268a29464f8f6dc0e3d8119981305f6 WHIRLPOOL ef1efa2986e9c4cb771f21855cdd8c5f09024a553189031c603737e9629fae1974ebb0aa8f62b3b8b00a0e72f8653afa2152b8e002de71f684554fe715a89c47
-DIST thunderbird-17.0-gd.xpi 428939 SHA256 a8e32620b4b05bd9ed5b5f44c885785f1f56c16c4e91ae5af41667cbfbb68d3e SHA512 e90e63a32f88d2c33ff8b71397058bcc72ae36fe51c5d130ffb836b6b013495eac068b72eb222a26839e1ea2a6e42ebff0a4d451c5abb9b3816897493c0f9933 WHIRLPOOL 640d7489eb92fd088914f03ab94cd327b863d1c27246af6e09d5c1a3501ea495d50f7c0fa162c45020bc85d7972fd090216597e36e27bc1a1f916b3543011ea2
-DIST thunderbird-17.0-gl.xpi 410369 SHA256 cc5a1924621f5f3303e9ee258150d082929650e0f7afd6325df400a0dd589ef3 SHA512 706b77720900ef1f4a62c5e9e03874e03b5dbc6c7f23927383eaf4fd4a3a5257f588836fe69a54fb2d63b144bb6274c06a10bd2f66b0bc8e9a6073c378b94ad9 WHIRLPOOL d0183acb9eb5dba1dd0b95732ba5d1dd1b533e07f73a19b45eab52a8c75bcce9d0ad98861e4dbebd91443d0a9b74fe8bf4f9b41cbf232792e15a4093a4d5e9a7
-DIST thunderbird-17.0-he.xpi 439503 SHA256 76fb587cf1522bc0608e9ddea5c62d5b0d22bfec1990323cccff1283805209e7 SHA512 eedb3fc2d623b148528b37f6c0f5dcae7dd13ca6e3173096eda88647e9c86f2d97026401adec7171dabfd7bd97df4316cf8f4745013d326de9eb36d74f183526 WHIRLPOOL 011780fb85886d36a815164c299cb90cc509d5364a7351b1005a6fa57cb045613d15424d10b831632fd5ac822ceaba3cdc9c67103e3062706a630b23291b9e9f
-DIST thunderbird-17.0-hr.xpi 411412 SHA256 47ee94304e0c07b3eb1032825c30bd0d6cd1dc501aeaceaa8bbf210abe6a0d41 SHA512 077a5dc90264211af6277d454d510e251f4eb19c72703a18d48a699fb74bd009847bd9841787e2e7ba2b73970e5f70b5e4acda622bc01df39e023f5c1202d8cd WHIRLPOOL cdd9dbf3b49fa2ff37e41a16f9762b8efa2b29be1091831c38ec3687768d4d247f3bb1caba63092a38e82f6ba00b15551b6f16757d15f3f9fa729d812328e3e5
-DIST thunderbird-17.0-hu.xpi 433187 SHA256 7ae5970cff9c0fa02d72679e2d24bd4b13cf79300f24b0860ceb329311632973 SHA512 503b06e01e1912753ea38d1e67f6e7a3c57f2e60088096d7a55b9e9fb0c40b4fea1f5079380fd233a988d8867c47325f90680eb56de80f8d8dfa8649b69f7b37 WHIRLPOOL d24a09f4fb4f4c79a7c28fae9471d6378b473aade4f3b0e291c907eacaaff31c5f55d3b731c7ed08073c882c86bd3fdca13b89970e7ede2c0491dd69e4e7cae3
-DIST thunderbird-17.0-hy-AM.xpi 611963 SHA256 d990a103b7c4813c4421eed03941cf6ebd39f52b01511bbff19bb7fc60a9b91b SHA512 d5ef1c9cb47027d5cd00be73c8ae470641a83975864b3652140f8cc5a5d4975fb6dc3ec03abe860045d2e9bad685cf0cac18aceb18868249045c1b53552539ba WHIRLPOOL 56e411616011f0c2df668f6f8193ba37ec1097bbc71ff2b6472dcca0588c7e1c221e5f83dede12ce9ebd637671ba1cbff22eeee21a73cf237fd04ed8e570adf6
-DIST thunderbird-17.0-id.xpi 439575 SHA256 9e7c55e761f9f5073bfd83d1d43db223fa7c69e219fb1db9cc9cf487cd1da9d7 SHA512 4ac7a3ef9c768dec5ef246742b764a60a7483916fd54d6c4426863cf693fdaa4cd8de7db11e74cf4dc591c7f15b2674f034b618c23824933d73d76e3398405c4 WHIRLPOOL ae1af01e46d88cb746253449e85e251513b6f534f0719324a5d85232df4667b528f1324f6afe9c77918bc53fc6c6621b77328a5ab849deb26c60b1353ef3ab7c
-DIST thunderbird-17.0-is.xpi 414068 SHA256 1a01f6fb65c37dae8c1c74868b4c189aa4aa6960390a219652c56e4ee211bddd SHA512 09fc7b21d2247416134605e417f0888a0c6f33f6c57d0474da55f0b1ac66506ec66bd60d0086da4a388aedd7f4c4a00176d1cfe0d600fc68f947977e6be36a2c WHIRLPOOL 5b8d1e72f30dc28704d3043a7564bf4b1524eac72506485f743bf3f445833db7e4ac1bafcb6734d39c7fa4d61513c1e94ee854f5fd63efe8accddece0ab5a8a7
-DIST thunderbird-17.0-it.xpi 348621 SHA256 4debda60f724c5d46ca83436d3471728a4cd438cfbe8b70275f6ca71fc5ef274 SHA512 2911b8adc1504cdcd9a475af385ee26740f9121eac2a492b2b4d5c6b80c43419764457e96eb44fd93e2719ed98989f3bd1589a267d5db479bc849bac68dc377a WHIRLPOOL 142f2662df77a2ca1be727b821a35c7c8fb3936f1d09599ebbf48ea4a66c050052cbb6182f4e6b3cb00091f767af1383edd0d11a7578fa30a6863aeb4d6969b2
-DIST thunderbird-17.0-ja.xpi 463487 SHA256 05003502cd5a5f2d1ae5560b220306397c840516ad0b8ec8eb2411ee82cffde7 SHA512 06f7cff2b45b77871bdcf8077cb01af4a62929b918cd1d5b3241d872f07ecd18baa7c9f1ae2d7f58e241735056716ff365b3f4d3bc47d153f32601a737a4b0d9 WHIRLPOOL 09444db204fb9eff8616d893c30ea335e4ca3dbee309893dc958286ab5aa36ea1382606ca223119514b9858653d4040599b4bdd00fab17c7f59b85d0cfbb723b
-DIST thunderbird-17.0-ko.xpi 412963 SHA256 215846d3ba55c281273358d0db9ac70a331995a002f2ac436fc142c158193574 SHA512 089ebcd16ac2210af63fe40d89841016d1d92afa2a732da8b263d5b77c33192e1f1e5df2e03543fe85e94d054180634fb82ea88c88af37ec9babf6f8c8980185 WHIRLPOOL 9c71acf25f56045d0dd1dbde7fca78dc3e24879da590ccfbf702b35a024adb08ddab61bc15e9b6e2328aabbd2ea6ed9f4b850ea17fc3f38cc01a0927fd434037
-DIST thunderbird-17.0-lt.xpi 519802 SHA256 920df8494112c0c814212f6997579aef31beed10fefeafd843e38690fef36fe5 SHA512 eb5dc1cbde71115896316394233c23ad22710ab5fb400156465a5d68057aab26c6d9260a2422feb5243e88d873bc1cc55f3b5eb7a7bbb37c7bd91e63ba86dbbe WHIRLPOOL 63b7578928107caf7f49cffb38be09f9da6a74f248486e5f8d1b41263062cc53867ddbd2ee0e44a09309a7fd5d3a47888d4921af6475658d83e7c1bc3f1baad6
-DIST thunderbird-17.0-nb-NO.xpi 408519 SHA256 1b51894cce54f5ec2025344440f151626f012ea51cc7e113a1ca816388eb6315 SHA512 9cb7d6be7c29d87dd8e962443a8dbe3bd68d3bafa85b0fefeab6c4a401b1568e29ab039f37184e1550e8441a7fb97721e24b3126f15d47b04d3a8e6b4912073b WHIRLPOOL 0a41d7d3050e4698e1cb16697b7ebf7dfb01a570916fbb11260f20ec3109a309f979eee19420b2ddaad818febcb750772679e2b8bbe63109513ceffb4195a0e6
-DIST thunderbird-17.0-nl.xpi 408526 SHA256 223225ff67ae11c09167a1f099e2598ea66542886744075e495c692477838f11 SHA512 bd2730422f4ae8d4d03d37cc8bb555bc04ddd44069500dff4497e85f54b629315563474467211bce6c048c2c3c87bd8cb7c1db42a55571aa4467e99d8c1742ef WHIRLPOOL 980cdd15000788dfa4e68e8827a11217752da92da9806149e570afb2195ab59ddd1631fe24f8e36eb9b242357d7a8c970cb718b235dec0f72d42ceb4a8aeb191
-DIST thunderbird-17.0-nn-NO.xpi 431471 SHA256 4dd87615f9989c085e3b9cb6382d0c8163cc3e07989d70cc0f5cc8bc2e946bc0 SHA512 1a776854ae6ad19561713c14c204ec7aa6204a7829c99c4f286ce0b19cf95b4c2bf4a156545a43b0e4c69f320697bbfc5e039b1058f4476fc02560a23ea3ab29 WHIRLPOOL 9bc482a6d0080a5fbbee92aaa900cc44f878eaa451ee97d5deb9ef7cffc1787d2eb18ccd62264ff9daf82a6ae58944a69220e0613ae0d63c881557b2a0662b1b
-DIST thunderbird-17.0-pa-IN.xpi 492443 SHA256 679a0a9a615973d506ba768a2518ebc870d86998f4aab89d28ed6f85968548c2 SHA512 c6811cfd0e1f8b5a2680f080f7ce1a0b9353b14c663ce8db4535435ae2630f83b579278f18aaf4ae73d0fa952364ae88fc6f910fbe33b30590324eeae5cdb3cc WHIRLPOOL f96c133c9b47eca692f0d1c6bcbd75ec83c7d4b9013d439b4565755a3e560a39482bacf55c08a94d8f31a647cab641b1aea87dc60eed1578fb89dcd016d560c5
+DIST firefox-18.0-patches-0.5.tar.xz 52684 SHA256 346ba2fd359ac4160b98a0519cf00c146865b5312f18e2999848dcc0e9410d76 SHA512 4faef1c009e1dba785b3deac2fca32f7194c772bc0aeb90399b4f75f36a30497e8fbe76c3db130b130639fac50e6a5aef419cc672fd91e9eba200c0962c12787 WHIRLPOOL 03e11937f03594a0c678b36a36f58adc8d54cf594060f6acf857dc383b9cf9791140db1cb1636481332c5bf7d8a65f9d75a224ea53f47605095911288b88578d
 DIST thunderbird-17.0-patches-01.tar.xz 820 SHA256 79bf322258e0efc7682ce71ea84398e4dbec55b912acb264e16ddae72917bd8e SHA512 94ad743f86d95cb437bbe3be52beb8ab7c97acd9f703841f9445f94672d764cf6b9a3dfc065a6c54f24eeb16113a62708290512a3f54389c538a52fa93be7e06 WHIRLPOOL eb234826caf0f648d3ea8043b49fc2650f3a011eb28db661122e50abab0a6098b467e580d3c120b97a29919934c072e931f956bfa6676a2759cf46a2db88f282
-DIST thunderbird-17.0-pl.xpi 402114 SHA256 54debb71864456864172f70f21c50b867b00637ab0f298a68abcfa221d04e159 SHA512 572911de04742ce890c385b25b632e1f119b5138c362f931aece053f3c37579aac6578ab5af1a0f9981d21a9e04d5a4efbf5f190f3a82f75490a329b05b1b5cf WHIRLPOOL 535ef264291b0a55420e9f82922e85a02dad31b646d454a3a1b0f158338f9287b54e8336163ffea1625c28bb17c69e1f1ed47e5a7549af2468b83b91aa8a9686
-DIST thunderbird-17.0-pt-BR.xpi 415777 SHA256 a8910d96c162702b174c7bd3930e2348bbd52450bafb09b0c49507d003d6c308 SHA512 252bb16d8c173a9f452d95f5b46b1e4500cb00f12776a69c17f3d8755361159917f1dc5be830b439a84cd030be4219f4531b331deaf5d891a853c6d4369355af WHIRLPOOL 921d3205f1148f7d290ad5acfd8afaf5988f3af17cc464e3a332abf6c56b71e10c46b9e17ce71e6eb698104aa0b81abd5d354c14b97088a9a5fddf3dca4c7320
-DIST thunderbird-17.0-pt-PT.xpi 445753 SHA256 abca9f2694b12bdb804a12fa356ebb68ea4cdb286c1f1cc1523347537d7bc242 SHA512 83feb5dbfbac20dca386fabaa8008866c6241d7a11d74ec60fd642d6f0e781cb6d70502d4eb064da0309fde2d9afacf234860113296a14bd9acb26f400374200 WHIRLPOOL 923c5232446c3fd0d389d85e8cf48df20f5615319dc0a8f0a2eff7c8c2834e91a2a46b7bbce2249f4219e82dc03246a9705eb4b8b6841074d92d65b91582ac9d
-DIST thunderbird-17.0-rm.xpi 415530 SHA256 993c1272ef31cb949e7df775c6afea6d96746ad6c092113b03dfe307d3f2de5c SHA512 eb83f27f5526cabc7d58040eea8b53969e2ac4e3e222bfa20ecb10843783c13cfa8fa3e5df49a69929cd35ee94bbdb8cd3e8ebe3c13464d58dd4aa993972264b WHIRLPOOL d7513b8c28e0154968bb3e866a6159887d8e913720246d806b414be48717af31cfe7b830608db1a2a3514d85c7d9dcb6492c082db3375b0ad8dd2881e89be538
-DIST thunderbird-17.0-ro.xpi 480492 SHA256 dd6e8ae0b75912c9d35494e7954f73d653f0878aff8e9e4df85bcd0ec34910b1 SHA512 e3f176f730e10a5f037ed29dd3f3a9db6b2b5efa9ec1c135f7a72ed03e54b383ccaaa2417abfbf41e23770f0cc38c1309ecf616eb51866f3d9d4e787b3da61bd WHIRLPOOL 78f6429191c70de29b539365cb441758ad54168ef877da98bc45ddc74f2154a0995df1c6883fdbf400015ea76b4b406c868ed6cdc08251fcb055a94fbde1374e
-DIST thunderbird-17.0-ru.xpi 415708 SHA256 0b6278d769b1f2526847a153c9c9db3c80b7f3a29cf5181afbf0cd56ca48ea08 SHA512 3e17cc64d630dd6c29a2d33132ab78c8044def76e09816ee5f43ac0e073ad1993d84318852b199e7dc4e654db2d1d15c65f0d9f8f225b0ee5bc465153abd6344 WHIRLPOOL 3b8d645fae83668d85b76949f12677aee207152a2cb4d1aacab4bd92402e26fb3e3c41a62468c758cc1f9f850d104fb85ff1025bc9ee8cedb85eee860adedf0a
-DIST thunderbird-17.0-si.xpi 494162 SHA256 04f2c4a7ba8c769983f36b0932a8f04c552c60f9bf0ee4d7c1783a548d5552a7 SHA512 a094790487f30daf9356c771b324694d8b8696a77cc81ec4fe83dae94ebb7940bdc0c35700ef2a4354cd76edb9206a59bb29c2404630b7b0658e8ab1ae010074 WHIRLPOOL 2944f7add898e80c451323aca7304f88330a34a07b205350904abd6d411b05675b3e43c216d7fb2bb4227a31ae43a6c7a15b42a64c1be9f49ef35d15ffd929ad
-DIST thunderbird-17.0-sk.xpi 429756 SHA256 9a9aca008f73cf2dfc8b7ad97ddaef572276b1bb572452df2951661c4ba68df9 SHA512 af6abed15832782f871e31a2e4a1a7cc417e06294eb04ce3d0f97e455a598d0bd1b4a3d5c284017b5cde8fb40bb6c807044ade20e13ba8c264f940efcfd6b2a5 WHIRLPOOL facd241f805d6be490a049e3a8a6356bba2be10774c9daf782459a5b7d6137ee5dc68b5b7c3dcb3fb93cd79285613a12bac98d0aaf3d8c3365ba87d7abd5a85f
-DIST thunderbird-17.0-sl.xpi 442096 SHA256 52716753794104c91261921f47f57b0ebfa42088f108d0f013b559165bdcf6d2 SHA512 ded7c8a798a6d00baa6a1a6755aa78f73a8c087a285b87e4808621a264638f0760140f1c6118b5b2b1b8cbe855775e963e01b53898e5ef7c5bfc482db8203df7 WHIRLPOOL 85b68a50f0900f87ab277d7ac5169ef0afbd9152de5822f80ff3d74ab3394935e77ef1e1cb6a43870057ad0adb5941e775a0f8e8da99d46000f2692a4562ef83
-DIST thunderbird-17.0-sq.xpi 418779 SHA256 a8c1d59077f36d822d322f3c834561b55c3eb9123d8b7d56a05a2e2e55635931 SHA512 3811f9bd82b674da3b3daf9e2d905f32a0ac256ff9b31e2474a32f111276334ed129203d7022e8b9a684528e848679a85db06d7a4b84d3b7bd07833550030835 WHIRLPOOL ba02aff8e6368cd0dd307c66f7b490817826f2f7881544b3cfe6540b2a5bea513a83dc3b46a03140f0f140699f1250822e79ff177d6a55a5325c230e2255a9e1
-DIST thunderbird-17.0-sr.xpi 502500 SHA256 fbb791a51e028affb614c340464f503adcf10814eb8c46a22f6ff18bd5160df7 SHA512 7a3427d3fd6a850bb8fe670833dc324ece0b3c3a8b64d1d446ecd0f7c9e42ec540b3ac6ae63843e581f6c1d6041c47af06af8302863c756522a42ce81b19ebaf WHIRLPOOL 4ce30153d42970411772965fcfd393dedf5d81f9d83d28e03d61a4157402b063138d7ab57ea34e0311e616eb43f642937bbae12a83f1e62cbcb5f5324f244302
-DIST thunderbird-17.0-sv-SE.xpi 413218 SHA256 ed27240255445591569a8d7cd66e9000d52f4a8c7043e196e95a379440c3be04 SHA512 f7a8abb5089107b41af90eac3e7134d20ceabe6bd27a4bdf2ac196c018d5f99acd1552f0bea56dce5bd8b2387ffbf709c52046dbd6ed266466b93f11a4b63194 WHIRLPOOL 6c45f2242fbadd76c2cc934ab7b857825d261813b61fbb2f85c8331bc22516c21bc8f67aa7955583a79528e8f435047fdf5c733cfc80493c53489b9915ee49cd
-DIST thunderbird-17.0-ta-LK.xpi 517912 SHA256 199b1c55d570350ac308ce7e0e615a7cc8d030ebe00f4e3ed93a86644ab2c669 SHA512 33230c145a4998ec38807ac68ace14e74ec155c360f2559cef6172025c66f9c57ebefada6823bca652e8910e15e01575f34e0bba9e4fc79a5f6a92bd40aa4340 WHIRLPOOL 5d026f5142debd794bc16ee7d9b19528e06a9cc63dff0cbec2cc842dbe2c509c867345c718b9d0c71cf13d9ebb2a0246163295f68a4cfda3a4860bc399158797
-DIST thunderbird-17.0-tr.xpi 444944 SHA256 16a0c9a21cf689c25ca3cd0a8678e31f69197cf9948c6ec97979c99b02e86593 SHA512 1184ae4cfc67d4bc51700b233adf2b67a890783d6422bde1dde94a34c894b8a6e459a8b11e3dbf949a8177c5f72f26acd112ad0632a69dc08f5e6e43383cc689 WHIRLPOOL ffc3eb683ec6305923bf3a84ac497251ff1ae6d84de4bbc7feee17c9537b6e86a0483d7dd15ce88e64c5740ee9765a1e7719e1a73e3fb0bb11c4eba849f75e57
-DIST thunderbird-17.0-uk.xpi 471142 SHA256 d6c85cc9afec156d66a215da82075f7b4dd834f6f3a8021f43b4e1dff3e4396d SHA512 3e4d6a32b3c419d65323766972cdb61e4870f701aa43bb2a0410471dd932df55475191053baf355683235e4c1f0774e591ef8f293dbabe6e09aed758e2237bb5 WHIRLPOOL 4246c80bc0b99f90f7439f340fe4263eaedc565505b7b40fe519d61dd96d60911a6c68af25bf7ac09255336ce6d6a11071d414276cf50a2d6276b3c73836ee18
-DIST thunderbird-17.0-vi.xpi 478454 SHA256 0073327cfe4a44d4238f109e43936b9bbb6c62d3dde61ec92d73494ba86f78b4 SHA512 8690456e6d097c0a68105af6da18ee355d8e0711e2231258d1000e965d203438578a2302c517d6f0af3a02a58892738d686c45aacaffdb7a57a55ebaa0ac66ff WHIRLPOOL cdab1d9df7d2a170283279f299dbb04a1a26633499c09c8fd0e6906c74c21440acc26b06ace3fdf01c59cb48f4a8724753d9f0cb3e3db94067a0488c26911072
-DIST thunderbird-17.0-zh-CN.xpi 436082 SHA256 0f10c72f398f768f0d861cb6575622ea045d362048ae47fddb46b3b5f761013b SHA512 68d9d763653acc8071edbbfdd59fb5e235bed3833ffa1975907ca1cc2ec234ad045814b92a0db4c1a6f6ef6c3770f9ac7c286b1199bb9398950596f356f66acf WHIRLPOOL e102c90f43f718f1490f5f0fc95378a8d5955ec0ddcd4caae68b55ae8826b4c73fea6690e9a5feec85dede256703d88ed89a36e2c77742cbf4155257c66cce9b
-DIST thunderbird-17.0-zh-TW.xpi 437590 SHA256 555fcd98a7ea2a46db0b6d8193fc1c784a140d31aa0c70a99da7bb2502038ee5 SHA512 a5cce543faa5645cc5d9b289073d7797ab04c970a6dd3c226a3d6f5a9fa53853f466cbc2c24cff4c383eb0e9d23640efc97e3be6085c1fd084b8d4e11d79bfba WHIRLPOOL cba655f07c4b2893398729904862e1372519de310ee9cf4c6ce268c1e6d4efeb348f7941535ed4ccb582f4ebc26662845b4f40f7651085ab384b05ec006ff34e
-DIST thunderbird-17.0.source.tar.bz2 113270266 SHA256 08a102f21511afb696980b7c35b75f385f4260fba5f1c0b1b488ab81a49dbede SHA512 6fee7f5e765d156ab54e667a7fdcfd24c7b054d76c70a6de60e06b5368e228436db628f59af80c64be7e74a083d069c723a18c354fddc15e99a763380e124015 WHIRLPOOL c71e9d5acadc3b5a04060e5a61c06de1573fd08dff762b6348a8ee3248ec59d2ab0ade7d6656b1a0f710d8580dc967e4d7a52e5b6f558415707285e3b7d95c77
 DIST thunderbird-18.0b1.source.tar.bz2 119356332 SHA256 60a31745fc0ee4fc5597de6663a757f55c0bd61494f67607e3b914c73e236c72 SHA512 a5cfd4049b88db6cfa30e3bb8f53637db0992c6ed8f5030958ed268ce93913e8936ca5e7b91f1ebf3c760c72b3ae5156fd72140dac6c5bc21a93ec20d3399c6b WHIRLPOOL 2836c94478bc364a7deb4e341b984c6dc987dc969dcc8b3c1b2e1bb85237e2109ccfb647de05860ac5afaa0076e60b278fe47299ad628d3c97c2f3e15f7cf0e2
-EBUILD thunderbird-17.0-r2.ebuild 10450 SHA256 5b01d4fd8afa076e0e24b602930d2d2c45805234f49334d1c76ab98656ab2093 SHA512 7c198d964f2d3290c7808cfb720f405fda987ac09b67b3e62f47234d25f7d436e3084abbe8580d5d309a75dfd8b8fc9c3dbf64a9ca1aa3e58a7e648c10f4eeee WHIRLPOOL c265a2a6b9cbd2cda4739b5d3e00f2d3945a8d21521bc41d0e624f0130b6181d8a31b5ff1b735e648f793f4c438984612fb68cac6ed8aff923c6deb38e8320ae
-EBUILD thunderbird-18.0_beta1.ebuild 10450 SHA256 a23ba132929938c758988dc3ef81bbe3ceddaafb94f59c3499caf6e36fd0ccb6 SHA512 37ea3f6b83966cda6d24273677fc7f9889df30c3092538240fa48118d2952be3b214d72bc2ddf9f910a390ab26f289618a14dc5cd01de7e5c48f69559ab869d5 WHIRLPOOL cbb754370f713f4785d265e62b9ca57ab68ecaf0ef63eb30fd556aa05d64ec421b659d838ddb9870ac98174e6fcb48c50b1d7ce8559526c6db529c5e58e2e725
+EBUILD thunderbird-18.0_beta1.ebuild 10450 SHA256 6c7113e69006212a2161aa8aa870d1a20de295b6aa45331b7606bbec7136d112 SHA512 e19fb4040638db6d9069eb9eab514990992c03da94231eaaead824a9f678b297290e315e76cbd405cb8b6f4fc6250ef3d29d4dd7b5ba41d90abbbe4ba9adbf9c WHIRLPOOL e20f5f7a884569e9bd9ff92ab38f45f8a7e010cfeb1dd481681ccc4c426debc77f604b4862f17e7aad3dee475f6118af7239e73565de15bb3a87c21c34ca9255

diff --git a/mail-client/thunderbird/thunderbird-17.0-r2.ebuild b/mail-client/thunderbird/thunderbird-17.0-r2.ebuild
deleted file mode 100644
index 0719855..0000000
--- a/mail-client/thunderbird/thunderbird-17.0-r2.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild,v 1.3 2012/05/24 22:06:14 floppym Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO
-nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi
-zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}"
-# ESR releases have slightly version numbers
-if [[ ${MOZ_ESR} == 1 ]]; then
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${PN}-${MOZ_PV}"
-
-# Enigmail version
-EMVER="1.4.6"
-# Upstream ftp release URI that's used by mozlinguas.eclass
-# We don't use the http mirror because it deletes old tarballs.
-MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
-
-inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib autotools pax-utils python check-reqs nsplugins mozlinguas
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist gconf +crypt +jit +ipc ldap +lightning +minimal mozdom selinux"
-
-PATCH="thunderbird-17.0-patches-01"
-PATCHFF="firefox-17.0-patches-0.3"
-
-SRC_URI="${SRC_URI}
-	${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
-	crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
-	http://dev.gentoo.org/~nirbheek/mozilla/patchsets/${PATCHFF}.tar.xz
-	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-RDEPEND=">=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.13.6
-	>=dev-libs/nspr-4.9.2
-	>=dev-libs/glib-2.26
-	gconf? ( >=gnome-base/gconf-1.2.1:2 )
-	>=media-libs/libpng-1.5.11[apng]
-	>=x11-libs/cairo-1.10
-	>=x11-libs/pango-1.14.0
-	>=x11-libs/gtk+-2.14
-	kernel_linux? ( media-libs/alsa-lib )
-	>=media-libs/libvpx-1.0.0
-	virtual/libffi
-	!x11-plugins/enigmail
-	system-sqlite? ( >=dev-db/sqlite-3.7.13[fts3,secure-delete,threadsafe,unlock-notify,debug=] )
-	selinux? ( sec-policy/selinux-thunderbird )
-	crypt?  ( || (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk]
-				app-crypt/pinentry[qt4]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	) )"
-
-DEPEND="${RDEPEND}
-	dev-python/pysqlite
-	!elibc_glibc? ( dev-libs/libexecinfo )
-	virtual/pkgconfig
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )"
-
-if [[ ${PV} =~ beta ]]; then
-	S="${WORKDIR}/comm-beta"
-elif [[ ${MOZ_ESR} == 1 ]]; then
-	S="${WORKDIR}/comm-esr${PV%%.*}"
-else
-	S="${WORKDIR}/comm-release"
-fi
-
-pkg_setup() {
-	moz_pkgsetup
-
-	export MOZILLA_DIR="${S}/mozilla"
-
-	if ! use bindist ; then
-		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"
-		elog
-	fi
-
-	# Ensure we have enough disk space to compile
-	CHECKREQS_DISK_BUILD="4G"
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply our Thunderbird patchset
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/thunderbird"
-
-	# Apply our patchset from firefox to thunderbird as well
-	pushd "${S}"/mozilla &>/dev/null || die
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/firefox"
-	popd &>/dev/null || die
-
-	if use crypt ; then
-		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
-		cd "${S}"
-	fi
-
-	# Disable gnomevfs extension
-	sed -i -e "s:gnomevfs::" "${S}/"mozilla/browser/confvars.sh \
-		-e "s:gnomevfs::" "${S}/"mozilla/xulrunner/confvars.sh \
-		|| die "Failed to remove gnomevfs extension"
-
-	#Fix compilation with curl-7.21.7 bug 376027
-	sed -e '/#include <curl\/types.h>/d'  \
-		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
-		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
-		-i "${S}"/mozilla/config/system-headers \
-		-i "${S}"/mozilla/js/src/config/system-headers || die "Sed failed"
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
-
-	# Shell scripts sometimes contain DOS line endings; bug 391889
-	grep -rlZ --include="*.sh" $'\r$' . |
-	while read -r -d $'\0' file ; do
-		einfo edos2unix "${file}"
-		edos2unix "${file}"
-	done
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	eautoreconf
-	# Ensure we run eautoreconf in mozilla to regenerate configure
-	cd "${S}"/mozilla
-	eautoconf
-}
-
-src_configure() {
-	declare 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"
-
-	# We must force enable jemalloc 3 threw .mozconfig
-	echo "export MOZ_JEMALLOC=1" >> ${S}/.mozconfig
-
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}"
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-	mozconfig_annotate '' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
-	mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
-
-	# Use enable features
-	mozconfig_use_enable lightning calendar
-	mozconfig_use_enable gconf
-	mozconfig_use_enable ldap
-	# Features know to cause problems with hardened.
-	mozconfig_use_enable jit methodjit
-	mozconfig_use_enable jit tracejit
-
-	# Bug #72667
-	if use mozdom; then
-		MEXTENSIONS="${MEXTENSIONS},inspector"
-	fi
-
-	# Use an objdir to keep things organized.
-	echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/tbird" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Disable no-print-directory
-	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
-	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() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake -f client.mk || die
-
-	# Only build enigmail extension if crypt enabled.
-	if use crypt ; then
-		cd "${S}"/mailnews/extensions/enigmail || die
-		./makemake -r 2&> /dev/null
-		cd "${S}"/tbird/mailnews/extensions/enigmail
-		emake || die "make enigmail failed"
-		emake xpi || die "make enigmail xpi failed"
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	declare emid
-	local obj_dir="tbird"
-	cd "${S}/${obj_dir}"
-
-	# Copy our preference before omnijar is created.
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
-		"${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" || die
-
-	# Without methodjit and tracejit there's no conflict with PaX
-	if use jit; then
-		# Pax mark xpcshell for hardened support, only used for startupcache creation.
-		pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell
-	fi
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Install language packs
-	mozlinguas_src_install
-
-	if ! use bindist; then
-		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		newicon "${S}"/mail/branding/aurora/content/icon48.png thunderbird-icon-unbranded.png
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
-			"${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	if use crypt ; then
-		cd "${T}" || die
-		unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi install.rdf || die
-		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi || die
-	fi
-
-	if use lightning ; then
-		emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/gdata-provider.xpi
-
-		emid="calendar-timezones@×××××××.org"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/calendar-timezones.xpi
-
-		emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/lightning.xpi
-
-		# Fix mimetype so it shows up as a calendar application in GNOME 3
-		# This requires that the .desktop file was already installed earlier
-		sed -e "s:^\(MimeType=\):\1text/calendar;:" \
-			-e "s:^\(Categories=\):\1Calendar;:" \
-			-i "${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	if use jit ; then
-		pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
-	fi
-
-	# Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash
-	# continue to work as expected.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
-
-	# Plugins dir
-	share_plugins_dir
-
-	if use minimal; then
-		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} || \
-			die "Failed to remove sdk and headers"
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "If you are experience problems with plugins please issue the"
-	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
-	elog "then restart thunderbird"
-}

diff --git a/mail-client/thunderbird/thunderbird-18.0_beta1.ebuild b/mail-client/thunderbird/thunderbird-18.0_beta1.ebuild
index 7b316ae..f9cbe12 100644
--- a/mail-client/thunderbird/thunderbird-18.0_beta1.ebuild
+++ b/mail-client/thunderbird/thunderbird-18.0_beta1.ebuild
@@ -37,7 +37,7 @@ LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist gconf +crypt +jit +ipc ldap +lightning +minimal mozdom selinux"
 
 PATCH="thunderbird-17.0-patches-01"
-PATCHFF="firefox-18.0-patches-0.4"
+PATCHFF="firefox-18.0-patches-0.5"
 
 SRC_URI="${SRC_URI}
 	${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index cbc7fb6..c496e68 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -3,94 +3,6 @@ AUX firefox-14.0_beta7-gst-youtube-h264.patch 1437 SHA256 9b871769727e6d16939c55
 AUX firefox-15.0-fix-gstreamer-html5-crash.patch 1094 SHA256 1fa2a1963ef3146ef71a51affc46179fdae5fcd5a4bfdf5acb3da0f035b482f2 SHA512 42b8fc013ee061f9b7c00d347fe2712c2a1110574f578ae815dd4b5287dfa27b5643c74d41f2e2913d147017026d61f8b7a3603b2a40586f30f0e70c41f6af74 WHIRLPOOL dae601e40e1e9cfcb9775313ef5f5b57af40124a64e204261ef6de05b01533df36e28e333356ba2d09ada996e82a882ef492fa0efbd4c7cc06572dde16d83346
 AUX gentoo-default-prefs.js-1 821 SHA256 16259ec24a231d1d60097c8d892caa80d2703ba5be72304f6da55cfce1b329de SHA512 b63542c51edfe0158ce487b317ea6d36ffc17cf8457534adb6aa3f613d9a027f4285c9dcf76eb1b96de6bbc10ba09948fa6c081e00cfb25ca47450cbc32923f2 WHIRLPOOL 770d4b15f1b142ee1f59ce47f7b6d9e4bf4adb20a8a9fc104ea7d6c2481edb0d685c2e672008dbd869d92e8b24ea6ad8efdb4180421ff19ae88d0a9f6f752121
 AUX icon/firefox.desktop 276 SHA256 06565ade11b6e4b448cf10339696c43f31e73cb6824491094bb6e0ab902c7cf5 SHA512 3ab9aa94d3006518fb154c887e9be99fd372a75ac128b8d37debe5d72f26fb7103dd36f75bb6111750e93d520b730a29a8118805fe84be8f3021e4528c0ec47e WHIRLPOOL 9722c40c167bb1a76e7a81e3b1aedbb3cd10a09e00361fe1678883feff33e1d9ce31379f150a757d8b2667715175c2bbc16a714164d02210b4284ee91a25f8f5
-DIST firefox-17.0-patches-0.3.tar.xz 50988 SHA256 9baf32d80fb3353bccb1e79d2dc6f4c5f41847e04b5d18435cb37aeb99f16826 SHA512 8b0fb92caf93f5384b172c5d261f469b52a4b3398e6caafeab823901aae6601b4c16582ae00c71e5f6a56ce266720ce2080950aed9426180211a0d6bdea8666b WHIRLPOOL 1482c0e92caa72bcb645bdf0d0f2ff82bff4a1dd1aea4eb855579f39aec507d630f2a438d7fd417d15a15b2368518fe3abfbfd948d50f31aca33a1b316590edc
-DIST firefox-17.0.1-af.xpi 281146 SHA256 79946751171224948166a1452b0a3b6173e12743febaf7d62df82532e629c942 SHA512 9ddfadee9c6be17d7ab73c0832f06d4a9edd705a6c37b5c7358f003d1a2f812fd53fcb4462e79c0055563f57bfbf28b1a02ca7e2712ccd001547246546e3f58a WHIRLPOOL 26ed8f9ec26a578686d856a839a05b41349767b43ea9b0b3a10e79d77de016f59f6a564c45ff5f0cd035bf4eb739c540580d5d0e6db8197a8a1eb23d4411b0f2
-DIST firefox-17.0.1-ak.xpi 282977 SHA256 d16f38bf48d36415c845d9eba5a551c05750c08ccf8859dcd571b6c380c4513f SHA512 dc82a128b744b3228d53aaa92d71f7b42f72fc26dffd87530314151d8d6f479b384db960aa0fbd4c61b1e72d4173d1a670fc83610bdbb96221fc2b596ab616f2 WHIRLPOOL 8ebd52cf6fbbf664e856f578bb05b8bdfacab52bd432d74502d04c4b7cb64b60a0fc644f7d1b2e68ee244a49fedebae48f3d1c0bc7a8beeb4340322ca0bf073b
-DIST firefox-17.0.1-ar.xpi 311507 SHA256 e4f8a029f846dcc65ffb7857b1f961cca151fa26e0d7a68f0a479867e3c8e1df SHA512 b2e1f1a699d2808be0287fc3afe0116c19aa407e65711ac075a33a28f012bfe6e258e176d3a3177f4ef75d37897ae4d3c85eb9f121f2ade3112bfcb970d4ce1c WHIRLPOOL 0a594d675fd252376c9eae03a21d8fa4c82dcd6815499ba3b855c3dd6ea3ba6e6c06998e502923aa9a52471361b1c734b5335bb24135b58d6e87066f16a48c4e
-DIST firefox-17.0.1-as.xpi 327281 SHA256 2ad38587325dd1c21a26f30b2a49e4ef5a10493ae35d2d22e4e1800fcdab3f8f SHA512 ee59ebfec923e75c7cc092f87f93a0de42bad60e92ec1d7de7318e7e908fe2a834832a9dd0a82075d5ffab1dad93235562270d8a011e8b0d1a22fd0b0cb13bd0 WHIRLPOOL e3ae2c30d446d8324bd050d909106fc860ffbe657e9136f751aef67022bf4ce120dfc351889eaa19234ba69c0c0f39c981032c8bcf502692f758f376888d78cd
-DIST firefox-17.0.1-ast.xpi 264124 SHA256 5f27101e8a120ab7af30b5077089c7b4dc531de4efa0553f3d2194fd36b9ebd4 SHA512 3740043616a688d2d0cb0652a2c2f6116abaac3a71d6a682977447919e76d21a1b0064d0ec3823f7a2525c8d8ec42d022a36bc14583b91750ded5759be7c2159 WHIRLPOOL 3d838d52accbb412388c421ef7d063893398f4f6ace5c261f63f4332ff7ff7f5be7b0fb3729d44df9ce9108a5f253aecba1fc18062e3bc54a9751ee926e06618
-DIST firefox-17.0.1-be.xpi 273412 SHA256 43c8657472340252e4dbf47acec30c33c48ee925382c60484f89feb3b7d46bb5 SHA512 cab670abb658e2f7c48b14e2e7138ec835871411eac854e37e2a2583d0408a6ec263479f4afcdf4d2cf65d345c0986079c5930740a517326f82d8f503b667519 WHIRLPOOL cf2c4ae00dc1efb172817bd55072b658659660ce7e0f01d1de88a6f2aa74a3cff67f30aa1e6371349723c15f880a61cee60f3f3036926d04b15be77da9f12d7d
-DIST firefox-17.0.1-bg.xpi 327261 SHA256 a9e0ce0381dee06c192657c94e9b3f4b69d28284d08eab467b8a400a561df7b6 SHA512 2ebe45e0b5f0e4cf65cd21ae40ef492521ba848f61303ce4a30b0665f87c3e1257f1a63eb995d850e68b5c902b8b1d919629243a71bc69aec0b4e3e55aed3de0 WHIRLPOOL 216b884d9ce800a10d6f64943efc6ebadf8e149cd861f9b0902c8afd9ef304283be9b145aba3d9ba4cd032432adfcf2d90cbd4250ac95945480325f17ea95581
-DIST firefox-17.0.1-bn-BD.xpi 339303 SHA256 116c07018be7de3b4dfc463b1da1f3962dff092a1a28165b3431086d44598357 SHA512 fd2f123c7b5de7cd22a7f68c76388d53c31248135ca179eac206bdfd6442ae33def090b0f1f96aac5b3b711480ac8e95ff6e447dad9dccf91d00aa73e8152845 WHIRLPOOL 8293cc503bf7ed1d4531589b596ccca42f090ebfe09d9be9427d572aac14c8be08fd66fb8a10fbca3a7cc2785945d45f1adc3d6cc6cf4e30ac1bf7a87a1a525b
-DIST firefox-17.0.1-bn-IN.xpi 373021 SHA256 d3f5932231e942be726403d08d633850745499e428f94708456eb3e9ff8230a7 SHA512 112eb5eabec153734137650c1068f321cd85ae429b9a2329767838417cb939f65e626eb2c798c916975ecb5728b416acd24253a257f4d7a299146d0b461f0870 WHIRLPOOL bd52444972ed93b78c9a290d6f6738ff5599952ded1e616b36a40899a99238ecf566adef52e3586abd7c295f0a1da705d7f5d262d9387497bd60947b0a65ccf2
-DIST firefox-17.0.1-br.xpi 291583 SHA256 dbe0fe456828f375fb55cd46410d5368c0d0a84173c5a0ec1aa02c18e7022f82 SHA512 6add46a68728062d1d406796f23173a0bbddcc478251b79e15f041ac70f086c82a47a15ea4f76b8b3c7f65ef2682efbe12157bf9f2a2acd696e145f40259f3e5 WHIRLPOOL ec96f1c648e8977bd34a31fdc49816ae3662454ab1b1633249ee2c2d7723056369e82d6614f12e05f76c51aaabfbfa8f942f7478339a70e3da5b396a7881c833
-DIST firefox-17.0.1-bs.xpi 292223 SHA256 7a4400dd0b05c5c35b576ed9881f34e175c0cd8dba359a8995d3220d3bbfc773 SHA512 c5c61e0635baa8080262ce43800655bf6e86a156f5ad2ae6648a2e5fc8bb53f4f737661fd08d436cdfbbbad161664a0be09a8ce8e9b2a67443e79ef54e779950 WHIRLPOOL 4513152542fea90a2549009f097274d817e7df7fc42ba1fb53349a0cbd1c3d3f9c87f1f2a62b94b106de0eb8bc1abb8485e3c638e06f25f19a0357a962181913
-DIST firefox-17.0.1-ca.xpi 293532 SHA256 2993abcbd5b4d75d21f1413d8f90f804b214008b047383870ac7e810383dfe5e SHA512 8e35e954ae0279c5b6f466417f65002a298f60def9f4826bda8999e3e178524c000ccb42e67b940b3f6b13b4b20ae1f6366dbcb99ca21bf9425e9420935f4782 WHIRLPOOL c515c573c75e1311957daaefbb0e9a26f6a30231c09577f9f710d7f483b8f29e871e63741c97c2dd2fc4103f3fc0c667cebcc129d5177434f5edd4c67e5ebe9c
-DIST firefox-17.0.1-cs.xpi 294133 SHA256 e05eaf795400ca227cc9305fb0719dc950c9f83c36045d1c82b54ec1f172e2d0 SHA512 9009275cbf2bc4cef8b98a65e199ee8e8239186c5bcef63c21e3be56faa6d7efd2219f6be15cec0949c34b31e817de89d3dee26941302d2a5ed1ed3bedcb2588 WHIRLPOOL cee4a61dabe54fe81163b606571e6dc25c2516c84144b6a548c71692edfac4fa5dd4e9d3ed2826ccd6544cea6ff02c6e6f1abd40aab8f8fe82a0903b852cc95e
-DIST firefox-17.0.1-csb.xpi 299946 SHA256 0c07dab98ed0a813ef240f74c62cb342134c7a6e1a149c2b579fe4314a4538a7 SHA512 1452434a59e8b44dc53cdc1455657d621f904a06cd156b3e74bf587e5e1f9cc7772285f85e878ba23bfaf1051c534b715b3cccf89ac4e326d11ad64f153af122 WHIRLPOOL 3e4eca2a2704e746bfbf39658e0c9335f0790a37979ceae3a501c6152ad13d9d29a28f3a118910d1c58a13fc6ac3df5f5916549b09d919ddd4f83e4ffd444e2e
-DIST firefox-17.0.1-cy.xpi 284868 SHA256 5e3d83605e003cea83700df461ce2d9021657d90c8eed1c04b28ca4e1227790a SHA512 a7ca549ad025250cd09821bceae86a1eec2a12eb9f234e524236ec29cb9d4029146d1fce48eee8cc15a87147258a44a29ce79348f96399f4fce1bc5dcda1f1ee WHIRLPOOL ee80740978a0a630895a261d66ac9f0569f4c83a0ba24cf44a0c6e6b703ce631534a969b45e9fdb1c6fca7b6458b2a9276ee922e0483f5194a65cb550cf6cadf
-DIST firefox-17.0.1-da.xpi 282668 SHA256 d683462657cad304c67a3b31e51afabbc8cd5ea200b5437118655d2228003f4d SHA512 10064b2310c08ec1dbe7e8aed9086a6e07ea869b783a77aacc957c94ddaba77c5f0122f6bb9f16b3754d69a185924282d1f4b503a93e9f0cfdf2edf6fdfc28e6 WHIRLPOOL 85f3a2ca3b67ee3c5b848481856b93046ba80c6b490932e99bc29a46716f05d9e6d6d277da9d99bc7fc07832ad2d221c43f0ad40a80d55ee4617c5ca97f9c36b
-DIST firefox-17.0.1-de.xpi 270384 SHA256 ce5e154648c9ca8e90460914ebb1a7883f234df52c507f9b34952b36d2278bc2 SHA512 854687e538f762197299aa1069f424b93bcf989f88d46260bfd6e3f1ed51065fce80551cf01d73bee61cdb05e217db81e5aa1d0bc479531f18cf0c98ebde02a1 WHIRLPOOL 59e93e182fdcad4b30404baeaae29ca16a22e862205172ab30b206119cdf05662f5d675bfb97f4baeee9bc1fa13ee64e8a8f7e36f869e39d0a090406d53bebe6
-DIST firefox-17.0.1-el.xpi 311653 SHA256 89cdd8ca1a5f99436fe9d37925a7907e5a57a9c113762d4d901493ef31f5e7c5 SHA512 ee503df4ca9405febf2628701398b8b5f6955c84e348b4dbd8cde456d9f91c2a970500044d1e646687abf184f3114485208b5c539b895541f9c141bc0279d575 WHIRLPOOL 700e321c5acea3e3ca9fa675c31c1725f8641af6322131b2f42dfa356ed51f44fd934a76fb963d388a0b54525948061197aea50e090c9e22283bbd9096d93004
-DIST firefox-17.0.1-en-GB.xpi 272104 SHA256 b73bd071eff3830685521486da2a3c9ff48e18bf398a7860e47ccdee2117c95f SHA512 f7c09f0f12551c1a80444100e78d311e073898c889d1744015280d88aac5cd20b3ade3ecba41524671283d0780d186b8f6099301dc32d3118195ce05a307b9e7 WHIRLPOOL 4c832d53d6713a1b15f711cb587c30b2e5d65b0087a8690e674da44164d5f79288af8c49920b3a3147f702a45c52d36403b0e345dd4fa537e12707e7a2357d18
-DIST firefox-17.0.1-en-ZA.xpi 272935 SHA256 5e8004313ad1153bb43eaff17ea0d78c5112b631d393c58685d4899b1a7203e7 SHA512 f3e865e5313182498c49d1355979bbf70b55e36e15d4564fdbff8e8129137b33e6d7f48d3113a34337f38792869a928a62ec2db18802459bd13231357116d3fa WHIRLPOOL d1c601d8967af3c67487855a87287104613d5d614aa78e3d9445cd43e137ba487eda880cf2f29b620100cc97728fe97a4689e2f4d18f8ab2b994265b1805bb38
-DIST firefox-17.0.1-eo.xpi 284801 SHA256 58ec9689784450209d9b5ca63a02c58ecb665930365b419ec4f91c6497ee9316 SHA512 d9f3ebfb723b01b00ecb1d3a3ec4f08c645a56040be7598673178db4cddc4b9763cefbb7a711a67906d3a18a18d9f6f3390edfdbc716ef7c24f49788b088437d WHIRLPOOL 71460c82a8c224788aba8125f6396a3355668a138c225ba5b971671948fa481aad7917ceceb35944c109c72b22af35090fdc82313972ce0d9c3db4c561a7a8b5
-DIST firefox-17.0.1-es-AR.xpi 289239 SHA256 378c22b0dc9e7ee455f5c1f2cd4853a7f9f4b0872032adc1e530e35ef6de3080 SHA512 b23a45da09e907f0b4279dc2f9c508a9c7daa59ac96a349bfe99864b1533c5541c63b2289688a75d8322c4395566de28328bfeafba3066fc52a99ecf2970fe33 WHIRLPOOL c10dac18855c721ab9dae6721127c2af715c429dc399bb40562308db7e67549dd5ca455add091c98e52bd8c67a7fa97a931fb6622e39c1b994ba06600444fec9
-DIST firefox-17.0.1-es-CL.xpi 296878 SHA256 fb639b16b8087983315251f97119a3694bddf03f0ccb0d138c12ed12654e6ca2 SHA512 4a3e5be9e83ee712717451a41408081c2f3ec87d99f5682515dc514b6207e2c98618f1643c3fa35c3c382df9b5c437b3d66e4c182b70e5e0a966f8b876a83c63 WHIRLPOOL 1f036be49216b7a63653644e4a10239759199e9e0675e98832dab18c2cf0f8d75a6aaffa920dc9c8eb7b521d3fe9acac12381aebd4c3e2ac454f755793a47b9e
-DIST firefox-17.0.1-es-ES.xpi 242185 SHA256 21c86166ea229c1db574cec3fb66f684e70efae5a13d28f0fdc73d42d9865b20 SHA512 6b0170757c302c7512ae75095c8f391ecc900138dd9a4b0af68a9e53a6cae746e9f258f628709388fa388d579cab1629c1dc9b318dccbb904d021df6fd296f18 WHIRLPOOL 2a362dc91b08e9f09d2194e4b681db60a92f64eb810a2d85ce341ac52eb8db4703f80f63eb5f2e8c194d9ecdf48d636f3e007011465add10a30d2b471b347f27
-DIST firefox-17.0.1-es-MX.xpi 247972 SHA256 46bfa95ccc11c12f43a53eb35e3535e03ebb89ad35e3e18b1349943919dbc9a9 SHA512 b414e8ec30e7b2b78a0b8a9e5f9b7cb4cc4ffd630f02ebf5bbf4f41223b4e03dd75e42dc5bf793e499cee7bf85b30564ed83b38d043fef50a9b33ec0a5467b1d WHIRLPOOL 535687d9cd01ae7cb7436032b7be709befc2e7342ac72e7c9e5468317b0608c271d225ada53e04880a9a9559507971385f65254e3355c753f8771253b35b2939
-DIST firefox-17.0.1-et.xpi 284694 SHA256 1c2be6ddd962b84c50db991fe7346d2673d16e63a44f50745e4d5520ceb0f502 SHA512 58b17973d5cb6c43073ca6d8ac5374449859677d3d4cb39b1b118fb71972f42eeb04aa25458a16e1bf6c1aced60a18647b8600e5c19f423e229f5c2fad80591b WHIRLPOOL 8d4eb30f6ff3cf39639f0786f21a1aca871c203fd4a1e1a42a63ca33a219ee1c95e86d470dbf4b8dfb60af3fcacac3442c4a90f460502c2ac3f510ccf9f94511
-DIST firefox-17.0.1-eu.xpi 284227 SHA256 bd9e661baf655be491e666592b0797163e94e9f13cf16b3b8bb2de25b183e65b SHA512 fc48e88a84e31eb4afc24e20809cc18e7694879a9f0efa36d36cd4b9fa74c9355e8cead6fccacf9a9aa3b242c86ea6dd58e477443f5621ee4ba0907fe144e63f WHIRLPOOL a16b7520c1886c39d3a3029c389c603bea98da5f1a117175d45d8f534a466c018c6f8968098cef11600cfbec6fdd11ad06da7e8959ad897658a4b1f2a9b54b40
-DIST firefox-17.0.1-fa.xpi 323997 SHA256 c604ffeb77c5856a438c3645c017fd60830cd196c80f697be6a7dac4af4492b2 SHA512 eadbf2e9218f1f622912c8c9d607712b3ac217fa759456b2f3b197f810f3272cf847ccb92769a9e95fb0662e33b1045cf44e7dd5e3fa1ccbfa20149ce3da447f WHIRLPOOL 43e90837694b8efe9e84859b21c023f6e7cf99ac5d429f516a1f1acaca871c5ac03c2fad5e255ecf23c2ef4762c1b6bfc8e2308c2f62bf256bd45356b10bbf53
-DIST firefox-17.0.1-fi.xpi 288656 SHA256 4cbe8988e070c50d2fa35f91fe094f6b9fe0eb1a38f7a02bfa2a14c2d12befb8 SHA512 9edc18995278fe86ec994442786553d75b7eee1973a162787af0e20394eef799f53199496b6400a2d656f43acc35ca07d5d54fc5b5c3a340470d88a5f46595af WHIRLPOOL 68bd7587c32853e9a5a00743431d208b3df60bf70cbc68bf9c52d91c039988545789dcb624ae65d67145db0fc4c925ad5454863f87f84922cd03cc53cf9a7219
-DIST firefox-17.0.1-fr.xpi 293362 SHA256 e237590c1424f7b0d88f20f5435df110be1719f0745a0681d4691f09efdcc287 SHA512 e789ae8358895502901309143731c72d658519d9b11ebe08fa9ea1f0652d4ae3e4f90344a4fe8136e73013df4d9663c97e4ca6449f5f17cc4e4dcfc6ad933159 WHIRLPOOL c8564ed36e29f09031617f554e6d9eb7bcabc6d18b1587f93e6edb1d6f49c5e87921eaac7af30d96fc50773d68c7ee5b1869c27cf17b9902157dbe742ebbe609
-DIST firefox-17.0.1-fy-NL.xpi 289690 SHA256 a9e1bb63c215ae63fa3aa6466208697054874ebd05c04594918a06a929fdec30 SHA512 72173e1b8549c914b4b93088cc408c3692980f232f491626df67da3518adb01c0183e536b88148e30ff0543246efbd6c100557901297b24a012ee9d986ee9539 WHIRLPOOL 9056bee17637f481a60c67ba5a541cf85c967b4ff220ed044fe8f161d144f82b87a5a3d1db628490e4cc8584819af529d9fb6b0c9eba66728c8d1a2a6201732d
-DIST firefox-17.0.1-ga-IE.xpi 296976 SHA256 8ebc6fa56b13b6b6cb8b9192b3ca286aaada9116d57ae2180aa66c3cc63b36da SHA512 91522f9960533600936a159bbe202e8551d66b03f8d48587874db8cad0eb487ff17f13d8a37fc452cd4cffb03291c1c09bb3b7dfc9d2c495c7c417f7f3f4a5e5 WHIRLPOOL b70914327d28bcd2ecb3e0a2de29968798641ef0ca835efe544228fe3f1e79b273cd04ffb95994bf15bf6e245095246b76c1fceb5dd5f15bc51345cdebefe443
-DIST firefox-17.0.1-gd.xpi 299294 SHA256 e2f6ec84376221f837eff7e35c9450d8f2059d9bff485c7e9c3078b62b5e2377 SHA512 218c40c74fdf7c879126b5b566a79db3ac77843fd0793a1e3d5d69cb0da2b4f2439bba62468b0ffc5ca6dc55ce1418c4da3807759519eced9c9214e9d00cd60c WHIRLPOOL 2c0691b04ae72dff81db5fd168bce7409b97a9976254bf0e8e66ea6975e087ea6da79e620dd9175661130e10fbe001e97a7e965b5abe5a2fd2975d4f36e47c7a
-DIST firefox-17.0.1-gl.xpi 286997 SHA256 c585ce4065f0d77b3b9fc858e22767052dcd39ec221d5f965360ea5f46a85711 SHA512 e44de7be0bf43b8db7ef812565289af01c4616f9c258ef1abfccdb9ddcaf04191ce1f8134900870b6ded775807ce0ab0f7ed054d4efc27ba0b6eb21f9ba318bb WHIRLPOOL 19f8a49655b6d72749afa066eb847e39c399e50d478a90bbc6b27999d1d09fe1e758cfa65e0dfc2061bee3d24088347ec354d21ce400b859905d5feeaca9113e
-DIST firefox-17.0.1-gu-IN.xpi 319480 SHA256 515fa47b36eaa48209a35ac58fc8f72869daf8d502a67f11360c3095280489d3 SHA512 402543b08deba3b40eca0436e2b7c525ffe88179a9a3258acdf96474a6ddee1b1a42fe867ca260f4af8d57b7a95bcf86bb5b5cfcd4365cf530e922fd0d28baf7 WHIRLPOOL 4d36aa693544c95f03f2ff67547d7f394f7166603c3af236a8805491f3039e5a1b0223da6c2e6697e2a231b442940177875bdc9f8e7cc20ebf89310bf7b63c75
-DIST firefox-17.0.1-he.xpi 301482 SHA256 10d9f2e8adc6a6154ef54355a6841761a9493a69e4436fb9fe262ed25c91b40c SHA512 7d90e8c034dd11c796505b7c3707ed6b6e35d905378b546ed80cbcafbf9b5c3560ff8bb4c9bb73492e27720b3dd02a4059b651b4c106eada429969e5ffc97540 WHIRLPOOL c5fa28c89e7f37d33649d5b3ac0d201dc0f102fc316c921dc755bc75a014bf609279c4c8039d5affa36db85baac8b3fb6578badc03f534dfa78efd5ac1bee8dc
-DIST firefox-17.0.1-hi-IN.xpi 330864 SHA256 522dd4b1b6f6395694279d1cc49c761e2746c2e3f50e6078cd42bc834c4eca20 SHA512 65a5d8262a6b0a78af9fb4da30964143584c863846ba7e7c888aa73da752a6a87a21e2d693259daa04118770a784aee70b98ff67d292775ce4ec51533551e77e WHIRLPOOL 1f88d4d92a036a030d37a0b059098b09b8ba9ce8f284861e527440316223c1ce27112face965b03dd6182c7e3128eb1a52f1348b43772665dc8a9d7f6482c94a
-DIST firefox-17.0.1-hr.xpi 287940 SHA256 78e235e7339f36bbdc548a317376e3f197d50ff5b3ed9d80531f19e88fdc4ae7 SHA512 7297de65ba32bb1fbca9c705e81a7e2a1dd7c0393042991b61b36f8f814531778c65961452162ac3f99342abbd888d91815f9dc48f06d4640f428d0be71c1669 WHIRLPOOL c72374bded3fbb2d6c701ff53d9e6bdc1dbbb81991fea949b5bca93ef8c3071867794eff3408eacc9fb7081d695439abf0dfeef78c9aaf2984d64b5b09e4a236
-DIST firefox-17.0.1-hu.xpi 303044 SHA256 6c3d0491980971ef33939f07a2b2954411f0a6faeda7350ebc5dac03b9aea340 SHA512 a8e1a71637bd8865e4f897222cb783a40e2108c63b4fcae6eb9587043026734f2d1f7c2c3b8763fb3e9786ed14ee0bb2989699fec0f3936dfbd377ffabe86619 WHIRLPOOL 2fdeff9584ba2c36c1bbcccabe69429a0d8fa8fa9c3b41873ff2c5e52ac5d72108eb42c741680a9e910406f3e62b04577d660c4d9a9215be65eef5f14f9ce5ea
-DIST firefox-17.0.1-hy-AM.xpi 328203 SHA256 dbe5c9d5bc97938c8053907a9adca2e7fa5d1ef8002c620f59fb2b3972096505 SHA512 49935419a0b58e3542efa5d1ea09a805904858bb4e6db856063da8b22e0ba39bdb23b89fd6d4523996e439e692987ff88ee66e1880613de1c8f27b60b3521ff0 WHIRLPOOL 52f2a6fabf6d70a3947e88131244501171016c07914bcc38bbf7cd28c996a9d3e51201dc2659d404f88f095927527bd1f351fb541727b1dc633c550b069a241d
-DIST firefox-17.0.1-id.xpi 283726 SHA256 71042659017a0d768b921211433c72721b3d6623164ad67a7dc6142dc53d798e SHA512 54658bb20fa3732905ae23dbb55737f9b20dcdfe6eca1e2900daeb48c0435a7f0f02cc4e729454ef31d8bbee02ee5f92bf0abeff7068f6f1f0e607d62646e29f WHIRLPOOL 1238bd9d88dfd9b47cdf740810adfd6b09409584709fd789c0659bbe157b95ce02875a56921a0cfad16653ae82ef064f6989e6e11091b6be82a3156d385a7408
-DIST firefox-17.0.1-is.xpi 284908 SHA256 23214de85cb2427f86aea7bc40fe71a6f66936c23ce6f874618f17efa03b1b6f SHA512 67bc8639bfeac403170ece653f6ed7bdc6b8b213381b29b8680856c935ca8019bf580244c149cb02b6a07ed17f6e7540cd8976284098915f261409173cf592c4 WHIRLPOOL 8eeebce666469e5bee6d077173244c0bcb8ba1ca5758a0223229aec079e2aaaac6cbc84038602531ebd06af4ee1faa1d5a507411cd5a11f6ec1aad4f7224beda
-DIST firefox-17.0.1-it.xpi 238645 SHA256 c62fad53c04467fd7b75ab9523683172cfc368bb3a8502143039880cfcd61998 SHA512 49abb1e0111747221b0569dde2064f47ee488d6d55403ede846a1912651ece025896e752315f88040c192adb9eec1f51191f22a1b026d44a81b7cb633e0ce836 WHIRLPOOL 33c1ec88d8213e9042bc752300f9ea5b201689ff924f14e38b6d86b0753e19764b62c82e97a533c8444c1b8f1a55266d04f130532b16f5b06c398cfdfc12bf43
-DIST firefox-17.0.1-ja.xpi 322490 SHA256 b58f4feaf7c891cae544673c81a34c1e0b9fbe612849ca4c439dc5118a199ff2 SHA512 7408b93d706193fb4023c198edf9367edf13862c05c3858369a2bf2f0fa9adeaacf01c9121769829d7210110f2c61b618680c52d697dd73645f6ce75b6368401 WHIRLPOOL a7bc365dc9be171d52080b046bbc878a1ac4d779a736d4de690c46b0bef2471a34acda96892aacf96a131d43bcee9c8d34cb471fdf8d5d6c7a79794c71d1d566
-DIST firefox-17.0.1-kk.xpi 330352 SHA256 1864d4881cbe8bdaa4bcf08d4a370b44c0822591a206a5e74912780d13d26fd3 SHA512 158169eb4f3b6f534635bc7c5056c976c1c535db4dd73b186331a4ce49352ae67afcefd422bd09b2fd304c21263236a9dfd82f597cca3fbb95b77c3ce74dbd1d WHIRLPOOL 20f89c81bc0a00cdabc52ea9f23f9389aaa8d6a565e3becb03e03975aab8633ef58d5b6dd7b0c8b3137b37d8c59687d0b570900ca72a7738b5f76bb19bf0ba77
-DIST firefox-17.0.1-km.xpi 346931 SHA256 d0f2c647a16fe82c509f08859438b9c27646c49a52b4738fbaa31a175313c62c SHA512 e7aba78f54c87f215ae79ac00b77720ce86317235b6722e7f50a34016bd5f1a22733af314be9c2725e8f33c5838793e03cb3aff53f515819d3ea46d60f2b7192 WHIRLPOOL 73b5bb4bbb21db7aaf0d7d7314efa05f6892dc267505037d79d3322df946f169e36c72327a1a9265f693073c4857f5b13ce75bc6e2dcc81f4f62109ecace0f96
-DIST firefox-17.0.1-kn.xpi 354900 SHA256 c11d44b77e0319299475fef88b5c01ac8ccbe746df479c6b7d2a583fee338ced SHA512 daefbdd289c5b84856cb0d15f2a38b4a1a210512f596cd8b9f822e3907efab2bf2ea5b1ddf40c1ce945f932fc2c68d9f6f19e1301177166fefb06c4f95fb6fde WHIRLPOOL c20ab5a29c7a246df151cf7246f6fdd45ec99bd944e8840058631172b56cc65a0ac103a23e5e3612fe0eabe12937354089d41c633c02a21e4d8d4736c37fa7c5
-DIST firefox-17.0.1-ko.xpi 296729 SHA256 453acea9fc1ad1b2a8fc93dc71f2298a2be9f7a8938f0c41f27c0d0503671a44 SHA512 7df94b26de37d013afb772e4131e9ca0f4158f0bb627573e0edc13d1f46cbb09ff059e23b67624bbe090f9496cba2bd8ebd1b33626cfc994f0df9c0f47c64de8 WHIRLPOOL ab696c3583793bda90621aeb5d97edab18545aa03f8948d0faff56e1524a8c3310687b98d6a10f742e3217bec70458d8c864a4f0a55bd73470cc60e67723155b
-DIST firefox-17.0.1-ku.xpi 304898 SHA256 a43f9b89761f38359e59be7840e51658003b354c4420762afcb430cdab198828 SHA512 0dab1ccf325056569d43bc67a1156d2b40d96630afb66f80d5c73b518548039925a9ea9752ef68b41b34b725e35ced9a87f7c2f989e2ca1c41d2fcb769f2e9f8 WHIRLPOOL 5b90904e9f749446c1a7bb2948b04f38a9f7000038c3ef31b4a8ad7351f40f3cf1e48cdc30fe5f223ba0a62bd5dd94eb9fe541744fc857e0762bbd43c2f701cf
-DIST firefox-17.0.1-lg.xpi 290627 SHA256 18cf04654e253242380117c03215723fb2f7ea5e4b54b9ee3434bbba99338f7a SHA512 3892914dfba549c5a8cba5ff58f0ae3f8f72dd4768cf1d66389f996899ae7f89b9e123fbebee04fa983fec5b273c269c7719fa45d3ee18f31ff5ad4d64d048d4 WHIRLPOOL 22df1adcef9f9f4c8d81bbb2c6b291c84c9b8c687d65077bf2b857d5735e6682026d0876885a5c921fc7e62ea19483a2bc5879ec1a0a6d456fdc32d03e3f12d6
-DIST firefox-17.0.1-lt.xpi 349462 SHA256 d68145f604e6eb6ef2d0d84ec9791077242ad3c2c3ea20571852b0d64a65854b SHA512 04770369c239ba83b8dfbb4ff2b16e81eda4eba309ee7fd86d1b1b40cf927f93f7fa192b9919607502aa8c1d742879ee860f504de19c244f238b37d649e06e69 WHIRLPOOL 6d0998f69dbe3fe0e0e8e483b167d6d7faa9d981fdb1dcc2b065169bfe24dfc2881d035ab6d41c63ffed79963637b55da94ef48166f1830af2cc7da3822221cd
-DIST firefox-17.0.1-lv.xpi 291404 SHA256 b6e23532352d2714d8fffac469da1c93717243cb2625229a4284e56ca70e49a8 SHA512 dd867e5fb490542ba46ac2be222822b98d9e8e5dc3b074f1759feaa73b9e1b9e541204d3ca15ab049f61da51d16f0ab9890dd5e3725ed67e8c3f2e7971a3d406 WHIRLPOOL e0fffc706ca7fa7632f5452a6ca4529aeddeefbe35c0f360d898c30c1e0390fdfa205a4a02ce67db1d53209394fc53158e5cddafda1f868b94bb5b41f84f45db
-DIST firefox-17.0.1-mai.xpi 328267 SHA256 6292c85c1a924037ffc41e301b8482a54980b1917ae26eb3e9d29adf6f1276e4 SHA512 7d2b8cd25307b3aa9f647fc691d94652e3abe082446799e2d3d901f404ce4aec911bf5ba4c9884bd4ff23b3cd7c1548f3aa14345f7758272abc14e86d8361810 WHIRLPOOL 2811575b3b90d6f7ea720e9acfc13ddae7a0122d7529a02bf1dab54e26b5fda8e39ae6f500ab174c8b60cc23fdb7e92d59ce4c6c9894bdbcbd22b7550cd1c729
-DIST firefox-17.0.1-mk.xpi 315578 SHA256 018910e2c6a739007aeb3b568e30b16454a642b3ad8f7a32555892abd86096e4 SHA512 957a9a8f01679d9a8bc3942e139c25d35121909ad0aebdd62fca94e52629b60be8baf32a86a85d22f90ca459ea4fcaf366e5e05611a55ebb1fb0052aa1399f0b WHIRLPOOL edac8aba4f50c7e2af396fa80e313990d07c2a17ed8f8c1e44693408d0c78e28366dff4f38d23d2ed1841e63fdd3e70766544df3133d643b7c407003ffe267ec
-DIST firefox-17.0.1-ml.xpi 361541 SHA256 f91bebb5d7175e99e23206ff51be04427b28f28c0c203be7dd54463e51d5a010 SHA512 f33e52fd3c735adbdd7fe0b7f87807cb72f3feda8c509ac1ee8ad646281faaebe3b33c40749b7bbe535ccd6068311aa432f5424e376bfaad464fc532b98f4d73 WHIRLPOOL 468d507a6c6bea4539f75e044d9a76e46a32be90ef0868ece96452d759f4012a0c74cc0a4d30a8e5dcd91a640968f1a80910e0e1592c996b5987db0107000a6f
-DIST firefox-17.0.1-mr.xpi 327860 SHA256 cc9b7ac996488943f7a7d2ca5474e20c25b461da61b67def9359faebd0284adf SHA512 7a0092461b045ddfabe3bd570b1f377325759a5e406bcbb145d94f94fdf3a80e88a72663376cbe7dbaefb11c3bd0ce6a8c59e7db3284bb5420d39509a8b715ae WHIRLPOOL b51f2ae97eac09d1e7ac00f7b81bab539f64f7f2d70ab0f228a1ae9e87f2246c59b574c278346b5e5f71ca876fbb48e6a71548512962de02f9a1c8a5d800f111
-DIST firefox-17.0.1-nb-NO.xpi 284889 SHA256 a8aec8c2df851b1d0d2b40ad9b8ebca1cbd41e869a7ff4196c4815dfbf71cf76 SHA512 98bea5582111486dd12fe33be225c28c38f290dba2bf4686278289df7aad7ca5099a8c4b101613768c39aab8a14973bc0531f5975368d11aee41b41a88b0bddd WHIRLPOOL 70725f5a558682775ccf4914ff60f34330084f3077629b44cf2d866b42a9b9efc84af1b9f0e807bc9b467e97fabb97c33dede7ec803ee6f19c343ae04a43dda8
-DIST firefox-17.0.1-nl.xpi 286112 SHA256 f6870752dbd491f0106c4c91c7416c4e0c244bb7b368230fd83c3824c5ce0eac SHA512 db7cbd13b71596885dc095cfc32bf88a33b07d2b842e9472aaaa0dfee96e5e9ded074d833ead33c4c85ffc92d3b7bf6a8b97a2d802b674f5c034849ccdc25e6a WHIRLPOOL 26b950284143d2c6467bae875a4ec31b43e47777f1fb74d11e1b48d06f231d93d7cbe4302f2876206adfcd3c8a178d36eebe56425684555b4588235d7065a474
-DIST firefox-17.0.1-nn-NO.xpi 287844 SHA256 977e05f7727869bf971e591c8d60271fc2fc259312285f6f24994211bc5e192b SHA512 3e36820813b4d2d098cc490b9ecc893dbf2f88339334d8c45686eb82570adc8e8e71851c80325dc9f7d5988649e4c2086a73f3244c4443382db0a0397de1d3a2 WHIRLPOOL 3d1ebfcffe5ad825aea99cc1da11e568617d511c0c4c0ebe0c1d2755a6431724df1867efc668541b13165415ddcc58dc263fb744e872bd7864eea8af3c165ad2
-DIST firefox-17.0.1-nso.xpi 288150 SHA256 62a2bccdf08d28b9794f1bf0ad1dc4a1d37dfee3c6c58bf830e47134d6104561 SHA512 ec363589a90eb54182089ad77c80d757723abb2801304443e93519aa063e34012fcfa1fb5cb5c7366235b0590d0905419c13c502314ff95ba8c2f050a6d8af82 WHIRLPOOL aeaf8f4d63807f6574232756cd29e1fb342fec457697c706a9aa7d2b464e9b1364fda341b730d8d6c004f4f69192b9c8a5c193695ace83e64b90b3af0a2a25b4
-DIST firefox-17.0.1-or.xpi 329684 SHA256 76599f08b7520c09444d46cf6c0cf33d4591965d9a60b0d304a1487d6a9b564d SHA512 853437ddbf4698bf0058c2ae4164cf5d6611f9d9420440f37ba471219f63e52ec8952de52aaf64636c162a3cfd251a2aad48bd05a06a0f57d5293436ff81472d WHIRLPOOL 35a7a74f21cadf19c202fb599b0f503413316d1f286e04bb08482ca746c6d108c3d828068660d0c385b565e355157fc65d46b53e5f4df5611f00627db633654f
-DIST firefox-17.0.1-pa-IN.xpi 318504 SHA256 8b5101a373fbc4d686bc1d497047152680da5cfab27cd9f05aa30f82a0759603 SHA512 513a00b8c893415010cd02da807d14eed18c72635427a4a77267d9152a521e98e0eebfbbc6356987331e195f4f5cf5cdc148d36f466355174a39f8e0fa4a18e6 WHIRLPOOL d72ca7882d1503325423da4fe75ca0b34eef95de0e1590ce25baa922b56718b5bd4b575cdda057470925a6dc4ae6a481fe8f3e681bd129f3bfe26b83a01da2b8
-DIST firefox-17.0.1-pl.xpi 301035 SHA256 a9cb97edc06701a262fef5652eb90a95a24c4f9a7573fd6b07292a0147b0d24c SHA512 c3ba81a5bb8137e1eeb905c02dedfef1b884bae881f82b7e254ad1094d1aa1af55bb30ba5562bd5bd4b3161d28a01f7d8d7fff1be6b7430611b93afdcfcfb355 WHIRLPOOL 7644350d295be2ab6f7844b3aa1107e044a959963dc1b4f96c5365b40ca2fccefeadc52560955a9454cd8f57be3443f6ca200ce58b4deb7274880a685349aa6e
-DIST firefox-17.0.1-pt-BR.xpi 289244 SHA256 ca60b72278dee550066f929072d48f57a614d76922d62ec44112acd399b0e6eb SHA512 5ddeb3333a45247c0898262f4a35fcbf9261d7e4790429b6cf68df2e3824b7601c5f5d07991db9c6b673317daf6502127700576f586551336e35f0ebec62dcbe WHIRLPOOL e4af456224cdd6188b7f227e5d160d779bf2a2bcb6d1631629edfbf632cb7420b7e8d53bd44d3803d58e1e44b26e3b9dc57dbbbb8c3b2351ed6261688f8bf657
-DIST firefox-17.0.1-pt-PT.xpi 291458 SHA256 467cb8660625c4583eea1de0e0a1ec457a17da9b448d783b4eea043560f4411f SHA512 2e922693446f40f5a409882a48db514d38e0cfbe521b6b48d5e30586768cd4756d90308a199c0ca20e84b795385d736bd3e7cd9404ad0ad99d7a1112fea89330 WHIRLPOOL 4c75306782e9f1a826e3068b0cd12e930d8fadeac3042ace5310cc40e5420e44bfb781bfb5866a79daa3d19cb370c1f207e99d13c0993f85b6dee1885084f957
-DIST firefox-17.0.1-rm.xpi 288466 SHA256 2a48c8bc8814f8a8b8967405c7850c81c3260d9d8183cdeca7a1c88cfda60878 SHA512 6bc1ea6e3d1e0bbe92cf8525f5608a43c637cb3885ad59ca1f6eba71ba9a1135e9d53906fa6db5dd03a68d55d3d9d48ee1b2f90d050555d0d31a89353727785d WHIRLPOOL e05fd53a728eb41c7998376a10f94a610ccd0dab1410880c851f2458e8176476707bf82040a1ee8f6cc704ae65309eb12f0bc3fb5b3134b418c2c1affb837840
-DIST firefox-17.0.1-ro.xpi 310252 SHA256 8f17b399e7635f0b651ccbe0703c68e7dc5c1de68eb263e0ebabc986b7a6a075 SHA512 4d92c2931004d3f972da6dea51a8e258ae22cfdd20c879e0489037903d7a05d784c564052212487e6b7593e2082f468050385195df03c59e64bcf46045af461a WHIRLPOOL f5604b9b95a6ddb52eb4bbc7d23603e2563d86a09e830e4f664ac8689cdcc51ca412370db9eb5ac05f3ceffdef685a86b8329368c6c6617773b3bfddbcd708d8
-DIST firefox-17.0.1-ru.xpi 284915 SHA256 fe56cf2a9525f7770ea933829ea19a24c14ab22ca7ba22b0589832511a04bbc4 SHA512 4716cc93e398193e116d32b8e1e517d7dabb4f38620c7a5fa26421a77866819730c3dba9583cffc77d97b779e32bf2ca65d84cc06efa60fdc635587cc9574072 WHIRLPOOL d27f70c28db4b75111a2f24c0384a1bc83618fc1865ebb06e2c318e0e733daaf37f9454015ebfd6b79043a75d25ca780874557b2b4ddfb6445671a8df42e8e10
-DIST firefox-17.0.1-si.xpi 317364 SHA256 9f625c26a8812baa21a39f0abbd9f6f44872a0313138f377c24c96f94dec483f SHA512 34cf07f36376802c8f2aecfab17e7e79fea7d97399ee3f38e13ef8a399ac4e1799a977158178cc45c036ce002d6c2a0265743c4cedeea2a116710e04d4437b0a WHIRLPOOL 2d1f0d17786fba4b587002b4e32d4ae81c0a2496b5efa8bcc828e2b96ac75f7d33b41700a33765ca03fefe83d9e3b7a5f9f4610c90dd763c4b7cfe956c36be79
-DIST firefox-17.0.1-sk.xpi 301478 SHA256 4f53b79c3a27bec6fb26e797da338a884b01a883f57482d5ff3ab8bc2edb6708 SHA512 f46b080151fb91642b7c0aaaa6062e6e79161e463920c8520c49fc13f39a86301d8e18fce101c52f98459012ee5928b1617f0fcf63fe519a1b2a5e69b9570778 WHIRLPOOL b1534d045f9cdd08cdc2ea56d87469ed9672a7d32049b802108298eeab9228e5e26da451d099a1df40f81d944257813585da5ae20519c6140b70f75e81b6ed6c
-DIST firefox-17.0.1-sl.xpi 286638 SHA256 c81aed04e9b0cc2aaf31d683bbb335a03b55d749f02ec5f2c32d82715900ba66 SHA512 65016d4c5ee781a3a773e26592ba32aebbfc5abb5a44401fa5970aab6ee9e92433af3da6e479df2bb2320f3c5b8565c961cf12ccf6d482b5f952b2c768e982cc WHIRLPOOL 52721687c46eebd6876c9a45ec3cd5fe3b8c9746a9f6180de540845af96f209862672355a03ca3242b058b7241ca5385fa12894347e1a6400955cfc2268c73c1
-DIST firefox-17.0.1-son.xpi 283684 SHA256 eeb0193e01b11be3308afadf418111c4d352335d58dae6a99d6070ebf8b501a3 SHA512 522f5514d9c4a82dd7bdafa1455ad84e185e33d39d9f93259c164b3f13bf3ca75a2e27f027bf2b11f4b3c00a37bab801eb18995f67730220cf44580d4783fa7d WHIRLPOOL 562debda8bfad482b114fe0d9dbdab84281d71ce6598883c874c962762e69595812f570c08b757ee73a0379bf6ac06726f3058fbcbe1657f58f0c98e5df51946
-DIST firefox-17.0.1-sq.xpi 291166 SHA256 93ee14c4cb5f09f536fca30cf480ff4c8541c6f095be7a49485590979e594e0b SHA512 aa7f0657576cb7f01ca3493260c511e387188e6804061c2480a593f91a9537792976208b3f25bc9403af6a9923244d782fad345774c0bdc649dc82ca5da77ae2 WHIRLPOOL 95d02892c02dd298543938780bc2b1d5c4e11379f3b83065440a46ec81fbe8159c1a0d3ef8e32bb539334a20d64d25b3152789469614adf4e17a4d3f790ccf78
-DIST firefox-17.0.1-sr.xpi 334015 SHA256 4710068e07eb4055be6da7ce55a683fdf4737e2a9692723eeb847037d6b46d40 SHA512 2bb4dc3d1ae5a4b64bd4a11dc611e4ca39f200ee1a03d9f725cf9dc3a762a1ced6054e7fc19da7d60e5956b6b408ab28b69525c547f0ecde94775545a0bc5a63 WHIRLPOOL b1d59ac52f8b790bf17827886df06021fe1ba3aa6d04757e574baad5adf7c47ec2170dc6a7dc81e5aad7fe428ada76bb2f450fd1dfd6ec77c7c3a6efe7638740
-DIST firefox-17.0.1-sv-SE.xpi 288084 SHA256 ca4499381e1003bcbe34e361d94bfbc5f42f015389bc0aac0aa238dd992757ee SHA512 c3405a247caa006fab1122c4bd881e1fa175468086a285fd8362d3f9f1c36ac2f9ce8da2fe61aefdbe88a8cd63d0a62d9019477093053040ae894602b4f314da WHIRLPOOL b4edf673da5357a873788ba8e9bb34523ce5609e543ff4f5bbef49c02d739ed89b379482d647c91990f70e8ccead8f346f0b7e01c825d03f3b397ce3f61c1c56
-DIST firefox-17.0.1-ta-LK.xpi 339932 SHA256 51e5cf61504d44dd782ddf6bc459ae2e733c470ac7cddede9055ba952f271284 SHA512 7be03355b14d670cf88c20899712213ed41815c9dbd81835b0242259a19ef8fffbdc5d14ddeb09434fd5a1d43460d2cfa8612a22d84ea6a56cb59bdace703003 WHIRLPOOL 965f4d4eb956f096133686f431969f5522a4d7d43210be4b49c3cb5b13d2106615d432f63301d1fd4670bb82d9737386bd18e3b302363143971dedf1cc53930b
-DIST firefox-17.0.1-ta.xpi 325367 SHA256 939484b400ff3928bb07c29d978b029a68216c0b7c6d8b0f9e560b28ef5bfe28 SHA512 ec5363da0056a6aff0886cb430b1aa2d40d7f62b68cc7d4ce198387f4e54aa7173cab7a23b21b775a654ae1fcf48f8dcb6093247b63d9dc1fe64c93b143ed83a WHIRLPOOL c9525b26391b12d5614b2d793eabbe7ba209df06c7e7582837af47ed0f6829aa314a01dba7d56c431598a2b5fc183b8e6a3c17ffe445bdfe0e7c2dcadb5e185d
-DIST firefox-17.0.1-te.xpi 341958 SHA256 47648dc9de2992de9bae61a926214df34d24873992b25c9e1fb9333994714854 SHA512 6e7b020f79c992170377eb38f5ae27c45219c6ec4076bdd850f5241209cd4782c7603a67c38ec3845279099c30701be25086d9c1c3168f94792a6013f0a08817 WHIRLPOOL d5d2027b6f8426ae2b1cce53bf6caa9928b608efbb294220316d91d473d33329deaaff6dd7916c80cb87d7e602d92878cc756342854346f37fd3cc34e7809cb5
-DIST firefox-17.0.1-th.xpi 323676 SHA256 52f5fd75d9d93de9e08d790af28f92b4df1c150f4758552f9c2ac44951e601dd SHA512 713617f248caf683ada3cfcf37265b60e94dc88c442a6647ae9b17e142555d718b08527036e1427617e1f000ec1d5cade48b91c41f3040306c1fe19e8f11247d WHIRLPOOL 1bb23bf8116c25c0ab58cbdf602d838bd3e0870e413357b6aef1409140da26be39e59bd660b7f7b0af0074d65f8084de819247701a23f2d2191281c41a5395d2
-DIST firefox-17.0.1-tr.xpi 295842 SHA256 f2df762fa8ad03e32efcb12b6f8734fb3010f2eb19eee97b4821231c1f50e6fc SHA512 322a40e8cc24f76ef49ee22f4cdd8e9dac2772346d134b316b00aa03174447d4d98a187bf06446c7aff6854a7fd178cf7f1550a950f0fc31f665cb95578faf6f WHIRLPOOL 347dd292a6429b2c0f1f7e6cfc7bfd1e967a759ea9553d22a8c4a419f128dd68e1dd1ecf3f85ea310be4c286851a47c55b910d8e958926959b384a825c18eecf
-DIST firefox-17.0.1-uk.xpi 324251 SHA256 307cd2fbe5a838045513053ee18b208495e25c0b23b43ea77178e0eacf53ebab SHA512 859e750289d0bdd0dc2d6e7c2e371614537d7c81f47f8d055439a5e19e596dd2999b2198c943c85f9fe97055a7ee948ce25813d93c5dbca8f1f9a2b02d42631a WHIRLPOOL 4e00f5d5297a63fa26b7e49497faaaf37d4acc94372e03e1cab39b5fab8949da3671e885758e66be90cacdb7554a3596a0f946430c557fe435845142c33e9a77
-DIST firefox-17.0.1-vi.xpi 313549 SHA256 8a15d3dfe5fa360e4b1eacdda2160ef1cbaf2681f537ab430d7133d2462e9e03 SHA512 c4dc3ec9979970224ef4ada98be7b5213395d1c964ab5024543385601894285ed4e8fbe031d297de7b30cf63e4e5063af99d742ece9854fb91eddacb40cc7b0d WHIRLPOOL 148627ec6a28e061a8b3ebbcdd2774de923a0b7458ddee752003e1e84b5ee33e2969fb3ae102c2c9a3c666b024ee025a0dbe9268997dcf9144fb4d27b66a4195
-DIST firefox-17.0.1-zh-CN.xpi 304251 SHA256 7ffc7afd6aeb4b954f9aafa94ac5a764e8fa44a13c4aba87a87773955be0050d SHA512 023a1f522102552ab6dde7308c9eac2c16f56343c2b4de3bda8c2d6354aab763127042f05987e1ddfb4e0cde4871f0b381458562eaf041d168cd43537106cd6b WHIRLPOOL 7d98130cd65b1d90742f759fc89c001d498288c291b46a51f2ebd35da3c80d1e9a5256f27e56ef43f33c79a81431c4bb5b5f4220b274febc8da66e9306fa00d8
-DIST firefox-17.0.1-zh-TW.xpi 305438 SHA256 cefcd27a01a573885d4fc9c85f13f9fc2ef17f35ec238a38eb32db0d79a0e3e1 SHA512 3f67a97b8c9d8d8abba221b29edd3fa314b328d2ff7134546ea4bd3076c95183a5d12779e285873a95e58ef065708da3a0b06920bd31aa9496d23e9844d81c76 WHIRLPOOL 60f376ad414a4d1c1794756371226752a0d863a0de8b925d9f4ec3b6f6c94e79b07fa99e3b90bd774192efa513fef09ad20d17d78ae38558b4a244fa7286e6f7
-DIST firefox-17.0.1-zu.xpi 296594 SHA256 6f1bd98029668b48424147f112404ac70f69abecd3888a7d010ff425943c2855 SHA512 c7a54d3d0a8a4d5e9ec1605c0b407d727a3c53925a67834e01bd2b04d6149fa2e97d2f1605df16fe219afec1483a3da1e3ee318ff3ff1a9d695281a49305ce16 WHIRLPOOL 3f32c10908a8050413cec2ff769e0c4ad27c814bd400913fbe358555031d19a8bca4cc825a51e91202a074bfb07625d6dee0adc3355d89e11ae98c2a57d154c1
-DIST firefox-17.0.1.source.tar.bz2 90785127 SHA256 bec6b29e5d29fa0550e95e48ec1c6842dc56981e342580ea04876d0f8d2a6e56 SHA512 058ebc40c950a12a9d4db2a61909bf778ea18d850e4828f2a3d592301ad96202e9eb3d435eccce64bfe91e5dfc9b9e30ff10b4aef9603e25e1e90f2f8c776d6c WHIRLPOOL d7445fee39a185e0dc4aee69a26780ec7958fa03614442adb50a110464cacee2b1e551cd20804c533158065b278712d727ce7cc0f0c3af05467c3b3f06c9ad5a
-DIST firefox-18.0-patches-0.4.tar.xz 51676 SHA256 353dd5a9d583d468c6998facb474b03de50cfe281b532990094c2a2128689488 SHA512 e32118edfdfcd07edd35e9f6aea8788b0328d573e96270b43541b07f62ff873c74125ce210e7f3ceb588220fd728acbfa7582074f266e234e7ff2b7e598a9849 WHIRLPOOL 19a8b95fd0eccaf2b867c3c66bcb944368436d3d98c1b87a68cb3f8079c7b5acb7c50454cb75a91ebaf70da5945149afb93c799f4f532330d437b775eb06a8a6
+DIST firefox-18.0-patches-0.5.tar.xz 52684 SHA256 346ba2fd359ac4160b98a0519cf00c146865b5312f18e2999848dcc0e9410d76 SHA512 4faef1c009e1dba785b3deac2fca32f7194c772bc0aeb90399b4f75f36a30497e8fbe76c3db130b130639fac50e6a5aef419cc672fd91e9eba200c0962c12787 WHIRLPOOL 03e11937f03594a0c678b36a36f58adc8d54cf594060f6acf857dc383b9cf9791140db1cb1636481332c5bf7d8a65f9d75a224ea53f47605095911288b88578d
 DIST firefox-18.0b6.source.tar.bz2 97158422 SHA256 4a4811fc4be15a4a87f6d816b89eda5d4beca9e8eca300b75350c28aef59595b SHA512 16cb523641d8560ae4b56cc538b989ff1c28a01f3db45badae44a928040d2d0d2e6ee6e0ed4eabdaa92e1a6b705a7b4b0d4208f712713a45d83b40e59dab6460 WHIRLPOOL 5f520bfd743d7bb0aeeed344e6d0c4adf1922a845277b8c67d39f1dec753a025031b6086d1f0badaba0a924a97f739bd51f281a0a961a6354ee407e24155ad99
-EBUILD firefox-17.0.1.ebuild 11889 SHA256 1aba51b2aa345cc90671e0880f5911809d256aa21fb6991437b17414566726fd SHA512 4a09c243ac7522d86445971d03dbabc5f788fdd60ac8c88b5cd435346fd184a928b63f67fb53606af7f6970341a74bb688013694639109003f3a96ec71129daf WHIRLPOOL 0fa534941a074d551ebbb6e7a173ac1ab69244173f7295b143819bde78233e88c1491f127ca85cfd93dc1cf92b0b71a68ad673e564e55288c0c153c9fda8f46b
-EBUILD firefox-18.0_beta6.ebuild 11352 SHA256 b3cd8739e48d3b8ca29656a9e2ebb327c4c7c4a3e59ab2a2d3bade3beb70744a SHA512 67ca55f06964318d71dd6976239b54cecbd9d2cebb44515dffcb0a37820c54cc8a8cf4c714141eb892c992af0ef4856011fcb3e2c5376f062b554029d2c6e507 WHIRLPOOL f1d4af14b05a4990a4b9cb24647b66a65b888f3da5e5090080ca30993f9a01cf221e96522bb73d1bd3091a660c42451b4834236b23653d26bd482ca3c0199632
+EBUILD firefox-18.0_beta6.ebuild 11352 SHA256 1fe864ef235ebb6a6819914b252a0621a32dd68b62e5870d34d04c386ae0d1c2 SHA512 9b4648d1be1fab7179e403231c90abeff2fd3566622bb9c447a415755f1b78d284f72346b532e7993ffdf27f7b8c22ba584a8377ae676af9361db0841c3d34a1 WHIRLPOOL 03b39bc7e57f0df01875dacfe8c950f690984711c3ca4d3c23988d70c19d0d1a4da49cc2e8d8d23bff1b870bf8991ab911d69c226613991b8756a7e465d5f799

diff --git a/www-client/firefox/firefox-17.0.1.ebuild b/www-client/firefox/firefox-17.0.1.ebuild
deleted file mode 100644
index 9019c25..0000000
--- a/www-client/firefox/firefox-17.0.1.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de
-el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX 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 km kn ko ku
-lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro
-ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-17.0-patches-0.3"
-# Upstream ftp release URI that's used by mozlinguas.eclass
-# We don't use the http mirror because it deletes old tarballs.
-MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools python virtualx nsplugins mozlinguas
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.com/firefox"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist gstreamer +jit +minimal pgo selinux system-sqlite"
-
-# More URIs appended below...
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
-	http://dev.gentoo.org/~nirbheek/mozilla/patchsets/${PATCH}.tar.xz"
-
-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.13.6
-	>=dev-libs/nspr-4.9.2
-	>=dev-libs/glib-2.26:2
-	>=media-libs/mesa-7.10
-	>=media-libs/libpng-1.5.11[apng]
-	virtual/libffi
-	gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] )
-	system-sqlite? ( >=dev-db/sqlite-3.7.13[fts3,secure-delete,threadsafe,unlock-notify,debug=] )
-	>=media-libs/libvpx-1.0.0
-	kernel_linux? ( media-libs/alsa-lib )
-	selinux? ( sec-policy/selinux-mozilla )"
-# We don't use PYTHON_DEPEND/PYTHON_USE_WITH for some silly reason
-DEPEND="${RDEPEND}
-	dev-python/pysqlite
-	virtual/pkgconfig
-	pgo? (
-		=dev-lang/python-2*[sqlite]
-		>=sys-devel/gcc-4.5 )
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )"
-
-# No source releases for alpha|beta
-if [[ ${PV} =~ alpha ]]; then
-	CHANGESET="8a3042764de7"
-	SRC_URI="${SRC_URI}
-		http://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.bz2"
-	S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
-elif [[ ${PV} =~ beta ]]; then
-	S="${WORKDIR}/mozilla-beta"
-	SRC_URI="${SRC_URI}
-		${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
-else
-	SRC_URI="${SRC_URI}
-		${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
-	if [[ ${MOZ_ESR} == 1 ]]; then
-		S="${WORKDIR}/mozilla-esr${PV%%.*}"
-	else
-		S="${WORKDIR}/mozilla-release"
-	fi
-fi
-
-QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
-
-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 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."
-		ewarn "This will result in your build taking at least twice as long as before."
-	fi
-
-	# Ensure we have enough disk space to compile
-	if use pgo || use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/firefox"
-
-	# 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!"
-
-	# 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
-
-	#Fix compilation with curl-7.21.7 bug 376027
-	sed -e '/#include <curl\/types.h>/d'  \
-		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
-		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
-		-i "${S}"/config/system-headers \
-		-i "${S}"/js/src/config/system-headers || die "Sed failed"
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/browser/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	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"
-
-	# We must force enable jemalloc 3 threw .mozconfig
-	echo "export MOZ_JEMALLOC=1" >> ${S}/.mozconfig
-
-	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 '' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-
-	# Other ff-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
-	mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
-
-	mozconfig_use_enable gstreamer
-	mozconfig_use_enable system-sqlite
-	# Feature is know to cause problems on hardened
-	mozconfig_use_enable jit methodjit
-	mozconfig_use_enable jit tracejit
-
-	# 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
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		# Firefox tries to use dri stuff when it's run, see bug 380283
-		shopt -s nullglob
-		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-		if test -n "${cards}"; then
-			# FOSS drivers are fine
-			addpredict "${cards}"
-		else
-			cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
-			if test -n "${cards}"; then
-				# Binary drivers seem to cause access violations anyway, so
-				# let's use indirect rendering so that the device files aren't
-				# touched at all. See bug 394715.
-				export LIBGL_ALWAYS_INDIRECT=1
-			fi
-		fi
-		shopt -u nullglob
-
-		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}"
-
-	# Without methodjit and tracejit there's no conflict with PaX
-	if use jit; then
-		# Pax mark xpcshell for hardened support, only used for startupcache creation.
-		pax-mark m "${S}/${obj_dir}"/dist/bin/xpcshell
-	fi
-
-	# Add our default prefs for firefox
-	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
-		"${S}/${obj_dir}/dist/bin/defaults/preferences/all-gentoo.js" || die
-
-	if ! use libnotify; then
-		echo "pref(\"browser.download.manager.showAlertOnComplete\", false);" \
-			>> "${S}/${obj_dir}/dist/bin/defaults/preferences/all-gentoo.js" || die
-	fi
-
-	echo "pref("extensions.autoDisableScopes", 3);" >> \
-		"${S}/${obj_dir}/dist/bin/defaults/preferences/all-gentoo.js" || die
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local size sizes icon_path icon name
-	if use bindist; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/aurora"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="aurora"
-		name="Aurora"
-	else
-		sizes="16 22 24 32 256"
-		icon_path="${S}/browser/branding/official"
-		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
-
-	# Without methodjit and tracejit there's no conflict with PaX
-	if use jit; then
-		# Required in order to use plugins and even run firefox on hardened.
-		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin}
-	fi
-
-	# Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash
-	# continue to work as expected.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
-
-	# Plugins dir
-	share_plugins_dir
-
-	if use minimal; then
-		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} || \
-			die "Failed to remove sdk and headers"
-	fi
-
-	# 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/firefox-18.0_beta6.ebuild b/www-client/firefox/firefox-18.0_beta6.ebuild
index 87598be..e6f2db4 100644
--- a/www-client/firefox/firefox-18.0_beta6.ebuild
+++ b/www-client/firefox/firefox-18.0_beta6.ebuild
@@ -25,7 +25,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then
 fi
 
 # Patch version
-PATCH="${PN}-18.0-patches-0.4"
+PATCH="${PN}-18.0-patches-0.5"
 # Upstream ftp release URI that's used by mozlinguas.eclass
 # We don't use the http mirror because it deletes old tarballs.
 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"