Bump to 1.0.3

Package-Manager: portage-2.0.51.19

21 files changed, 61 insertions, 1584 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 48f053aef24a..791bc33bf69a 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.13 2005/03/27 20:34:19 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.14 2005/04/16 17:50:42 brad Exp $
+
+*mozilla-firefox-1.0.3 (16 Apr 2005)
+
+  16 Apr 2005; Brad Laue <brad@gentoo.org> -mozilla-firefox-0.9.3.ebuild,
+  -mozilla-firefox-1.0_pre-r2.ebuild, -mozilla-firefox-1.0_rc1.ebuild,
+  -mozilla-firefox-1.0_rc2.ebuild, -mozilla-firefox-1.0.ebuild,
+  -mozilla-firefox-1.0-r2.ebuild, -mozilla-firefox-1.0-r3.ebuild,
+  -mozilla-firefox-1.0.1.ebuild, -mozilla-firefox-1.0.1-r1.ebuild,
+  +mozilla-firefox-1.0.3.ebuild:
+  Bump to 1.0.3. Stable on x86 immediately due to #88039.
 
   27 Mar 2005; Guy Martin <gmsoft@gentoo.org> files/mozilla-hppa.patch,
   mozilla-firefox-1.0.2.ebuild:
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index 51dea98d4318..febc7c46cd4d 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -1,38 +1,22 @@
-MD5 e62291e6bb58441aa8b600628a4957f9 ChangeLog 19079
-MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 eafdcd3d88b3a24aca03d99aaf06bd85 mozilla-firefox-0.9.3.ebuild 8433
-MD5 e7b51ac324211f6233d670725fc56ba7 mozilla-firefox-1.0-r2.ebuild 5484
-MD5 623dae2f5f0c5e67e488711b00ae3957 mozilla-firefox-1.0-r3.ebuild 5951
-MD5 38d4c1da97bddf35b76da780c40389b5 mozilla-firefox-1.0.1.ebuild 6297
-MD5 47a961b1c0836a5f831bb13981eb4c11 mozilla-firefox-1.0.ebuild 5064
-MD5 6f631456061fa3b3131e63c3e0c7e004 mozilla-firefox-1.0_pre-r2.ebuild 5080
-MD5 98d20592c2d9f0bf878f5209150a494d mozilla-firefox-1.0_rc1.ebuild 5154
-MD5 28199d760fdfd8703247dc0536832b82 mozilla-firefox-1.0_rc2.ebuild 5073
-MD5 abb589f883243f5283f8042c818c5cb6 mozilla-firefox-1.0.1-r1.ebuild 6626
-MD5 ebdb84ca864e6a0fc32f3e130bf524e7 mozilla-firefox-1.0.2.ebuild 6614
+MD5 720da313cc9451ec39f128c462e48070 mozilla-firefox-1.0.3.ebuild 7801
 MD5 a5d2651cec78aa8dd7883ff06d730187 mozilla-firefox-1.0.2-r1.ebuild 7805
-MD5 606e82226379fd5ae6cd1d0d1faff7ff files/10MozillaFirefox 31
-MD5 0c7804fd13815f9a0e7a1ef0eab6a871 files/digest-mozilla-firefox-0.9.3 75
-MD5 47c899122e30bc898b5a899ed0e10129 files/digest-mozilla-firefox-1.0 73
-MD5 47c899122e30bc898b5a899ed0e10129 files/digest-mozilla-firefox-1.0-r2 73
-MD5 47c899122e30bc898b5a899ed0e10129 files/digest-mozilla-firefox-1.0-r3 73
-MD5 07f1e3ad740ebc825da0bb43e4d9a84e files/digest-mozilla-firefox-1.0.1 75
-MD5 bef773177860190ef5d6cce7ec70c613 files/digest-mozilla-firefox-1.0_pre-r2 77
-MD5 fa885b490a3c76594784843a1c06ee3a files/digest-mozilla-firefox-1.0_rc1 76
-MD5 e5cc0a5838a73f3fdaf38f4e3c368c26 files/digest-mozilla-firefox-1.0_rc2 76
-MD5 58b96b2730ee9e78eccfb2cb7e79ba2d files/firefox 4220
-MD5 3ad7410bd680964096c84eee3fa21abf files/firefox-0.8-gcc-3.4.patch 460
-MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322
-MD5 c6308c086c87ed2e1e4f3d136efdd770 files/firefox-0.9-nsFormHistory-crash-fix.patch 1755
-MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646
-MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-firebird-amd64.patch 35052
-MD5 b16efe0e4066720b718d67348aeee757 files/mozilla-firefox-1.0-4ft2.patch 22294
+MD5 ebdb84ca864e6a0fc32f3e130bf524e7 mozilla-firefox-1.0.2.ebuild 6614
+MD5 1ba91896d440ab483380cd3865a2f3ce ChangeLog 19549
+MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 3961b39c763ff8f98b56098ac0cdbecc files/mozilla-firefox-1.0-kp_separator.patch 444
+MD5 b16efe0e4066720b718d67348aeee757 files/mozilla-firefox-1.0-4ft2.patch 22294
+MD5 7870df97e6382caede680d440af594c1 files/digest-mozilla-firefox-1.0.2 75
+MD5 c1b444abfc62f5c642c44f44e2436308 files/digest-mozilla-firefox-1.0.3 75
+MD5 7870df97e6382caede680d440af594c1 files/digest-mozilla-firefox-1.0.2-r1 75
 MD5 88371b8f812caf799a1ede2b1b07c079 files/mozilla-firefox-mousebuttons.patch 17099
 MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863
