Updated build to mozilla 1.7.6-r1 to fix compilation bugs, kept the same version # as it doesn't make sense to force users to recompile.

Package-Manager: portage-2.0.51.19

9 files changed, 96 insertions, 286 deletions

diff --git a/net-libs/gecko-sdk/ChangeLog b/net-libs/gecko-sdk/ChangeLog
index e17992bc0af3..2692abd7861c 100644
--- a/net-libs/gecko-sdk/ChangeLog
+++ b/net-libs/gecko-sdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/gecko-sdk
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/ChangeLog,v 1.8 2005/03/23 16:18:40 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/ChangeLog,v 1.9 2005/04/16 13:14:40 josejx Exp $
+
+  15 Apr 2005; Joseph Jezak <josejx@gentoo.org> -gecko-sdk-1.7.3.ebuild,
+  gecko-sdk-1.7.5.ebuild:
+  Updated build to mozilla-1.7.6-r1 for compilation bugs, but I used the same
+  gecko-sdk version number since there is no reason to recompile the SDK.
 
   23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> gecko-sdk-1.7.5.ebuild:
   change dep from net-www/mozilla to www-client/mozilla
diff --git a/net-libs/gecko-sdk/Manifest b/net-libs/gecko-sdk/Manifest
index eda7af6a6285..54b731690d02 100644
--- a/net-libs/gecko-sdk/Manifest
+++ b/net-libs/gecko-sdk/Manifest
@@ -1,9 +1,5 @@
-MD5 cfd8e89f36e1c8b91fb06a7fc6a00517 ChangeLog 1132
-MD5 1aa757cd5b43a4dff846df98624954b5 gecko-sdk-1.7.3.ebuild 2038
-MD5 81bc2c535ebfc2ad359200f9a5596eb5 gecko-sdk-1.7.5.ebuild 3930
+MD5 ec854db1545256e0265848c1e550b44f ChangeLog 1383
+MD5 91e833803a98a3cda595bb68b0840151 gecko-sdk-1.7.5.ebuild 5905
 MD5 66c156160ef60780ee4c80a28873e766 metadata.xml 250
