Remove beta ebuilds

5 files changed, 12 insertions, 1249 deletions

diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest
index 1463b9477bd5..c44c9e2d0525 100644
--- a/net-www/mozilla/Manifest
+++ b/net-www/mozilla/Manifest
@@ -1,34 +1,30 @@
-MD5 0b23015c76a780ee77d3a572f1db3db1 ChangeLog 24188
-MD5 3d428c2cf97c36c769ff7ac419996aa5 mozilla-1.3-r2.ebuild 16750
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+MD5 3d428c2cf97c36c769ff7ac419996aa5 mozilla-1.3-r2.ebuild 16750
 MD5 b8036fc580046725c243d8faf9753808 mozilla-1.4-r3.ebuild 16729
 MD5 ae6f8c3a96767d491dd65c111d6340cc mozilla-1.4-r4.ebuild 17265
-MD5 6e8e847d464feea0e901b10f7e321099 mozilla-1.5.ebuild 16429
 MD5 f24b7db89d2f74e9065e1bf4dd9061c4 mozilla-1.4.1.ebuild 17256
+MD5 6e8e847d464feea0e901b10f7e321099 mozilla-1.5.ebuild 16429
 MD5 5951b4c18da9ca8897c754f68be9a730 mozilla-1.5-r1.ebuild 16994
-MD5 7fe806389125ee602eb44f055ae9e7e6 mozilla-1.6_alpha.ebuild 16921
-MD5 4920d1cb06f4d1deaf383b580f0ba643 mozilla-1.6_beta.ebuild 16867
+MD5 0b23015c76a780ee77d3a572f1db3db1 ChangeLog 24188
 MD5 6d07c2a10f865bd50920a2fef199bfa0 mozilla-1.6.ebuild 16862
 MD5 2245cc4f37902e2c6dd188f72874fbb3 files/10mozilla 60
+MD5 3cbe151665ba43403e657607949244e8 files/digest-mozilla-1.3-r2 201
+MD5 965c8430aca20b99db6430555624b4d2 files/digest-mozilla-1.4-r3 201
+MD5 3fc638d05bf40a6d7a5d3296ee2a0449 files/digest-mozilla-1.4-r4 201
+MD5 28cbb765c235caf88a998f8a413d29f3 files/digest-mozilla-1.4.1 196
+MD5 14ab5596f8ab82d99af369a72d6c7d6e files/digest-mozilla-1.5 201
+MD5 75e7de2ef297a2260862175d3289cb45 files/digest-mozilla-1.5-r1 201
+MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
 MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
 MD5 766df4cd7332bf4127847985f98e46ec files/gtk2mozilla_head_patch2 27148
 MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134
+MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-1.4-amd64.patch 35052
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
 MD5 df4a4bc60d8f5d28c801ccedfea84d70 files/mozilla-ft-bytecode.patch 629
 MD5 296fe1fa9c5b387bcd909f0a128c7a16 files/mozilla-new-freetype2.patch 720
 MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
 MD5 5b01d0425f9ef7bbe0765985e6041c6b files/mozilla.sh 6684
 MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
-MD5 3cbe151665ba43403e657607949244e8 files/digest-mozilla-1.3-r2 201
-MD5 965c8430aca20b99db6430555624b4d2 files/digest-mozilla-1.4-r3 201
-MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
-MD5 3fc638d05bf40a6d7a5d3296ee2a0449 files/digest-mozilla-1.4-r4 201
-MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-1.4-amd64.patch 35052
-MD5 14ab5596f8ab82d99af369a72d6c7d6e files/digest-mozilla-1.5 201
-MD5 28cbb765c235caf88a998f8a413d29f3 files/digest-mozilla-1.4.1 196
-MD5 75e7de2ef297a2260862175d3289cb45 files/digest-mozilla-1.5-r1 201
-MD5 8c884b095f6624cda1c74bcf98624517 files/digest-mozilla-1.6_alpha 202
-MD5 ea3f20bb1740f61f9dfa9089e8bee8ee files/digest-mozilla-1.6_beta 202
 MD5 6ed0b1c17afe079aa2c43de51078c01f files/digest-mozilla-1.6 201
 MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
 MD5 83da5242120c74b0ca6cceae9d6cf237 files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2 2838
@@ -41,8 +37,8 @@ MD5 696d4810f2ccb8f2bcb0275fa13c67b9 files/1.2/mozilla-1.2b-gtk2.patch.bz2 6091
 MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320
 MD5 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396
 MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
-MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
 MD5 1655fea18e9fc538b41d88561d6080c7 files/1.3/mozilla-1.3-fix-gtkim.patch 921
 MD5 491741624c0aee888ea4a6824b979c3c files/1.3/mozilla-1.3-gtk2.patch 17387
+MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
 MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
 MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
