New Firefox release 1.5.0.7: fixes several security vunurabilities listed at <http://tinyurl.com/fn9ox>

(Portage version: 2.1-r2)

3 files changed, 417 insertions, 1 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 7102e1f682cd..de129a4b6bda 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,13 @@
 # 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.181 2006/09/15 16:03:59 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.182 2006/09/16 04:19:38 redhatter Exp $
+
+*mozilla-firefox-1.5.0.7 (16 Sep 2006)
+
+  16 Sep 2006; Stuart Longland <redhatter@gentoo.org>
+  +mozilla-firefox-1.5.0.7.ebuild:
+  New Firefox release 1.5.0.7: fixes several security vunurabilities listed at
+  <http://tinyurl.com/fn9ox>
 
   15 Sep 2006; Thomas Cort <tcort@gentoo.org>
   mozilla-firefox-2.0_beta2.ebuild:
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.7 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.7
new file mode 100644
index 000000000000..d999044e1f61
--- /dev/null
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.7
@@ -0,0 +1,111 @@
+MD5 518cbd99a3fe663237070013e5cdb1a4 firefox-1.5.0.7-source.tar.bz2 35541113
+RMD160 156a73842949d4fcd401dfaa54afc6cac3aa66c2 firefox-1.5.0.7-source.tar.bz2 35541113
+SHA256 9fea10a367f7709649fdd93830cf1d9e2c63b9a840a6f03e28da6afd5d286989 firefox-1.5.0.7-source.tar.bz2 35541113
+MD5 f6c930fb3d703901c11fe4f58296ed3d firefox-ar-1.5.0.7.xpi 153269
+RMD160 f4b054e00bfef596d5c51615c96f15588c60d56f firefox-ar-1.5.0.7.xpi 153269
+SHA256 b8016826a5e2e84a7e9404e256f5fa9ef1969aa6aa51271374ff3671d0afebb8 firefox-ar-1.5.0.7.xpi 153269
+MD5 e613cd409bb32c4fd6d5a78844c4dc81 firefox-bg-1.5.0.7.xpi 163016
+RMD160 898538f8151bc511c7af9630d2e2cbc6e2a13998 firefox-bg-1.5.0.7.xpi 163016
+SHA256 06f51127adcc792849ab03419b6d72a1c3dc413f488e431c9b4c4a44da5c919a firefox-bg-1.5.0.7.xpi 163016
+MD5 4571d3a887aaba3f0b244a940b51dfee firefox-ca-1.5.0.7.xpi 161283
+RMD160 fad939c10b50cb790c521ee46d3f84625a89c4ea firefox-ca-1.5.0.7.xpi 161283
+SHA256 a849189227b9013c6053913b6a1f7dcf9fe674212391bba99ed6682cd7314cb0 firefox-ca-1.5.0.7.xpi 161283
+MD5 634b3aa9a6f990dab20c506384318707 firefox-cs-1.5.0.7.xpi 153054
+RMD160 4f673a2c1f2f3a0a39b5e2b344be4020568b41dd firefox-cs-1.5.0.7.xpi 153054
+SHA256 832b56cd65d64a5b046bced33d6a7f37b36df700f90a766415e04b66f927cdc3 firefox-cs-1.5.0.7.xpi 153054
+MD5 0d843eac73833bcf573fcdf39b0a99ae firefox-da-1.5.0.7.xpi 142462
+RMD160 b712fe6c086593b3bfa2830c28dd45c77aa7c26d firefox-da-1.5.0.7.xpi 142462
+SHA256 4bf4b8b2c12e177319244ba3cc06e1cbd33b7872c200212f005e92de30483e4d firefox-da-1.5.0.7.xpi 142462
+MD5 40512834c48ccf800729caad1a72d504 firefox-de-1.5.0.7.xpi 141050
+RMD160 76859556500bb8d2b60282168731dba8673220e7 firefox-de-1.5.0.7.xpi 141050
+SHA256 6f1dd3ce49395777d32fb9b116d09a901851c3d47fe2d29b2ec8a34e346b99bc firefox-de-1.5.0.7.xpi 141050
+MD5 7f424fb24b6f50b6007287965b864617 firefox-el-1.5.0.7.xpi 146942
+RMD160 50d60e7e2a1d5548c2c7b51e0ab0ffd89f00b012 firefox-el-1.5.0.7.xpi 146942
+SHA256 23a66c50334d16e76d232fdb43d48bb911f75b05a9fdb8652f7ff3392d13c1ab firefox-el-1.5.0.7.xpi 146942
+MD5 25a19cd69084ed1acf2617e88cd197b2 firefox-en-GB-1.5.0.7.xpi 139579
+RMD160 c295b5705511758f112cd776562eb6926ce84748 firefox-en-GB-1.5.0.7.xpi 139579
+SHA256 94449240881284fe4eed2cc04f786936c55010db6a7603990ee9fd9deb47937c firefox-en-GB-1.5.0.7.xpi 139579
+MD5 ae6d870e7a306f381f37eec9e2dca35e firefox-es-AR-1.5.0.7.xpi 146126
+RMD160 38fb0ff8cc0a0f1759b5b84b44ffb27bf8102f06 firefox-es-AR-1.5.0.7.xpi 146126
+SHA256 af91ce570b0c41d7ea9177cdc3f8ea659f06c97069bc12247898fb9b439a2e0f firefox-es-AR-1.5.0.7.xpi 146126
+MD5 d8bba1f48b18cc6312974e16f5afe1f7 firefox-es-ES-1.5.0.7.xpi 132483
+RMD160 9d1e14d715ca31270c0a49c48a0790624d580553 firefox-es-ES-1.5.0.7.xpi 132483
+SHA256 b6cee480d7c97943a906c82091699284750ca4b55279c2e70f22318841f6457c firefox-es-ES-1.5.0.7.xpi 132483
+MD5 97825b9244592867bc45990fc33f748c firefox-eu-1.5.0.7.xpi 138736
+RMD160 7cbc55490381c6ba975b08420d0b834879501f22 firefox-eu-1.5.0.7.xpi 138736
+SHA256 d512b4db1512a845dc7fc3ecee95a12db301b65a9e801b8a09fa6d16f0bbf56f firefox-eu-1.5.0.7.xpi 138736
+MD5 c1789a21528c775c6e6c49b12b00c21f firefox-fi-1.5.0.7.xpi 143014
+RMD160 b0a652741dc745187555a5fd971df905ffe7346c firefox-fi-1.5.0.7.xpi 143014
+SHA256 08e9870b6ef7aeed0fc65f8b30b59191c18145849fad54dec9d0ba2cccc307fb firefox-fi-1.5.0.7.xpi 143014
+MD5 6c53c58f2611ce03297288a38cab2db2 firefox-fr-1.5.0.7.xpi 203230
+RMD160 1b18b9def26f635d8c7df5ac95f8576159df1fc3 firefox-fr-1.5.0.7.xpi 203230
+SHA256 e9fd63d383916e81415941c1392610479424fc0708f48d4593ae3070603530ca firefox-fr-1.5.0.7.xpi 203230
+MD5 784fda90e49fef0f51419ac31f0f7993 firefox-ga-IE-1.5.0.7.xpi 144794
+RMD160 a83b6526bac127654e84a052bf4cfc6dff14584e firefox-ga-IE-1.5.0.7.xpi 144794
+SHA256 fb34e23b2327e7de765e4faa01d4ec23069cec166725b0b475521253f2f36f9c firefox-ga-IE-1.5.0.7.xpi 144794
+MD5 7c571e7c00cd9f3d022e63516a7d4d7a firefox-gu-IN-1.5.0.7.xpi 163188
+RMD160 42a025cb67f6ed76d54c956dd1737ded2e57a96a firefox-gu-IN-1.5.0.7.xpi 163188
+SHA256 df6671c928584e4c4cd4ed463418e6fd7887af1831ad8840cf3f61886ce43b3e firefox-gu-IN-1.5.0.7.xpi 163188
+MD5 a4bdc7c8ece6a48b525a83172afe89de firefox-he-1.5.0.7.xpi 144977
+RMD160 57c8713c020009c52eb8507c36db1365111cede8 firefox-he-1.5.0.7.xpi 144977
+SHA256 1d5294f122ede67084dda9f1b7a35f1f7b9ea9c141eaca1f0bb0d08cde01ab73 firefox-he-1.5.0.7.xpi 144977
+MD5 2720e67352e5b34e60ab1c7fe18a6bd1 firefox-hu-1.5.0.7.xpi 154453
+RMD160 6869334404648c0fbb7d64d0c63399ee8e8cbf9a firefox-hu-1.5.0.7.xpi 154453
+SHA256 24a28b9e22aa037458411b42afe8677d5fc3ca63eac8d2cea9743b1666e9e6a2 firefox-hu-1.5.0.7.xpi 154453
+MD5 e0559c40be51bf31568ab45665e5934d firefox-it-1.5.0.7.xpi 156720
+RMD160 b66df0b6df5508d9101ac18c878bf4a8b183679c firefox-it-1.5.0.7.xpi 156720
+SHA256 5c2fc74d4bb03a2cf4b134eb651b989fa7088d5c9e2d3e05db63cf5b93eb1bbe firefox-it-1.5.0.7.xpi 156720
+MD5 5382cb9b4dbf85771e2adec1241b9a31 firefox-ja-1.5.0.7.xpi 162443
+RMD160 8c16beb5277737909c2b3d5fcf9ba91743c0c9ab firefox-ja-1.5.0.7.xpi 162443
+SHA256 69af1be95efd77b3b158953187dc39f331f8b177cbd59df6dd9b023699514415 firefox-ja-1.5.0.7.xpi 162443
+MD5 1481fa67e247eafb374d6c6a8520daff firefox-ko-1.5.0.7.xpi 149488
+RMD160 3822ee625d491af5da63305bddd5b8aff4a04324 firefox-ko-1.5.0.7.xpi 149488
+SHA256 287dabc76e49272dd3f00a2c18a3ade36b601cdc428ac208a5497915bdc5bb9e firefox-ko-1.5.0.7.xpi 149488
+MD5 2b3d855ff3940931277afae45a401992 firefox-lt-1.5.0.7.xpi 155111
+RMD160 aa2402ae8c9202d2669537e13a4656f24fa5b01e firefox-lt-1.5.0.7.xpi 155111
+SHA256 e128b47c62ecb534c7b2b49a9d635b5ca601cdea74d8a711d3cb2ae434bd0f61 firefox-lt-1.5.0.7.xpi 155111
+MD5 2fbc8c153ab3b506215d573a0e406852 firefox-mk-1.5.0.7.xpi 162211
+RMD160 754d9a44c0b29bd332c9966bba622e0cacbc971f firefox-mk-1.5.0.7.xpi 162211
+SHA256 292da44c0335ce8cacd0518a3fa29e1ddd3e7a2f2f02d8cd4019aca4be064f75 firefox-mk-1.5.0.7.xpi 162211
+MD5 528a487e825cb968ddc6887e13ac96e5 firefox-nb-NO-1.5.0.7.xpi 151778
+RMD160 57d623cb6429050ea114076bbd6bc671faa99100 firefox-nb-NO-1.5.0.7.xpi 151778
+SHA256 bb4544c600bfad0cfe4d1e3152c0a0027fd1722a90fc54b50983d5ff6964fb9e firefox-nb-NO-1.5.0.7.xpi 151778
+MD5 83aba7d4aac6d90db81fc83b5aea2910 firefox-nl-1.5.0.7.xpi 150930
+RMD160 408d4dc927cb67818343091a305935f593259b2e firefox-nl-1.5.0.7.xpi 150930
+SHA256 5f6e89e411dddea4372e90166865402e4516b118f72f8968ee23e689d248f633 firefox-nl-1.5.0.7.xpi 150930
+MD5 102730043c4a86f7125935ec074f2bcf firefox-pa-IN-1.5.0.7.xpi 152282
+RMD160 bd47b32d16348835f9e0b3154c4a62cba639c372 firefox-pa-IN-1.5.0.7.xpi 152282
+SHA256 c070eed96c8fe2f959dd1949fe87e45c9fea2b1aba7a189a25ff3850f075d562 firefox-pa-IN-1.5.0.7.xpi 152282
+MD5 303930c5377cbdb34cd3c912e6173fc5 firefox-pl-1.5.0.7.xpi 243653
+RMD160 93196b3397160f7bad43f32e05ee464177ed5923 firefox-pl-1.5.0.7.xpi 243653
+SHA256 df1c23a58165b78e8de1f36cd1f3b5c443823c9622bbae3fc513105fca00b35f firefox-pl-1.5.0.7.xpi 243653
+MD5 051f700263742561c63c27ac58edabd1 firefox-pt-BR-1.5.0.7.xpi 143568
+RMD160 d1927c9add21be098c0d6f2527c858270231f88c firefox-pt-BR-1.5.0.7.xpi 143568
+SHA256 853280b5a9d076404240b370c91bd1930f52f9eff9c38c35f0b214b36783b84b firefox-pt-BR-1.5.0.7.xpi 143568
+MD5 41709d7a16bef9a747382288df79bd8c firefox-ro-1.5.0.7.xpi 144114
+RMD160 65eacda8af6c684b74d5287aa524ebbe2773907d firefox-ro-1.5.0.7.xpi 144114
+SHA256 38eaab6b47529ca31447a962a900b046cf8caa75b50ef3689677f86d33505eb0 firefox-ro-1.5.0.7.xpi 144114
+MD5 cdb90458d996073ab00a3135dbd37afc firefox-ru-1.5.0.7.xpi 170084
+RMD160 4bf8fccaf82e0fb25f2117f93b489e54e5ba7917 firefox-ru-1.5.0.7.xpi 170084
+SHA256 16d4dfefd9b948c10e3ebe1eb7b170f1bcdcb6ec4c9eb7f0ddf8b27a871e51fe firefox-ru-1.5.0.7.xpi 170084
+MD5 35fc68e2c9234eda0a7f7ec66a23bbfa firefox-sk-1.5.0.7.xpi 153991
+RMD160 f11f32e94dd74700b601809273ccf6fc8b484b19 firefox-sk-1.5.0.7.xpi 153991
+SHA256 8b04dad4506a1e5678e00989ca26573c259576000d9161f21cdf3c141953b451 firefox-sk-1.5.0.7.xpi 153991
+MD5 900a14075dfa6aa2c12e8ef10aed851c firefox-sl-1.5.0.7.xpi 145205
+RMD160 d6e753daf38da65199f3ed482eaa097dad06dc69 firefox-sl-1.5.0.7.xpi 145205
+SHA256 10919704b31887b5d4c85e342f1f21ef495da63e1434250be43abca6fea82c6b firefox-sl-1.5.0.7.xpi 145205
+MD5 34095b5ccff2973d552cea49252c6502 firefox-sv-SE-1.5.0.7.xpi 154913
+RMD160 f3edf4a904349ef5a7b84ea1cda46f520c8d1c9d firefox-sv-SE-1.5.0.7.xpi 154913
+SHA256 beb75ec1330033a99e6b82c7cbec68b755726862a450e41776dfab954345b3f3 firefox-sv-SE-1.5.0.7.xpi 154913
+MD5 8148d39219645900987e757ef0f6b4ec firefox-tr-1.5.0.7.xpi 136158
+RMD160 45b297a1b5142681b838578408981341452a39a1 firefox-tr-1.5.0.7.xpi 136158
+SHA256 98dce6d5fb5f4e39b9c23122d07b3ac6516d4b228b1d3e1fb54fd8ed8279dce7 firefox-tr-1.5.0.7.xpi 136158
+MD5 164f96ce99d3f07ea69dd97f09762b6c firefox-zh-CN-1.5.0.7.xpi 136417
+RMD160 0e911f5ca17ec36f8bc7267d0fb485aae74079d7 firefox-zh-CN-1.5.0.7.xpi 136417
+SHA256 89f4bb111b1242caed415960552571ba71430139f1c3c63069265910f669d5bc firefox-zh-CN-1.5.0.7.xpi 136417
+MD5 d6c540c35485b9cdef083254fbf498c4 firefox-zh-TW-1.5.0.7.xpi 128231
+RMD160 8e77f997c547528e32817901e547a2b7ff4b532d firefox-zh-TW-1.5.0.7.xpi 128231
+SHA256 58e75085a47ad6c4e655bc808f6083db7c379da8918b2c282db05e4c45905138 firefox-zh-TW-1.5.0.7.xpi 128231
+MD5 00b326efed7c4d3a05b01c0099a56621 mozilla-firefox-1.5.0.7-patches-0.1.tar.bz2 37084
+RMD160 a605c9087d1bc5b9705b17c9ddfba766ca6a1ca6 mozilla-firefox-1.5.0.7-patches-0.1.tar.bz2 37084
+SHA256 7a73b891e01fab67cfcc2bc08c97f2ef0edff0d52ed4a8711ad56e12ed35c31c mozilla-firefox-1.5.0.7-patches-0.1.tar.bz2 37084
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.5.0.7.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.7.ebuild
new file mode 100644
index 000000000000..cccc2b0c08db
--- /dev/null
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.7.ebuild
@@ -0,0 +1,298 @@
+# 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.7.ebuild,v 1.1 2006/09/16 04:19:38 redhatter 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
+
+# All: 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 ko lt mk nb-NO nl pa-IN pl pt-BR ro ru sk sl sv-SE tr zh-CN zh-TW 
+# New:    bg                                  eu       fy-NL       gu-IN                lt             pa-IN
+# Ignored: fy-NL (due to repoman griping about it)
+LANGS="ar bg ca cs da de el en-GB es-AR es-ES eu fi fr       ga-IE gu-IN he hu it ja ko lt mk nb-NO nl pa-IN pl pt-BR ro ru sk sl sv-SE tr zh-CN zh-TW"
+SHORTLANGS="es-ES ga-IE nb-NO sv-SE"
+PVER="0.1"
+
+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"
+
+KEYWORDS="-* ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="java mozdevelop"
+
+for X in ${LANGS} ; do
+	SRC_URI="${SRC_URI} linguas_${X/-/_}? ( mirror://gentoo/firefox-${X}-${PV}.xpi )"
+	IUSE="${IUSE} linguas_${X/-/_}"
+done
+
+for X in ${SHORTLANGS} ; do
+	SRC_URI="${SRC_URI} linguas_${X%%-*}? ( mirror://gentoo/firefox-${X}-${PV}.xpi )"
+	IUSE="${IUSE} linguas_${X%%-*}"
+done
+
+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
+	~sys-devel/autoconf-2.13"
+
+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} en en_US; then
+			hasq en ${linguas} || \
+				linguas="${linguas:+"${linguas} "}en"
+			continue
+		elif hasq ${LANG} ${LANGS//-/_}; then
+			hasq ${LANG//_/-} ${linguas} || \
+				linguas="${linguas:+"${linguas} "}${LANG//_/-}"
+			continue
+		else
+			local SLANG
+			for SLANG in ${SHORTLANGS}; do
+				if [[ ${LANG} == ${SLANG%%-*} ]]; then
+					hasq ${SLANG} ${linguas} || \
+						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_SUFFIX="patch" \
+	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.1" \
+		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 "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}
+	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! mozilla@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
+}