removed mozxmlterm, cleanup

Package-Manager: portage-2.0.51.22-r2

16 files changed, 34 insertions, 1995 deletions

diff --git a/www-client/mozilla/ChangeLog b/www-client/mozilla/ChangeLog
index c353ccb339b7..cd03a1b87230 100644
--- a/www-client/mozilla/ChangeLog
+++ b/www-client/mozilla/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/mozilla
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/ChangeLog,v 1.53 2005/08/04 21:53:06 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/ChangeLog,v 1.54 2005/08/08 17:05:58 anarchy Exp $
+
+  08 Aug 2005; Jory A. Pratt <anarchy@gentoo.org> -mozilla-1.7.7.ebuild,
+  -mozilla-1.7.7-r2.ebuild, -mozilla-1.7.8.ebuild, -mozilla-1.7.8-r1.ebuild,
+  -mozilla-1.7.8-r2.ebuild, mozilla-1.7.10-r1.ebuild,
+  mozilla-1.7.10-r2.ebuild, mozilla-1.7.10-r3.ebuild, mozilla-1.7.11.ebuild:
+  cleanup, drop of mozxmlterm as it is expermimental and not supported by us
+  anymore
 
   04 Aug 2005; Martin Schlemmer <azarah@gentoo.org>
   mozilla-1.7.10-r1.ebuild, mozilla-1.7.10-r2.ebuild,
diff --git a/www-client/mozilla/Manifest b/www-client/mozilla/Manifest
index 158caac1ad5d..180023cb8df2 100644
--- a/www-client/mozilla/Manifest
+++ b/www-client/mozilla/Manifest
@@ -1,46 +1,26 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d7647539e7dcae6a80683e8f42b8e80a mozilla-1.7.10-r1.ebuild 12647
-MD5 e0bd34c27a64d76ba0c0d7ec720c3455 ChangeLog 48342
-MD5 0ac3b237f5a7b9cb5d9bfb633d326bdd mozilla-1.7.11.ebuild 12236
-MD5 c26f1486c82829d3659efbe322a741a6 mozilla-1.7.10-r3.ebuild 12239
-MD5 954ba5f007d13a0b984708b387f830c3 mozilla-1.7.10-r2.ebuild 11894
-MD5 31adb1c8bd099f61d5c68f7e6e446440 mozilla-1.7.8-r1.ebuild 12236
-MD5 12b8ce8242ac4a90d28d0dcd6040a605 mozilla-1.7.8.ebuild 11769
+MD5 2670fd5b05dbcab6ecce9540fe3f32af ChangeLog 48712
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 2629a6429172f0f52ed0aaca1e0d7051 mozilla-1.7.7.ebuild 11699
-MD5 9a1d1ff8920e1e63f730c07062aaddd0 mozilla-1.7.8-r2.ebuild 12360
-MD5 4ea3d1895061904b61b76550541c64b0 mozilla-1.7.7-r2.ebuild 11778
-MD5 a86b94268e23e2bb90882f4b393efbb9 files/digest-mozilla-1.7.10-r3 428
-MD5 b7c78ba7ca0c519d0f3d2b80ab4cdd74 files/mozilla-1.7.6-ppc64.patch 3651
-MD5 dda9d34fd8970334058d801c524a027c files/digest-mozilla-1.7.7 203
+MD5 61ca4a322a0a3bd660ace9c217c27861 mozilla-1.7.10-r1.ebuild 12593
+MD5 1297e81aab332ee5b47fda97bd2792bd mozilla-1.7.10-r2.ebuild 11840
+MD5 f4220e4244e4b13b675001ef472cb16c mozilla-1.7.10-r3.ebuild 12185
+MD5 fc8af6c13b781ae3114117218b4c4bd6 mozilla-1.7.11.ebuild 12182
+MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
 MD5 f928943477be0f114ef393d3a4c28e80 files/digest-mozilla-1.7.10-r1 432
-MD5 5b22d0e1ea93923e3e66787c286ad86f files/mozilla-1.7.8-objectframefix.diff 673
 MD5 f928943477be0f114ef393d3a4c28e80 files/digest-mozilla-1.7.10-r2 432
-MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
+MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
+MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-1.7.3-4ft2.patch 22360
+MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818
+MD5 b7c78ba7ca0c519d0f3d2b80ab4cdd74 files/mozilla-1.7.6-ppc64.patch 3651
+MD5 eb21396de389b3ef0277d5f95d59c348 files/mozilla-1.7.8-amd64.patch 4020
+MD5 5b22d0e1ea93923e3e66787c286ad86f files/mozilla-1.7.8-objectframefix.diff 673
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
-MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
 MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863
+MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
 MD5 278524216669b594ea5b6468a180ed73 files/mozilla-stackgrowth.patch 931
-MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11 428
-MD5 eb21396de389b3ef0277d5f95d59c348 files/mozilla-1.7.8-amd64.patch 4020
-MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-1.7.3-4ft2.patch 22360
-MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818
-MD5 dda9d34fd8970334058d801c524a027c files/digest-mozilla-1.7.7-r2 203
-MD5 72c2d705282918e79c1dbc1d0fe8498a files/digest-mozilla-1.7.8-r2 274
-MD5 5d946445ba7bba30fb129f941bc7e84b files/digest-mozilla-1.7.8 203
-MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
+MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
 MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
-MD5 5d946445ba7bba30fb129f941bc7e84b files/digest-mozilla-1.7.8-r1 203
-MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
-MD5 e3c488f3226f61adbb11d6a73ae84209 files/icon/mozilla.desktop 153
-MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
+MD5 a86b94268e23e2bb90882f4b393efbb9 files/digest-mozilla-1.7.10-r3 428
+MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11 428
 MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFC8o5e1ZcsMnZjRyIRAgTmAJ9Cl2/DANrgcjumsB/lY27jRXX6fQCdEo4I
-/LB1upkvBUDOTXhKv7aGy54=
-=FSGe
------END PGP SIGNATURE-----
+MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
+MD5 e3c488f3226f61adbb11d6a73ae84209 files/icon/mozilla.desktop 153
diff --git a/www-client/mozilla/files/digest-mozilla-1.7.7 b/www-client/mozilla/files/digest-mozilla-1.7.7
deleted file mode 100644
index 9f0cb8e1bed7..000000000000
--- a/www-client/mozilla/files/digest-mozilla-1.7.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a16d3d98bb90d45c7bc04dae20d39e3e mozilla-source-1.7.7.tar.bz2 29776225
-MD5 4aa272b46c8cbf167dcd49a6d74cf526 ipc-1.1.2.tar.gz 102663
-MD5 4ab46132f41b4f1718cd4141742f824b enigmail-0.91.0.tar.gz 365622
diff --git a/www-client/mozilla/files/digest-mozilla-1.7.7-r2 b/www-client/mozilla/files/digest-mozilla-1.7.7-r2
deleted file mode 100644
index 9f0cb8e1bed7..000000000000
--- a/www-client/mozilla/files/digest-mozilla-1.7.7-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a16d3d98bb90d45c7bc04dae20d39e3e mozilla-source-1.7.7.tar.bz2 29776225
-MD5 4aa272b46c8cbf167dcd49a6d74cf526 ipc-1.1.2.tar.gz 102663
-MD5 4ab46132f41b4f1718cd4141742f824b enigmail-0.91.0.tar.gz 365622
diff --git a/www-client/mozilla/files/digest-mozilla-1.7.8 b/www-client/mozilla/files/digest-mozilla-1.7.8
deleted file mode 100644
index 5048d5eba16d..000000000000
--- a/www-client/mozilla/files/digest-mozilla-1.7.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a6fa13d0c9243060bac6821fcff4b973 mozilla-1.7.8-source.tar.bz2 30449749
-MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
-MD5 4ab46132f41b4f1718cd4141742f824b enigmail-0.91.0.tar.gz 365622
diff --git a/www-client/mozilla/files/digest-mozilla-1.7.8-r1 b/www-client/mozilla/files/digest-mozilla-1.7.8-r1
deleted file mode 100644
index 5048d5eba16d..000000000000
--- a/www-client/mozilla/files/digest-mozilla-1.7.8-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a6fa13d0c9243060bac6821fcff4b973 mozilla-1.7.8-source.tar.bz2 30449749
-MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
-MD5 4ab46132f41b4f1718cd4141742f824b enigmail-0.91.0.tar.gz 365622
diff --git a/www-client/mozilla/files/digest-mozilla-1.7.8-r2 b/www-client/mozilla/files/digest-mozilla-1.7.8-r2
deleted file mode 100644
index 9f6607afb259..000000000000
--- a/www-client/mozilla/files/digest-mozilla-1.7.8-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 a6fa13d0c9243060bac6821fcff4b973 mozilla-1.7.8-source.tar.bz2 30449749
-MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
-MD5 4ab46132f41b4f1718cd4141742f824b enigmail-0.91.0.tar.gz 365622
-MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
diff --git a/www-client/mozilla/mozilla-1.7.10-r1.ebuild b/www-client/mozilla/mozilla-1.7.10-r1.ebuild
index d911b5fae1c4..2f545e5c5f1f 100644
--- a/www-client/mozilla/mozilla-1.7.10-r1.ebuild
+++ b/www-client/mozilla/mozilla-1.7.10-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/mozilla-1.7.10-r1.ebuild,v 1.6 2005/08/04 21:53:06 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/mozilla-1.7.10-r1.ebuild,v 1.7 2005/08/08 17:05:58 anarchy Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
@@ -28,7 +28,7 @@ SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/s
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
-IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg mozxmlterm postgres ssl"
+IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg postgres ssl"
 
 # xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
 # and is required to build with support for cairo.  #71504
