Version bump, bug 154434.

(Portage version: 2.1.2_rc1-r4)

3 files changed, 426 insertions, 1 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 5e8d1c401a8f..faa573b6127c 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.208 2006/11/01 23:39:11 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.209 2006/11/08 20:43:26 kloeri Exp $
+
+*mozilla-firefox-1.5.0.8 (08 Nov 2006)
+
+  08 Nov 2006; Bryan Østergaard <kloeri@gentoo.org>
+  +mozilla-firefox-1.5.0.8.ebuild:
+  Version bump, bug 154434.
 
   01 Nov 2006; Bryan Østergaard <kloeri@gentoo.org>
   -mozilla-firefox-1.5.0.5.ebuild, mozilla-firefox-1.5.0.7.ebuild:
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.8 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.8
new file mode 100644
index 000000000000..b7babdc0503e
--- /dev/null
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.8
@@ -0,0 +1,111 @@
+MD5 86f98df1586efb419225a2988a217951 firefox-1.5.0.8-source.tar.bz2 35588049
+RMD160 b28cb7b104c1fbaad9b2a43ded31149fab0cf476 firefox-1.5.0.8-source.tar.bz2 35588049
+SHA256 988d916568c7ddd2c790b190437cd54833b9c5ff1db9a43736771369426a6060 firefox-1.5.0.8-source.tar.bz2 35588049
+MD5 cd6838c3e2b0f4bdc94c739975a472fb mozilla-firefox-1.5.0.8-ar.xpi 153693
+RMD160 049390b12b598abd41a7bf90fa42aa3d7b0b673c mozilla-firefox-1.5.0.8-ar.xpi 153693
+SHA256 d41ab4bbe7ace1475c64ee83420620f857eb80a3d4653e15830c3d79d12ca07a mozilla-firefox-1.5.0.8-ar.xpi 153693
+MD5 1e113ff39a00953bc65566b4c9e63ab3 mozilla-firefox-1.5.0.8-bg.xpi 163276
+RMD160 d5b5d561cd2dbbb9d537e7a8bc57acf89ce90249 mozilla-firefox-1.5.0.8-bg.xpi 163276
+SHA256 31407564adab0937d968c9b02b82b19e2b417528c163cdffc621e3ba25018a7d mozilla-firefox-1.5.0.8-bg.xpi 163276
+MD5 5570e6e51a06e2a6c9d14aaa11a92ee1 mozilla-firefox-1.5.0.8-ca.xpi 161501
+RMD160 2986dd707dcad62fd4c77bebc17be2911e6a55f8 mozilla-firefox-1.5.0.8-ca.xpi 161501
+SHA256 743ad2558df1f66f1faf38f4b077d7f310abf314ffbb4878e864e0649dfe8d72 mozilla-firefox-1.5.0.8-ca.xpi 161501
+MD5 f95cffa3a5c9b37ef443eb4b2e174cd0 mozilla-firefox-1.5.0.8-cs.xpi 153278
+RMD160 890783f15b2fb058010e913e2714e66ccce401a2 mozilla-firefox-1.5.0.8-cs.xpi 153278
+SHA256 24739473f163ecaec70e0cb7bec2b4364e5cdc2b63705bc1603148c813909909 mozilla-firefox-1.5.0.8-cs.xpi 153278
+MD5 cd02de9ad93bc1b7c804d3c61f7a1dbf mozilla-firefox-1.5.0.8-da.xpi 142669
+RMD160 b0bf2e1bd859a78a72479df70e5d0e50c0ebd2e9 mozilla-firefox-1.5.0.8-da.xpi 142669
+SHA256 cc99c27131884fc815ff2fea400ca426fff65e96367f82d87ec492a7624716a4 mozilla-firefox-1.5.0.8-da.xpi 142669
+MD5 30402b7c1329a7d36438a4858ca04282 mozilla-firefox-1.5.0.8-de.xpi 141237
+RMD160 a277082ff604b39a584280c425e34db955a6377a mozilla-firefox-1.5.0.8-de.xpi 141237
+SHA256 ecac24802d8d78aec59d32cee9689828df3795f50c8df5ca1b4b25c4c587b161 mozilla-firefox-1.5.0.8-de.xpi 141237
+MD5 8c580b26b1d1db65d9420abff5a8062b mozilla-firefox-1.5.0.8-el.xpi 147176
+RMD160 951bce0618fb7b1a86faaa31e85cdb2992f52938 mozilla-firefox-1.5.0.8-el.xpi 147176
+SHA256 21dc1bb6fb6a2add8a89f311bdb0d37b1d0bb7195f562d8d49ae20a90cc3d22e mozilla-firefox-1.5.0.8-el.xpi 147176
+MD5 132743b14b1e382997d256a81b8afa91 mozilla-firefox-1.5.0.8-en-GB.xpi 139726
+RMD160 d48d1c0c265fd00dde9ca909e0ddb560448c8834 mozilla-firefox-1.5.0.8-en-GB.xpi 139726
+SHA256 ced90cf7df0e4d0f1dddc34e3acc9fd23eeb6b0738f654d751e939609740d20a mozilla-firefox-1.5.0.8-en-GB.xpi 139726
+MD5 b268bfb7995d22cb4be3d60774fbb6b8 mozilla-firefox-1.5.0.8-es-AR.xpi 146358
+RMD160 d075d47e4bec7edc7f0de9e6e14c2504fc467a64 mozilla-firefox-1.5.0.8-es-AR.xpi 146358
+SHA256 0b727d227c7f619d96beeebf3bff5281c2f2b6189c30385192f9a32b7edb233a mozilla-firefox-1.5.0.8-es-AR.xpi 146358
+MD5 a7b1ff20a405824a702af55373d2b143 mozilla-firefox-1.5.0.8-es-ES.xpi 132709
+RMD160 163e733de831e8abf5dbae2526e5afc35ed3ba56 mozilla-firefox-1.5.0.8-es-ES.xpi 132709
+SHA256 185cc51dd54c702bc9642898ce528584436426eda881458d2724477a03a70301 mozilla-firefox-1.5.0.8-es-ES.xpi 132709
+MD5 22f1a08f9910144584710c7019feaab8 mozilla-firefox-1.5.0.8-eu.xpi 138950
+RMD160 7b60d6e02c411090a66bb24c0bf9c8bc305487e8 mozilla-firefox-1.5.0.8-eu.xpi 138950
+SHA256 60d79a63c3f483a4e47057bcda609c702e32452d93b543aaa90d2e7eb1919e5b mozilla-firefox-1.5.0.8-eu.xpi 138950
+MD5 9260f51571f02a3c64992dbd3187ac7b mozilla-firefox-1.5.0.8-fi.xpi 143209
+RMD160 97b4404bc5aa4b5ca0af2bd244bb6de5a19bb01b mozilla-firefox-1.5.0.8-fi.xpi 143209
+SHA256 05ffe94dde125a8d78cabcb203b320e08ecb4d591b1d7462e81b8d9f540ac311 mozilla-firefox-1.5.0.8-fi.xpi 143209
+MD5 17df0f6a5cf1450fd5de60c0c12df02c mozilla-firefox-1.5.0.8-fr.xpi 203488
+RMD160 56cd998e4181c6c1fc174be803b1ffb74457f7d4 mozilla-firefox-1.5.0.8-fr.xpi 203488
+SHA256 8142f7ed36f7e12f03327dac46f156495a16b3c7c5d4fcea9c39987f985d677a mozilla-firefox-1.5.0.8-fr.xpi 203488
+MD5 64795073eb2d8333a4e3f2cbb1ad7a17 mozilla-firefox-1.5.0.8-ga-IE.xpi 145059
+RMD160 6903eb7118bf480da182050ec71d071b708c0f2c mozilla-firefox-1.5.0.8-ga-IE.xpi 145059
+SHA256 3ad7197c5574accb12c3ddf1c0d8906567ec80358855741241b4b871f53a4c09 mozilla-firefox-1.5.0.8-ga-IE.xpi 145059
+MD5 cec879c1c22cd964777dedebfef0a620 mozilla-firefox-1.5.0.8-gu-IN.xpi 163732
+RMD160 6455d6a429030dcce9029d1edb345b6078f448ff mozilla-firefox-1.5.0.8-gu-IN.xpi 163732
+SHA256 dfbf24892d9402ab649c40422f2889d41aafc7ed4699620d57b3644d54494540 mozilla-firefox-1.5.0.8-gu-IN.xpi 163732
+MD5 00f81c8ea0e30d2284fb34949c36da2b mozilla-firefox-1.5.0.8-he.xpi 145207
+RMD160 92d0799509a7d235abc337795555f1abd031b099 mozilla-firefox-1.5.0.8-he.xpi 145207
+SHA256 f84970e948d3f46cbd3f013bbb738afc05a50fb5fe42f027b2f01d1c4b195b0f mozilla-firefox-1.5.0.8-he.xpi 145207
+MD5 075cf5719c6fe3b44035c78a2c7f3002 mozilla-firefox-1.5.0.8-hu.xpi 154686
+RMD160 e6580cd217c5a15008c7506bd0b1c624cc025039 mozilla-firefox-1.5.0.8-hu.xpi 154686
+SHA256 960dc8a5a5356e6fed9d38a0030f4ed5cf90c04fb05b48da90b4c2ff6a64c197 mozilla-firefox-1.5.0.8-hu.xpi 154686
+MD5 5d575771bdffaa5d15bd249d1b23e753 mozilla-firefox-1.5.0.8-it.xpi 156892
+RMD160 ff5ca923f9bd8e2cab462feb3e1f91b40d16a026 mozilla-firefox-1.5.0.8-it.xpi 156892
+SHA256 02f5355a72d47b4ded73ee2a5c75733a2ceaeb389265484c8e7e9acfce842106 mozilla-firefox-1.5.0.8-it.xpi 156892
+MD5 22d7a8c6d482d7397d0ad1ea3c5ad2f1 mozilla-firefox-1.5.0.8-ja.xpi 162688
+RMD160 532df562b7fefbda4b11dd4ee73283c0c9320f00 mozilla-firefox-1.5.0.8-ja.xpi 162688
+SHA256 671778a1dc0723b4d508881b28f7577ef1503643ed2743ea48aa5a8ef153f6a7 mozilla-firefox-1.5.0.8-ja.xpi 162688
+MD5 9adea173609176189dfe8b7610b9c60c mozilla-firefox-1.5.0.8-ko.xpi 149720
+RMD160 9cc8852ceacad1bec1740d4eede9993f95bb17df mozilla-firefox-1.5.0.8-ko.xpi 149720
+SHA256 d10aef265af13c263c2f5282b6d6598946c6cc9ddaa9444060442fa5b19169ac mozilla-firefox-1.5.0.8-ko.xpi 149720
+MD5 8609d1fe3ba20f27d088b9cc06b12e31 mozilla-firefox-1.5.0.8-lt.xpi 155347
+RMD160 05502c98f05e8ea9b1cf3c0f0d4bd035731a5e3e mozilla-firefox-1.5.0.8-lt.xpi 155347
+SHA256 d74a1cba63e11ff189ec1b1285bb344b49222c5c5b576a8a899b1fc91a0cd60c mozilla-firefox-1.5.0.8-lt.xpi 155347
+MD5 3756010f4c66d88200fe76ced3e49e2b mozilla-firefox-1.5.0.8-mk.xpi 162480
+RMD160 8eb8e0b086284ca6790b3f4d9e0aa40f3f31c659 mozilla-firefox-1.5.0.8-mk.xpi 162480
+SHA256 60c150f9f08d3b23b244473073bfd5e2621969b938a33898918632229821bb94 mozilla-firefox-1.5.0.8-mk.xpi 162480
+MD5 96d01647d359f25d702b50c4bba47a1a mozilla-firefox-1.5.0.8-nb-NO.xpi 151906
+RMD160 7b54986ce2f44de891437f98bb0a1410d1f6324d mozilla-firefox-1.5.0.8-nb-NO.xpi 151906
+SHA256 17dad4685bc93f40f9b1d505bfb7f31c372c89008423e065da30beae2c00d1b4 mozilla-firefox-1.5.0.8-nb-NO.xpi 151906
+MD5 038bb507b17d33e7fd41e908c1264e70 mozilla-firefox-1.5.0.8-nl.xpi 151157
+RMD160 78dcbc3e2fba4ca52f35b012921dc10f2ecc7029 mozilla-firefox-1.5.0.8-nl.xpi 151157
+SHA256 b5535a3b054ca223376532308a0bd9688aa78361bf85f9e96e6db83bd3aebc4d mozilla-firefox-1.5.0.8-nl.xpi 151157
+MD5 5aef6258ab256ade0a873efa2cad7d96 mozilla-firefox-1.5.0.8-pa-IN.xpi 152791
+RMD160 8e1eefd659222d385dbc66e559a3618465bcfd9f mozilla-firefox-1.5.0.8-pa-IN.xpi 152791
+SHA256 05eea0dc40e636450ecc1092889acefa56c6ca7e05c9bda1745e217390623955 mozilla-firefox-1.5.0.8-pa-IN.xpi 152791
+MD5 1693b79fb0eec2308ce00c3ceed81238 mozilla-firefox-1.5.0.8-patches-0.1.tar.bz2 37058
+RMD160 4ff71f669a0241bfc7ed2a375aad82ca95963287 mozilla-firefox-1.5.0.8-patches-0.1.tar.bz2 37058
+SHA256 35addeda577d0ec0d2d258eaf8e6079f8bf77cc3374db009c10145d705c3224f mozilla-firefox-1.5.0.8-patches-0.1.tar.bz2 37058
+MD5 4f5c5d885bd0af1c8c4b768bcb04f58e mozilla-firefox-1.5.0.8-pl.xpi 243862
+RMD160 2820fec0e6f39bfc63f0e16114ff5612f27c0e5e mozilla-firefox-1.5.0.8-pl.xpi 243862
+SHA256 8ef09cefb90f0e34d8f84a69e64ac504ab4a84be346c70a3dac813190a262a21 mozilla-firefox-1.5.0.8-pl.xpi 243862
+MD5 f24644e97035866cd75553c50430eea3 mozilla-firefox-1.5.0.8-pt-BR.xpi 143776
+RMD160 47fa637d890cfb4606341b2a7ef80e094110652f mozilla-firefox-1.5.0.8-pt-BR.xpi 143776
+SHA256 ec95ada9d9af82fbf37ddd6f04ed959b29265729c3865e14b17371561df5490a mozilla-firefox-1.5.0.8-pt-BR.xpi 143776
+MD5 9ece91f43e5a253df5ca76e47a67651e mozilla-firefox-1.5.0.8-ro.xpi 144395
+RMD160 cdbabc84e9622556460a6f1528b73a2bcf65eb80 mozilla-firefox-1.5.0.8-ro.xpi 144395
+SHA256 a0b4b77e19bbff3adfd45ba16e0412941dbbba6e4ffc81dd4995d6a6d0238d6d mozilla-firefox-1.5.0.8-ro.xpi 144395
+MD5 e9d53163f910a3083f1318fc90d358b6 mozilla-firefox-1.5.0.8-ru.xpi 170076
+RMD160 94e18524ad8765a4bbdfec66ae3e8683b035ffcf mozilla-firefox-1.5.0.8-ru.xpi 170076
+SHA256 85ea552f070fe418f4d1ecbf55628b9bbcb93baca202ec5afbe1459128e11cc6 mozilla-firefox-1.5.0.8-ru.xpi 170076
+MD5 4dd3337258013008e5420f0ae81783d4 mozilla-firefox-1.5.0.8-sk.xpi 154220
+RMD160 f3a8a5724c17b17c9039ece71c3c4889e162ac1d mozilla-firefox-1.5.0.8-sk.xpi 154220
+SHA256 9e3dc7bf638bfac96ea63fab193b613ce653bc2fbe8151d1c0129a6c18f87a7f mozilla-firefox-1.5.0.8-sk.xpi 154220
+MD5 debc7ba89146352c1f90ae01034b95d3 mozilla-firefox-1.5.0.8-sl.xpi 145432
+RMD160 473810aa2edc1017223b102d8fd59ba3a12a9f02 mozilla-firefox-1.5.0.8-sl.xpi 145432
+SHA256 e0f463d1c9dc7216cdaed80a721e8edf277bcf176003c59f00a1333e2468861a mozilla-firefox-1.5.0.8-sl.xpi 145432
+MD5 c5f01a51c42ca7d37616b28186f072c7 mozilla-firefox-1.5.0.8-sv-SE.xpi 155140
+RMD160 005cd61042b391ad1c1c5374048ed4f9c8b06936 mozilla-firefox-1.5.0.8-sv-SE.xpi 155140
+SHA256 1ec40ab4e92e1375a9023e28f2950900bd836eaeff0c246770011a4b2f931ed7 mozilla-firefox-1.5.0.8-sv-SE.xpi 155140
+MD5 474ff4e87ae1b694bcec1a7d3dc5b4c9 mozilla-firefox-1.5.0.8-tr.xpi 136355
+RMD160 cc443d10cce25b23c65374611e61a00c60f5a2e8 mozilla-firefox-1.5.0.8-tr.xpi 136355
+SHA256 db16bd378f295ac75b3269436b9d117a107e95ce31f354b3c1232af1d02c7c9b mozilla-firefox-1.5.0.8-tr.xpi 136355
+MD5 b04de69b31703731fe74810b9a1817e9 mozilla-firefox-1.5.0.8-zh-CN.xpi 136634
+RMD160 d58b2098ce783fd33f2ab2b6d36425ce2fdd0f26 mozilla-firefox-1.5.0.8-zh-CN.xpi 136634
+SHA256 2727119c855fdaf6b0ba5c2e48680a61e2918afc1df8b8de5428e0ed521da622 mozilla-firefox-1.5.0.8-zh-CN.xpi 136634
+MD5 18a8e5804cf72b9a8b5a66f3b49d3cec mozilla-firefox-1.5.0.8-zh-TW.xpi 128467
+RMD160 46eb47e5e0bc3e15d3910317cdd6ddb1c9d6ae08 mozilla-firefox-1.5.0.8-zh-TW.xpi 128467
+SHA256 8bcfc1f74d7ce3e7e5b45069abd211364b2c9f95cad0c04be8baed3ee363f6c8 mozilla-firefox-1.5.0.8-zh-TW.xpi 128467
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.5.0.8.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.8.ebuild
new file mode 100644
index 000000000000..c0d2244e0150
--- /dev/null
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.8.ebuild
@@ -0,0 +1,308 @@
+# 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.8.ebuild,v 1.1 2006/11/08 20:43:26 kloeri 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/${P}-${X}.xpi )"
+	IUSE="${IUSE} linguas_${X/-/_}"
+done
+
+for X in ${SHORTLANGS} ; do
+	SRC_URI="${SRC_URI} linguas_${X%%-*}? ( mirror://gentoo/${P}-${X}.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
+}
+
+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
+
+	use moznopango && warn_mozilla_launcher_stub
+}
+
+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
+}