ABI fix for extensions

(Portage version: 2.1_pre7-r3)

4 files changed, 396 insertions, 4 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 177768a7089e..19fc16eaf7ef 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.132 2006/03/30 03:16:17 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.133 2006/03/31 18:52:55 anarchy Exp $
+
+*mozilla-firefox-1.5.0.1-r4 (31 Mar 2006)
+
+  31 Mar 2006; Jory A. Pratt <anarchy@gentoo.org>
+  +mozilla-firefox-1.5.0.1-r4.ebuild:
+  fix ABI so extension are aware of ABI instead of unknown
 
   30 Mar 2006; Jory A. Pratt <anarchy@gentoo.org>
   mozilla-firefox-1.5.0.1-r3.ebuild:
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index 2145a315bb44..7e70784ff809 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -1,6 +1,6 @@
-MD5 3926a20ddf1645c261437a20bf57dd08 ChangeLog 42183
-RMD160 fb6f7e2b2d4aa6ee69077d90abcfb840b6c5b48f ChangeLog 42183
-SHA256 795a97ccf6b687541d7ddf3572c0e3aee0424b96f641194e7c3ddd13454d40b0 ChangeLog 42183
+MD5 2e8a7a08c49b4406371cdbdb73b9bb8d ChangeLog 42374
+RMD160 1156f133d815862dda1b31b9b093e823ca858c69 ChangeLog 42374
+SHA256 bff310fb0f575d6c15cec389815bb6a0b2cadf5712ccdf6e6defe242bb2b7c30 ChangeLog 42374
 MD5 328c58524dbe1f58eea781194cc7de94 files/1.5/mozilla-firefox-1.5-history.patch 2376
 RMD160 2e6a58c257c5a1455c9440b5d1f3829a2149c970 files/1.5/mozilla-firefox-1.5-history.patch 2376
 SHA256 bad2ff1c2534fb55851fb43bbb1a123511e828eca52e88589f8fbdad42e6a6ef files/1.5/mozilla-firefox-1.5-history.patch 2376
@@ -25,6 +25,9 @@ SHA256 fe47019329dc41d4287da0a08176d62513bf7f96647b952c78c45a96b1e3cac3 files/di
 MD5 2eb764d26c64af3e9925957c1472bbf2 files/digest-mozilla-firefox-1.5.0.1-r3 8075
 RMD160 87b34063b980be1d73afcfcba6e51ad5c31a0690 files/digest-mozilla-firefox-1.5.0.1-r3 8075
 SHA256 33ecb23c12444f869aad9c4780942be6c9e24ffbe0fc65aed8bef0075fb8040f files/digest-mozilla-firefox-1.5.0.1-r3 8075
+MD5 96c54e981c10bfae741965d082f73cbe files/digest-mozilla-firefox-1.5.0.1-r4 8075
+RMD160 f4e9b7c1951026f93ac1606dd3491317bf8e6dc0 files/digest-mozilla-firefox-1.5.0.1-r4 8075
+SHA256 775dabd5fe06cf5ae8632ee98c9d7726e2194e2d4cc55a1c54b6c7aff3561ef1 files/digest-mozilla-firefox-1.5.0.1-r4 8075
 MD5 6a7a2240dc5864e7f8ee444e34e84461 files/firefox.1 2538
 RMD160 4564007d7d5345e9ab09c941015e3cdb78913835 files/firefox.1 2538
 SHA256 3483439a73c74b818bdde98c15223b6d3fcfe78e3ad974fb35f197cf3ad614e7 files/firefox.1 2538
@@ -61,3 +64,6 @@ SHA256 bdcc6bbbca462928df2252f5cbadd053a27371c1c8097c80b614da681d6d39ad mozilla-
 MD5 d0bd46e41702ff6446015dc99407f659 mozilla-firefox-1.5.0.1-r3.ebuild 8678
 RMD160 9b677edc645e7e6fcb7a5d0971090a3c5ac81a29 mozilla-firefox-1.5.0.1-r3.ebuild 8678
 SHA256 613c9a12aef15ef1e6dabb93c566126f0cb4d0b820304a6e788351faf48fbef1 mozilla-firefox-1.5.0.1-r3.ebuild 8678