+MD5 58b96b2730ee9e78eccfb2cb7e79ba2d files/firefox 4220
+MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646
+MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322
+MD5 606e82226379fd5ae6cd1d0d1faff7ff files/10MozillaFirefox 31
 MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
-MD5 07f1e3ad740ebc825da0bb43e4d9a84e files/digest-mozilla-firefox-1.0.1-r1 75
-MD5 7870df97e6382caede680d440af594c1 files/digest-mozilla-firefox-1.0.2 75
-MD5 7870df97e6382caede680d440af594c1 files/digest-mozilla-firefox-1.0.2-r1 75
-MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979
+MD5 c6308c086c87ed2e1e4f3d136efdd770 files/firefox-0.9-nsFormHistory-crash-fix.patch 1755
+MD5 3ad7410bd680964096c84eee3fa21abf files/firefox-0.8-gcc-3.4.patch 460
+MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-firebird-amd64.patch 35052
 MD5 2cdd03eb2752bc01ba07ad837e926f39 files/icon/mozillafirefox.desktop 168
+MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-0.9.3 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-0.9.3
deleted file mode 100644
index a76e9602e97f..000000000000
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-0.9.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 641ebf96d2211b3c5527e88389b9687e firefox-0.9.3-source.tar.bz2 33945173
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0
deleted file mode 100644
index e6d2584b2eac..000000000000
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49c16a71f4de014ea471be81e46b1da8 firefox-1.0-source.tar.bz2 32686249
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0-r2 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0-r2
deleted file mode 100644
index e6d2584b2eac..000000000000
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49c16a71f4de014ea471be81e46b1da8 firefox-1.0-source.tar.bz2 32686249
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0-r3 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0-r3
deleted file mode 100644
index e6d2584b2eac..000000000000
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49c16a71f4de014ea471be81e46b1da8 firefox-1.0-source.tar.bz2 32686249
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.1 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.1
deleted file mode 100644
index d93a4c1b13de..000000000000
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ebaea974fea9460ab7050fff76b41cb1 firefox-1.0.1-source.tar.bz2 32671529
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.1-r1 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.1-r1
deleted file mode 100644
index d93a4c1b13de..000000000000
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ebaea974fea9460ab7050fff76b41cb1 firefox-1.0.1-source.tar.bz2 32671529
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
new file mode 100644
index 000000000000..207e32c81b1f
--- /dev/null
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.3
@@ -0,0 +1 @@
+MD5 f1a9a8da0547564a0f8a249f9d56bdf4 firefox-1.0.3-source.tar.bz2 32784300
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0_pre-r2 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0_pre-r2
deleted file mode 100644
index 8484ceb42494..000000000000
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0_pre-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ff9eae3b90b8573bf44293ea44bf3c50 firefox-1.0PR.1-source.tar.bz2 32380173
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0_rc1 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0_rc1
deleted file mode 100644
index a8e293a143dd..000000000000
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7a0411859fc5d5f647e211c24beaf94b firefox-1.0rc1-source.tar.bz2 32706624
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0_rc2 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0_rc2
deleted file mode 100644
index b2270531c18c..000000000000
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aab6ffe0e57de39b20d1c8ccef057171 firefox-1.0rc2-source.tar.bz2 32659115
diff --git a/www-client/mozilla-firefox/mozilla-firefox-0.9.3.ebuild b/www-client/mozilla-firefox/mozilla-firefox-0.9.3.ebuild
deleted file mode 100644
index 28e2d36037ef..000000000000
--- a/www-client/mozilla-firefox/mozilla-firefox-0.9.3.ebuild
+++ /dev/null
@@ -1,289 +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-0.9.3.ebuild,v 1.2 2005/03/23 20:05:30 seemant Exp $
-
-inherit makeedit flag-o-matic gcc nsplugins eutils mozilla-launcher
-
-S=${WORKDIR}/mozilla
-
-DESCRIPTION="The Mozilla Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.org/projects/firefox/"
-# Mirrors have it in one of the following places, depending on what
-# mirror you check and when you check it... :-(
-SRC_URI="
-	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/firefox-${PV}-source.tar.bz2
-	http://ftp.mozilla.org/pub/firefox/releases/${PV}/firefox-${PV}-source.tar.bz2"
-
-KEYWORDS="x86 ppc sparc alpha amd64 ia64"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-IUSE="java gtk2 ipv6 moznoxft truetype xinerama"
-
-RDEPEND="virtual/x11
-	!moznoxft? ( virtual/xft )
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/jpeg-6b
-	>=media-libs/libmng-1.0.0
-	>=media-libs/libpng-1.2.1
-	>=sys-apps/portage-2.0.36
-	dev-libs/expat
-	app-arch/zip
-	app-arch/unzip
-	gtk2?  ( >=x11-libs/gtk+-2.1.1 >=dev-libs/libIDL-0.8.0 )
-	!gtk2? ( =x11-libs/gtk+-1.2* =gnome-base/orbit-0* )
-	java?  ( virtual/jre )
-	>=www-client/mozilla-launcher-1.7-r1"
-
-DEPEND="${RDEPEND}
-	virtual/libc
-	dev-util/pkgconfig
-	java? ( >=dev-java/java-config-0.2.0 )"
-
-# needed by src_compile() and src_install()
-export MOZ_PHOENIX=1
-export MOZ_CALENDAR=0
-export MOZ_ENABLE_XFT=1
-
-src_unpack() {
-	unpack firefox-${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
-
-	# this patch fixes upstream bug 248442 "Crash in form autocomplete
-	# (64-bit arch only)".
-	epatch ${FILESDIR}/firefox-0.9-nsFormHistory-crash-fix.patch
-}
-
-src_compile() {
-	local enable_optimize
-	local myconf="--disable-composer \
-		--with-x \
-		--with-system-jpeg \
-		--with-system-zlib \
-		--with-system-png \
-		--with-system-mng \
-		--disable-mailnews \
-		--disable-calendar \
-		--disable-pedantic \
-		--disable-svg \
-		--enable-mathml \
-		--without-system-nspr \
-		--enable-nspr-autoconf \
-		--enable-xsl \
-		$(use_enable ipv6) \
-		--enable-crypto \
-		--with-java-supplement \
-		--with-pthreads \
-		--with-default-mozilla-five-home=/usr/lib/MozillaFirefox \
-		--with-user-appdir=.phoenix \
-		--disable-jsd \
-		--disable-accessibility \
-		--disable-tests \
-		--disable-debug \
-		--disable-dtd-debug \
-		--disable-logging \
-		--enable-reorder \
-		--enable-strip \
-		--enable-strip-libs \
-		--enable-cpp-rtti \
-		--enable-xterm-updates \
-		--disable-ldap \
-		--disable-toolkit-qt \
-		--disable-toolkit-xlib \
-		--enable-extensions=default,-irc,-venkman,-content-packs,-help"
-
-	if use gtk2; then
-		myconf="${myconf} \
-			--enable-toolkit-gtk2 \
-			--enable-default-toolkit=gtk2 \
-			--disable-toolkit-gtk"
-	else
-		myconf="${myconf} \
-			--enable-toolkit-gtk \
-			--enable-default-toolkit=gtk \
-			--disable-toolkit-gtk2"
-	fi
-
-	if use moznoxft; then
-		myconf="${myconf} --disable-xft $(use_enable truetype freetype2)"
-	elif use gtk2; then
-		local pango_version
-
-		# We need Xft2.0 localy installed
-		if [[ -x /usr/bin/pkg-config ]] && pkg-config xft; then
-			pango_version="$(pkg-config --modversion pango | cut -d. -f1,2)"
-
-			# We also need pango-1.1, else Mozilla links to both
-			# Xft1.1 *and* Xft2.0, and segfault...
-			if [[ ${pango_version//.} -gt 10 ]]; then
-				einfo "Building with Xft2.0 (Gtk+-2.0) support!"
-				myconf="${myconf} --enable-xft --disable-freetype2"
-				touch ${WORKDIR}/.xft
-			else
-				ewarn "Building without Xft2.0 support!"
-				myconf="${myconf} --disable-xft $(use_enable truetype freetype2)"
-			fi
-		else
-			ewarn "Building without Xft2.0 support!"
-			myconf="${myconf} --disable-xft $(use_enable truetype freetype2)"
-		fi
-	else
-		einfo "Building with Xft2.0 (Gtk+-1.0) support!"
-		myconf="${myconf} --enable-xft --disable-freetype2"
-		touch ${WORKDIR}/.xft
-	fi
-
-	# Check for xinerama - closes #19369
-	if use xinerama; then
-		myconf="${myconf} --enable-xinerama=yes"
-	else
-		myconf="${myconf} --enable-xinerama=no"
-	fi
-
-	# Per-architecture flags
-	case "${ARCH}" in
-		alpha|amd64|ia64)
-			# 64-bit needs -fPIC
-			append-flags -fPIC
-			;;
-		sparc)
-			# Added to get MozillaFirebird to compile on sparc
-			replace-sparc64-flags
-			;;
-		ppc)
-			# Fix to avoid gcc-3.3.x miscompilation issues.
-			if [[ "$(gcc-major-version).$(gcc-minor-version)" == 3.3 ]]; then
-				append-flags -fno-strict-aliasing
-			fi
-			;;
-	esac
-
-	# 32-bit vs. 64-bit optimization
-	case "${ARCH}" in
-		alpha|amd64|ia64)
-			# Allow -O0 or -O1: Anything more than this causes
-			# segfaults on startup on 64-bit (bug 33767)
-			enable_optimize=$(echo "$CFLAGS" | grep -Eoe '-O[01]|-O\>')
-			enable_optimize=${enable_optimize:--O1}
-			filter-flags -O -O?
-			;;
-		*)
-			# -O2 and below allowed on 32-bit
-			enable_optimize=$(echo "$CFLAGS" | grep -Eoe '-O[012]|-O\>')
-			enable_optimize=${enable_optimize:--O2}
-			filter-flags -O -O?
-			;;
-	esac
-
-	# Crashes on start when compiled with -fomit-frame-pointer
-	filter-flags -fno-default-inline	# see bug 42488
-	filter-flags -fstack-protector		# see bug 45671
-	filter-flags -fomit-frame-pointer -mpowerpc-gfxopt
-	filter-flags -ffast-math
-	append-flags -s -fforce-addr
-
-	if [[ $(gcc-major-version) -eq 3 ]]; then
-		# gcc-3 prior to 3.2.3 doesn't work well for pentium4
-		if [[ $(gcc-minor-version) -lt 2 ||
-			( $(gcc-minor-version) -eq 2 && $(gcc-micro-version) -lt 3 ) ]]
-		then
-			replace-flags -march=pentium4 -march=pentium3
-			filter-flags -msse2
-		fi
-
-		# Enable us to use flash, etc plugins compiled with gcc-2.95.3
-		if [[ ${ARCH} == x86 ]]; then
-			myconf="${myconf} --enable-old-abi-compat-wrappers"
-		fi
-	fi
-
-	econf --enable-optimize="${enable_optimize}" ${myconf} || die
-
-	edit_makefiles
-	emake MOZ_PHOENIX=1 || die
-}
-
-src_install() {
-	# Plugin path creation
-	PLUGIN_DIR="/usr/lib/nsbrowser/plugins"
-	dodir ${PLUGIN_DIR}
-
-	dodir /usr/lib
-	dodir /usr/lib/MozillaFirefox
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaFirefox
-
-	#fix permissions
-	chown -R root:root ${D}/usr/lib/MozillaFirefox
-
-	# Plugin path setup (rescuing the existent plugins)
-	src_mv_plugins /usr/lib/MozillaFirefox/plugins
-
-	dodir /usr/bin
-	dosym /usr/libexec/mozilla-launcher /usr/bin/firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10MozillaFirefox
-
-	# Fix icons to look the same everywhere
-	insinto /usr/lib/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/lib/MozillaFirefox
-}
-
-pkg_preinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/usr/lib/MozillaFirefox
-
-	# Remove the old plugins dir
-	pkg_mv_plugins /usr/lib/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/lib/MozillaFirefox"
-
-	# Needed to update the run time bindings for REGXPCOM
-	# (do not remove next line!)
-	env-update
-
-	# Register Components and Chrome
-	einfo "Registering Components and Chrome..."
-	LD_LIBRARY_PATH=/usr/lib/MozillaFirefox ${MOZILLA_FIVE_HOME}/regxpcom
-	LD_LIBRARY_PATH=/usr/lib/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-r2.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0-r2.ebuild
deleted file mode 100644
index 024c5aca8394..000000000000
--- a/www-client/mozilla-firefox/mozilla-firefox-1.0-r2.ebuild
+++ /dev/null
@@ -1,181 +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-r2.ebuild,v 1.2 2005/03/23 20:05:30 seemant Exp $
-
-inherit makeedit flag-o-matic gcc nsplugins eutils mozconfig mozilla-launcher
-
-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"
-
-LICENSE="MPL-1.1 NPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE="java ipv6 moznoxft truetype xinerama"
-
-RDEPEND="virtual/x11
-	!moznoxft? ( virtual/xft )
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/jpeg-6b
-	>=media-libs/libmng-1.0.0
-	>=media-libs/libpng-1.2.1
-	>=sys-apps/portage-2.0.36
-	dev-libs/expat
-	app-arch/zip
-	app-arch/unzip
-	java?  ( virtual/jre )
-	>=www-client/mozilla-launcher-1.20"
-
-DEPEND="${RDEPEND}
-	virtual/libc
-	dev-util/pkgconfig
-	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
-}
-
-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_annotate '' --with-default-mozilla-five-home=/usr/lib/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
-	econf
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake MOZ_PHOENIX=1 || die
-}
-
-src_install() {
-	# Plugin path creation
-	PLUGIN_DIR="/usr/lib/nsbrowser/plugins"
-	dodir ${PLUGIN_DIR}
-
-	dodir /usr/lib
-	dodir /usr/lib/MozillaFirefox
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaFirefox
-
-	#fix permissions
-	chown -R root:root ${D}/usr/lib/MozillaFirefox
-
-	# Plugin path setup (rescuing the existent plugins)
-	src_mv_plugins /usr/lib/MozillaFirefox/plugins
-
-	dodir /usr/bin
-	dosym /usr/libexec/mozilla-launcher /usr/bin/firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10MozillaFirefox
-
-	# Fix icons to look the same everywhere
-	insinto /usr/lib/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/lib/MozillaFirefox
-}
-
-pkg_preinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/usr/lib/MozillaFirefox
-
-	# Remove the old plugins dir
-	pkg_mv_plugins /usr/lib/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/lib/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/lib/MozillaFirefox ${MOZILLA_FIVE_HOME}/regxpcom
-	HOME=~root LD_LIBRARY_PATH=/usr/lib/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-r3.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0-r3.ebuild
deleted file mode 100644
index a54b83bc9f69..000000000000
--- a/www-client/mozilla-firefox/mozilla-firefox-1.0-r3.ebuild
+++ /dev/null
@@ -1,189 +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-r3.ebuild,v 1.1 2005/03/18 19:47:25 seemant Exp $
-
-inherit makeedit flag-o-matic gcc nsplugins eutils mozconfig mozilla-launcher
-
-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"
-
-LICENSE="MPL-1.1 NPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~sparc ~x86 hppa"
-IUSE="java 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
-	)"
-
-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 ${FILESDIR}/mozilla-firefox-1.0-4ft2.patch
-
-	# patch to fix separate character on euro keyboards, bug 68995
-	epatch ${FILESDIR}/mozilla-firefox-1.0-kp_separator.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/lib/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
-	econf
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake MOZ_PHOENIX=1 || die
-}
-
-src_install() {
-	# Plugin path creation
-	PLUGIN_DIR="/usr/lib/nsbrowser/plugins"
-	dodir ${PLUGIN_DIR}
-
-	dodir /usr/lib
-	dodir /usr/lib/MozillaFirefox
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaFirefox
-
-	#fix permissions
-	chown -R root:root ${D}/usr/lib/MozillaFirefox
-
-	# Plugin path setup (rescuing the existent plugins)
-	src_mv_plugins /usr/lib/MozillaFirefox/plugins
-
-	dodir /usr/bin
-	dosym /usr/libexec/mozilla-launcher /usr/bin/firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10MozillaFirefox
-
-	# Fix icons to look the same everywhere
-	insinto /usr/lib/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/lib/MozillaFirefox
-}
-
-pkg_preinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/usr/lib/MozillaFirefox
-
-	# Remove the old plugins dir
-	pkg_mv_plugins /usr/lib/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/lib/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/lib/MozillaFirefox ${MOZILLA_FIVE_HOME}/regxpcom
-	HOME=~root LD_LIBRARY_PATH=/usr/lib/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.1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.1.ebuild
deleted file mode 100644
index 7621deb8da9c..000000000000
--- a/www-client/mozilla-firefox/mozilla-firefox-1.0.1.ebuild
+++ /dev/null
@@ -1,195 +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.1.ebuild,v 1.1 2005/03/18 19:47:25 seemant Exp $
-
-inherit makeedit flag-o-matic gcc 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"
-
-LICENSE="MPL-1.1 NPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86"
-IUSE="java 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
-	)"
-
-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 ${FILESDIR}/mozilla-firefox-1.0-4ft2.patch
-
-	# 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
-	dosym /usr/libexec/mozilla-launcher /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.1-r1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.3.ebuild
index b35aadf6a364..0303d2adfe22 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-1.0.1-r1.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.0.3.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.1-r1.ebuild,v 1.2 2005/03/23 20:05:30 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.0.3.ebuild,v 1.1 2005/04/16 17:50:42 brad Exp $
 
 inherit makeedit flag-o-matic gcc nsplugins eutils mozconfig mozilla-launcher multilib
 