@@ -169,7 +169,6 @@ src_compile() {
 	mozconfig_use_enable gnome gnomevfs
 	mozconfig_use_extension gnome gnomevfs
 	mozconfig_use_extension !moznoirc irc
-	mozconfig_use_extension mozxmlterm xmlterm
 	mozconfig_use_extension postgres sql
 	if use postgres ; then
 		export MOZ_ENABLE_PGSQL=1
diff --git a/www-client/mozilla/mozilla-1.7.10-r2.ebuild b/www-client/mozilla/mozilla-1.7.10-r2.ebuild
index ce58debb247a..022176c5d95b 100644
--- a/www-client/mozilla/mozilla-1.7.10-r2.ebuild
+++ b/www-client/mozilla/mozilla-1.7.10-r2.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/mozilla-1.7.10-r2.ebuild,v 1.3 2005/08/04 21:53:06 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/mozilla-1.7.10-r2.ebuild,v 1.4 2005/08/08 17:05:58 anarchy Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
@@ -28,7 +28,7 @@ SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/s
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
-IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg mozxmlterm postgres ssl"
+IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg postgres ssl"
 
 # xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
 # and is required to build with support for cairo.  #71504
@@ -168,7 +168,6 @@ src_compile() {
 	mozconfig_use_enable gnome gnomevfs
 	mozconfig_use_extension gnome gnomevfs
 	mozconfig_use_extension !moznoirc irc
-	mozconfig_use_extension mozxmlterm xmlterm
 	mozconfig_use_extension postgres sql
 	if use postgres ; then
 		export MOZ_ENABLE_PGSQL=1
diff --git a/www-client/mozilla/mozilla-1.7.10-r3.ebuild b/www-client/mozilla/mozilla-1.7.10-r3.ebuild
index 73aea61b670f..e96663b59b96 100644
--- a/www-client/mozilla/mozilla-1.7.10-r3.ebuild
+++ b/www-client/mozilla/mozilla-1.7.10-r3.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/mozilla-1.7.10-r3.ebuild,v 1.6 2005/08/04 21:53:06 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/mozilla-1.7.10-r3.ebuild,v 1.7 2005/08/08 17:05:58 anarchy Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
@@ -27,7 +27,7 @@ SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/s
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
-IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg mozxmlterm postgres ssl"
+IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg postgres ssl"
 
 # xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
 # and is required to build with support for cairo.  #71504
@@ -167,7 +167,6 @@ src_compile() {
 	mozconfig_use_enable gnome gnomevfs
 	mozconfig_use_extension gnome gnomevfs
 	mozconfig_use_extension !moznoirc irc
-	mozconfig_use_extension mozxmlterm xmlterm
 	mozconfig_use_extension postgres sql
 	if use postgres ; then
 		export MOZ_ENABLE_PGSQL=1
diff --git a/www-client/mozilla/mozilla-1.7.11.ebuild b/www-client/mozilla/mozilla-1.7.11.ebuild
index f7bc7c863fa9..4481ba340b3a 100644
--- a/www-client/mozilla/mozilla-1.7.11.ebuild
+++ b/www-client/mozilla/mozilla-1.7.11.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/mozilla-1.7.11.ebuild,v 1.2 2005/08/04 21:53:06 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/mozilla-1.7.11.ebuild,v 1.3 2005/08/08 17:05:58 anarchy Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
@@ -27,7 +27,7 @@ SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/s
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
-IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg mozxmlterm postgres ssl"
+IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg postgres ssl"
 
 # xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
 # and is required to build with support for cairo.  #71504
@@ -167,7 +167,6 @@ src_compile() {
 	mozconfig_use_enable gnome gnomevfs
 	mozconfig_use_extension gnome gnomevfs
 	mozconfig_use_extension !moznoirc irc
-	mozconfig_use_extension mozxmlterm xmlterm
 	mozconfig_use_extension postgres sql
 	if use postgres ; then
 		export MOZ_ENABLE_PGSQL=1
diff --git a/www-client/mozilla/mozilla-1.7.7-r2.ebuild b/www-client/mozilla/mozilla-1.7.7-r2.ebuild
deleted file mode 100644
index 6c7440c4226c..000000000000
--- a/www-client/mozilla/mozilla-1.7.7-r2.ebuild
+++ /dev/null
@@ -1,381 +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/mozilla-1.7.7-r2.ebuild,v 1.7 2005/07/09 14:05:24 agriffis Exp $
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils nsplugins mozilla-launcher mozconfig makeedit multilib
-
-IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg mozxmlterm postgres ssl"
-
-EMVER="0.91.0"
-IPCVER="1.1.2"
-
-# handle _rc versions
-MY_PV=${PV/_alpha/a} 	# handle alpha
-MY_PV=${MY_PV/_beta/b}	# handle beta
-MY_PV=${MY_PV/_rc/rc}	# handle rc
-
-DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
-HOMEPAGE="http://www.mozilla.org"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/source/${PN}-source-${MY_PV}.tar.bz2
-	crypt? ( !moznomail? (
-		http://www.mozilla-enigmail.org/downloads/src/ipc-${IPCVER}.tar.gz
-		http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz
-	) )"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-
-# 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 )
-	mozsvg? (
-		>=x11-base/xorg-x11-6.7.0-r2
-		x11-libs/cairo
-	)
-	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
-	>=www-client/mozilla-launcher-1.28"
-
-DEPEND="${RDEPEND}
-	~sys-devel/autoconf-2.13
-	java? ( >=dev-java/java-config-0.2.0 )
-	dev-lang/perl
-	postgres? ( >=dev-db/postgresql-7.2.0 )"
-
-S="${WORKDIR}/mozilla"
-
-src_unpack() {
-	typeset x
-
-	unpack ${A} || die "unpack failed"
-	cd ${S} || die "cd failed"
-
-	if [[ $(gcc-major-version) -eq 3 ]]; then
-		# ABI Patch for alpha/xpcom for gcc-3.x
-		if [[ ${ARCH} == alpha ]]; then
-			epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
-		fi
-	fi
-
-	# Fix stack growth logic
-	epatch ${FILESDIR}/${PN}-stackgrowth.patch
-
-	# Fix logic error when using RAW target
-	# <azarah@gentoo.org> (23 Feb 2003)
-	epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.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-1.7.3-4ft2.patch
-
-	# Patch to allow compilation on ppc64 - bug #54843
-	use ppc64 && epatch ${FILESDIR}/mozilla-1.7.6-ppc64.patch
-
-	# Patch for newer versions of cairo ( bug #80301)
-	if has_version '>=x11-libs/cairo-0.3.0'; then
-		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
-	fi
-
-	# Fix building with gcc4
-	epatch ${FILESDIR}/${PN}-1.7.6-gcc4.patch
-
-	# Fix scripts that call for /usr/local/bin/perl #51916
-	ebegin "Patching smime to call perl from /usr/bin"
-	sed -i -e '1s,usr/local/bin,usr/bin,' security/nss/cmd/smimetools/smime
-	eend || die "sed failed"
-
-	WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
-
-	# Unpack the enigmail plugin
-	if use crypt && ! use moznomail; then
-		for x in ipc enigmail; do
-			mv ${WORKDIR}/${x} ${S}/extensions || die "mv failed"
-			cd ${S}/extensions/${x} || die "cd failed"
-			makemake	# from mozilla.eclass
-		done
-	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 moz-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_extension !moznoirc irc
-	mozconfig_use_extension mozxmlterm xmlterm
-	mozconfig_use_extension postgres sql
-	mozconfig_use_enable mozcalendar calendar
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_use_enable mozsvg svg
-	mozconfig_use_enable mozsvg svg-renderer-cairo
-	mozconfig_annotate '' --prefix=/usr/$(get_libdir)/mozilla
-	mozconfig_annotate '' --with-default-mozilla-five-home=/usr/$(get_libdir)/mozilla
-
-	if use moznomail && ! use mozcalendar; then
-		mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
-	fi
-	if use moznocompose && use moznomail; then
-		mozconfig_annotate "+moznocompose +moznomail" --disable-composer
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if use postgres ; then
-		export MOZ_ENABLE_PGSQL=1
-		export MOZ_PGSQL_INCLUDES=/usr/include
-		export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
-	fi
-
-	####################################
-	#
-	#  Configure and build Mozilla
-	#
-	####################################
-
-	# ./configure picks up the mozconfig stuff
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	./configure || die "configure failed"
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake || die "emake failed"
-
-	####################################
-	#
-	#  Build Mozilla NSS
-	#
-	####################################
-
-	# Build the NSS/SSL support
-	if use ssl; then
-		einfo "Building Mozilla NSS..."
-
-		# Fix #include problem
-		cd ${S}/security/coreconf || die "cd coreconf failed"
-		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
-			>>headers.mk
-		emake -j1 || die "make security headers failed"
-
-		cd ${S}/security/nss || die "cd nss failed"
-		emake -j1 moz_import || die "make moz_import failed"
-		emake -j1 || die "make nss failed"
-	fi
-
-	####################################
-	#
-	#  Build Enigmail plugin
-	#
-	####################################
-
-	# Build the enigmail plugin
-	if use crypt && ! use moznomail; then
-		einfo "Building Enigmail plugin..."
-		cd ${S}/extensions/ipc || die "cd ipc failed"
-		emake || die "make ipc failed"
-
-		cd ${S}/extensions/enigmail || die "cd enigmail failed"
-		emake || die "make enigmail failed"
-	fi
-}
-
-src_install() {
-	# Install, don't create tarball
-	dodir /usr/$(get_libdir)
-	cd ${S}/xpinstall/packager
-	einfo "Installing mozilla into build root..."
-	make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die "make failed"
-	mv -f ${S}/dist/mozilla ${D}/usr/$(get_libdir)/mozilla
-
-	einfo "Installing includes and idl files..."
-	# Copy the include and idl files
-	dodir /usr/$(get_libdir)/mozilla/include/idl /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}/usr/$(get_libdir)/mozilla/include
-	cp -LfR idl/* ${D}/usr/$(get_libdir)/mozilla/include/idl
-	dosym /usr/$(get_libdir)/mozilla/include /usr/include/mozilla
-
-	# Install the development tools in /usr
-	dodir /usr/bin
-	mv ${D}/usr/$(get_libdir)/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin
-
-	# Install the NSS/SSL libs, headers and tools
-	if use ssl; then
-		einfo "Installing Mozilla NSS..."
-		# Install the headers ('make install' do not work for headers ...)
-		insinto /usr/$(get_libdir)/mozilla/include/nss
-		[ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
-		[ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
-		[ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
-		# These come with zlib ...
-		rm -f ${D}/usr/$(get_libdir)/mozilla/include/nss/{zconf.h,zlib.h}
-
-		cd ${S}/security/nss
-
-		mkdir -p ${WORKDIR}/nss/{bin,lib}
-		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
-		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
-
-		make install || die "make failed"
-		# Gets installed as symbolic links ...
-		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
-		cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/$(get_libdir)/mozilla
-
-		# Need to unset these incase we want to rebuild, else the build
-		# gets newked.
-		unset SOURCE_LIB_DIR
-		unset SOURCE_BIN_DIR
-	fi
-
-	cd ${S}/build/unix
-	# Fix mozilla-config and install it
-	perl -pi -e "s:/lib/mozilla-${MY_PV}::g" mozilla-config
-	perl -pi -e "s:/mozilla-${MY_PV}::g" mozilla-config
-	exeinto /usr/$(get_libdir)/mozilla
-	doexe mozilla-config
-	# Fix pkgconfig files and install them
-	insinto /usr/$(get_libdir)/pkgconfig
-	for x in *.pc; do
-		if [[ -f ${x} ]]; then
-			perl -pi -e "s:/lib/mozilla-${MY_PV}::g" ${x}
-			perl -pi -e "s:/mozilla-${MY_PV}::g" ${x}
-			doins ${x}
-		fi
-	done
-	cd ${S}
-
-	dodir /usr/bin
-	cat <<EOF >${D}/usr/bin/mozilla
-#!/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=mozilla
-exec /usr/libexec/mozilla-launcher "\$@"
-EOF
-	chmod 0755 ${D}/usr/bin/mozilla
-	insinto /etc/env.d
-	doins ${FILESDIR}/10mozilla
-	dodoc LEGAL LICENSE README/mozilla/README*
-
-	# Install rebuild script
-	exeinto /usr/$(get_libdir)/mozilla/
-	doexe ${FILESDIR}/mozilla-rebuild-databases.pl
-
-	# Move plugins dir
-	src_mv_plugins /usr/$(get_libdir)/mozilla/plugins
-
-	# Update Google search plugin to use UTF8 charset ...
-	insinto /usr/$(get_libdir)/mozilla/searchplugins
-	doins ${FILESDIR}/google.src
-
-	if [[ -f "${WORKDIR}/.xft" ]]; then
-		# We are using Xft, so change the default font
-		insinto /usr/$(get_libdir)/mozilla/defaults/pref
-		doins ${FILESDIR}/xft.js
-	fi
-
-	# Fix icons to look the same everywhere
-	insinto /usr/$(get_libdir)/mozilla/icons
-	doins ${S}/widget/src/gtk/mozicon16.xpm
-	doins ${S}/widget/src/gtk/mozicon50.xpm
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/mozilla-icon.png
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozilla.desktop
-
-	# Take care of non root execution
-	# (seems the problem is that not all files are readible by the user)
-	einfo "Fixing Permissions..."
-	chmod -R g+r,o+r ${D}/usr/$(get_libdir)/mozilla
-	find ${D}/usr/$(get_libdir)/mozilla/ -type d -exec chmod 0755 {} \; || :
-}
-
-pkg_preinst() {
-	# Move old plugins dir
-	pkg_mv_plugins /usr/$(get_libdir)/mozilla/plugins
-
-	if true; then
-		# Remove entire installed instance to solve various problems,
-		# for example see bug 27719
-		rm -rf ${ROOT}/usr/$(get_libdir)/mozilla
-	else
-		# Stale components and chrome files break when unmerging old
-		rm -rf ${ROOT}/usr/$(get_libdir)/mozilla/components
-		rm -rf ${ROOT}/usr/$(get_libdir)/mozilla/chrome
-
-		# Remove stale component registry.
-		rm -f ${ROOT}/usr/$(get_libdir)/mozilla/component.reg
-		rm -f ${ROOT}/usr/$(get_libdir)/mozilla/components/compreg.dat
-
-		# Make sure these are removed.
-		rm -f ${ROOT}/usr/$(get_libdir)/mozilla/lib{Xft,Xrender}.so*
-	fi
-}
-
-pkg_postinst() {
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/mozilla"
-
-	# 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..."
-	${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
-
-	# 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 {} \;
-
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	# Regenerate component.reg in case some things changed
-	if [[ -e ${ROOT}/usr/$(get_libdir)/mozilla/regxpcom ]]; then
-		export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/mozilla"
-
-		if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl ]]; then
-			${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
-			# Fix directory permissions
-			find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 755 {} \;
-			# Fix permissions on chrome files
-			find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \;
-		fi
-	fi
-
-	update_mozilla_launcher_symlinks
-}
diff --git a/www-client/mozilla/mozilla-1.7.7.ebuild b/www-client/mozilla/mozilla-1.7.7.ebuild
deleted file mode 100644
index 7e1b3e45c1f8..000000000000
--- a/www-client/mozilla/mozilla-1.7.7.ebuild
+++ /dev/null
@@ -1,378 +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/mozilla-1.7.7.ebuild,v 1.14 2005/07/09 14:05:24 agriffis Exp $
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils nsplugins mozilla-launcher mozconfig makeedit multilib
-
-IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg mozxmlterm postgres ssl"
-
-EMVER="0.91.0"
-IPCVER="1.1.2"
-
-# handle _rc versions
-MY_PV=${PV/_alpha/a} 	# handle alpha
-MY_PV=${MY_PV/_beta/b}	# handle beta
-MY_PV=${MY_PV/_rc/rc}	# handle rc
-
-DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
-HOMEPAGE="http://www.mozilla.org"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/source/${PN}-source-${MY_PV}.tar.bz2
-	crypt? ( !moznomail? (
-		http://www.mozilla-enigmail.org/downloads/src/ipc-${IPCVER}.tar.gz
-		http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz
-	) )"
-
-KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-
-# 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 )
-	mozsvg? (
-		>=x11-base/xorg-x11-6.7.0-r2
-		x11-libs/cairo
-	)
-	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
-	>=www-client/mozilla-launcher-1.28"
-
-DEPEND="${RDEPEND}
-	~sys-devel/autoconf-2.13
-	java? ( >=dev-java/java-config-0.2.0 )
-	dev-lang/perl
-	postgres? ( >=dev-db/postgresql-7.2.0 )"
-
-S="${WORKDIR}/mozilla"
-
-src_unpack() {
-	typeset x
-
-	unpack ${A} || die "unpack failed"
-	cd ${S} || die "cd failed"
-
-	if [[ $(gcc-major-version) -eq 3 ]]; then
-		# ABI Patch for alpha/xpcom for gcc-3.x
-		if [[ ${ARCH} == alpha ]]; then
-			epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
-		fi
-	fi
-
-	# Fix stack growth logic
-	epatch ${FILESDIR}/${PN}-stackgrowth.patch
-
-	# Fix logic error when using RAW target
-	# <azarah@gentoo.org> (23 Feb 2003)
-	epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.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-1.7.3-4ft2.patch
-
-	# Patch to allow compilation on ppc64 - bug #54843
-	use ppc64 && epatch ${FILESDIR}/mozilla-1.7.6-ppc64.patch
-
-	# Patch for newer versions of cairo ( bug #80301)
-	if has_version '>=x11-libs/cairo-0.3.0'; then
-		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
-	fi
-
-	# Fix scripts that call for /usr/local/bin/perl #51916
-	ebegin "Patching smime to call perl from /usr/bin"
-	sed -i -e '1s,usr/local/bin,usr/bin,' security/nss/cmd/smimetools/smime
-	eend || die "sed failed"
-
-	WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
-
-	# Unpack the enigmail plugin
-	if use crypt && ! use moznomail; then
-		for x in ipc enigmail; do
-			mv ${WORKDIR}/${x} ${S}/extensions || die "mv failed"
-			cd ${S}/extensions/${x} || die "cd failed"
-			makemake	# from mozilla.eclass
-		done
-	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 moz-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_extension !moznoirc irc
-	mozconfig_use_extension mozxmlterm xmlterm
-	mozconfig_use_extension postgres sql
-	mozconfig_use_enable mozcalendar calendar
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_use_enable mozsvg svg
-	mozconfig_use_enable mozsvg svg-renderer-cairo
-	mozconfig_annotate '' --prefix=/usr/$(get_libdir)/mozilla
-	mozconfig_annotate '' --with-default-mozilla-five-home=/usr/$(get_libdir)/mozilla
-
-	if use moznomail && ! use mozcalendar; then
-		mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
-	fi
-	if use moznocompose && use moznomail; then
-		mozconfig_annotate "+moznocompose +moznomail" --disable-composer
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if use postgres ; then
-		export MOZ_ENABLE_PGSQL=1
-		export MOZ_PGSQL_INCLUDES=/usr/include
-		export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
-	fi
-
-	####################################
-	#
-	#  Configure and build Mozilla
-	#
-	####################################
-
-	# ./configure picks up the mozconfig stuff
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	./configure || die "configure failed"
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake || die "emake failed"
-
-	####################################
-	#
-	#  Build Mozilla NSS
-	#
-	####################################
-
-	# Build the NSS/SSL support
-	if use ssl; then
-		einfo "Building Mozilla NSS..."
-
-		# Fix #include problem
-		cd ${S}/security/coreconf || die "cd coreconf failed"
-		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
-			>>headers.mk
-		emake -j1 || die "make security headers failed"
-
-		cd ${S}/security/nss || die "cd nss failed"
-		emake -j1 moz_import || die "make moz_import failed"
-		emake -j1 || die "make nss failed"
-	fi
-
-	####################################
-	#
-	#  Build Enigmail plugin
-	#
-	####################################
-
-	# Build the enigmail plugin
-	if use crypt && ! use moznomail; then
-		einfo "Building Enigmail plugin..."
-		cd ${S}/extensions/ipc || die "cd ipc failed"
-		emake || die "make ipc failed"
-
-		cd ${S}/extensions/enigmail || die "cd enigmail failed"
-		emake || die "make enigmail failed"
-	fi
-}
-
-src_install() {
-	# Install, don't create tarball
-	dodir /usr/$(get_libdir)
-	cd ${S}/xpinstall/packager
-	einfo "Installing mozilla into build root..."
-	make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die "make failed"
-	mv -f ${S}/dist/mozilla ${D}/usr/$(get_libdir)/mozilla
-
-	einfo "Installing includes and idl files..."
-	# Copy the include and idl files
-	dodir /usr/$(get_libdir)/mozilla/include/idl /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}/usr/$(get_libdir)/mozilla/include
-	cp -LfR idl/* ${D}/usr/$(get_libdir)/mozilla/include/idl
-	dosym /usr/$(get_libdir)/mozilla/include /usr/include/mozilla
-
-	# Install the development tools in /usr
-	dodir /usr/bin
-	mv ${D}/usr/$(get_libdir)/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin
-
-	# Install the NSS/SSL libs, headers and tools
-	if use ssl; then
-		einfo "Installing Mozilla NSS..."
-		# Install the headers ('make install' do not work for headers ...)
-		insinto /usr/$(get_libdir)/mozilla/include/nss
-		[ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
-		[ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
-		[ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
-		# These come with zlib ...
-		rm -f ${D}/usr/$(get_libdir)/mozilla/include/nss/{zconf.h,zlib.h}
-
-		cd ${S}/security/nss
-
-		mkdir -p ${WORKDIR}/nss/{bin,lib}
-		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
-		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
-
-		make install || die "make failed"
-		# Gets installed as symbolic links ...
-		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
-		cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/$(get_libdir)/mozilla
-
-		# Need to unset these incase we want to rebuild, else the build
-		# gets newked.
-		unset SOURCE_LIB_DIR
-		unset SOURCE_BIN_DIR
-	fi
-
-	cd ${S}/build/unix
-	# Fix mozilla-config and install it
-	perl -pi -e "s:/lib/mozilla-${MY_PV}::g" mozilla-config
-	perl -pi -e "s:/mozilla-${MY_PV}::g" mozilla-config
-	exeinto /usr/$(get_libdir)/mozilla
-	doexe mozilla-config
-	# Fix pkgconfig files and install them
-	insinto /usr/$(get_libdir)/pkgconfig
-	for x in *.pc; do
-		if [[ -f ${x} ]]; then
-			perl -pi -e "s:/lib/mozilla-${MY_PV}::g" ${x}
-			perl -pi -e "s:/mozilla-${MY_PV}::g" ${x}
-			doins ${x}
-		fi
-	done
-	cd ${S}
-
-	dodir /usr/bin
-	cat <<EOF >${D}/usr/bin/mozilla
-#!/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=mozilla
-exec /usr/libexec/mozilla-launcher "\$@"
-EOF
-	chmod 0755 ${D}/usr/bin/mozilla
-	insinto /etc/env.d
-	doins ${FILESDIR}/10mozilla
-	dodoc LEGAL LICENSE README/mozilla/README*
-
-	# Install rebuild script
-	exeinto /usr/$(get_libdir)/mozilla/
-	doexe ${FILESDIR}/mozilla-rebuild-databases.pl
-
-	# Move plugins dir
-	src_mv_plugins /usr/$(get_libdir)/mozilla/plugins
-
-	# Update Google search plugin to use UTF8 charset ...
-	insinto /usr/$(get_libdir)/mozilla/searchplugins
-	doins ${FILESDIR}/google.src
-
-	if [[ -f "${WORKDIR}/.xft" ]]; then
-		# We are using Xft, so change the default font
-		insinto /usr/$(get_libdir)/mozilla/defaults/pref
-		doins ${FILESDIR}/xft.js
-	fi
-
-	# Fix icons to look the same everywhere
-	insinto /usr/$(get_libdir)/mozilla/icons
-	doins ${S}/widget/src/gtk/mozicon16.xpm
-	doins ${S}/widget/src/gtk/mozicon50.xpm
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/mozilla-icon.png
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozilla.desktop
-
-	# Take care of non root execution
-	# (seems the problem is that not all files are readible by the user)
-	einfo "Fixing Permissions..."
-	chmod -R g+r,o+r ${D}/usr/$(get_libdir)/mozilla
-	find ${D}/usr/$(get_libdir)/mozilla/ -type d -exec chmod 0755 {} \; || :
-}
-
-pkg_preinst() {
-	# Move old plugins dir
-	pkg_mv_plugins /usr/$(get_libdir)/mozilla/plugins
-
-	if true; then
-		# Remove entire installed instance to solve various problems,
-		# for example see bug 27719
-		rm -rf ${ROOT}/usr/$(get_libdir)/mozilla
-	else
-		# Stale components and chrome files break when unmerging old
-		rm -rf ${ROOT}/usr/$(get_libdir)/mozilla/components
-		rm -rf ${ROOT}/usr/$(get_libdir)/mozilla/chrome
-
-		# Remove stale component registry.
-		rm -f ${ROOT}/usr/$(get_libdir)/mozilla/component.reg
-		rm -f ${ROOT}/usr/$(get_libdir)/mozilla/components/compreg.dat
-
-		# Make sure these are removed.
-		rm -f ${ROOT}/usr/$(get_libdir)/mozilla/lib{Xft,Xrender}.so*
-	fi
-}
-
-pkg_postinst() {
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/mozilla"
-
-	# 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..."
-	${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
-
-	# 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 {} \;
-
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	# Regenerate component.reg in case some things changed
-	if [[ -e ${ROOT}/usr/$(get_libdir)/mozilla/regxpcom ]]; then
-		export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/mozilla"
-
-		if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl ]]; then
-			${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
-			# Fix directory permissions
-			find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 755 {} \;
-			# Fix permissions on chrome files
-			find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \;
-		fi
-	fi
-
-	update_mozilla_launcher_symlinks
-}
diff --git a/www-client/mozilla/mozilla-1.7.8-r1.ebuild b/www-client/mozilla/mozilla-1.7.8-r1.ebuild
deleted file mode 100644
index 6986f090578c..000000000000
--- a/www-client/mozilla/mozilla-1.7.8-r1.ebuild
+++ /dev/null
@@ -1,392 +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/mozilla-1.7.8-r1.ebuild,v 1.10 2005/07/11 21:52:02 agriffis Exp $
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils nsplugins mozilla-launcher mozconfig makeedit multilib
-
-IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg mozxmlterm postgres ssl"
-
-EMVER="0.91.0"
-IPCVER="1.1.3"
-
-# handle _rc versions
-MY_PV=${PV/_alpha/a} 	# handle alpha
-MY_PV=${MY_PV/_beta/b}	# handle beta
-MY_PV=${MY_PV/_rc/rc}	# handle rc
-
-DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
-HOMEPAGE="http://www.mozilla.org"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/source/${PN}-${MY_PV}-source.tar.bz2
-	crypt? ( !moznomail? (
-		http://www.mozilla-enigmail.org/downloads/src/ipc-${IPCVER}.tar.gz
-		http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz
-	) )"
-
-KEYWORDS="-alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-
-# 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 )
-	mozsvg? (
-		>=x11-base/xorg-x11-6.7.0-r2
-		x11-libs/cairo
-	)
-	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
-	>=www-client/mozilla-launcher-1.28"
-
-DEPEND="${RDEPEND}
-	~sys-devel/autoconf-2.13
-	java? ( >=dev-java/java-config-0.2.0 )
-	dev-lang/perl
-	postgres? ( >=dev-db/postgresql-7.2.0 )"
-
-S="${WORKDIR}/mozilla"
-
-src_unpack() {
-	typeset x
-
-	unpack ${A} || die "unpack failed"
-	cd ${S} || die "cd failed"
-
-	if [[ $(gcc-major-version) -eq 3 ]]; then
-		# ABI Patch for alpha/xpcom for gcc-3.x
-		if [[ ${ARCH} == alpha ]]; then
-			epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
-		fi
-	fi
-
-	# Fix stack growth logic
-	epatch ${FILESDIR}/${PN}-stackgrowth.patch
-
-	# Fix logic error when using RAW target
-	# <azarah@gentoo.org> (23 Feb 2003)
-	epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.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-1.7.3-4ft2.patch
-
-	# Patch to allow compilation on ppc64 - bug #54843
-	use ppc64 && epatch ${FILESDIR}/mozilla-1.7.6-ppc64.patch
-
-	# Patch for newer versions of cairo ( bug #80301)
-	if has_version '>=x11-libs/cairo-0.3.0'; then
-		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
-	fi
-
-	# Fix building with gcc4
-	epatch ${FILESDIR}/${PN}-1.7.6-gcc4.patch
-
-	# Fix building on amd64 with gcc4 (patch from Debian)
-	epatch ${FILESDIR}/${P}-amd64.patch
-
-	# Mozilla Bug 292257, https://bugzilla.mozilla.org/show_bug.cgi?id=292257
-	# Mozilla crashes under some rare cases when plugin.default_plugin_disabled
-	# is true. This patch fixes that. Backported by hansmi@gentoo.org.
-	epatch ${FILESDIR}/${P}-objectframefix.diff
-
-	# Fix scripts that call for /usr/local/bin/perl #51916
-	ebegin "Patching smime to call perl from /usr/bin"
-	sed -i -e '1s,usr/local/bin,usr/bin,' security/nss/cmd/smimetools/smime
-	eend || die "sed failed"
-
-	WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
-
-	# Unpack the enigmail plugin
-	if use crypt && ! use moznomail; then
-		for x in ipc enigmail; do
-			mv ${WORKDIR}/${x} ${S}/extensions || die "mv failed"
-			cd ${S}/extensions/${x} || die "cd failed"
-			makemake	# from mozilla.eclass
-		done
-	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 moz-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_extension !moznoirc irc
-	mozconfig_use_extension mozxmlterm xmlterm
-	mozconfig_use_extension postgres sql
-	mozconfig_use_enable mozcalendar calendar
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_use_enable mozsvg svg
-	mozconfig_use_enable mozsvg svg-renderer-cairo
-	mozconfig_annotate '' --prefix=/usr/$(get_libdir)/mozilla
-	mozconfig_annotate '' --with-default-mozilla-five-home=/usr/$(get_libdir)/mozilla
-
-	if use moznomail && ! use mozcalendar; then
-		mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
-	fi
-	if use moznocompose && use moznomail; then
-		mozconfig_annotate "+moznocompose +moznomail" --disable-composer
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if use postgres ; then
-		export MOZ_ENABLE_PGSQL=1
-		export MOZ_PGSQL_INCLUDES=/usr/include
-		export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
-	fi
-
-	####################################
-	#
-	#  Configure and build Mozilla
-	#
-	####################################
-
-	# ./configure picks up the mozconfig stuff
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	./configure || die "configure failed"
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake || die "emake failed"
-
-	####################################
-	#
-	#  Build Mozilla NSS
-	#
-	####################################
-
-	# Build the NSS/SSL support
-	if use ssl; then
-		einfo "Building Mozilla NSS..."
-
-		# Fix #include problem
-		cd ${S}/security/coreconf || die "cd coreconf failed"
-		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
-			>>headers.mk
-		emake -j1 || die "make security headers failed"
-
-		cd ${S}/security/nss || die "cd nss failed"
-		emake -j1 moz_import || die "make moz_import failed"
-		emake -j1 || die "make nss failed"
-	fi
-
-	####################################
-	#
-	#  Build Enigmail plugin
-	#
-	####################################
-
-	# Build the enigmail plugin
-	if use crypt && ! use moznomail; then
-		einfo "Building Enigmail plugin..."
-		cd ${S}/extensions/ipc || die "cd ipc failed"
-		emake || die "make ipc failed"
-
-		cd ${S}/extensions/enigmail || die "cd enigmail failed"
-		emake || die "make enigmail failed"
-	fi
-}
-
-src_install() {
-	# Install, don't create tarball
-	dodir /usr/$(get_libdir)
-	cd ${S}/xpinstall/packager
-	einfo "Installing mozilla into build root..."
-	make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die "make failed"
-	mv -f ${S}/dist/mozilla ${D}/usr/$(get_libdir)/mozilla
-
-	einfo "Installing includes and idl files..."
-	# Copy the include and idl files
-	dodir /usr/$(get_libdir)/mozilla/include/idl /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}/usr/$(get_libdir)/mozilla/include
-	cp -LfR idl/* ${D}/usr/$(get_libdir)/mozilla/include/idl
-	dosym /usr/$(get_libdir)/mozilla/include /usr/include/mozilla
-
-	# Install the development tools in /usr
-	dodir /usr/bin
-	mv ${D}/usr/$(get_libdir)/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin
-
-	# Install the NSS/SSL libs, headers and tools
-	if use ssl; then
-		einfo "Installing Mozilla NSS..."
-		# Install the headers ('make install' do not work for headers ...)
-		insinto /usr/$(get_libdir)/mozilla/include/nss
-		[ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
-		[ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
-		[ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
-		# These come with zlib ...
-		rm -f ${D}/usr/$(get_libdir)/mozilla/include/nss/{zconf.h,zlib.h}
-
-		cd ${S}/security/nss
-
-		mkdir -p ${WORKDIR}/nss/{bin,lib}
-		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
-		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
-
-		make install || die "make failed"
-		# Gets installed as symbolic links ...
-		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
-		cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/$(get_libdir)/mozilla
-
-		# Need to unset these incase we want to rebuild, else the build
-		# gets newked.
-		unset SOURCE_LIB_DIR
-		unset SOURCE_BIN_DIR
-	fi
-
-	cd ${S}/build/unix
-	# Fix mozilla-config and install it
-	perl -pi -e "s:/lib/mozilla-${MY_PV}::g" mozilla-config
-	perl -pi -e "s:/mozilla-${MY_PV}::g" mozilla-config
-	exeinto /usr/$(get_libdir)/mozilla
-	doexe mozilla-config
-	# Fix pkgconfig files and install them
-	insinto /usr/$(get_libdir)/pkgconfig
-	for x in *.pc; do
-		if [[ -f ${x} ]]; then
-			perl -pi -e "s:/lib/mozilla-${MY_PV}::g" ${x}
-			perl -pi -e "s:/mozilla-${MY_PV}::g" ${x}
-			doins ${x}
-		fi
-	done
-	cd ${S}
-
-	dodir /usr/bin
-	cat <<EOF >${D}/usr/bin/mozilla
-#!/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=mozilla
-exec /usr/libexec/mozilla-launcher "\$@"
-EOF
-	chmod 0755 ${D}/usr/bin/mozilla
-	insinto /etc/env.d
-	doins ${FILESDIR}/10mozilla
-	dodoc LEGAL LICENSE README/mozilla/README*
-
-	# Set correct libdir in env.d file
-	dosed "s:/usr/lib:/usr/$(get_libdir):" /etc/env.d/10mozilla
-
-	# Install rebuild script
-	exeinto /usr/$(get_libdir)/mozilla/
-	doexe ${FILESDIR}/mozilla-rebuild-databases.pl
-
-	# Move plugins dir
-	src_mv_plugins /usr/$(get_libdir)/mozilla/plugins
-
-	# Update Google search plugin to use UTF8 charset ...
-	insinto /usr/$(get_libdir)/mozilla/searchplugins
-	doins ${FILESDIR}/google.src
-
-	if [[ -f "${WORKDIR}/.xft" ]]; then
-		# We are using Xft, so change the default font
-		insinto /usr/$(get_libdir)/mozilla/defaults/pref
-		doins ${FILESDIR}/xft.js
-	fi
-
-	# Fix icons to look the same everywhere
-	insinto /usr/$(get_libdir)/mozilla/icons
-	doins ${S}/widget/src/gtk/mozicon16.xpm
-	doins ${S}/widget/src/gtk/mozicon50.xpm
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/mozilla-icon.png
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozilla.desktop
-
-	# Take care of non root execution
-	# (seems the problem is that not all files are readible by the user)
-	einfo "Fixing Permissions..."
-	chmod -R g+r,o+r ${D}/usr/$(get_libdir)/mozilla
-	find ${D}/usr/$(get_libdir)/mozilla/ -type d -exec chmod 0755 {} \; || :
-}
-
-pkg_preinst() {
-	# Move old plugins dir
-	pkg_mv_plugins /usr/$(get_libdir)/mozilla/plugins
-
-	if true; then
-		# Remove entire installed instance to solve various problems,
-		# for example see bug 27719
-		rm -rf ${ROOT}/usr/$(get_libdir)/mozilla
-	else
-		# Stale components and chrome files break when unmerging old
-		rm -rf ${ROOT}/usr/$(get_libdir)/mozilla/components
-		rm -rf ${ROOT}/usr/$(get_libdir)/mozilla/chrome
-
-		# Remove stale component registry.
-		rm -f ${ROOT}/usr/$(get_libdir)/mozilla/component.reg
-		rm -f ${ROOT}/usr/$(get_libdir)/mozilla/components/compreg.dat
-
-		# Make sure these are removed.
-		rm -f ${ROOT}/usr/$(get_libdir)/mozilla/lib{Xft,Xrender}.so*
-	fi
-}
-
-pkg_postinst() {
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/mozilla"
-
-	# 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..."
-	${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
-
-	# 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 {} \;
-
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	# Regenerate component.reg in case some things changed
-	if [[ -e ${ROOT}/usr/$(get_libdir)/mozilla/regxpcom ]]; then
-		export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/mozilla"
-
-		if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl ]]; then
-			${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
-			# Fix directory permissions
-			find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 755 {} \;
-			# Fix permissions on chrome files
-			find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \;
-		fi
-	fi
-
-	update_mozilla_launcher_symlinks
-}
diff --git a/www-client/mozilla/mozilla-1.7.8-r2.ebuild b/www-client/mozilla/mozilla-1.7.8-r2.ebuild
deleted file mode 100644
index 1a6ad55074e4..000000000000
--- a/www-client/mozilla/mozilla-1.7.8-r2.ebuild
+++ /dev/null
@@ -1,396 +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/mozilla-1.7.8-r2.ebuild,v 1.1 2005/07/11 21:52:02 agriffis Exp $
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils nsplugins mozilla-launcher mozconfig makeedit multilib
-
-IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg mozxmlterm postgres ssl"
-
-EMVER="0.91.0"
-IPCVER="1.1.3"
-
-# handle _rc versions
-MY_PV=${PV/_alpha/a} 	# handle alpha
-MY_PV=${MY_PV/_beta/b}	# handle beta
-MY_PV=${MY_PV/_rc/rc}	# handle rc
-
-DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
-HOMEPAGE="http://www.mozilla.org"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/source/${PN}-${MY_PV}-source.tar.bz2
-	crypt? ( !moznomail? (
-		http://www.mozilla-enigmail.org/downloads/src/ipc-${IPCVER}.tar.gz
-		http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz
-	) )
-	mirror://gentoo/mozilla-jslibmath-alpha.patch"
-
-KEYWORDS="~alpha"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-
-# 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 )
-	mozsvg? (
-		>=x11-base/xorg-x11-6.7.0-r2
-		x11-libs/cairo
-	)
-	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
-	>=www-client/mozilla-launcher-1.28"
-
-DEPEND="${RDEPEND}
-	~sys-devel/autoconf-2.13
-	java? ( >=dev-java/java-config-0.2.0 )
-	dev-lang/perl
-	postgres? ( >=dev-db/postgresql-7.2.0 )"
-
-S="${WORKDIR}/mozilla"
-
-src_unpack() {
-	typeset x
-
-	unpack ${A} || die "unpack failed"
-	cd ${S} || die "cd failed"
-
-	if [[ $(gcc-major-version) -eq 3 ]]; then
-		# ABI Patch for alpha/xpcom for gcc-3.x
-		if [[ ${ARCH} == alpha ]]; then
-			epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
-		fi
-	fi
-
-	# Fix stack growth logic
-	epatch ${FILESDIR}/${PN}-stackgrowth.patch
-
-	# Fix logic error when using RAW target
-	# <azarah@gentoo.org> (23 Feb 2003)
-	epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.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-1.7.3-4ft2.patch
-
-	# Patch to allow compilation on ppc64 - bug #54843
-	use ppc64 && epatch ${FILESDIR}/mozilla-1.7.6-ppc64.patch
-
-	# Patch for newer versions of cairo ( bug #80301)
-	if has_version '>=x11-libs/cairo-0.3.0'; then
-		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
-	fi
-
-	# Fix building with gcc4
-	epatch ${FILESDIR}/${PN}-1.7.6-gcc4.patch
-
-	# Fix building on amd64 with gcc4 (patch from Debian)
-	epatch ${FILESDIR}/${P}-amd64.patch
-
-	# Mozilla Bug 292257, https://bugzilla.mozilla.org/show_bug.cgi?id=292257
-	# Mozilla crashes under some rare cases when plugin.default_plugin_disabled
-	# is true. This patch fixes that. Backported by hansmi@gentoo.org.
-	epatch ${FILESDIR}/${P}-objectframefix.diff
-
-	# Fix math functions on alpha so that maps.google.com works correctly
-	epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
-
-	# Fix scripts that call for /usr/local/bin/perl #51916
-	ebegin "Patching smime to call perl from /usr/bin"
-	sed -i -e '1s,usr/local/bin,usr/bin,' security/nss/cmd/smimetools/smime
-	eend || die "sed failed"
-
-	WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
-
-	# Unpack the enigmail plugin
-	if use crypt && ! use moznomail; then
-		for x in ipc enigmail; do
-			mv ${WORKDIR}/${x} ${S}/extensions || die "mv failed"
-			cd ${S}/extensions/${x} || die "cd failed"
-			makemake	# from mozilla.eclass
-		done
-	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 moz-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_extension !moznoirc irc
-	mozconfig_use_extension mozxmlterm xmlterm
-	mozconfig_use_extension postgres sql
-	mozconfig_use_enable mozcalendar calendar
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_use_enable mozsvg svg
-	mozconfig_use_enable mozsvg svg-renderer-cairo
-	mozconfig_annotate '' --prefix=/usr/$(get_libdir)/mozilla
-	mozconfig_annotate '' --with-default-mozilla-five-home=/usr/$(get_libdir)/mozilla
-
-	if use moznomail && ! use mozcalendar; then
-		mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
-	fi
-	if use moznocompose && use moznomail; then
-		mozconfig_annotate "+moznocompose +moznomail" --disable-composer
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if use postgres ; then
-		export MOZ_ENABLE_PGSQL=1
-		export MOZ_PGSQL_INCLUDES=/usr/include
-		export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
-	fi
-
-	####################################
-	#
-	#  Configure and build Mozilla
-	#
-	####################################
-
-	# ./configure picks up the mozconfig stuff
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	./configure || die "configure failed"
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake || die "emake failed"
-
-	####################################
-	#
-	#  Build Mozilla NSS
-	#
-	####################################
-
-	# Build the NSS/SSL support
-	if use ssl; then
-		einfo "Building Mozilla NSS..."
-
-		# Fix #include problem
-		cd ${S}/security/coreconf || die "cd coreconf failed"
-		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
-			>>headers.mk
-		emake -j1 || die "make security headers failed"
-
-		cd ${S}/security/nss || die "cd nss failed"
-		emake -j1 moz_import || die "make moz_import failed"
-		emake -j1 || die "make nss failed"
-	fi
-
-	####################################
-	#
-	#  Build Enigmail plugin
-	#
-	####################################
-
-	# Build the enigmail plugin
-	if use crypt && ! use moznomail; then
-		einfo "Building Enigmail plugin..."
-		cd ${S}/extensions/ipc || die "cd ipc failed"
-		emake || die "make ipc failed"
-
-		cd ${S}/extensions/enigmail || die "cd enigmail failed"
-		emake || die "make enigmail failed"
-	fi
-}
-
-src_install() {
-	# Install, don't create tarball
-	dodir /usr/$(get_libdir)
-	cd ${S}/xpinstall/packager
-	einfo "Installing mozilla into build root..."
-	make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die "make failed"
-	mv -f ${S}/dist/mozilla ${D}/usr/$(get_libdir)/mozilla
-
-	einfo "Installing includes and idl files..."
-	# Copy the include and idl files
-	dodir /usr/$(get_libdir)/mozilla/include/idl /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}/usr/$(get_libdir)/mozilla/include
-	cp -LfR idl/* ${D}/usr/$(get_libdir)/mozilla/include/idl
-	dosym /usr/$(get_libdir)/mozilla/include /usr/include/mozilla
-
-	# Install the development tools in /usr
-	dodir /usr/bin
-	mv ${D}/usr/$(get_libdir)/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin
-
-	# Install the NSS/SSL libs, headers and tools
-	if use ssl; then
-		einfo "Installing Mozilla NSS..."
-		# Install the headers ('make install' do not work for headers ...)
-		insinto /usr/$(get_libdir)/mozilla/include/nss
-		[ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
-		[ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
-		[ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
-		# These come with zlib ...
-		rm -f ${D}/usr/$(get_libdir)/mozilla/include/nss/{zconf.h,zlib.h}
-
-		cd ${S}/security/nss
-
-		mkdir -p ${WORKDIR}/nss/{bin,lib}
-		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
-		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
-
-		make install || die "make failed"
-		# Gets installed as symbolic links ...
-		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
-		cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/$(get_libdir)/mozilla
-
-		# Need to unset these incase we want to rebuild, else the build
-		# gets newked.
-		unset SOURCE_LIB_DIR
-		unset SOURCE_BIN_DIR
-	fi
-
-	cd ${S}/build/unix
-	# Fix mozilla-config and install it
-	perl -pi -e "s:/lib/mozilla-${MY_PV}::g" mozilla-config
-	perl -pi -e "s:/mozilla-${MY_PV}::g" mozilla-config
-	exeinto /usr/$(get_libdir)/mozilla
-	doexe mozilla-config
-	# Fix pkgconfig files and install them
-	insinto /usr/$(get_libdir)/pkgconfig
-	for x in *.pc; do
-		if [[ -f ${x} ]]; then
-			perl -pi -e "s:/lib/mozilla-${MY_PV}::g" ${x}
-			perl -pi -e "s:/mozilla-${MY_PV}::g" ${x}
-			doins ${x}
-		fi
-	done
-	cd ${S}
-
-	dodir /usr/bin
-	cat <<EOF >${D}/usr/bin/mozilla
-#!/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=mozilla
-exec /usr/libexec/mozilla-launcher "\$@"
-EOF
-	chmod 0755 ${D}/usr/bin/mozilla
-	insinto /etc/env.d
-	doins ${FILESDIR}/10mozilla
-	dodoc LEGAL LICENSE README/mozilla/README*
-
-	# Set correct libdir in env.d file
-	dosed "s:/usr/lib:/usr/$(get_libdir):" /etc/env.d/10mozilla
-
-	# Install rebuild script
-	exeinto /usr/$(get_libdir)/mozilla/
-	doexe ${FILESDIR}/mozilla-rebuild-databases.pl
-
-	# Move plugins dir
-	src_mv_plugins /usr/$(get_libdir)/mozilla/plugins
-
-	# Update Google search plugin to use UTF8 charset ...
-	insinto /usr/$(get_libdir)/mozilla/searchplugins
-	doins ${FILESDIR}/google.src
-
-	if [[ -f "${WORKDIR}/.xft" ]]; then
-		# We are using Xft, so change the default font
-		insinto /usr/$(get_libdir)/mozilla/defaults/pref
-		doins ${FILESDIR}/xft.js
-	fi
-
-	# Fix icons to look the same everywhere
-	insinto /usr/$(get_libdir)/mozilla/icons
-	doins ${S}/widget/src/gtk/mozicon16.xpm
-	doins ${S}/widget/src/gtk/mozicon50.xpm
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/mozilla-icon.png
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozilla.desktop
-
-	# Take care of non root execution
-	# (seems the problem is that not all files are readible by the user)
-	einfo "Fixing Permissions..."
-	chmod -R g+r,o+r ${D}/usr/$(get_libdir)/mozilla
-	find ${D}/usr/$(get_libdir)/mozilla/ -type d -exec chmod 0755 {} \; || :
-}
-
-pkg_preinst() {
-	# Move old plugins dir
-	pkg_mv_plugins /usr/$(get_libdir)/mozilla/plugins
-
-	if true; then
-		# Remove entire installed instance to solve various problems,
-		# for example see bug 27719
-		rm -rf ${ROOT}/usr/$(get_libdir)/mozilla
-	else
-		# Stale components and chrome files break when unmerging old
-		rm -rf ${ROOT}/usr/$(get_libdir)/mozilla/components
-		rm -rf ${ROOT}/usr/$(get_libdir)/mozilla/chrome
-
-		# Remove stale component registry.
-		rm -f ${ROOT}/usr/$(get_libdir)/mozilla/component.reg
-		rm -f ${ROOT}/usr/$(get_libdir)/mozilla/components/compreg.dat
-
-		# Make sure these are removed.
-		rm -f ${ROOT}/usr/$(get_libdir)/mozilla/lib{Xft,Xrender}.so*
-	fi
-}
-
-pkg_postinst() {
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/mozilla"
-
-	# 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..."
-	${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
-
-	# 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 {} \;
-
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	# Regenerate component.reg in case some things changed
-	if [[ -e ${ROOT}/usr/$(get_libdir)/mozilla/regxpcom ]]; then
-		export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/mozilla"
-
-		if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl ]]; then
-			${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
-			# Fix directory permissions
-			find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 755 {} \;
-			# Fix permissions on chrome files
-			find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \;
-		fi
-	fi
-
-	update_mozilla_launcher_symlinks
-}
diff --git a/www-client/mozilla/mozilla-1.7.8.ebuild b/www-client/mozilla/mozilla-1.7.8.ebuild
deleted file mode 100644
index 1029a49992f0..000000000000
--- a/www-client/mozilla/mozilla-1.7.8.ebuild
+++ /dev/null
@@ -1,381 +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/mozilla-1.7.8.ebuild,v 1.14 2005/07/09 14:05:24 agriffis Exp $
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils nsplugins mozilla-launcher mozconfig makeedit multilib
-
-IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg mozxmlterm postgres ssl"
-
-EMVER="0.91.0"
-IPCVER="1.1.3"
-
-# handle _rc versions
-MY_PV=${PV/_alpha/a} 	# handle alpha
-MY_PV=${MY_PV/_beta/b}	# handle beta
-MY_PV=${MY_PV/_rc/rc}	# handle rc
-
-DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
-HOMEPAGE="http://www.mozilla.org"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/source/${PN}-${MY_PV}-source.tar.bz2
-	crypt? ( !moznomail? (
-		http://www.mozilla-enigmail.org/downloads/src/ipc-${IPCVER}.tar.gz
-		http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz
-	) )"
-
-KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-
-# 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 )
-	mozsvg? (
-		>=x11-base/xorg-x11-6.7.0-r2
-		x11-libs/cairo
-	)
-	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
-	>=www-client/mozilla-launcher-1.28"
-
-DEPEND="${RDEPEND}
-	~sys-devel/autoconf-2.13
-	java? ( >=dev-java/java-config-0.2.0 )
-	dev-lang/perl
-	postgres? ( >=dev-db/postgresql-7.2.0 )"
-
-S="${WORKDIR}/mozilla"
-
-src_unpack() {
-	typeset x
-
-	unpack ${A} || die "unpack failed"
-	cd ${S} || die "cd failed"
-
-	if [[ $(gcc-major-version) -eq 3 ]]; then
-		# ABI Patch for alpha/xpcom for gcc-3.x
-		if [[ ${ARCH} == alpha ]]; then
-			epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
-		fi
-	fi
-
-	# Fix stack growth logic
-	epatch ${FILESDIR}/${PN}-stackgrowth.patch
-
-	# Fix logic error when using RAW target
-	# <azarah@gentoo.org> (23 Feb 2003)
-	epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.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-1.7.3-4ft2.patch
-
-	# Patch to allow compilation on ppc64 - bug #54843
-	use ppc64 && epatch ${FILESDIR}/mozilla-1.7.6-ppc64.patch
-
-	# Patch for newer versions of cairo ( bug #80301)
-	if has_version '>=x11-libs/cairo-0.3.0'; then
-		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
-	fi
-
-	# Fix building with gcc4
-	epatch ${FILESDIR}/${PN}-1.7.6-gcc4.patch
-
-	# Fix scripts that call for /usr/local/bin/perl #51916
-	ebegin "Patching smime to call perl from /usr/bin"
-	sed -i -e '1s,usr/local/bin,usr/bin,' security/nss/cmd/smimetools/smime
-	eend || die "sed failed"
-
-	WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
-
-	# Unpack the enigmail plugin
-	if use crypt && ! use moznomail; then
-		for x in ipc enigmail; do
-			mv ${WORKDIR}/${x} ${S}/extensions || die "mv failed"
-			cd ${S}/extensions/${x} || die "cd failed"
-			makemake	# from mozilla.eclass
-		done
-	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 moz-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_extension !moznoirc irc
-	mozconfig_use_extension mozxmlterm xmlterm
-	mozconfig_use_extension postgres sql
-	mozconfig_use_enable mozcalendar calendar
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_use_enable mozsvg svg
-	mozconfig_use_enable mozsvg svg-renderer-cairo
-	mozconfig_annotate '' --prefix=/usr/$(get_libdir)/mozilla
-	mozconfig_annotate '' --with-default-mozilla-five-home=/usr/$(get_libdir)/mozilla
-
-	if use moznomail && ! use mozcalendar; then
-		mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
-	fi
-	if use moznocompose && use moznomail; then
-		mozconfig_annotate "+moznocompose +moznomail" --disable-composer
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if use postgres ; then
-		export MOZ_ENABLE_PGSQL=1
-		export MOZ_PGSQL_INCLUDES=/usr/include
-		export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
-	fi
-
-	####################################
-	#
-	#  Configure and build Mozilla
-	#
-	####################################
-
-	# ./configure picks up the mozconfig stuff
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	./configure || die "configure failed"
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake || die "emake failed"
-
-	####################################
-	#
-	#  Build Mozilla NSS
-	#
-	####################################
-
-	# Build the NSS/SSL support
-	if use ssl; then
-		einfo "Building Mozilla NSS..."
-
-		# Fix #include problem
-		cd ${S}/security/coreconf || die "cd coreconf failed"
-		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
-			>>headers.mk
-		emake -j1 || die "make security headers failed"
-
-		cd ${S}/security/nss || die "cd nss failed"
-		emake -j1 moz_import || die "make moz_import failed"
-		emake -j1 || die "make nss failed"
-	fi
-
-	####################################
-	#
-	#  Build Enigmail plugin
-	#
-	####################################
-
-	# Build the enigmail plugin
-	if use crypt && ! use moznomail; then
-		einfo "Building Enigmail plugin..."
-		cd ${S}/extensions/ipc || die "cd ipc failed"
-		emake || die "make ipc failed"
-
-		cd ${S}/extensions/enigmail || die "cd enigmail failed"
-		emake || die "make enigmail failed"
-	fi
-}
-
-src_install() {
-	# Install, don't create tarball
-	dodir /usr/$(get_libdir)
-	cd ${S}/xpinstall/packager
-	einfo "Installing mozilla into build root..."
-	make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die "make failed"
-	mv -f ${S}/dist/mozilla ${D}/usr/$(get_libdir)/mozilla
-
-	einfo "Installing includes and idl files..."
-	# Copy the include and idl files
-	dodir /usr/$(get_libdir)/mozilla/include/idl /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}/usr/$(get_libdir)/mozilla/include
-	cp -LfR idl/* ${D}/usr/$(get_libdir)/mozilla/include/idl
-	dosym /usr/$(get_libdir)/mozilla/include /usr/include/mozilla
-
-	# Install the development tools in /usr
-	dodir /usr/bin
-	mv ${D}/usr/$(get_libdir)/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin
-
-	# Install the NSS/SSL libs, headers and tools
-	if use ssl; then
-		einfo "Installing Mozilla NSS..."
-		# Install the headers ('make install' do not work for headers ...)
-		insinto /usr/$(get_libdir)/mozilla/include/nss
-		[ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
-		[ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
-		[ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
-		# These come with zlib ...
-		rm -f ${D}/usr/$(get_libdir)/mozilla/include/nss/{zconf.h,zlib.h}
-
-		cd ${S}/security/nss
-
-		mkdir -p ${WORKDIR}/nss/{bin,lib}
-		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
-		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
-
-		make install || die "make failed"
-		# Gets installed as symbolic links ...
-		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
-		cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/$(get_libdir)/mozilla
-
-		# Need to unset these incase we want to rebuild, else the build
-		# gets newked.
-		unset SOURCE_LIB_DIR
-		unset SOURCE_BIN_DIR
-	fi
-
-	cd ${S}/build/unix
-	# Fix mozilla-config and install it
-	perl -pi -e "s:/lib/mozilla-${MY_PV}::g" mozilla-config
-	perl -pi -e "s:/mozilla-${MY_PV}::g" mozilla-config
-	exeinto /usr/$(get_libdir)/mozilla
-	doexe mozilla-config
-	# Fix pkgconfig files and install them
-	insinto /usr/$(get_libdir)/pkgconfig
-	for x in *.pc; do
-		if [[ -f ${x} ]]; then
-			perl -pi -e "s:/lib/mozilla-${MY_PV}::g" ${x}
-			perl -pi -e "s:/mozilla-${MY_PV}::g" ${x}
-			doins ${x}
-		fi
-	done
-	cd ${S}
-
-	dodir /usr/bin
-	cat <<EOF >${D}/usr/bin/mozilla
-#!/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=mozilla
-exec /usr/libexec/mozilla-launcher "\$@"
-EOF
-	chmod 0755 ${D}/usr/bin/mozilla
-	insinto /etc/env.d
-	doins ${FILESDIR}/10mozilla
-	dodoc LEGAL LICENSE README/mozilla/README*
-
-	# Install rebuild script
-	exeinto /usr/$(get_libdir)/mozilla/
-	doexe ${FILESDIR}/mozilla-rebuild-databases.pl
-
-	# Move plugins dir
-	src_mv_plugins /usr/$(get_libdir)/mozilla/plugins
-
-	# Update Google search plugin to use UTF8 charset ...
-	insinto /usr/$(get_libdir)/mozilla/searchplugins
-	doins ${FILESDIR}/google.src
-
-	if [[ -f "${WORKDIR}/.xft" ]]; then
-		# We are using Xft, so change the default font
-		insinto /usr/$(get_libdir)/mozilla/defaults/pref
-		doins ${FILESDIR}/xft.js
-	fi
-
-	# Fix icons to look the same everywhere
-	insinto /usr/$(get_libdir)/mozilla/icons
-	doins ${S}/widget/src/gtk/mozicon16.xpm
-	doins ${S}/widget/src/gtk/mozicon50.xpm
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/mozilla-icon.png
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozilla.desktop
-
-	# Take care of non root execution
-	# (seems the problem is that not all files are readible by the user)
-	einfo "Fixing Permissions..."
-	chmod -R g+r,o+r ${D}/usr/$(get_libdir)/mozilla
-	find ${D}/usr/$(get_libdir)/mozilla/ -type d -exec chmod 0755 {} \; || :
-}
-
-pkg_preinst() {
-	# Move old plugins dir
-	pkg_mv_plugins /usr/$(get_libdir)/mozilla/plugins
-
-	if true; then
-		# Remove entire installed instance to solve various problems,
-		# for example see bug 27719
-		rm -rf ${ROOT}/usr/$(get_libdir)/mozilla
-	else
-		# Stale components and chrome files break when unmerging old
-		rm -rf ${ROOT}/usr/$(get_libdir)/mozilla/components
-		rm -rf ${ROOT}/usr/$(get_libdir)/mozilla/chrome
-
-		# Remove stale component registry.
-		rm -f ${ROOT}/usr/$(get_libdir)/mozilla/component.reg
-		rm -f ${ROOT}/usr/$(get_libdir)/mozilla/components/compreg.dat
-
-		# Make sure these are removed.
-		rm -f ${ROOT}/usr/$(get_libdir)/mozilla/lib{Xft,Xrender}.so*
-	fi
-}
-
-pkg_postinst() {
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/mozilla"
-
-	# 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..."
-	${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
-
-	# 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 {} \;
-
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	# Regenerate component.reg in case some things changed
-	if [[ -e ${ROOT}/usr/$(get_libdir)/mozilla/regxpcom ]]; then
-		export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/mozilla"
-
-		if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl ]]; then
-			${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
-			# Fix directory permissions
-			find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 755 {} \;
-			# Fix permissions on chrome files
-			find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \;
-		fi
-	fi
-
-	update_mozilla_launcher_symlinks
-}