Install /usr/bin/firefox stub using install_mozilla_launcher_stub from

mozilla-launcher.eclass #99084
Package-Manager: portage-2.0.51.20-r5

16 files changed, 23 insertions, 1515 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index d33184759f93..562871c6ff7f 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.46 2005/07/14 21:57:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.47 2005/07/18 15:15:38 agriffis Exp $
+
+*mozilla-firefox-1.0.5-r1 (18 Jul 2005)
+
+  18 Jul 2005; Aron Griffis <agriffis@gentoo.org>
+  -mozilla-firefox-1.0.2.ebuild, -mozilla-firefox-1.0.2-r1.ebuild,
+  -mozilla-firefox-1.0.3.ebuild, -mozilla-firefox-1.0.3-r1.ebuild,
+  -mozilla-firefox-1.0.4.ebuild, -mozilla-firefox-1.0.4-r1.ebuild,
+  -mozilla-firefox-1.0.5.ebuild, +mozilla-firefox-1.0.5-r1.ebuild:
+  Install /usr/bin/firefox stub using install_mozilla_launcher_stub from
+  mozilla-launcher.eclass #99084
 
   14 Jul 2005; Aron Griffis <agriffis@gentoo.org>
   mozilla-firefox-1.0.5.ebuild:
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index f98830ee6714..bb2e2d36c323 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -1,23 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6571beadc32beea35e52e47be732e384 mozilla-firefox-1.0.3-r1.ebuild 8421
-MD5 d4bcec8332c3374b32f10f1a2448f01f mozilla-firefox-1.0.3.ebuild 7958
-MD5 1381725e1ec5d4c2bd632c7025e7d426 mozilla-firefox-1.0.2-r1.ebuild 7950
-MD5 3f962d9f9f84f80fd59b6bd9866cdb02 mozilla-firefox-1.0.5.ebuild 8859
-MD5 c7f6a0943a53243be7681bb32d2e37c9 mozilla-firefox-1.0.2.ebuild 6758
-MD5 e0a1bcd1af0ccb9d8f8c32b254ecf1cd ChangeLog 24561
-MD5 086c4743961c07450512ffec32d653b4 mozilla-firefox-1.0.4-r1.ebuild 8810
+MD5 24f616b0ce2ff1571ec5e5ff7269bfef mozilla-firefox-1.0.5-r1.ebuild 8742
+MD5 04550704a9ca0e2ee08d50f6d23aa92e ChangeLog 25027
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 ff92e4004d14a30090204a60eb56972a mozilla-firefox-1.0.4.ebuild 8724
 MD5 3961b39c763ff8f98b56098ac0cdbecc files/mozilla-firefox-1.0-kp_separator.patch 444
-MD5 bb49e8ba9d2443dc026ba1908bbaf195 files/digest-mozilla-firefox-1.0.2 152
-MD5 0abbcd1a3af79d6969e14e600ffd6004 files/digest-mozilla-firefox-1.0.3 152
-MD5 87cb7da5c73dfd3b1850a90fdb241476 files/digest-mozilla-firefox-1.0.4 302
-MD5 8b34a3a356586c0dfc62afb61479b65b files/digest-mozilla-firefox-1.0.5 302
-MD5 bb49e8ba9d2443dc026ba1908bbaf195 files/digest-mozilla-firefox-1.0.2-r1 152
-MD5 8a591e0c9549592c1aa4a9a71eab365d files/digest-mozilla-firefox-1.0.3-r1 231
-MD5 87cb7da5c73dfd3b1850a90fdb241476 files/digest-mozilla-firefox-1.0.4-r1 302
+MD5 8b34a3a356586c0dfc62afb61479b65b files/digest-mozilla-firefox-1.0.5-r1 302
 MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863
 MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646
 MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322
@@ -27,10 +12,3 @@ MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
 MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-firefox-1.0.4-gcc4.patch 1818
 MD5 2cdd03eb2752bc01ba07ad837e926f39 files/icon/mozillafirefox.desktop 168
 MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC1t+2BXaUFmZvwyMRAkeZAJ47IBwMljWEYRygDE/PRolGYIbGugCeObR5
