Version bump wrt security #187205

(Portage version: 2.1.3_rc9)

3 files changed, 283 insertions, 1 deletions

diff --git a/www-client/mozilla-firefox-bin/ChangeLog b/www-client/mozilla-firefox-bin/ChangeLog
index 66f0660d1d2d..158804d1a3be 100644
--- a/www-client/mozilla-firefox-bin/ChangeLog
+++ b/www-client/mozilla-firefox-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/mozilla-firefox-bin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.97 2007/07/28 18:18:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.98 2007/07/31 13:14:30 armin76 Exp $
+
+*mozilla-firefox-bin-2.0.0.6 (31 Jul 2007)
+
+  31 Jul 2007; Raúl Porcel <armin76@gentoo.org>
+  +mozilla-firefox-bin-2.0.0.6.ebuild:
+  Version bump wrt security #187205
 
   28 Jul 2007; Raúl Porcel <armin76@gentoo.org>
   -mozilla-firefox-bin-2.0.0.4.ebuild:
diff --git a/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-2.0.0.6 b/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-2.0.0.6
new file mode 100644
index 000000000000..01a4a4083fa5
--- /dev/null
+++ b/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-2.0.0.6
@@ -0,0 +1,132 @@
+MD5 803561a2bc199e71fcbf645b7c6a30a5 firefox-2.0.0.6.tar.gz 9671806
+RMD160 8cad47d2fa04098762a215c14fbc1f91364b2f0c firefox-2.0.0.6.tar.gz 9671806
+SHA256 8bfd8b8f4b73a16e2ffe6bb52cc353b25c5614d05cb2d6989dbf131a0fc4efbb firefox-2.0.0.6.tar.gz 9671806
+MD5 0120f40b044c596e10045a3cb04634b1 mozilla-firefox-2.0.0.6-af.xpi 148044
+RMD160 cccae64509b0a4c18524d5abf87a836b69b6b5a7 mozilla-firefox-2.0.0.6-af.xpi 148044
+SHA256 a54ccf62ab029c03228612a1a060d593a8a5c150e231e81d351af5ad38b8e902 mozilla-firefox-2.0.0.6-af.xpi 148044
+MD5 49420d70f1ab8724455e0335d6254d23 mozilla-firefox-2.0.0.6-ar.xpi 159726
+RMD160 995b1c2aedcf41c97616e31ab89548f21d6fd321 mozilla-firefox-2.0.0.6-ar.xpi 159726
+SHA256 195968aabed8ab66718ece1e6caa7342050642355f9953d04798e35375614914 mozilla-firefox-2.0.0.6-ar.xpi 159726
+MD5 24b2a76e9fe2a279897490fd3e881adf mozilla-firefox-2.0.0.6-be.xpi 161164
+RMD160 4e09a00f56fdb22f4d07637de0efc0ac8be72c4d mozilla-firefox-2.0.0.6-be.xpi 161164
+SHA256 bc9524d6418ea4c66ef2814eceb0b49d3e8cb796a38fc3a768bc15a43c114e01 mozilla-firefox-2.0.0.6-be.xpi 161164
+MD5 8849e55b734ee3ef660abc49f4863f90 mozilla-firefox-2.0.0.6-bg.xpi 169651
+RMD160 3a73b98108ff3701cebc52dc96742155c083c2b8 mozilla-firefox-2.0.0.6-bg.xpi 169651
+SHA256 a010d07fa60bff33f7d9de71362f3e3885c7a188406982b31dc7704539655d19 mozilla-firefox-2.0.0.6-bg.xpi 169651
+MD5 215b721691964f4879f021f484f274de mozilla-firefox-2.0.0.6-ca.xpi 170691
+RMD160 2428478d35ca285454b35e4cd72294562f0bad81 mozilla-firefox-2.0.0.6-ca.xpi 170691
+SHA256 d3fa1b29743570dbfd248d6b4136f44872b71f39657d882c43a1d9939974dae0 mozilla-firefox-2.0.0.6-ca.xpi 170691
+MD5 6b76366c718ab7766fb60ca914c0c9bf mozilla-firefox-2.0.0.6-cs.xpi 167974
+RMD160 1b8b4f90da48282b53ce70d9cc177261f373daa1 mozilla-firefox-2.0.0.6-cs.xpi 167974
+SHA256 08d6701688084e6545b9b6cfe9c33b41a8da9b920a8cab83b76791910e33186f mozilla-firefox-2.0.0.6-cs.xpi 167974
+MD5 f5d116533c61ce41f725b408fe3911ea mozilla-firefox-2.0.0.6-da.xpi 152108
+RMD160 c0089b3a1a3d853194437367e65ed69320829e91 mozilla-firefox-2.0.0.6-da.xpi 152108
+SHA256 6d78a83995e10be859f5bb6db0c0bd333e78d340a2d738f8d6ecb8484e4d9397 mozilla-firefox-2.0.0.6-da.xpi 152108
+MD5 3d0acbecf58b0cae09dbdf28ca42e136 mozilla-firefox-2.0.0.6-de.xpi 152531
+RMD160 9c535421fae85263ba0dbc0abf0e5ecc2fbf6df9 mozilla-firefox-2.0.0.6-de.xpi 152531
+SHA256 775461eff45e21b2314a1023ba691576a4dc35e53ab0ff883f851faae0dc11fa mozilla-firefox-2.0.0.6-de.xpi 152531
+MD5 d9bb8e985e0676c368eb1f390f47a634 mozilla-firefox-2.0.0.6-el.xpi 169725
+RMD160 03ebb7dab4fc13d98222ed9a6f3fedf4154c7a27 mozilla-firefox-2.0.0.6-el.xpi 169725
+SHA256 ee1347130c95298b233ea5c1c33dcb0f92b4c1eb071f1cac106bd6c118d9552e mozilla-firefox-2.0.0.6-el.xpi 169725
+MD5 78f53552ab54b93e6042e10312aa11a3 mozilla-firefox-2.0.0.6-en-GB.xpi 156165
+RMD160 98278ba2d6c747ec628763a46d081b2594390624 mozilla-firefox-2.0.0.6-en-GB.xpi 156165
+SHA256 add724be5bab421958b2df24c03df83d4afff1b2b6de4590937643e6cffd6182 mozilla-firefox-2.0.0.6-en-GB.xpi 156165
+MD5 7dbe9998180a76aff97c6ab2100e1eba mozilla-firefox-2.0.0.6-es-AR.xpi 156152
+RMD160 b82061d410372eb9b5363f4f631dc3af4b4a44ba mozilla-firefox-2.0.0.6-es-AR.xpi 156152
+SHA256 7e8c23b001b7c62d7426f8dccce87648a71faf9500cf0688b1bf8401bb8a612e mozilla-firefox-2.0.0.6-es-AR.xpi 156152
+MD5 84085a1f7414406a29e8374842a72835 mozilla-firefox-2.0.0.6-es-ES.xpi 143592
+RMD160 201a6a6f9381f21053f814443474632a0a6ea093 mozilla-firefox-2.0.0.6-es-ES.xpi 143592
+SHA256 2285ddf660712e2164117fb48d9f173e49987baaf79135771e09b31c504212f9 mozilla-firefox-2.0.0.6-es-ES.xpi 143592
+MD5 4469ae714700775b6383cc0917675c17 mozilla-firefox-2.0.0.6-eu.xpi 153658
+RMD160 0b80cf0753682a78a1dd675f8ecc0ea1e42e20fe mozilla-firefox-2.0.0.6-eu.xpi 153658
+SHA256 2ee3d5ba2b3c20bf226c91ff59cb0b587c37ead15a9fe35de9d1558c66908123 mozilla-firefox-2.0.0.6-eu.xpi 153658
+MD5 c71f216c4a9a312038df0b59d5264def mozilla-firefox-2.0.0.6-fi.xpi 155421
+RMD160 4c4d80370aea4aac2eb327ff2fe2d4f5b077af63 mozilla-firefox-2.0.0.6-fi.xpi 155421
+SHA256 c3cacf449afc839991ee1136a632b7b33bc8b351eb8dc1219a22cefb5a228bed mozilla-firefox-2.0.0.6-fi.xpi 155421
+MD5 6b276751b336852a3662894741e553bf mozilla-firefox-2.0.0.6-fr.xpi 173828
+RMD160 1a87e0e48a3896e3c4e77b90b6642c06e1463ca8 mozilla-firefox-2.0.0.6-fr.xpi 173828
+SHA256 709e2393692ed44d47f3783688890aea8fed5a9d064c7ae9313167871bca7dca mozilla-firefox-2.0.0.6-fr.xpi 173828
+MD5 91b3cdfd17f37d3565ad8c4ee071897f mozilla-firefox-2.0.0.6-fy-NL.xpi 167165
+RMD160 df3860d593e5eaf097d3393c3ef7fed351d5cca6 mozilla-firefox-2.0.0.6-fy-NL.xpi 167165
+SHA256 345231e0172915ac874df36a186bed5c9a0e714ac12b917bfbbe4ec85171a45c mozilla-firefox-2.0.0.6-fy-NL.xpi 167165
+MD5 b37c71cdb8dc4db4a4a0ca657e3cc880 mozilla-firefox-2.0.0.6-ga-IE.xpi 151754
+RMD160 0477feb53c3990eeaedc39a8ec7384af3647c13c mozilla-firefox-2.0.0.6-ga-IE.xpi 151754
+SHA256 b52194cc4b795cee13b79974a9b56caf189acc879e460389f2c31fea85476036 mozilla-firefox-2.0.0.6-ga-IE.xpi 151754
+MD5 25a9930d08464d3a2678ac733d2dd7ea mozilla-firefox-2.0.0.6-gu-IN.xpi 172672
+RMD160 4167a63bcd221a075393dbacf6c4f8e3f56c2a67 mozilla-firefox-2.0.0.6-gu-IN.xpi 172672
+SHA256 396a469f5491659532090907860785b0207cf7ffe4b57dcf3d198767ab6ce8de mozilla-firefox-2.0.0.6-gu-IN.xpi 172672
+MD5 570c21dfb790d98406f4c8661f4da576 mozilla-firefox-2.0.0.6-he.xpi 150304
+RMD160 bbc5d37400667cc498297e62c72aa0fc9ddae505 mozilla-firefox-2.0.0.6-he.xpi 150304
+SHA256 4aab83bc4a3eecb3ffa3db8819350da0c1cc70eaab0e29be8987dd16e3b530cf mozilla-firefox-2.0.0.6-he.xpi 150304
+MD5 81cbc5c0e5f0361bd41e2e3e6b629db2 mozilla-firefox-2.0.0.6-hu.xpi 163754
+RMD160 24851f6bd307a9783ae16534c9cad76aa38dc988 mozilla-firefox-2.0.0.6-hu.xpi 163754
+SHA256 9b2c4ea09c714fc66285ada5d2d716d4009b1b8f52e6bb4be14dff21190c3195 mozilla-firefox-2.0.0.6-hu.xpi 163754
+MD5 7b7fef0f9c83b65b7b625a7980aa53b5 mozilla-firefox-2.0.0.6-it.xpi 144821
+RMD160 b183d01a0d3f1ce86fc7e3ec373c7f72a752530a mozilla-firefox-2.0.0.6-it.xpi 144821
+SHA256 65fe4165ac420ba4aacddce972dfd938553d175ba30146afa5b1c3553febd51c mozilla-firefox-2.0.0.6-it.xpi 144821
+MD5 6b26474d5c603642099c582a3ae2374b mozilla-firefox-2.0.0.6-ja.xpi 163309
+RMD160 99804b3070b9f9a53d3fb7730e8d76ba163d3e24 mozilla-firefox-2.0.0.6-ja.xpi 163309
+SHA256 3ccfa948a39fbdcbd0a5186d9f30d9ccda2afd83e4b65598bc4a231bb35cb185 mozilla-firefox-2.0.0.6-ja.xpi 163309
+MD5 39d073a4fb7e689ebc86bab456d7cb3e mozilla-firefox-2.0.0.6-ka.xpi 177906
+RMD160 817893fa006ce7ffb147d3bceca4ec0afcd451dd mozilla-firefox-2.0.0.6-ka.xpi 177906
+SHA256 2fbe2f30bb741650fd4d5286e6924834e22535c4f4fc1146eb4f6630a5ea040f mozilla-firefox-2.0.0.6-ka.xpi 177906
+MD5 0ec3d776e92426e6e83a645215250169 mozilla-firefox-2.0.0.6-ko.xpi 148116
+RMD160 207a1bd6aa669090fff0f6a2bbab639bc08c18dd mozilla-firefox-2.0.0.6-ko.xpi 148116
+SHA256 fd95c96b87287e079901ccedb16cb0e0c6c5261c92cd0320b3dcda1375c80883 mozilla-firefox-2.0.0.6-ko.xpi 148116
+MD5 03b05dace7305d7c1f94d44907c1d69f mozilla-firefox-2.0.0.6-ku.xpi 153155
+RMD160 945bc41be7fe661e5385f5e94faa4387334bfb18 mozilla-firefox-2.0.0.6-ku.xpi 153155
+SHA256 eebf549ce59e94b12e092e994511cb12d6ba89012c5e9788034b4891fc8982fc mozilla-firefox-2.0.0.6-ku.xpi 153155
+MD5 e98daec4093372a55278763308f508ba mozilla-firefox-2.0.0.6-lt.xpi 164578
+RMD160 508019a5ed5a3f49b4932a1e5bf7df479a4a8633 mozilla-firefox-2.0.0.6-lt.xpi 164578
+SHA256 c80744e1ef6643d23ac1531d1971289c9a27d999f70257cad26b1f25700afa53 mozilla-firefox-2.0.0.6-lt.xpi 164578
+MD5 77761fa4975a314001dc2ddf20623605 mozilla-firefox-2.0.0.6-mk.xpi 159966
+RMD160 70e8d8d82c40e56b1d159343783b23e1d921c685 mozilla-firefox-2.0.0.6-mk.xpi 159966
+SHA256 a040ff22d8a1d3ee6ad48c685d8f7f96fc17536d27da5461c696d6162d50f8d3 mozilla-firefox-2.0.0.6-mk.xpi 159966
+MD5 e934ffa7c4caf5f131b021aff6e831c8 mozilla-firefox-2.0.0.6-mn.xpi 160148
+RMD160 fe1acdfd0d5a7a361a3fcd059e3836666bef0e07 mozilla-firefox-2.0.0.6-mn.xpi 160148
+SHA256 ab158f7aab2e70ae637e944e562c6d7ce3ba870c09018eba8cc6b46bd66e9d57 mozilla-firefox-2.0.0.6-mn.xpi 160148
+MD5 f30a2da3b048e97ee1c722689d3ba2c0 mozilla-firefox-2.0.0.6-nb-NO.xpi 163721
+RMD160 e8a4b0e769759b95cfd24494761fef2c5d15aff3 mozilla-firefox-2.0.0.6-nb-NO.xpi 163721
+SHA256 72e63687586b1fb61f5351dd9cb5d8068d674381eee64a12eb77e9cbd11cd937 mozilla-firefox-2.0.0.6-nb-NO.xpi 163721
+MD5 7e365a0e80a8e3ea04d35ac6e34137b9 mozilla-firefox-2.0.0.6-nl.xpi 170025
+RMD160 6f86c5d960b9c1dc02e294aa8606a2331ce6f038 mozilla-firefox-2.0.0.6-nl.xpi 170025
+SHA256 59440a82c5ca1257163e349aefec3b4fc416bdd458bd2d0888b38fc1362557e5 mozilla-firefox-2.0.0.6-nl.xpi 170025
+MD5 6425deba5996cf8d6a0ed293d09e1aa0 mozilla-firefox-2.0.0.6-nn-NO.xpi 160690
+RMD160 69aa15bcf016cc276c618bcebbcba15fa4c458b5 mozilla-firefox-2.0.0.6-nn-NO.xpi 160690
+SHA256 efaf39e177d86d00652b7976eba4a6348afb041222fb382adc47287c22a2038d mozilla-firefox-2.0.0.6-nn-NO.xpi 160690
+MD5 d842b74aa5eb0c8ae2b09b5bb5f4a5d5 mozilla-firefox-2.0.0.6-pa-IN.xpi 161692
+RMD160 2125b2069b54ed6f8714530c33eea51cb484335b mozilla-firefox-2.0.0.6-pa-IN.xpi 161692
+SHA256 84ce18ad8f665b6b03837493e96b7a5672360c14aa25961949bb60ca95a821fc mozilla-firefox-2.0.0.6-pa-IN.xpi 161692
+MD5 1bf47a6f3d05cf1254b8677a548e6b03 mozilla-firefox-2.0.0.6-pl.xpi 170976
+RMD160 beacc4fe2a9c4d20b346c3a7192800a99ddf6947 mozilla-firefox-2.0.0.6-pl.xpi 170976
+SHA256 4a1d97de61ef566ac40ec48214e3e6eaa4b76e38f049a46dd3658ad9e7ad75a7 mozilla-firefox-2.0.0.6-pl.xpi 170976
+MD5 20535262b24d638b3c03dbd7408904dc mozilla-firefox-2.0.0.6-pt-BR.xpi 153290
+RMD160 38d73cb76c9da2999320f05b9a9e312b85b9c3c4 mozilla-firefox-2.0.0.6-pt-BR.xpi 153290
+SHA256 1f24b8b0791da166dfb36906c51298741fcf76817a52c2b7b7ff2c1926d5358c mozilla-firefox-2.0.0.6-pt-BR.xpi 153290
+MD5 32264224c532d30e6b8c72acea84e759 mozilla-firefox-2.0.0.6-pt-PT.xpi 153533
+RMD160 91a0da635f55c97d8e50d0373424d03aaffdc143 mozilla-firefox-2.0.0.6-pt-PT.xpi 153533
+SHA256 86e11330fccdb4ed1a54338bd6ecb518d852715cf2541dcfca3e496bc07965dc mozilla-firefox-2.0.0.6-pt-PT.xpi 153533
+MD5 071b4db558ca28df40071adaaac4bde3 mozilla-firefox-2.0.0.6-ro.xpi 159204
+RMD160 45ac05eb2b2d123b476f8530f30fc5f7f3069075 mozilla-firefox-2.0.0.6-ro.xpi 159204
+SHA256 dd8f05e3f82e9e104cddb9125c36e68c2f2cf9a86b35501b52bc60531cbdbc7f mozilla-firefox-2.0.0.6-ro.xpi 159204
+MD5 4dc2fec563f41a64aaf07d522816774b mozilla-firefox-2.0.0.6-ru.xpi 167717
+RMD160 ca54d8aade4e9dbc50ee51de1c4566aa6dde6ac1 mozilla-firefox-2.0.0.6-ru.xpi 167717
+SHA256 a1b46ac0ac723d0c54f857d564e4cfbdcfe3b795de39e2f0afdb8173f363cc3a mozilla-firefox-2.0.0.6-ru.xpi 167717
+MD5 cbb4bf1ec3bff62f4ce6bc829566fd58 mozilla-firefox-2.0.0.6-sk.xpi 164899
+RMD160 baa31dc3bd58de12ec189dae2e02951d57dc9f1d mozilla-firefox-2.0.0.6-sk.xpi 164899
+SHA256 b78441e8dd07ffe8766488a350d7177e8d377ea850fea53f550aae1b0b0a39f1 mozilla-firefox-2.0.0.6-sk.xpi 164899
+MD5 35b8703dc0967de10cee79ad1ac34a78 mozilla-firefox-2.0.0.6-sl.xpi 154979
+RMD160 ecab138ab5b8507996e33c7266e1b523fec7c5a8 mozilla-firefox-2.0.0.6-sl.xpi 154979
+SHA256 762fa56dabf202e8b134aa2502c41d4192bffecbb1b455f9c0c571e20035f6fe mozilla-firefox-2.0.0.6-sl.xpi 154979
+MD5 863a6f18c05b66e2deb61d3363c72bae mozilla-firefox-2.0.0.6-sv-SE.xpi 165898
+RMD160 7bab2cc7a2ac6375a104b19495c66eb84a0f45e3 mozilla-firefox-2.0.0.6-sv-SE.xpi 165898
+SHA256 56d772299a509a5c7975c16b65b709ede67294a8a69aae06ea83269672d6c860 mozilla-firefox-2.0.0.6-sv-SE.xpi 165898
+MD5 1f6c7d85d50238a04cf0eb302b814345 mozilla-firefox-2.0.0.6-tr.xpi 148657
+RMD160 530a3add151bca56190930abb085eed28cc30e87 mozilla-firefox-2.0.0.6-tr.xpi 148657
+SHA256 ba164b92ceb7173e29f8e4807b9e1010f26cc0d57b0cad5c0fdb800997d46dc4 mozilla-firefox-2.0.0.6-tr.xpi 148657
+MD5 2f2bb61cde4c52142bfa7d763c4851b0 mozilla-firefox-2.0.0.6-zh-CN.xpi 139265
+RMD160 00ce27f7e4867ef8819e3d7e05963a0003595c2c mozilla-firefox-2.0.0.6-zh-CN.xpi 139265
+SHA256 f7152044dfcdee626944bfd2a28309e95ff1ec5c4cf32e10c48e58665d253017 mozilla-firefox-2.0.0.6-zh-CN.xpi 139265
+MD5 7c15979b117ed95c7fd5decfc0535052 mozilla-firefox-2.0.0.6-zh-TW.xpi 141995
+RMD160 79ad0176a7e94b2aed6b41713f10aa3144082155 mozilla-firefox-2.0.0.6-zh-TW.xpi 141995
+SHA256 a270a2c1138d49aa235562a62e4058df2e77917b133c5ddd1a9cbe06c49f54fe mozilla-firefox-2.0.0.6-zh-TW.xpi 141995
diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.6.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.6.ebuild
new file mode 100644
index 000000000000..75c1e9970c60
--- /dev/null
+++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.6.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2007 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.6.ebuild,v 1.1 2007/07/31 13:14:30 armin76 Exp $
+
+inherit eutils mozilla-launcher multilib mozextension
+
+LANGS="af ar be bg ca cs da de el en-GB es-AR es-ES eu fi fr fy-NL ga-IE gu-IN he hu it ja ka ko ku lt mk mn nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru sk sl sv-SE tr zh-CN zh-TW"
+NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
+
+DESCRIPTION="Firefox Web Browser"
+SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/linux-i686/en-US/firefox-${PV}.tar.gz"
+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
+	SRC_URI="${SRC_URI}
+		linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P/-bin}-xpi/${P/-bin/}-${X}.xpi )"
+	IUSE="${IUSE} linguas_${X/-/_}"
+	# english is handled internally
+	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
+		SRC_URI="${SRC_URI}
+			linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${P/-bin}-xpi/${P/-bin/}-${X}.xpi )"
+		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
+		=virtual/libstdc++-3.3
+	)
+	amd64? (
+		>=app-emulation/emul-linux-x86-baselibs-1.0
+		>=app-emulation/emul-linux-x86-gtklibs-1.0
+		app-emulation/emul-linux-x86-compat
+	)
+	>=www-client/mozilla-launcher-1.41"
+
+PDEPEND="restrict-javascript? ( x11-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 mozilla-firefox does not support the ${LANG} LINGUA"
+	done
+}
+
+src_unpack() {
+	unpack firefox-${PV}.tar.gz
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_unpack "${P/-bin/}-${X}.xpi"
+	done
+	if [[ ${linguas} != "" ]]; then
+		einfo "Selected language packs (first will be default): ${linguas}"
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/firefox
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	touch ${S}/extensions/talkback@mozilla.org/chrome.manifest
+	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
+	install_mozilla_launcher_stub firefox-bin ${MOZILLA_FIVE_HOME}
+
+	# Install icon and .desktop for menu entry
+	doicon ${FILESDIR}/icon/${PN}-icon.png
+	domenu ${FILESDIR}/icon/${PN}.desktop
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins ${FILESDIR}/10firefox-bin
+
+	# install ldpath env.d
+	doenvd ${FILESDIR}/71firefox-bin
+}
+
+pkg_preinst() {
+	declare MOZILLA_FIVE_HOME=/opt/firefox
+
+	# Remove entire installed instance to prevent all kinds of
+	# problems... see bug 44772 for example
+	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
+}
+
+pkg_postinst() {
+	use amd64 && einfo "NB: You just installed a 32-bit firefox"
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	update_mozilla_launcher_symlinks
+}