revision bump, including security updates

(Portage version: 2.1_pre10-r2)

5 files changed, 396 insertions, 7 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 7e469575523a..3a91a30655c2 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.147 2006/05/01 17:02:12 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.148 2006/05/02 23:00:39 anarchy Exp $
+
+*mozilla-firefox-1.5.0.3 (02 May 2006)
+
+  02 May 2006; Jory A. Pratt <anarchy@gentoo.org>
+  +mozilla-firefox-1.5.0.3.ebuild:
+  revision bump, including security updates
 
   01 May 2006; <nixnut@gentoo.org> mozilla-firefox-1.5.0.2-r1.ebuild:
   Stable on ppc as requested by Anarchy.
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.2 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.2
index c6e5e4c5f89b..d32c1b624fb4 100644
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.2
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.2
@@ -1,6 +1,6 @@
-MD5 6bd65d899e9bcb16c28225899cc61a1e firefox-1.5.0.2-source.tar.bz2 35234245
-RMD160 a3128798930d069a175d278b5522cdc8e43dc352 firefox-1.5.0.2-source.tar.bz2 35234245
-SHA256 23aa847dd166ac8240b85c114e937f65003750045aa69b30000cfeb9414ed83c firefox-1.5.0.2-source.tar.bz2 35234245
+MD5 50ec8471ddb45838f2240a957eedd985 firefox-1.5.0.2-source.tar.bz2 418136
+RMD160 94a3655506ceba8d3f5649906e04fdceba06c7ff firefox-1.5.0.2-source.tar.bz2 418136
+SHA256 2992301187419ee0d2d014dfae0cffb9922c24ed7d715246951f3042e7e461cf firefox-1.5.0.2-source.tar.bz2 418136
 MD5 2b774cc5eb0930da204e7b4ea619da64 firefox-ar-1.5.0.2.xpi 153269
 RMD160 2d9ae94b62e3a3ed0017f9074c5c12d1defcf074 firefox-ar-1.5.0.2.xpi 153269
 SHA256 1c6cba1daf12a8032dffbd563fc52e389c09a20d3e4f3775fc947ba6498216b3 firefox-ar-1.5.0.2.xpi 153269
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.2-r1 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.2-r1
index 1c9d3ee6e6ae..7ed2c4e1b726 100644
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.2-r1
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.2-r1
@@ -1,6 +1,6 @@
-MD5 6bd65d899e9bcb16c28225899cc61a1e firefox-1.5.0.2-source.tar.bz2 35234245
-RMD160 a3128798930d069a175d278b5522cdc8e43dc352 firefox-1.5.0.2-source.tar.bz2 35234245
-SHA256 23aa847dd166ac8240b85c114e937f65003750045aa69b30000cfeb9414ed83c firefox-1.5.0.2-source.tar.bz2 35234245
+MD5 50ec8471ddb45838f2240a957eedd985 firefox-1.5.0.2-source.tar.bz2 418136
+RMD160 94a3655506ceba8d3f5649906e04fdceba06c7ff firefox-1.5.0.2-source.tar.bz2 418136
+SHA256 2992301187419ee0d2d014dfae0cffb9922c24ed7d715246951f3042e7e461cf firefox-1.5.0.2-source.tar.bz2 418136
 MD5 2b774cc5eb0930da204e7b4ea619da64 firefox-ar-1.5.0.2.xpi 153269
 RMD160 2d9ae94b62e3a3ed0017f9074c5c12d1defcf074 firefox-ar-1.5.0.2.xpi 153269
 SHA256 1c6cba1daf12a8032dffbd563fc52e389c09a20d3e4f3775fc947ba6498216b3 firefox-ar-1.5.0.2.xpi 153269
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.3 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.3
new file mode 100644
index 000000000000..a7a8d247a2b4
--- /dev/null
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.3
@@ -0,0 +1,96 @@
+MD5 30e99f7ac4f4cc1c8c69a6895292ef3c firefox-1.5.0.3-source.tar.bz2 35239885
+RMD160 0c278d242bb763343690a51f5e3b4750cb10a937 firefox-1.5.0.3-source.tar.bz2 35239885
+SHA256 eef8db5fb7cce258d3cb10856fb77eba38617d86c1c533815a6d30a6ba06b6c8 firefox-1.5.0.3-source.tar.bz2 35239885
+MD5 07477843b8b41b14b6b86a5c9fb21349 firefox-ar-1.5.0.3.xpi 153269
+RMD160 0f3c08b49df65e576dd4912b422b7507d09812d5 firefox-ar-1.5.0.3.xpi 153269
+SHA256 1fc595dd0013a6011444a95d5cca6d1071bb9ff4598842e1f215ab25d4c20807 firefox-ar-1.5.0.3.xpi 153269
+MD5 26082ca3f08bf52c89fee0270396e54a firefox-ca-1.5.0.3.xpi 161283
+RMD160 88235337d7bbf2b82583dbcb8e6f8247e200358e firefox-ca-1.5.0.3.xpi 161283
+SHA256 88f5cc9f744e832dd28e4f60e724a989b6f243c7f68f382168d378e8a513e5ba firefox-ca-1.5.0.3.xpi 161283
+MD5 6a9d024bdfc5258134a9870250e85871 firefox-cs-1.5.0.3.xpi 153054
+RMD160 8bdf00f26a63f86bcec2f2c37066db02315c2a5f firefox-cs-1.5.0.3.xpi 153054
+SHA256 f97cee88d69ad6a8b7efe9315d8a89db95bbef045a32d837285f9128831f874f firefox-cs-1.5.0.3.xpi 153054
+MD5 2925106d85f754cdbff42c1fede2d21d firefox-da-1.5.0.3.xpi 142462
+RMD160 51314c0a34308546154d4a48e2ea5527d47c1025 firefox-da-1.5.0.3.xpi 142462
+SHA256 8ad1cc7f9e1a2e73109eaec4919d5241c5f6ef310e720b37d54daeee659200b6 firefox-da-1.5.0.3.xpi 142462
+MD5 579ac08bb4af6022171bc0d50646a88f firefox-de-1.5.0.3.xpi 141050
+RMD160 67c90126d6eb10dc6f44da686db860bf4245b9eb firefox-de-1.5.0.3.xpi 141050
+SHA256 0b337a80296d647c256bd1f20c0802c3d496fac0169759321fbc54386df9620b firefox-de-1.5.0.3.xpi 141050
+MD5 454e9db29e848dcff549374261553bbc firefox-el-1.5.0.3.xpi 146941
+RMD160 53a486d3d5f06b79f2e86e327fe8ac2a86ac6ec6 firefox-el-1.5.0.3.xpi 146941
+SHA256 5aba5922a46e74ad8cdc48a5c10e9564c2d38d3755feccce541188f0b02d8609 firefox-el-1.5.0.3.xpi 146941
+MD5 e58923a5710915a5419de34b01bddc3f firefox-en-GB-1.5.0.3.xpi 139579
+RMD160 068dc4c1010ff9b301db9196813784d1bda09cc1 firefox-en-GB-1.5.0.3.xpi 139579
+SHA256 b20b413bd157b7f6a33bcf8e72c85ca16d0fedacbbe8d45ac063f46943f10c56 firefox-en-GB-1.5.0.3.xpi 139579
+MD5 b7a04b0652a09af2b5855ca169eb6473 firefox-es-AR-1.5.0.3.xpi 146127
+RMD160 13017ee5776d1ffa60aec7b28ec6afc584ce8de9 firefox-es-AR-1.5.0.3.xpi 146127
+SHA256 b790b0d9fc43c6a74cefe893d69b836beb134f92e18ce56a1db5dc10a09a0ac8 firefox-es-AR-1.5.0.3.xpi 146127
+MD5 0218fb9f67364045c4c54adb4ea45542 firefox-es-ES-1.5.0.3.xpi 132483
+RMD160 1f3abca2361ea2a848e5df8ff70e44a3edb23c19 firefox-es-ES-1.5.0.3.xpi 132483
+SHA256 b4cb2316f82be99ada4255fe15efaf406bbe3da2f72c36a3699a1159c84fd90c firefox-es-ES-1.5.0.3.xpi 132483
+MD5 7f58c0977fda75aa78aee62c0e733ec7 firefox-fi-1.5.0.3.xpi 143014
+RMD160 369e9b04b2fe61d2385050a75c8adcc834e01c7c firefox-fi-1.5.0.3.xpi 143014
+SHA256 cde885355638c98aba6716220211e07d586f0b557ea7c441c9f5ff940b115573 firefox-fi-1.5.0.3.xpi 143014
+MD5 987a1ce12b8a4e69902154b2c7b8764c firefox-fr-1.5.0.3.xpi 203232
+RMD160 0a27ff747a0783c79a9f1cfa8344371c44352927 firefox-fr-1.5.0.3.xpi 203232
+SHA256 76dfcdc2c14228a5bb221e3920dd28c1dee97be9bbec09efaea84c29f7054ba1 firefox-fr-1.5.0.3.xpi 203232
+MD5 7203ae76e00480373ecfc58a07016f93 firefox-ga-IE-1.5.0.3.xpi 144794
+RMD160 b2a8be0576a1d2ee05ac5c455d0132adc35fb76b firefox-ga-IE-1.5.0.3.xpi 144794
+SHA256 398f3c7b2cea77bc5ddd34439697e6255927bdc51798501c0c9187400ed21d79 firefox-ga-IE-1.5.0.3.xpi 144794
+MD5 c11d7a3ce10acdb414127d3d7872dd84 firefox-he-1.5.0.3.xpi 144977
+RMD160 88065e452023369cbe7dd0b2550ce0afe9be5ccc firefox-he-1.5.0.3.xpi 144977
+SHA256 607d1cb271dff67e759d9f30b86261d07a4fbdc7bc09eae5fa59319ad4c96715 firefox-he-1.5.0.3.xpi 144977
+MD5 e8ee05876ac781e17682e288bfab7a28 firefox-hu-1.5.0.3.xpi 154452
+RMD160 695c02be642c1d98f26a0d319a88a089a5d82bba firefox-hu-1.5.0.3.xpi 154452
+SHA256 c20f2eb578f74201f28b39cb6b453e7867bd4df98e3b19f1c0e7a7a40868539c firefox-hu-1.5.0.3.xpi 154452
+MD5 5218d835ba683f5f25b7f8c7655cdc19 firefox-it-1.5.0.3.xpi 156712
+RMD160 8442bdfdf466727aa3d5095f3994d0c3cfa42cb5 firefox-it-1.5.0.3.xpi 156712
+SHA256 a1a71fe944b691f9b609b436d49c7362ce40e62ef59bac56f0e5911e151fc5e2 firefox-it-1.5.0.3.xpi 156712
+MD5 659b69cb3bcff591b299d1d6943b4b20 firefox-ja-1.5.0.3.xpi 162443
+RMD160 24d0de9a0c819860bfd855edf98a612ae7f18651 firefox-ja-1.5.0.3.xpi 162443
+SHA256 5980950a42c5b0215bc0d5cb7d83bbc92fc297154ea503839d85d2095b75ea49 firefox-ja-1.5.0.3.xpi 162443
+MD5 65e61a1af8344bd5ba4c8452383d13c9 firefox-ko-1.5.0.3.xpi 149477
+RMD160 f03335e33de8c07eca7c44dbb2f24d19222f4ab4 firefox-ko-1.5.0.3.xpi 149477
+SHA256 5ecb8445558130e2acf87f64c097da9e365cbed2a9f27a52eba44dc5bfe71652 firefox-ko-1.5.0.3.xpi 149477
+MD5 07f6c677715db900198d824d4ee66811 firefox-mk-1.5.0.3.xpi 162212
+RMD160 ecadceb840e7b0b01055846f6b73a6febcc4a77a firefox-mk-1.5.0.3.xpi 162212
+SHA256 05199f472b020520ebb1a5b4d11302928eab9e19cded0f00882f51aeac3bff82 firefox-mk-1.5.0.3.xpi 162212
+MD5 0d91c273d32f676fde896591d5b864fe firefox-nb-NO-1.5.0.3.xpi 151775
+RMD160 b037db352446d54f73c1c4c33ea88840b509d559 firefox-nb-NO-1.5.0.3.xpi 151775
+SHA256 0fee3d1a40da1a49d148453580ee6dc193b2afae338a879c3f227f23ee8473ac firefox-nb-NO-1.5.0.3.xpi 151775
+MD5 884643cc78ce6bbf5fc694427e284d24 firefox-nl-1.5.0.3.xpi 150930
+RMD160 dc8dda8e31c5ab2a87d30c5612911704a9fdc294 firefox-nl-1.5.0.3.xpi 150930
+SHA256 7d06f2eaf97d21af5f4e362d15e02177dcc7777b0b650b0f63812e3596eb5367 firefox-nl-1.5.0.3.xpi 150930
+MD5 7c5107b5afa7fcaa27830eec84a85097 firefox-pl-1.5.0.3.xpi 243653
+RMD160 6a759acf08bdad414995fc5e976e77d6742c61b0 firefox-pl-1.5.0.3.xpi 243653
+SHA256 d4198edbe09c57b0d84b3c7ed067be448bb09b375eac195473c36abdfd201f03 firefox-pl-1.5.0.3.xpi 243653
+MD5 caad08cc005ac4da77ec1836b4d532fe firefox-pt-BR-1.5.0.3.xpi 143567
+RMD160 255b92a0fe001bc8d5176591dd52d8bb967470ac firefox-pt-BR-1.5.0.3.xpi 143567
+SHA256 854a42497cf50c00efd6e9f53b9f3e0ae441ce25ca296a2dca207aa80484dda3 firefox-pt-BR-1.5.0.3.xpi 143567
+MD5 91eac1a0200422393e5835214caec44c firefox-ro-1.5.0.3.xpi 144113
+RMD160 f13ac837b064d91b9ea768266e354d15eaf9ef64 firefox-ro-1.5.0.3.xpi 144113
+SHA256 a8b88b16485e93145ca46d4d2701c7a16e0c06bd1045c27e1edf857d0289661d firefox-ro-1.5.0.3.xpi 144113
+MD5 f87b33424715c6b4c95a51b2a5009820 firefox-ru-1.5.0.3.xpi 170096
+RMD160 2d2c09356e3791d07e72cbc643fdc2bcc0b73294 firefox-ru-1.5.0.3.xpi 170096
+SHA256 2b52aa8d2768f378faa2bc13e882f8550a84a618bb6ad4357cf746793e9f1876 firefox-ru-1.5.0.3.xpi 170096
+MD5 36bc8ca98adf4a818dc50dc140bce449 firefox-sk-1.5.0.3.xpi 153991
+RMD160 63e6b24f925b5f46a54e9ea68b5c8a2546ea1ecf firefox-sk-1.5.0.3.xpi 153991
+SHA256 82314e089077c75036bdfcbeac39c18f0da638088ad01f8efc9baef7015e7304 firefox-sk-1.5.0.3.xpi 153991
+MD5 e3ab0218f3ddd79bb91cd337479019e9 firefox-sl-1.5.0.3.xpi 145204
+RMD160 a52cb41535649c644785411fac4f90df1a80c133 firefox-sl-1.5.0.3.xpi 145204
+SHA256 3d339e68d5b87f712cfd77602da0c1e6d70eb7070b5845c1dadc973cbfc04718 firefox-sl-1.5.0.3.xpi 145204
+MD5 7aeb687a5bc3e8c139e139c027384a65 firefox-sv-SE-1.5.0.3.xpi 154914
+RMD160 a9cebaca7f3bba7d0874f0f00d450ed002a4184a firefox-sv-SE-1.5.0.3.xpi 154914
+SHA256 9ae3c5ce4c73a36d62911508028a92d25c83207fd8877379d71c1ec32454363d firefox-sv-SE-1.5.0.3.xpi 154914
+MD5 323e07f4c0407b5738d7118ffb6fdc46 firefox-tr-1.5.0.3.xpi 136158
+RMD160 ef50d4ce3a5ef9b9252a7ebb51bba894415d2d78 firefox-tr-1.5.0.3.xpi 136158
+SHA256 f8f6784dfe7e8081a2f758507e7efc5c4ee9f8db3d71c796e5f133444fd1a3eb firefox-tr-1.5.0.3.xpi 136158
+MD5 493b80be0b8704c70392fa7a9a48fb0b firefox-zh-CN-1.5.0.3.xpi 136417
+RMD160 af558e30111a0475f7bb0cee23313ea6673e7881 firefox-zh-CN-1.5.0.3.xpi 136417
+SHA256 4fb8682652d8c7c88c94d6f0582796df54d6fa972c13a69d421b03c1980a9934 firefox-zh-CN-1.5.0.3.xpi 136417
+MD5 d31199f8218e7fc5aac7a165c8aa2f5a firefox-zh-TW-1.5.0.3.xpi 128231
+RMD160 6f0835055f0151e04d0bb921c6e98f872dc2d5c2 firefox-zh-TW-1.5.0.3.xpi 128231
+SHA256 40238485b813db24f493403196158e40de222316f6f8adaaa9f618c02f7d8c74 firefox-zh-TW-1.5.0.3.xpi 128231
+MD5 9e407327e9d3072af85d37617f9e5133 mozilla-firefox-1.5.0.3-patches-1.0.tar.bz2 39680
+RMD160 b286a75fc31da5e00e49f5cae6db107207f4a676 mozilla-firefox-1.5.0.3-patches-1.0.tar.bz2 39680
+SHA256 b15bc304850e646601b0c9121cd2febfc3f06c311f7c3bc3d91b8200165a32ce mozilla-firefox-1.5.0.3-patches-1.0.tar.bz2 39680
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.5.0.3.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.3.ebuild
new file mode 100644
index 000000000000..dedd16bd12ba
--- /dev/null
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.3.ebuild
@@ -0,0 +1,287 @@
+# 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-1.5.0.3.ebuild,v 1.1 2006/05/02 23:00:39 anarchy Exp $
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime mozextension autotools
+
+LANGS="ar ca cs da de el en-GB es-AR es-ES fi fr ga-IE he hu it ja ko mk nb-NO nl pl pt-BR ro ru sk sl sv-SE tr zh-CN zh-TW"
+SHORTLANGS="es-ES ga-IE nb-NO sv-SE"
+PVER="1.0"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.org/projects/firefox/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2
+	mirror://gentoo/${P}-patches-${PVER}.tar.bz2
+	http://dev.gentoo.org/~anarchy/dist/${P}-patches-${PVER}.tar.bz2"
+
+for X in ${LANGS} ; do
+	SRC_URI="${SRC_URI} linguas_${X/-/_}? ( mirror://gentoo/firefox-${X}-${PV}.xpi )"
+done
+
+for X in ${SHORTLANGS} ; do
+	SRC_URI="${SRC_URI} linguas_${X%%-*}? ( mirror://gentoo/firefox-${X}-${PV}.xpi )"
+done
+
+KEYWORDS="-* ~amd64 ~ia64 ~ppc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="java mozdevelop"
+
+RDEPEND="java? ( virtual/jre )
+	>=www-client/mozilla-launcher-1.39
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.10
+	>=dev-libs/nspr-4.6.1"
+
+DEPEND="${RDEPEND}
+	java? ( >=dev-java/java-config-0.2.0 )"
+
+S=${WORKDIR}/mozilla
+
+# Needed by src_compile() and src_install().
+# Would do in pkg_setup but that loses the export attribute, they
+# become pure shell variables.
+export MOZ_CO_PROJECT=browser
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+
+linguas() {
+	linguas=
+	local LANG
+	for LANG in ${LINGUAS}; do
+		if hasq ${LANG} ${LANGS//-/_} en; then
+			hasq ${LANG//_/-} ${linguas} || \
+				linguas="${linguas} ${LANG//_/-}"
+			continue
+		else
+			local SLANG
+			for SLANG in ${SHORTLANGS}; do
+				if [[ ${LANG} == ${SLANG%%-*} ]]; then
+					hasq ${SLANG} ${linguas} || \
+						linguas="${linguas} ${SLANG}"
+					continue 2
+				fi
+			done
+		fi
+		ewarn "Sorry, but mozilla-firefox does not support the ${LANG} LINGUA"
+	done
+}
+
+src_unpack() {
+	unpack firefox-${PV}-source.tar.bz2  ${P}-patches-${PVER}.tar.bz2
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != en ]] && xpi_unpack firefox-${X}-${PV}.xpi
+	done
+
+	# Apply our patches
+	cd ${S} || die "cd failed"
+	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
+
+	WANT_AUTOCONF="2.13" \
+		eautoreconf || die "failed  running eautoreconf"
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	mozconfig_annotate '' --enable-extensions=default,typeaheadfind
+	mozconfig_annotate '' --disable-mailnews
+	#mozconfig_annotate '' --enable-native-uconv
+	mozconfig_annotate '' --enable-image-encoder=all
+	mozconfig_annotate ''  --enable-canvas
+	mozconfig_annotate '' --with-system-nspr
+	mozconfig_annotate '' --with-system-nss
+	mozconfig_annotate '' --enable-official-branding
+
+	# 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}
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# hardened GCC uses -fstack-protector-all by default, which breaks us
+	gcc-specs-ssp && append-flags -fno-stack-protector-all
+	# remove -fstack-protector because now it borks firefox
+	CFLAGS=${CFLAGS/-fstack-protector-all/}
+	CFLAGS=${CFLAGS/-fstack-protector/}
+	CXXFLAGS=${CXXFLAGS/-fstack-protector-all/}
+	CXXFLAGS=${CXXFLAGS/-fstack-protector/}
+
+	append-flags -freorder-blocks -fno-reorder-functions
+
+	# Export CPU_ARCH_TEST  as it is not exported by default.
+	case $(tc-arch) in
+	amd64) [[ ${ABI} == "x86" ]] && CPU_ARCH_TEST="x86" || CPU_ARCH_TEST="x86_64" ;;
+	*) CPU_ARCH_TEST=$(tc-arch) ;;
+	esac
+
+	export CPU_ARCH_TEST
+
+	####################################
+	#
+	#  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 || die
+}
+
+pkg_preinst() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	echo ""
+	einfo "We are removing old install before we continue. This is to help"
+	einfo "eliminate any problems during the install, sorry for those of you"
+	einfo "who disagree with this but this will ensure a sane build for everyone"
+	einfo "Comments and suggestion should be addressed to mozilla@gentoo.org"
+	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
+	echo ""
+}
+
+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}
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != en ]] && xpi_install ${WORKDIR}/firefox-${X}-${PV}
+	done
+
+	local LANG=${linguas%% *}
+	if [[ ${LANG} != "" && ${LANG} != "en" ]]; then
+		ebegin "Setting default locale to ${LANG}"
+		sed -i "s:pref(\"general.useragent.locale\", \"en-US\"):pref(\"general.useragent.locale\", \"${LANG}\"):" \
+			${D}${MOZILLA_FIVE_HOME}/defaults/pref/firefox.js \
+			${D}${MOZILLA_FIVE_HOME}/defaults/pref/firefox-l10n.js
+		eend $? || 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
+	doicon ${FILESDIR}/icon/firefox-icon.png
+	domenu ${FILESDIR}/icon/mozillafirefox-1.5.desktop
+
+	# 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
+	#
+	####################################
+
+	ewarn "Installing includes and idl files..."
+	dodir ${MOZILLA_FIVE_HOME}/idl ${MOZILLA_FIVE_HOME}/include
+	cd ${S}/dist
+	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include || die "failed to copy"
+	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/idl || die "failed to copy"
+
+	# Dirty hack to get some applications using this header running
+	dosym ${MOZILLA_FIVE_HOME}/include/necko/nsIURI.h \
+		/usr/$(get_libdir)/${MOZILLA_FIVE_HOME##*/}/include/nsIURI.h
+
+
+	# Fix pkgconfig files and install them
+	insinto /usr/$(get_libdir)/pkgconfig
+	for x in ${S}/build/unix/*.pc; do
+		doins ${x}
+	done
+
+	####################################
+	# 
+	# Some preferences, probably gentoo.org as start-page also
+	#
+	####################################
+
+	dodir ${MOZILLA_FIVE_HOME}/greprefs
+	cp ${FILESDIR}/gentoo-default-prefs.js ${D}/${MOZILLA_FIVE_HOME}/greprefs/all-gentoo.js
+	dodir ${MOZILLA_FIVE_HOME}/defaults/pref
+	cp ${FILESDIR}/gentoo-default-prefs.js ${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js
+
+	# Install docs
+	dodoc LEGAL
+}
+
+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
+
+	echo  ""
+	ewarn "Please remember to rebuild any packages that you have built"
+	ewarn "against firefox. Some packages might be broken by the upgrade; if this"
+	ewarn "is the case, please search at http://bugs.gentoo.org and open a new bug"
+	ewarn "if one does not exist. Before filing any bugs, please move or remove ~/.mozilla"
+	ewarn "and test with a clean profile directory."
+	ewarn "Thank you! anarchy@gentoo.org."
+
+	echo     ""
+	einfo "Any regchrome errors can be ignored right now, this is due to"
+	einfo "mozilla-firefox-1.0.x. being unregistered with mozilla-launcher."
+
+	epause 15
+}
+
+pkg_postrm() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	update_mozilla_launcher_symlinks
+}