Bump to 3.0.12, also fix deps for noscript pkgmove

Package-Manager: portage-2.2_rc33/cvs/Linux i686

6 files changed, 251 insertions, 12 deletions

diff --git a/www-client/mozilla-firefox-bin/ChangeLog b/www-client/mozilla-firefox-bin/ChangeLog
index e9b63b696985..a9d0d229f9bf 100644
--- a/www-client/mozilla-firefox-bin/ChangeLog
+++ b/www-client/mozilla-firefox-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/mozilla-firefox-bin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.198 2009/07/20 13:36:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.199 2009/07/22 09:37:11 nirbheek Exp $
+
+*mozilla-firefox-bin-3.0.12 (22 Jul 2009)
+
+  22 Jul 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  mozilla-firefox-bin-2.0.0.19.ebuild, mozilla-firefox-bin-3.0.11.ebuild,
+  +mozilla-firefox-bin-3.0.12.ebuild, mozilla-firefox-bin-3.5.1.ebuild:
+  Bump to 3.0.12, also fix deps for noscript pkgmove
 
 *mozilla-firefox-bin-3.5.1 (20 Jul 2009)
 
diff --git a/www-client/mozilla-firefox-bin/Manifest b/www-client/mozilla-firefox-bin/Manifest
index e9174fdedfef..26f3399fe890 100644
--- a/www-client/mozilla-firefox-bin/Manifest
+++ b/www-client/mozilla-firefox-bin/Manifest
@@ -4,6 +4,7 @@ AUX icon/mozilla-firefox-bin-icon.png 3979 RMD160 7d8f39974e9853dcdd4af05142c9b5
 AUX icon/mozilla-firefox-bin.desktop 202 RMD160 2aa2a5777008a86254afc8a754ccc9e749da35e3 SHA1 33d467532af84b7f5e4423142ada3c1cff76c8c4 SHA256 f3cffa449451641504c55c588a3195236305912d4ce0ddf92193b33ec1133c97
 DIST firefox-2.0.0.19.tar.gz 9711461 RMD160 d6c56000f343fd5aadaf2807c46398710572f9eb SHA1 a0aa99f5e29eb442bd81751e4aaad3920eeae6f1 SHA256 7c998fb612b567ec39e835c904811120e49c3052f127b8db285d6cb86e5b2d0f
 DIST firefox-3.0.11.tar.bz2 9139789 RMD160 e77ffa0a25372201faccfc7b5799f09e56a40547 SHA1 c1e8d71f7ea3c61b0faf7952943414fdc9016700 SHA256 ee95095b6bb24ab9729535d898e1e03f6d264e593327f122deea59aa45c96b54
+DIST firefox-3.0.12.tar.bz2 9158222 RMD160 b513c04fcd6d35538cd1d8dbb9a4133ce037ed31 SHA1 c06ecd37a7f4a229abb9888348022616995a6537 SHA256 d1fe3f4a0b29fac1872ebfa078866e2e04b3621651328f6f5bc98696cbdee73d
 DIST firefox-3.5.1.tar.bz2 9876366 RMD160 d11e3672c4f1a9fdad8701a96427f8248f8d78c8 SHA1 bc29eb5881e591c4980b3b6ea86fb22279805271 SHA256 44e9b8b54866ed3ea40f1915b6054efa85aa3ac9403a3c20aba84f823de3b7a1
 DIST mozilla-firefox-2.0.0.19-af.xpi 148040 RMD160 a5dc085836fb39cd56ac30b61483365add5593c5 SHA1 4cf019880bf9161ff01d636c0806e2cac964e6f6 SHA256 11030463e11b40a17f64f60627eaa4ebaad88c2b4d840843a794def35485ec7f
 DIST mozilla-firefox-2.0.0.19-ar.xpi 159734 RMD160 b55f8f12fefa60cb8fd9893b1fbf26baf20c8675 SHA1 8140476b0a48adb3c1185376a19226c1102234ab SHA256 42d7703fcd8253f40a338d2b2bca117e6b14b4c0f49cae86cff9bd892d35c14e
@@ -110,6 +111,67 @@ DIST mozilla-firefox-3.0.11-tr.xpi 118571 RMD160 f4fe881bb7ead205633a5dd34614160
 DIST mozilla-firefox-3.0.11-uk.xpi 137213 RMD160 b4944d5ed78cc7228f74a008af6209746c6be202 SHA1 f9de361f61952ee8dce2c8bc1f78ae7211cf9d47 SHA256 b020791ee28aec28813b0b496b627faa967b2fc49cdc4624d79ca7fc3fb5715b
 DIST mozilla-firefox-3.0.11-zh-CN.xpi 108880 RMD160 0735149d508f7ade2b0cc6598199f48f6d5dbeae SHA1 998018b22f784318a053030b5894406eaa8c8b99 SHA256 b436454bea0bd21135e643027b068fb75319426e94d2d93239c5c492b1f002f2
 DIST mozilla-firefox-3.0.11-zh-TW.xpi 121796 RMD160 d67498f2bb268faea46b71b5ca769b1c389803de SHA1 c38f433c19fe004efa10b2bd913bc24076aba9e7 SHA256 c856330e481b6d27dc4e3269d80f0a4280de14191706f00c7511e1cc2c047fa8
