revision/security bump, changes to ia64 and filepicker patch, sparc patch integrated into patch tarball

(Portage version: 2.1_rc3-r4)

3 files changed, 395 insertions, 1 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 077b0f78adbd..ca52d9d818ac 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.153 2006/05/23 17:56:17 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.154 2006/06/03 01:31:04 anarchy Exp $
+
+*mozilla-firefox-1.5.0.4 (03 Jun 2006)
+
+  03 Jun 2006; Jory A. Pratt <anarchy@gentoo.org>
+  +mozilla-firefox-1.5.0.4.ebuild:
+  revision/security bump, changes to ia64 and filepicker patch, sparc patch
+  integrated into patch tarball
 
   23 May 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   +files/firefox-bus-error.patch, mozilla-firefox-1.5.0.3.ebuild:
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.4 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.4
new file mode 100644
index 000000000000..4610dc24ce89
--- /dev/null
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.4
@@ -0,0 +1,96 @@
+MD5 4cb3d7c1b5345585750766c589308b5e firefox-1.5.0.4-source.tar.bz2 35337540
+RMD160 e119bbd4a65205f92341cb664222a9d6f1299991 firefox-1.5.0.4-source.tar.bz2 35337540
+SHA256 7b91edc5fe7ce07780b78a8c9838d2058e5d3227f9253f6001850f61f20511f4 firefox-1.5.0.4-source.tar.bz2 35337540
+MD5 e23fefc4b07fc6da0c144d14b4e8f81b firefox-ar-1.5.0.4.xpi 153268
+RMD160 c9e6b52d0518fafa69c5e56c2fcbe778be46241b firefox-ar-1.5.0.4.xpi 153268
+SHA256 8decad6e35a0d266a497e1710d37a0488c47b2ad22596a276e6e0eaed1295dc6 firefox-ar-1.5.0.4.xpi 153268
+MD5 12ea5e7c7e64e9f164b10b4b7177928e firefox-ca-1.5.0.4.xpi 161283
+RMD160 9b32ba702e615eec3fd97126934a4af82a26b0a9 firefox-ca-1.5.0.4.xpi 161283
+SHA256 2b0a9307c0927872afc65be7ccd062aab13b304cd3c0d6c8afb5b8ebc7a622ed firefox-ca-1.5.0.4.xpi 161283
+MD5 03e2574ae55d88147241e6e44f10831b firefox-cs-1.5.0.4.xpi 153054
+RMD160 39302e104c483c4d5c46e09d823c556d644813af firefox-cs-1.5.0.4.xpi 153054
+SHA256 d7efcac2022815c40ad7a4e23a7955d5a22c77c37cd7ecd51270a6924c4afc38 firefox-cs-1.5.0.4.xpi 153054
+MD5 004eeec34da75c497fac034133e7faa7 firefox-da-1.5.0.4.xpi 142462
+RMD160 91c4463cdf494f1a5a43d9f1576b1de582873a43 firefox-da-1.5.0.4.xpi 142462
+SHA256 70c101384e6ca9a96481f6816b32681209b8b6a9a70479608cdcf973267fe18a firefox-da-1.5.0.4.xpi 142462
+MD5 cd15e737a776c581083a5d4cf8887168 firefox-de-1.5.0.4.xpi 141050
+RMD160 4bd3ee06996f4df2f9828d44370932df3c2c1a62 firefox-de-1.5.0.4.xpi 141050
+SHA256 13bee8b4dc7a00eb84b58e0293e4403f276ea01ae7ea69959debabf5de5b695a firefox-de-1.5.0.4.xpi 141050
+MD5 de2ad39a365c9030b1e7ac13cf8747d2 firefox-el-1.5.0.4.xpi 146941
+RMD160 3a46e06ebd08e5c30772031268df4663cddf6f25 firefox-el-1.5.0.4.xpi 146941
+SHA256 e19553b5831bc81aee3159c86536ee402b2445e1cc9ce816022df01b83103f1b firefox-el-1.5.0.4.xpi 146941
+MD5 8fe33fa7158e849786dfffa2dcc3a669 firefox-en-GB-1.5.0.4.xpi 139579
+RMD160 ab593903fd1c80630fb66f33f5fbbda65d7fcfb7 firefox-en-GB-1.5.0.4.xpi 139579
+SHA256 1d495265c913df2bb0738ed0360456676c483690c48fda043bd326ddea47061f firefox-en-GB-1.5.0.4.xpi 139579
+MD5 7688ca56dcf6bc60675f18121e189c37 firefox-es-AR-1.5.0.4.xpi 146126
+RMD160 001f8c09ac4c36295bd15e4b7798320c4fc0f246 firefox-es-AR-1.5.0.4.xpi 146126
+SHA256 f8b5ce171c9bb6f6f6399fc1177c6248eb9e6a82c6a6679eac4c08cea6d0a556 firefox-es-AR-1.5.0.4.xpi 146126
+MD5 815d1d29760b6018117cf9a21bfa81c4 firefox-es-ES-1.5.0.4.xpi 132483
+RMD160 63b2d1d1e05b12e6819cba593bfcb63a4c70a23e firefox-es-ES-1.5.0.4.xpi 132483
+SHA256 1ef4382fdab1e9d118ce476b9cb3db01017b358eb9353fe5dd7ee3e3e1cafb16 firefox-es-ES-1.5.0.4.xpi 132483
+MD5 69b5ff83295c99d865e3064c845fb007 firefox-fi-1.5.0.4.xpi 143014
+RMD160 dc4f2e453fda14b5ca63e930cc721d14eeec8247 firefox-fi-1.5.0.4.xpi 143014
+SHA256 1691ec3c462c3b739cf9d1337d2e509e935e13a160d325ffc2bdec8ef4d9a09d firefox-fi-1.5.0.4.xpi 143014
+MD5 8ce20025590284a423d5ab7ff0ed5cf7 firefox-fr-1.5.0.4.xpi 203230
+RMD160 89d41f8c618a0db78d40396dd51e13d00c138090 firefox-fr-1.5.0.4.xpi 203230
+SHA256 4a93fbb1201ad5bb1994827a9607b51516b8243a65e226ac0cd24bb348d4704e firefox-fr-1.5.0.4.xpi 203230
+MD5 9f2ec07302ba3e2e24f9e88230e4f2fc firefox-ga-IE-1.5.0.4.xpi 144794
+RMD160 8a52e1225258e29c4ee41afcb0dec8769a9e14d0 firefox-ga-IE-1.5.0.4.xpi 144794
+SHA256 0d3f80253faaad3ff6fb65ddda1ffd7bbb2e40b1fca72d3784c28439ddb04d5a firefox-ga-IE-1.5.0.4.xpi 144794
+MD5 fc3b1566356a46bcc9ecfec6207f61f7 firefox-he-1.5.0.4.xpi 144977
+RMD160 4b71e36805dd631b2536527961275efea358bde4 firefox-he-1.5.0.4.xpi 144977
+SHA256 f6a2c05b8f75dde0ef619e5359b08cbcea2985cf0066d6361f299d9642628cba firefox-he-1.5.0.4.xpi 144977
+MD5 1fe40b8a9657fb6505ab321f88a63c1f firefox-hu-1.5.0.4.xpi 154453
+RMD160 cc62e48dad9f9a036ca5e3500a02f97836f64703 firefox-hu-1.5.0.4.xpi 154453
+SHA256 e020a78e4cc1e0a5d500e5e7117e3d7a25ab3d911379dbb91e30296bfc03f2a4 firefox-hu-1.5.0.4.xpi 154453
+MD5 b4ce508367f2080819a16a026d1227bf firefox-it-1.5.0.4.xpi 156720
+RMD160 9436b85bd4bfee72e8d913f63a9a04b4d912cc43 firefox-it-1.5.0.4.xpi 156720
+SHA256 48e7b7acced9f19e32bba3bda33944bde0a1ef7b455c09cb6ecf61eba328cff2 firefox-it-1.5.0.4.xpi 156720
+MD5 40e50490ca2103ff6cba87639cbc00f9 firefox-ja-1.5.0.4.xpi 162443
+RMD160 28d00f45ca32db2db6df525ba642268bdca646af firefox-ja-1.5.0.4.xpi 162443
+SHA256 029803a633489e7e3bbab0d52a0841043a90739d3c595b8a222aa4ad0c48a407 firefox-ja-1.5.0.4.xpi 162443
+MD5 71196ea114652a712a064837f4ae7af7 firefox-ko-1.5.0.4.xpi 149476
+RMD160 4861d2d1aeede061ec19d78a4510309e1558182c firefox-ko-1.5.0.4.xpi 149476
+SHA256 c69333d427893205e1b5f42fbb11e0d6eb6353e20064ea534fb2b6853debc7cc firefox-ko-1.5.0.4.xpi 149476
+MD5 6873b970d1fd51e26acda6fb47258c70 firefox-mk-1.5.0.4.xpi 162212
+RMD160 53fec6f0e13e4b98cc6fbf3aaf29b04005e0a601 firefox-mk-1.5.0.4.xpi 162212
+SHA256 8a2c979b8f3c3e44d1f966db3e7ea4a256224b86310d12097714d81720920e0e firefox-mk-1.5.0.4.xpi 162212
+MD5 c7b5fde5496c9d94cacf3678772bf763 firefox-nb-NO-1.5.0.4.xpi 151778
+RMD160 f5aa815feba0d7de3df259f69fd0b46cfaba1b58 firefox-nb-NO-1.5.0.4.xpi 151778
+SHA256 ffc83a824416fe7b07b66938577a0e7abb11b37130953b97b50b32320642b757 firefox-nb-NO-1.5.0.4.xpi 151778
+MD5 6161921f9d4f7b35aa0ecfd421e834df firefox-nl-1.5.0.4.xpi 150930
+RMD160 bfcae25f0458a797c513911741209830b6cbd85c firefox-nl-1.5.0.4.xpi 150930
+SHA256 69c5a810fc56169b1f082bbfe60603b518f0feea4234197d4fafdea552ab75ab firefox-nl-1.5.0.4.xpi 150930
+MD5 3c54d2396dcc5518c59b0043ebfb1aad firefox-pl-1.5.0.4.xpi 243664
+RMD160 2b61a91534255efb494af04bc392c01e297d1a24 firefox-pl-1.5.0.4.xpi 243664
+SHA256 c15c694134d5c8e4423cb2d0ce343c142ae7ffeff99f75a148d7fccc067e326b firefox-pl-1.5.0.4.xpi 243664
+MD5 2ef49d42bea940512a9ad9d8e0cbd055 firefox-pt-BR-1.5.0.4.xpi 143567
+RMD160 43dae569b52f9dd0820a8fe5430987ccc95b8c20 firefox-pt-BR-1.5.0.4.xpi 143567
+SHA256 3813cbac072bc504494b170b7cf927aa0bb6fe87426b0288a7aa2610795de42d firefox-pt-BR-1.5.0.4.xpi 143567
+MD5 84e9652fd980bb29554d485a6a126224 firefox-ro-1.5.0.4.xpi 144113
+RMD160 02415dc284c6007eb962450dd964eee812588a83 firefox-ro-1.5.0.4.xpi 144113
+SHA256 a7ec1478e6ba1115980e5ca1c226c0339f703448c0affcbfed82dfa5faf628cb firefox-ro-1.5.0.4.xpi 144113
+MD5 7c53b89f0482e9daf3d0e0493c11bb1c firefox-ru-1.5.0.4.xpi 170083
+RMD160 e3beed928f3b63d1d72fcc70b843500b063513b2 firefox-ru-1.5.0.4.xpi 170083
+SHA256 015adf97c415938e8f39e342f99e0a72630c8b68cafa38d016020eae0fe2a6a4 firefox-ru-1.5.0.4.xpi 170083
+MD5 27d2ea95225ae6a96b464af087fc04b9 firefox-sk-1.5.0.4.xpi 153991
+RMD160 438d1bbfdb8eace6dac0caa8b1345df9cf045cd1 firefox-sk-1.5.0.4.xpi 153991
+SHA256 be38d47f008635c9e3510f68f7bef2db9c9ad426b203503a0da0e88f9ecbb819 firefox-sk-1.5.0.4.xpi 153991
+MD5 35acf29dbf7c5567a89a3d914aa61677 firefox-sl-1.5.0.4.xpi 145204
+RMD160 0c2b692aebbe1f92b17ca052cc875b0d4b02eff5 firefox-sl-1.5.0.4.xpi 145204
+SHA256 fd4dbbca8d389807eeee4e0695f1958ed354531673d3340c0b499a8faf1785f2 firefox-sl-1.5.0.4.xpi 145204
+MD5 8fc3c14913a993ec4d801b1e86a98f77 firefox-sv-SE-1.5.0.4.xpi 154913
+RMD160 e9cd9058e3d743a6520179ce2bea308f725ecfd4 firefox-sv-SE-1.5.0.4.xpi 154913
+SHA256 20a1520d3165065b06fac0d87a55ae6a1ebdce793ff1930f392b7bef08cb5e47 firefox-sv-SE-1.5.0.4.xpi 154913
+MD5 2168032a4bc6020fdf00c5276e793e7c firefox-tr-1.5.0.4.xpi 136158
+RMD160 181570ee5227c0ae04478e334e6f4850ca27db40 firefox-tr-1.5.0.4.xpi 136158
+SHA256 a760bcece9e86593a7225be11ee1bcfff62d6ddc2f168ceb45a6c812ca3c1fed firefox-tr-1.5.0.4.xpi 136158
+MD5 599239fad139db164da9dfaee2ebae7f firefox-zh-CN-1.5.0.4.xpi 136417
+RMD160 23c29a0de219df548d51d2c355668477d1aaa95d firefox-zh-CN-1.5.0.4.xpi 136417
+SHA256 1c0f3e52410a9836a1eb41bea112a903c56e83ffed3e72b45259228f921b1d50 firefox-zh-CN-1.5.0.4.xpi 136417
+MD5 62cdecb44ca5de65d110e980ddade832 firefox-zh-TW-1.5.0.4.xpi 128230
+RMD160 0fb0cadc09df73a46842dc0ff11a68dca1867a7c firefox-zh-TW-1.5.0.4.xpi 128230
+SHA256 de76b8525ad32a87239659635b720a630eb04abe396275d419436837706199ce firefox-zh-TW-1.5.0.4.xpi 128230
+MD5 1e0fa6ba0e29223dc35f8f21b8c42148 mozilla-firefox-1.5.0.4-patches-1.0.tar.bz2 41314
+RMD160 f9f53abbee5c39b5f2661c53bb4e627c15fd0714 mozilla-firefox-1.5.0.4-patches-1.0.tar.bz2 41314
+SHA256 7422c93c49066ac5fe4358d80ff8d16019ae8262c5a694a71c28d71e3117829d mozilla-firefox-1.5.0.4-patches-1.0.tar.bz2 41314
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.5.0.4.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.4.ebuild
new file mode 100644
index 000000000000..49909dc2f3ec
--- /dev/null
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.4.ebuild
@@ -0,0 +1,291 @@
+# 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.4.ebuild,v 1.1 2006/06/03 01:31:04 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 ~sparc ~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} 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_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
+}