Remove broken revision bump, new revision bump, thanks to Anarchy

(Portage version: 2.1.2_rc4-r9)

3 files changed, 415 insertions, 1 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 9251e0362e3c..1e30e7e173cf 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.248 2007/01/14 10:14:21 pingu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.249 2007/01/14 14:20:24 armin76 Exp $
+
+*mozilla-firefox-2.0.0.1-r2 (14 Jan 2007)
+
+  14 Jan 2007; Raúl Porcel <armin76@gentoo.org>
+  -mozilla-firefox-2.0.0.1-r1.ebuild, +mozilla-firefox-2.0.0.1-r2.ebuild:
+  Remove broken revision bump, new revision bump, thanks to Anarchy
 
   14 Jan 2007; Christian Marie <pingu@gentoo.org>
   mozilla-firefox-2.0.0.1-r1.ebuild:
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0.0.1-r2 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0.0.1-r2
new file mode 100644
index 000000000000..e5eaa3ad7e8b
--- /dev/null
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0.0.1-r2
@@ -0,0 +1,126 @@
+MD5 7a1fc804ed735c5b7e9b1498bac8b5db firefox-2.0.0.1-source.tar.bz2 37056207
+RMD160 ce86c30f1e2038d2af05c7119fdab5609c21d12d firefox-2.0.0.1-source.tar.bz2 37056207
+SHA256 b7db1a7d7ee37707dd5736a656982d1deaea7b29654f49564c2aa54c59ba1e24 firefox-2.0.0.1-source.tar.bz2 37056207
+MD5 9b682260bdbb24e312247d05aa71ff09 mozilla-firefox-2.0-patches-1.1.tar.bz2 41163
+RMD160 f18bab25a29d1010121a9ee12dcb8ff38540704f mozilla-firefox-2.0-patches-1.1.tar.bz2 41163
+SHA256 e77b41e7b2d45234611c4e14dc1e6d4d810834653c4860faca0f5cecef5b4723 mozilla-firefox-2.0-patches-1.1.tar.bz2 41163
+MD5 338a21a6172280dedcbc6cc96326a698 mozilla-firefox-2.0.0.1-ar.xpi 159961
+RMD160 5c41f5f9d30930f62e539544c737b1753eaf5b7f mozilla-firefox-2.0.0.1-ar.xpi 159961
+SHA256 a7e0298cbfd9fda38c09050b40d319bcb3b075d98574cbe1fdb2dc98495bff2c mozilla-firefox-2.0.0.1-ar.xpi 159961
+MD5 1eda41f606c39b60567295d6f33900a0 mozilla-firefox-2.0.0.1-bg.xpi 169651
+RMD160 19f772d05cb65bb304cba8535ff309bc3635d3e1 mozilla-firefox-2.0.0.1-bg.xpi 169651
+SHA256 2e232517626a454ad9567eef4be752178063cc8901b83fd591a30af78ffe951f mozilla-firefox-2.0.0.1-bg.xpi 169651
+MD5 c6114a51b19a949c0abf039de6d03d32 mozilla-firefox-2.0.0.1-ca.xpi 170789
+RMD160 e35e2143db4113e0bdf8b54221450d06507d523f mozilla-firefox-2.0.0.1-ca.xpi 170789
+SHA256 0f341ccd157027d3b866d4f18398daef47a3ccb7b05ada8cf9a22dd982151995 mozilla-firefox-2.0.0.1-ca.xpi 170789
+MD5 52ac7e2b73ebf73164b094ee64af22e6 mozilla-firefox-2.0.0.1-cs.xpi 168070
+RMD160 fe5c69d9f14868a98e3de8979053d9347301c28d mozilla-firefox-2.0.0.1-cs.xpi 168070
+SHA256 8370f19669cfabac053d1089376f16917155c97b317f73fe086cc6eb4ce949a3 mozilla-firefox-2.0.0.1-cs.xpi 168070
+MD5 648ea93ba3018629fbf6400da5a84707 mozilla-firefox-2.0.0.1-da.xpi 152243
+RMD160 92e39654c5277a857f978d1f3a9b3d4089bf48b7 mozilla-firefox-2.0.0.1-da.xpi 152243
+SHA256 ed1b7834d74be74ce132c9caf8ed1e628e3b8adc872b3d14b5ceb69e9f4c0ecd mozilla-firefox-2.0.0.1-da.xpi 152243
+MD5 aad042bcd3cc5bac3763b78f37c479a6 mozilla-firefox-2.0.0.1-de.xpi 152621
+RMD160 9ba8335cafb9f9af47aaffd1c30a1154933270d8 mozilla-firefox-2.0.0.1-de.xpi 152621
+SHA256 3e54384f2c02cc071fcc97b48f7d6dff889a8e078d448022902be1420437732c mozilla-firefox-2.0.0.1-de.xpi 152621
+MD5 653f0fcf5dbb0e76dcf46d6b20ad0fed mozilla-firefox-2.0.0.1-el.xpi 169901
+RMD160 93644669bfbb32936652e2e8f54572fc6db2d77a mozilla-firefox-2.0.0.1-el.xpi 169901
+SHA256 f6393ece7a4b009d897e77503cb8b08f1e17743d769e60bf1d7f1aee3c077fbb mozilla-firefox-2.0.0.1-el.xpi 169901
+MD5 7a07924a544009a3fd1738dc2c1f4e4b mozilla-firefox-2.0.0.1-en-GB.xpi 156171
+RMD160 8a7cad76803cf02997d0e4356c75b60d4cab1034 mozilla-firefox-2.0.0.1-en-GB.xpi 156171
+SHA256 918b67c4379d8edcba26fb80fd34fedeb13c184c365604a7ab78ad644bf32e7b mozilla-firefox-2.0.0.1-en-GB.xpi 156171
+MD5 80be8d20fa573a19ecd45db8d73f7fb5 mozilla-firefox-2.0.0.1-es-AR.xpi 156157
+RMD160 35db81e25ae105fadaabd7a030bc86be5f9be496 mozilla-firefox-2.0.0.1-es-AR.xpi 156157
+SHA256 f00099f707fc3cc4070f788cc5d790346152948988ef2cdae2097500d15194c3 mozilla-firefox-2.0.0.1-es-AR.xpi 156157
+MD5 91fd55cde12c09c32a7e4e17002d008d mozilla-firefox-2.0.0.1-es-ES.xpi 143696
+RMD160 1ea907402534c29ac3098565494b430f51d6c388 mozilla-firefox-2.0.0.1-es-ES.xpi 143696
+SHA256 f14bced107cbff7539c15201cd1b9a88731eeef52db55fc54b5ba70e01de80b2 mozilla-firefox-2.0.0.1-es-ES.xpi 143696
+MD5 67cfec021305edf6bcc8279fbfdccd6b mozilla-firefox-2.0.0.1-eu.xpi 153806
+RMD160 f1606bb2d733b9eaf17ae0658026ff6d7d2258ca mozilla-firefox-2.0.0.1-eu.xpi 153806
+SHA256 be6eee59c66e5fb74022ebfc6ec7a68c072810951c1f71059974c2813a6061c0 mozilla-firefox-2.0.0.1-eu.xpi 153806
+MD5 d4b21e08e57bbf7a9f86581dbd6c011f mozilla-firefox-2.0.0.1-fi.xpi 155466
+RMD160 b359a54ce8e15c89e14230dd62aafd9e6532c33d mozilla-firefox-2.0.0.1-fi.xpi 155466
+SHA256 d78b15142882e15a624ed2ad212774c789a122c3ee6febd0a2e325eec1619063 mozilla-firefox-2.0.0.1-fi.xpi 155466
+MD5 4b1b04f37e4dc2536de8660efca3b8d9 mozilla-firefox-2.0.0.1-fr.xpi 173933
+RMD160 73e3014c5f38d0d4d3c8059b86ff232725a8da21 mozilla-firefox-2.0.0.1-fr.xpi 173933
+SHA256 8fedd7934b15e1a4466deeec0ec1ef5301e9f4edfa7285b20cb3c8d0bea52a4f mozilla-firefox-2.0.0.1-fr.xpi 173933
+MD5 f25dd5631bc6970e145a3e0f27b67507 mozilla-firefox-2.0.0.1-fy-NL.xpi 167266
+RMD160 678d08b6b7a423912f14b1bfe222954d53d4169d mozilla-firefox-2.0.0.1-fy-NL.xpi 167266
+SHA256 5e7c6903a79de51fd199fd1c4161a1f0133d0d96b8c2c0483472b32b2405c226 mozilla-firefox-2.0.0.1-fy-NL.xpi 167266
+MD5 74d991fd12ca8c7c96007a68c139f86d mozilla-firefox-2.0.0.1-ga-IE.xpi 151759
+RMD160 118029432220150597c2fa69de64646f7683586f mozilla-firefox-2.0.0.1-ga-IE.xpi 151759
+SHA256 9a36389cf84350e8b14dbf3234600d577f6e1ea9461f7741b95e4d4316669b3b mozilla-firefox-2.0.0.1-ga-IE.xpi 151759
+MD5 2838a8190880a8c5480a4cba4491a3c9 mozilla-firefox-2.0.0.1-gu-IN.xpi 172786
+RMD160 e555d32232dedf27a73b7e8f2e318b3beb9cb818 mozilla-firefox-2.0.0.1-gu-IN.xpi 172786
+SHA256 a162ec70012455c4f257e8f22837bec1a1c35c01305c19b2d4539cc8315e1923 mozilla-firefox-2.0.0.1-gu-IN.xpi 172786
+MD5 10eb938b3744821d379c05960e5db31e mozilla-firefox-2.0.0.1-he.xpi 149174
+RMD160 03758887920428837c51f65e3a415fd6f9267bfa mozilla-firefox-2.0.0.1-he.xpi 149174
+SHA256 04075c0602a2e5f8666f45e6e1cd4d425f3ff2f7a5ca3cc6d7dbf8dc664feb13 mozilla-firefox-2.0.0.1-he.xpi 149174
+MD5 8fb766742b00fa6e4990f85065accccf mozilla-firefox-2.0.0.1-hu.xpi 164165
+RMD160 c97086296a6224cc975a8ed11611e1e8d9a077ef mozilla-firefox-2.0.0.1-hu.xpi 164165
+SHA256 67025fa54ff081791b9fd80d3a6776a165e15e77e6d16317da558381919271aa mozilla-firefox-2.0.0.1-hu.xpi 164165
+MD5 d1d870a63b73a2b9812a6d5710486c53 mozilla-firefox-2.0.0.1-it.xpi 144823
+RMD160 af9fbc08694379dcd7d7960580e32b8d35d2c658 mozilla-firefox-2.0.0.1-it.xpi 144823
+SHA256 cc9488014f40dc19d8f92054d9249cc173375573d08084b15ce4eb9a305e2bef mozilla-firefox-2.0.0.1-it.xpi 144823
+MD5 5672bb0e464c75a68e2a418f6a3cfe47 mozilla-firefox-2.0.0.1-ja.xpi 163422
+RMD160 29ae1d7c2c263f721ece1fae542fd0a28b53396e mozilla-firefox-2.0.0.1-ja.xpi 163422
+SHA256 9c6e5a4a339c83c4c2bb220bf3a5d3da7355fa79966642913555343c70c064db mozilla-firefox-2.0.0.1-ja.xpi 163422
+MD5 063dcc6f9dff99229cd2f3c7e3b1b484 mozilla-firefox-2.0.0.1-ka.xpi 177933
+RMD160 7996e04201b5bedfe011ba8ffb17518f411a6364 mozilla-firefox-2.0.0.1-ka.xpi 177933
+SHA256 445ef79112294a90b79641a8de34e15bab3824ac35b4d57a6b229054b5f3b59e mozilla-firefox-2.0.0.1-ka.xpi 177933
+MD5 2f1d90c6cc0b291a53abf052af5dac19 mozilla-firefox-2.0.0.1-ko.xpi 148134
+RMD160 e2091541d81e5a6ad65f1d63dd2249479a85bb6f mozilla-firefox-2.0.0.1-ko.xpi 148134
+SHA256 7a25cf877c751554b4a23d7e8f9e16dd017712ffc80f78101b0001d5892450d7 mozilla-firefox-2.0.0.1-ko.xpi 148134
+MD5 7d0ce5b9551225fd6e7c0d253d857a73 mozilla-firefox-2.0.0.1-ku.xpi 152744
+RMD160 06afdf321a18cf90de801b358ddcf334e47ea57e mozilla-firefox-2.0.0.1-ku.xpi 152744
+SHA256 0b5d4da4490c6aab1ac73c1919ccee9449a8932e59adfe992643b38b16edebcb mozilla-firefox-2.0.0.1-ku.xpi 152744
+MD5 28a303ef5f00341e888007da342797b8 mozilla-firefox-2.0.0.1-lt.xpi 164688
+RMD160 cf7a440f9cae09f05687edfb6043612bbdfd3ba0 mozilla-firefox-2.0.0.1-lt.xpi 164688
+SHA256 b0aabaf152a2a427a663220a9fd059fa9637301b70dc87662a6ca50cb9b396eb mozilla-firefox-2.0.0.1-lt.xpi 164688
+MD5 ef9784a21ed68f073c7111ad06a425c6 mozilla-firefox-2.0.0.1-mk.xpi 160080
+RMD160 0e7b5ed275b6d10b78d0d62195e3d3a35f10bb01 mozilla-firefox-2.0.0.1-mk.xpi 160080
+SHA256 20d8447b548c895d2dbdbd29606f79a58ff159c36cfadf46b20d6c0607465c15 mozilla-firefox-2.0.0.1-mk.xpi 160080
+MD5 eeaa1212bda9bb1d3bf75c70f66a13cc mozilla-firefox-2.0.0.1-mn.xpi 160249
+RMD160 f4357eaa8ca4aac394a02b5548ba3f8fb781753b mozilla-firefox-2.0.0.1-mn.xpi 160249
+SHA256 f078b78b46a0c190e658b8cf88c47ff8801748c7a204845794d8a04b02a50bc1 mozilla-firefox-2.0.0.1-mn.xpi 160249
+MD5 53be8cd5a5e01f8a959c1a5b2ec2176b mozilla-firefox-2.0.0.1-nb-NO.xpi 163827
+RMD160 dc50cb57ca06219eb3ccf257a65d453004cb6b13 mozilla-firefox-2.0.0.1-nb-NO.xpi 163827
+SHA256 c0d7b2b3eae77b1f49e4d636e9d79c9fab13c93be9509cfc583fef6b1c476979 mozilla-firefox-2.0.0.1-nb-NO.xpi 163827
+MD5 3fc02806e089af6d9cc6d9817c28e840 mozilla-firefox-2.0.0.1-nl.xpi 170129
+RMD160 b22fe536cc02968b2fa4cb62c10d9fcd30866715 mozilla-firefox-2.0.0.1-nl.xpi 170129
+SHA256 bf0a1073970845d6769885e7e54be402c480b30a4a2ae29e470dfec90b78f8c5 mozilla-firefox-2.0.0.1-nl.xpi 170129
+MD5 4d9c7dd60e71878a4d2447dc87763b3b mozilla-firefox-2.0.0.1-nn-NO.xpi 160799
+RMD160 4ba1004debac97d2250dc4ef7dec2597061988fd mozilla-firefox-2.0.0.1-nn-NO.xpi 160799
+SHA256 df4a6aa4e4eda6b7a337f01a80f353d5ecd33e47bad94d6a90443a929b9d52f6 mozilla-firefox-2.0.0.1-nn-NO.xpi 160799
+MD5 f3f6b9cf6d3be9953e8a5959ee69f7e4 mozilla-firefox-2.0.0.1-pa-IN.xpi 161681
+RMD160 a4bfd1e77cd4de1fb657a84a038777a51acfb17f mozilla-firefox-2.0.0.1-pa-IN.xpi 161681
+SHA256 7915b7455c2923c5bbc7e40dd733a84ab26c04bec0ea7f63ca9b06b65055b36f mozilla-firefox-2.0.0.1-pa-IN.xpi 161681
+MD5 14d3bb924aeac290d4c501fd5b29b4be mozilla-firefox-2.0.0.1-pl.xpi 171082
+RMD160 efbadec507fed85c2e306ea286d8ea6d1e86c907 mozilla-firefox-2.0.0.1-pl.xpi 171082
+SHA256 45f5a73106c96ab708dd496333e2ebca9dbf9e45dc464db72d8b679940cee4a8 mozilla-firefox-2.0.0.1-pl.xpi 171082
+MD5 6d755b88718dada24a0de67c93ca915c mozilla-firefox-2.0.0.1-pt-BR.xpi 153380
+RMD160 deeba487a61fe5c650c851b18e3425139e1d6706 mozilla-firefox-2.0.0.1-pt-BR.xpi 153380
+SHA256 539b5adf50843a2c0305d2ccc90d4b52771c7d45a57bb88f8e334b5988c0b32b mozilla-firefox-2.0.0.1-pt-BR.xpi 153380
+MD5 902cad626dc36d340cf85b790c1ff25c mozilla-firefox-2.0.0.1-pt-PT.xpi 153608
+RMD160 76432bca65edf4ab81b584f2dab3efe65ff7ab27 mozilla-firefox-2.0.0.1-pt-PT.xpi 153608
+SHA256 715d19623b8292897957001f3dc41a2768443aafb076f75e8896fe134e432240 mozilla-firefox-2.0.0.1-pt-PT.xpi 153608
+MD5 7bb9127a4914272fd8240f969e0c0d9d mozilla-firefox-2.0.0.1-ru.xpi 167791
+RMD160 541410d4e953fd7ca7bdd5bc504a99cfd635ede3 mozilla-firefox-2.0.0.1-ru.xpi 167791
+SHA256 6ed2c9546b0b2f33b5d7e0ad32f129ef3a0f28551e6c0e5deb998c97bd4d1524 mozilla-firefox-2.0.0.1-ru.xpi 167791
+MD5 e1e59732d2e295b879a4235d139ecce0 mozilla-firefox-2.0.0.1-sk.xpi 165136
+RMD160 4acbbed64eb01a97d0ad97755f46937fdb91498f mozilla-firefox-2.0.0.1-sk.xpi 165136
+SHA256 40a860a2282954aeb061a55a61b640866ac9983b770e1ed6d5089e976c503522 mozilla-firefox-2.0.0.1-sk.xpi 165136
+MD5 342163fb91b0526579b2e2d988f2ff3e mozilla-firefox-2.0.0.1-sl.xpi 155073
+RMD160 f51d040bfc1c48340e3020829fbd1d9515ea72c0 mozilla-firefox-2.0.0.1-sl.xpi 155073
+SHA256 f46f37235c7e7dd23f007900d6edb7378e50cf05e48b0030681f008840b5810f mozilla-firefox-2.0.0.1-sl.xpi 155073
+MD5 598e58250e91ca68f61956d9c0d42ff3 mozilla-firefox-2.0.0.1-sv-SE.xpi 165979
+RMD160 4e7f91ff66b178fd4eb949ef464d091aa8fd5afa mozilla-firefox-2.0.0.1-sv-SE.xpi 165979
+SHA256 521630859913a64357d8e571e74e73a7e2a4f82c6f321eca9c65a88741f6e825 mozilla-firefox-2.0.0.1-sv-SE.xpi 165979
+MD5 bef75c2c49ce6b7f6985f8b99ed878e7 mozilla-firefox-2.0.0.1-tr.xpi 148762
+RMD160 4347cdbe5e1e2ee04d76f3ac87dbf1c4cb958d13 mozilla-firefox-2.0.0.1-tr.xpi 148762
+SHA256 10d5c7459a530b867ba891c50ba186c6c5d93bcdc05bbcaa25157b8caa6ae79c mozilla-firefox-2.0.0.1-tr.xpi 148762
+MD5 9c75a0f1335b233039b65a3e178f2313 mozilla-firefox-2.0.0.1-zh-CN.xpi 142718
+RMD160 99363893c8590ee4ca3a632dfd8a76d0e60af5ea mozilla-firefox-2.0.0.1-zh-CN.xpi 142718
+SHA256 4f25a4a20c4a13c6be4af49986657d0f4dc46c5b3b114c4f299310d9bd305d63 mozilla-firefox-2.0.0.1-zh-CN.xpi 142718
+MD5 8150ac800dcac22c12af35c99735a8fe mozilla-firefox-2.0.0.1-zh-TW.xpi 142025
+RMD160 2838e4da75aea7ae27c4ecf3efeaceca45c6c867 mozilla-firefox-2.0.0.1-zh-TW.xpi 142025
+SHA256 135855969082bb419938402ca1229390d1450f747f31a273719cec674fdb61b7 mozilla-firefox-2.0.0.1-zh-TW.xpi 142025
diff --git a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.1-r2.ebuild b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.1-r2.ebuild
new file mode 100644
index 000000000000..357bff8e4b83
--- /dev/null
+++ b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.1-r2.ebuild
@@ -0,0 +1,282 @@
+# 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/mozilla-firefox-2.0.0.1-r2.ebuild,v 1.1 2007/01/14 14:20:25 armin76 Exp $
+
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime mozextension autotools
+
+PATCH="${PN}-2.0-patches-1.1"
+LANGS="ar 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 ru sk sl sv-SE tr zh-CN zh-TW"
+NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.org/projects/firefox/"
+
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
+SLOT="0"
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+IUSE="java mozdevelop mozbranding xforms restrict-javascript filepicker"
+
+MOZ_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PV}"
+SRC_URI="${MOZ_URI}/source/firefox-${PV}-source.tar.bz2
+	http://dev.gentooexperimental.org/~anarchy/dist/${PATCH}.tar.bz2
+	mirror://gentoo/${PATCH}.tar.bz2"
+
+# These are in
+#
+#  http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/linux-i686/xpi/
+#
+# for i in $LANGS $SHORTLANGS; do wget $i.xpi -O ${P}-$i.xpi; done
+for X in ${LANGS} ; do
+	SRC_URI="${SRC_URI}
+		linguas_${X/-/_}? ( http://gentooexperimental.org/~genstef/dist/${P}-xpi/${P}-${X}.xpi )"
+	IUSE="${IUSE} linguas_${X/-/_}"
+	# english is handled internally
+	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
+		SRC_URI="${SRC_URI}
+			linguas_${X%%-*}? ( http://gentooexperimental.org/~genstef/dist/${P}-xpi/${P}-${X}.xpi )"
+		IUSE="${IUSE} linguas_${X%%-*}"
+	fi
+done
+
+RDEPEND="java? ( virtual/jre )
+	>=www-client/mozilla-launcher-1.39
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.11.1-r1
+	>=dev-libs/nspr-4.6.1"
+
+DEPEND="${RDEPEND}
+	java? ( >=dev-java/java-config-0.2.0 )"
+
+PDEPEND="restrict-javascript? ( x11-plugins/noscript )"
+
+S="${WORKDIR}/mozilla"
+
+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
+	einfo "Selected language packs (first will be default): $linguas"
+}
+
+pkg_setup(){
+	if ! built_with_use x11-libs/cairo X; then
+		eerror "Cairo is not built with X useflag."
+		eerror "Please add 'X' to your USE flags, and re-emerge cairo."
+		die "Cairo needs X"
+	fi
+
+	if use mozbranding; then
+		einfo "You are enabling official branding. You may not redistribute this build"
+		einfo "to any users on your network or the internet. Doing so puts yourself into"
+		einfo "a legal problem with mozilla foundation"
+	fi
+
+	use moznopango && warn_mozilla_launcher_stub
+}
+
+src_unpack() {
+
+	unpack ${A%bz2*}bz2
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
+	done
+
+	cd "${S}"
+
+	# Apply our patches
+	EPATCH_FORCE="yes" epatch "${WORKDIR}"/patch
+
+	if use filepicker; then
+		epatch ${FILESDIR}/mozilla-filepicker.patch
+	fi
+
+	eautoreconf
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	mozconfig_init
+	mozconfig_config
+
+	mozconfig_annotate '' --enable-application=browser
+	mozconfig_annotate '' --enable-image-encoder=all
+	mozconfig_annotate '' --enable-canvas
+	mozconfig_annotate '' --with-system-nspr
+	mozconfig_annotate '' --with-system-nss
+
+	if use xforms; then
+		mozconfig_annotate '' --enable-extensions=default,xforms,schema-validation,typeaheadfind
+	else
+		mozconfig_annotate '' --enable-extensions=default,typeaheadfind
+	fi
+
+	if use ia64; then
+		echo "ac_cv_visibility_pragma=no" >>  "${S}/.mozconfig"
+	fi
+
+	if use mozbranding; then
+		mozconfig_annotate '' --enable-official-branding
+	fi
+
+	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
+	# regardless of java setting.
+	mozconfig_annotate '' --enable-oji --enable-mathml
+
+	# Other ff-specific settings
+	mozconfig_use_enable mozdevelop jsd
+	mozconfig_use_enable mozdevelop xpctools
+	mozconfig_use_extension mozdevelop venkman
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	# Add build variables
+	mozconfig_build_opts
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# -fstack-protector breaks us
+	if gcc-version ge 4 1; then
+		gcc-specs-ssp && append-flags -fno-stack-protector
+	else
+		gcc-specs-ssp && append-flags -fno-stack-protector-all
+	fi
+		filter-flags -fstack-protector -fstack-protector-all
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	econf || die
+
+	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
+	# to econf, but the quotes cause configure to fail.
+	sed -i -e \
+		's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
+		${S}/config/autoconf.mk \
+		${S}/xpfe/global/buildconfig.html
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake -j1 || die
+}
+
+pkg_preinst() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	einfo "Removing old installs though some really ugly code.  It potentially"
+	einfo "eliminates any problems during the install, however suggestions to"
+	einfo "replace this are highly welcome.  Send comments and suggestions to"
+	einfo "mozilla@gentoo.org."
+	rm -rf "${ROOT}"/"${MOZILLA_FIVE_HOME}"
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# Most of the installation happens here
+	dodir "${MOZILLA_FIVE_HOME}"
+	cp -RL "${S}"/dist/bin/* "${D}"/"${MOZILLA_FIVE_HOME}"/ || die "cp failed"
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
+	done
+
+	local LANG=${linguas%% *}
+	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
+		einfo "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
+	install_mozilla_launcher_stub firefox "${MOZILLA_FIVE_HOME}"
+
+	# Install icon and .desktop for menu entry
+	if use mozbranding; then
+		doicon "${FILESDIR}"/icon/firefox-icon.png
+		newmenu "${FILESDIR}"/icon/mozillafirefox-1.5.desktop \
+			mozillafirefox-2.0.desktop
+	else
+		doicon "${FILESDIR}"/icon/firefox-icon-unbranded.png
+		newmenu "${FILESDIR}"/icon/mozillafirefox-1.5-unbranded.desktop \
+			mozillafirefox-2.0.desktop
+	fi
+
+	# Fix icons to look the same everywhere
+	insinto "${MOZILLA_FIVE_HOME}"/icons
+	doins "${S}"/dist/branding/mozicon16.xpm
+	doins "${S}"/dist/branding/mozicon50.xpm
+
+
+	# Install files necessary for applications to build against firefox
+	einfo "Installing includes and idl files..."
+	cp -LfR "${S}"/dist/include "${D}"/"${MOZILLA_FIVE_HOME}" || die "cp failed"
+	cp -LfR "${S}"/dist/idl "${D}"/"${MOZILLA_FIVE_HOME}" || die "cp failed"
+
+	# Dirty hack to get some applications using this header running
+	dosym "${MOZILLA_FIVE_HOME}"/include/necko/nsIURI.h \
+		"${MOZILLA_FIVE_HOME}"/include/nsIURI.h
+
+	# Install pkgconfig files
+	insinto /usr/"$(get_libdir)"/pkgconfig
+	doins "${S}"/build/unix/*.pc
+
+	insinto "${MOZILLA_FIVE_HOME}"/greprefs
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+	insinto "${MOZILLA_FIVE_HOME}"/defaults/pref
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+}
+
+pkg_postinst() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# This should be called in the postinst and postrm of all the
+	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
+	# thunderbird-bin ebuilds.
+	update_mozilla_launcher_symlinks
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+
+	elog "Please remember to rebuild any packages that you have built"
+	elog "against firefox. Some packages might be broken by the upgrade; if this"
+	elog "is the case, please search at http://bugs.gentoo.org and open a new bug"
+	elog "if one does not exist. Before filing any bugs, please move or remove ~/.mozilla"
+	elog "and test with a clean profile directory."
+}
+
+pkg_postrm() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	update_mozilla_launcher_symlinks
+}