Version bump wrt security #185737

(Portage version: 2.1.3_rc8)

3 files changed, 289 insertions, 1 deletions

diff --git a/www-client/mozilla-firefox-bin/ChangeLog b/www-client/mozilla-firefox-bin/ChangeLog
index 981803c6222e..22aae330622e 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.90 2007/07/02 14:38:55 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.91 2007/07/18 18:03:20 armin76 Exp $
+
+*mozilla-firefox-bin-2.0.0.5 (18 Jul 2007)
+
+  18 Jul 2007; Raúl Porcel <armin76@gentoo.org>
+  +mozilla-firefox-bin-2.0.0.5.ebuild:
+  Version bump wrt security #185737
 
   02 Jul 2007; Piotr Jaroszyński <peper@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.5 b/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-2.0.0.5
new file mode 100644
index 000000000000..e07c6cb35570
--- /dev/null
+++ b/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-2.0.0.5
@@ -0,0 +1,132 @@
+MD5 d6562086f7358c1059a1aaf43f78322c firefox-2.0.0.5.tar.gz 9671891
+RMD160 3e26f5e30eed3be53dc9db22d24397cbffd278ea firefox-2.0.0.5.tar.gz 9671891
+SHA256 06fcd17be053ea6e1cc02b95de5c8fe01e30778744cfeffa3785251b50db8a0a firefox-2.0.0.5.tar.gz 9671891
+MD5 a62ca8fda5be764ac40990f7cd98997b mozilla-firefox-2.0.0.5-af.xpi 148044
+RMD160 834438211a4adef65f8e462f3a894a10f55a1057 mozilla-firefox-2.0.0.5-af.xpi 148044
+SHA256 bb33c6ab206590e9bb8de52101b41189ae041d39a4110285caafbeec061b46fc mozilla-firefox-2.0.0.5-af.xpi 148044
+MD5 32dbbd23e18ce0bdb75b359890e8a6bd mozilla-firefox-2.0.0.5-ar.xpi 159726
+RMD160 f2863651ec326d3479694001705a40388a1492ab mozilla-firefox-2.0.0.5-ar.xpi 159726
+SHA256 f6b05763d4e5e5aa32dd3597b44c0b84a6d5c80cc4ff3881d1665feffd93bf25 mozilla-firefox-2.0.0.5-ar.xpi 159726
+MD5 1d855c3ef1e315645e8d93772d11b62a mozilla-firefox-2.0.0.5-be.xpi 161164
+RMD160 e12eab5414398ad66d06448d99c157129ffc7c32 mozilla-firefox-2.0.0.5-be.xpi 161164
+SHA256 001fc9f2a3ec5e0f1b9cf16da5ac87942f66d59d6245e9fc778ced30a24b1154 mozilla-firefox-2.0.0.5-be.xpi 161164
+MD5 02f8c8ecc2ae4661220ef3f778f949be mozilla-firefox-2.0.0.5-bg.xpi 169651
+RMD160 2a4fefe123d198c4203e23f6f409727d624c7713 mozilla-firefox-2.0.0.5-bg.xpi 169651
+SHA256 9f9130ecdf0601230d6a3827705d8c0d376b20bcd4f8d293fecc17471c961491 mozilla-firefox-2.0.0.5-bg.xpi 169651
+MD5 9e49f8d00545163e9ced5fdf9dbb0a0c mozilla-firefox-2.0.0.5-ca.xpi 170692
+RMD160 c540081adcba1eab25408672968be92b586d8429 mozilla-firefox-2.0.0.5-ca.xpi 170692
+SHA256 99ff4a909b5eed96141369ed24f73d1ee6eac58e5f40519b38913a5fe5c22b39 mozilla-firefox-2.0.0.5-ca.xpi 170692
+MD5 6e93d851e0e7ebc4ee4cb59ee12d3aa2 mozilla-firefox-2.0.0.5-cs.xpi 167975
+RMD160 ca50aca84bdc3969eed6ad1abab8b51aa8d91c09 mozilla-firefox-2.0.0.5-cs.xpi 167975
+SHA256 3d03da34a54524002afcee04a7742a68296cebbfa3ce4a0bcf29771824869dfd mozilla-firefox-2.0.0.5-cs.xpi 167975
+MD5 42425fea7b3e8a5944dc036b9dc4315e mozilla-firefox-2.0.0.5-da.xpi 152108
+RMD160 fc21ddce953abcd092a500b481c78d6385d3e65d mozilla-firefox-2.0.0.5-da.xpi 152108
+SHA256 f8c79d8bfe45f5dc4616b13cb946d6dc9db395300e02584178e5fee26926d25f mozilla-firefox-2.0.0.5-da.xpi 152108
+MD5 e9e493676b1ab606c26a442bd943fd86 mozilla-firefox-2.0.0.5-de.xpi 152531
+RMD160 b2016eee195e8959d2d26f6d4c219c9ad5cb4500 mozilla-firefox-2.0.0.5-de.xpi 152531
+SHA256 a527752f9ccd41e3f65329929465c62f6b6145514d1180d3f7bf73148fb094a6 mozilla-firefox-2.0.0.5-de.xpi 152531
+MD5 8ffc531c02cd480fed3b1cbfecf3383c mozilla-firefox-2.0.0.5-el.xpi 169725
+RMD160 d126b536c07315b2e9cab8c4daf8c50ed9be1f46 mozilla-firefox-2.0.0.5-el.xpi 169725
+SHA256 9378560c20069694ad9a66b2e046af0cb721a6cf5372af32416429bcea8a3f51 mozilla-firefox-2.0.0.5-el.xpi 169725
+MD5 f33a5a45f7d315b587b1c479c772c88b mozilla-firefox-2.0.0.5-en-GB.xpi 156165
+RMD160 fe09929f3660f3919681838865615cb7c26051d9 mozilla-firefox-2.0.0.5-en-GB.xpi 156165
+SHA256 65b9db6c149e616b37a6029bc1f0e8ab0172957821f4857315608fd73c95aae2 mozilla-firefox-2.0.0.5-en-GB.xpi 156165
+MD5 67519a97e533c29d6271fa0bc48c535b mozilla-firefox-2.0.0.5-es-AR.xpi 156152
+RMD160 f7dfa9ec144351906e4ac9fcbb31f15f5cb6566e mozilla-firefox-2.0.0.5-es-AR.xpi 156152
+SHA256 427b95164d960b736ebf12f0df2f17c0ffffc55665c3e37fe2dd187485e243cf mozilla-firefox-2.0.0.5-es-AR.xpi 156152
+MD5 396b3ad87ddf327490b352a28b3942ac mozilla-firefox-2.0.0.5-es-ES.xpi 143592
+RMD160 0cb38644561d68f9e8a745ca55f4e343223a9485 mozilla-firefox-2.0.0.5-es-ES.xpi 143592
+SHA256 d5604e041b324baf722d033aa379fb91209e6e0a0bf4e6c9bb489b59412d4422 mozilla-firefox-2.0.0.5-es-ES.xpi 143592
+MD5 92c51f1320d92868385d816de97b2748 mozilla-firefox-2.0.0.5-eu.xpi 153658
+RMD160 0aab935c0cb77424509a46e40d54ad6c29baacb6 mozilla-firefox-2.0.0.5-eu.xpi 153658
+SHA256 30b14bc5dfccb9280b5126b7876a960a55ee5fe9b90d0ad6d9986b556aa92823 mozilla-firefox-2.0.0.5-eu.xpi 153658
+MD5 d3750ddce88270923d3c6f9f2ac22a18 mozilla-firefox-2.0.0.5-fi.xpi 155420
+RMD160 55c8751410bcea6c01836d2918628baad7fe74e4 mozilla-firefox-2.0.0.5-fi.xpi 155420
+SHA256 7b73c8b64f0b5dc5d95929a3aad43a9111106c60ac3ce5e7c2f60907dff24dc4 mozilla-firefox-2.0.0.5-fi.xpi 155420
+MD5 d91e9d22da58ff4c89df8bad6e81ab73 mozilla-firefox-2.0.0.5-fr.xpi 173828
+RMD160 139e4f7471eb688c1411f6058d65ef02a6cbccb1 mozilla-firefox-2.0.0.5-fr.xpi 173828
+SHA256 27cfb209db35e42aa3e9cc10b9afdf089a281b32a2aee3677d976fb854677d17 mozilla-firefox-2.0.0.5-fr.xpi 173828
+MD5 b2057b70f0cb9346851ba40fe4b19ca8 mozilla-firefox-2.0.0.5-fy-NL.xpi 167166
+RMD160 f49f7bac12690f10e700a2836a582d4057784853 mozilla-firefox-2.0.0.5-fy-NL.xpi 167166
+SHA256 7797a219b1ad9cf05f9ba7f1697c4080ba0fea0e67b659ea1fe6ee7193001977 mozilla-firefox-2.0.0.5-fy-NL.xpi 167166
+MD5 be6e6d095103eb8548ea2cd20bff3dcf mozilla-firefox-2.0.0.5-ga-IE.xpi 151754
+RMD160 44201771ea35e5044e1567a747830458f1492afd mozilla-firefox-2.0.0.5-ga-IE.xpi 151754
+SHA256 0badfa6504cb499e541fd6c5dc6cccf4b594c04698b51cd11c896e12e07ba89b mozilla-firefox-2.0.0.5-ga-IE.xpi 151754
+MD5 c9991ea746e3dd6da314192a4fa19ee7 mozilla-firefox-2.0.0.5-gu-IN.xpi 172672
+RMD160 5f014f7f97b3c42c92b25d3715c003137bbaa3cc mozilla-firefox-2.0.0.5-gu-IN.xpi 172672
+SHA256 487920d4eef47c01c7e5388f05b4da9da271c5efd4b9623ba39b48f725413ec1 mozilla-firefox-2.0.0.5-gu-IN.xpi 172672
+MD5 2f34c70fc6ce2de479efc83de21423e9 mozilla-firefox-2.0.0.5-he.xpi 150304
+RMD160 06f9bb99229ff0983c87b6289a67073fe59735fe mozilla-firefox-2.0.0.5-he.xpi 150304
+SHA256 682b7031776ccb8ba16c4a014cd96f7e16061cb88798aa251f8a02c307e77b6b mozilla-firefox-2.0.0.5-he.xpi 150304
+MD5 9471a06243ba2be8c02a0c4756e1bfba mozilla-firefox-2.0.0.5-hu.xpi 163755
+RMD160 42d8ea74e23e4982c84f0970efa1b0afa4ca02a2 mozilla-firefox-2.0.0.5-hu.xpi 163755
+SHA256 53d558ea6c996fdef2afc11063578939a8628b244375f36fe38f627419b2e1db mozilla-firefox-2.0.0.5-hu.xpi 163755
+MD5 15bf69bace6e9b2ed759c0598924f9c4 mozilla-firefox-2.0.0.5-it.xpi 144821
+RMD160 d01aadeb4be6837048473577bac545f75bee3966 mozilla-firefox-2.0.0.5-it.xpi 144821
+SHA256 ae99935b7255c1952ca603e17c1d8fb350f2c5bd8b956b304c1f87266dedc76d mozilla-firefox-2.0.0.5-it.xpi 144821
+MD5 c27df64370fe185fa8c2ef84028fd24a mozilla-firefox-2.0.0.5-ja.xpi 163309
+RMD160 1684605da48b6b43da5a74c037195732cc2329ca mozilla-firefox-2.0.0.5-ja.xpi 163309
+SHA256 6ec1c19eada279b92ca433be3dacbb9a6cfb1b21b7406e50b0e65f5465b908cf mozilla-firefox-2.0.0.5-ja.xpi 163309
+MD5 6b95cfe3fc8576ce63fe3617506fe6a7 mozilla-firefox-2.0.0.5-ka.xpi 177906
+RMD160 790f46a721e785467a17b0d855a08b0f5b927d75 mozilla-firefox-2.0.0.5-ka.xpi 177906
+SHA256 973ff2b49f2e1689cf1b7f869c2486c9737f775b40eedafe6030e4efbab3ba0a mozilla-firefox-2.0.0.5-ka.xpi 177906
+MD5 7d43bd08bdffdf8f2c645943a1a90230 mozilla-firefox-2.0.0.5-ko.xpi 148117
+RMD160 20c75cb446ad557191cef9a69e8e013418eba5f6 mozilla-firefox-2.0.0.5-ko.xpi 148117
+SHA256 bbd7482f5e0921670a585ec4689e86b4bf9116aca64b23bed55a27ec6e1fd7e8 mozilla-firefox-2.0.0.5-ko.xpi 148117
+MD5 8ede8a51a036c6f767f7238b67e0f99b mozilla-firefox-2.0.0.5-ku.xpi 153159
+RMD160 d460853db1d0b7a2a2d2fa1698ebaaf3e53f68c4 mozilla-firefox-2.0.0.5-ku.xpi 153159
+SHA256 3838b8dd92ab99ff55423d2aabdcd3460f2d00889ad06f1e8082589887919916 mozilla-firefox-2.0.0.5-ku.xpi 153159
+MD5 6e95ff7a93a27458899dcb0df0722523 mozilla-firefox-2.0.0.5-lt.xpi 164578
+RMD160 efed32960e96bf5c64f202f5e09443292e78e1a4 mozilla-firefox-2.0.0.5-lt.xpi 164578
+SHA256 6fc2cf5a6ffbd5ee46e3364ccaf835ed2589ea55609d6199f175fd28de883ef4 mozilla-firefox-2.0.0.5-lt.xpi 164578
+MD5 4f37eb8d27947b7c5c084283d169801d mozilla-firefox-2.0.0.5-mk.xpi 159966
+RMD160 49e5da8d74b0dded6ef494b41ed0e40254784caa mozilla-firefox-2.0.0.5-mk.xpi 159966
+SHA256 b0d15bb73143107be9ee11142ca9f27412074512de9c34c0ef030db7560cce2f mozilla-firefox-2.0.0.5-mk.xpi 159966
+MD5 164eb9f9ef80d1d7b45d70d6b780cd3e mozilla-firefox-2.0.0.5-mn.xpi 160148
+RMD160 2395d2e6003a5a54cf898428c202a2afebb18920 mozilla-firefox-2.0.0.5-mn.xpi 160148
+SHA256 3164e49cbb025e08840f6b4e0964c54934942ad7b8292048d0c8173278ca0b65 mozilla-firefox-2.0.0.5-mn.xpi 160148
+MD5 d713b636743174173b731f775eeb07d9 mozilla-firefox-2.0.0.5-nb-NO.xpi 163722
+RMD160 458120c0e7c2fd23f8e6e46a24c2141be88e8d32 mozilla-firefox-2.0.0.5-nb-NO.xpi 163722
+SHA256 b8e927ad08ea75cacdafffd215fc04630234a62616b31bcd821d11162d2f301d mozilla-firefox-2.0.0.5-nb-NO.xpi 163722
+MD5 e35a2c716f1552490e67a23431589f7d mozilla-firefox-2.0.0.5-nl.xpi 170025
+RMD160 6b3398189aa5e787203f4a5b60cfc0ca5332ce56 mozilla-firefox-2.0.0.5-nl.xpi 170025
+SHA256 5f1365edcb9d1f88e6b8f2ea9ea51326e6dbdcd212dce7ec7bc1976d71ef1bc8 mozilla-firefox-2.0.0.5-nl.xpi 170025
+MD5 822013b800e0dfe0002ff4ed4839d63b mozilla-firefox-2.0.0.5-nn-NO.xpi 160690
+RMD160 58d0d5f73bb53b226e4bd6fd37d1d5a3735c44e9 mozilla-firefox-2.0.0.5-nn-NO.xpi 160690
+SHA256 854bb2e5c1d86dbf090e4a8f240149bb7399220d5fe1574c5f552b25f1e98df3 mozilla-firefox-2.0.0.5-nn-NO.xpi 160690
+MD5 8789ac0170933d7a4bfcb97008242228 mozilla-firefox-2.0.0.5-pa-IN.xpi 161692
+RMD160 92316a5cd4dce259b62d1315b7a835301cdee40a mozilla-firefox-2.0.0.5-pa-IN.xpi 161692
+SHA256 d90014b80b942f2a31d269b149ea67150cba6057bf0c099a8b918b2a75fc4840 mozilla-firefox-2.0.0.5-pa-IN.xpi 161692
+MD5 d590f47a500b4ceb695088e3bd49dc3c mozilla-firefox-2.0.0.5-pl.xpi 170976
+RMD160 2d912d3c3d9867de4a608fb4578752ed1116a6c9 mozilla-firefox-2.0.0.5-pl.xpi 170976
+SHA256 56d945205db4d7f8afec46124489c8a122db8cf60350c92cf7154638da63e548 mozilla-firefox-2.0.0.5-pl.xpi 170976
+MD5 56f4c07538f0c739f7b852a289affe34 mozilla-firefox-2.0.0.5-pt-BR.xpi 153290
+RMD160 5404b878c53b2394b7b62880080636e7c2ccc3ac mozilla-firefox-2.0.0.5-pt-BR.xpi 153290
+SHA256 27fa0951b6ac5024efbe8378215b49129b92e55ffcda4db9bef9e2b478558e1a mozilla-firefox-2.0.0.5-pt-BR.xpi 153290
+MD5 07258167cae30bc600e210a554de66a5 mozilla-firefox-2.0.0.5-pt-PT.xpi 153533
+RMD160 3782e24980f8e1bd664663fbf2f92451d9f5c2fe mozilla-firefox-2.0.0.5-pt-PT.xpi 153533
+SHA256 96fe62949003d0cbdd1dc98a73824f7a5475c72e14c2d38579fb0cc429f3b77a mozilla-firefox-2.0.0.5-pt-PT.xpi 153533
+MD5 66ce6de16a495886dfcde61f6ba88871 mozilla-firefox-2.0.0.5-ro.xpi 159204
+RMD160 992efbda8685bc0801b261741a9e526596566cc3 mozilla-firefox-2.0.0.5-ro.xpi 159204
+SHA256 a6f630330fee3ffef2da333f2c80ac2c48f19b779a7678f0a6ce0a6f0c6d4764 mozilla-firefox-2.0.0.5-ro.xpi 159204
+MD5 4ac34291533cbd342c75607934e0738e mozilla-firefox-2.0.0.5-ru.xpi 167717
+RMD160 630924d8296042150a1f96ba5938903b05586a33 mozilla-firefox-2.0.0.5-ru.xpi 167717
+SHA256 f2a438622dbb9545570131b366a05d70e1a6beff4e52f3f405b984135b265d8d mozilla-firefox-2.0.0.5-ru.xpi 167717
+MD5 60b5e54ba94dbf31d127214fc166363f mozilla-firefox-2.0.0.5-sk.xpi 164899
+RMD160 f44e563addfa0938266d35c6b8d200c8b2fb24f5 mozilla-firefox-2.0.0.5-sk.xpi 164899
+SHA256 6959b9683d9a6cdc726f06a12b8d7849e8326d814d0c059f60ff333889a896eb mozilla-firefox-2.0.0.5-sk.xpi 164899
+MD5 25bce5f2e8b2c410369b891db258c67a mozilla-firefox-2.0.0.5-sl.xpi 154979
+RMD160 d53d2d7a554d2c19e13ffd78e590690877d450e2 mozilla-firefox-2.0.0.5-sl.xpi 154979
+SHA256 b18912f2c5d6b0b8fff966f385ed2a7efcf7e4c5cc66543512980b640a9a1d79 mozilla-firefox-2.0.0.5-sl.xpi 154979
+MD5 674c9fa7bec75a32ad1df3b80038e6a3 mozilla-firefox-2.0.0.5-sv-SE.xpi 165898
+RMD160 600f96c8efd9375fd5932ffb049a62fb91fdc960 mozilla-firefox-2.0.0.5-sv-SE.xpi 165898
+SHA256 9030cb757da76b81a4ffb6872ad8be3b62469792d0cf4ebce33d98c90068e384 mozilla-firefox-2.0.0.5-sv-SE.xpi 165898
+MD5 39700c0cd02b4a8525273636d7dace90 mozilla-firefox-2.0.0.5-tr.xpi 148657
+RMD160 2c00d972d2ec2995053fb47d5fc8c31fe1a90a14 mozilla-firefox-2.0.0.5-tr.xpi 148657
+SHA256 1c68e1ea1d63afb1ef2129ce66f37d4c20ca8ce91b2d680ced897850bf2ff10f mozilla-firefox-2.0.0.5-tr.xpi 148657
+MD5 1ed01ad104a39bc33bb7b6422e18c1e5 mozilla-firefox-2.0.0.5-zh-CN.xpi 139266
+RMD160 e004c744069ed507a9565298ed19fc8ef86e2728 mozilla-firefox-2.0.0.5-zh-CN.xpi 139266
+SHA256 2c964db98b752e6f0863eefc07d636f8c400c0135f16a9222c20db7e00d096f5 mozilla-firefox-2.0.0.5-zh-CN.xpi 139266
+MD5 ebd62d7fd45d47a86fe9c4af37eab2b7 mozilla-firefox-2.0.0.5-zh-TW.xpi 141995
+RMD160 0bd03bfaf06de852148a50981554ffa48597e4e0 mozilla-firefox-2.0.0.5-zh-TW.xpi 141995
+SHA256 139e98a103d9a57e38b1ca455dfd2b0640197ec1a1f305f1a90cc70bca67a5b3 mozilla-firefox-2.0.0.5-zh-TW.xpi 141995
diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.5.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.5.ebuild
new file mode 100644
index 000000000000..a34750cd0824
--- /dev/null
+++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.5.ebuild
@@ -0,0 +1,150 @@
+# 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.5.ebuild,v 1.1 2007/07/18 18:03:20 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
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/icon/${PN}-icon.png
+	insinto /usr/share/applications
+	doins ${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() {
+	if use amd64; then
+		echo
+		einfo "NB: You just installed a 32-bit firefox"
+	fi
+
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	update_mozilla_launcher_symlinks
+}