+DIST mozilla-firefox-3.0.12-af.xpi 120104 RMD160 c0d719bd7232d19a64d625b463cfc0b79ed89468 SHA1 1eac4836d4c2f84afd748f17e920c2dd2465b265 SHA256 148a9dcb85c0cc22a95caccd9b210d0fcdc8e2c1d10841269ab805425370cf29
+DIST mozilla-firefox-3.0.12-ar.xpi 128305 RMD160 8f469de1f29b47dd76539e4867d3261f5829bd36 SHA1 921a1edc27af85846befbd5c17a07328ebdd123f SHA256 b55e603ddd1f4595fa1aecb7868cf2673c50d6e85aad6f77803f212879272722
+DIST mozilla-firefox-3.0.12-be.xpi 123305 RMD160 27f55cd84e968f6439a3c60f54467fcdab6176c7 SHA1 392dbfcda4938dd9dec2599ba1a9fbcdd54a45a7 SHA256 c74b7c95129b1021e00d945f00f3a946dad84ac526449070a54d1efb24d3f2b8
+DIST mozilla-firefox-3.0.12-bg.xpi 131985 RMD160 3f8067a3fbc0f85ef777b532cd41ee41e988460b SHA1 14f36b76548b38ab4ab8f76c4920b6b19eb8d931 SHA256 0cf62a343ca10f1f8ebd9cf5986f62f06a27e5f6f5edfe8bd7ed4852af83e5ae
+DIST mozilla-firefox-3.0.12-bn-IN.xpi 153871 RMD160 59f2d87fcef896c41df50b86e9eae1f73a69782a SHA1 3e53495f0e84fbb759dc565ae93acbd496ba07db SHA256 86d6d9c2d0b3b56c974e3944020070b2503b6637ea1e7e1a039447c8e5f978d5
+DIST mozilla-firefox-3.0.12-ca.xpi 126873 RMD160 0044448f749ef2f73a3ca19291af56ca7b7aad4d SHA1 f9d2bd368a97639c42bd0cd46ad6672d4c9ae8b6 SHA256 03450f1e0e1d946ab2fda13636cc7a2510883af8e0ec71bf6e315a39d5cccd64
+DIST mozilla-firefox-3.0.12-cs.xpi 125633 RMD160 9c4549cd65b5ffb6c445424f4eceaed5e113bb82 SHA1 6cbf5b8fa2c71c1e02054da9c9261addeecc6e0f SHA256 2b4e5137695130d777234c85549d9dfb08e0ecc7b791ea62a479e1fe16c2067d
+DIST mozilla-firefox-3.0.12-cy.xpi 119975 RMD160 c5ff0a34bb2a6d24f29ac3d9258408cfdfb7b50b SHA1 5c59928f25b74f8e0b0ca73a2bca1aa17215b2ad SHA256 e324220f29dd4e18fa9ae99596b430d07ce8b66bbf3ab00eda8c23b8f7c5afb2
+DIST mozilla-firefox-3.0.12-da.xpi 124018 RMD160 4c5889cc43f5c53b584542478dee07e8ababd824 SHA1 eccebe4ef571344b19ebb14973fbc12a02bcd5b2 SHA256 e7b5ffa66816824638f2d1f4c2371223564d804bec752a3a3793fff97d0c6225
+DIST mozilla-firefox-3.0.12-de.xpi 128129 RMD160 52ed1d490d15cea4e30e898b2424183dc2ee8c80 SHA1 0152724f046257ac79191e430c3d83bcc5417247 SHA256 97a23c12eecfda27fb5adf4d80b2639b176a724b3198323d9337e791f9ef20a8
+DIST mozilla-firefox-3.0.12-el.xpi 133466 RMD160 a6b8026bbfe9826a9b6ee5180b34042f7c39ec6f SHA1 a78545f5c1b7883337fce07c0d10d54e074b8637 SHA256 c4b6b7d75bb7789e61e1f2e509b9d2f8fa52d580ec8d46c9038b5295ca5fc4db
+DIST mozilla-firefox-3.0.12-en-GB.xpi 117720 RMD160 31fe5a05afde7cf9c2d252a5a0d36323ad75e04d SHA1 92e8604d6fb37fb9a3ca9cfc17e867d42b212c41 SHA256 965a53ab5dec03b7237fcaa5b4109cee977be714fd47fea159d0e6933f315d6f
+DIST mozilla-firefox-3.0.12-eo.xpi 120841 RMD160 1955da65aefce639dea4520c061e4d561fd9c363 SHA1 e72fc444ee2619cced08acfa5f4e021ca8253985 SHA256 5684932d5bdd05b549c30d0a63ced63e7234a241fc90a9018bf78e84bcae861a
+DIST mozilla-firefox-3.0.12-es-AR.xpi 126851 RMD160 380c1125baa01085d8bac5527bd40085000919da SHA1 30f272e0f1746613bee70dcb1ea35d1102d831d6 SHA256 e45b58759df6f173e13acf1ed43a30eab400d0bf6e845e8d7deb733f524631af
+DIST mozilla-firefox-3.0.12-es-ES.xpi 110061 RMD160 8ae31f1936028d84f370af1f28b256ea536d80ef SHA1 c7ceb54ca9f9d36a7952694e98f61b6b392c649f SHA256 4e88b440fa614e08d0065ff29e97eacba6ee3952967f49af0d49695c949d8355
+DIST mozilla-firefox-3.0.12-et.xpi 124756 RMD160 a636b715cb20e33fa5fc6349289d5e01317a429e SHA1 6fd1ac6e160945c56926416bde47096e68eb3692 SHA256 5a0e6aff2f700ea62d62ce4939d2b1c3c75a5ce539a326732b9df51f4180a663
+DIST mozilla-firefox-3.0.12-eu.xpi 120682 RMD160 adb1307762af6cf8311df69d351aa6e11db35a44 SHA1 d444313a700e7ed8e37172e9149eeefd62a438c7 SHA256 81245b50e5c2d17b779238a04de1ee4beec8231293a7b5931f1db2b87ef10ad0
+DIST mozilla-firefox-3.0.12-fi.xpi 125214 RMD160 62d825933afe0cbc5c918df5a8f043a3e2ee325d SHA1 f0111bf55b62a97fe4955cf3d04cb58a947109a0 SHA256 471b49132a4b66570e3d6274f08e165ab32e63d9c16bd6f814450ad602bd6e65
+DIST mozilla-firefox-3.0.12-fr.xpi 128259 RMD160 3b5a709ab7512aece0fab013340a618ac4a1d665 SHA1 37ef38342101682410421cc580b159f753432d5b SHA256 16af2941421c0450fd84ab6e00cc78396404bfc3fa5a73a4da76457e16f690f8
+DIST mozilla-firefox-3.0.12-fy-NL.xpi 128087 RMD160 3ef51bec2fda79957415316f7004d1c5c034deac SHA1 bc235c2d7c71cdc4c1f17cd988b2bdcda48e7406 SHA256 17ef96400ebe7adaf1182b9ccb6e8512781d1a8a885c64cda21c4266dfebdf52
+DIST mozilla-firefox-3.0.12-ga-IE.xpi 126568 RMD160 a83b75ded1534200ab20ac9701d022acb776a583 SHA1 b44df5f6beb2fe70780eb1715f05414148f0c7c9 SHA256 42f220552069faab003fa34b611827820da244dc30c590405df1f129ea8c7636
+DIST mozilla-firefox-3.0.12-gl.xpi 123469 RMD160 07ea29e02056071e35baf63d2bba7ac5e7f85dc2 SHA1 1d823734f974b2448ebe88362e015b4b9fa28606 SHA256 ffa8dbdeae35edcca40c3d0ec2351d19f6f2b95a1c3c7c3a8f6fa858f1c08cd7
+DIST mozilla-firefox-3.0.12-gu-IN.xpi 144547 RMD160 36f57707400232c3ec0743286223bbcbc3c1e680 SHA1 0892c6308db53be92b401181339f0d7329af2af7 SHA256 a7a59ebf0fce43288b5afe74facaf03681b084111e48f5f8e94d6c036ac41bf2
+DIST mozilla-firefox-3.0.12-he.xpi 120791 RMD160 4fe5738266a134510cd459c642f3194cdb374eab SHA1 c4d29d2d6b9e2fd1179507842099aad7a8f5ced4 SHA256 4ca3e96c83aa14d4c97ecb695651bcc80324ed039e06e741c927992415cad0f5
+DIST mozilla-firefox-3.0.12-hi-IN.xpi 139880 RMD160 f2fe0e5233d585c7f77bf2198c41f93b214a412d SHA1 da21b505c57424064163b0d722890ddfea37ad27 SHA256 93092437f05e6d43f96a54a50890f26e4901334b85fbb2054422f25543c1b870
+DIST mozilla-firefox-3.0.12-hu.xpi 129481 RMD160 54c3153fc637dd4d413a2eb3f5b4c8ae1de6a051 SHA1 c0f357ccb561e96b56d3cfc827f45de4ed74b330 SHA256 2a277e35bb86bbf51fb5fb19362e0fbedae6b707b1912325e0c87504fbc07374
+DIST mozilla-firefox-3.0.12-id.xpi 104500 RMD160 48fe06424ee930191be7ca348f4f914abcac8aa1 SHA1 08b6673e244da06618875d226223c881c39e91e9 SHA256 bc221535d5e913e9de12742203818cee572c315c22c56beac0ef0de941113c05
+DIST mozilla-firefox-3.0.12-is.xpi 121505 RMD160 6876fb79bd677718c567212889d462db4ecd43c8 SHA1 c6880d758cfff41477471febac93ffcf4793241d SHA256 03e4319daf8305833e5377a9b58fe2c29d505c09b5ff60c6bc5b4a25cb30802d
+DIST mozilla-firefox-3.0.12-it.xpi 108743 RMD160 94c59dee76aaa33989610472d5de9d3a42a7d294 SHA1 e7cf5495498d298e90bb1ee1d491648e63e5ad73 SHA256 49ab2fcab1188123c45a084ae15ad13d5e9a3c5cb2d068db06c237742e3673bc
+DIST mozilla-firefox-3.0.12-ja.xpi 134710 RMD160 e3a4bb43c1a893c93dd26ece5f009363df7ffc51 SHA1 6d0b4ba73419f7891ef42ff9bdc36575d7495270 SHA256 01034a537c549dc0f010151caba216ad3b0d7cc9a1903d447efd3b8ec215cf6f
+DIST mozilla-firefox-3.0.12-ka.xpi 150932 RMD160 06fc72f163e9ca6eab6ded3eca380cab34936f75 SHA1 cd21bc4717b29c7a103cb9b1aa3e89ed4b53dd05 SHA256 218e6b852df835f1feffc4ce0f657399d531f980d1547af2020259742b9beecd
+DIST mozilla-firefox-3.0.12-kn.xpi 147596 RMD160 4139ac98a85e3b1d6105644212d86292b2db4b3e SHA1 c546e95e4c82a1ff463ea12eeb4b582198bb4d72 SHA256 14fade8b80d2f180c5e4d61445fefd58833907fda2c2601f700d3aad0e7fb00b
+DIST mozilla-firefox-3.0.12-ko.xpi 113225 RMD160 70cef7c1296304824a3e7f7b63d738b7b3ca79bc SHA1 53dbf88a85164174cab1a3e1710e9cf3d5ebbd7b SHA256 b0cc37e571f84a7c1bb277f4890ef3b7e4a58d792f4acb00a1ce705df0b07a3b
+DIST mozilla-firefox-3.0.12-ku.xpi 126775 RMD160 7fff6edfcb243fcf23b5d39356afd2e8151e61d5 SHA1 9fa94999944822d1a4914997559a82fab8bfd384 SHA256 5c766247aced0775b904babdf62425fc7c61efc97a640cf3b5f9765e0664904c
+DIST mozilla-firefox-3.0.12-lt.xpi 137577 RMD160 a5ab8e26362d869869e3da2927cb0fe76a9a0a93 SHA1 ec98198bdc64ed9d59739bb4e44c20b3f28a925b SHA256 1cd43b2822c1ab3beba451016ea9c95197488fd07a8030cbaff626aa4d7be9d1
+DIST mozilla-firefox-3.0.12-lv.xpi 123269 RMD160 a5348135579f6e7b26e0df404f8fcb1519526219 SHA1 0590dd7ca374b3d3ac8a2bf535104dcb66db012b SHA256 41908ed23f8496d507df7e928640350364354b5f5968f2cb98b93ea68fbe5aa1
+DIST mozilla-firefox-3.0.12-mk.xpi 124830 RMD160 2166f3806207758bf9319d877430e88af41832c3 SHA1 cd381299689debfc36590bb617db2970e7fc5879 SHA256 b6c7036be946a01ebca7b50e0840bb8704b3f0285ae0e3807e6cc255ae4ea5bc
+DIST mozilla-firefox-3.0.12-mn.xpi 131348 RMD160 40223067f1e90713779b886b62f83b0fa9c7f80e SHA1 303728459ce0e3c96684375848a86133d1d2976b SHA256 cd64d0247ed9c3c3d31519e9f4731585259d4e945f432588d346ec90b974f024
+DIST mozilla-firefox-3.0.12-mr.xpi 137022 RMD160 0f6f657c946216c9895b972fe4c82b35b92e2a7f SHA1 60064e5f67b9d1f73a844e2d24edd0ca83887c3f SHA256 fd9e76969b9b0b2b573457ec7d319725d8c2cad6d23e157450e47d2acdb5b0be
+DIST mozilla-firefox-3.0.12-nb-NO.xpi 123333 RMD160 a3b0a33dce1944326687e847e88333f0d781295a SHA1 0f7c03c7f1922c972807529bfe3f0b6fbd3be7a4 SHA256 f1d8558de2419b4b1c0f82a8b5acf24cd496db5399b892395fe07fc3c20a7ad0
+DIST mozilla-firefox-3.0.12-nl.xpi 125552 RMD160 b4220b81ae644d1545576118c66c2b2e1c6b472d SHA1 8b51a19464c090ce9e25c67d15f7354b6b5eb930 SHA256 57ae0832f40bfc4dbea763e01238df82ac2bd1875c5c9bc0a4947893d8d50954
+DIST mozilla-firefox-3.0.12-nn-NO.xpi 125041 RMD160 966fc9da439d809ef4585be655caf18ba09e1044 SHA1 6b4dce2dbc6a2c511b3e04cbbd794537e78b575b SHA256 9e681c6a7bf8713f65be77ffa7dc5c830ba829125e4fb61e1f9874456bdf4513
+DIST mozilla-firefox-3.0.12-oc.xpi 104729 RMD160 7be31377ee1549772be080bee3a57dd06ef1434d SHA1 2ecddb2030e8d341ec6aa00ce78ba1c9c5a7d944 SHA256 4e02ec68671e29a6987db48e18a13b122f442914ef778ec94b66ec1574d0f48a
+DIST mozilla-firefox-3.0.12-pa-IN.xpi 141249 RMD160 29026aa7f617fb3bea483fc61cd8b99deca1c7de SHA1 86f224de6bc0ef2e83855ecdec6b4cc165736d22 SHA256 1e2c58bd8fc21f18a14563580d44b41f88c6dea4a2370a4b2feecefc8ba016ee
+DIST mozilla-firefox-3.0.12-pl.xpi 130958 RMD160 b527a36933222d042673fdf6682d558f2645bc1c SHA1 a7d0693103f65dcbca3e2425bb8762a47f847f35 SHA256 acd4ef661198f13ae9fe0d5b72b303f99ce75362458e7a26fc25c9936fbb7908
+DIST mozilla-firefox-3.0.12-pt-BR.xpi 123885 RMD160 cdbd5c20e88b6cfab851f50dcb714ba72794304a SHA1 210cf3afec1f1931c93d3e953cd694be30a69c1a SHA256 2ecd678194b6b9bdbf83c6469e645ae08c87910c61f03831661360b014ed2ee8
+DIST mozilla-firefox-3.0.12-pt-PT.xpi 123080 RMD160 bc2329b01e31744f35a8b78b3238dd56d542fd3b SHA1 230e306f682fe642a060d94d005c12b0278bb85e SHA256 309d6f501736824d58fc48b97ca5ea477e44c026fc308ea4586f464b7431b6dd
+DIST mozilla-firefox-3.0.12-ro.xpi 127874 RMD160 cc62bb2b0bcdc928c9367206f4b1fae734e1a6f5 SHA1 2dfa7b776fcb88cff5d8ccfc342bd4c417e569df SHA256 88c40f52f740d5cfba633c4ff27f727ca9b8d1e137baeca2f6d17d0ffeeedf08
+DIST mozilla-firefox-3.0.12-ru.xpi 126466 RMD160 09a2345b085012a22f210e042fcaaffae0aab2b4 SHA1 c7d9ebb332bc0e27daccd2cc53ec447bfcef6188 SHA256 754c332363a9b7382a7f7085ff1ceb7caa0463ca55bfb2eda524e4bb2f8dc6cb
+DIST mozilla-firefox-3.0.12-si.xpi 139733 RMD160 fd879224d6b430a05d06128610af3a66137ef082 SHA1 d8c5e1d3f96bc5d0faf8ed1d548e50e9b342bcc8 SHA256 d49621cb774684183ad31b09e2a1f3cb6d424f04b649cfde71cfe826183c2f49
+DIST mozilla-firefox-3.0.12-sk.xpi 129263 RMD160 20333475f18dada3045fa9566d951f177db73011 SHA1 a9e76b19b1729517ded12444f7299cd627fdfb14 SHA256 cbb55fbc1b35cd362f6cae2ceacfbbc2860fedafc0ef4e8f5937d1e76cdc572c
+DIST mozilla-firefox-3.0.12-sl.xpi 122199 RMD160 d063163defa12932684560234472541d16c6c11f SHA1 bdd70fb232012ec2273da92f7936c4e9c5ffb60e SHA256 5748f26b2bde2ac33a0b38b46a2f555f2c611db9f6112517ae4b360ec9e2434c
+DIST mozilla-firefox-3.0.12-sq.xpi 120810 RMD160 90b85c0c6a7089f4eab49c8e134642228d309941 SHA1 ea5d067ac06414b19582cd44901df8b83930392b SHA256 79312dfbcf127ca0afdb62d6e0adb9605acd9aeadbb26f6d251cf19f13e1bd36
+DIST mozilla-firefox-3.0.12-sr.xpi 134774 RMD160 9bd7061683ea8af56c4adc136043dcffb42998f3 SHA1 70f2f9b91e38227d46417dbb1b5a520081971d32 SHA256 d0887f24fcd4253136ec0a8329abf7ff907a4319ba94230f7f01157d84eb4553
+DIST mozilla-firefox-3.0.12-sv-SE.xpi 127910 RMD160 bd95d570387aaeb938ae4c492a03a9624bcab2cb SHA1 93d0c0419b310d694fb0b471aada7d92f82d168f SHA256 6fedd0d839b5a3045d0785b48028411133e0bee343ba6a03e0d747c75ca875bf
+DIST mozilla-firefox-3.0.12-te.xpi 145174 RMD160 5baf276003c2fd10670b6f0bace51996b87dc6c3 SHA1 12bc9582f118776a16e9c5cbbcd9a5a703d6ab0a SHA256 7787bcf1d1779c797ab9672c9966b2c150b8fe05e01fa8fd5a7fe9a2f699e35e
+DIST mozilla-firefox-3.0.12-th.xpi 130719 RMD160 972161425e9246aec9e9bf813d83f6e055b151e2 SHA1 d04f1ca3cd5b7d1568c214b6394c66589de3490f SHA256 4eddd36768aea2dc52d09887e58e83645328f930ac0fce2facfeee7e91ca3635
+DIST mozilla-firefox-3.0.12-tr.xpi 118571 RMD160 5160d588990165d02b83a227bd32bc748cbc2aa3 SHA1 b832de2126661156fa52a974e5ba3a61bbed4a79 SHA256 56428d460dc1918e2c102dc02c01e73a0c872fc6561c8b1e4606063f32bcb575
+DIST mozilla-firefox-3.0.12-uk.xpi 137212 RMD160 c228477fdca94c31a92b2d6ce6eb90958723113c SHA1 5300f508aa95af7bafd33decb06db3b53c7d1095 SHA256 201cb379309c071637fc3b3a50ce415d6ed568b2f1020b77210516d60ad84906
+DIST mozilla-firefox-3.0.12-zh-CN.xpi 108880 RMD160 b2c5c4a78348a86cae4369800010fe07a2fbe563 SHA1 bf11de117c4b6d6b37894739c0803b9a85c96868 SHA256 299da40fd9a103e510266504de9f8b167c3d257abd3e278924d43f62250c0310
+DIST mozilla-firefox-3.0.12-zh-TW.xpi 121797 RMD160 5d08ff3c70dc1041a48e3476c4d6dd944af96f59 SHA1 87cfdba6be009dd2e9f2aabf33e82ec4e2b4291f SHA256 d5129b93d69b801051b7d810c0752f60986ed2553c5dea3db3deb4f3abc02648
 DIST mozilla-firefox-3.5.1-af.xpi 121084 RMD160 0c568b8a79a5e66f9000d8fdb3b90e869f5822e3 SHA1 f51312ed8c2b158ad19e32b6f2af8d85527bb279 SHA256 4705a8d73edb171327c2a408b305a468c92bb05552a44206da532b0a9f87e22b
 DIST mozilla-firefox-3.5.1-ar.xpi 131414 RMD160 36891bd3223ede3f20c6e9a0faf7d5ac7cb536dd SHA1 0cf41bd1d1781a14cf65583bb2fe7a5b317256a1 SHA256 4beef7c6a0fa2a83892a8729fd92cdc62432911be752c04e22880052f5550151
 DIST mozilla-firefox-3.5.1-be.xpi 122135 RMD160 090c3801f64d1c9b072cda21b03236212ef38a22 SHA1 ba25afd0f589bb22cd0827bae6ac45b96466cda0 SHA256 42449afecc26d281179956bf92eec0139dada8323410fb3a033f7190d3ccc5a6
