bug fixes, nss/nspr system now

Package-Manager: portage-2.1_pre4-r1

3 files changed, 394 insertions, 0 deletions

diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index 47dcd7029570..774d33394cc5 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -13,6 +13,9 @@ SHA256 e5ca27ea35d528bd873f1dfe59b15d06cf8e34e1325ca0ccf5b73f7e0307040a files/10
 MD5 c24bf7e058e8e34c7c18e6ad016be1a0 files/digest-mozilla-firefox-1.0.7-r4 435
 RMD160 bd34b43f06a13099276489d5e6d9798312cbc072 files/digest-mozilla-firefox-1.0.7-r4 435
 SHA256 7069e4786ed5d664ec723035af870d4635777477680aca87fe4feb7243ef581d files/digest-mozilla-firefox-1.0.7-r4 435
+MD5 9f8e6126a7ba1d8dbf81656147f916cf files/digest-mozilla-firefox-1.5-r11 6611
+RMD160 51c9b78747503d2b850a4ea60988f6cb62e22249 files/digest-mozilla-firefox-1.5-r11 6611
+SHA256 13b98b983eb1c0ff81d314e1c5ddd48c2f0b0cbb13f92b94fa1b1d36957c11d5 files/digest-mozilla-firefox-1.5-r11 6611
 MD5 942724f965942ebb0b378944365971d0 files/digest-mozilla-firefox-1.5-r9 5797
 RMD160 8481d85385633ee60f4116635d6c5d1c117cfdfb files/digest-mozilla-firefox-1.5-r9 5797
 SHA256 30f2e95fb485ef6858d6390b8c921cd368c67a6e65b41a1f818dd4809f4c9e55 files/digest-mozilla-firefox-1.5-r9 5797
@@ -40,6 +43,9 @@ SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b metadata
 MD5 88a8a7b16c2a9376c68e91be09ea0ba5 mozilla-firefox-1.0.7-r4.ebuild 9847
 RMD160 539d5c3ce8b2d225fa8871fd2722b52506ab5eef mozilla-firefox-1.0.7-r4.ebuild 9847
 SHA256 6dd31547c54e7ddb6e0faca73242aa74a7405ee4c27124a3404fcbbd518536a2 mozilla-firefox-1.0.7-r4.ebuild 9847
