New patchset, fixing bug 156023 and ppc64.

(Portage version: 2.1.2_rc2-r3)

3 files changed, 406 insertions, 1 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 86934a0d0b71..9f05e37659ab 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.220 2006/11/21 06:42:19 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.221 2006/12/01 21:57:56 kloeri Exp $
+
+*mozilla-firefox-2.0-r2 (01 Dec 2006)
+
+  01 Dec 2006; Bryan Østergaard <kloeri@gentoo.org>
+  +mozilla-firefox-2.0-r2.ebuild:
+  New patchset, fixing bug 156023 and ppc64.
 
   21 Nov 2006; Stefan Schweizer <genstef@gentoo.org>
   -mozilla-firefox-2.0.ebuild, mozilla-firefox-2.0-r1.ebuild:
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0-r2 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0-r2
new file mode 100644
index 000000000000..8a4987fa2fa4
--- /dev/null
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-2.0-r2
@@ -0,0 +1,114 @@
+MD5 03709c15cba0e0375ff5336d538f77e7 firefox-2.0-source.tar.bz2 36922776
+RMD160 88b284b236f29fa5e483a32cd75ceaadebd2f6c3 firefox-2.0-source.tar.bz2 36922776
+SHA256 dba581583ef390fab90c39c9a667bf1a5bfbeaec75e6fbb2a9cedcc857d26800 firefox-2.0-source.tar.bz2 36922776
+MD5 29fc7a487e88d84237d7066e69398f56 mozilla-firefox-2.0-ar.xpi 159961
+RMD160 b18c19e2578b7411a01af7d73468a0908aff2c34 mozilla-firefox-2.0-ar.xpi 159961
+SHA256 f7f2c24f347489d80c9e7becc7c62cf316e3014aceafb699bf6f212614450535 mozilla-firefox-2.0-ar.xpi 159961
+MD5 c648e7f761b9c529e2541c1ca051bffb mozilla-firefox-2.0-bg.xpi 169651
+RMD160 dafd1434125531f943588c4ec4f89da99ca58386 mozilla-firefox-2.0-bg.xpi 169651
+SHA256 fcf1136c08496e732c6d18e8e4db1398f2ee0ae3eee41d3cbb6530d7b9fb1690 mozilla-firefox-2.0-bg.xpi 169651
+MD5 ee53889ab6e80be237ddab759fd03c8e mozilla-firefox-2.0-ca.xpi 170779
+RMD160 91087c7f4b763a847314673ff44ce326281ea3f6 mozilla-firefox-2.0-ca.xpi 170779
+SHA256 44294306982836d991a86efb2d9f64a75474b7d952420bec75e46711d2c0f618 mozilla-firefox-2.0-ca.xpi 170779
+MD5 17b3c175a704fdec2ccb21aa2ffb4b3d mozilla-firefox-2.0-cs.xpi 168073
+RMD160 2b843979e2ae1d6d8cab273b1fedc2ef3489a13c mozilla-firefox-2.0-cs.xpi 168073
+SHA256 181c5abcbeff7c5ab1b6d386885e7eac194f54785b0f2dc95a5869c5b1f56c28 mozilla-firefox-2.0-cs.xpi 168073
+MD5 51925fecee0376be25971f62f6c5cc3a mozilla-firefox-2.0-da.xpi 152242
+RMD160 3dca6c44c058fd60bd528087556b0b0d3c1fa3fb mozilla-firefox-2.0-da.xpi 152242
+SHA256 eb74a06a5c2aa8d897b1497b810ebb91907eb63c93f7a554e1b07f811f8e7e3f mozilla-firefox-2.0-da.xpi 152242
+MD5 ed9623260273cb2b824c9474e5f8621d mozilla-firefox-2.0-de.xpi 152544
+RMD160 0232910542e40a2d4ceb930a514c9c07670baf63 mozilla-firefox-2.0-de.xpi 152544
+SHA256 014004a3b38acbee8017d1ea6fee4763331bac8edf14c8e0503d149fbfe3a792 mozilla-firefox-2.0-de.xpi 152544
+MD5 1cc203237ab727a1f1a7093ef19fde6b mozilla-firefox-2.0-el.xpi 169900
+RMD160 ccea3290029e7e5248086e0a578c562dd086d010 mozilla-firefox-2.0-el.xpi 169900
+SHA256 85cb0b23a43c686233133e93ec1882a7d9b09c3bd8bbf7bc6cc2a5d30ce87a65 mozilla-firefox-2.0-el.xpi 169900
+MD5 35bb47b42a8e97e00df8017013bbac7d mozilla-firefox-2.0-en-GB.xpi 156170
+RMD160 cf50575478fe18e9e5bbef511839e8976d5f1959 mozilla-firefox-2.0-en-GB.xpi 156170
+SHA256 f5a0a1e507d31b0b39a596bbcdefbc62f33e41a045b86241572ebbb501340026 mozilla-firefox-2.0-en-GB.xpi 156170
+MD5 d7277129b3ea1506baae2765162a8e10 mozilla-firefox-2.0-es-AR.xpi 156157
+RMD160 efaa5696a5051635545daaad8ae4b2b0036ec579 mozilla-firefox-2.0-es-AR.xpi 156157
+SHA256 33d6e9d6f6f9fde34d676335365995a0fdfe81211c2723f94c13ffe265d723b8 mozilla-firefox-2.0-es-AR.xpi 156157
+MD5 10b3505b12024bc7f3d4a0f9768cf2a7 mozilla-firefox-2.0-es-ES.xpi 143975
+RMD160 f9ae2ecc69778db9eea1d7a9e6b44305086df5b3 mozilla-firefox-2.0-es-ES.xpi 143975
+SHA256 6871f8a817027c5df23ca2f025b6fb9b254a2b046eb7e282beced648fcf4febd mozilla-firefox-2.0-es-ES.xpi 143975
+MD5 a88f4b05f57b71ead7f25a796f6b8e6d mozilla-firefox-2.0-eu.xpi 153808
+RMD160 294f291667bf41045d3f94a676b118724582dfc7 mozilla-firefox-2.0-eu.xpi 153808
+SHA256 d88b94b2acbd1be34565487f396e1bd043eaa79f41e82e48746e04fa7dd46f6d mozilla-firefox-2.0-eu.xpi 153808
+MD5 343f57229c0a5a7262d2ad22fcc1c268 mozilla-firefox-2.0-fi.xpi 155484
+RMD160 a4489a15798f99302b8c2e2b8b44b19b9b4f90eb mozilla-firefox-2.0-fi.xpi 155484
+SHA256 a3ea0033c94d56c43b2577465948d5757d873e506d210891dc47f55cb2918156 mozilla-firefox-2.0-fi.xpi 155484
+MD5 5e28ab59d14bd72905998e407bb839d9 mozilla-firefox-2.0-fr.xpi 173967
+RMD160 5c6608d324e71b442f35c5e78f1e730d827e9435 mozilla-firefox-2.0-fr.xpi 173967
+SHA256 5f3ee3a81944bf1af360b2099021e4e9d8a37d78915aa83816acae4d66cc50a9 mozilla-firefox-2.0-fr.xpi 173967
+MD5 17bb19548fe2d7f83734e72f2599360f mozilla-firefox-2.0-fy-NL.xpi 167266
+RMD160 bc0bd4d91183cd717d9c148698b446d5dd3faaba mozilla-firefox-2.0-fy-NL.xpi 167266
+SHA256 2899e75d3cc854f287dffab6d5f675bdbcdbedfce1900d28dac1d29ccdfd0acf mozilla-firefox-2.0-fy-NL.xpi 167266
+MD5 0ebe8bf7cff2203b6cff377dee6c172a mozilla-firefox-2.0-ga-IE.xpi 151747
+RMD160 76e8d9af935716fa472463c591e15ff39ea878a8 mozilla-firefox-2.0-ga-IE.xpi 151747
+SHA256 dc33a525c0cdeb554b37c8568f0d771e01ee9c5cb2616ad400f8c4b24fe4ccfc mozilla-firefox-2.0-ga-IE.xpi 151747
+MD5 6a011e2fdfea24d1bc30a725807dc1f6 mozilla-firefox-2.0-gu-IN.xpi 172781
+RMD160 e4348f3e7b7b402359c59490dc86af950d133798 mozilla-firefox-2.0-gu-IN.xpi 172781
+SHA256 d1a7784e2e6386ffdf747b92849d663778d2ce391d19c5ac732190c96aa858a7 mozilla-firefox-2.0-gu-IN.xpi 172781
+MD5 5549ced2315455c13fdeebb08cce9086 mozilla-firefox-2.0-hu.xpi 164165
+RMD160 8fb162518e02a5ffcdb93969f181645af438fb04 mozilla-firefox-2.0-hu.xpi 164165
+SHA256 a297b5f5aa9ea4dae3ab5656b7bc1fcfef350508127fbe251a5ab7e2d92bb285 mozilla-firefox-2.0-hu.xpi 164165
+MD5 dcc23136b40949820c0752db67ef814d mozilla-firefox-2.0-it.xpi 144803
+RMD160 564c9eb35af626b9a479c19c84b06d4bc5a69b09 mozilla-firefox-2.0-it.xpi 144803
+SHA256 a5c049baa1b54bd6190b7004636a63ffc60ae013c09cb1230c0937ebc09fd996 mozilla-firefox-2.0-it.xpi 144803
+MD5 8948d8bb57f62a9e449d7a304ebf3cdb mozilla-firefox-2.0-ja.xpi 163241
+RMD160 669c1e52f4d7ce7bedbe7f2b8fd5e514d5c40cea mozilla-firefox-2.0-ja.xpi 163241
+SHA256 42a9d7aa0ca19fab138087ea9fad5f11dd365c73ddf0fe6b727f1ee88e37dcd0 mozilla-firefox-2.0-ja.xpi 163241
+MD5 dd8dfcd6720a81c2fbf9cfedf45f5ca1 mozilla-firefox-2.0-ko.xpi 148121
+RMD160 4531e311864dadcb48f0d6e624cf061f7eecd63d mozilla-firefox-2.0-ko.xpi 148121
+SHA256 2c66f4b417b278cafd96b0d3276d7aaae04996b85c962e39396a909a6596af73 mozilla-firefox-2.0-ko.xpi 148121
+MD5 7545048621af14a4219ba3f921a21cfc mozilla-firefox-2.0-lt.xpi 164687
+RMD160 5ae8fa44c8aab48d29818882f1a67fbb286b96aa mozilla-firefox-2.0-lt.xpi 164687
+SHA256 f9b91e9302e2789d15d7860d9c43f7d706504f20cab0af96928f0f8adc2d8e2d mozilla-firefox-2.0-lt.xpi 164687
+MD5 3f79545abbb03753f0ab959611b4516e mozilla-firefox-2.0-mk.xpi 160080
+RMD160 aee4665187243bf183099f916bf9cfc41c8517bd mozilla-firefox-2.0-mk.xpi 160080
+SHA256 4492f1d9036f0e159bbd50bd634a1536eea5f4d31fc6f0f0f766fab97cf891a0 mozilla-firefox-2.0-mk.xpi 160080
+MD5 b02851894dd578be3fcc60217df1bf22 mozilla-firefox-2.0-mn.xpi 160248
+RMD160 6380636da8bfe0503bc17e24aec568365623d0c2 mozilla-firefox-2.0-mn.xpi 160248
+SHA256 1737ff0ada9f48eaecaeaa8a115b31779c2663e78ac8be0bed2f7aebb7e0fd14 mozilla-firefox-2.0-mn.xpi 160248
+MD5 e4eb8272d27f878b3bf858615de442ac mozilla-firefox-2.0-nb-NO.xpi 163827
+RMD160 1195bff82b48937a03ff18678c634ffb8556d045 mozilla-firefox-2.0-nb-NO.xpi 163827
+SHA256 809f7c90efb60750a7e3b3f3bfcf888bdd1c8bec929c01140a714b456d9ebe9b mozilla-firefox-2.0-nb-NO.xpi 163827
+MD5 f46a06a15f25e9f584a27ee2928c3d79 mozilla-firefox-2.0-nl.xpi 170117
+RMD160 51a64513d0237bd3300856a6fdd80a0c997869da mozilla-firefox-2.0-nl.xpi 170117
+SHA256 a0ecd0fa64f79f9312fa2876a8c8b1e1dcdf8a68df63157a77fe4c8b86c92b84 mozilla-firefox-2.0-nl.xpi 170117
+MD5 9a9aff8e105e003043b03db93de6de07 mozilla-firefox-2.0-nn-NO.xpi 160799
+RMD160 ff3d51f9a15c36ad0e029be42294007397143790 mozilla-firefox-2.0-nn-NO.xpi 160799
+SHA256 ca9877adddce4fcbe4a5f20beb168f46d865751548f9e122558d0515e49c15d6 mozilla-firefox-2.0-nn-NO.xpi 160799
+MD5 f6d3b4e7b13c7f8a232125130b4e15d8 mozilla-firefox-2.0-patches-0.3.tar.bz2 33402
+RMD160 5b3ac326c338091a7fb785a8349d1203a8937214 mozilla-firefox-2.0-patches-0.3.tar.bz2 33402
+SHA256 a884b20b91ae7fe447e243791932fc9c1a4fb96e970fdb2b948e00e4a6c49f66 mozilla-firefox-2.0-patches-0.3.tar.bz2 33402
+MD5 f17083b5012fc7fbe36fad0b7b440e65 mozilla-firefox-2.0-pl.xpi 171073
+RMD160 776edfa2440cb11b0db9b21a258c450915ba1a8a mozilla-firefox-2.0-pl.xpi 171073
+SHA256 d62608aff8551d182c7c5636672eaa4e181b2e974c53d4b8e86047f12a8831ca mozilla-firefox-2.0-pl.xpi 171073
+MD5 57ae7676a92a121abf5e1cc5c2b3d4d0 mozilla-firefox-2.0-pt-BR.xpi 153408
+RMD160 2b4e69211774f1e4186e2d928a57b8f93bf5cc77 mozilla-firefox-2.0-pt-BR.xpi 153408
+SHA256 0c3b873f56ced84c9c8fc59c164d0dd6a4bfef21fec9a7c849d3da4956aad226 mozilla-firefox-2.0-pt-BR.xpi 153408
+MD5 1709aee003f06e0ad56ba441060282b1 mozilla-firefox-2.0-pt-PT.xpi 153794
+RMD160 ab007d2862c221343fc782348b7a2cdffdced9e9 mozilla-firefox-2.0-pt-PT.xpi 153794
+SHA256 e3b8f8cda69aa4c096f18994077b68f53f342608e5a7c840be223b79b7d98d83 mozilla-firefox-2.0-pt-PT.xpi 153794
+MD5 2b5dbf538ad2ba248742136e65ab2dc1 mozilla-firefox-2.0-ru.xpi 167790
+RMD160 076b4ae92db591973868e0514d67d1af9424e436 mozilla-firefox-2.0-ru.xpi 167790
+SHA256 92df2d55a881506a2b9ee0b35214648d8b91cfaa5955dbadc9e117821278f1e7 mozilla-firefox-2.0-ru.xpi 167790
+MD5 8cc47e219a026ab70dae5b40989eb27e mozilla-firefox-2.0-sk.xpi 165136
+RMD160 b34352da07ae5469e69be830185345fe716c3f6a mozilla-firefox-2.0-sk.xpi 165136
+SHA256 0415f9a1135cfb311d23328349e4811200a16726c772f74ba0828a6a7455dcb0 mozilla-firefox-2.0-sk.xpi 165136
+MD5 e86395ac837f8dde920a9e3a117e157c mozilla-firefox-2.0-sl.xpi 155073
+RMD160 3f720ad1634ca17a84a4fdaece4c743823956a43 mozilla-firefox-2.0-sl.xpi 155073
+SHA256 bd3f9d710dc344121cd342dcc57af0116b841a587d04f7bd3a0530e5e65770b6 mozilla-firefox-2.0-sl.xpi 155073
+MD5 f7d56800c547220437e54153536db752 mozilla-firefox-2.0-sv-SE.xpi 165978
+RMD160 962147d20228f8e29fdc42ed3bbcdbde3b9400ed mozilla-firefox-2.0-sv-SE.xpi 165978
+SHA256 e7879a9da0172109356c7377d844b385f375c4b998f032ac5af404d1d4daeec1 mozilla-firefox-2.0-sv-SE.xpi 165978
+MD5 e5249ad2f365d3bdb4fede7171a7b7ab mozilla-firefox-2.0-tr.xpi 148752
+RMD160 9692710e40046a9f6543aec2e49ac992c59700e1 mozilla-firefox-2.0-tr.xpi 148752
+SHA256 a3d5ed7be7977348f5865eea4676fc48fbb8744922d45556f18ae83f2f4e1fc3 mozilla-firefox-2.0-tr.xpi 148752
+MD5 79b484fc9ce6b8858fe47186086ee2f0 mozilla-firefox-2.0-zh-CN.xpi 142814
+RMD160 512d265ed1a332790d19e9878b0fd2570a3ca1bb mozilla-firefox-2.0-zh-CN.xpi 142814
+SHA256 508e475bdb422deca88a129a2457ba5bde23297eb8267e997a36a100296769aa mozilla-firefox-2.0-zh-CN.xpi 142814
+MD5 eebd36ae137eaef36cfc0b57d5bb8375 mozilla-firefox-2.0-zh-TW.xpi 142024
+RMD160 622e515438a0de617378f218bddd343e041505d1 mozilla-firefox-2.0-zh-TW.xpi 142024
+SHA256 3fba2e180a668237fc974c53a126c85f6fe40ab0e289bb22e337a9871ffbb905 mozilla-firefox-2.0-zh-TW.xpi 142024
diff --git a/www-client/mozilla-firefox/mozilla-firefox-2.0-r2.ebuild b/www-client/mozilla-firefox/mozilla-firefox-2.0-r2.ebuild
new file mode 100644
index 000000000000..50a3a4922bd9
--- /dev/null
+++ b/www-client/mozilla-firefox/mozilla-firefox-2.0-r2.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2006 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-r2.ebuild,v 1.1 2006/12/01 21:57:56 kloeri 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-0.3"
+LANGS="ar bg ca cs da de el en-GB es-AR es-ES eu fi fr fy-NL ga-IE gu-IN hu it ja ko lt mk mn nb-NO nl nn-NO 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 ~sparc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="java mozdevelop mozbranding xforms restrict-javascript"
+
+MOZ_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PV}"
+SRC_URI="${MOZ_URI}/source/firefox-${PV}-source.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
+
+	[[ `uname -m` = "ppc64" ]] && die "Building on a ppc64 host requires linux32."
+
+	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
+
+	# Fix a compilation issue using the 32-bit userland with 64-bit kernel on
+	# PowerPC, because with that configuration, it detects a ppc64 system.
+	# -- hansmi, 2005-11-13
+	if use ppc && [[ "${PROFILE_ARCH}" == ppc64 ]]; then
+		sed -i -e "s#OS_TEST=\`uname -m\`\$#OS_TEST=${ARCH}#" \
+			"${S}"/configure
+		sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \
+			"${S}"/security/coreconf/arch.mk
+	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 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
+}