diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
new file mode 100644
index 0000000..c1ddd07
--- /dev/null
+++ b/net-libs/xulrunner/Manifest
@@ -0,0 +1,4 @@
+AUX xulrunner-default-prefs.js 709 RMD160 a4d062f75c17552545267ec3fe2f6b54073dafbd SHA1 580128e9edf8021fdbbca2c91abf63cb83bab2c7 SHA256 e6850b0a22f7d3889b49ec4a79a3c4d3d077edd98c8f0ffdc26e30bc70bb4b09
+DIST firefox-4.0rc2.source.tar.bz2 66022050 RMD160 be75b75f8d58fae2a781c52bc59fcc1960ce6da3 SHA1 0fb0d7c9b185959dd6c41c80a77f71e806a4742b SHA256 d38d94b66568c549bd4046838e61da783a7d4f53eb040a10fbad3e4811ce9c54
+DIST xulrunner-2.0-patches-1.2.tar.bz2 50296 RMD160 55efe05cd37f3a49d4e6bc25ea0e0e2a50eab02a SHA1 1a56906b94f30e33885b568041d1bdd53ad2b5b6 SHA256 e6b63b4c94f4a44c35aab34e6d15998c5a812eedcc4856a662f5c8eb35a4e6d9
+EBUILD xulrunner-2.0_rc2.ebuild 5454 RMD160 322d178211ffb426771096e9fbad13545d9591ef SHA1 c28a94cc0b2fe59f7ff80371054cc81f32b018a4 SHA256 78f9c9a5cf7d741a5c13aac3a3fff0a149e0744fbabaa3f72e638c62bf46c495
diff --git a/net-libs/xulrunner/files/xulrunner-default-prefs.js b/net-libs/xulrunner/files/xulrunner-default-prefs.js
new file mode 100644
index 0000000..9286a6a
--- /dev/null
+++ b/net-libs/xulrunner/files/xulrunner-default-prefs.js
@@ -0,0 +1,14 @@
+pref("app.update.enabled",                 false);
+pref("app.update.autoInstallEnabled",      false);
+pref("browser.display.use_system_colors",  true);
+pref("browser.link.open_external",         3);
+pref("general.smoothScroll",               true);
+pref("general.autoScroll",                 false);
+pref("browser.tabs.tabMinWidth",           15);
+pref("browser.backspace_action",           0);
+pref("browser.urlbar.hideGoButton",        true);
+pref("accessibility.typeaheadfind",        true);
+pref("browser.shell.checkDefaultBrowser",  false); 
+pref("browser.EULA.override",              true); 
+pref("intl.locale.matchOS", true);
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
diff --git a/net-libs/xulrunner/xulrunner-2.0_rc2.ebuild b/net-libs/xulrunner/xulrunner-2.0_rc2.ebuild
new file mode 100644
index 0000000..309f3e4
--- /dev/null
+++ b/net-libs/xulrunner/xulrunner-2.0_rc2.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib autotools python versionator pax-utils prefix
+
+MAJ_XUL_PV="$(get_version_component_range 1-2)" # from mozilla-* branch name
+MAJ_FF_PV="4.0"
+FF_PV="${PV/${MAJ_XUL_PV}/${MAJ_FF_PV}}" # 3.7_alpha6, 3.6.3, etc.
+FF_PV="${FF_PV/_alpha/a}" # Handle alpha for SRC_URI
+FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI
+FF_PV="${FF_PV/_rc/rc}" # Handle rc for SRC_URI
+CHANGESET="e56ecd8b3a68"
+PATCH="${PN}-2.0-patches-1.2"
+
+DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
+HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="1.9"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="+crashreporter +ipc"
+
+# More URIs appended below...
+SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
+
+RDEPEND="
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12.9
+	>=dev-libs/nspr-4.8.7
+	x11-libs/pango[X]
+	media-libs/libpng[apng]
+	!www-plugins/weave"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-lang/yasm"
+
+if [[ ${PV} =~ alpha|beta ]]; then
+	# hg snapshot tarball
+	SRC_URI="${SRC_URI}
+		http://dev.gentoo.org/~anarchy/mozilla/firefox/firefox-${FF_PV}_${CHANGESET}.source.tar.bz2"
+	S="${WORKDIR}/mozilla-central"
+else
+	REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
+	SRC_URI="${SRC_URI}
+		${REL_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2"
+	S="${WORKDIR}/mozilla-${MAJ_XUL_PV}"
+fi
+
+pkg_setup() {
+	moz_pkgsetup
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	eprefixify \
+		extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java \
+		xpcom/build/nsXPCOMPrivate.h \
+		xulrunner/installer/Makefile.in \
+		xulrunner/app/nsRegisterGREUnix.cpp
+
+	# fix double symbols due to double -ljemalloc
+	sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
+		xulrunner/stub/Makefile.in || die
+
+	# Same as in config/autoconf.mk.in
+	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_XUL_PV}"
+	SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_XUL_PV}/sdk"
+
+	# Gentoo install dirs
+	sed -i -e "s:@PV@:${MAJ_XUL_PV}:" "${S}"/config/autoconf.mk.in \
+		|| die "${MAJ_XUL_PV} sed failed!"
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Disable gnomevfs extension
+	sed -i -e "s:gnomevfs::" "${S}/"xulrunner/confvars.sh \
+		|| die "Failed to remove gnomevfs extension"
+
+	eautoreconf
+
+	cd js/src
+	eautoreconf
+}
+
+src_configure() {
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	MEXTENSIONS="default"
+
+	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_XUL_PV}"
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}"
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-mailnews
+	mozconfig_annotate '' --enable-canvas
+	mozconfig_annotate '' --enable-safe-browsing
+	mozconfig_annotate '' --with-system-png
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-flags -fno-stack-protector
+	fi
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!"
+
+	# hack added to workaround bug 299905 on hosts with libc that doesn't
+	# support tls, (probably will only hit this condition with Gentoo Prefix)
+	tc-has-tls -l || export ac_cv_thread_keyword=no
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	rm "${ED}"/usr/bin/xulrunner
+
+	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_XUL_PV}"
+	SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_XUL_PV}/sdk"
+
+	if has_multilib_profile; then
+		local config
+		for config in "${ED}"/etc/gre.d/*.system.conf ; do
+			mv "${config}" "${config%.conf}.${CHOST}.conf"
+		done
+	fi
+
+	dodir /usr/bin
+	dosym "${MOZLIBDIR}/xulrunner" "/usr/bin/xulrunner-${MAJ_XUL_PV}" || die
+
+	# env.d file for ld search path
+	dodir /etc/env.d
+	echo "LDPATH=${EPREFIX}/${MOZLIBDIR}" > "${ED}"/etc/env.d/08xulrunner || die "env.d failed"
+
+	# Add our defaults to xulrunner and out of firefox
+	cp "${FILESDIR}"/xulrunner-default-prefs.js \
+		"${ED}/${MOZLIBDIR}/defaults/pref/all-gentoo.js" || \
+			die "failed to cp xulrunner-default-prefs.js"
+
+	pax-mark m "${ED}"/${MOZLIBDIR}/plugin-container
+}
+
+pkg_postinst() {
+	ewarn "This is experimental DO NOT file a bug report unless you can"
+	ewarn "are willing to provide a patch. All bugs that are filled without a patch"
+	ewarn "will be closed INVALID!!"
+}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
new file mode 100644
index 0000000..8321924
--- /dev/null
+++ b/www-client/firefox/Manifest
@@ -0,0 +1,80 @@
+AUX firefox-default-prefs.js 95 RMD160 805cdfec6fb31c224322cb71125547ad7a515f49 SHA1 7fab69d85b12a9f1b0c87fbb1821bdafd7485ac9 SHA256 8bc4cb870bc402db1f20b135a689f8c5dbfa5de8f1755b1926198d627c12c5f1
+AUX icon/firefox-1.5-unbranded.desktop 303 RMD160 e9cb808302b7fbd7d4eb84aeb0a438e1f82f220b SHA1 cd5d0ce5162d9fd246360409b1af396b62c1bc6b SHA256 1d6ba1b322ba1bf3ab8e6ef92528bdbc1a2f5cbca3119df3f4380b8b73b5cb05
+AUX icon/firefox-1.5.desktop 300 RMD160 df437e79147897b0ec52b44edc42ad4ef270eda5 SHA1 b60d51629ba58992f6d9ae9ad8c29ffc6630de4d SHA256 bc6f84004032afab5c078d8dc7c4ffe36abc45738c119fad3fcfa5de89dd5dae
+DIST firefox-4.0-patches-0.7.tar.bz2 4101 RMD160 6e006b1a047c1b750b7deb7449651b4bc30173e0 SHA1 9e47ce491edb9d12d9384949a73ea92377601542 SHA256 9fa9d0b407a084d7f0f9887d054263404626eda46dc560ccd5ffd5d8c91fa707
+DIST firefox-4.0_rc2-af.xpi 220420 RMD160 ee8e95bbaf9e548082aca0a8029edc4cc6557afd SHA1 3a2da0b247983cdcf20a14faa2e3c1b6e3906264 SHA256 d4062ced61ccb4f1c37ee6c8793675e1c5da4d2a5e91ddf4c2d9f36561353492
+DIST firefox-4.0_rc2-ak.xpi 222040 RMD160 0ba8ab5ec79abafe126a8045844e4839a772d1e8 SHA1 4979d5ecfdd90a723d95984f57b07ddc6ed2df57 SHA256 4a050f68c9f4c51f89bb946c2aec22b5e81ae6b8a1835f601fc747c692e4dc37
+DIST firefox-4.0_rc2-ar.xpi 241600 RMD160 d22109a623f83319d64e16bba931bdecc7b71831 SHA1 d4bc970bcb8ccc6c0a5ff6cbcce157727261756e SHA256 be5d98d19c926861dd545bad492043983cd709f409cb88eb1931bd82ca816c79
+DIST firefox-4.0_rc2-ast.xpi 218121 RMD160 66715c87d9be0e059160759fce6cf77fcf8b092a SHA1 3e952a711e348413929326a06f634a85e8901c9e SHA256 d481b56751631102e9f477eaafff708ad4e527e3d8f5808d6fb0c1b02d9ea018
+DIST firefox-4.0_rc2-be.xpi 231345 RMD160 817a1b0b48aa01bc1d48d3f1f02ed99508c04f4f SHA1 58f2c732e2b5a2d824a8fe6b96042f0660c98115 SHA256 0e83a6505f923213ab78fb8963e8d6954531afcb7c2795ff0eae9bb5076dddab
+DIST firefox-4.0_rc2-bg.xpi 254932 RMD160 c0b579cff4e138b377584557cb0971357a43c009 SHA1 02fbf088d5ba116c20c8bf43f657131355f985bc SHA256 3c0433eef8b2e97ed8a01547c8b7d852643f03fccbd40ec79f5be3f2f68a8170
+DIST firefox-4.0_rc2-bn-BD.xpi 263228 RMD160 f30b3b4dca5d09cf6fe836a220a7ad534186a38e SHA1 388bc80773792ee276646d8446ec2e46c59d010a SHA256 7a7dfa7d5231df26c68629feb017f2159d2d890241717811dff96124333b092c
+DIST firefox-4.0_rc2-bn-IN.xpi 292730 RMD160 74e1542b86e0bf9b50b5cb358878752b583c186e SHA1 cb312304144ad66e5cd90ba165d5c79c58832966 SHA256 946b229d4ad8981e2d665aeacba30fc4c3c072a4bd74825d5aa1563c6985f956
+DIST firefox-4.0_rc2-br.xpi 228737 RMD160 33ce8723438baadd2c17fadaf978350543a72471 SHA1 191f0d48c459697e63475b0b74951568e36f5e04 SHA256 fcc605ef95a351d097dedb598649b97a5f987e0120621a4a298e664e6f040731
+DIST firefox-4.0_rc2-bs.xpi 226716 RMD160 71c8029f48f0c54f89c7c951eb2d644b7833e579 SHA1 89023ac5215492c22ccfb99bf1ea05a5962f9e93 SHA256 adb9de13598ccdfe6978871da6df47e89605a854b1a88f2900fa2473117c9a61
+DIST firefox-4.0_rc2-ca.xpi 228112 RMD160 3703394b75d8512bb7948fed152d5fed2aa5ec72 SHA1 171e37718f72e38b704b03097265ddba35d01c4a SHA256 c439b72b3e282380b510546bf1ac9a42d7c8d8a2229e17fbc8a427bbb81cae17
+DIST firefox-4.0_rc2-cs.xpi 229189 RMD160 09d7436033fd379d52e363d37842d5b84003a01e SHA1 cb7abbb7c275a609a96f80842627f9be64c10d19 SHA256 59fdf536071486d7f53e57bc7526a1893f72ddc6d1b11ab596c80c59d9b3cd4e
+DIST firefox-4.0_rc2-cy.xpi 221681 RMD160 ddbde4986fa28d6ff06b14f8c5eb1ec1772954f2 SHA1 d0f7ad9cd939a01e864fec96934894b479f8b4c8 SHA256 578b9eb8d1793ea468d59f5eca987ae32bc8ddaa3830e95317936227400704d6
+DIST firefox-4.0_rc2-da.xpi 221656 RMD160 5de4d463f7f432c0e2a80cfcd88a8ce81986d17c SHA1 c29d5bb6721ce44c423df2e8d7b0322d36cc980c SHA256 2c23c8b959464990037f9ac9e129e914fa79ee65784c3ea8b729475bb63b772b
+DIST firefox-4.0_rc2-de.xpi 229255 RMD160 645d6fe7991eb90189aebd2573572a994be2beca SHA1 9f59b4eec38bbc3777e3ddfde75f4de184e3e865 SHA256 8a6137b2db466b99e8b2db30d49814bb1756a9f2845b25cdcbd5bbd678c56ecd
+DIST firefox-4.0_rc2-el.xpi 243564 RMD160 8e2091df491ae270410b25816f015c1e833c537d SHA1 d78096a658433eef5634713d55ada99d468ed84b SHA256 0e13ea40f0aba80fc85c91a6a9f1f8a28245db206f3e3bab56807c0dd2086470
+DIST firefox-4.0_rc2-en-ZA.xpi 213525 RMD160 e2deb3c419d6549f822428df76c34c27ba7bc15b SHA1 0d99fa983fd0f84ac46b7bec9623310d44c717e1 SHA256 458f9426ff3c52126de43f25c0de8946a46b781136b66a59d82cada3bf211637
+DIST firefox-4.0_rc2-eo.xpi 222303 RMD160 e6a5cc96d03e179aa5a0d6d728cd2bd666c6f850 SHA1 8abd236605a9a9bbd0c2aa37eef6c33e79cb08cc SHA256 646795549623c5639f752d96b56567d050d19118fc36a97083965d6aefe5135b
+DIST firefox-4.0_rc2-es-ES.xpi 202310 RMD160 8f7ac6cf54ed211d402eed9be31b9dab1e9496a7 SHA1 fbe9949f65b71fde8ebf91f3fa402e88a3357bff SHA256 98f735e8a8dcac76099187c8b2f7cf94ac2eb142b0e33b5845ad67a29f6a5b6e
+DIST firefox-4.0_rc2-et.xpi 223430 RMD160 afa8b840b1f892c3d778f9b8963370f62de68269 SHA1 f173d6d1d5b8b1ff96b757f5f167a859768c89db SHA256 c91c26bd550c203e9b7fed9126f69238c3ad5efb1aa8f3be0a6add255d0b0b00
+DIST firefox-4.0_rc2-eu.xpi 221329 RMD160 b0ae3be4d801ef0bc2d112507057da65d048dcc3 SHA1 6f7756138726c97445a09975a778386d5bcfe5e0 SHA256 914e3bfb8389fa1cb474461575ae0063fa796651692578eace5bf92ab2d45213
+DIST firefox-4.0_rc2-fa.xpi 249720 RMD160 3468c7cdfdd0c9804843cb92bc3381bd3f6278a3 SHA1 eb278a8d297904b07c9104d8b83a737a3e0a80dd SHA256 45e1e0d668c8e659861d97dca9afc244b03bd8b6eb9f1ffecbba23b99a77866d
+DIST firefox-4.0_rc2-fi.xpi 224501 RMD160 3cce027b270096ca11b3151ecd208570f16afaf7 SHA1 68e05d577f14baff7a1bcf10405c00c327d3d450 SHA256 fb7fcadbb7f29610d492b000f15e73c9659af1a946650315b8d3fc1623207dae
+DIST firefox-4.0_rc2-fr.xpi 230273 RMD160 f132858db277cb33bc8bb39678d9be024647cf27 SHA1 a654dbf0c59ea4de51c5021310d7ac689cb55b21 SHA256 b1292a03586d74f1610d5d9a1506bef1346bac62e7fe5fb002b0bbf3df1cf443
+DIST firefox-4.0_rc2-fy-NL.xpi 227611 RMD160 ba0f5c875b7b9fe846974d178a2ce3239bd2cc54 SHA1 82317e21d052b45022c22f9e106f4f1370d4d8d6 SHA256 0c6f85d2c3c46c6ec51666e7b072fe7503d3b39e0452378717f540be74b45017
+DIST firefox-4.0_rc2-ga-IE.xpi 232340 RMD160 88adb0c425361d3e652768dabec8cae5cc9e4c77 SHA1 2c806fb69e67c4811a05c212c74e7d242b9f6f8d SHA256 367462c892f789c27456da3c76b2f09ebfa8a41903709744c818e6bb0c67bf14
+DIST firefox-4.0_rc2-gd.xpi 233885 RMD160 84e5a5291976579a58f254f9f5f4c544e261c979 SHA1 9add4cbd29af174aac40a8f57a34348269ed2ae8 SHA256 f7bb3ef783ebf3fb8f94375fb40e8c8fbbf978ccba406e14995b768df878d7aa
+DIST firefox-4.0_rc2-gl.xpi 224435 RMD160 16a609e6ad6d21b57cc729a87d65780016f4645f SHA1 27f0e1b6951e1d7c5d6ca3fd52e0279737a0bfea SHA256 4cc72b8d4c9bfc30e781ea3482b35e8f7c6f254de6355b6d09f71624874c0eef
+DIST firefox-4.0_rc2-gu-IN.xpi 252612 RMD160 4417e493e903706ad19afb6f36b83f5cce4b3e62 SHA1 cc61d3db9b5ad540d61a10d5fb1002d6f1a876df SHA256 a4688fa5a94d9234066ed299c3868bde6ccfb043ce471a8b98a7bd5dd7edde4f
+DIST firefox-4.0_rc2-he.xpi 234329 RMD160 52eefd566e98833e2dcdc48f19fa08df46a56c29 SHA1 d23913b9cdfb73b2d5baf23afb59ffd63cc3926e SHA256 ebaac57d825e294fba5f43fee6966ab2d1e604efce2f5c15af9b3111327e1e97
+DIST firefox-4.0_rc2-hi-IN.xpi 257583 RMD160 4d5eb04bf31c2949efb23a7b93ff35e8676e78ef SHA1 4a0f23461f5470526966c478b67d8fab6f7aaa28 SHA256 9756a988317e5d805b268ce875c5ea282dba4859c0464429816ea5e40747f407
+DIST firefox-4.0_rc2-hr.xpi 234111 RMD160 fb869027bf146f700129703ca131eaff9c4bb499 SHA1 e9972463a4b52fe6888450f1d41c3e1310b31a27 SHA256 ff68c5e860584ffe8202cad6cd59b3c48550ae09c4ac29df92e4d90e5653b76f
+DIST firefox-4.0_rc2-hu.xpi 234704 RMD160 7225975b17464401e513a1d22485b3a8f706d44d SHA1 93aad90f24ffa6ba34fe7a6b426b91f8fdc9531f SHA256 5879bc2f9b0790a4ce688d4fe3638daac7a8083bc34e64e6a76e94b4616333d8
+DIST firefox-4.0_rc2-hy-AM.xpi 418851 RMD160 4073a84ad4e068b344d04f1a791964ced138ddfb SHA1 2ce8a282e11c39364b7a4382ea198a0d71a5d43e SHA256 65914ce44243cc4d3f5c3527964aaa478bdb89adfee19438ace4ab84931e4126
+DIST firefox-4.0_rc2-id.xpi 218468 RMD160 91b0ac87668af6ebdc8de1d273b8f539feac241a SHA1 1da4e29753df936f37c0205546cf47bf2e17a127 SHA256 e9b33ac714de5f20b991231c6026d8ef51370beb36f9139668c5f2ce347834d8
+DIST firefox-4.0_rc2-is.xpi 224201 RMD160 51d94f4d00393f522a150e40e2c6702d9de8e7d0 SHA1 f7d308a15dd5cf953161ef36f3ba7bf4940ea684 SHA256 247d4e86f9ab05f614f67e1ba39c3987fc51e4e3a63471f68c312aebdef88417
+DIST firefox-4.0_rc2-it.xpi 199869 RMD160 14a054f682119c5e14ff9cb99c8118aef1632962 SHA1 b9691a008083ce3c21fc122831e4fa02b0e807a7 SHA256 8ea0ace78ebceb146f406eebb331aa890f8ca3c7163012943b6bffe581ae9e49
+DIST firefox-4.0_rc2-ja.xpi 252157 RMD160 e1264836df02e2c93753feeb05e9fe767f2f7758 SHA1 8c7e5f73e1faee9bfc4013bf311027649b4d478e SHA256 dca68fbf5bb142dccd9498052c62b920aba5beb966c57a72545032792f8edd8f
+DIST firefox-4.0_rc2-kk.xpi 256606 RMD160 47dde9259e2b85ac6e71d13449cfc0766f91a290 SHA1 9108d460a7c2abe0cd09b8a28819eae0030024a7 SHA256 bff59c5f9eb48d82b72d4b4610517de96799a887ebf7811ae260cf687edd48d5
+DIST firefox-4.0_rc2-kn.xpi 273821 RMD160 06465a3cd8503f7c42ff9725cf698fab2f7f3b10 SHA1 e97c7b3f2d5a03790a6f4683cb7307e52d4db759 SHA256 32c9ee46f4a74bb4a0e3b1787bad5c3c7c2e844a4e4fb3118e873c909d691363
+DIST firefox-4.0_rc2-ko.xpi 206943 RMD160 66a527060080b0ece8cc5e2bf3ea620601f98cac SHA1 1a4e9bd99b9a4f37a5ec9e82965c917c2b28bae1 SHA256 1b0c3dfa803fcbe54c39d01b04847f8b34c31a20ab8b405c09c88246343b1685
+DIST firefox-4.0_rc2-ku.xpi 231603 RMD160 930955b91e9a1983e097540433e604f68087fde4 SHA1 8cba2dfb1dcdedfaddf8a1d518c20d47091892be SHA256 0289fb4bc8ba28a1ad60d264586278bc20aafd2b0715cd58c0e8ca5e7850141a
+DIST firefox-4.0_rc2-lg.xpi 228823 RMD160 1bca794f015e7e3b046c0a89c0637e93c4faa0b6 SHA1 01899e00bd7ce9ff00b1297594111277c4b4858c SHA256 a601e703cb0d1ce36542889edb749c83e30c742ed4f1fd33ea6933e0e53a1889
+DIST firefox-4.0_rc2-lt.xpi 314013 RMD160 0ef549ad7ccf177c5fedbbc8bde0cfad257fe54e SHA1 99ff605b3829db8f2b4681490b8744cccc1071ab SHA256 6f41a61ed65d0631b6b412100b0d9245004d0ef25e2714be7649ea42a102b2be
+DIST firefox-4.0_rc2-lv.xpi 225534 RMD160 ec5bd64898040e1cf4e8454c12adb9351d87bfb2 SHA1 0620ef2c4e0ab851638e02d5cd8d656e3738f8b3 SHA256 de9cb0c239b9a6369ad911943de8a8f1630198a101ae5fddd2fe0305a11be40c
+DIST firefox-4.0_rc2-mai.xpi 257132 RMD160 4e3f890600ef85a9d9efba020440f085483ec0e4 SHA1 9d1f7aca895d3f2dfb68dfecd3e8c07adfef0116 SHA256 cff1b86640db641f61ab457f33b17d0a612a475c9ce3ea10fcbefd536e9d8488
+DIST firefox-4.0_rc2-mk.xpi 250534 RMD160 4fa56deeb7e8757ac528e2f6d807473c052387eb SHA1 cef8dba12e98cf578bdf2a857325c81386ab7869 SHA256 08367d01a87045a5cf1aa00719070023a178d0eb1d4bd3d4c7d22383d6ec6361
+DIST firefox-4.0_rc2-ml.xpi 282446 RMD160 47a381b8de1d2c28c22c29ea75f6d9c05c04b1c0 SHA1 a26bb016578d831b53c05666a4647d4eaf797e58 SHA256 ef516fcb34c9c227b95857ba7843a70d7ce485d7fce5c390a120e9e7907b7fcd
+DIST firefox-4.0_rc2-mr.xpi 257803 RMD160 ada90139888c8b51fe862af961ebc96fe97200cf SHA1 4716da3acbe3a00374a004e37c34e9b769961b46 SHA256 e83942d6002fb7c365fd12882de8ce95ecf80019c56a09b08cdf75b98f87a3ef
+DIST firefox-4.0_rc2-nb-NO.xpi 222492 RMD160 22a1c0a2033c7f234e9f0f8faa17fe309f0fe094 SHA1 372354e2f99db77aa08cd6e16936fcc45e76f11d SHA256 323dedd9684e4cc95632cc533cdf611a471807390019504e39288488299637e6
+DIST firefox-4.0_rc2-nl.xpi 223776 RMD160 4ae539e56a9b8cc855b0e563a74d2afbe9791a30 SHA1 19a0cbaf1b186600ecaea0c8f634e8dfb32f87e1 SHA256 35a69c437d04dcc4c4ef3d26ca395f90f7f871d51e8131e99a993b8b2c5e2e3e
+DIST firefox-4.0_rc2-nn-NO.xpi 223782 RMD160 f8ca64365cb9bd544a4644f381c9e5a032af36b4 SHA1 283e4d0f221364f93bf6695c7af10bbfea315bd7 SHA256 2dd2ab2ea50347ae299de251848486fffe3947ecdbc7f73dc8a45162d64fb5b0
+DIST firefox-4.0_rc2-nso.xpi 227055 RMD160 45ae077884bc146df7aed82385e6e8811f12e8a0 SHA1 5b65e2c1d7fe939681c58b7d07761b4aa42a76cf SHA256 756ce3806e348e73caabfea83ed4663b7905c1d30df3b5773e0d1c0b76d980f0
+DIST firefox-4.0_rc2-or.xpi 261470 RMD160 bedf870de88251eaa9fd4aae959a0e5eff0f6390 SHA1 1b53819e9b3a04e0b8f1127a4a44ff5f6e01d932 SHA256 2e261a838f51346f89844cd245989a60072dfe12f9980b9206eaa49838c7b944
+DIST firefox-4.0_rc2-pa-IN.xpi 258822 RMD160 a4d5ffdc02ba4e61d97b98e6729db1107ebe1c9b SHA1 e6550fe9b6c2074cc9cf55c65339533a023448c0 SHA256 cef1ea7ede5a1178ddac236b9798342578f874dd6c7e47e9b29b53270241b3c0
+DIST firefox-4.0_rc2-pl.xpi 232254 RMD160 932c1711999656f5a8103aeef8553bd9a45d2238 SHA1 c057d541dbfcfcb29ba771716247c9a8b7343d5b SHA256 55c104e276d287b336e2bc1ef70804b1e4d479299e5a558cd7066b0acaa575cd
+DIST firefox-4.0_rc2-pt-PT.xpi 227259 RMD160 effef591829b2392ddaada5ba39e31d90e99235b SHA1 63ce998863be1bcd7087233d6517b3ebcaea6b08 SHA256 2154e647537b502cdfe6082682124dd088a95ee2eb09ebc4e37f827d81467df3
+DIST firefox-4.0_rc2-rm.xpi 226579 RMD160 318b3357f9e87d669460813707e361dd77e3b2d6 SHA1 80c3426229e1e20b87e685ad0f643f6bdddf08ab SHA256 ccb56318719363342b7fdf516ae95e207d742784d214709c8eb5bd6a10f56b34
+DIST firefox-4.0_rc2-ro.xpi 230022 RMD160 237b5a3fd5592abbf2faa3a3c1cf6a899b295e62 SHA1 e0ce921bf1191bdd1c98a4879735896570663a17 SHA256 f4289ede0aec8076c39f319218203afe9b02bf02cac001b36b29d6c1d5f791f9
+DIST firefox-4.0_rc2-ru.xpi 239289 RMD160 1c94bd0ec35c617a7f50bdbf1ddb9bc9d1cc5f11 SHA1 5f3a113d1a2febb001024a9249623edba3002e3a SHA256 2831d2f75e9d257ec4cf4ec8d44b030e85d2db51939df3ed5bc6d81cef103342
+DIST firefox-4.0_rc2-si.xpi 252436 RMD160 882bf291d8d0c6b33c309a8fe19fd303528697e8 SHA1 ad7020f8ec9d8a87ff1414860412d90f95561677 SHA256 77e589e3076a23b1e84c4712cc2b52458064f0762c853f24241ac3a071a08171
+DIST firefox-4.0_rc2-sk.xpi 234294 RMD160 2ebc273f0fa846ff3d76bedb83d068a3968923cd SHA1 6c89b226719900176264cc4f3adb12cb16919202 SHA256 02b6fd972072185cd07ecfa9a027e28e08185264bff3cf339d413fcbbd4f6331
+DIST firefox-4.0_rc2-sl.xpi 222380 RMD160 40319658d50c7175306e748f5da0213f055c091a SHA1 afcb91d4c8798e63c54c3fc222ee189b02bd6f70 SHA256 ae4282267f5a1200c163e60e06e3a1d1fedbf34618ccb67b9efa237e2fbd45a6
+DIST firefox-4.0_rc2-son.xpi 220133 RMD160 7b4f33636fe9a824a420add8eb8a7c65e0154c08 SHA1 f62d7f9b22eec2186b7670c8252d220eb5ff0b38 SHA256 ac5510c213652bcc92f7417ba6f31aa15a288f1ea6a88eeb1a712f3db9168c66
+DIST firefox-4.0_rc2-sq.xpi 207484 RMD160 93115b5529bdd159166eb6a487e514943730a375 SHA1 9de5efdf2ec5e45c662630a660680145b6696301 SHA256 4763a246ae5dee81d563b504fe022a30af7704c6ec9bedd7a0e0ac48b5d94f59
+DIST firefox-4.0_rc2-sr.xpi 258225 RMD160 4045f8a62cd386c8a43d4be3ff4ac3d85284a91d SHA1 0d9f260cb2581411b96fcd9d765396d9eca2eddc SHA256 3ace84cb3f468a39aeade3093ceea5f8eaeeec6f1271f6ab1b482bf11d60647c
+DIST firefox-4.0_rc2-sv-SE.xpi 260772 RMD160 14736f6713392f38e3ca54b9041197d6cca040e9 SHA1 a6b13e7992ec5070fad5153929d5c5c4f324384b SHA256 166547e422eb63a63dc1376ca6dd70f529f467db16830b47f7a0847292a9b196
+DIST firefox-4.0_rc2-ta-LK.xpi 267028 RMD160 a52ed2620ea43c03e7594ddfff5991b6da14886b SHA1 3d15ac0dddc9d254a19e0f55dab5d270718029f0 SHA256 ca4a52d31cc44bed39eb35a5605b1f5cf4b0a20d93724c11fc92fd0653ef3395
+DIST firefox-4.0_rc2-ta.xpi 252373 RMD160 bbd460ebbe8f6e4ffbc76a9b6a4c602eb8c698a7 SHA1 18c4d2fcf2868b1251342f81c5a8e17530b2e940 SHA256 455954af5ed65a7316722685c10cf53553c96cf0ad78a29577d8586c40fda38c
+DIST firefox-4.0_rc2-te.xpi 266687 RMD160 75267c5c66877b16a0e542e6552b8bdb2bf4f0ec SHA1 797047ef15100d81b92bfd2852ea9123c923a380 SHA256 555ea7bc5016f318915a6b567fef60f4254cd0bac0dbaed86a406a99cd57c620
+DIST firefox-4.0_rc2-th.xpi 253293 RMD160 34284b97b4d29f835ee208c629b73b6e99297ed4 SHA1 67d217df9bd28e98ffec4cf336d990e13b807976 SHA256 8aff35bca7627d63c83a844e67785c4b8d9edc8f8c96184c498cda586968d11e
+DIST firefox-4.0_rc2-tr.xpi 227122 RMD160 ba203b941514cb3ba84457cbb956ab8fe560b247 SHA1 2ec8d95efe5f5433fc3ea1fba7210592758f4384 SHA256 d7eac74d305ac3c818089d302b1fe7a05137965355f59cd51f6fc43b571ed02d
+DIST firefox-4.0_rc2-uk.xpi 260129 RMD160 4a7cda6a1ae6dd31d3b089b05e6bc4f85d0b0a3e SHA1 266f10b432165e21450379d5ffc693bb5f46fde7 SHA256 83127127e402ae2a734e74b4dbc8c88c636d18c1edb4ca5046f3d6b263dffa36
+DIST firefox-4.0_rc2-zu.xpi 227605 RMD160 56d91ea40c9983dc28db96af51a18cdd0b22a50d SHA1 a73c237b85bbb17924a2a2fc8499db380caa0f03 SHA256 474dfa2edf6cd692dbc05c9569d263ea326b02d91feb335a1e2e360117f524ae
+DIST firefox-4.0rc2.source.tar.bz2 66022050 RMD160 be75b75f8d58fae2a781c52bc59fcc1960ce6da3 SHA1 0fb0d7c9b185959dd6c41c80a77f71e806a4742b SHA256 d38d94b66568c549bd4046838e61da783a7d4f53eb040a10fbad3e4811ce9c54
+EBUILD firefox-4.0_rc2.ebuild 7325 RMD160 1858e377967a80f661eecc5a7222c076d24f2c51 SHA1 5acef88712982df7cac288d621d06b3fff230079 SHA256 79ecf6fa68d4630f672a07ab97509a3c2a97bffa0add81dcdccf43102a3e7d6d
diff --git a/www-client/firefox/files/firefox-default-prefs.js b/www-client/firefox/files/firefox-default-prefs.js
new file mode 100644
index 0000000..f7c031e
--- /dev/null
+++ b/www-client/firefox/files/firefox-default-prefs.js
@@ -0,0 +1,2 @@
+pref("browser.tabs.tabMinWidth",           15);
+pref("browser.backspace_action",           0);
diff --git a/www-client/firefox/files/icon/firefox-1.5-unbranded.desktop b/www-client/firefox/files/icon/firefox-1.5-unbranded.desktop
new file mode 100644
index 0000000..4c8fbda
--- /dev/null
+++ b/www-client/firefox/files/icon/firefox-1.5-unbranded.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Bon Echo
+Comment=Web Browser
+Exec=/usr/bin/firefox %U
+Icon=firefox-icon-unbranded
+Terminal=false
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+Categories=Network;WebBrowser;
diff --git a/www-client/firefox/files/icon/firefox-1.5.desktop b/www-client/firefox/files/icon/firefox-1.5.desktop
new file mode 100644
index 0000000..742f947
--- /dev/null
+++ b/www-client/firefox/files/icon/firefox-1.5.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Mozilla Firefox
+Comment=Web Browser
+Exec=/usr/bin/firefox %U
+Icon=firefox-icon
+Terminal=false
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+Categories=Network;WebBrowser;
diff --git a/www-client/firefox/firefox-4.0_rc2.ebuild b/www-client/firefox/firefox-4.0_rc2.ebuild
new file mode 100644
index 0000000..07a8674
--- /dev/null
+++ b/www-client/firefox/firefox-4.0_rc2.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension versionator python
+
+MAJ_XUL_PV="2.0"
+MAJ_FF_PV="$(get_version_component_range 1-2)" # 3.5, 3.6, 4.0, etc.
+XUL_PV="${MAJ_XUL_PV}${PV/${MAJ_FF_PV}/}" # 1.9.3_alpha6, 1.9.2.3, etc.
+FF_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI
+FF_PV="${FF_PV/_rc/rc}" # Handle rc for SRC_URI
+CHANGESET="e56ecd8b3a68"
+PATCH="${PN}-4.0-patches-0.7"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.com/firefox"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="bindist +ipc wifi libnotify system-sqlite webm"
+
+REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
+# More URIs appended below...
+SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
+
+RDEPEND="
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12.9
+	>=dev-libs/nspr-4.8.7
+	x11-libs/pango[X]
+	media-libs/libpng[apng]
+	~net-libs/xulrunner-${XUL_PV}[wifi=,libnotify=,system-sqlite=,webm=]"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	webm? ( dev-lang/yasm )"
+
+# No source releases for alpha|beta
+if [[ ${PV} =~ alpha|beta ]]; then
+	SRC_URI="${SRC_URI}
+		http://dev.gentoo.org/~anarchy/mozilla/firefox/firefox-${FF_PV}_${CHANGESET}.source.tar.bz2"
+	S="${WORKDIR}/mozilla-central"
+else
+	SRC_URI="${SRC_URI}
+		${REL_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2"
+	S="${WORKDIR}/mozilla-${MAJ_XUL_PV}"
+fi
+
+# No language packs for alphas
+if ! [[ ${PV} =~ alpha|beta ]]; then
+	# This list can be updated with scripts/get_langs.sh from mozilla overlay
+	LANGS="af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de
+	el en en-ZA eo es-ES et eu fa fi fr fy-NL ga-IE gd gl gu-IN
+	he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk
+	ml mr nb-NO nl nn-NO nso or pa-IN pl pt-PT rm ro ru si sk sl
+	son sq sr sv-SE ta ta-LK te th tr uk zu"
+	NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW"
+
+	for X in ${LANGS} ; do
+		if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
+			SRC_URI="${SRC_URI}
+				linguas_${X/-/_}? ( ${REL_URI}/${FF_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
+		fi
+		IUSE="${IUSE} linguas_${X/-/_}"
+		# english is handled internally
+		if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
+			if [ "${X}" != "en-US" ]; then
+				SRC_URI="${SRC_URI}
+					linguas_${X%%-*}? ( ${REL_URI}/${FF_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
+			fi
+			IUSE="${IUSE} linguas_${X%%-*}"
+		fi
+	done
+fi
+
+QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
+
+linguas() {
+	local LANG SLANG
+	for LANG in ${LINGUAS}; do
+		if has ${LANG} en en_US; then
+			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
+			continue
+		elif has ${LANG} ${LANGS//-/_}; then
+			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
+			continue
+		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
+			for X in ${LANGS}; do
+				if [[ "${X}" == "${LANG}-"* ]] && \
+					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
+					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
+					continue 2
+				fi
+			done
+		fi
+		ewarn "Sorry, but ${P} does not support the ${LANG} LINGUA"
+	done
+}
+
+pkg_setup() {
+	moz_pkgsetup
+
+	if ! use bindist ; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	linguas
+	for X in ${linguas}; do
+		# FIXME: Add support for unpacking xpis to portage
+		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
+	done
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	# Disable gnomevfs extension
+	sed -i -e "s:gnomevfs::" "${S}/"browser/confvars.sh \
+		|| die "Failed to remove gnomevfs extension"
+
+	eautoreconf
+
+	cd js/src
+	eautoreconf
+}
+
+src_configure() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-mailnews
+	mozconfig_annotate '' --enable-canvas
+	mozconfig_annotate '' --enable-safe-browsing
+	mozconfig_annotate '' --with-system-png
+
+	mozconfig_annotate '' --with-system-libxul
+	mozconfig_annotate '' --with-libxul-sdk="${EPREFIX}"/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV}
+
+	# Other ff-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	# omni.jar breaks ff on xr
+	mozconfig_annotate '' --enable-chrome-format=jar
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}/${P}-${X}"
+	done
+
+	# Install icon and .desktop for menu entry
+	if ! use bindist ; then
+		newicon "${S}"/other-licenses/branding/firefox/content/icon48.png ${PN}-icon.png
+		newmenu "${FILESDIR}"/icon/${PN}-1.5.desktop \
+			${PN}-${MAJ_FF_PV}.desktop
+	else
+		newicon "${S}"/browser/base/branding/icon48.png ${PN}-icon-unbranded.png
+		newmenu "${FILESDIR}"/icon/${PN}-1.5-unbranded.desktop \
+			${PN}-${MAJ_FF_PV}.desktop
+		sed -i -e "s:Bon Echo:Shiretoko:" \
+			"${ED}"/usr/share/applications/${PN}-${MAJ_FF_PV}.desktop || die "sed failed!"
+	fi
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true" >> "${ED}"/usr/share/applications/${PN}-${MAJ_FF_PV}.desktop
+	fi
+
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/firefox
+
+	# Enable very specific settings not inherited from xulrunner
+	cp "${FILESDIR}"/firefox-default-prefs.js \
+		"${ED}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \
+		die "failed to cp firefox-default-prefs.js"
+
+	# Plugins dir
+	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
+		|| die "failed to symlink"
+
+	# very ugly hack to make firefox not sigbus on sparc
+	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
+					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" || \
+					 die "sparc sed failed"; }
+}
+
+pkg_postinst() {
+	ewarn "All the packages built against ${PN} won't compile,"
+	ewarn "any package that fails to build warrants a bug report."
+	elog
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+}