revision bump that should address textrel issues

(Portage version: 2.1_pre9-r5)

3 files changed, 390 insertions, 1 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index ad7ba87a5d3b..e126c41486c3 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.145 2006/04/28 23:59:44 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.146 2006/04/30 00:41:17 anarchy Exp $
+
+*mozilla-firefox-1.5.0.2-r1 (30 Apr 2006)
+
+  30 Apr 2006; Jory A. Pratt <anarchy@gentoo.org>
+  +mozilla-firefox-1.5.0.2-r1.ebuild:
+  revision bump that should address textrel issues
 
   28 Apr 2006; Jory A. Pratt <anarchy@gentoo.org>
   mozilla-firefox-1.5.0.2.ebuild:
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.2-r1 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.2-r1
new file mode 100644
index 000000000000..1c9d3ee6e6ae
--- /dev/null
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5.0.2-r1
@@ -0,0 +1,96 @@
+MD5 6bd65d899e9bcb16c28225899cc61a1e firefox-1.5.0.2-source.tar.bz2 35234245
+RMD160 a3128798930d069a175d278b5522cdc8e43dc352 firefox-1.5.0.2-source.tar.bz2 35234245
+SHA256 23aa847dd166ac8240b85c114e937f65003750045aa69b30000cfeb9414ed83c firefox-1.5.0.2-source.tar.bz2 35234245
+MD5 2b774cc5eb0930da204e7b4ea619da64 firefox-ar-1.5.0.2.xpi 153269
+RMD160 2d9ae94b62e3a3ed0017f9074c5c12d1defcf074 firefox-ar-1.5.0.2.xpi 153269
+SHA256 1c6cba1daf12a8032dffbd563fc52e389c09a20d3e4f3775fc947ba6498216b3 firefox-ar-1.5.0.2.xpi 153269
+MD5 ebea90ea686058864d5ea473de1f19a1 firefox-ca-1.5.0.2.xpi 161283
+RMD160 2627c265b80d36d12c8d2354accf188e876f4f24 firefox-ca-1.5.0.2.xpi 161283
+SHA256 52adfca6f1172aa5729ec06c261a5971f777696b2b192cc206f86357e66f2af8 firefox-ca-1.5.0.2.xpi 161283
+MD5 afb584a967cbff55abfcde811c05fca2 firefox-cs-1.5.0.2.xpi 153054
+RMD160 058dee292a6b9bc9e6afbcc99b9f97d7221635e7 firefox-cs-1.5.0.2.xpi 153054
+SHA256 4b40064bf34547f08ec557a2d5d9930bf2c46f02920f41f3725568a9fdc76ada firefox-cs-1.5.0.2.xpi 153054
+MD5 225a6f12faa4c1429a20bd16125139ce firefox-da-1.5.0.2.xpi 142462
+RMD160 a8969ae95fa5c76d80cbeeb22977bfe4894d7702 firefox-da-1.5.0.2.xpi 142462
+SHA256 14f4390e32ebc17df6e9f9f6894f50105dc2a85701a51fa22c03ee10d865ca3f firefox-da-1.5.0.2.xpi 142462
+MD5 c1ff82a4db1419053e01a78a4f702acb firefox-de-1.5.0.2.xpi 141050
+RMD160 33f6318d5354a2ce93db60430e8b36f1846a6bec firefox-de-1.5.0.2.xpi 141050
+SHA256 2c41dda5ac2210b67172dcb78495e0c43d966f0e8b76a38b3c5e636f130ac4f8 firefox-de-1.5.0.2.xpi 141050
+MD5 4a0bbe936b78779b8e7140b8915a4012 firefox-el-1.5.0.2.xpi 146941
+RMD160 439c7bc016b64171163b9678cdd96d3a09a1e7bf firefox-el-1.5.0.2.xpi 146941
+SHA256 200073e6f19dee7265bef01a167296b082721b9e413c15dd13ababe027f57aab firefox-el-1.5.0.2.xpi 146941
+MD5 385b3b1f7b1d6fc63c88f59b22df92be firefox-en-GB-1.5.0.2.xpi 139579
+RMD160 40cf209ea265f3d9fe402c02f8262a2ccf86e345 firefox-en-GB-1.5.0.2.xpi 139579
+SHA256 e3eda8edd7c1897f958ccc363ef2eff3116d0cb6215c00d75d05c02828099791 firefox-en-GB-1.5.0.2.xpi 139579
+MD5 a3bbebe692710403f0fd885876218317 firefox-es-AR-1.5.0.2.xpi 146127
+RMD160 4611faa19ab297eb7a96f9e2d3cf376156c9e0d2 firefox-es-AR-1.5.0.2.xpi 146127
+SHA256 ee5b939b6e7be3ad2206fed49131469210220ebff533095c244ed80421af286d firefox-es-AR-1.5.0.2.xpi 146127
+MD5 d49e6ce599bcc46922cbf499c0dfd792 firefox-es-ES-1.5.0.2.xpi 132483
+RMD160 e955f82c0d400e6b3802bfe120afc9fa24e9812e firefox-es-ES-1.5.0.2.xpi 132483
+SHA256 b391407fc4d0d7871bfd77c05e85b42c043a888d99d8e1d4baff9afdf6d6c2dc firefox-es-ES-1.5.0.2.xpi 132483
+MD5 ea579b7a079ddf84add5e2b044b314cb firefox-fi-1.5.0.2.xpi 143014
+RMD160 8b68a67c2224ad0c004151f846f64264acf4f3e8 firefox-fi-1.5.0.2.xpi 143014
+SHA256 609647dbb1fca096c47b8c50f2ad66eb09e2bdddaa85974656d8795d23bfcb95 firefox-fi-1.5.0.2.xpi 143014
+MD5 13f9d89c85d445cda63b40d955c9eb99 firefox-fr-1.5.0.2.xpi 203232
+RMD160 7dd4222f94042fe4470d82210c87286ab7cf5310 firefox-fr-1.5.0.2.xpi 203232
+SHA256 c9db9ffab091547118d4edabe41c9e113e44c0391945ca40f247f42cad1699c4 firefox-fr-1.5.0.2.xpi 203232
+MD5 d4cea3137cfa24214ece1484c3abe41f firefox-ga-IE-1.5.0.2.xpi 144794
+RMD160 7ac78bd8f5bb24a90c773d5c8584f7057bc20cfe firefox-ga-IE-1.5.0.2.xpi 144794
+SHA256 bf65dd98af6de567c5fe6570ff965ee5f80ccd4352edc07d54aec2a053263ce7 firefox-ga-IE-1.5.0.2.xpi 144794
+MD5 65028f93170c064b57756567d9977d13 firefox-he-1.5.0.2.xpi 144977
+RMD160 1a08b25a5532bec4601da63663e8eb8ea6fe7bd7 firefox-he-1.5.0.2.xpi 144977
+SHA256 7337e57288163e4b058cce42f34edf2eb98eb9f82ebf6591a2473347b02250b1 firefox-he-1.5.0.2.xpi 144977
+MD5 d2de1498932e0926ea945ed700ba8d93 firefox-hu-1.5.0.2.xpi 154452
+RMD160 a12e5e570a122dbd9265af9a21578917256316ad firefox-hu-1.5.0.2.xpi 154452
+SHA256 03b2bbd8bb18f9b20add9da841de1fb14ee16575707e75d6a0dde0e71b8706f5 firefox-hu-1.5.0.2.xpi 154452
+MD5 9cf375406774dd090b313b06ee635596 firefox-it-1.5.0.2.xpi 156712
+RMD160 1bb566c5051e762d0bcbf0675366cfb2d6577f26 firefox-it-1.5.0.2.xpi 156712
+SHA256 ce26126b7b3181c1290d8e6bd5199a6a8fe4080e69a22dc365ad540b91b5003d firefox-it-1.5.0.2.xpi 156712
+MD5 2af2dbb44b69646f01a9e84e2ce9efbc firefox-ja-1.5.0.2.xpi 162443
+RMD160 9970071b532f5359178812551d96652bb31c3f68 firefox-ja-1.5.0.2.xpi 162443
+SHA256 42a41e48950b9389bacde93f2f515f14d5b62f14cd7482b57895891c313a7cb2 firefox-ja-1.5.0.2.xpi 162443
+MD5 4bbe6f59a7d46fcb00dca48986c352e6 firefox-ko-1.5.0.2.xpi 149477
+RMD160 06cb017641459c550aac879992de91354f877999 firefox-ko-1.5.0.2.xpi 149477
+SHA256 fb7ca1cf98b366555e0e688a042e30ef2bfe82275f1afc912f484613ee660953 firefox-ko-1.5.0.2.xpi 149477
+MD5 deffa61c495ca5c202017eee507285f7 firefox-mk-1.5.0.2.xpi 162212
+RMD160 6f8fc87d4a4fdd90ad01b632d6929a430a0450dc firefox-mk-1.5.0.2.xpi 162212
+SHA256 3fcfdc9565b39353cb45bc886aa411b939048af8bbc9b412f53c0db1af6fa5d9 firefox-mk-1.5.0.2.xpi 162212
+MD5 d3e4b54fe0b93e8a415d1e8a84b3c7ca firefox-nb-NO-1.5.0.2.xpi 151775
+RMD160 0d6e9ac665a84263025f8b7535502a7caa0c73e9 firefox-nb-NO-1.5.0.2.xpi 151775
+SHA256 e70f3398f6d94c655f2b72e6c125c46cb28321bc253bcfe5b27c3e2e51b7c48e firefox-nb-NO-1.5.0.2.xpi 151775
+MD5 c21553a775b1c7250f29344e88b00a75 firefox-nl-1.5.0.2.xpi 150930
+RMD160 0667b5e281cb71528f62f334169abe75b15a7a9b firefox-nl-1.5.0.2.xpi 150930
+SHA256 66001f5dc3219b3354b2829f42d9e9f5b0780601fe09bedf953b8bd2b5251528 firefox-nl-1.5.0.2.xpi 150930
+MD5 b248d8dec8c95b4dea2c7d08d65cbd60 firefox-pl-1.5.0.2.xpi 243653
+RMD160 0955be6665a233326f4eff8b11c3f7b001526a29 firefox-pl-1.5.0.2.xpi 243653
+SHA256 2345105f422ff55e6c6e8793c827dd4b9414ea455b9593afe8b1ce65786f9900 firefox-pl-1.5.0.2.xpi 243653
+MD5 767e4b0d92e8b9aaeeb3451b2294d45e firefox-pt-BR-1.5.0.2.xpi 143567
+RMD160 f447f991e3a9eaeb32a9c965aa824a15b27e9e94 firefox-pt-BR-1.5.0.2.xpi 143567
+SHA256 2b53e94353b9460e4e97dbe8fbe9db920866dc0ded403a18c904974b9f26be43 firefox-pt-BR-1.5.0.2.xpi 143567
+MD5 2e2a089a341b847e2d3ec60c8e47567a firefox-ro-1.5.0.2.xpi 144113
+RMD160 ea3390816a6e600f752e6356a3094ffb83b07738 firefox-ro-1.5.0.2.xpi 144113
+SHA256 3ecb23f2b41309c03d7a2bc833d4fc280b21ef4c69260502051858032a4c9662 firefox-ro-1.5.0.2.xpi 144113
+MD5 81c5829683a607591a7e414e5564f3d9 firefox-ru-1.5.0.2.xpi 170096
+RMD160 c1ae3a6bffe44be3cfddd0bf60ace15ff65f7fcb firefox-ru-1.5.0.2.xpi 170096
+SHA256 3f1ad4d5f8a30519a88f68513dd9009aaf9a8559a7ac6d774c5726416e5554d3 firefox-ru-1.5.0.2.xpi 170096
+MD5 874da19ba38de53010d96e8c0ca2fb64 firefox-sk-1.5.0.2.xpi 153991
+RMD160 945c2e74d22cc52578f6d1e4d670fc03ecfd68bb firefox-sk-1.5.0.2.xpi 153991
+SHA256 cc5efcd2e8206f863d86ffde6aebc41af2c9dd3028801bd06b24e3bdc7cc0ca9 firefox-sk-1.5.0.2.xpi 153991
+MD5 59621a38098be5bf5df9e0a7b2917db1 firefox-sl-1.5.0.2.xpi 145204
+RMD160 6c4e11b4430a1e21a51a4a7040e7224b1bf03306 firefox-sl-1.5.0.2.xpi 145204
+SHA256 c05662bf50a6c49dbe04aa8d432c2f02cb52a036148b10167c667ae0b853cc8a firefox-sl-1.5.0.2.xpi 145204
+MD5 d15c5a37add4cb5437f18b6efa51182a firefox-sv-SE-1.5.0.2.xpi 154913
+RMD160 7e31cc0486938781dbe5c6bc049ee5cc591cbf8e firefox-sv-SE-1.5.0.2.xpi 154913
+SHA256 8f58292d0a4f8e48a8781c09029d3924edf7cd6810de4677b428221290788f79 firefox-sv-SE-1.5.0.2.xpi 154913
+MD5 a3fa108436d82706292da52dc7f18937 firefox-tr-1.5.0.2.xpi 136158
+RMD160 9d13249d64afa1213e2b0d83fdc3d5da581c3692 firefox-tr-1.5.0.2.xpi 136158
+SHA256 0d48d7bdf9df7a945593143d31b14088d5595837c7f87d13782e6282d259e4db firefox-tr-1.5.0.2.xpi 136158
+MD5 10e02b7640b8b1e18bd6c1f1ba3ac47a firefox-zh-CN-1.5.0.2.xpi 136417
+RMD160 25c8c2dc9cd2f8c0e83a993abf722d0fe33b8e11 firefox-zh-CN-1.5.0.2.xpi 136417
+SHA256 001d6c16451ba1632f772842c881992b6f7736fb174ccce54f6065cd8d04e7db firefox-zh-CN-1.5.0.2.xpi 136417
+MD5 e9d879c78791715147d14a55991e255d firefox-zh-TW-1.5.0.2.xpi 128231
+RMD160 7c4688260a2ace9b9e253e154c27867f73f54ebe firefox-zh-TW-1.5.0.2.xpi 128231
+SHA256 30cf118f32d31d2437a562ea4f211330695272f11a3c26c207bab629d9b393de firefox-zh-TW-1.5.0.2.xpi 128231
+MD5 9e407327e9d3072af85d37617f9e5133 mozilla-firefox-1.5.0.2-patches-1.2.tar.bz2 39680
+RMD160 b286a75fc31da5e00e49f5cae6db107207f4a676 mozilla-firefox-1.5.0.2-patches-1.2.tar.bz2 39680
+SHA256 b15bc304850e646601b0c9121cd2febfc3f06c311f7c3bc3d91b8200165a32ce mozilla-firefox-1.5.0.2-patches-1.2.tar.bz2 39680
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.5.0.2-r1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.2-r1.ebuild
new file mode 100644
index 000000000000..03d9721e3b47
--- /dev/null
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.2-r1.ebuild
@@ -0,0 +1,287 @@
+# 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.2-r1.ebuild,v 1.1 2006/04/30 00:41:17 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() {
+	linguas=
+	local LANG
+	for LANG in ${LINGUAS}; do
+		if hasq ${LANG} ${LANGS//-/_} en; then
+			hasq ${LANG//_/-} ${linguas} || \
+				linguas="${linguas} ${LANG//_/-}"
+			continue
+		else
+			local SLANG
+			for SLANG in ${SHORTLANGS}; do
+				if [[ ${LANG} == ${SLANG%%-*} ]]; then
+					hasq ${SLANG} ${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
+}