@@ -173,8 +235,9 @@ DIST mozilla-firefox-3.5.1-uk.xpi 141267 RMD160 29d31ca4b08c2f2e1853a9e2ab038dab
 DIST mozilla-firefox-3.5.1-vi.xpi 128610 RMD160 cfbe881573b9ceda10a92a81571b25b89c5a8661 SHA1 1cdcb2978b4f22c486a269840a24c9d8ad4e3349 SHA256 b8916387533ae86313558077061f6e03396d25de4e016a5e70870158c591b07d
 DIST mozilla-firefox-3.5.1-zh-CN.xpi 126370 RMD160 52d21f2830e2551d95eb0f218a6f049ece531587 SHA1 4cd4aaf2acafc0a63d935eb1b7778e7e63b035b7 SHA256 9eeb510bedf7bcc14da22d1482e416766243b49883151193b01374450b5bc6c6
 DIST mozilla-firefox-3.5.1-zh-TW.xpi 127832 RMD160 3cb1e8aef6f6442e246470d604c087998083110c SHA1 8db4fb19408c140012d01827026180667b84a468 SHA256 aa575e4b6ff7d9c8fdb9776a27643452b5a5b67d039fe8d7cdbd76793d193080
-EBUILD mozilla-firefox-bin-2.0.0.19.ebuild 4701 RMD160 6b173d28048981bfffee808332e492b565b62eea SHA1 777a7fc78f4ef999319ab6973e5aef99557152cf SHA256 baad50d084db89a6585437e3332df96c57e3c1cbecef6a491171bc09e777a887
-EBUILD mozilla-firefox-bin-3.0.11.ebuild 4872 RMD160 f2e46d8c72e0e8808c7b05c320ff6b32eac642f6 SHA1 3d7fb5f8f1f40910331921c0bf0f85c239531cc7 SHA256 06d4f7cbdd5216326ab2b3ecaed119a57c3784eb52f5fc409162d8e6afbd8243
-EBUILD mozilla-firefox-bin-3.5.1.ebuild 5201 RMD160 3e2986cbcd6f66273b127813e80c03df0ed265ed SHA1 8d723c893e65e8b0ef77eb81d1110acb27534a65 SHA256 a8b056b4b9199dc83bdd718cbf41e6214d311e2f8da19f5efb4ba513d56b82b1
-MISC ChangeLog 36912 RMD160 51ccfa020f3504a584053de1fb8b31085046b0f7 SHA1 13b35debb716af46c70cb3b12d02e9f03b80896d SHA256 90e181bb8b30d8f588d66a6f3ccfcb697b5c3c311c983399db948a06cfb6505d
+EBUILD mozilla-firefox-bin-2.0.0.19.ebuild 4703 RMD160 f00c39a8fe32d9e159df19ddf965cf2f414eb0bd SHA1 2f0dbad82df773a03444800d86a6023d8fa47ccb SHA256 263ec7671204d05f8314cf2ed25cebe12b3eaa40c6247a736096db64d446fd57
+EBUILD mozilla-firefox-bin-3.0.11.ebuild 4874 RMD160 37938b5a505504688f4abca5b7684c598abab9cf SHA1 18e126625a690fdbc0506492dca639475432658d SHA256 6c520fcca2d5366ca57c9dad52cd5e4b507c44cdca6bfb27604bc473e1ee8bad
+EBUILD mozilla-firefox-bin-3.0.12.ebuild 4876 RMD160 f8b10ec714711b9158c489f32f7e79872a89cde5 SHA1 54ecaf6e7d7f72ade436019b79b8821c769d042a SHA256 5efed062f2de1c39f5c11c87b766deea1ed04760e08e12fb975520db12622a26
+EBUILD mozilla-firefox-bin-3.5.1.ebuild 5202 RMD160 1b094508d1b4969d162cc70303f2b8ab817239b6 SHA1 89fe9a99d8ff9838fb24f4ee5f6ba9546b861853 SHA256 48105ea14a25c371f8293ce32142139adc29925341835ebeb512cee5ed520b51
+MISC ChangeLog 37210 RMD160 15ca21179b13b2f54818044805e531666489bbe8 SHA1 2ee4cdfc11728df770cfc2a483b3bf049c6cda72 SHA256 4e93e0cb57529c503bf16d212a2545711419bd38c684cb7ed14864b1c1ea0032
 MISC metadata.xml 361 RMD160 875569d22de792136757a0f5885f7fdd11b40691 SHA1 ef5fecfad87eceaeb1b4af3bbfa4bacebf714277 SHA256 adcb3648206e341af38e084574e9e4851e4e51ffa7356bbeaf205e3e16553d3b
diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.19.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.19.ebuild
index 2b0866414a53..218e5f3c6f22 100644
--- a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.19.ebuild
+++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.19.ebuild,v 1.2 2008/12/20 21:13:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.19.ebuild,v 1.3 2009/07/22 09:37:11 nirbheek Exp $
 
 inherit eutils mozilla-launcher multilib mozextension
 
@@ -51,7 +51,7 @@ RDEPEND="x11-libs/libXrender
 	)
 	>=www-client/mozilla-launcher-1.41"
 
-PDEPEND="restrict-javascript? ( x11-plugins/noscript )"
+PDEPEND="restrict-javascript? ( www-plugins/noscript )"
 
 S="${WORKDIR}/firefox"
 
diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.11.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.11.ebuild
index ba07ee4234fb..632f46aa0148 100644
--- a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.11.ebuild
+++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.11.ebuild,v 1.3 2009/07/01 20:19:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.11.ebuild,v 1.4 2009/07/22 09:37:11 nirbheek Exp $
 EAPI="2"
 
 inherit eutils mozilla-launcher multilib mozextension
@@ -48,7 +48,7 @@ RDEPEND="x11-libs/libXrender
 		app-emulation/emul-linux-x86-compat
 	)"
 
-PDEPEND="restrict-javascript? ( x11-plugins/noscript )"
+PDEPEND="restrict-javascript? ( www-plugins/noscript )"
 
 S="${WORKDIR}/firefox"
 
diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.12.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.12.ebuild
new file mode 100644
index 000000000000..db797f122268
--- /dev/null
+++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.12.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.12.ebuild,v 1.1 2009/07/22 09:37:11 nirbheek Exp $
+EAPI="2"
+
+inherit eutils mozilla-launcher multilib mozextension
+
+LANGS="af ar be bg bn-IN ca cs cy da de el en-GB en-US eo es-AR es-ES et eu fi fr fy-NL ga-IE gl gu-IN he hi-IN hu id is it ja ka kn ko ku lt lv mk mn mr nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT ro ru si sk sl sq sr sv-SE te th tr uk zh-CN zh-TW"
+NOSHORTLANGS="en-GB es-AR pt-BR zh-CN"
+
+DESCRIPTION="Firefox Web Browser"
+REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/"
+SRC_URI="${REL_URI}/${PV}/linux-i686/en-US/firefox-${PV}.tar.bz2"
+HOMEPAGE="http://www.mozilla.com/firefox"
+RESTRICT="strip"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="restrict-javascript"
+
+for X in ${LANGS} ; do
+	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
+		SRC_URI="${SRC_URI}
+			linguas_${X/-/_}? ( ${REL_URI}/${PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )"
+	fi
+	IUSE="${IUSE} linguas_${X/-/_}"
+	# english is handled internally
+	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
+		if [ "${X}" != "en-US" ]; then
+			SRC_URI="${SRC_URI}
+				linguas_${X%%-*}? ( ${REL_URI}/${PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )"
+		fi
+		IUSE="${IUSE} linguas_${X%%-*}"
+	fi
+done
+
+DEPEND="app-arch/unzip"
+RDEPEND="x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXmu
+	x86? (
+		>=x11-libs/gtk+-2.2
+	)
+	amd64? (
+		>=app-emulation/emul-linux-x86-baselibs-1.0
+		>=app-emulation/emul-linux-x86-gtklibs-1.0
+		app-emulation/emul-linux-x86-compat
+	)"
+
+PDEPEND="restrict-javascript? ( www-plugins/noscript )"
+
+S="${WORKDIR}/firefox"
+
+pkg_setup() {
+	# This is a binary x86 package => ABI=x86
+	# Please keep this in future versions
+	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
+	has_multilib_profile && ABI="x86"
+}
+
+linguas() {
+	local LANG SLANG
+	for LANG in ${LINGUAS}; do
+		if has ${LANG} en en_US; then
+			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
+			continue
+		elif has ${LANG} ${LANGS//-/_}; then
+			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
+			continue
+		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
+			for X in ${LANGS}; do
+				if [[ "${X}" == "${LANG}-"* ]] && \
+					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
+					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
+					continue 2
+				fi
+			done
+		fi
+		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
+	done
+}
+
+src_unpack() {
+	unpack firefox-${PV}.tar.bz2
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_unpack "${P/-bin/}-${X}.xpi"
+	done
+	if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
+		einfo "Selected language packs (first will be default): ${linguas}"
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/firefox
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png
+	domenu "${FILESDIR}"/icon/${PN}.desktop
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P/-bin/}-${X}"
+	done
+
+	local LANG=${linguas%% *}
+	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
+		elog "Setting default locale to ${LANG}"
+		dosed -e "s:general.useragent.locale\", \"en-US\":general.useragent.locale\", \"${LANG}\":" \
+			"${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js \
+			"${MOZILLA_FIVE_HOME}"/defaults/pref/firefox-l10n.js || \
+			die "sed failed to change locale"
+	fi
+
+		# Create /usr/bin/firefox-bin
+		dodir /usr/bin/
+		cat <<EOF >"${D}"/usr/bin/firefox-bin
+#!/bin/sh
+unset LD_PRELOAD
+exec /opt/firefox/firefox "\$@"
+EOF
+		fperms 0755 /usr/bin/firefox-bin
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10firefox-bin
+
+	# install ldpath env.d
+	doenvd "${FILESDIR}"/71firefox-bin
+
+	rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins
+	dosym /usr/"$(get_libdir)"/nsbrowser/plugins ${MOZILLA_FIVE_HOME}/plugins
+}
+
+pkg_postinst() {
+	if use x86; then
+		if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+			|| ! has_version 'net-misc/curl'; then
+			einfo
+			einfo "For using the crashreporter, you need gnome-base/gconf,"
+			einfo "gnome-base/orbit and net-misc/curl emerged."
+			einfo
+		fi
+		if has_version 'net-misc/curl' && built_with_use --missing \
+			true 'net-misc/curl' nss; then
+			einfo
+			einfo "Crashreporter won't be able to send reports"
+			einfo "if you have curl emerged with the nss USE-flag"
+			einfo
+		fi
+	else
+		einfo
+		einfo "NB: You just installed a 32-bit firefox"
+		einfo
+		einfo "Crashreporter won't work on amd64"
+		einfo
+	fi
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	update_mozilla_launcher_symlinks
+}
diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.5.1.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.5.1.ebuild
index 62c8e073a674..52297f4dbde4 100644
--- a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.5.1.ebuild
+++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.5.1.ebuild,v 1.1 2009/07/20 13:36:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.5.1.ebuild,v 1.2 2009/07/22 09:37:11 nirbheek Exp $
 EAPI="2"
 
 inherit eutils mozilla-launcher multilib mozextension
@@ -54,7 +54,7 @@ RDEPEND="dev-libs/dbus-glib
 		app-emulation/emul-linux-x86-compat
 	)"
 
-PDEPEND="restrict-javascript? ( x11-plugins/noscript )"
+PDEPEND="restrict-javascript? ( www-plugins/noscript )"
 
 S="${WORKDIR}/firefox"