new patchset to fix mathml, via anarchy

(Portage version: 2.1.2_rc3-r9)

3 files changed, 425 insertions, 1 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 6f338e70dc36..00354e032d8a 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,11 @@
 # 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.231 2006/12/21 18:51:29 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.232 2006/12/22 15:12:03 gothgirl Exp $
+
+*mozilla-firefox-1.5.0.9-r1 (22 Dec 2006)
+
+  22 Dec 2006; <gothgirl@gentoo.org> +mozilla-firefox-1.5.0.9-r1.ebuild:
+  new patchset for 1.5.0.9 for mathml, via anarchy
 
   21 Dec 2006; Joshua Jackson <tsunam@gentoo.org>
   mozilla-firefox-1.5.0.9.ebuild:
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.9-r1 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.9-r1
new file mode 100644
index 000000000000..a71a2e08d5d7
--- /dev/null
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.9-r1
@@ -0,0 +1,114 @@
+MD5 383d3f3a17ba819ead94c2edc6739773 firefox-1.5.0.9-source.tar.bz2 35600822
+RMD160 b83bca8f317a6bc00dd40fd0d868cbe82536f45e firefox-1.5.0.9-source.tar.bz2 35600822
+SHA256 1f4a26eeeca5c4d9a36251999c4cb96737064c190248002a5a6e9a6f4e7ec657 firefox-1.5.0.9-source.tar.bz2 35600822
+MD5 943e6351b8bd66b11e9d2adf7fa16296 mozilla-firefox-1.5.0.9-ar.xpi 153694
+RMD160 94576ebb1fe7af13255a1ff8030342ed844f7337 mozilla-firefox-1.5.0.9-ar.xpi 153694
+SHA256 8f68a1e18d2291a8846172a6b278ac140804bc295b5f7dcd16b9bbb19f411ed2 mozilla-firefox-1.5.0.9-ar.xpi 153694
+MD5 570d03e8d9666a92f2453f1bdfbddf35 mozilla-firefox-1.5.0.9-bg.xpi 163277
+RMD160 32e4160d2575995ee00831870961a1a2bf50c93a mozilla-firefox-1.5.0.9-bg.xpi 163277
+SHA256 91f61d71857a6073d8631162217a551c274ecdc5c84c795a50610c2b37619e7e mozilla-firefox-1.5.0.9-bg.xpi 163277
+MD5 0c699f309a98794ba66507ec8b26c02a mozilla-firefox-1.5.0.9-ca.xpi 161502
+RMD160 807b545e2d2376819694d900901236786744f92d mozilla-firefox-1.5.0.9-ca.xpi 161502
+SHA256 768eecb3580baf07af6638551771d8a26170c4b7aae15f1dea91f45313203bc3 mozilla-firefox-1.5.0.9-ca.xpi 161502
+MD5 cac905d24fef265bde3d07af9fa032f1 mozilla-firefox-1.5.0.9-cs.xpi 153279
+RMD160 1ca9d82f64fdc7c5be677b9b1fecc52cd385e06e mozilla-firefox-1.5.0.9-cs.xpi 153279
+SHA256 334e2e961cb1afbe2a4eec4c70f6b0e1ec003fa33bd559add251639642aeeb54 mozilla-firefox-1.5.0.9-cs.xpi 153279
+MD5 9562c031b951db00c00dd98dafe83fab mozilla-firefox-1.5.0.9-da.xpi 142670
+RMD160 99d0f2d2ac8acfece77042570de104dc0c372698 mozilla-firefox-1.5.0.9-da.xpi 142670
+SHA256 1045c0f68f808bc6321812c438148e28b451b72e2bb7740d28cbcbdadee9395b mozilla-firefox-1.5.0.9-da.xpi 142670
+MD5 e056e4cc0e311648884f413a48ed79db mozilla-firefox-1.5.0.9-de.xpi 141238
+RMD160 32f898a1bbda0927ea077a0c98d789a3ae866a65 mozilla-firefox-1.5.0.9-de.xpi 141238
+SHA256 2569cc55707a4b5be05ebd23a0efa4fe0fabc0face7bb90ec0410c345409958f mozilla-firefox-1.5.0.9-de.xpi 141238
+MD5 7439fcdea7bff1c408559f343787bb22 mozilla-firefox-1.5.0.9-el.xpi 147176
+RMD160 94f7159b69d7417727375bd12d2fd9ffcfe268d2 mozilla-firefox-1.5.0.9-el.xpi 147176
+SHA256 bdea8253e5adbb38e9727dde6bae7116fdca34696acc214c0db61ed66885776b mozilla-firefox-1.5.0.9-el.xpi 147176
+MD5 0d3315fa8ae40994b9fa6e49f748deb7 mozilla-firefox-1.5.0.9-en-GB.xpi 139727
+RMD160 a3a46be986ec06117fc9950423a6b97dad613e6c mozilla-firefox-1.5.0.9-en-GB.xpi 139727
+SHA256 284cd0f75d9d17ef56cd17aba00d079b57409dda9ccc032ce94abc871f7715a3 mozilla-firefox-1.5.0.9-en-GB.xpi 139727
+MD5 4055ef0a2935ec251429e38ecf01893c mozilla-firefox-1.5.0.9-es-AR.xpi 146359
+RMD160 a2da60e5aeec3da65efb61ec6afb1c00d2b776e7 mozilla-firefox-1.5.0.9-es-AR.xpi 146359
+SHA256 b56227fc22c4f13fce2711238ff2d7ba77d73bdec2b9e91daefd87333f0ee8e3 mozilla-firefox-1.5.0.9-es-AR.xpi 146359
+MD5 dcb8ad9e0bc8e56cde236f04f499b471 mozilla-firefox-1.5.0.9-es-ES.xpi 132710
+RMD160 2dfa2338b4eac0a0fa7bd844fadb73ed3091fe4f mozilla-firefox-1.5.0.9-es-ES.xpi 132710
+SHA256 f6edb262ecd9059e5e41bc7a85092432729a82f10a2abd35dbf1910bcb19cee2 mozilla-firefox-1.5.0.9-es-ES.xpi 132710
+MD5 160c170f5f2ef863356903c163d22235 mozilla-firefox-1.5.0.9-eu.xpi 138951
+RMD160 8fe4db1f9c91e81631049c8ed580f003a7567a98 mozilla-firefox-1.5.0.9-eu.xpi 138951
+SHA256 5abd763195cfa96e9416664282f149e8feaf1f4e4eef4175faf6957301ae8d29 mozilla-firefox-1.5.0.9-eu.xpi 138951
+MD5 1dce1f093f86a2a98fa378d2a2f159a5 mozilla-firefox-1.5.0.9-fi.xpi 143210
+RMD160 4cb8e196f4fd8a9858960a5c0fa9631be28893e5 mozilla-firefox-1.5.0.9-fi.xpi 143210
+SHA256 3f534063d87f1aeb69cc200a55bd2c51681040ca26db056ea4ad26bebc4fced2 mozilla-firefox-1.5.0.9-fi.xpi 143210
+MD5 6d3176ee5e251aae078b9af6748a8db3 mozilla-firefox-1.5.0.9-fr.xpi 203488
+RMD160 908f00b06af2faa153c02d2620a51d0d16e91286 mozilla-firefox-1.5.0.9-fr.xpi 203488
+SHA256 8b83104cd1c5065f48665c804d118c718b1707e9e01bbdd9b6500019a13af07b mozilla-firefox-1.5.0.9-fr.xpi 203488
+MD5 d02d7fb85344b462f5c0f24e603f43f9 mozilla-firefox-1.5.0.9-fy-NL.xpi 152894
+RMD160 b477ce198ff8e13e352653defb90fd7525049946 mozilla-firefox-1.5.0.9-fy-NL.xpi 152894
+SHA256 059a7c6c871c2640ea53752111a735ad86cb0832ce4d6870324f6de8543ea774 mozilla-firefox-1.5.0.9-fy-NL.xpi 152894
+MD5 9cd25a06be3851f4d1de9c7c6827480a mozilla-firefox-1.5.0.9-ga-IE.xpi 145060
+RMD160 ba8e507893c1dfea3b95ad86c23909a0a12c737b mozilla-firefox-1.5.0.9-ga-IE.xpi 145060
+SHA256 6e01bf0d078f7903320ed2c314d9611595265f5988ef2f6c971d6daa02e41f7c mozilla-firefox-1.5.0.9-ga-IE.xpi 145060
+MD5 1a519e059763ddb9dcd545aa1779eb13 mozilla-firefox-1.5.0.9-gu-IN.xpi 163733
+RMD160 6dda0034d3a89ab7c9e3e84e10e0393e8caa8f4e mozilla-firefox-1.5.0.9-gu-IN.xpi 163733
+SHA256 3ee98312f7a1add0ab0310a83a3d4f2696f016a45a8f1da4f5c6f3d90a37510a mozilla-firefox-1.5.0.9-gu-IN.xpi 163733
+MD5 02b9865ee4f005502da6124e942eeec5 mozilla-firefox-1.5.0.9-he.xpi 145208
+RMD160 ad5d73b269192c307ca8760bc73531b0c8920975 mozilla-firefox-1.5.0.9-he.xpi 145208
+SHA256 44469e81a95646e3cfd77b5e1ebf6e9f4b10dff824647263577685aacdc4313a mozilla-firefox-1.5.0.9-he.xpi 145208
+MD5 91e708acf8b391e79ce7463126a12c03 mozilla-firefox-1.5.0.9-hu.xpi 154686
+RMD160 161073dac28b424a9395bd6ab69c4735183bec22 mozilla-firefox-1.5.0.9-hu.xpi 154686
+SHA256 82b9a1161e3f5866b6b2b14ca8472dd6b7218d44a62d9f43b76c10b90d6e5c79 mozilla-firefox-1.5.0.9-hu.xpi 154686
+MD5 eb64da608045f2543e1ed8b15799651b mozilla-firefox-1.5.0.9-it.xpi 156893
+RMD160 c528f68e2a25152f81be7e4e7be500066fdf5ecd mozilla-firefox-1.5.0.9-it.xpi 156893
+SHA256 9edf0ec7ebcdae0b2a9a17c508e92f8a4e66d322acda2bebe3ba1d898f0316cc mozilla-firefox-1.5.0.9-it.xpi 156893
+MD5 189aad5b817d184d4c0ba5004934c05c mozilla-firefox-1.5.0.9-ja.xpi 162691
+RMD160 c56d82ca1e77ed915aae8727f98e9b57270f8c36 mozilla-firefox-1.5.0.9-ja.xpi 162691
+SHA256 4b085d351df685609d5478e8c22481ad44ed6d65d5625147d8c8ed6516c155cf mozilla-firefox-1.5.0.9-ja.xpi 162691
+MD5 8dd1a963bb745d977ab46786d90f3a01 mozilla-firefox-1.5.0.9-ko.xpi 149721
+RMD160 a800529a3fdd8d533f09b026a39a02ebcb7fb5b6 mozilla-firefox-1.5.0.9-ko.xpi 149721
+SHA256 f2b4e05743f443e7c920a7ac05c96fbe520def844d44b03667626f0daab12143 mozilla-firefox-1.5.0.9-ko.xpi 149721
+MD5 876241dc778e04352c145cd58cf095aa mozilla-firefox-1.5.0.9-lt.xpi 155348
+RMD160 c878cfb1bb3986beba1cfe58f3f5198d77506298 mozilla-firefox-1.5.0.9-lt.xpi 155348
+SHA256 9f2fd99b7844ecbb73928895da66e941210103f93ea7dca419a9958cc321e951 mozilla-firefox-1.5.0.9-lt.xpi 155348
+MD5 d937636aceea131f241670b71e7fcf03 mozilla-firefox-1.5.0.9-mk.xpi 162481
+RMD160 d982d11aabaab23f9ce1d5c6124d452a4876e317 mozilla-firefox-1.5.0.9-mk.xpi 162481
+SHA256 360bb74c1c19a90f35c88695a8ed8d9f8e241f6454930a602e5e16e08dab1fa8 mozilla-firefox-1.5.0.9-mk.xpi 162481
+MD5 2960f0c03e16aad90e953675c962c363 mozilla-firefox-1.5.0.9-nb-NO.xpi 151906
+RMD160 129dca88e71ffba7bf3bb2320c96e3d69c5e2159 mozilla-firefox-1.5.0.9-nb-NO.xpi 151906
+SHA256 9b6ccc746a6ca839b8c964696fe1eee2ebf4077f023adf404140f42687c622b8 mozilla-firefox-1.5.0.9-nb-NO.xpi 151906
+MD5 bf020323e77d93ccbd52fe282b0056f6 mozilla-firefox-1.5.0.9-nl.xpi 151171
+RMD160 efddb6fc0485e230993486834f50e23f06d07d11 mozilla-firefox-1.5.0.9-nl.xpi 151171
+SHA256 61c4aa596559daaddb0fcf46ebe6f67439fed5f20e870f68a95d90ad67ba4ce2 mozilla-firefox-1.5.0.9-nl.xpi 151171
+MD5 55630f1c88cc1be0a6e268bfcb26e6a5 mozilla-firefox-1.5.0.9-pa-IN.xpi 152792
+RMD160 0bc025a771884c11df0c4531c30f53607df380e5 mozilla-firefox-1.5.0.9-pa-IN.xpi 152792
+SHA256 4fc3a022cb5d946f74478592a6847bd692b5a0c7e38d3aa452cc4d29d3978f98 mozilla-firefox-1.5.0.9-pa-IN.xpi 152792
+MD5 3ad7ae72852a7a68433914e95012b9b2 mozilla-firefox-1.5.0.9-patches-0.1.tar.bz2 37710
+RMD160 755f901dcf16d8e9e5c4a0b6fe5ff58865195a4d mozilla-firefox-1.5.0.9-patches-0.1.tar.bz2 37710
+SHA256 19571c86c43ce85c69441d0fb0e5c922c669e0ccb5b27d406233511f085aa85e mozilla-firefox-1.5.0.9-patches-0.1.tar.bz2 37710
+MD5 73ad121078262bb6b0564d2a6a9b02b3 mozilla-firefox-1.5.0.9-pl.xpi 243862
+RMD160 650906a204f738035e90eaecebdebcdd90dce6cc mozilla-firefox-1.5.0.9-pl.xpi 243862
+SHA256 394a88d8873dd71a558e88ae0c1d4d92d41c1bd98448d4a7bc8213b5d29b2e37 mozilla-firefox-1.5.0.9-pl.xpi 243862
+MD5 988c59bc015e805e02f41c1afb4e59fd mozilla-firefox-1.5.0.9-pt-BR.xpi 143776
+RMD160 a4da0c2fe2980ecef006ef01dbf915ca3c20e977 mozilla-firefox-1.5.0.9-pt-BR.xpi 143776
+SHA256 cbde242c52bc460e4c65c5069fc8e5c0015b5057fe3e18ae4d9fed433da860db mozilla-firefox-1.5.0.9-pt-BR.xpi 143776
+MD5 310dfa7b80d3eaee9a9b546118eaa742 mozilla-firefox-1.5.0.9-ro.xpi 144396
+RMD160 0e8aa949028a2eaa065affd0d182e663f626ce1c mozilla-firefox-1.5.0.9-ro.xpi 144396
+SHA256 08056d5c2cb78ce2e3170d2ae5be1abb22fdb0c800c1b695b138cb2716b264e8 mozilla-firefox-1.5.0.9-ro.xpi 144396
+MD5 453bde189fbe751fac8d4e943f12e0ad mozilla-firefox-1.5.0.9-ru.xpi 170077
+RMD160 20299024fe3fe3d0240de364c57734f188d68b95 mozilla-firefox-1.5.0.9-ru.xpi 170077
+SHA256 60ab3441a801228f43e4715349b885985e95625b6cac65746027af146e33956e mozilla-firefox-1.5.0.9-ru.xpi 170077
+MD5 fb4ff2979608bece287582482bbe8bf2 mozilla-firefox-1.5.0.9-sk.xpi 154221
+RMD160 452b8d481f526de6794d6d3e343b02dce3e80db0 mozilla-firefox-1.5.0.9-sk.xpi 154221
+SHA256 196ce595ad434f941e4d5324b4c299c2828f94b9b6e93666f3b1783701d7986c mozilla-firefox-1.5.0.9-sk.xpi 154221
+MD5 ba6392aa0a8b3e7195a43cae91158443 mozilla-firefox-1.5.0.9-sl.xpi 145432
+RMD160 5f5b53a9587956f17cb781d251cc852cc1a517d0 mozilla-firefox-1.5.0.9-sl.xpi 145432
+SHA256 8202f054911d20d3c8d8fdcb7f1f1d0b4349d296d3413f0eca1b2197a564ccd9 mozilla-firefox-1.5.0.9-sl.xpi 145432
+MD5 82326457c297d1e20aa4e4afcf31aeb3 mozilla-firefox-1.5.0.9-sv-SE.xpi 155141
+RMD160 d2116719831381bc279299fb734497784d51b881 mozilla-firefox-1.5.0.9-sv-SE.xpi 155141
+SHA256 f897e595ebee88d23da7449f231850c3e5833530a922fce3f825f08d15dc78b4 mozilla-firefox-1.5.0.9-sv-SE.xpi 155141
+MD5 1a2a40b87ea2ab423ac2f196ded386ba mozilla-firefox-1.5.0.9-tr.xpi 136356
+RMD160 9dda7b355ad53ff1832dcbe0c1f0a6f9abf52cdb mozilla-firefox-1.5.0.9-tr.xpi 136356
+SHA256 d157afbaa7c08ff90f0e5f15a553ac9b4eb2cce0b255d79ab216d9208828fe54 mozilla-firefox-1.5.0.9-tr.xpi 136356
+MD5 33035b6b70ab036546cc05b7cc624135 mozilla-firefox-1.5.0.9-zh-CN.xpi 136635
+RMD160 ada4f8b51cdbd03f853f92aa27879d464cb4b863 mozilla-firefox-1.5.0.9-zh-CN.xpi 136635
+SHA256 942240c5c2360865a73a7de958fbc1fa278ce604decc20b5246638339166040d mozilla-firefox-1.5.0.9-zh-CN.xpi 136635
+MD5 0bbe5e84315c1d6c6374c6e479430e84 mozilla-firefox-1.5.0.9-zh-TW.xpi 128468
+RMD160 fec00a58e99c4e20126f7641425c770a1d18a47b mozilla-firefox-1.5.0.9-zh-TW.xpi 128468
+SHA256 989aaaf646c7d97a2276dc9f110d78aba08c3f6799e3bf790aa532d27dcc8f70 mozilla-firefox-1.5.0.9-zh-TW.xpi 128468
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.5.0.9-r1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.9-r1.ebuild
new file mode 100644
index 000000000000..23f4de9adf32
--- /dev/null
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.9-r1.ebuild
@@ -0,0 +1,305 @@
+# 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.9-r1.ebuild,v 1.1 2006/12/22 15:12:03 gothgirl Exp $
+
+WANT_AUTOCONF="2.1"
+
+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 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"
+SHORTLANGS="es-ES ga-IE nb-NO sv-SE"
+PATCH="${P}-patches-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
+	http://dev.gentooexperimental.org/~anarchy/dist/${PATCH}.tar.bz2
+	mirror://gentoo/${PATCH}.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/-/_}? ( http://dev.gentooexperimental.org/~anarchy/${P}-xpi/${P}-${X}.xpi )"
+	IUSE="${IUSE} linguas_${X/-/_}"
+done
+
+for X in ${SHORTLANGS} ; do
+	SRC_URI="${SRC_URI} linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~anarchy/${P}-xpi/${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"
+
+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 ${A}
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != en ]] && xpi_unpack ${P}-${X}.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
+
+	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 -j1 || 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}/${P}-${X}
+	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
+}