+MD5 89a86b4e6a2acddc33613dfe2b276f46 mozilla-firefox-1.5.0.1-r4.ebuild 8907
+RMD160 5a998497b462a84c32d3fc009b430825513de577 mozilla-firefox-1.5.0.1-r4.ebuild 8907
+SHA256 4c465bb5c8f878c23202db72b428c5a2a829df17ffd7777a6f464f7f94d914ac mozilla-firefox-1.5.0.1-r4.ebuild 8907
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.1-r4 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.1-r4
new file mode 100644
index 000000000000..b3a463eba2c1
--- /dev/null
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.1-r4
@@ -0,0 +1,96 @@
+MD5 c76f02956645bc823241379e27f76bb5 firefox-1.5.0.1-source.tar.bz2 34705286
+RMD160 6e332fb1a7e80ab56d3d6e3de3d203c8c58217bf firefox-1.5.0.1-source.tar.bz2 34705286
+SHA256 b398cd9c32168669077a535475f4da67b925523de99147977603ffa3b8897814 firefox-1.5.0.1-source.tar.bz2 34705286
+MD5 d74dcd578d52b56ef890c33bf5bb91c7 firefox-ar-1.5.0.1.xpi 153269
+RMD160 49276db6db9275aff4def3d78404b9104d6e8960 firefox-ar-1.5.0.1.xpi 153269
+SHA256 bcf534646b4485fc5ab071049c1b9888e5c101c520e2f02783ea2253ae184f86 firefox-ar-1.5.0.1.xpi 153269
+MD5 87d9eea1a15ab2a2e59c22d33bfd4539 firefox-ca-1.5.0.1.xpi 161283
+RMD160 19ca65da5a4e14ae0feef6286116efb5e6d87a47 firefox-ca-1.5.0.1.xpi 161283
+SHA256 40a39286b5b8f9e67823eef707adbf5f4415e88330145ff4d66d8c515649d87b firefox-ca-1.5.0.1.xpi 161283
+MD5 a662463c9a7cc973bcd175d3c4090ee5 firefox-cs-1.5.0.1.xpi 153054
+RMD160 c9697e68dfa5e8db621c40bb08166dcfe502e219 firefox-cs-1.5.0.1.xpi 153054
+SHA256 70da7ea59466fb1822c9fa93ff37b3915cd4e09708bab389d51c41962d4d2703 firefox-cs-1.5.0.1.xpi 153054
+MD5 e0ec46e4580688becee8cf6516e1e15c firefox-da-1.5.0.1.xpi 142462
+RMD160 baa0acf20ff503e1bfd6778f623c3be939d7c94d firefox-da-1.5.0.1.xpi 142462
+SHA256 ae0121e94c2219f8826d33003fda7dfe2ab6f694212b28f577ff182fd0e37033 firefox-da-1.5.0.1.xpi 142462
+MD5 8d207fc0664f0d6b74b8819ef51fd7a4 firefox-de-1.5.0.1.xpi 141050
+RMD160 4bae5fd5812a99d1edacfa0ae10ff3433662f9aa firefox-de-1.5.0.1.xpi 141050
+SHA256 79ea9e6efc6f1f05c205fdb183fbae0e42f0ea67a609e3ab39dabfd3a995f8c5 firefox-de-1.5.0.1.xpi 141050
+MD5 aa64a9d3f5220dfabbd97420d3af74ae firefox-el-1.5.0.1.xpi 146942
+RMD160 01f75c934132469a7b8f559d38d0b33c37c1a341 firefox-el-1.5.0.1.xpi 146942
+SHA256 206bf137504ae7e2a530ea38cbab5123aaea2b6a2e5bbdfd553c409128ff59db firefox-el-1.5.0.1.xpi 146942
+MD5 a936e2c46545e6e61023a6a20edecf74 firefox-en-GB-1.5.0.1.xpi 139579
+RMD160 2d6e4718c3891042fb7681147c15b8438a615e9b firefox-en-GB-1.5.0.1.xpi 139579
+SHA256 a3b7f49d94fe9b396e88814f51ce6a699405b0c2d266ed9f13fe78362bef3c0b firefox-en-GB-1.5.0.1.xpi 139579
+MD5 bbd1dbf00f5c7b5ce9fed00a761a2465 firefox-es-AR-1.5.0.1.xpi 146127
+RMD160 f7fc739f411a3d2e3b8a72f61f2052eaa1944994 firefox-es-AR-1.5.0.1.xpi 146127
+SHA256 6766eef7f8962a6ddb5efd5e4cbe761329f741fa08bdc5c54f7f8f10ebd824ba firefox-es-AR-1.5.0.1.xpi 146127
+MD5 e2cf3de192754243674fbb2a1600004b firefox-es-ES-1.5.0.1.xpi 132483
+RMD160 dac37c2d57cfd0e90e7f7f3a412b236a89f36c88 firefox-es-ES-1.5.0.1.xpi 132483
+SHA256 93a95f9ab1ec3dfb8d2ee0240c8e7254836eebc3007bdec2bb652f1095ef4a86 firefox-es-ES-1.5.0.1.xpi 132483
+MD5 a859ccc40eaa76e061eee50ed293a074 firefox-fi-1.5.0.1.xpi 143014
+RMD160 c64e28628f0d0cbf38ba9d69a1e206c2a6e4376b firefox-fi-1.5.0.1.xpi 143014
+SHA256 cfb0aa324e7a9b92431f5c496c72ca851f475487a50c0a0558f6d3c60806f368 firefox-fi-1.5.0.1.xpi 143014
+MD5 e1d108c55dae42b1cbba5bc5386ff645 firefox-fr-1.5.0.1.xpi 203232
+RMD160 6baa08d2ac77ca3e9e4499f5b417d2a024a24be8 firefox-fr-1.5.0.1.xpi 203232
+SHA256 f02bb0cd09cd6535f280ab81b48a7f8514a25983ecc2a6c7f6bcb793c5e36636 firefox-fr-1.5.0.1.xpi 203232
+MD5 a25d4887409490fc907f5075e22fd5d5 firefox-ga-IE-1.5.0.1.xpi 144794
+RMD160 ec1b317829665436dacfbf6f97a52a677243c13d firefox-ga-IE-1.5.0.1.xpi 144794
+SHA256 176bfbebd19dd5ca012347546a920368d36ce4c27f6a6df25055068336b51658 firefox-ga-IE-1.5.0.1.xpi 144794
+MD5 d244eb8b14948decf1691745495c2c8f firefox-he-1.5.0.1.xpi 144977
+RMD160 2cc998357af1eeda9b4a0f0d03b152d9685f0ede firefox-he-1.5.0.1.xpi 144977
+SHA256 e91bb1a505aee9cbe09dca6beff7cf3698d4388b8dd9aeafb4cc7e5e70625811 firefox-he-1.5.0.1.xpi 144977
+MD5 9e630cdff180b76bb4be6b7e874970a6 firefox-hu-1.5.0.1.xpi 154454
+RMD160 f5d15df122ba1d7188410835015029ca2f367586 firefox-hu-1.5.0.1.xpi 154454
+SHA256 38ae781de0827b6133c245b2195910f7f0e5729fa81fd56e196750fa770b8f97 firefox-hu-1.5.0.1.xpi 154454
+MD5 e4db3be4f79fbd038687fca2a72e0716 firefox-it-1.5.0.1.xpi 156712
+RMD160 720162bd7a80542cbd4ae3a2d38cbf5d149a59ec firefox-it-1.5.0.1.xpi 156712
+SHA256 9eb87ca0e4bcf6ad8916d6328587851c856af995a2290ffcd8bad9251abdfbdd firefox-it-1.5.0.1.xpi 156712
+MD5 99df33ac4322cbc86341779e23b71b23 firefox-ja-1.5.0.1.xpi 162443
+RMD160 14465b9e45a8644f57582d92bf3d7d1318694b03 firefox-ja-1.5.0.1.xpi 162443
+SHA256 9e4ea3b6eb776091fd1c2031ecc7ef6ce8e98075d756a5e097e3f9274a6da402 firefox-ja-1.5.0.1.xpi 162443
+MD5 7a686ff59b13dc9ca12013ef97b81bb5 firefox-ko-1.5.0.1.xpi 149477
+RMD160 c01c0d8f9133710638a9895ab578b4737bfe9bf6 firefox-ko-1.5.0.1.xpi 149477
+SHA256 5f8df08bfc2bc86354a44f03a9e347abd6a00cecf17fddf2e8a1059029fceab8 firefox-ko-1.5.0.1.xpi 149477
+MD5 eeda86afff9791379cf9e4f669f04a4a firefox-mk-1.5.0.1.xpi 162212
+RMD160 2cb0ea6ea6749097880bd3e6b085069cf33895d3 firefox-mk-1.5.0.1.xpi 162212
+SHA256 3d13470a51bb5b86342bedaba79d4a3da4e12fc2ef4a614ed2db1efe3d1bb5bf firefox-mk-1.5.0.1.xpi 162212
+MD5 724b21da210fb32c9f8ce739289f532b firefox-nb-NO-1.5.0.1.xpi 151775
+RMD160 426e71adf67063e58f71058e4dd2befa616dcb87 firefox-nb-NO-1.5.0.1.xpi 151775
+SHA256 a2125d8f79bd492b16a3b61f7c2bb3990808138e312c1ac0177e820f86e60e63 firefox-nb-NO-1.5.0.1.xpi 151775
+MD5 b9b21f29024bb96e01a1703f065f4c5c firefox-nl-1.5.0.1.xpi 150930
+RMD160 108d18abfd10f6bef50efefb926804bb07c99fc2 firefox-nl-1.5.0.1.xpi 150930
+SHA256 b4b56ffe58446b0fa87512130e6519f34e21e17b9875d999481d638b1eef1d1b firefox-nl-1.5.0.1.xpi 150930
+MD5 ddffac7d447d7b917eee4fd61f20ff8a firefox-pl-1.5.0.1.xpi 243654
+RMD160 2c0aeace26ec957e06653ad4bc961e882e8e4f31 firefox-pl-1.5.0.1.xpi 243654
+SHA256 d6da6a21cc6832961fb402edf8a7d5a46aa3d770a74eefe9ce94bbe24309f73f firefox-pl-1.5.0.1.xpi 243654
+MD5 797e3c51dddf90ca97209105a163053f firefox-pt-BR-1.5.0.1.xpi 143568
+RMD160 aa0d9ad9e4b73d5e996a0825ad706d473b1b0394 firefox-pt-BR-1.5.0.1.xpi 143568
+SHA256 d1fe1994d81ac3d66e45ea8bf21250b2d3197d2014d75d7bb528f961167a8714 firefox-pt-BR-1.5.0.1.xpi 143568
+MD5 5df657b6578f8888a2857d796c13c99f firefox-ro-1.5.0.1.xpi 144113
+RMD160 5af872fd21ec748eaf8400c269825e9f32383ae4 firefox-ro-1.5.0.1.xpi 144113
+SHA256 d10e27b94930fd37dca9e7b4e72533f1974ab95a4efb80d21b1f1f5a38956a79 firefox-ro-1.5.0.1.xpi 144113
+MD5 aad2b38f515f24124188be6cc07078dd firefox-ru-1.5.0.1.xpi 170096
+RMD160 7a8a506a92143e6966124ac78c50f7e4a3a53ba7 firefox-ru-1.5.0.1.xpi 170096
+SHA256 15116cbc14ae196535b18922022c3196b3ce2a0f4bdabd0b4571c58182cb1b52 firefox-ru-1.5.0.1.xpi 170096
+MD5 6773f50904482c9519f0ea4b8f1b90f8 firefox-sk-1.5.0.1.xpi 153991
+RMD160 4d7265bce8bc72e8c62ed2c744ee34ce77cecec6 firefox-sk-1.5.0.1.xpi 153991
+SHA256 e4d021106bada822f250ef6c40c37382dee312debb69aeb58ec3cd45570761a4 firefox-sk-1.5.0.1.xpi 153991
+MD5 4b2ff0f753966ce77331b4cfbbf243e7 firefox-sl-1.5.0.1.xpi 145204
+RMD160 e4db899374bc4943057c6b377115d172498ae558 firefox-sl-1.5.0.1.xpi 145204
+SHA256 a2b1f372c39aca67f71c76a62d6c819b58d59647847d167e25da6e10e7a2ec8b firefox-sl-1.5.0.1.xpi 145204
+MD5 34c025141e1babd5a0089b5dd0b44ef6 firefox-sv-SE-1.5.0.1.xpi 154913
+RMD160 4c9f4b5834a1df3d61fdbcaeaa4836e00c241b64 firefox-sv-SE-1.5.0.1.xpi 154913
+SHA256 d3f01766b5bd597c296e04c04c48de445acb9060865e7a2c70134eb130873d23 firefox-sv-SE-1.5.0.1.xpi 154913
+MD5 0a8a557ba7645f9284dd5d685fa3c614 firefox-tr-1.5.0.1.xpi 136158
+RMD160 ccf862e1963fc3e61af489be4b8b000f28bcb8be firefox-tr-1.5.0.1.xpi 136158
+SHA256 37e4fb218579750ce3df00d8d2e21431d685a39a1b993fc957f083f3a4ad884b firefox-tr-1.5.0.1.xpi 136158
+MD5 e8f49b0164448d9ae63d0b63c793c590 firefox-zh-CN-1.5.0.1.xpi 136417
+RMD160 c3e534a7844389cb0270e9fc8c67c3db69d3bddb firefox-zh-CN-1.5.0.1.xpi 136417
+SHA256 5df69c7787cae781f4f276e620c0838a56ee44b085522373cd458008f0994467 firefox-zh-CN-1.5.0.1.xpi 136417
+MD5 75deb6edd07ba70af65e0b717021fd84 firefox-zh-TW-1.5.0.1.xpi 128231
+RMD160 639d8e55eb7129b23d5aee5eb5de6d988e9d58ff firefox-zh-TW-1.5.0.1.xpi 128231
+SHA256 a9aefbd4d7657237a2de9898f52aa6091ec2b983b10ec9dc1c55e5e8ce2a25b0 firefox-zh-TW-1.5.0.1.xpi 128231
+MD5 db8b8e17f1f51570d00656ae520404b5 mozilla-firefox-1.5.0.1-patches-1.2.tar.bz2 36447
+RMD160 43fe199c261aa4d7dd451477a6e57c66efb8d172 mozilla-firefox-1.5.0.1-patches-1.2.tar.bz2 36447
+SHA256 7bd91288de6ffd3c49361a2cdf732e77117314d07aa763e34db2f7f9fca64a5d mozilla-firefox-1.5.0.1-patches-1.2.tar.bz2 36447
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.5.0.1-r4.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.1-r4.ebuild
new file mode 100644
index 000000000000..8366c0fab97b
--- /dev/null
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.1-r4.ebuild
@@ -0,0 +1,284 @@
+# 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.1-r4.ebuild,v 1.1 2006/03/31 18:52:55 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.2"
+
+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() {
+	local LANG
+	for LANG in ${LINGUAS//_/-}; do
+		if hasq ${LANG} ${LANGS} en; then
+			echo -n "${LANG} "
+		else
+			local SLANG
+			for SLANG in ${SHORTLANGS}; do
+				[[ ${LANG} == ${SLANG%%-*} ]] && \
+					echo -n "${SLANG} "
+			done
+		fi
+	done
+}
+
+src_unpack() {
+	unpack firefox-${PV}-source.tar.bz2  ${P}-patches-${PVER}.tar.bz2
+
+	LINGUAS=$(linguas)
+	for X in ${LINGUAS}; do
+		[[ ${X} != en ]] && xpi_unpack firefox-${X}-${PV}.xpi
+	done
+
+	if ! use alpha; then
+		rm ${WORKDIR}/patch/001_mozilla-1.3-alpha-stubs.patch.bz2
+	fi
+
+	# 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
+	has_hardened && 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=$(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
+}