+MD5 e3cf634bcdf4ad0ecf557403b85ff6c0 mozilla-firefox-1.5-r11.ebuild 9412
+RMD160 e48189d4e7c0225585ea57a26ce650a51b7f0642 mozilla-firefox-1.5-r11.ebuild 9412
+SHA256 9fc7917cdb2275adb873f1683bbaa2fb57ff9ca56daf6337fad68c5393a60c4f mozilla-firefox-1.5-r11.ebuild 9412
 MD5 cbb5d789ecf331b385b63a1b75447eb5 mozilla-firefox-1.5-r9.ebuild 8402
 RMD160 220e973f575c9ba4f701e11c1340870cd68c4d6e mozilla-firefox-1.5-r9.ebuild 8402
 SHA256 3d63df219c0119abd3a835bb8cf7bf55b250b428e8647628b82fc4145e8780b6 mozilla-firefox-1.5-r9.ebuild 8402
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5-r11 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5-r11
new file mode 100644
index 000000000000..f7b521b14958
--- /dev/null
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5-r11
@@ -0,0 +1,96 @@
+MD5 ab89c9ecf8402c2d6703de08879b6053 ar.xpi 153267
+RMD160 5035808bbf14d55ad4a493276397493fd531a048 ar.xpi 153267
+SHA256 eede7996f20dcea615f74508a923fb75a985d569d8f10249e1809429fc6a5b7c ar.xpi 153267
+MD5 58ca5cc51582ab37aa7b1605f0d91679 ca.xpi 161282
+RMD160 e49729d6d1720a2156de5ab7762debd66fc27346 ca.xpi 161282
+SHA256 1a67da5e4bb11e2a9d328197f382308b2546340a74348b164e4ad4044346ef29 ca.xpi 161282
+MD5 6f81abef4371fbf65849e9bec2939f39 cs.xpi 153049
+RMD160 7f6bac6a50ad58bc01f8216dbefbe3aa403a79f0 cs.xpi 153049
+SHA256 5c83b1debeb5d43df21e3557ae4b06155c8acadba7524ed8de4dd05f9869ebc6 cs.xpi 153049
+MD5 b6a5341ffd63ef0b39b8f561afe1072e da.xpi 142463
+RMD160 7ee7c41e720749b921fc44219aae4dd420571ebc da.xpi 142463
+SHA256 f9335bd8f1f7df6a67ad22920c4dc765b68eb14e1535336ddd5eb87bbdcdb358 da.xpi 142463
+MD5 63de76d822b986367f2029f363e8e625 de.xpi 141056
+RMD160 68458e5790169e6957578c3cf346edb79b6fb002 de.xpi 141056
+SHA256 7769dfbc2dd1abfa6fc594cd8fb3214825f38804cd3278b8c015cde052fe19a9 de.xpi 141056
+MD5 b1d2189b9248c994999e7e3d82885b31 el.xpi 146943
+RMD160 1604d3bb614de1ecbd6ef6b0d47c1e079b4e9da7 el.xpi 146943
+SHA256 466f01dcabeabd8d0641d0a9df2a28378f05576d342f28b89b39465c600a7bad el.xpi 146943
+MD5 d8ed9f1d3f6edf2c870a831dec72cfea en-GB.xpi 139581
+RMD160 5124e015adcdf42d54b9917345b3a4153271fb38 en-GB.xpi 139581
+SHA256 450b2d4e09ebcaca642e88afd250eeefc17a35f5b8413ac4531e16450edcb91c en-GB.xpi 139581
+MD5 655c2d6f95185260fad7f782729da10e es-AR.xpi 146125
+RMD160 fcb4255a0986bf0a8d330bc95d130b5cf483de6d es-AR.xpi 146125
+SHA256 96ce83874880023d8c1f3403a5924c9948e8bed408e0d129f2dfc52891c4314d es-AR.xpi 146125
+MD5 89cbf50f50ddde89a4b1cada2157f51a es-ES.xpi 132461
+RMD160 781a628f8f5424267a42209bbc49f1acdb2448bf es-ES.xpi 132461
+SHA256 56cb4bb4cdd836785bb958e1664251d1d6b141d242d68d241e0192b3fd2b7735 es-ES.xpi 132461
+MD5 a04056b74d7541da63a9a3f4e2deef38 fi.xpi 143012
+RMD160 97af038b65f7c4fb1c05da78be1e2ed1e85a0297 fi.xpi 143012
+SHA256 5ec58931f0ace1406523a7dd9ae8b3bcd1dbc25180ab8e7dabc67dac5488457f fi.xpi 143012
+MD5 fa915ddcadecda30ed3e13694f26a779 firefox-1.5-source.tar.bz2 34491496
+RMD160 5e7475846e9c92e36167a384e1e8a3d699b0b62f firefox-1.5-source.tar.bz2 34491496
+SHA256 3cdbd0929b1f92c60b3fb27601f621975fefea23465d5253238c6e120360d36b firefox-1.5-source.tar.bz2 34491496
+MD5 5a359eedd21c01b5bd3f17830cc69310 fr.xpi 203230
+RMD160 66eebebaec59a1cfdbc7efc413c4246d5869fa65 fr.xpi 203230
+SHA256 a22fd927cad9d2e266c9a13b6684c30763d2a85abcc043ff3de40338f3eaf171 fr.xpi 203230
+MD5 1c28ec03ce05851a9e77befbad6f8b7a ga-IE.xpi 144789
+RMD160 66965dbeab426b7408da861a99914df7176ee590 ga-IE.xpi 144789
+SHA256 b070e77abc3fa62ec222aa040498a05adb36367f2e2510df14e77dc31eaa80a1 ga-IE.xpi 144789
+MD5 62767c9e689a4b0abadaf80abb374e2c he.xpi 144976
+RMD160 301602ab3e3a03554c903ec03e1a768ebd2cfbf3 he.xpi 144976
+SHA256 16461ebb53b51d65727ee8822a7a09ec583623e397a7c336c6ec66f4135563ea he.xpi 144976
+MD5 65bf69b578c31444ba6c5d466f96fae6 hu.xpi 154449
+RMD160 a38e2a95d0cc31d85f62c24999431b434c4fdfa8 hu.xpi 154449
+SHA256 c445c139459bc4f24dd3ba654ea360c585cd55e28bf41c67a5d1816fac07414f hu.xpi 154449
+MD5 08bac8b89fa2bd0740c8e24d30533f47 it.xpi 156712
+RMD160 888fefe892a89cf9a2e502ff9ae870e4931b6b2d it.xpi 156712
+SHA256 963a9475fc1b83da95df82d0400ff6b0111dd787bf04eb42ed346657ca5d75ab it.xpi 156712
+MD5 1b5f28d3a980c5a92d590219fc337f03 ja.xpi 162438
+RMD160 a8c2a21ae116348b652334a58329d42bb7d294ba ja.xpi 162438
+SHA256 a9c6a328f91602b0739b2ea358f82f99915f7c33323067ac7528eb06648aeaf8 ja.xpi 162438
+MD5 15724eb7fb952b2dd90add37d3331ac9 ko.xpi 149473
+RMD160 1f89d42286c662277ee438e943f55bf90e92841f ko.xpi 149473
+SHA256 520441b894523485bbe973f3528cd221fea0e533b1e80863f3e172a3503dd432 ko.xpi 149473
+MD5 4370df701364eaf22b2b214b4491c7f0 mk.xpi 162207
+RMD160 f7d9bbaaaed66d0c9298946ee1d74cad431674ec mk.xpi 162207
+SHA256 03cff8cca2ef2d76c789a0bb51f56eb6b360bf22ca831c2970c860ee0400bf12 mk.xpi 162207
+MD5 e1a1afbe9507d50544420239aee39d5b mozilla-firefox-1.5-patches-1.4.tar.bz2 36020
+RMD160 bec663ebaeffaa480d1921e03fcca8d5bb66562a mozilla-firefox-1.5-patches-1.4.tar.bz2 36020
+SHA256 47222edf0151df87507aabe5f89aab1388479be441c887ee824a36dc349e1566 mozilla-firefox-1.5-patches-1.4.tar.bz2 36020
+MD5 6e030a4c52bc0144e7de6f2092ba57dc nb-NO.xpi 151770
+RMD160 df19b6fb3a8def33bf1caecf404525413eb7ac60 nb-NO.xpi 151770
+SHA256 a4b8f35a4b487d161ba1b9e1e19052a56218b38206757ca168aef945ae6d8f61 nb-NO.xpi 151770
+MD5 92f8b9f0a4aaf3ebfc1b6fb74189ede3 nl.xpi 150929
+RMD160 214986a22f66ddb68b438d183c6005a0609b2aa6 nl.xpi 150929
+SHA256 a9eceae035b6500aeca74739a91c2d584929068f5792acaf9791f8bfa3e81b38 nl.xpi 150929
+MD5 1864b9b0c82b9d30018a9537336e56bf pl.xpi 243650
+RMD160 a4508fb3ed59d77bff95034cd3f7067d9aabcbea pl.xpi 243650
+SHA256 fb891a2ae5ba30ece532f8b26394f96dd8d4e760a5f0c1c493d7221ddbde73b3 pl.xpi 243650
+MD5 4ea8f665e814e03474d955f89711d73a pt-BR.xpi 143568
+RMD160 8d1a0760fb51c36820f6ecf5e7fb0ca9dc21062f pt-BR.xpi 143568
+SHA256 b05bb410e9a15903680a47151cff46c09d18eaf43ad0544e57294baa45d64c23 pt-BR.xpi 143568
+MD5 d62c152f06dd1479441f7769635ee4e8 ro.xpi 144106
+RMD160 ff5c55e195d40c2f22238190889d4da895de56ad ro.xpi 144106
+SHA256 71ce3a15328cc6233ab45fae63ca1b96004293c7f9d468e91a2dc2a3eae9670b ro.xpi 144106
+MD5 f19c6d0e4131d04536f05f5534753c38 ru.xpi 170096
+RMD160 4f8c0b4b2f6dcf6dde33c3f1f2aa176eb660f9a1 ru.xpi 170096
+SHA256 14d16d0667b0acac03b0acc0e0f5a1bcaf8b27740a612b4d036c88855eab225b ru.xpi 170096
+MD5 bdc1cb09937465d5f8d6e3d3666b280d sk.xpi 153991
+RMD160 87a7bbe19097980ac4795cb19ec746926b213f9e sk.xpi 153991
+SHA256 6cb4ca78d2da883869a817241c9f98f6f79aaab11814423ae47d637cc056041f sk.xpi 153991
+MD5 a6e5d8d95c795782bd4cf9204f712424 sl.xpi 145205
+RMD160 0ae69cecaa58122a939e8619a1342e59ed9dbc27 sl.xpi 145205
+SHA256 2c44e2234b57cb6822f5d2a4658accb17494f27aa31476a71c8a1fc80fdc558a sl.xpi 145205
+MD5 704fadd436b1443cf996fe28ea4af017 sv-SE.xpi 154919
+RMD160 5dbb8816f8aaa1141fb02de7dd1099db2ba60cb6 sv-SE.xpi 154919
+SHA256 eb63409a62a54a504615e2c0c133528401c982aef45c9828546405acfc0160d8 sv-SE.xpi 154919
+MD5 eff05aaf7f64bb1daa8e3d646237f077 tr.xpi 136159
+RMD160 04b974970583ca5eb54079e767ab205b58754bee tr.xpi 136159
+SHA256 92852dcc2f869024fdb7feea6244a06fc9cdcfa9307a6b678987666f881efe27 tr.xpi 136159
+MD5 2213a8fab73a160366046fdd86eda0cc zh-CN.xpi 136431
+RMD160 1a820a7ff5a9e28f26ab869a5d93cd08d7027a01 zh-CN.xpi 136431
+SHA256 6ba364dc70611887641df19d11713ea5272cb3df9d1bc73275a3eb82b2e103bc zh-CN.xpi 136431
+MD5 f017d6f4421f9bd306cdcd306def80b5 zh-TW.xpi 128229
+RMD160 772c561fd36ad83e3cef3e4815175e76059f6223 zh-TW.xpi 128229
+SHA256 c3d72c4fb98358fcd8f57038c74a929f3c9a2f1e9f6f44fafe68612a323258ce zh-TW.xpi 128229
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.5-r11.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.5-r11.ebuild
new file mode 100644
index 000000000000..34e7dad85d61
--- /dev/null
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.5-r11.ebuild
@@ -0,0 +1,292 @@
+# 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-r11.ebuild,v 1.1 2006/02/01 22:13:20 anarchy Exp $
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+MOZ_FREETYPE2="no"   # Need to disable for newer .. remove here and in mozconfig
+	                 # when older is removed from tree.
+MOZ_PANGO="yes"      # Need to enable for newer .. remove here and in mozconfig
+	                 # when older is removed from tree.
+
+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.4"
+
+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/-/_}? ( http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/linux-i686/xpi/${X}.xpi )"
+done
+
+for X in ${SHORTLANGS} ; do
+	SRC_URI="${SRC_URI} linguas_${X%%-*}? ( http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/linux-i686/xpi/${X}.xpi )"
+done
+
+KEYWORDS="-* ~amd64 ~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}
+	app-arch/unzip
+	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 ${X}.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
+
+	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
+
+	# 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
+
+	####################################
+	#
+	#  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
+
+	# Fixup the RPATH
+	sed -i -e \
+		's|#RPATH_FIXER|'"${MOZILLA_FIVE_HOME}"'|' \
+		${S}/config/rules.mk \
+		${S}/nsprpub/config/rules.mk \
+		${S}/security/coreconf/rules.mk
+
+	# 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}
+}
+
+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}
+
+	# Create directory structure to support portage-installed extensions.
+	# See update_chrome() in mozilla-launcher
+	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
+	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
+	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
+		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
+
+	LINGUAS=$(linguas)
+	for X in ${LINGUAS}; do
+		[[ ${X} != en ]] && xpi_install ${WORKDIR}/${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 busted please search"
+	ewarn "http://bugs.gentoo.org if no bug is open, then please open a new"
+	ewarn "bug report so these can be fixed. Before filling bugs make sure you"
+	ewarn "have moved $HOME/.mozilla our of way and tested with clean profile."
+	ewarn "Thank you! anarchy@gentoo.org."
+
+	echo     ""
+	einfo "I am unable to brand firefox or thunderbird officially yet."
+	einfo "You will see that everything says Deer Park cause of this."
+
+	epause 15
+}
+
+pkg_postrm() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	update_mozilla_launcher_symlinks
+}