--- /usr/portage/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild	2004-10-03 21:36:00.000000000 +0200
+++ /usr/portage/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild	2004-10-22 00:45:40.645601496 +0200
@@ -15,7 +15,7 @@
 KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
 SLOT="0"
 LICENSE="MPL-1.1 | NPL-1.1"
-IUSE="java gtk2 ipv6 moznoxft truetype xinerama"
+IUSE="java gtk2 ipv6 moznoxft truetype xinerama ssl"
 
 RDEPEND="virtual/x11
 	!moznoxft? ( virtual/xft )
@@ -87,6 +87,26 @@
 	edit_makefiles
 
 	emake MOZ_PHOENIX=1 || die
+
+    ####################################
+    #   
+    #  Build Firefox NSS
+    #   
+    ####################################
+        
+    # Build the NSS/SSL support
+    if use ssl; then
+        einfo "Building Firefox 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
 }
 
 src_install() {
@@ -101,6 +121,46 @@
 	#fix permissions
 	chown -R root:root ${D}/usr/lib/MozillaFirefox
 
+    einfo "Installing includes and idl files..."
+    # Copy the include and idl files
+    dodir /usr/lib/MozillaFirefox/include/idl /usr/include
+    cd ${S}/dist
+    cp -LfR include/* ${D}/usr/lib/MozillaFirefox/include
+    cp -LfR idl/* ${D}/usr/lib/MozillaFirefox/include/idl
+    dosym /usr/lib/MozillaFirefox/include /usr/include/mozilla
+
+    # Install the development tools in /usr
+    dodir /usr/bin
+    mv ${D}/usr/lib/MozillaFirefox/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin
+
+    # Install the NSS/SSL libs, headers and tools
+    if use ssl; then
+        einfo "Installing Firefox NSS..."
+        # Install the headers ('make install' do not work for headers ...)
+        insinto /usr/lib/MozillaFirefox/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/MozillaFirefox/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
+        # Gets installed as symbolic links ...
+        cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
+        cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/lib/MozillaFirefox
+
+        # Need to unset these incase we want to rebuild, else the build
+        # gets newked.
+        unset SOURCE_LIB_DIR
+        unset SOURCE_BIN_DIR
+    fi
+
 	# Plugin path setup (rescuing the existent plugins)
 	src_mv_plugins /usr/lib/MozillaFirefox/plugins
 
--- /dev/null	2004-10-16 05:27:22.519293800 +0200
+++ /usr/lib/pkgconfig/mozilla-nspr.pc	2004-10-22 00:47:21.334294488 +0200
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=/usr
+libdir=${exec_prefix}/lib/MozillaFirefox
+includedir=${prefix}/include/mozilla/nspr
+
+Name: mozilla-nspr
+Description: Mozilla NSPR
+Version: 1.0
+Requires: 
+Libs: -L${libdir}
+Cflags: -I${includedir}
--- /dev/null	2004-10-16 05:27:22.519293800 +0200
+++ /usr/lib/pkgconfig/mozilla-nss.pc	2004-10-22 00:47:21.334294488 +0200
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=/usr
+libdir=${exec_prefix}/lib/MozillaFirefox
+includedir=${prefix}/include/mozilla/nss
+
+Name: mozilla-nss
+Description: Mozilla NSS
+Version: 1.0
+Requires: 
+Libs: -L${libdir}
+Cflags: -I${includedir}
--- /dev/null	2004-10-16 05:27:22.519293800 +0200
+++ /usr/lib/pkgconfig/mozilla-xpcom.pc	2004-10-22 12:20:07.198322672 +0200
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=/usr
+libdir=${exec_prefix}/lib/MozillaFirefox
+includedir=${prefix}/include/mozilla/xpcom
+
+Name: mozilla-xpcom
+Description: Mozilla XPCOM
+Version: 1.0
+Requires: 
+Libs: -L${libdir}
+Cflags: -I${includedir}