add digest, fix

7 files changed, 155 insertions, 193 deletions

diff --git a/net-www/mozilla/files/digest-mozilla-0.9.4-r2 b/net-www/mozilla/files/digest-mozilla-0.9.4-r2
deleted file mode 100644
index 67a25f9302f0..000000000000
--- a/net-www/mozilla/files/digest-mozilla-0.9.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 495707918a7b9b8780ab659b6538e2bc mozilla-source-0.9.4.tar.gz 34230272
diff --git a/net-www/mozilla/files/digest-mozilla-0.9.5 b/net-www/mozilla/files/digest-mozilla-0.9.5
deleted file mode 100644
index 2ae14a9311e9..000000000000
--- a/net-www/mozilla/files/digest-mozilla-0.9.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 288a596f4c4aab9bd9a6963ca2d013bc mozilla-source-0.9.5.tar.gz 35172352
diff --git a/net-www/mozilla/files/digest-mozilla-0.9.6 b/net-www/mozilla/files/digest-mozilla-0.9.6
index daac8dec0fb0..4cf71b64ed06 100644
--- a/net-www/mozilla/files/digest-mozilla-0.9.6
+++ b/net-www/mozilla/files/digest-mozilla-0.9.6
@@ -1 +1 @@
-MD5 f3faa4ec9674d649b2adeba1c3b83d6e mozilla-source-0.9.6.tar.gz 35303424
+MD5 b1f02fe3f01c700147237de92ef11000 mozilla-source-0.9.6.tar.bz2 27054080
diff --git a/net-www/mozilla/files/digest-mozilla-0.9.6-r1 b/net-www/mozilla/files/digest-mozilla-0.9.6-r1
new file mode 100644
index 000000000000..4cf71b64ed06
--- /dev/null
+++ b/net-www/mozilla/files/digest-mozilla-0.9.6-r1
@@ -0,0 +1 @@
+MD5 b1f02fe3f01c700147237de92ef11000 mozilla-source-0.9.6.tar.bz2 27054080
diff --git a/net-www/mozilla/mozilla-0.9.4-r2.ebuild b/net-www/mozilla/mozilla-0.9.4-r2.ebuild
deleted file mode 100644
index 8ad4c7c71ce7..000000000000
--- a/net-www/mozilla/mozilla-0.9.4-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# /home/cvsroot/gentoo-x86/net-www/mozilla/mozilla-0.9.ebuild,v 1.4 2001/06/07 01:45:52 achim Exp
-# /home/cvsroot/gentoo-x86/net-www/mozilla/mozilla-0.9.4.ebuild,v 1.1 2001/09/22 09:07:50 blocke Exp
-
-
-A=mozilla-source-${PV}.tar.gz
-S=${WORKDIR}/mozilla
-DESCRIPTION=""
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla${PV}/src/${A}"
-HOMEPAGE="http://www.mozilla.org"
-PROVIDE="virtual/x11-web-browser"
-
-DEPEND="sys-devel/perl >=gnome-base/ORBit-0.5.10-r1
-	>=x11-libs/gtk+-1.2.10-r4
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.0.9
-	app-arch/zip
-	app-arch/unzip
-	mozqt? ( x11-libs/qt-x11 )"
-RDEPEND=">=gnome-base/ORBit-0.5.10-r1
-	>=x11-libs/gtk+-1.2.10-r4
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.0.9
-	app-arch/zip
-	app-arch/unzip
-	mozqt? ( x11-libs/qt-x11 )"
-
-src_compile() {
-    chown -R root.root *
-    if [ "`use mozqt`" ] ; then
-	myconf="--with-qt --enable-toolkit=qt --without-gtk --with-extentions=default,venkman"
-    else
-	myconf="--with-gtk --with-extentions=default,venkman,irc"
-    fi
-    ./configure --prefix=/usr/lib/mozilla --host=${CHOST} \
-	$myconf --disable-tests --disable-debug --enable-jsd || die
-    make || die
-#    if [ ! "`use mozqt`" ] ; then
-#      cd extensions/irc
-#      make || die
-#      cd ../..
-#    fi
-
-    ./configure --prefix=/usr/lib/mozilla --host=${CHOST} \
-	$myconf --disable-tests --disable-debug || die
-    make BUILD_MODULES=psm || die
-
-}
-
-src_install () {
-
-    dodir /usr/lib/mozilla/include/nspr/{private,obsolete,md}
-    cd dist/include
-    cp -f *.h ${D}/usr/lib/mozilla/include
-    cp -f nspr/*.h ${D}/usr/lib/mozilla/include/nspr
-    cp -f nspr/obsolete/*.h ${D}/usr/lib/mozilla/include/nspr/obsolete
-    cp -f nspr/private/*.h ${D}/usr/lib/mozilla/include/nspr/private
-    cp -f nspr/md/*.cfg ${D}/usr/lib/mozilla/include/nspr/md
-
-    export MOZILLA_OFFICIAL=1
-    export BUILD_OFFICIAL=1
-    cd ${S}/xpinstall/packager
-    make || die
-    dodir /usr/lib
-    tar xzf ${S}/dist/mozilla-`uname -m`-pc-linux-gnu.tar.gz -C ${D}/usr/lib
-    mv ${D}/usr/lib/package ${D}/usr/lib/mozilla
-
-    exeinto /usr/bin
-    doexe ${FILESDIR}/mozilla
-    insinto /etc/env.d
-    doins ${FILESDIR}/10mozilla
-    dodoc LEGAL LICENSE README/mozilla/README*
-
-    # Take care of non root execution
-    # (seems the problem is that not all files are readible by the user)
-    chmod -R g+r,o+r ${D}/usr/lib/mozilla
-
-}
-
-pkg_postinst () {
-
-    # Take care of component registration
-    export MOZILLA_FIVE_HOME="/usr/lib/mozilla"
-    # Needed to update the run time bindings for REGXPCOM (do not remove next line!)
-    env-update
-    /usr/lib/mozilla/regxpcom
-    chmod g+r,o+r /usr/lib/mozilla/component.reg
-
-}
-
diff --git a/net-www/mozilla/mozilla-0.9.5.ebuild b/net-www/mozilla/mozilla-0.9.5.ebuild
deleted file mode 100644
index 4198ee10ecd2..000000000000
--- a/net-www/mozilla/mozilla-0.9.5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Desktop Team <desktop@cvs.gentoo.org>
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-0.9.5.ebuild,v 1.1 2001/10/20 16:04:22 hallski Exp $
-
-S=${WORKDIR}/mozilla
-DESCRIPTION="The Mozilla web browser"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla${PV}/src/${PN}-source-${PV}.tar.gz"
-HOMEPAGE="http://www.mozilla.org"
-
-PROVIDE="virtual/x11-web-browser"
-
-RDEPEND=">=gnome-base/ORBit-0.5.10-r1
-	>=x11-libs/gtk+-1.2.10-r4
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.0.9
-	app-arch/zip
-	app-arch/unzip
-	mozqt? ( x11-libs/qt-x11 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/perl"
-
-src_compile() {
-	chown -R root.root *
-
-	if [ "`use mozqt`" ] ; then
-		myconf="--with-qt --enable-toolkit=qt --without-gtk"
-	else
-		myconf="--with-gtk --enable-toolkit=gtk"
-	fi
-
-	if [ -z "$DEBUG" ] ; then
-		myconf="${myconf} --enable-strip-libs"
-	fi
-
-	./configure  --host=${CHOST}					\
-		     --prefix=/usr/lib/mozilla 				\
-		     --disable-tests					\
-		     --disable-debug					\
-		     --disable-dtd-debug				\
-		     --disable-pedantic					\
-		     --enable-xsl					\
-		     --enable-crypto					\
-		     --with-java-supplement				\
-		     --enable-optimize=-O2				\
-		     --with-default-mozilla-five-home=/usr/lib/mozilla	\
-		     ${myconf} || die
-
-	make || die
-}
-
-src_install () {
-	dodir /usr/lib/mozilla/include
-	cd ${S}/dist/include
-	cp -LfR * ${D}/usr/lib/mozilla/include
-#	rm ${D}/usr/lib/mozilla/include/*.h
-	
-#	cd ${S}/include
-#	cp -f *.h ${D}/usr/lib/mozilla/include
-#	cp -f nspr/*.h ${D}/usr/lib/mozilla/include/nspr
-#	cp -f nspr/obsolete/*.h ${D}/usr/lib/mozilla/include/nspr/obsolete
-#	cp -f nspr/private/*.h ${D}/usr/lib/mozilla/include/nspr/private
-#	cp -f nspr/md/*.cfg ${D}/usr/lib/mozilla/include/nspr/md
-
-	export MOZILLA_OFFICIAL=1
-	export BUILD_OFFICIAL=1
-	cd ${S}/xpinstall/packager
-	make || die
-	dodir /usr/lib
-
-	tar xzf ${S}/dist/mozilla-`uname -m`-pc-linux-gnu.tar.gz 	\
-	    -C ${D}/usr/lib
-
-	mv ${D}/usr/lib/package ${D}/usr/lib/mozilla
-	exeinto /usr/bin
-	doexe ${FILESDIR}/mozilla
-	insinto /etc/env.d
-	doins ${FILESDIR}/10mozilla
-	dodoc LEGAL LICENSE README/mozilla/README*
-
-	# Take care of non root execution
-	# (seems the problem is that not all files are readible by the user)
-	chmod -R g+r,o+r ${D}/usr/lib/mozilla
-}
-
-pkg_postinst () {
-	# Take care of component registration
-	export MOZILLA_FIVE_HOME="/usr/lib/mozilla"
-
-	# Needed to update the run time bindings for REGXPCOM 
-	# (do not remove next line!)
-	env-update
-	/usr/lib/mozilla/regxpcom
-	chmod g+r,o+r /usr/lib/mozilla/component.reg
-}
-
diff --git a/net-www/mozilla/mozilla-0.9.6-r1.ebuild b/net-www/mozilla/mozilla-0.9.6-r1.ebuild
new file mode 100644
index 000000000000..7a83c6b03456
--- /dev/null
+++ b/net-www/mozilla/mozilla-0.9.6-r1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>
+# /space/gentoo/cvsroot/gentoo-x86/net-www/mozilla/mozilla-0.9.6.ebuild,v 1.4 2001/11/23 04:45:07 azarah Exp
+
+S=${WORKDIR}/mozilla
+DESCRIPTION="The Mozilla web browser"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla${PV}/src/${PN}-source-${PV}.tar.bz2"
+HOMEPAGE="http://www.mozilla.org"
+
+PROVIDE="virtual/x11-web-browser"
+
+RDEPEND=">=gnome-base/ORBit-0.5.10-r1
+	>=dev-libs/glib-1.2.10
+	>=x11-libs/gtk+-1.2.10-r4
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.0.9
+	app-arch/zip
+	app-arch/unzip
+	mozqt? ( x11-libs/qt-x11 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/perl"
+
+
+# needed by src_compile() and src_install()
+export MOZILLA_OFFICIAL=1
+export BUILD_OFFICIAL=1	
+
+src_compile() {
+
+	chown -R root.root *
+
+	local myconf
+	if [ "`use mozqt`" ] ; then
+		myconf="--with-qt --enable-toolkit=qt --without-gtk"
+	else
+		myconf="--with-gtk --enable-toolkit=gtk"
+	fi
+
+	if [ -z "$DEBUG" ] ; then
+		myconf="${myconf} --enable-strip-libs"
+	fi
+
+
+	# NB!!:  Due to the fact that the non default modules 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 (as of 0.9.6, according to configure (line ~9787)):
+	#     cookie wallet content-packs xml-rpc xmlextras help transformiix venkman
+	# Non-defaults are:
+	#     irc xmlterm inspector access-builtin ctl
+	local myext="default"
+	if [ "`use mozirc`" ] ; then
+		myext="${myext},irc"
+	fi
+	if [ "`use mozxmlterm`" ] ; then
+		myext="${myext},xmlterm"
+	fi
+	if [ "`use mozinspector`" ] ; then
+		myext="${myext},inspector"
+	fi
+	if [ "`use mozaccess-builtin`" ] ; then
+		myext="${myext},access-builtin"
+	fi
+	if [ "`use mozctl`" ] ; then
+		myext="${myext},ctl"
+	fi
+	
+	
+	export BUILD_MODULES=all
+
+	./configure  --host=${CHOST}					\
+		     --prefix=/usr/lib/mozilla 				\
+		     --disable-tests		 			\
+		     --disable-debug					\
+		     --disable-dtd-debug				\
+		     --disable-pedantic					\
+		     --enable-xsl					\
+		     --enable-crypto					\
+		     --enable-detect-webshell-leaks			\
+		     --with-java-supplement				\
+		     --with-extensions="${myext}"			\
+		     --enable-optimize=-O3				\
+		     --with-default-mozilla-five-home=/usr/lib/mozilla	\
+		     ${myconf} || die
+
+	make depend || die
+	make || die
+}
+
+src_install() {
+
+	dodir /usr/lib/mozilla/include
+	cd ${S}/dist/include
+	cp -LfR * ${D}/usr/lib/mozilla/include
+
+	cd ${S}/xpinstall/packager
+	make || die
+	dodir /usr/lib
+
+	tar xzf ${S}/dist/mozilla-`uname -m`-pc-linux-gnu.tar.gz 	\
+	    -C ${D}/usr/lib
+
+	exeinto /usr/bin
+	doexe ${FILESDIR}/mozilla
+	insinto /etc/env.d
+	doins ${FILESDIR}/10mozilla
+	dodoc LEGAL LICENSE README/mozilla/README*
+
+	# Take care of non root execution
+	# (seems the problem is that not all files are readible by the user)
+	chmod -R g+r,o+r ${D}/usr/lib/mozilla
+
+        # Install icon and .desktop for menu entry
+	if [ "`use gnome`" ] ; then
+		insinto /usr/share/pixmaps
+		doins ${S}/build/package/rpm/SOURCES/mozilla-icon.png
+		insinto /usr/share/gnome/apps/Internet
+		doins ${S}/build/package/rpm/SOURCES/mozilla.desktop
+        fi
+
+	# Fix to get it removed at unmerge
+	touch ${D}/usr/lib/mozilla/component.reg
+}
+
+pkg_postinst () {
+
+	# Take care of component registration
+	export MOZILLA_FIVE_HOME="/usr/lib/mozilla"
+
+	# Needed to update the run time bindings for REGXPCOM 
+	# (do not remove next line!)
+	env-update
+	# Register components, setup Chrome .rdf files and fix file permissions
+	/usr/lib/mozilla/regxpcom
+	chmod g+r,o+r /usr/lib/mozilla/component.reg
+	/usr/lib/mozilla/regchrome
+	find /usr/lib/mozilla -type d -perm 0700 -exec chmod 755 {} \; || :
+
+    
+	echo
+	echo "*****************************************************************"
+	echo "* NB:  Please unmerge old versions prior to 0.9.5 as the header *"
+	echo "* layout in /usr/lib/mozilla/include have changed and will      *"
+	echo "* result in compile errors when compiling programs that need    *"
+	echo "* mozilla headers and libs (galeon, nautilus, ...)              *"
+	echo "*****************************************************************"
+	echo
+}
+