-MD5 640ad02464c41c9b820db9b59c7eeaec files/digest-gecko-sdk-1.7.3 75
-MD5 e5ed08e208ebaa0fc5407ac4a7f42e94 files/digest-gecko-sdk-1.7.5 75
-MD5 068edb8c46e34027f9c3febc19656c70 files/mozilla-1.3-fix-RAW-target.patch 328
-MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
-MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
+MD5 010f24bdcd24d6f49f3bdfec5e4813cf .ChangeLog.swp 12288
+MD5 0172084e349ca0f03d8cbe294054223e files/digest-gecko-sdk-1.7.5 203
diff --git a/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.3 b/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.3
deleted file mode 100644
index a10c327f101f..000000000000
--- a/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 15cb68da1d58f055f871b77ff655df77 mozilla-source-1.7.3.tar.bz2 29716200
diff --git a/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.5 b/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.5
index 5403bacddb1f..c60cf531b3c4 100644
--- a/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.5
+++ b/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.5
@@ -1 +1,3 @@
-MD5 e5994f3e801cd834966367c6a12f8aeb mozilla-source-1.7.5.tar.bz2 30440393
+MD5 09c78e9e51d8b11b2d3059987ef42fd0 mozilla-source-1.7.6.tar.bz2 30448120
+MD5 4aa272b46c8cbf167dcd49a6d74cf526 ipc-1.1.2.tar.gz 102663
+MD5 920f0e43e620d2c89934bd9bbf9b5d02 enigmail-0.90.2.tar.gz 340488
diff --git a/net-libs/gecko-sdk/files/mozilla-1.3-fix-RAW-target.patch b/net-libs/gecko-sdk/files/mozilla-1.3-fix-RAW-target.patch
deleted file mode 100644
index 5951496e9893..000000000000
--- a/net-libs/gecko-sdk/files/mozilla-1.3-fix-RAW-target.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mozilla/xpinstall/packager/Makefile.in.orig	2003-02-23 14:41:08.000000000 +0200
-+++ mozilla/xpinstall/packager/Makefile.in	2003-02-23 14:41:36.000000000 +0200
-@@ -87,6 +87,9 @@
- ifeq ($(MOZ_PKG_FORMAT),DEB)
- PKG_SUFFIX	= .deb
- endif
-+ifeq ($(MOZ_PKG_FORMAT),RAW)
-+MAKE_SDK    = echo
-+endif
- 
- TARGETS		= $(PACKAGE) $(SDK)
- 
diff --git a/net-libs/gecko-sdk/files/mozilla-alpha-xpcom-subs-fix.patch b/net-libs/gecko-sdk/files/mozilla-alpha-xpcom-subs-fix.patch
deleted file mode 100644
index c7f95467438a..000000000000
--- a/net-libs/gecko-sdk/files/mozilla-alpha-xpcom-subs-fix.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp	2002-04-10 05:37:38.000000000 +0200
-+++ mozilla-alpha/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp	2002-10-06 10:44:59.000000000 +0200
-@@ -20,6 +20,7 @@
-  * the Initial Developer. All Rights Reserved.
-  *
-  * Contributor(s):
-+ *   Glen Nakamura <glen@imodulo.com>
-  *
-  * Alternatively, the contents of this file may be used under the terms of
-  * either the GNU General Public License Version 2 or later (the "GPL"), or 
-@@ -37,16 +38,14 @@
- 
- /* Platform specific code to invoke XPCOM methods on native objects */
- 
--/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
--
- #include "xptcprivate.h"
- 
- /* Prototype specifies unmangled function name and disables unused warning */
--static void
-+void
- invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
- __asm__("invoke_copy_to_stack") __attribute__((unused));
- 
--static void
-+void
- invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
- {
-     const PRUint8 NUM_ARG_REGS = 6-1;        // -1 for "this" pointer
-@@ -163,7 +162,11 @@
-     "bis $16,$16,$1\n\t"    /* load "this" */
-     "ldq $2,16($15)\n\t"    /* load "methodIndex" */
-     "ldq $1,0($1)\n\t"      /* load vtable */
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+    "s8addq $2,$31,$2\n\t"  /* vtable index = "methodIndex" * 8 */
-+#else /* not G++ V3 ABI */
-     "s8addq $2,16,$2\n\t"   /* vtable index = "methodIndex" * 8 + 16 */
-+#endif /* G++ V3 ABI */
-     "addq $1,$2,$1\n\t"
-     "ldq $27,0($1)\n\t"     /* load address of function */
-     "jsr $26,($27),0\n\t"   /* call virtual function */
-@@ -176,4 +179,3 @@
-     "ret $31,($26),1\n\t"
-     ".end XPTC_InvokeByIndex"
-     );
--
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp	2002-04-10 05:37:42.000000000 +0200
-+++ mozilla-alpha/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp	2002-10-06 10:45:10.000000000 +0200
-@@ -20,6 +20,7 @@
-  * the Initial Developer. All Rights Reserved.
-  *
-  * Contributor(s):
-+ *   Glen Nakamura <glen@imodulo.com>
-  *
-  * Alternatively, the contents of this file may be used under the terms of
-  * either the GNU General Public License Version 2 or later (the "GPL"), or 
-@@ -37,16 +38,14 @@
- 
- /* Implement shared vtbl methods. */
- 
--/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
--
- #include "xptcprivate.h"
- 
- /* Prototype specifies unmangled function name and disables unused warning */
--static nsresult
-+nsresult
- PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
- __asm__("PrepareAndDispatch") __attribute__((unused));
- 
--static nsresult
-+nsresult
- PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
- {
-     const PRUint8 PARAM_BUFFER_COUNT = 16;
-@@ -188,23 +187,45 @@
-  * nsresult nsXPTCStubBase::Stub##n()
-  *  Sets register $1 to "methodIndex" and jumps to SharedStub.
-  */
-+#define STUB_MANGLED_ENTRY(n, symbol) \
-+    "#### Stub"#n" ####"      "\n\t" \
-+    ".text"                   "\n\t" \
-+    ".align 5"                "\n\t" \
-+    ".globl " symbol          "\n\t" \
-+    ".ent " symbol            "\n"   \
-+symbol ":"                    "\n\t" \
-+    ".frame $30,0,$26,0"      "\n\t" \
-+    "ldgp $29,0($27)"         "\n"   \
-+"$" symbol "..ng:"            "\n\t" \
-+    ".prologue 1"             "\n\t" \
-+    "lda $1,"#n               "\n\t" \
-+    "br $31,$SharedStub..ng"  "\n\t" \
-+    ".end " symbol
-+
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+
-+#define STUB_ENTRY(n) \
-+__asm__( \
-+    ".if "#n" < 10"                                              "\n\t" \
-+        STUB_MANGLED_ENTRY(n, "_ZN14nsXPTCStubBase5Stub"#n"Ev")  "\n\t" \
-+    ".elseif "#n" < 100"                                         "\n\t" \
-+        STUB_MANGLED_ENTRY(n, "_ZN14nsXPTCStubBase6Stub"#n"Ev")  "\n\t" \
-+    ".elseif "#n" < 1000"                                        "\n\t" \
-+        STUB_MANGLED_ENTRY(n, "_ZN14nsXPTCStubBase7Stub"#n"Ev")  "\n\t" \
-+    ".else"                                                      "\n\t" \
-+    ".err \"Stub"#n" >= 1000 not yet supported.\""               "\n\t" \
-+    ".endif" \
-+    );
-+
-+#else /* not G++ V3 ABI */
-+
- #define STUB_ENTRY(n) \
- __asm__( \
--    "#### Stub"#n" ####\n" \
--".text\n\t" \
--    ".align 5\n\t" \
--    ".globl Stub"#n"__14nsXPTCStubBase\n\t" \
--    ".ent Stub"#n"__14nsXPTCStubBase\n" \
--"Stub"#n"__14nsXPTCStubBase:\n\t" \
--    ".frame $30,0,$26,0\n\t" \
--    "ldgp $29,0($27)\n" \
--"$Stub"#n"__14nsXPTCStubBase..ng:\n\t" \
--    ".prologue 1\n\t" \
--    "lda $1,"#n"\n\t" \
--    "br $31,$SharedStub..ng\n\t" \
--    ".end Stub"#n"__14nsXPTCStubBase" \
-+    STUB_MANGLED_ENTRY(n, "Stub"#n"__14nsXPTCStubBase") \
-     );
- 
-+#endif /* G++ V3 ABI */
-+
- #define SENTINEL_ENTRY(n) \
- nsresult nsXPTCStubBase::Sentinel##n() \
- { \
-@@ -213,4 +234,3 @@
- }
- 
- #include "xptcstubsdef.inc"
--
diff --git a/net-libs/gecko-sdk/files/svg-cairo-0.3.0-fix.patch b/net-libs/gecko-sdk/files/svg-cairo-0.3.0-fix.patch
deleted file mode 100644
index 9d1f0d830559..000000000000
--- a/net-libs/gecko-sdk/files/svg-cairo-0.3.0-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -aur mozilla-orig/layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp mozilla/layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp
---- mozilla-orig/layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp	2004-02-10 15:18:09.000000000 -0500
-+++ mozilla/layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp	2005-02-23 20:25:32.240459288 -0500
-@@ -50,6 +50,7 @@
- #include "nsRenderingContextGTK.h"
- #include <gdk/gdkx.h>
- #include <cairo.h>
-+#include <cairo-xlib.h>
- 
- /**
-  * \addtogroup cairo_renderer Cairo Rendering Engine
-diff -aur mozilla-orig/layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp mozilla/layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp
---- mozilla-orig/layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp	2004-03-16 16:40:07.000000000 -0500
-+++ mozilla/layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp	2005-02-23 20:25:09.538910448 -0500
-@@ -51,6 +51,7 @@
- #include "nsSVGTypeCIDs.h"
- #include "nsIComponentManager.h"
- #include <cairo.h>
-+#include <stdlib.h>
- 
- /**
-  * \addtogroup gdiplus_renderer Cairo Rendering Engine
diff --git a/net-libs/gecko-sdk/gecko-sdk-1.7.3.ebuild b/net-libs/gecko-sdk/gecko-sdk-1.7.3.ebuild
deleted file mode 100644
index 7ea12de06a31..000000000000
--- a/net-libs/gecko-sdk/gecko-sdk-1.7.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/gecko-sdk-1.7.3.ebuild,v 1.6 2005/02/19 07:52:38 josejx Exp $
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozilla makeedit
-
-IUSE="java"		# other IUSE setting is in mozilla.eclass
-
-EMVER="0.86.0"
-IPCVER="1.0.8"
-
-# 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="Gecko SDK"
-HOMEPAGE="http://www.mozilla.org"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla${MY_PV}/src/mozilla-source-${MY_PV}.tar.bz2"
-KEYWORDS="x86 ppc amd64"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-RDEPEND=""
-DEPEND="java? ( >=dev-java/java-config-0.2.0 )
-	dev-lang/perl"
-
-S="${WORKDIR}/mozilla"
-
-src_unpack() {
-	typeset x
-
-	unpack ${A} || die "unpack failed"
-	cd ${S} || die
-
-	if [[ $(gcc-major-version) -eq 3 ]]; then
-		# ABI Patch for alpha/xpcom for gcc-3.x
-		if [[ ${ARCH} == alpha ]]; then
-			epatch ${FILESDIR}/mozilla-alpha-xpcom-subs-fix.patch
-		fi
-	fi
-
-	# Fix logic error when using RAW target
-	# <azarah@gentoo.org> (23 Feb 2003)
-	epatch ${FILESDIR}/mozilla-1.3-fix-RAW-target.patch
-
-	WANT_AUTOCONF=2.1 autoconf || die
-}
-
-src_compile() {
-	local myconf
-
-	####################################
-	#
-	# myconf, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	# mozilla_conf comes from mozilla.eclass
-	mozilla_conf
-
-	myconf="${myconf} \
-		--prefix=/usr/lib/mozilla \
-		--with-default-mozilla-five-home=/usr/lib/mozilla"
-
-	####################################
-	#
-	#  Configure and build Mozilla
-	#
-	####################################
-
-	./configure ${myconf} || die
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake || die
-}
-
-src_install(){
-	cd ${S}/dist
-	mkdir -p ${D}/usr/share
-	cp -RL sdk ${D}/usr/share/gecko-sdk
-}
diff --git a/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild b/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild
index b876f326cc8c..5e429c345818 100644
--- a/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild
+++ b/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild
@@ -1,38 +1,45 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild,v 1.3 2005/03/23 16:18:40 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild,v 1.4 2005/04/16 13:14:40 josejx Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozconfig makeedit
+inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozconfig makeedit multilib
 
-IUSE=""
+IUSE="java crypt ssl moznomail postgres"
 
-EMVER="0.89.6"
+EMVER="0.90.2"
 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
+MY_PV="1.7.6"
 
-DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
+DESCRIPTION="Gecko Engine SDK"
 HOMEPAGE="http://www.mozilla.org"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla${MY_PV}/source/mozilla-source-${MY_PV}.tar.bz2"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla${MY_PV}/source/mozilla-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="x86 ppc amd64"
+KEYWORDS="alpha amd64 hppa ia64 ppc 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="
+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}
-	dev-lang/perl"
+	~sys-devel/autoconf-2.13
+	java? ( >=dev-java/java-config-0.2.0 )
+	dev-lang/perl
+	pgsql? ( >=dev-db/postgresql-7.2.0 )"
 
 S="${WORKDIR}/mozilla"
 
@@ -50,7 +57,7 @@ src_unpack() {
 	fi
 
 	# Fix stack growth logic
-	epatch ${PORTDIR}/www-client/mozilla/files/mozilla-${PV}-stackgrowth.patch
+	epatch ${PORTDIR}/www-client/mozilla/files/mozilla-stackgrowth.patch
 
 	# Fix logic error when using RAW target
 	# <azarah@gentoo.org> (23 Feb 2003)
@@ -67,10 +74,24 @@ src_unpack() {
 
 	# 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
+		epatch ${PORTDIR}/www-client/mozilla/files/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() {
@@ -94,13 +115,14 @@ src_compile() {
 	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/lib/mozilla
-	mozconfig_annotate '' --with-default-mozilla-five-home=/usr/lib/mozilla
+	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
@@ -112,6 +134,12 @@ src_compile() {
 	# 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
@@ -119,6 +147,7 @@ src_compile() {
 	####################################
 
 	# ./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
@@ -126,6 +155,43 @@ src_compile() {
 	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() {