-TbS1iQIIID5fpzE5gkK+A2M=
-=AbtZ
------END PGP SIGNATURE-----
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.2 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.2
deleted file mode 100644
index 3ee3c64df0aa..000000000000
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fd1a0dec3e763e93eb45c0c34b399712 firefox-1.0.2-source.tar.bz2 32760074
-MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.2-r1 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.2-r1
deleted file mode 100644
index 3ee3c64df0aa..000000000000
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.2-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fd1a0dec3e763e93eb45c0c34b399712 firefox-1.0.2-source.tar.bz2 32760074
-MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.3 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.3
deleted file mode 100644
index 81f4ac19c0b1..000000000000
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f1a9a8da0547564a0f8a249f9d56bdf4 firefox-1.0.3-source.tar.bz2 32784300
-MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.3-r1 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.3-r1
deleted file mode 100644
index 47673246ad59..000000000000
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f1a9a8da0547564a0f8a249f9d56bdf4 firefox-1.0.3-source.tar.bz2 32784300
-MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
-MD5 39c7b08477b68fe0cb3fba75970c8125 mozilla-firefox-1.0.3-ia64.patch.bz2 2531
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.4 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.4
deleted file mode 100644
index 8b1c891cb864..000000000000
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.4
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 0f5d0586750fde79ba98ecf3ee4425a7 firefox-1.0.4-source.tar.bz2 32756592
-MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
-MD5 39c7b08477b68fe0cb3fba75970c8125 mozilla-firefox-1.0.3-ia64.patch.bz2 2531
-MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.4-r1 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.4-r1
deleted file mode 100644
index 8b1c891cb864..000000000000
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.4-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 0f5d0586750fde79ba98ecf3ee4425a7 firefox-1.0.4-source.tar.bz2 32756592
-MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
-MD5 39c7b08477b68fe0cb3fba75970c8125 mozilla-firefox-1.0.3-ia64.patch.bz2 2531
-MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.5 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.5-r1
index 949eeeadf7db..949eeeadf7db 100644
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.5
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.5-r1
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.0.2-r1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.2-r1.ebuild
deleted file mode 100644
index 3b2144f361f2..000000000000
--- a/www-client/mozilla-firefox/mozilla-firefox-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2005 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.0.2-r1.ebuild,v 1.7 2005/07/12 18:51:17 agriffis Exp $
-
-inherit makeedit flag-o-matic nsplugins eutils mozconfig mozilla-launcher multilib
-
-S=${WORKDIR}/mozilla
-
-DESCRIPTION="The Mozilla Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.org/projects/firefox/"
-MY_PV=${PV/_rc/rc}
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}-source.tar.bz2
-	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
-	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0-4ft2.patch.bz2"
-
-LICENSE="MPL-1.1 NPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE="gnome java mozdevelop mozsvg"
-
-# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
-# and is required to build with support for cairo.  #71504
-RDEPEND="java? ( virtual/jre )
-	>=media-libs/libmng-1.0.0
-	mozsvg? (
-		>=x11-base/xorg-x11-6.7.0-r2
-		x11-libs/cairo
-	)
-	>=www-client/mozilla-launcher-1.28"
-
-DEPEND="${RDEPEND}
-	java? ( >=dev-java/java-config-0.2.0 )"
-
-# 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_PHOENIX=1
-
-src_unpack() {
-	unpack firefox-${MY_PV}-source.tar.bz2 || die "unpack failed"
-	cd ${S} || die "cd failed"
-
-	# alpha stubs patch from lfs project.
-	# <taviso@gentoo.org> (26 Jun 2003)
-	use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch
-
-	# hppa patches from Ivar <orskaug@stud.ntnu.no>
-	# <gmsoft@gentoo.org> (22 Dec 2004)
-	epatch ${FILESDIR}/mozilla-hppa.patch
-
-	# patch out ft caching code since the API changed between releases of
-	# freetype; this enables freetype-2.1.8+ compat.
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
-	epatch ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
-
-	# patch to fix separate character on euro keyboards, bug 68995
-	epatch ${FILESDIR}/mozilla-firefox-1.0-kp_separator.patch
-
-	if has_version '>=x11-libs/cairo-0.3.0'; then
-		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
-	fi
-}
-
-src_compile() {
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	# 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_use_enable gnome gnomevfs
-	mozconfig_use_extension gnome gnomevfs
-	mozconfig_use_enable mozsvg svg
-	mozconfig_use_enable mozsvg svg-renderer-cairo
-	mozconfig_annotate '' --with-default-mozilla-five-home=/usr/$(get_libdir)/MozillaFirefox
-	mozconfig_annotate '' --prefix=/usr/$(get_libdir)/MozillaFirefox
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, and this breaks
-	# firefox.
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build Firefox
-	#
-	####################################
-
-	# ./configure picks up the mozconfig stuff
-	export LD="$(tc-getLD)"
-	export CC="$(tc-getCC)"
-	export CXX="$(tc-getCXX)"
-	econf
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake MOZ_PHOENIX=1 CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die
-}
-
-src_install() {
-	# Plugin path creation
-	PLUGIN_DIR="/usr/$(get_libdir)/nsbrowser/plugins"
-	dodir ${PLUGIN_DIR}
-
-	dodir /usr/$(get_libdir)/MozillaFirefox
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/$(get_libdir)/MozillaFirefox
-
-	einfo "Installing includes and idl files..."
-	# Copy the include and idl files
-	dodir /usr/$(get_libdir)/MozillaFirefox/include/idl /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}/usr/$(get_libdir)/MozillaFirefox/include
-	cp -LfR idl/* ${D}/usr/$(get_libdir)/MozillaFirefox/include/idl
-	dosym /usr/$(get_libdir)/MozillaFirefox/include /usr/include/MozillaFirefox
-
-	# Dirty hack to get some applications using this header running
-	dosym /usr/$(get_libdir)/MozillaFirefox/include/necko/nsIURI.h /usr/lib/MozillaFirefox/include/nsIURI.h
-
-	cd ${S}/build/unix
-	# Fix firefox-config and install it
-	sed -i -e "s:/lib/firefox-${MY_PV}:/$(get_libdir)/MozillaFirefox:g" firefox-config
-	sed -i -e "s:/firefox-${MY_PV}:/MozillaFirefox:g" firefox-config
-	exeinto /usr/$(get_libdir)/MozillaFirefox
-	doexe firefox-config
-	# Fix pkgconfig files and install them
-	insinto /usr/$(get_libdir)/pkgconfig
-	for x in *.pc; do
-			if [[ -f ${x} ]]; then
-					sed -i -e
-					"s:/lib/firefox-${MY_PV}:/$(get_libdir)/MozillaFirefox:g" ${x}
-					sed -i -e "s:/firefox-${MY_PV}:/MozillaFirefox:g" ${x}
-					doins ${x}
-			fi
-	done
-	cd ${S}
-
-
-	#fix permissions
-	chown -R root:root ${D}/usr/$(get_libdir)/MozillaFirefox
-
-	# Plugin path setup (rescuing the existent plugins)
-	src_mv_plugins /usr/$(get_libdir)/MozillaFirefox/plugins
-
-	dodir /usr/bin
-	cat <<EOF >${D}/usr/bin/firefox
-#!/bin/sh
-# 
-# Stub script to run mozilla-launcher.  We used to use a symlink here but
-# OOo brokenness makes it necessary to use a stub instead:
-# http://bugs.gentoo.org/show_bug.cgi?id=78890
-
-export MOZILLA_LAUNCHER=firefox
-exec /usr/libexec/mozilla-launcher "\$@"
-EOF
-chmod 0755 ${D}/usr/bin/firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10MozillaFirefox
-
-	# Fix icons to look the same everywhere
-	insinto /usr/$(get_libdir)/MozillaFirefox/icons
-	doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm
-	doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/firefox-icon.png
-	# Fix bug 54179: Install .desktop file into /usr/share/applications
-	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozillafirefox.desktop
-
-	# Normally firefox-0.9 must be run as root once before it can be
-	# run as a normal user.  Drop in some initialized files to avoid
-	# this.
-	einfo "Extracting firefox-${PV} initialization files"
-	tar xjpf ${FILESDIR}/firefox-0.9-init.tar.bz2 -C ${D}/usr/$(get_libdir)/MozillaFirefox
-}
-
-pkg_preinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/usr/$(get_libdir)/MozillaFirefox
-
-	# Remove the old plugins dir
-	pkg_mv_plugins /usr/$(get_libdir)/MozillaFirefox/plugins
-
-	# Remove entire installed instance to prevent all kinds of
-	# problems... see bug 44772 for example
-	rm -rf "${MOZILLA_FIVE_HOME}"
-}
-
-pkg_postinst() {
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/MozillaFirefox"
-
-	# Needed to update the run time bindings for REGXPCOM
-	# (do not remove next line!)
-	env-update
-
-	# Register Components and Chrome
-	#
-	# Bug 67031: Set HOME=~root in case this is being emerged via sudo.
-	# Otherwise the following commands will create ~/.mozilla owned by root
-	# and 700 perms, which makes subsequent execution of firefox by user
-	# impossible.
-	einfo "Registering Components and Chrome..."
-	HOME=~root LD_LIBRARY_PATH=/usr/$(get_libdir)/MozillaFirefox ${MOZILLA_FIVE_HOME}/regxpcom
-	HOME=~root LD_LIBRARY_PATH=/usr/$(get_libdir)/MozillaFirefox ${MOZILLA_FIVE_HOME}/regchrome
-
-	# Fix permissions of component registry
-	chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat
-
-	# Fix directory permissions
-	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || :
-
-	# Fix permissions on chrome files
-	find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || :
-
-	# 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
-}
-
-pkg_postrm() {
-	update_mozilla_launcher_symlinks
-}
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.0.2.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.2.ebuild
deleted file mode 100644
index 739674ad8d43..000000000000
--- a/www-client/mozilla-firefox/mozilla-firefox-1.0.2.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2005 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.0.2.ebuild,v 1.12 2005/07/12 18:51:17 agriffis Exp $
-
-inherit makeedit flag-o-matic nsplugins eutils mozconfig mozilla-launcher multilib
-
-S=${WORKDIR}/mozilla
-
-DESCRIPTION="The Mozilla Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.org/projects/firefox/"
-MY_PV=${PV/_rc/rc}
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}-source.tar.bz2
-	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
-	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0-4ft2.patch.bz2"
-
-LICENSE="MPL-1.1 NPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86"
-IUSE="gnome java mozdevelop mozsvg"
-
-# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
-# and is required to build with support for cairo.  #71504
-RDEPEND="java? ( virtual/jre )
-	>=media-libs/libmng-1.0.0
-	mozsvg? (
-		>=x11-base/xorg-x11-6.7.0-r2
-		x11-libs/cairo
-	)
-	>=www-client/mozilla-launcher-1.28"
-
-DEPEND="${RDEPEND}
-	java? ( >=dev-java/java-config-0.2.0 )"
-
-# 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_PHOENIX=1
-
-src_unpack() {
-	unpack firefox-${MY_PV}-source.tar.bz2 || die "unpack failed"
-	cd ${S} || die "cd failed"
-
-	# alpha stubs patch from lfs project.
-	# <taviso@gentoo.org> (26 Jun 2003)
-	use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch
-
-	# hppa patches from Ivar <orskaug@stud.ntnu.no>
-	# <gmsoft@gentoo.org> (22 Dec 2004)
-	epatch ${FILESDIR}/mozilla-hppa.patch
-
-	# patch out ft caching code since the API changed between releases of
-	# freetype; this enables freetype-2.1.8+ compat.
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
-	epatch ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
-
-	# patch to fix separate character on euro keyboards, bug 68995
-	epatch ${FILESDIR}/mozilla-firefox-1.0-kp_separator.patch
-
-	if has_version '>=x11-libs/cairo-0.3.0'; then
-		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
-	fi
-}
-
-src_compile() {
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	# 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_use_enable gnome gnomevfs
-	mozconfig_use_extension gnome gnomevfs
-	mozconfig_use_enable mozsvg svg
-	mozconfig_use_enable mozsvg svg-renderer-cairo
-	mozconfig_annotate '' --with-default-mozilla-five-home=/usr/$(get_libdir)/MozillaFirefox
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, and this breaks
-	# firefox.
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build Firefox
-	#
-	####################################
-
-	# ./configure picks up the mozconfig stuff
-	export LD="$(tc-getLD)"
-	export CC="$(tc-getCC)"
-	export CXX="$(tc-getCXX)"
-	econf
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake MOZ_PHOENIX=1 CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die
-}
-
-src_install() {
-	# Plugin path creation
-	PLUGIN_DIR="/usr/$(get_libdir)/nsbrowser/plugins"
-	dodir ${PLUGIN_DIR}
-
-	dodir /usr/$(get_libdir)/MozillaFirefox
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/$(get_libdir)/MozillaFirefox
-
-	#fix permissions
-	chown -R root:root ${D}/usr/$(get_libdir)/MozillaFirefox
-
-	# Plugin path setup (rescuing the existent plugins)
-	src_mv_plugins /usr/$(get_libdir)/MozillaFirefox/plugins
-
-	dodir /usr/bin
-	cat <<EOF >${D}/usr/bin/firefox
-#!/bin/sh
-# 
-# Stub script to run mozilla-launcher.  We used to use a symlink here but
-# OOo brokenness makes it necessary to use a stub instead:
-# http://bugs.gentoo.org/show_bug.cgi?id=78890
-
-export MOZILLA_LAUNCHER=firefox
-exec /usr/libexec/mozilla-launcher "\$@"
-EOF
-chmod 0755 ${D}/usr/bin/firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10MozillaFirefox
-
-	# Fix icons to look the same everywhere
-	insinto /usr/$(get_libdir)/MozillaFirefox/icons
-	doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm
-	doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/firefox-icon.png
-	# Fix bug 54179: Install .desktop file into /usr/share/applications
-	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozillafirefox.desktop
-
-	# Normally firefox-0.9 must be run as root once before it can be
-	# run as a normal user.  Drop in some initialized files to avoid
-	# this.
-	einfo "Extracting firefox-${PV} initialization files"
-	tar xjpf ${FILESDIR}/firefox-0.9-init.tar.bz2 -C ${D}/usr/$(get_libdir)/MozillaFirefox
-}
-
-pkg_preinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/usr/$(get_libdir)/MozillaFirefox
-
-	# Remove the old plugins dir
-	pkg_mv_plugins /usr/$(get_libdir)/MozillaFirefox/plugins
-
-	# Remove entire installed instance to prevent all kinds of
-	# problems... see bug 44772 for example
-	rm -rf "${MOZILLA_FIVE_HOME}"
-}
-
-pkg_postinst() {
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/MozillaFirefox"
-
-	# Needed to update the run time bindings for REGXPCOM
-	# (do not remove next line!)
-	env-update
-
-	# Register Components and Chrome
-	#
-	# Bug 67031: Set HOME=~root in case this is being emerged via sudo.
-	# Otherwise the following commands will create ~/.mozilla owned by root
-	# and 700 perms, which makes subsequent execution of firefox by user
-	# impossible.
-	einfo "Registering Components and Chrome..."
-	HOME=~root LD_LIBRARY_PATH=/usr/$(get_libdir)/MozillaFirefox ${MOZILLA_FIVE_HOME}/regxpcom
-	HOME=~root LD_LIBRARY_PATH=/usr/$(get_libdir)/MozillaFirefox ${MOZILLA_FIVE_HOME}/regchrome
-
-	# Fix permissions of component registry
-	chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat
-
-	# Fix directory permissions
-	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || :
-
-	# Fix permissions on chrome files
-	find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || :
-
-	# 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
-}
-
-pkg_postrm() {
-	update_mozilla_launcher_symlinks
-}
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.0.3-r1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.3-r1.ebuild
deleted file mode 100644
index b142d2e50b29..000000000000
--- a/www-client/mozilla-firefox/mozilla-firefox-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2005 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.0.3-r1.ebuild,v 1.5 2005/07/12 18:51:17 agriffis Exp $
-
-inherit makeedit flag-o-matic toolchain-funcs nsplugins eutils mozconfig mozilla-launcher multilib
-
-S=${WORKDIR}/mozilla
-
-DESCRIPTION="The Mozilla Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.org/projects/firefox/"
-MY_PV=${PV/_rc/rc}
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}-source.tar.bz2
-	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
-	mirror://gentoo/mozilla-firefox-1.0.3-ia64.patch.bz2
-	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0-4ft2.patch.bz2
-	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0.3-ia64.patch.bz2"
-
-LICENSE="MPL-1.1 NPL-1.1"
-SLOT="0"
-KEYWORDS="ia64"
-IUSE="gnome java mozdevelop mozsvg"
-
-# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
-# and is required to build with support for cairo.  #71504
-RDEPEND="java? ( virtual/jre )
-	>=media-libs/libmng-1.0.0
-	mozsvg? (
-		>=x11-base/xorg-x11-6.7.0-r2
-		x11-libs/cairo
-	)
-	>=www-client/mozilla-launcher-1.28"
-
-DEPEND="${RDEPEND}
-	java? ( >=dev-java/java-config-0.2.0 )"
-
-# 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_PHOENIX=1
-
-src_unpack() {
-	unpack firefox-${MY_PV}-source.tar.bz2 || die "unpack failed"
-	cd ${S} || die "cd failed"
-
-	# alpha stubs patch from lfs project.
-	# <taviso@gentoo.org> (26 Jun 2003)
-	use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch
-
-	# hppa patches from Ivar <orskaug@stud.ntnu.no>
-	# <gmsoft@gentoo.org> (22 Dec 2004)
-	epatch ${FILESDIR}/mozilla-hppa.patch
-
-	# patch out ft caching code since the API changed between releases of
-	# freetype; this enables freetype-2.1.8+ compat.
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
-	epatch ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
-
-	# patch to fix separate character on euro keyboards, bug 68995
-	epatch ${FILESDIR}/mozilla-firefox-1.0-kp_separator.patch
-
-	# some patches from Debian to set default preferences:
-	# - inherit LANG from env
-	# - shut off SSLv2 and 40-bit ciphers by default
-	# - disable application auto-updating
-	epatch ${FILESDIR}/mozilla-firefox-1.0.3-prefs.patch
-
-	# patch to solve segfaults on ia64, from Debian, originally from David
-	# Mosberger
-	epatch ${DISTDIR}/mozilla-firefox-1.0.3-ia64.patch.bz2
-
-	if has_version '>=x11-libs/cairo-0.3.0'; then
-		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
-	fi
-}
-
-src_compile() {
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	# 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_use_enable gnome gnomevfs
-	mozconfig_use_extension gnome gnomevfs
-	mozconfig_use_enable mozsvg svg
-	mozconfig_use_enable mozsvg svg-renderer-cairo
-	mozconfig_annotate '' --with-default-mozilla-five-home=/usr/$(get_libdir)/MozillaFirefox
-	mozconfig_annotate '' --prefix=/usr/$(get_libdir)/MozillaFirefox
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, and this breaks
-	# firefox.
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build Firefox
-	#
-	####################################
-
-	# ./configure picks up the mozconfig stuff
-	export LD="$(tc-getLD)"
-	export CC="$(tc-getCC)"
-	export CXX="$(tc-getCXX)"
-	econf
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake MOZ_PHOENIX=1 CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die
-}
-
-src_install() {
-	# Plugin path creation
-	PLUGIN_DIR="/usr/$(get_libdir)/nsbrowser/plugins"
-	dodir ${PLUGIN_DIR}
-
-	dodir /usr/$(get_libdir)/MozillaFirefox
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/$(get_libdir)/MozillaFirefox
-
-	einfo "Installing includes and idl files..."
-	# Copy the include and idl files
-	dodir /usr/$(get_libdir)/MozillaFirefox/include/idl /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}/usr/$(get_libdir)/MozillaFirefox/include
-	cp -LfR idl/* ${D}/usr/$(get_libdir)/MozillaFirefox/include/idl
-	dosym /usr/$(get_libdir)/MozillaFirefox/include /usr/include/MozillaFirefox
-
-	# Dirty hack to get some applications using this header running
-	dosym /usr/$(get_libdir)/MozillaFirefox/include/necko/nsIURI.h /usr/lib/MozillaFirefox/include/nsIURI.h
-
-	cd ${S}/build/unix
-	# Fix firefox-config and install it
-	sed -i -e "s:/lib/firefox-${MY_PV}:/$(get_libdir)/MozillaFirefox:g" firefox-config
-	sed -i -e "s:/firefox-${MY_PV}:/MozillaFirefox:g" firefox-config
-	exeinto /usr/$(get_libdir)/MozillaFirefox
-	doexe firefox-config
-	# Fix pkgconfig files and install them
-	insinto /usr/$(get_libdir)/pkgconfig
-	for x in *.pc; do
-			if [[ -f ${x} ]]; then
-					sed -i -e
-					"s:/lib/firefox-${MY_PV}:/$(get_libdir)/MozillaFirefox:g" ${x}
-					sed -i -e "s:/firefox-${MY_PV}:/MozillaFirefox:g" ${x}
-					doins ${x}
-			fi
-	done
-	cd ${S}
-
-
-	#fix permissions
-	chown -R root:root ${D}/usr/$(get_libdir)/MozillaFirefox
-
-	# Plugin path setup (rescuing the existent plugins)
-	src_mv_plugins /usr/$(get_libdir)/MozillaFirefox/plugins
-
-	dodir /usr/bin
-	cat <<EOF >${D}/usr/bin/firefox
-#!/bin/sh
-# 
-# Stub script to run mozilla-launcher.  We used to use a symlink here but
-# OOo brokenness makes it necessary to use a stub instead:
-# http://bugs.gentoo.org/show_bug.cgi?id=78890
-
-export MOZILLA_LAUNCHER=firefox
-exec /usr/libexec/mozilla-launcher "\$@"
-EOF
-chmod 0755 ${D}/usr/bin/firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10MozillaFirefox
-
-	# Fix icons to look the same everywhere
-	insinto /usr/$(get_libdir)/MozillaFirefox/icons
-	doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm
-	doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/firefox-icon.png
-	# Fix bug 54179: Install .desktop file into /usr/share/applications
-	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozillafirefox.desktop
-
-	# Normally firefox-0.9 must be run as root once before it can be
-	# run as a normal user.  Drop in some initialized files to avoid
-	# this.
-	einfo "Extracting firefox-${PV} initialization files"
-	tar xjpf ${FILESDIR}/firefox-0.9-init.tar.bz2 -C ${D}/usr/$(get_libdir)/MozillaFirefox
-}
-
-pkg_preinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/usr/$(get_libdir)/MozillaFirefox
-
-	# Remove the old plugins dir
-	pkg_mv_plugins /usr/$(get_libdir)/MozillaFirefox/plugins
-
-	# Remove entire installed instance to prevent all kinds of
-	# problems... see bug 44772 for example
-	rm -rf "${MOZILLA_FIVE_HOME}"
-}
-
-pkg_postinst() {
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/MozillaFirefox"
-
-	# Needed to update the run time bindings for REGXPCOM
-	# (do not remove next line!)
-	env-update
-
-	# Register Components and Chrome
-	#
-	# Bug 67031: Set HOME=~root in case this is being emerged via sudo.
-	# Otherwise the following commands will create ~/.mozilla owned by root
-	# and 700 perms, which makes subsequent execution of firefox by user
-	# impossible.
-	einfo "Registering Components and Chrome..."
-	HOME=~root LD_LIBRARY_PATH=/usr/$(get_libdir)/MozillaFirefox ${MOZILLA_FIVE_HOME}/regxpcom
-	HOME=~root LD_LIBRARY_PATH=/usr/$(get_libdir)/MozillaFirefox ${MOZILLA_FIVE_HOME}/regchrome
-
-	# Fix permissions of component registry
-	chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat
-
-	# Fix directory permissions
-	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || :
-
-	# Fix permissions on chrome files
-	find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || :
-
-	# 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
-}
-
-pkg_postrm() {
-	update_mozilla_launcher_symlinks
-}
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.0.3.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.3.ebuild
deleted file mode 100644
index 3db4047b0e03..000000000000
--- a/www-client/mozilla-firefox/mozilla-firefox-1.0.3.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2005 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.0.3.ebuild,v 1.11 2005/07/12 18:51:17 agriffis Exp $
-
-inherit makeedit flag-o-matic toolchain-funcs nsplugins eutils mozconfig mozilla-launcher multilib
-
-S=${WORKDIR}/mozilla
-
-DESCRIPTION="The Mozilla Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.org/projects/firefox/"
-MY_PV=${PV/_rc/rc}
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}-source.tar.bz2
-	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
-	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0-4ft2.patch.bz2"
-
-LICENSE="MPL-1.1 NPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa -ia64 ppc sparc x86"
-IUSE="gnome java mozdevelop mozsvg"
-
-# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
-# and is required to build with support for cairo.  #71504
-RDEPEND="java? ( virtual/jre )
-	>=media-libs/libmng-1.0.0
-	mozsvg? (
-		>=x11-base/xorg-x11-6.7.0-r2
-		x11-libs/cairo
-	)
-	>=www-client/mozilla-launcher-1.28"
-
-DEPEND="${RDEPEND}
-	java? ( >=dev-java/java-config-0.2.0 )"
-
-# 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_PHOENIX=1
-
-src_unpack() {
-	unpack firefox-${MY_PV}-source.tar.bz2 || die "unpack failed"
-	cd ${S} || die "cd failed"
-
-	# alpha stubs patch from lfs project.
-	# <taviso@gentoo.org> (26 Jun 2003)
-	use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch
-
-	# hppa patches from Ivar <orskaug@stud.ntnu.no>
-	# <gmsoft@gentoo.org> (22 Dec 2004)
-	epatch ${FILESDIR}/mozilla-hppa.patch
-
-	# patch out ft caching code since the API changed between releases of
-	# freetype; this enables freetype-2.1.8+ compat.
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
-	epatch ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
-
-	# patch to fix separate character on euro keyboards, bug 68995
-	epatch ${FILESDIR}/mozilla-firefox-1.0-kp_separator.patch
-
-	if has_version '>=x11-libs/cairo-0.3.0'; then
-		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
-	fi
-}
-
-src_compile() {
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	# 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_use_enable gnome gnomevfs
-	mozconfig_use_extension gnome gnomevfs
-	mozconfig_use_enable mozsvg svg
-	mozconfig_use_enable mozsvg svg-renderer-cairo
-	mozconfig_annotate '' --with-default-mozilla-five-home=/usr/$(get_libdir)/MozillaFirefox
-	mozconfig_annotate '' --prefix=/usr/$(get_libdir)/MozillaFirefox
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, and this breaks
-	# firefox.
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build Firefox
-	#
-	####################################
-
-	# ./configure picks up the mozconfig stuff
-	export LD="$(tc-getLD)"
-	export CC="$(tc-getCC)"
-	export CXX="$(tc-getCXX)"
-	econf
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake MOZ_PHOENIX=1 CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die
-}
-
-src_install() {
-	# Plugin path creation
-	PLUGIN_DIR="/usr/$(get_libdir)/nsbrowser/plugins"
-	dodir ${PLUGIN_DIR}
-
-	dodir /usr/$(get_libdir)/MozillaFirefox
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/$(get_libdir)/MozillaFirefox
-
-	einfo "Installing includes and idl files..."
-	# Copy the include and idl files
-	dodir /usr/$(get_libdir)/MozillaFirefox/include/idl /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}/usr/$(get_libdir)/MozillaFirefox/include
-	cp -LfR idl/* ${D}/usr/$(get_libdir)/MozillaFirefox/include/idl
-	dosym /usr/$(get_libdir)/MozillaFirefox/include /usr/include/MozillaFirefox
-
-	# Dirty hack to get some applications using this header running
-	dosym /usr/$(get_libdir)/MozillaFirefox/include/necko/nsIURI.h /usr/lib/MozillaFirefox/include/nsIURI.h
-
-	cd ${S}/build/unix
-	# Fix firefox-config and install it
-	sed -i -e "s:/lib/firefox-${MY_PV}:/$(get_libdir)/MozillaFirefox:g" firefox-config
-	sed -i -e "s:/firefox-${MY_PV}:/MozillaFirefox:g" firefox-config
-	exeinto /usr/$(get_libdir)/MozillaFirefox
-	doexe firefox-config
-	# Fix pkgconfig files and install them
-	insinto /usr/$(get_libdir)/pkgconfig
-	for x in *.pc; do
-			if [[ -f ${x} ]]; then
-					sed -i -e
-					"s:/lib/firefox-${MY_PV}:/$(get_libdir)/MozillaFirefox:g" ${x}
-					sed -i -e "s:/firefox-${MY_PV}:/MozillaFirefox:g" ${x}
-					doins ${x}
-			fi
-	done
-	cd ${S}
-
-
-	#fix permissions
-	chown -R root:root ${D}/usr/$(get_libdir)/MozillaFirefox
-
-	# Plugin path setup (rescuing the existent plugins)
-	src_mv_plugins /usr/$(get_libdir)/MozillaFirefox/plugins
-
-	dodir /usr/bin
-	cat <<EOF >${D}/usr/bin/firefox
-#!/bin/sh
-# 
-# Stub script to run mozilla-launcher.  We used to use a symlink here but
-# OOo brokenness makes it necessary to use a stub instead:
-# http://bugs.gentoo.org/show_bug.cgi?id=78890
-
-export MOZILLA_LAUNCHER=firefox
-exec /usr/libexec/mozilla-launcher "\$@"
-EOF
-chmod 0755 ${D}/usr/bin/firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10MozillaFirefox
-
-	# Fix icons to look the same everywhere
-	insinto /usr/$(get_libdir)/MozillaFirefox/icons
-	doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm
-	doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/firefox-icon.png
-	# Fix bug 54179: Install .desktop file into /usr/share/applications
-	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozillafirefox.desktop
-
-	# Normally firefox-0.9 must be run as root once before it can be
-	# run as a normal user.  Drop in some initialized files to avoid
-	# this.
-	einfo "Extracting firefox-${PV} initialization files"
-	tar xjpf ${FILESDIR}/firefox-0.9-init.tar.bz2 -C ${D}/usr/$(get_libdir)/MozillaFirefox
-}
-
-pkg_preinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/usr/$(get_libdir)/MozillaFirefox
-
-	# Remove the old plugins dir
-	pkg_mv_plugins /usr/$(get_libdir)/MozillaFirefox/plugins
-
-	# Remove entire installed instance to prevent all kinds of
-	# problems... see bug 44772 for example
-	rm -rf "${MOZILLA_FIVE_HOME}"
-}
-
-pkg_postinst() {
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/MozillaFirefox"
-
-	# Needed to update the run time bindings for REGXPCOM
-	# (do not remove next line!)
-	env-update
-
-	# Register Components and Chrome
-	#
-	# Bug 67031: Set HOME=~root in case this is being emerged via sudo.
-	# Otherwise the following commands will create ~/.mozilla owned by root
-	# and 700 perms, which makes subsequent execution of firefox by user
-	# impossible.
-	einfo "Registering Components and Chrome..."
-	HOME=~root LD_LIBRARY_PATH=/usr/$(get_libdir)/MozillaFirefox ${MOZILLA_FIVE_HOME}/regxpcom
-	HOME=~root LD_LIBRARY_PATH=/usr/$(get_libdir)/MozillaFirefox ${MOZILLA_FIVE_HOME}/regchrome
-
-	# Fix permissions of component registry
-	chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat
-
-	# Fix directory permissions
-	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || :
-
-	# Fix permissions on chrome files
-	find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || :
-
-	# 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
-}
-
-pkg_postrm() {
-	update_mozilla_launcher_symlinks
-}
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.0.4.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.4.ebuild
deleted file mode 100644
index dc73e712132e..000000000000
--- a/www-client/mozilla-firefox/mozilla-firefox-1.0.4.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2005 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.0.4.ebuild,v 1.17 2005/07/12 18:51:17 agriffis Exp $
-
-inherit makeedit flag-o-matic nsplugins eutils mozconfig mozilla-launcher multilib
-
-S=${WORKDIR}/mozilla
-
-DESCRIPTION="The Mozilla Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.org/projects/firefox/"
-MY_PV=${PV/_rc/rc}
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}-source.tar.bz2
-	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
-	mirror://gentoo/mozilla-firefox-1.0.3-ia64.patch.bz2
-	mirror://gentoo/mozilla-jslibmath-alpha.patch
-	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0.3-ia64.patch.bz2
-	http://dev.gentoo.org/~agriffis/dist/mozilla-jslibmath-alpha.patch
-	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0-4ft2.patch.bz2"
-
-LICENSE="MPL-1.1 NPL-1.1"
-SLOT="0"
-KEYWORDS="-alpha amd64 ~arm hppa ia64 ppc sparc x86"
-IUSE="gnome java mozdevelop mozsvg"
-
-# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
-# and is required to build with support for cairo.  #71504
-RDEPEND="java? ( virtual/jre )
-	>=media-libs/libmng-1.0.0
-	mozsvg? (
-		>=x11-base/xorg-x11-6.7.0-r2
-		x11-libs/cairo
-	)
-	>=www-client/mozilla-launcher-1.28"
-
-DEPEND="${RDEPEND}
-	java? ( >=dev-java/java-config-0.2.0 )"
-
-# 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_PHOENIX=1
-
-src_unpack() {
-	unpack firefox-${MY_PV}-source.tar.bz2 || die "unpack failed"
-	cd ${S} || die "cd failed"
-
-	# alpha stubs patch from lfs project.
-	# <taviso@gentoo.org> (26 Jun 2003)
-	use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch
-
-	# hppa patches from Ivar <orskaug@stud.ntnu.no>
-	# <gmsoft@gentoo.org> (22 Dec 2004)
-	epatch ${FILESDIR}/mozilla-hppa.patch
-
-	# patch out ft caching code since the API changed between releases of
-	# freetype; this enables freetype-2.1.8+ compat.
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
-	epatch ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
-
-	# patch to fix separate character on euro keyboards, bug 68995
-	epatch ${FILESDIR}/mozilla-firefox-1.0-kp_separator.patch
-
-	# some patches from Debian to set default preferences:
-	# - inherit LANG from env
-	# - shut off SSLv2 and 40-bit ciphers by default
-	# - disable application auto-updating
-	epatch ${FILESDIR}/mozilla-firefox-1.0.3-prefs.patch
-
-	# patch to solve segfaults on ia64, from Debian, originally from David
-	# Mosberger
-	epatch ${DISTDIR}/mozilla-firefox-1.0.3-ia64.patch.bz2
-
-	if has_version '>=x11-libs/cairo-0.3.0'; then
-		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
-	fi
-
-	# GCC4 compile fix, bug #87800
-	epatch ${FILESDIR}/${P}-gcc4.patch
-}
-
-src_compile() {
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	# 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_use_enable gnome gnomevfs
-	mozconfig_use_extension gnome gnomevfs
-	mozconfig_use_enable mozsvg svg
-	mozconfig_use_enable mozsvg svg-renderer-cairo
-	mozconfig_annotate '' --with-default-mozilla-five-home=/usr/$(get_libdir)/MozillaFirefox
-	mozconfig_annotate '' --prefix=/usr/$(get_libdir)/MozillaFirefox
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, and this breaks
-	# firefox.
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build Firefox
-	#
-	####################################
-
-	# ./configure picks up the mozconfig stuff
-	export LD="$(tc-getLD)"
-	export CC="$(tc-getCC)"
-	export CXX="$(tc-getCXX)"
-	econf
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake MOZ_PHOENIX=1 CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die
-}
-
-src_install() {
-	# Plugin path creation
-	PLUGIN_DIR="/usr/$(get_libdir)/nsbrowser/plugins"
-	dodir ${PLUGIN_DIR}
-
-	dodir /usr/$(get_libdir)/MozillaFirefox
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/$(get_libdir)/MozillaFirefox
-
-	einfo "Installing includes and idl files..."
-	# Copy the include and idl files
-	dodir /usr/$(get_libdir)/MozillaFirefox/include/idl /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}/usr/$(get_libdir)/MozillaFirefox/include
-	cp -LfR idl/* ${D}/usr/$(get_libdir)/MozillaFirefox/include/idl
-	dosym /usr/$(get_libdir)/MozillaFirefox/include /usr/include/MozillaFirefox
-
-	# Dirty hack to get some applications using this header running
-	dosym /usr/$(get_libdir)/MozillaFirefox/include/necko/nsIURI.h /usr/lib/MozillaFirefox/include/nsIURI.h
-
-	cd ${S}/build/unix
-	# Fix firefox-config and install it
-	sed -i -e "s:/lib/firefox-${MY_PV}:/$(get_libdir)/MozillaFirefox:g" firefox-config
-	sed -i -e "s:/firefox-${MY_PV}:/MozillaFirefox:g" firefox-config
-	exeinto /usr/$(get_libdir)/MozillaFirefox
-	doexe firefox-config
-	# Fix pkgconfig files and install them
-	insinto /usr/$(get_libdir)/pkgconfig
-	for x in *.pc; do
-			if [[ -f ${x} ]]; then
-					sed -i -e "s:/lib/firefox-${MY_PV}:/$(get_libdir)/MozillaFirefox:g" ${x}
-					sed -i -e "s:/firefox-${MY_PV}:/MozillaFirefox:g" ${x}
-					doins ${x}
-			fi
-	done
-	cd ${S}
-
-
-	#fix permissions
-	chown -R root:root ${D}/usr/$(get_libdir)/MozillaFirefox
-
-	# Plugin path setup (rescuing the existent plugins)
-	src_mv_plugins /usr/$(get_libdir)/MozillaFirefox/plugins
-
-	dodir /usr/bin
-	cat <<EOF >${D}/usr/bin/firefox
-#!/bin/sh
-# 
-# Stub script to run mozilla-launcher.  We used to use a symlink here but
-# OOo brokenness makes it necessary to use a stub instead:
-# http://bugs.gentoo.org/show_bug.cgi?id=78890
-
-export MOZILLA_LAUNCHER=firefox
-exec /usr/libexec/mozilla-launcher "\$@"
-EOF
-chmod 0755 ${D}/usr/bin/firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10MozillaFirefox
-
-	# Set correct libdir in env.d file
-	dosed "s:/usr/lib:/usr/$(get_libdir):" /etc/env.d/10MozillaFirefox
-
-	# Fix icons to look the same everywhere
-	insinto /usr/$(get_libdir)/MozillaFirefox/icons
-	doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm
-	doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/firefox-icon.png
-	# Fix bug 54179: Install .desktop file into /usr/share/applications
-	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozillafirefox.desktop
-
-	# Normally firefox-0.9 must be run as root once before it can be
-	# run as a normal user.  Drop in some initialized files to avoid
-	# this.
-	einfo "Extracting firefox-${PV} initialization files"
-	tar xjpf ${FILESDIR}/firefox-0.9-init.tar.bz2 -C ${D}/usr/$(get_libdir)/MozillaFirefox
-}
-
-pkg_preinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/usr/$(get_libdir)/MozillaFirefox
-
-	# Remove the old plugins dir
-	pkg_mv_plugins /usr/$(get_libdir)/MozillaFirefox/plugins
-
-	# Remove entire installed instance to prevent all kinds of
-	# problems... see bug 44772 for example
-	rm -rf "${MOZILLA_FIVE_HOME}"
-}
-
-pkg_postinst() {
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/MozillaFirefox"
-
-	# Needed to update the run time bindings for REGXPCOM
-	# (do not remove next line!)
-	env-update
-
-	# Register Components and Chrome
-	#
-	# Bug 67031: Set HOME=~root in case this is being emerged via sudo.
-	# Otherwise the following commands will create ~/.mozilla owned by root
-	# and 700 perms, which makes subsequent execution of firefox by user
-	# impossible.
-	einfo "Registering Components and Chrome..."
-	HOME=~root LD_LIBRARY_PATH=/usr/$(get_libdir)/MozillaFirefox ${MOZILLA_FIVE_HOME}/regxpcom
-	HOME=~root LD_LIBRARY_PATH=/usr/$(get_libdir)/MozillaFirefox ${MOZILLA_FIVE_HOME}/regchrome
-
-	# Fix permissions of component registry
-	chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat
-
-	# Fix directory permissions
-	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || :
-
-	# Fix permissions on chrome files
-	find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || :
-
-	# 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
-}
-
-pkg_postrm() {
-	update_mozilla_launcher_symlinks
-}
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.0.4-r1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.5-r1.ebuild
index be624595d74a..ebcbbc77c397 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-1.0.4-r1.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.0.4-r1.ebuild,v 1.2 2005/07/12 18:51:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.0.5-r1.ebuild,v 1.1 2005/07/18 15:15:38 agriffis Exp $
 
 inherit makeedit flag-o-matic nsplugins eutils mozconfig mozilla-launcher multilib
 
@@ -19,7 +19,7 @@ SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source
 
 LICENSE="MPL-1.1 NPL-1.1"
 SLOT="0"
-KEYWORDS="alpha"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86"
 IUSE="gnome java mozdevelop mozsvg"
 
 # xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
@@ -30,7 +30,7 @@ RDEPEND="java? ( virtual/jre )
 		>=x11-base/xorg-x11-6.7.0-r2
 		x11-libs/cairo
 	)
-	>=www-client/mozilla-launcher-1.28"
+	>=www-client/mozilla-launcher-1.35"
 
 DEPEND="${RDEPEND}
 	java? ( >=dev-java/java-config-0.2.0 )"
@@ -78,7 +78,7 @@ src_unpack() {
 	fi
 
 	# GCC4 compile fix, bug #87800
-	epatch ${FILESDIR}/${P}-gcc4.patch
+	epatch ${FILESDIR}/mozilla-firefox-1.0.4-gcc4.patch
 }
 
 src_compile() {
@@ -175,18 +175,11 @@ src_install() {
 	# Plugin path setup (rescuing the existent plugins)
 	src_mv_plugins /usr/$(get_libdir)/MozillaFirefox/plugins
 
-	dodir /usr/bin
-	cat <<EOF >${D}/usr/bin/firefox
-#!/bin/sh
-# 
-# Stub script to run mozilla-launcher.  We used to use a symlink here but
-# OOo brokenness makes it necessary to use a stub instead:
-# http://bugs.gentoo.org/show_bug.cgi?id=78890
-
-export MOZILLA_LAUNCHER=firefox
-exec /usr/libexec/mozilla-launcher "\$@"
-EOF
-chmod 0755 ${D}/usr/bin/firefox
+	# Install /usr/bin/firefox
+	install_mozilla_launcher_stub firefox /usr/$(get_libdir)/MozillaFirefox
+
+	# Install env.d snippet, which isn't necessary for running firefox, but
+	# might be necessary for programs linked against firefox
 	insinto /etc/env.d
 	doins ${FILESDIR}/10MozillaFirefox
 
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.0.5.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.5.ebuild
deleted file mode 100644
index 41ed170a605b..000000000000
--- a/www-client/mozilla-firefox/mozilla-firefox-1.0.5.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2005 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.0.5.ebuild,v 1.7 2005/07/14 21:57:01 agriffis Exp $
-
-inherit makeedit flag-o-matic nsplugins eutils mozconfig mozilla-launcher multilib
-
-S=${WORKDIR}/mozilla
-
-DESCRIPTION="The Mozilla Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.org/projects/firefox/"
-MY_PV=${PV/_rc/rc}
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}-source.tar.bz2
-	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
-	mirror://gentoo/mozilla-firefox-1.0.3-ia64.patch.bz2
-	mirror://gentoo/mozilla-jslibmath-alpha.patch
-	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0.3-ia64.patch.bz2
-	http://dev.gentoo.org/~agriffis/dist/mozilla-jslibmath-alpha.patch
-	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0-4ft2.patch.bz2"
-
-LICENSE="MPL-1.1 NPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc sparc x86"
-IUSE="gnome java mozdevelop mozsvg"
-
-# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
-# and is required to build with support for cairo.  #71504
-RDEPEND="java? ( virtual/jre )
-	>=media-libs/libmng-1.0.0
-	mozsvg? (
-		>=x11-base/xorg-x11-6.7.0-r2
-		x11-libs/cairo
-	)
-	>=www-client/mozilla-launcher-1.28"
-
-DEPEND="${RDEPEND}
-	java? ( >=dev-java/java-config-0.2.0 )"
-
-# 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_PHOENIX=1
-
-src_unpack() {
-	unpack firefox-${MY_PV}-source.tar.bz2 || die "unpack failed"
-	cd ${S} || die "cd failed"
-
-	# alpha stubs patch from lfs project.
-	# <taviso@gentoo.org> (26 Jun 2003)
-	use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch
-
-	# hppa patches from Ivar <orskaug@stud.ntnu.no>
-	# <gmsoft@gentoo.org> (22 Dec 2004)
-	epatch ${FILESDIR}/mozilla-hppa.patch
-
-	# patch out ft caching code since the API changed between releases of
-	# freetype; this enables freetype-2.1.8+ compat.
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
-	epatch ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
-
-	# patch to fix separate character on euro keyboards, bug 68995
-	epatch ${FILESDIR}/mozilla-firefox-1.0-kp_separator.patch
-
-	# some patches from Debian to set default preferences:
-	# - inherit LANG from env
-	# - shut off SSLv2 and 40-bit ciphers by default
-	# - disable application auto-updating
-	epatch ${FILESDIR}/mozilla-firefox-1.0.3-prefs.patch
-
-	# patch to solve segfaults on ia64, from Debian, originally from David
-	# Mosberger
-	epatch ${DISTDIR}/mozilla-firefox-1.0.3-ia64.patch.bz2
-
-	# patch to fix math operations on alpha, makes maps.google.com work!
-	epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
-
-	if has_version '>=x11-libs/cairo-0.3.0'; then
-		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
-	fi
-
-	# GCC4 compile fix, bug #87800
-	epatch ${FILESDIR}/mozilla-firefox-1.0.4-gcc4.patch
-}
-
-src_compile() {
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	# 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_use_enable gnome gnomevfs
-	mozconfig_use_extension gnome gnomevfs
-	mozconfig_use_enable mozsvg svg
-	mozconfig_use_enable mozsvg svg-renderer-cairo
-	mozconfig_annotate '' --with-default-mozilla-five-home=/usr/$(get_libdir)/MozillaFirefox
-	mozconfig_annotate '' --prefix=/usr/$(get_libdir)/MozillaFirefox
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, and this breaks
-	# firefox.
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build Firefox
-	#
-	####################################
-
-	# ./configure picks up the mozconfig stuff
-	export LD="$(tc-getLD)"
-	export CC="$(tc-getCC)"
-	export CXX="$(tc-getCXX)"
-	econf
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake MOZ_PHOENIX=1 CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die
-}
-
-src_install() {
-	# Plugin path creation
-	PLUGIN_DIR="/usr/$(get_libdir)/nsbrowser/plugins"
-	dodir ${PLUGIN_DIR}
-
-	dodir /usr/$(get_libdir)/MozillaFirefox
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/$(get_libdir)/MozillaFirefox
-
-	einfo "Installing includes and idl files..."
-	# Copy the include and idl files
-	dodir /usr/$(get_libdir)/MozillaFirefox/include/idl /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}/usr/$(get_libdir)/MozillaFirefox/include
-	cp -LfR idl/* ${D}/usr/$(get_libdir)/MozillaFirefox/include/idl
-	dosym /usr/$(get_libdir)/MozillaFirefox/include /usr/include/MozillaFirefox
-
-	# Dirty hack to get some applications using this header running
-	dosym /usr/$(get_libdir)/MozillaFirefox/include/necko/nsIURI.h /usr/lib/MozillaFirefox/include/nsIURI.h
-
-	cd ${S}/build/unix
-	# Fix firefox-config and install it
-	sed -i -e "s:/lib/firefox-${MY_PV}:/$(get_libdir)/MozillaFirefox:g" firefox-config
-	sed -i -e "s:/firefox-${MY_PV}:/MozillaFirefox:g" firefox-config
-	exeinto /usr/$(get_libdir)/MozillaFirefox
-	doexe firefox-config
-	# Fix pkgconfig files and install them
-	insinto /usr/$(get_libdir)/pkgconfig
-	for x in *.pc; do
-			if [[ -f ${x} ]]; then
-					sed -i -e "s:/lib/firefox-${MY_PV}:/$(get_libdir)/MozillaFirefox:g" ${x}
-					sed -i -e "s:/firefox-${MY_PV}:/MozillaFirefox:g" ${x}
-					doins ${x}
-			fi
-	done
-	cd ${S}
-
-
-	#fix permissions
-	chown -R root:root ${D}/usr/$(get_libdir)/MozillaFirefox
-
-	# Plugin path setup (rescuing the existent plugins)
-	src_mv_plugins /usr/$(get_libdir)/MozillaFirefox/plugins
-
-	dodir /usr/bin
-	cat <<EOF >${D}/usr/bin/firefox
-#!/bin/sh
-# 
-# Stub script to run mozilla-launcher.  We used to use a symlink here but
-# OOo brokenness makes it necessary to use a stub instead:
-# http://bugs.gentoo.org/show_bug.cgi?id=78890
-
-export MOZILLA_LAUNCHER=firefox
-exec /usr/libexec/mozilla-launcher "\$@"
-EOF
-chmod 0755 ${D}/usr/bin/firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10MozillaFirefox
-
-	# Set correct libdir in env.d file
-	dosed "s:/usr/lib:/usr/$(get_libdir):" /etc/env.d/10MozillaFirefox
-
-	# Fix icons to look the same everywhere
-	insinto /usr/$(get_libdir)/MozillaFirefox/icons
-	doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm
-	doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/firefox-icon.png
-	# Fix bug 54179: Install .desktop file into /usr/share/applications
-	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozillafirefox.desktop
-
-	# Normally firefox-0.9 must be run as root once before it can be
-	# run as a normal user.  Drop in some initialized files to avoid
-	# this.
-	einfo "Extracting firefox-${PV} initialization files"
-	tar xjpf ${FILESDIR}/firefox-0.9-init.tar.bz2 -C ${D}/usr/$(get_libdir)/MozillaFirefox
-}
-
-pkg_preinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/usr/$(get_libdir)/MozillaFirefox
-
-	# Remove the old plugins dir
-	pkg_mv_plugins /usr/$(get_libdir)/MozillaFirefox/plugins
-
-	# Remove entire installed instance to prevent all kinds of
-	# problems... see bug 44772 for example
-	rm -rf "${MOZILLA_FIVE_HOME}"
-}
-
-pkg_postinst() {
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/MozillaFirefox"
-
-	# Needed to update the run time bindings for REGXPCOM
-	# (do not remove next line!)
-	env-update
-
-	# Register Components and Chrome
-	#
-	# Bug 67031: Set HOME=~root in case this is being emerged via sudo.
-	# Otherwise the following commands will create ~/.mozilla owned by root
-	# and 700 perms, which makes subsequent execution of firefox by user
-	# impossible.
-	einfo "Registering Components and Chrome..."
-	HOME=~root LD_LIBRARY_PATH=/usr/$(get_libdir)/MozillaFirefox ${MOZILLA_FIVE_HOME}/regxpcom
-	HOME=~root LD_LIBRARY_PATH=/usr/$(get_libdir)/MozillaFirefox ${MOZILLA_FIVE_HOME}/regchrome
-
-	# Fix permissions of component registry
-	chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat
-
-	# Fix directory permissions
-	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || :
-
-	# Fix permissions on chrome files
-	find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || :
-
-	# 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
-}
-
-pkg_postrm() {
-	update_mozilla_launcher_symlinks
-}