diff --git a/net-www/mozilla/files/digest-mozilla-1.6_alpha b/net-www/mozilla/files/digest-mozilla-1.6_alpha
deleted file mode 100644
index 9e46aa1cabbe..000000000000
--- a/net-www/mozilla/files/digest-mozilla-1.6_alpha
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0e0f050af00b9b53d4d70cbb27634747 mozilla-source-1.6a.tar.bz2 29575800
-MD5 7fff5f1f5e9757eec09fd81051c34db4 enigmail-0.82.2.tar.gz 254794
-MD5 457f8277b12f3e37defa71dc186f83b4 ipc-1.0.5.tar.gz 137083
diff --git a/net-www/mozilla/files/digest-mozilla-1.6_beta b/net-www/mozilla/files/digest-mozilla-1.6_beta
deleted file mode 100644
index e3c911c8dabd..000000000000
--- a/net-www/mozilla/files/digest-mozilla-1.6_beta
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 713c8b4660f09c035940e3d90305fb67 mozilla-source-1.6b.tar.bz2 29477111
-MD5 8ec2a2156cb5b646e9ce78dcdaab2d0a enigmail-0.82.4.tar.gz 270240
-MD5 457f8277b12f3e37defa71dc186f83b4 ipc-1.0.5.tar.gz 137083
diff --git a/net-www/mozilla/mozilla-1.6_alpha.ebuild b/net-www/mozilla/mozilla-1.6_alpha.ebuild
deleted file mode 100644
index c1e9dca03d67..000000000000
--- a/net-www/mozilla/mozilla-1.6_alpha.ebuild
+++ /dev/null
@@ -1,614 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.6_alpha.ebuild,v 1.1 2003/12/20 18:37:49 brad Exp $
-
-IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug"
-# Internal USE flags that I do not really want to advertise ...
-IUSE="${IUSE} mozcalendar mozaccess mozxmlterm"
-IUSE="${IUSE} moznoirc moznomail moznocompose moznoxft"
-
-inherit flag-o-matic gcc eutils nsplugins
-
-# Strip over-aggressive CFLAGS - Mozilla supplies its own fine-tuned CFLAGS and shouldn't be interfered with
-strip-flags
-
-# Strip flags which create more documented instability
-filter-flags "-fomit-frame-pointer"
-filter-flags -ffast-math
-append-flags -s -fforce-addr
-
-# Merged ARCH stuff into a single case statement.  But shouldn't this
-# stuff go in src_compile? (18 Nov 2003 agriffis)
-case "${ARCH}" in
-	alpha|ia64)
-		# Anything more than this causes segfaults on startup on 64-bit
-		# (bug 33767)
-		export CFLAGS="${CFLAGS//-O[1-9s]/-O} -Wall -fPIC -pipe"
-		export CXXFLAGS="${CXXFLAGS//-O[1-9s]/-O} -Wall -fPIC -pipe"
-		;;
-	amd64)
-		# Anything more than this causes segfaults on startup on amd64
-		# [Note: I think amd64 could use the same as above in the
-		# alpha/ia64 section, but I'll let the amd64 devs choose. -agriffis]
-		export CFLAGS="-O -Wall -fPIC -pipe"
-		export CXXFLAGS="${CFLAGS}"
-		;;
-	ppc)
-		# Fix to avoid gcc-3.3.x micompilation issues.
-		if [ "$(gcc-major-version).$(gcc-minor-version)" = "3.3" ]; then
-			append-flags -fno-strict-aliasing
-		fi
-		;;
-	sparc)
-		# Sparc support ...
-		replace-sparc64-flags
-		;;
-	*)
-		# We set -O in ./configure to -O1, as -O2 cause crashes on
-		# startup (bug 13287)
-		export CFLAGS="${CFLAGS//-O?}"
-		export CXXFLAGS="${CFLAGS//-O?}"
-		;;
-esac
-
-EMVER="0.82.2"
-IPCVER="1.0.5"
-
-PATCH_VER="1.0"
-
-# handle _rc versions
-MY_PV1="${PV/_}"
-MY_PV2="${MY_PV1/lpha}"
-S="${WORKDIR}/mozilla"
-DESCRIPTION="The Mozilla Web Browser"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV2}/src/${PN}-source-${MY_PV2}.tar.bz2
-	crypt? ( mirror://gentoo/enigmail-${EMVER}.tar.gz
-			 http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )"
-#	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
-HOMEPAGE="http://www.mozilla.org"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-
-RDEPEND=">=x11-base/xfree-4.2.0-r11
-	>=dev-libs/libIDL-0.8.0
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/fontconfig-2.1
-	virtual/xft
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.2.1
-	>=sys-apps/portage-2.0.14
-	dev-libs/expat
-	app-arch/zip
-	app-arch/unzip
-	( gtk2? >=x11-libs/gtk+-2.2.0 :
-	        =x11-libs/gtk+-1.2* )
-	( gtk2? >=dev-libs/glib-2.2.0 :
-	        =dev-libs/glib-1.2* )
-	gtk2?  ( >=x11-libs/pango-1.2.1 )
-	!gtk2? ( >=gnome-base/ORBit-0.5.10-r1 )
-	java?  ( virtual/jre )
-	crypt? ( >=app-crypt/gnupg-1.2.1 )"
-
-DEPEND="${RDEPEND}
-	virtual/x11
-	dev-util/pkgconfig
-	dev-lang/perl
-	java? ( >=dev-java/java-config-0.2.0 )"
-
-
-moz_setup() {
-
-	# Set MAKEOPTS to have proper -j? option ..
-	get_number_of_jobs
-	# This should enable parallel builds, I hope
-	export MAKE="emake"
-
-	# needed by src_compile() and src_install()
-	export MOZILLA_OFFICIAL=1
-	export BUILD_OFFICIAL=1
-
-	# make sure the nss module gets build (for NSS support)
-	if [ -n "`use ssl`" ]
-	then
-		export MOZ_PSM="1"
-	fi
-
-}
-
-src_unpack() {
-
-	moz_setup
-
-	unpack ${A}
-
-	cd ${S}
-
-	if [ "$(gcc-major-version)" -eq "3" ]
-	then
-		# ABI Patch for alpha/xpcom for gcc-3.x
-		if [ "${ARCH}" = "alpha" ]
-		then
-			cd ${S}; epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
-		fi
-		if [ "${ARCH}" = "amd64" ]
-		then
-			cd ${S}; epatch ${FILESDIR}/${PN}-1.4-amd64.patch
-		fi
-	fi
-
-	epatch ${FILESDIR}/1.2/${PN}-1.2b-default-plugin-less-annoying.patch.bz2
-	epatch ${FILESDIR}/1.2/${PN}-1.2b-over-the-spot.patch.bz2
-	epatch ${FILESDIR}/1.2/${PN}-1.2b-wallet.patch.bz2
-
-	# Fix logic error when using RAW target
-	# <azarah@gentoo.org> (23 Feb 2003)
-	epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.patch
-
-	export WANT_AUTOCONF_2_1=1
-	autoconf &> /dev/null
-	unset WANT_AUTOCONF_2_1
-
-	# Unpack the enigmail plugin
-	if [ -n "`use crypt`" -a -z "`use moznomail`" ]
-	then
-		mv -f ${WORKDIR}/ipc ${S}/extensions/
-		mv -f ${WORKDIR}/enigmail ${S}/extensions/
-		cp ${FILESDIR}/enigmail/Makefile-enigmail ${S}/extensions/enigmail/Makefile
-		cp ${FILESDIR}/enigmail/Makefile-ipc ${S}/extensions/ipc/Makefile
-	fi
-
-}
-
-src_compile() {
-
-	moz_setup
-
-	local myconf=
-	# NOTE: QT and XLIB toolkit seems very unstable, leave disabled until
-	#       tested ok -- azarah
-	if [ -n "`use gtk2`" ]
-	then
-		myconf="${myconf} --enable-toolkit-gtk2 \
-		                  --enable-default-toolkit=gtk2 \
-		                  --disable-toolkit-qt \
-		                  --disable-toolkit-xlib \
-		                  --disable-toolkit-gtk"
-	else
-		myconf="${myconf} --enable-toolkit-gtk \
-			              --enable-default-toolkit=gtk \
-			              --disable-toolkit-qt \
-			              --disable-toolkit-xlib \
-			              --disable-toolkit-gtk2"
-	fi
-
-	if [ -z "`use ldap`" ]
-	then
-		myconf="${myconf} --disable-ldap"
-	fi
-
-	if [ -z "`use debug`" ]
-	then
-		myconf="${myconf} --enable-strip-libs \
-			              --disable-debug \
-			              --disable-tests \
-						  --enable-reorder \
-						  --enable-strip"
-#						  --enable-cpp-rtti"
-
-		# Currently --enable-elf-dynstr-gc only works for x86 and ppc,
-		# thanks to Jason Wever <weeve@gentoo.org> for the fix.
-		if [ -n "`use x86`" -o -n "`use ppc`" ]
-		then
-			myconf="${myconf} --enable-elf-dynstr-gc"
-		fi
-	fi
-
-	# Check if we should enable Xft support ...
-	if [ -z "`use moznoxft`" ]
-	then
-		if [ -n "`use gtk2`" ]
-		then
-			local pango_version=""
-
-			# We need Xft2.0 localy installed
-			if (test -x /usr/bin/pkg-config) && (pkg-config xft)
-			then
-				pango_version="`pkg-config --modversion pango | cut -d. -f1,2`"
-				pango_version="`echo ${pango_version} | sed -e 's:\.::g'`"
-
-				# 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
-	else
-		myconf="${myconf} --disable-xft `use_enable truetype freetype2`"
-	fi
-
-	if [ -n "`use ipv6`" ]
-	then
-		myconf="${myconf} --enable-ipv6"
-	fi
-
-
-	# NB!!:  Due to the fact that the non default extensions do not always
-	#        compile properly, using them is considered unsupported, and
-	#        is just here for completeness.  Please do not use if you
-	#        do not know what you are doing!
-	#
-	# The defaults are:
-	# cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix 
-	# venkman inspector irc universalchardet typeaheadfind webservices 
-	# spellcheck
-	# Non-defaults are:
-	#     xmlterm access-builtin datetime finger cview
-	use mozxmlterm || use mozaccess && \
-		ewarn "" && \
-		ewarn "The use of the non-default extensions is considered unsupported, and these" && \
-		ewarn "may not always compile properly." && \
-		ewarn "Please do not use if you do not know what you're doing!" && \
-		ewarn "" && \
-		sleep 3
-
-	local myext="default"
-	if [ -n "`use mozxmlterm`" ]
-	then
-		myext="${myext},xmlterm"
-	fi
-	if [ -n "`use mozaccess`" ]
-	then
-		myext="${myext},access-builtin"
-	fi
-	if [ -n "`use moznoirc`" ]
-	then
-		myext="${myext},-irc"
-	fi
-
-# Disable SVG until it's properly implemented
-#	if [ -n "`use mozsvg`" ]
-#	then
-#		export MOZ_INTERNAL_LIBART_LGPL="1"
-#		myconf="${myconf} --enable-svg"
-#	else
-#		myconf="${myconf} --disable-svg"
-#	fi
-	if [ -n "`use mozcalendar`" ]
-	then
-		myconf="${myconf} --enable-calendar"
-	fi
-
-	if [ -n "`use moznomail`" ]
-	then
-		myconf="${myconf} --disable-mailnews"
-	fi
-	if [ -n "`use moznocompose`" -a -n "`use moznomail`" ]
-	then
-		myconf="${myconf} --disable-composer"
-	fi
-
-	if [ "$(gcc-major-version)" -eq "3" ]
-	then
-		# Currently gcc-3.2 or older do not work well if we specify "-march"
-		# and other optimizations for pentium4.
-		if [ "$(gcc-minor-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
-
-	if [ -n "`use alpha`" ]
-	then
-		# mozilla wont link with X11 on alpha, for some crazy reason.
-		# set it to link explicitly here.
-		sed -i 's/\(EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS).*$\)/\1 -L/usr/X11R6/lib -lX11/' \
-			${S}/gfx/src/gtk/Makefile.in
-	fi
-
-	# *********************************************************************
-	#
-	#  Configure and build Mozilla
-	#
-	# *********************************************************************
-
-	export BUILD_MODULES=all
-	export BUILD_OPT=1
-
-	# Get it to work without warnings on gcc3
-	export CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
-
-	# On 64-bit we statically set 'safe' CFLAGS. Use those only.
-	# using the standard -O2 will cause segfaults on startup
-	case "${ARCH}" in
-		alpha|amd64|ia64)
-			ENABLE_OPTIMIZE="${CFLAGS}"
-			;;
-		*)
-			ENABLE_OPTIMIZE="-O2"
-			;;
-	esac
-
-	cd ${S}
-	einfo "Configuring Mozilla..."
-	./configure --prefix=/usr/lib/mozilla \
-		--disable-pedantic \
-		--disable-short-wchar \
-		--disable-xprint \
-		--enable-mathml \
-		--without-system-nspr \
-		--enable-nspr-autoconf \
-		--with-system-zlib \
-		--enable-xsl \
-		--enable-crypto \
-		--enable-extensions="${myext}" \
-		--enable-optimize="${ENABLE_OPTIMIZE}" \
-		--with-default-mozilla-five-home=/usr/lib/mozilla \
-		${myconf} || die
-
-	einfo "Building Mozilla..."
-	make WORKDIR="${WORKDIR}" || die
-
-	# *********************************************************************
-	#
-	#  Build Mozilla NSS
-	#
-	# *********************************************************************
-
-	# Build the NSS/SSL support
-	if [ "`use ssl`" ]
-	then
-		einfo "Building Mozilla NSS..."
-		cd ${S}/security/coreconf
-
-		# Fix #include problem
-		cp headers.mk headers.mk.orig
-		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
-			>>headers.mk
-
-		# Disable jobserver here ...
-		make MAKE="make" || die
-
-		cd ${S}/security/nss
-
-		# Disable jobserver here ...
-		make MAKE="make" moz_import || die
-		make MAKE="make" || die
-		cd ${S}
-	fi
-
-	# *********************************************************************
-	#
-	#  Build Enigmail plugin
-	#
-	# *********************************************************************
-
-	# Build the enigmail plugin
-	if [ -n "`use crypt`" -a -z "`use moznomail`" ]
-	then
-		einfo "Building Enigmail plugin..."
-		cd ${S}/extensions/ipc
-		make || die
-
-		cd ${S}/extensions/enigmail
-		make || die
-	fi
-}
-
-src_install() {
-
-	moz_setup
-
-	# Install, don't create tarball
-	dodir /usr/lib
-	cd ${S}/xpinstall/packager
-	einfo "Installing mozilla into build root..."
-	make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die
-	mv -f ${S}/dist/mozilla ${D}/usr/lib/mozilla
-
-	einfo "Installing includes and idl files..."
-	# Copy the include and idl files
-	dodir /usr/lib/mozilla/include/idl /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}/usr/lib/mozilla/include
-	cp -LfR idl/* ${D}/usr/lib/mozilla/include/idl
-	dosym /usr/lib/mozilla/include /usr/include/mozilla
-
-	# Install the development tools in /usr
-	dodir /usr/bin
-	mv ${D}/usr/lib/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/lib/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/lib/mozilla/include/nss/{zconf.h,zlib.h}
-
-		cd ${S}/security/nss
-
-		mkdir -p ${WORKDIR}/nss/{bin,lib}
-		export BUILD_OPT=1
-		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
-		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
-
-		make install || die
-		# Gets installed as symbolic links ...
-		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
-		cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/lib/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_PV2}::g" mozilla-config
-	perl -pi -e "s:/mozilla-${MY_PV2}::g" mozilla-config
-	exeinto /usr/lib/mozilla
-	doexe mozilla-config
-	# Fix pkgconfig files and install them
-	insinto /usr/lib/pkgconfig
-	for x in *.pc
-	do
-		if [ -f ${x} ]
-		then
-			perl -pi -e "s:/lib/mozilla-${MY_PV2}::g" ${x}
-			perl -pi -e "s:/mozilla-${MY_PV2}::g" ${x}
-			doins ${x}
-		fi
-	done
-
-	cd ${S}
-	exeinto /usr/bin
-	newexe ${FILESDIR}/mozilla.sh mozilla
-	insinto /etc/env.d
-	doins ${FILESDIR}/10mozilla
-	dodoc LEGAL LICENSE README/mozilla/README*
-
-	# Install rebuild script
-	exeinto /usr/lib/mozilla/
-	newexe ${S}/build/package/rpm/SOURCES/mozilla-rebuild-databases.pl.in \
-		mozilla-rebuild-databases.pl
-	dosed 's|LIBDIR|/usr/lib|g' /usr/lib/mozilla/mozilla-rebuild-databases.pl
-	dosed 's|-MOZILLA_VERSION||g' /usr/lib/mozilla/mozilla-rebuild-databases.pl
-
-	# Move plugins dir
-	src_mv_plugins /usr/lib/mozilla/plugins
-
-	# Update Google search plugin to use UTF8 charset ...
-	insinto /usr/lib/mozilla/searchplugins
-	doins ${FILESDIR}/google.src
-
-	if [ -f "${WORKDIR}/.xft" ]
-	then
-		# We are using Xft, so change the default font
-		insinto /usr/lib/mozilla/defaults/pref
-		doins ${FILESDIR}/xft.js
-	fi
-
-	# Fix icons to look the same everywhere
-	insinto /usr/lib/mozilla/icons
-	doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm
-	doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm
-
-	# Install icon and .desktop for menu entry
-	if [ "`use gnome`" ]
-	then
-		insinto /usr/share/pixmaps
-		doins ${S}/build/package/rpm/SOURCES/mozilla-icon.png
-
-		# Fix comment of menu entry
-		cd ${S}/build/package/rpm/SOURCES
-		perl -pi -e 's:Comment=Mozilla:Comment=Mozilla Web Browser:' mozilla.desktop
-		cd ${S}
-		insinto /usr/share/gnome/apps/Internet
-		doins ${S}/build/package/rpm/SOURCES/mozilla.desktop
-	fi
-
-	# 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/lib/mozilla
-	find ${D}/usr/lib/mozilla/ -type d -exec chmod 0755 {} \; || :
-}
-
-pkg_preinst() {
-	# Stale components and chrome files break when unmerging old
-	if [ -d ${ROOT}/usr/lib/mozilla/components ]
-	then
-		rm -rf ${ROOT}/usr/lib/mozilla/components
-	fi
-	if [ -d ${ROOT}/usr/lib/mozilla/chrome ]
-	then
-		rm -rf ${ROOT}/usr/lib/mozilla/chrome
-	fi
-
-	# Remove stale component registry.
-	if [ -e ${ROOT}/usr/lib/mozilla/component.reg ]
-	then
-		rm -f ${ROOT}/usr/lib/mozilla/component.reg
-	fi
-	if [ -e ${ROOT}/usr/lib/mozilla/components/compreg.dat ]
-	then
-		rm -f ${ROOT}/usr/lib/mozilla/components/compreg.dat
-	fi
-
-	# Make sure these are removed.
-	rm -f ${ROOT}/usr/lib/mozilla/lib{Xft,Xrender}.so*
-
-	# Move old plugins dir
-	pkg_mv_plugins /usr/lib/mozilla/plugins
-}
-
-pkg_postinst() {
-
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/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 {} \; || :
-
-
-	echo
-	ewarn "Please unmerge old versions of mozilla, as the header"
-	ewarn "layout in /usr/lib/mozilla/include have changed and will"
-	ewarn "result in compile errors when compiling programs that need"
-	ewarn "mozilla headers and libs (galeon, nautilus, ...)"
-}
-
-pkg_postrm() {
-
-	# Regenerate component.reg in case some things changed
-	if [ -e ${ROOT}/usr/lib/mozilla/regxpcom ]
-	then
-		export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/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
-}
-
diff --git a/net-www/mozilla/mozilla-1.6_beta.ebuild b/net-www/mozilla/mozilla-1.6_beta.ebuild
deleted file mode 100644
index c1e8d9309670..000000000000
--- a/net-www/mozilla/mozilla-1.6_beta.ebuild
+++ /dev/null
@@ -1,613 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.6_beta.ebuild,v 1.1 2003/12/20 18:37:49 brad Exp $
-
-IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug"
-# Internal USE flags that I do not really want to advertise ...
-IUSE="${IUSE} mozcalendar mozaccess mozxmlterm"
-IUSE="${IUSE} moznoirc moznomail moznocompose moznoxft"
-
-inherit flag-o-matic gcc eutils nsplugins
-
-# Strip over-aggressive CFLAGS - Mozilla supplies its own fine-tuned CFLAGS and shouldn't be interfered with
-strip-flags
-
-# Strip flags which create more documented instability
-filter-flags "-fomit-frame-pointer"
-filter-flags -ffast-math
-append-flags -s -fforce-addr
-
-# Merged ARCH stuff into a single case statement.  But shouldn't this
-# stuff go in src_compile? (18 Nov 2003 agriffis)
-case "${ARCH}" in
-	alpha|ia64)
-		# Anything more than this causes segfaults on startup on 64-bit
-		# (bug 33767)
-		export CFLAGS="${CFLAGS//-O[1-9s]/-O} -Wall -fPIC -pipe"
-		export CXXFLAGS="${CXXFLAGS//-O[1-9s]/-O} -Wall -fPIC -pipe"
-		;;
-	amd64)
-		# Anything more than this causes segfaults on startup on amd64
-		# [Note: I think amd64 could use the same as above in the
-		# alpha/ia64 section, but I'll let the amd64 devs choose. -agriffis]
-		export CFLAGS="-O -Wall -fPIC -pipe"
-		export CXXFLAGS="${CFLAGS}"
-		;;
-	ppc)
-		# Fix to avoid gcc-3.3.x micompilation issues.
-		if [ "$(gcc-major-version).$(gcc-minor-version)" = "3.3" ]; then
-			append-flags -fno-strict-aliasing
-		fi
-		;;
-	sparc)
-		# Sparc support ...
-		replace-sparc64-flags
-		;;
-	*)
-		# We set -O in ./configure to -O1, as -O2 cause crashes on
-		# startup (bug 13287)
-		export CFLAGS="${CFLAGS//-O?}"
-		export CXXFLAGS="${CFLAGS//-O?}"
-		;;
-esac
-
-EMVER="0.82.4"
-IPCVER="1.0.5"
-
-PATCH_VER="1.0"
-
-# handle _rc versions
-MY_PV1="${PV/_}"
-MY_PV2="${MY_PV1/eta}"
-S="${WORKDIR}/mozilla"
-DESCRIPTION="The Mozilla Web Browser"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV2}/src/${PN}-source-${MY_PV2}.tar.bz2
-	crypt? ( mirror://gentoo/enigmail-${EMVER}.tar.gz
-			 http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )"
-#	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
-HOMEPAGE="http://www.mozilla.org"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-
-RDEPEND=">=x11-base/xfree-4.2.0-r11
-	>=dev-libs/libIDL-0.8.0
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/fontconfig-2.1
-	virtual/xft
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.2.1
-	>=sys-apps/portage-2.0.14
-	dev-libs/expat
-	app-arch/zip
-	app-arch/unzip
-	( gtk2? >=x11-libs/gtk+-2.2.0 :
-	        =x11-libs/gtk+-1.2* )
-	( gtk2? >=dev-libs/glib-2.2.0 :
-	        =dev-libs/glib-1.2* )
-	gtk2?  ( >=x11-libs/pango-1.2.1 )
-	!gtk2? ( >=gnome-base/ORBit-0.5.10-r1 )
-	java?  ( virtual/jre )
-	crypt? ( >=app-crypt/gnupg-1.2.1 )"
-
-DEPEND="${RDEPEND}
-	virtual/x11
-	dev-util/pkgconfig
-	dev-lang/perl
-	java? ( >=dev-java/java-config-0.2.0 )"
-
-
-moz_setup() {
-
-	# Set MAKEOPTS to have proper -j? option ..
-	get_number_of_jobs
-	# This should enable parallel builds, I hope
-	export MAKE="emake"
-
-	# needed by src_compile() and src_install()
-	export MOZILLA_OFFICIAL=1
-	export BUILD_OFFICIAL=1
-
-	# make sure the nss module gets build (for NSS support)
-	if [ -n "`use ssl`" ]
-	then
-		export MOZ_PSM="1"
-	fi
-
-}
-
-src_unpack() {
-
-	moz_setup
-
-	unpack ${A}
-
-	cd ${S}
-
-	if [ "$(gcc-major-version)" -eq "3" ]
-	then
-		# ABI Patch for alpha/xpcom for gcc-3.x
-		if [ "${ARCH}" = "alpha" ]
-		then
-			cd ${S}; epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
-		fi
-		if [ "${ARCH}" = "amd64" ]
-		then
-			cd ${S}; epatch ${FILESDIR}/${PN}-1.4-amd64.patch
-		fi
-	fi
-
-	epatch ${FILESDIR}/1.2/${PN}-1.2b-default-plugin-less-annoying.patch.bz2
-	epatch ${FILESDIR}/1.2/${PN}-1.2b-over-the-spot.patch.bz2
-
-	# Fix logic error when using RAW target
-	# <azarah@gentoo.org> (23 Feb 2003)
-	epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.patch
-
-	export WANT_AUTOCONF_2_1=1
-	autoconf &> /dev/null
-	unset WANT_AUTOCONF_2_1
-
-	# Unpack the enigmail plugin
-	if [ -n "`use crypt`" -a -z "`use moznomail`" ]
-	then
-		mv -f ${WORKDIR}/ipc ${S}/extensions/
-		mv -f ${WORKDIR}/enigmail ${S}/extensions/
-		cp ${FILESDIR}/enigmail/Makefile-enigmail ${S}/extensions/enigmail/Makefile
-		cp ${FILESDIR}/enigmail/Makefile-ipc ${S}/extensions/ipc/Makefile
-	fi
-
-}
-
-src_compile() {
-
-	moz_setup
-
-	local myconf=
-	# NOTE: QT and XLIB toolkit seems very unstable, leave disabled until
-	#       tested ok -- azarah
-	if [ -n "`use gtk2`" ]
-	then
-		myconf="${myconf} --enable-toolkit-gtk2 \
-		                  --enable-default-toolkit=gtk2 \
-		                  --disable-toolkit-qt \
-		                  --disable-toolkit-xlib \
-		                  --disable-toolkit-gtk"
-	else
-		myconf="${myconf} --enable-toolkit-gtk \
-			              --enable-default-toolkit=gtk \
-			              --disable-toolkit-qt \
-			              --disable-toolkit-xlib \
-			              --disable-toolkit-gtk2"
-	fi
-
-	if [ -z "`use ldap`" ]
-	then
-		myconf="${myconf} --disable-ldap"
-	fi
-
-	if [ -z "`use debug`" ]
-	then
-		myconf="${myconf} --enable-strip-libs \
-			              --disable-debug \
-			              --disable-tests \
-						  --enable-reorder \
-						  --enable-strip"
-#						  --enable-cpp-rtti"
-
-		# Currently --enable-elf-dynstr-gc only works for x86 and ppc,
-		# thanks to Jason Wever <weeve@gentoo.org> for the fix.
-		if [ -n "`use x86`" -o -n "`use ppc`" ]
-		then
-			myconf="${myconf} --enable-elf-dynstr-gc"
-		fi
-	fi
-
-	# Check if we should enable Xft support ...
-	if [ -z "`use moznoxft`" ]
-	then
-		if [ -n "`use gtk2`" ]
-		then
-			local pango_version=""
-
-			# We need Xft2.0 localy installed
-			if (test -x /usr/bin/pkg-config) && (pkg-config xft)
-			then
-				pango_version="`pkg-config --modversion pango | cut -d. -f1,2`"
-				pango_version="`echo ${pango_version} | sed -e 's:\.::g'`"
-
-				# 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
-	else
-		myconf="${myconf} --disable-xft `use_enable truetype freetype2`"
-	fi
-
-	if [ -n "`use ipv6`" ]
-	then
-		myconf="${myconf} --enable-ipv6"
-	fi
-
-
-	# NB!!:  Due to the fact that the non default extensions do not always
-	#        compile properly, using them is considered unsupported, and
-	#        is just here for completeness.  Please do not use if you
-	#        do not know what you are doing!
-	#
-	# The defaults are:
-	# cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix 
-	# venkman inspector irc universalchardet typeaheadfind webservices 
-	# spellcheck
-	# Non-defaults are:
-	#     xmlterm access-builtin datetime finger cview
-	use mozxmlterm || use mozaccess && \
-		ewarn "" && \
-		ewarn "The use of the non-default extensions is considered unsupported, and these" && \
-		ewarn "may not always compile properly." && \
-		ewarn "Please do not use if you do not know what you're doing!" && \
-		ewarn "" && \
-		sleep 3
-
-	local myext="default"
-	if [ -n "`use mozxmlterm`" ]
-	then
-		myext="${myext},xmlterm"
-	fi
-	if [ -n "`use mozaccess`" ]
-	then
-		myext="${myext},access-builtin"
-	fi
-	if [ -n "`use moznoirc`" ]
-	then
-		myext="${myext},-irc"
-	fi
-
-# Disable SVG until it's properly implemented
-#	if [ -n "`use mozsvg`" ]
-#	then
-#		export MOZ_INTERNAL_LIBART_LGPL="1"
-#		myconf="${myconf} --enable-svg"
-#	else
-#		myconf="${myconf} --disable-svg"
-#	fi
-	if [ -n "`use mozcalendar`" ]
-	then
-		myconf="${myconf} --enable-calendar"
-	fi
-
-	if [ -n "`use moznomail`" ]
-	then
-		myconf="${myconf} --disable-mailnews"
-	fi
-	if [ -n "`use moznocompose`" -a -n "`use moznomail`" ]
-	then
-		myconf="${myconf} --disable-composer"
-	fi
-
-	if [ "$(gcc-major-version)" -eq "3" ]
-	then
-		# Currently gcc-3.2 or older do not work well if we specify "-march"
-		# and other optimizations for pentium4.
-		if [ "$(gcc-minor-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
-
-	if [ -n "`use alpha`" ]
-	then
-		# mozilla wont link with X11 on alpha, for some crazy reason.
-		# set it to link explicitly here.
-		sed -i 's/\(EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS).*$\)/\1 -L/usr/X11R6/lib -lX11/' \
-			${S}/gfx/src/gtk/Makefile.in
-	fi
-
-	# *********************************************************************
-	#
-	#  Configure and build Mozilla
-	#
-	# *********************************************************************
-
-	export BUILD_MODULES=all
-	export BUILD_OPT=1
-
-	# Get it to work without warnings on gcc3
-	export CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
-
-	# On 64-bit we statically set 'safe' CFLAGS. Use those only.
-	# using the standard -O2 will cause segfaults on startup
-	case "${ARCH}" in
-		alpha|amd64|ia64)
-			ENABLE_OPTIMIZE="${CFLAGS}"
-			;;
-		*)
-			ENABLE_OPTIMIZE="-O2"
-			;;
-	esac
-
-	cd ${S}
-	einfo "Configuring Mozilla..."
-	./configure --prefix=/usr/lib/mozilla \
-		--disable-pedantic \
-		--disable-short-wchar \
-		--disable-xprint \
-		--enable-mathml \
-		--without-system-nspr \
-		--enable-nspr-autoconf \
-		--with-system-zlib \
-		--enable-xsl \
-		--enable-crypto \
-		--enable-extensions="${myext}" \
-		--enable-optimize="${ENABLE_OPTIMIZE}" \
-		--with-default-mozilla-five-home=/usr/lib/mozilla \
-		${myconf} || die
-
-	einfo "Building Mozilla..."
-	make WORKDIR="${WORKDIR}" || die
-
-	# *********************************************************************
-	#
-	#  Build Mozilla NSS
-	#
-	# *********************************************************************
-
-	# Build the NSS/SSL support
-	if [ "`use ssl`" ]
-	then
-		einfo "Building Mozilla NSS..."
-		cd ${S}/security/coreconf
-
-		# Fix #include problem
-		cp headers.mk headers.mk.orig
-		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
-			>>headers.mk
-
-		# Disable jobserver here ...
-		make MAKE="make" || die
-
-		cd ${S}/security/nss
-
-		# Disable jobserver here ...
-		make MAKE="make" moz_import || die
-		make MAKE="make" || die
-		cd ${S}
-	fi
-
-	# *********************************************************************
-	#
-	#  Build Enigmail plugin
-	#
-	# *********************************************************************
-
-	# Build the enigmail plugin
-	if [ -n "`use crypt`" -a -z "`use moznomail`" ]
-	then
-		einfo "Building Enigmail plugin..."
-		cd ${S}/extensions/ipc
-		make || die
-
-		cd ${S}/extensions/enigmail
-		make || die
-	fi
-}
-
-src_install() {
-
-	moz_setup
-
-	# Install, don't create tarball
-	dodir /usr/lib
-	cd ${S}/xpinstall/packager
-	einfo "Installing mozilla into build root..."
-	make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die
-	mv -f ${S}/dist/mozilla ${D}/usr/lib/mozilla
-
-	einfo "Installing includes and idl files..."
-	# Copy the include and idl files
-	dodir /usr/lib/mozilla/include/idl /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}/usr/lib/mozilla/include
-	cp -LfR idl/* ${D}/usr/lib/mozilla/include/idl
-	dosym /usr/lib/mozilla/include /usr/include/mozilla
-
-	# Install the development tools in /usr
-	dodir /usr/bin
-	mv ${D}/usr/lib/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/lib/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/lib/mozilla/include/nss/{zconf.h,zlib.h}
-
-		cd ${S}/security/nss
-
-		mkdir -p ${WORKDIR}/nss/{bin,lib}
-		export BUILD_OPT=1
-		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
-		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
-
-		make install || die
-		# Gets installed as symbolic links ...
-		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
-		cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/lib/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_PV2}::g" mozilla-config
-	perl -pi -e "s:/mozilla-${MY_PV2}::g" mozilla-config
-	exeinto /usr/lib/mozilla
-	doexe mozilla-config
-	# Fix pkgconfig files and install them
-	insinto /usr/lib/pkgconfig
-	for x in *.pc
-	do
-		if [ -f ${x} ]
-		then
-			perl -pi -e "s:/lib/mozilla-${MY_PV2}::g" ${x}
-			perl -pi -e "s:/mozilla-${MY_PV2}::g" ${x}
-			doins ${x}
-		fi
-	done
-
-	cd ${S}
-	exeinto /usr/bin
-	newexe ${FILESDIR}/mozilla.sh mozilla
-	insinto /etc/env.d
-	doins ${FILESDIR}/10mozilla
-	dodoc LEGAL LICENSE README/mozilla/README*
-
-	# Install rebuild script
-	exeinto /usr/lib/mozilla/
-	newexe ${S}/build/package/rpm/SOURCES/mozilla-rebuild-databases.pl.in \
-		mozilla-rebuild-databases.pl
-	dosed 's|LIBDIR|/usr/lib|g' /usr/lib/mozilla/mozilla-rebuild-databases.pl
-	dosed 's|-MOZILLA_VERSION||g' /usr/lib/mozilla/mozilla-rebuild-databases.pl
-
-	# Move plugins dir
-	src_mv_plugins /usr/lib/mozilla/plugins
-
-	# Update Google search plugin to use UTF8 charset ...
-	insinto /usr/lib/mozilla/searchplugins
-	doins ${FILESDIR}/google.src
-
-	if [ -f "${WORKDIR}/.xft" ]
-	then
-		# We are using Xft, so change the default font
-		insinto /usr/lib/mozilla/defaults/pref
-		doins ${FILESDIR}/xft.js
-	fi
-
-	# Fix icons to look the same everywhere
-	insinto /usr/lib/mozilla/icons
-	doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm
-	doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm
-
-	# Install icon and .desktop for menu entry
-	if [ "`use gnome`" ]
-	then
-		insinto /usr/share/pixmaps
-		doins ${S}/build/package/rpm/SOURCES/mozilla-icon.png
-
-		# Fix comment of menu entry
-		cd ${S}/build/package/rpm/SOURCES
-		perl -pi -e 's:Comment=Mozilla:Comment=Mozilla Web Browser:' mozilla.desktop
-		cd ${S}
-		insinto /usr/share/gnome/apps/Internet
-		doins ${S}/build/package/rpm/SOURCES/mozilla.desktop
-	fi
-
-	# 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/lib/mozilla
-	find ${D}/usr/lib/mozilla/ -type d -exec chmod 0755 {} \; || :
-}
-
-pkg_preinst() {
-	# Stale components and chrome files break when unmerging old
-	if [ -d ${ROOT}/usr/lib/mozilla/components ]
-	then
-		rm -rf ${ROOT}/usr/lib/mozilla/components
-	fi
-	if [ -d ${ROOT}/usr/lib/mozilla/chrome ]
-	then
-		rm -rf ${ROOT}/usr/lib/mozilla/chrome
-	fi
-
-	# Remove stale component registry.
-	if [ -e ${ROOT}/usr/lib/mozilla/component.reg ]
-	then
-		rm -f ${ROOT}/usr/lib/mozilla/component.reg
-	fi
-	if [ -e ${ROOT}/usr/lib/mozilla/components/compreg.dat ]
-	then
-		rm -f ${ROOT}/usr/lib/mozilla/components/compreg.dat
-	fi
-
-	# Make sure these are removed.
-	rm -f ${ROOT}/usr/lib/mozilla/lib{Xft,Xrender}.so*
-
-	# Move old plugins dir
-	pkg_mv_plugins /usr/lib/mozilla/plugins
-}
-
-pkg_postinst() {
-
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/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 {} \; || :
-
-
-	echo
-	ewarn "Please unmerge old versions of mozilla, as the header"
-	ewarn "layout in /usr/lib/mozilla/include have changed and will"
-	ewarn "result in compile errors when compiling programs that need"
-	ewarn "mozilla headers and libs (galeon, nautilus, ...)"
-}
-
-pkg_postrm() {
-
-	# Regenerate component.reg in case some things changed
-	if [ -e ${ROOT}/usr/lib/mozilla/regxpcom ]
-	then
-		export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/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
-}
-