@@ -13,7 +13,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 ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc x86"
 IUSE="java mozsvg"
 
 # xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
@@ -81,6 +81,7 @@ src_compile() {
 	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
@@ -117,6 +118,36 @@ src_install() {
 	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
 
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.0.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.ebuild
deleted file mode 100644
index 38df178b6e1a..000000000000
--- a/www-client/mozilla-firefox/mozilla-firefox-1.0.ebuild
+++ /dev/null
@@ -1,171 +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.ebuild,v 1.2 2005/03/23 20:05:30 seemant Exp $
-
-inherit makeedit flag-o-matic gcc nsplugins eutils mozilla mozilla-launcher
-
-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"
-
-LICENSE="MPL-1.1 NPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ia64 ppc sparc x86"
-IUSE="java gtk2 ipv6 moznoxft truetype xinerama"
-
-RDEPEND="virtual/x11
-	!moznoxft? ( virtual/xft )
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/jpeg-6b
-	>=media-libs/libmng-1.0.0
-	>=media-libs/libpng-1.2.1
-	>=sys-apps/portage-2.0.36
-	dev-libs/expat
-	app-arch/zip
-	app-arch/unzip
-	gtk2?  ( >=x11-libs/gtk+-2.1.1 >=dev-libs/libIDL-0.8.0 )
-	!gtk2? ( =x11-libs/gtk+-1.2* =gnome-base/orbit-0* )
-	java?  ( virtual/jre )
-	>=www-client/mozilla-launcher-1.20"
-
-DEPEND="${RDEPEND}
-	virtual/libc
-	dev-util/pkgconfig
-	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
-}
-
-src_compile() {
-	local myconf
-
-	####################################
-	#
-	# myconf, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	# mozilla_conf comes from mozilla.eclass
-	mozilla_conf
-
-	# 1.0PR requires --enable-single-profile to build
-	# http://bugzilla.mozilla.org/show_bug.cgi?id=258831
-	myconf="${myconf} \
-		--with-default-mozilla-five-home=/usr/lib/MozillaFirefox \
-		--enable-single-profile"
-
-	# 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
-	#
-	####################################
-
-	econf ${myconf} || die
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake MOZ_PHOENIX=1 || die
-}
-
-src_install() {
-	# Plugin path creation
-	PLUGIN_DIR="/usr/lib/nsbrowser/plugins"
-	dodir ${PLUGIN_DIR}
-
-	dodir /usr/lib
-	dodir /usr/lib/MozillaFirefox
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaFirefox
-
-	#fix permissions
-	chown -R root:root ${D}/usr/lib/MozillaFirefox
-
-	# Plugin path setup (rescuing the existent plugins)
-	src_mv_plugins /usr/lib/MozillaFirefox/plugins
-
-	dodir /usr/bin
-	dosym /usr/libexec/mozilla-launcher /usr/bin/firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10MozillaFirefox
-
-	# Fix icons to look the same everywhere
-	insinto /usr/lib/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/lib/MozillaFirefox
-}
-
-pkg_preinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/usr/lib/MozillaFirefox
-
-	# Remove the old plugins dir
-	pkg_mv_plugins /usr/lib/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/lib/MozillaFirefox"
-
-	# Needed to update the run time bindings for REGXPCOM
-	# (do not remove next line!)
-	env-update
-
-	# Register Components and Chrome
-	einfo "Registering Components and Chrome..."
-	LD_LIBRARY_PATH=/usr/lib/MozillaFirefox ${MOZILLA_FIVE_HOME}/regxpcom
-	LD_LIBRARY_PATH=/usr/lib/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_pre-r2.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild
deleted file mode 100644
index d99b90c621be..000000000000
--- a/www-client/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild
+++ /dev/null
@@ -1,172 +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_pre-r2.ebuild,v 1.2 2005/03/23 20:05:30 seemant Exp $
-
-inherit makeedit flag-o-matic gcc nsplugins eutils mozilla mozilla-launcher
-
-S=${WORKDIR}/mozilla
-
-DESCRIPTION="The Mozilla Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.org/projects/firefox/"
-MY_PV=${PV/_pre/PR.1}
-SRC_URI="mirror://gentoo/firefox-${MY_PV}-source.tar.bz2 \
-	http://dev.gentoo.org/~brad/firefox-${MY_PV}-source.tar.bz2"
-
-LICENSE="MPL-1.1 NPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc sparc x86"
-IUSE="java gtk2 ipv6 moznoxft truetype xinerama"
-
-RDEPEND="virtual/x11
-	!moznoxft? ( virtual/xft )
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/jpeg-6b
-	>=media-libs/libmng-1.0.0
-	>=media-libs/libpng-1.2.1
-	>=sys-apps/portage-2.0.36
-	dev-libs/expat
-	app-arch/zip
-	app-arch/unzip
-	gtk2?  ( >=x11-libs/gtk+-2.1.1 >=dev-libs/libIDL-0.8.0 )
-	!gtk2? ( =x11-libs/gtk+-1.2* =gnome-base/orbit-0* )
-	java?  ( virtual/jre )
-	>=www-client/mozilla-launcher-1.20"
-
-DEPEND="${RDEPEND}
-	virtual/libc
-	dev-util/pkgconfig
-	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
-}
-
-src_compile() {
-	local myconf
-
-	####################################
-	#
-	# myconf, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	# mozilla_conf comes from mozilla.eclass
-	mozilla_conf
-
-	# 1.0PR requires --enable-single-profile to build
-	# http://bugzilla.mozilla.org/show_bug.cgi?id=258831
-	myconf="${myconf} \
-		--with-default-mozilla-five-home=/usr/lib/MozillaFirefox \
-		--enable-single-profile"
-
-	# 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
-	#
-	####################################
-
-	econf ${myconf} || die
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake MOZ_PHOENIX=1 || die
-}
-
-src_install() {
-	# Plugin path creation
-	PLUGIN_DIR="/usr/lib/nsbrowser/plugins"
-	dodir ${PLUGIN_DIR}
-
-	dodir /usr/lib
-	dodir /usr/lib/MozillaFirefox
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaFirefox
-
-	#fix permissions
-	chown -R root:root ${D}/usr/lib/MozillaFirefox
-
-	# Plugin path setup (rescuing the existent plugins)
-	src_mv_plugins /usr/lib/MozillaFirefox/plugins
-
-	dodir /usr/bin
-	dosym /usr/libexec/mozilla-launcher /usr/bin/firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10MozillaFirefox
-
-	# Fix icons to look the same everywhere
-	insinto /usr/lib/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/lib/MozillaFirefox
-}
-
-pkg_preinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/usr/lib/MozillaFirefox
-
-	# Remove the old plugins dir
-	pkg_mv_plugins /usr/lib/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/lib/MozillaFirefox"
-
-	# Needed to update the run time bindings for REGXPCOM
-	# (do not remove next line!)
-	env-update
-
-	# Register Components and Chrome
-	einfo "Registering Components and Chrome..."
-	LD_LIBRARY_PATH=/usr/lib/MozillaFirefox ${MOZILLA_FIVE_HOME}/regxpcom
-	LD_LIBRARY_PATH=/usr/lib/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_rc1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0_rc1.ebuild
deleted file mode 100644
index bf93b1baac43..000000000000
--- a/www-client/mozilla-firefox/mozilla-firefox-1.0_rc1.ebuild
+++ /dev/null
@@ -1,172 +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_rc1.ebuild,v 1.2 2005/03/23 20:05:30 seemant Exp $
-
-inherit makeedit flag-o-matic gcc nsplugins eutils mozilla mozilla-launcher
-
-S=${WORKDIR}/mozilla
-
-DESCRIPTION="The Mozilla Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.org/projects/firefox/"
-MY_PV=${PV/_rc1/rc1}
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/firefox-${MY_PV}-source.tar.bz2
-	http://ftp.mozilla.org/pub/firefox/releases/${MY_PV}/firefox-${MY_PV}-source.tar.bz2"
-
-LICENSE="MPL-1.1 NPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE="java gtk2 ipv6 moznoxft truetype xinerama"
-
-RDEPEND="virtual/x11
-	!moznoxft? ( virtual/xft )
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/jpeg-6b
-	>=media-libs/libmng-1.0.0
-	>=media-libs/libpng-1.2.1
-	>=sys-apps/portage-2.0.36
-	dev-libs/expat
-	app-arch/zip
-	app-arch/unzip
-	gtk2?  ( >=x11-libs/gtk+-2.1.1 >=dev-libs/libIDL-0.8.0 )
-	!gtk2? ( =x11-libs/gtk+-1.2* =gnome-base/orbit-0* )
-	java?  ( virtual/jre )
-	>=www-client/mozilla-launcher-1.20"
-
-DEPEND="${RDEPEND}
-	virtual/libc
-	dev-util/pkgconfig
-	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
-}
-
-src_compile() {
-	local myconf
-
-	####################################
-	#
-	# myconf, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	# mozilla_conf comes from mozilla.eclass
-	mozilla_conf
-
-	# 1.0PR requires --enable-single-profile to build
-	# http://bugzilla.mozilla.org/show_bug.cgi?id=258831
-	myconf="${myconf} \
-		--with-default-mozilla-five-home=/usr/lib/MozillaFirefox \
-		--enable-single-profile"
-
-	# 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
-	#
-	####################################
-
-	econf ${myconf} || die
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake MOZ_PHOENIX=1 || die
-}
-
-src_install() {
-	# Plugin path creation
-	PLUGIN_DIR="/usr/lib/nsbrowser/plugins"
-	dodir ${PLUGIN_DIR}
-
-	dodir /usr/lib
-	dodir /usr/lib/MozillaFirefox
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaFirefox
-
-	#fix permissions
-	chown -R root:root ${D}/usr/lib/MozillaFirefox
-
-	# Plugin path setup (rescuing the existent plugins)
-	src_mv_plugins /usr/lib/MozillaFirefox/plugins
-
-	dodir /usr/bin
-	dosym /usr/libexec/mozilla-launcher /usr/bin/firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10MozillaFirefox
-
-	# Fix icons to look the same everywhere
-	insinto /usr/lib/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/lib/MozillaFirefox
-}
-
-pkg_preinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/usr/lib/MozillaFirefox
-
-	# Remove the old plugins dir
-	pkg_mv_plugins /usr/lib/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/lib/MozillaFirefox"
-
-	# Needed to update the run time bindings for REGXPCOM
-	# (do not remove next line!)
-	env-update
-
-	# Register Components and Chrome
-	einfo "Registering Components and Chrome..."
-	LD_LIBRARY_PATH=/usr/lib/MozillaFirefox ${MOZILLA_FIVE_HOME}/regxpcom
-	LD_LIBRARY_PATH=/usr/lib/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_rc2.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0_rc2.ebuild
deleted file mode 100644
index 34b7a10329d7..000000000000
--- a/www-client/mozilla-firefox/mozilla-firefox-1.0_rc2.ebuild
+++ /dev/null
@@ -1,171 +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_rc2.ebuild,v 1.2 2005/03/23 20:05:30 seemant Exp $
-
-inherit makeedit flag-o-matic gcc nsplugins eutils mozilla mozilla-launcher
-
-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"
-
-LICENSE="MPL-1.1 NPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE="java gtk2 ipv6 moznoxft truetype xinerama"
-
-RDEPEND="virtual/x11
-	!moznoxft? ( virtual/xft )
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/jpeg-6b
-	>=media-libs/libmng-1.0.0
-	>=media-libs/libpng-1.2.1
-	>=sys-apps/portage-2.0.36
-	dev-libs/expat
-	app-arch/zip
-	app-arch/unzip
-	gtk2?  ( >=x11-libs/gtk+-2.1.1 >=dev-libs/libIDL-0.8.0 )
-	!gtk2? ( =x11-libs/gtk+-1.2* =gnome-base/orbit-0* )
-	java?  ( virtual/jre )
-	>=www-client/mozilla-launcher-1.20"
-
-DEPEND="${RDEPEND}
-	virtual/libc
-	dev-util/pkgconfig
-	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
-}
-
-src_compile() {
-	local myconf
-
-	####################################
-	#
-	# myconf, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	# mozilla_conf comes from mozilla.eclass
-	mozilla_conf
-
-	# 1.0PR requires --enable-single-profile to build
-	# http://bugzilla.mozilla.org/show_bug.cgi?id=258831
-	myconf="${myconf} \
-		--with-default-mozilla-five-home=/usr/lib/MozillaFirefox \
-		--enable-single-profile"
-
-	# 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
-	#
-	####################################
-
-	econf ${myconf} || die
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake MOZ_PHOENIX=1 || die
-}
-
-src_install() {
-	# Plugin path creation
-	PLUGIN_DIR="/usr/lib/nsbrowser/plugins"
-	dodir ${PLUGIN_DIR}
-
-	dodir /usr/lib
-	dodir /usr/lib/MozillaFirefox
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaFirefox
-
-	#fix permissions
-	chown -R root:root ${D}/usr/lib/MozillaFirefox
-
-	# Plugin path setup (rescuing the existent plugins)
-	src_mv_plugins /usr/lib/MozillaFirefox/plugins
-
-	dodir /usr/bin
-	dosym /usr/libexec/mozilla-launcher /usr/bin/firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10MozillaFirefox
-
-	# Fix icons to look the same everywhere
-	insinto /usr/lib/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/lib/MozillaFirefox
-}
-
-pkg_preinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/usr/lib/MozillaFirefox
-
-	# Remove the old plugins dir
-	pkg_mv_plugins /usr/lib/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/lib/MozillaFirefox"
-
-	# Needed to update the run time bindings for REGXPCOM
-	# (do not remove next line!)
-	env-update
-
-	# Register Components and Chrome
-	einfo "Registering Components and Chrome..."
-	LD_LIBRARY_PATH=/usr/lib/MozillaFirefox ${MOZILLA_FIVE_HOME}/regxpcom
-	LD_LIBRARY_PATH=/usr/lib/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
-}