new version

8 files changed, 92 insertions, 873 deletions

diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index 57be9bdc156c..127afb85a70d 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-www/mozilla
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.34 2002/08/27 08:11:28 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.35 2002/08/30 19:49:25 azarah Exp $
+
+*mozilla-1.1 (30 Aug 2002)
+
+  30 Aug 2002; Martin Schlemmer <azarah@gentoo.org> mozilla-1.1.ebuild :
+
+  Update version.  Also cleaned up the build some what.  Gtk+-2.0 support
+  seems usable for a change, and it also installs mozilla-remote-client,
+  thus our script will open additional URL's in the same session for
+  gtk2 version.
+
+  Added Enigmail support if "crypt" in USE, and the mail addon is built,
+  thanks to J Robert Ray <jrray@jrray.org>, closing bug #7149.
 
   27 Aug 2002; Wout Mertens <wmertens@gentoo.org> mozilla-1.1_beta :
 
diff --git a/net-www/mozilla/files/digest-mozilla-1.0-r2 b/net-www/mozilla/files/digest-mozilla-1.0-r2
deleted file mode 100644
index b445e74f96ef..000000000000
--- a/net-www/mozilla/files/digest-mozilla-1.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 033da936e48336aa2c5d8bf0aa039056 mozilla-source-1.0.tar.bz2 29620700
diff --git a/net-www/mozilla/files/digest-mozilla-1.0-r4 b/net-www/mozilla/files/digest-mozilla-1.0-r4
deleted file mode 100644
index b445e74f96ef..000000000000
--- a/net-www/mozilla/files/digest-mozilla-1.0-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 033da936e48336aa2c5d8bf0aa039056 mozilla-source-1.0.tar.bz2 29620700
diff --git a/net-www/mozilla/files/digest-mozilla-1.1 b/net-www/mozilla/files/digest-mozilla-1.1
new file mode 100644
index 000000000000..91495e01676d
--- /dev/null
+++ b/net-www/mozilla/files/digest-mozilla-1.1
@@ -0,0 +1,3 @@
+MD5 4fa54be2a540d584e428f50eaedfac76 mozilla-source-1.1.tar.gz 40817026
+MD5 946afa0c6fc91918fb3adc021c8471ae enigmail-0.63.3.tar.gz 134642
+MD5 a3cea7d2efa70fe9ce2066cf2fa6cf9d ipc-0.99.63.tar.gz 57214
diff --git a/net-www/mozilla/files/digest-mozilla-1.1_beta b/net-www/mozilla/files/digest-mozilla-1.1_beta
deleted file mode 100644
index cb57abde2de1..000000000000
--- a/net-www/mozilla/files/digest-mozilla-1.1_beta
+++ /dev/null
@@ -1 +0,0 @@
-MD5 608dc8abe8ea512fb4172f1191f6fe58 mozilla-source-1.1b.tar.bz2 30240179
diff --git a/net-www/mozilla/mozilla-1.0-r2.ebuild b/net-www/mozilla/mozilla-1.0-r2.ebuild
deleted file mode 100644
index 1c7200ee52a4..000000000000
--- a/net-www/mozilla/mozilla-1.0-r2.ebuild
+++ /dev/null
@@ -1,364 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.0-r2.ebuild,v 1.7 2002/08/16 03:01:02 murphy Exp $
-
-# NOTE: to build without the mail and news component:  export NO_MAIL="YES"
-
-# handle _rc versions
-MY_PV1=${PV/_}
-MY_PV2=${PV/_/\.}
-S=${WORKDIR}/mozilla
-DESCRIPTION="The Mozilla Web Browser"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla/releases/${PN}${MY_PV1}/src/${PN}-source-${MY_PV1}.tar.bz2"
-HOMEPAGE="http://www.mozilla.org"
-KEYWORDS="x86 ppc sparc sparc64"
-LICENSE="MPL-1.1 | NPL-1.1"
-
-RDEPEND=">=x11-base/xfree-4.2.0-r11
-	>=gnome-base/ORBit-0.5.10-r1
-	=dev-libs/glib-1.2*
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/jpeg-6b
-	>=media-libs/libmng-1.0.0
-	>=media-libs/libpng-1.2.1
-	dev-libs/expat
-	app-arch/zip
-	app-arch/unzip
-	( >=x11-libs/gtk+-1.2.10 
-	  <x11-libs/gtk+-1.3.0 )
-	java?  ( virtual/jre )"
-#	gtk?   ( x11-libs/gtk+ )
-#	mozqt? ( x11-libs/qt )"
-
-DEPEND="java?  ( >=dev-java/java-config-0.2.0 )
-	${RDEPEND}
-	virtual/x11
-	sys-devel/perl"
-
-SLOT="0"
-
-# needed by src_compile() and src_install()
-export MOZILLA_OFFICIAL=1
-export BUILD_OFFICIAL=1
-
-# enable XFT
-[ "${DISABLE_XFT}" != "1" ] && export MOZ_ENABLE_XFT=1
-
-# make sure the nss module gets build (for NSS support)
-[ -n "`use ssl`" ] && export MOZ_PSM=1
-
-# do we build java support for the NSS stuff ?
-# NOTE: this is broken for the moment
-#[ "`use java`" ] && export NS_USE_JDK=1
-
-
-src_unpack() {
-	
-	unpack ${A}
-
-	# Fix a compile error with freetype-2.0.9 or later
-	cd ${S}
-	patch -p1 < ${FILESDIR}/mozilla-new-freetype2.patch || die
-
-	# NOTE: XFT support will still work without this patch
-# This needs an updated XFree86
-#	if [ -n "${MOZ_ENABLE_XFT}" ] ; then
-#		cd ${S}
-#		patch -p0 <${FILESDIR}/${P}-xft.patch || die
-#	fi
-}
-
-src_compile() {
-
-	chown -R root.root *
-	#This should enable parallel builds, I hope
-	export MAKE="emake"
-	local myconf=""
-	# NOTE: QT and XLIB toolkit seems very unstable, leave disabled until
-	#       tested ok -- azarah
-#	if [ -n "`use qt`" ] ; then
-		# when you enable this again, remember the qt dir is now /usr/qt/2 - danarmak
-#		myconf="--enable-toolkit-qt --enable-default-toolkit=qt \
-#			--disable-toolkit-gtk --disable-toolkit-xlib"
-#	elif [ -n "`use gtk`" ] ; then
-		myconf="--enable-toolkit-gtk --enable-default-toolkit=gtk \
-			--disable-toolkit-qt --disable-toolkit-xlib"
-#	else
-#		myconf="--enable-toolkit-xlib --enable-default-toolkit=xlib \
-#			--disable-toolkit-qt --disable-toolkit-gtk"
-#	fi
-
-	if [ -z "`use ldap`" ] ; then
-		myconf="${myconf} --disable-ldap"
-	fi
-
-	if [ -z "$DEBUG" ] ; then
-		myconf="${myconf} --enable-strip-libs --disable-debug \
-			--disable-dtd-debug --disable-tests"
-	fi
-
-	if [ -n "${MOZ_ENABLE_XFT}" ] ; then
-		# for this we have to use freetype-2.0.8 included with XFree86
-		myconf="${myconf} --enable-xft --with-ft-prefix=/usr/X11R6 \
-			--with-ft-exec-prefix=/usr/X11R6/bin"
-			
-		export FT2_CONFIG="/usr/X11R6/bin/freetype-config"
-	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 (as of 1.0rc1, according to configure (line ~10799)):
-	#     cookie wallet content-packs xml-rpc xmlextras help transformiix venkman inspector irc
-	# Non-defaults are:
-	#     xmlterm access-builtin ctl p3p interfaceinfo
-	local myext="default"
-	if [ -n "`use mozxmlterm`" ] ; then
-		myext="${myext},xmlterm"
-	fi
-	if [ -n "`use mozaccess-builtin`" ] ; then
-		myext="${myext},access-builtin"
-	fi
-	if [ -n "`use mozctl`" ] ; then
-		myext="${myext},ctl"
-	fi
-	if [ -n "`use mozp3p`" ] ; then
-		myext="${myext},p3p"
-	fi
-	if [ -n "`use mozinterfaceinfo`" ] ; then
-		myext="${myext},interfaceinfo"
-	fi
-
-	
-	if [ "${NO_MAIL}" = "YES" ] || [ "${NO_MAIL}" = "yes" ]
-	then
-		myconf="${myconf} --disable-mailnews"
-	fi
-	
-	export BUILD_MODULES=all
-	export BUILD_OPT=1
-
-	# Crashes on start when compiled with -fomit-frame-pointer
-	CFLAGS="${CFLAGS/-fomit-frame-pointer}"
-	CXXFLAGS="${CXXFLAGS/-fomit-frame-pointer}"
-
-	./configure --prefix=/usr/lib/mozilla \
-		--disable-tests \
-		--disable-pedantic \
-		--disable-svg \
-		--enable-xsl \
-		--enable-crypto \
-		--enable-detect-webshell-leaks \
-		--enable-xinerama \
-		--with-java-supplement \
-		--with-pthreads \
-		--with-extensions="${myext}" \
-		--enable-optimize=-O3 \
-		--with-default-mozilla-five-home=/usr/lib/mozilla \
-		${myconf} || die
-
-	make || die
-
-	# Build the NSS/SSL support
-	if [ "`use ssl`" ] ; then
-		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
-
-		make || die
-
-		cd ${S}/security/nss
-		
-		make moz_import || die
-		make || die
-		cd ${S}
-	fi
-}
-
-src_install() {
-
-	# 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
-
-	# Build the Release Tarball
-	cd ${S}/xpinstall/packager
-	make || die
-	dodir /usr/lib
-
-    TODO=""
-	case ${ARCH} in 
-		ppc) 
-			TODO="${S}/dist/mozilla-powerpc-unknown-linux-gnu.tar.gz"
-			;;
-		x86)
-			TODO="${S}/dist/mozilla-`uname -m`-pc-linux-gnu.tar.gz"
-			;;
-		sparc)
-			;;
-		sparc64)
-			;;
-		arm)
-			;;
-		*)
-			TODO="${S}/dist/mozilla-`uname -m`-pc-linux-gnu.tar.gz"
-			;;
-	esac
-
-	tar xzf ${TODO} -C ${D}/usr/lib
-
-	# 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
-		# Install the headers ('make install' do not work for headers ...)
-		insinto /usr/lib/mozilla/include/nss
-		doins ${S}/dist/public/seccmd/*.h
-		doins ${S}/dist/public/security/*.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/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}
-	exeinto /usr/bin
-	doexe ${FILESDIR}/mozilla
-	insinto /etc/env.d
-	doins ${FILESDIR}/10mozilla
-	dodoc LEGAL LICENSE README/mozilla/README*
-
-	# 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
-		cp mozilla.desktop mozilla.desktop.orig
-		sed -e 's:Comment=Mozilla:Comment=Mozilla Web Browser:'	\
-			mozilla.desktop.orig >mozilla.desktop
-		cd ${S}
-		insinto /usr/share/gnome/apps/Internet
-		doins ${S}/build/package/rpm/SOURCES/mozilla.desktop
-        fi
-
-	if [ -n "${MOZ_ENABLE_XFT}" ] ; then
-		cd ${D}/usr/lib/mozilla/defaults/pref
-		patch -p0 <${FILESDIR}/mozilla-xft-unix-prefs.patch || \
-			die "failed unix prefs patch"
-	fi
-
-	# 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_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/components ]
-	then 
-		rm -rf ${ROOT}/usr/lib/mozilla/chrome
-	fi
-}
-
-pkg_postinst() {
-
-	# Make symlink for Java plugin (do not do in src_install(), else it only
-	# gets installed every second time)
-	if [ "`use java`" ] && [ ! -L /usr/lib/mozilla/plugins/`java-config --browser-plugin=mozilla` ]
-	then
-		if [ -e `java-config --full-browser-plugin-path=mozilla` ]
-		then
-			ln -sf `java-config --full-browser-plugin-path=mozilla` \
-				/usr/lib/mozilla/plugins/`java-config --browser-plugin=mozilla` 
-		fi
-	fi
-
-	# Take care of component registration
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
-
-	# Remove any stale component.reg
-	if [ -e ${ROOT}/usr/lib/mozilla/component.reg ] ; then
-		rm -f ${ROOT}/usr/lib/mozilla/component.reg
-	fi
-
-	# Tempory fix for missing libtimer_gtk.so
-	# If it exists when generating component.reg (before unmerge of old),
-	# it 'corrupts' the newly generated component.reg with invalid references.
-	if [ -e ${ROOT}/usr/lib/mozilla/components/libtimer_gtk.so ] ; then
-		rm -f ${ROOT}/usr/lib/mozilla/components/libtimer_gtk.so
-	fi
-
-	# 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
-	umask 022
-	${ROOT}/usr/lib/mozilla/regxpcom
-	chmod g+r,o+r ${ROOT}/usr/lib/mozilla/component.reg
-	# Setup the default skin and locale to correctly generate the Chrome .rdf files
-	echo "skin,install,select,classic/1.0" >> \
-		${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt
-	echo "locale,install,select,en-US" >> \
-		${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt
-	${ROOT}/usr/lib/mozilla/regchrome
-	find ${ROOT}/usr/lib/mozilla -type d -perm 0700 -exec chmod 755 {} \; || :
-
-    
-	echo
-	echo "*****************************************************************"
-	echo "* NB:  Please unmerge old versions of mozilla, 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
-}
-
-pkg_postrm() {
-
-	# Regenerate component.reg in case some things changed
-	if [ -e ${ROOT}/usr/lib/mozilla/regxpcom ] ; then
-	
-		if [ -e ${ROOT}/usr/lib/mozilla/component.reg ] ; then
-			rm -f ${ROOT}/usr/lib/mozilla/component.reg
-		fi
-		
-		${ROOT}/usr/lib/mozilla/regxpcom
-		chmod g+r,o+r ${ROOT}/usr/lib/mozilla/component.reg
-	fi
-}
-
diff --git a/net-www/mozilla/mozilla-1.0-r4.ebuild b/net-www/mozilla/mozilla-1.0-r4.ebuild
deleted file mode 100644
index 2fc8a78ce047..000000000000
--- a/net-www/mozilla/mozilla-1.0-r4.ebuild
+++ /dev/null
@@ -1,431 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.0-r4.ebuild,v 1.4 2002/08/16 03:01:02 murphy Exp $
-
-# NOTE: to build without the mail and news component:  export NO_MAIL="YES"
-inherit makeedit
-
-# handle _rc versions
-MY_PV1=${PV/_}
-MY_PV2=${PV/_/\.}
-S=${WORKDIR}/mozilla
-DESCRIPTION="The Mozilla Web Browser"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla/releases/${PN}${MY_PV1}/src/${PN}-source-${MY_PV1}.tar.bz2"
-HOMEPAGE="http://www.mozilla.org"
-KEYWORDS="x86 ppc sparc sparc64"
-LICENSE="MPL-1.1 | NPL-1.1"
-
-RDEPEND=">=x11-base/xfree-4.2.0-r11
-	>=gnome-base/ORBit-0.5.10-r1
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/jpeg-6b
-	>=media-libs/libmng-1.0.0
-	>=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.0.5 :
-	  =x11-libs/gtk+-1.2* )
-	( gtk2? >=dev-libs/glib-2.0.4 :
-	  =dev-libs/glib-1.2* )
-	java?  ( virtual/jre )"
-#	gtk?   ( x11-libs/gtk+ )
-#	mozqt? ( x11-libs/qt )"
-
-DEPEND="java?  ( >=dev-java/java-config-0.2.0 )
-	${RDEPEND}
-	virtual/x11
-	sys-devel/perl"
-
-SLOT="0"
-
-# needed by src_compile() and src_install()
-export MOZILLA_OFFICIAL=1
-export BUILD_OFFICIAL=1
-
-# enable XFT
-[ "${DISABLE_XFT}" != "1" ] && [ -z "`use gtk2`" ] && \
-	export MOZ_ENABLE_XFT=1
-
-# enable GTK+-2.0 support
-if [ "`use gtk2`" ] ; then
-	export MOZ_ENABLE_GTK2=1
-	export MOZ_WIDGET_GTK2=1
-	export MOZ_WIDGET_TOOLKIT=gtk2
-fi
-
-# make sure the nss module gets build (for NSS support)
-[ -n "`use ssl`" ] && export MOZ_PSM=1
-
-# do we build java support for the NSS stuff ?
-# NOTE: this is broken for the moment
-#[ "`use java`" ] && export NS_USE_JDK=1
-
-
-src_unpack() {
-	
-	unpack ${A}
-
-	# Fix a compile error with freetype-2.0.9 or later
-	cd ${S}
-	patch -p1 < ${FILESDIR}/mozilla-new-freetype2.patch || die
-
-	[ -z "${CC}" ] && CC=gcc
-	if [ "`${CC} -dumpversion | cut -d. -f1,2`" != "2.95" ] ; then
-		# Fix bogus asm (from Mandrake .spec)
-		patch -p1 < ${FILESDIR}/${P}-asmfixes.patch || die
-
-#		patch -p1 < ${FILESDIR}/${P}-gcc3-java-plugin.patch || die
-
-		# ABI compat patch for gcc-3.x to use gcc-2.95 plugins
-		#
-		# http://bugzilla.mozilla.org/show_bug.cgi?id=154206
-		# http://bugzilla.mozilla.org/show_bug.cgi?id=124006
-		# http://bugzilla.mozilla.org/show_bug.cgi?id=116444
-		#
-		if [ "${ARCH}" = "x86" ] ; then
-			patch -p0 < ${FILESDIR}/${P}-abi-compat-wrappers.patch
-		fi
-
-                # ABI Patch for ppc/xpcom for gcc-3.x
-                # http://bugzilla.mozilla.org/show_bug.cgi?id=142594
-
-                if [ "${ARCH}" = "ppc" ] ; then
-                        patch -p0 < ${FILESDIR}/mozilla-1.0-abi-xpcom-ppc.patch || die
-                fi
-	fi
-
-	# Apply the bytecode patch for freetype2
-	patch -p1 < ${FILESDIR}/mozilla-ft-bytecode.patch || die
-
-	# Use gtk+-2.0 as widget toolkit
-	if [ "`use gtk2`" ] ; then
-		cd ${S}/embedding/browser/gtk/src
-		bzip2 -dc ${FILESDIR}/gtk2_embed.patch.bz2 | patch -p0 || die
-		cd ${S}/widget/src/gtk2
-		bzip2 -dc ${FILESDIR}/gtk2_widget.patch.bz2 | patch -p0 || die
-	fi
-}
-
-src_compile() {
-
-	chown -R root.root *
-	#This should enable parallel builds, I hope
-	export MAKE="emake"
-	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-gtk"
-	else
-		myconf="${myconf} --enable-toolkit-gtk \
-			--enable-default-toolkit=gtk \
-			--disable-toolkit-qt \
-			--disable-toolkit-xlib \
-			--disable-gtk2"
-	fi
-
-	if [ -z "`use ldap`" ] ; then
-		myconf="${myconf} --disable-ldap"
-	fi
-
-	if [ -z "${DEBUG}" ] ; then
-		myconf="${myconf} --enable-strip-libs \
-			--disable-debug \
-			--disable-dtd-debug \
-			--disable-tests"
-	fi
-
-	if [ -n "${MOZ_ENABLE_XFT}" ] ; then
-		# for this we have to use freetype-2.0.8 included with XFree86
-		myconf="${myconf} --enable-xft \
-			--with-ft-prefix=/usr/X11R6 \
-			--with-ft-exec-prefix=/usr/X11R6/bin"
-			
-		export FT2_CONFIG="/usr/X11R6/bin/freetype-config"
-	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 (as of 1.0rc1, according to configure (line ~10799)):
-	#     cookie wallet content-packs xml-rpc xmlextras help transformiix venkman inspector irc
-	# Non-defaults are:
-	#     xmlterm access-builtin ctl p3p interfaceinfo
-	local myext="default"
-	if [ -n "`use mozxmlterm`" ] ; then
-		myext="${myext},xmlterm"
-	fi
-	if [ -n "`use mozaccess-builtin`" ] ; then
-		myext="${myext},access-builtin"
-	fi
-	if [ -n "`use mozctl`" ] ; then
-		myext="${myext},ctl"
-	fi
-	if [ -n "`use mozp3p`" ] ; then
-		myext="${myext},p3p"
-	fi
-	if [ -n "`use mozinterfaceinfo`" ] ; then
-		myext="${myext},interfaceinfo"
-	fi
-
-	
-	if [ -n "`use moznomail`" ] || \
-	   [ "${NO_MAIL}" = "YES" ] || [ "${NO_MAIL}" = "yes" ]
-	then
-		myconf="${myconf} --disable-mailnews"
-	fi
-	
-	export BUILD_MODULES=all
-	export BUILD_OPT=1
-
-	# Currently gcc-3.1.1 dont work well if we specify "-march"
-	# and other optimizations
-	[ -z "${CC}" ] && CC=gcc
-	if [ "`${CC} -dumpversion`" = "3.1.1" ] ; then
-		export CFLAGS=""
-		export CXXFLAGS=""
-	fi
-
-	# Crashes on start when compiled with -fomit-frame-pointer
-	CFLAGS="${CFLAGS/-fomit-frame-pointer}"
-	CXXFLAGS="${CXXFLAGS/-fomit-frame-pointer} -Wno-deprecated"
-
-	./configure --prefix=/usr/lib/mozilla \
-		--disable-pedantic \
-		--disable-svg \
-		--enable-mathml \
-		--without-system-nspr \
-		--enable-nspr-autoconf \
-		--with-system-zlib \
-		--enable-ipv6 \
-		--enable-xsl \
-		--enable-crypto \
-		--enable-detect-webshell-leaks \
-		--enable-xinerama \
-		--with-java-supplement \
-		--with-pthreads \
-		--with-extensions="${myext}" \
-		--enable-optimize="-O3" \
-		--with-default-mozilla-five-home=/usr/lib/mozilla \
-		${myconf} || die
-
-	edit_makefiles
-	make || die
-
-	# Build the NSS/SSL support
-	if [ "`use ssl`" ] ; then
-		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
-
-		make || die
-
-		cd ${S}/security/nss
-		
-		make moz_import || die
-		make || die
-		cd ${S}
-	fi
-}
-
-src_install() {
-
-	# 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
-
-	# Build the Release Tarball
-	cd ${S}/xpinstall/packager
-	make || die
-	dodir /usr/lib
-
-    TODO=""
-	case ${ARCH} in 
-		ppc) 
-			TODO="${S}/dist/mozilla-powerpc-unknown-linux-gnu.tar.gz"
-			;;
-		x86)
-			TODO="${S}/dist/mozilla-`uname -m`-pc-linux-gnu.tar.gz"
-			;;
-		sparc)
-			;;
-		sparc64)
-			;;
-		arm)
-			;;
-		*)
-			TODO="${S}/dist/mozilla-`uname -m`-pc-linux-gnu.tar.gz"
-			;;
-	esac
-
-	tar xzf ${TODO} -C ${D}/usr/lib
-
-	# 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
-		# Install the headers ('make install' do not work for headers ...)
-		insinto /usr/lib/mozilla/include/nss
-		doins ${S}/dist/public/seccmd/*.h
-		doins ${S}/dist/public/security/*.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/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}
-	exeinto /usr/bin
-	newexe ${FILESDIR}/mozilla.sh mozilla
-	insinto /etc/env.d
-	doins ${FILESDIR}/10mozilla
-	dodoc LEGAL LICENSE README/mozilla/README*
-
-	# 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
-		cp mozilla.desktop mozilla.desktop.orig
-		sed -e 's:Comment=Mozilla:Comment=Mozilla Web Browser:'	\
-			mozilla.desktop.orig >mozilla.desktop
-		cd ${S}
-		insinto /usr/share/gnome/apps/Internet
-		doins ${S}/build/package/rpm/SOURCES/mozilla.desktop
-        fi
-
-	if [ -n "${MOZ_ENABLE_XFT}" ] ; then
-		cd ${D}/usr/lib/mozilla/defaults/pref
-		patch -p0 <${FILESDIR}/mozilla-xft-unix-prefs.patch || \
-			die "failed unix prefs patch"
-	fi
-
-	# 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_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/components ]
-	then 
-		rm -rf ${ROOT}/usr/lib/mozilla/chrome
-	fi
-}
-
-pkg_postinst() {
-
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
-
-	# Make symlink for Java plugin (do not do in src_install(), else it only
-	# gets installed every second time)
-	if [ "`use java`" ] && [ ! -L ${MOZILLA_FIVE_HOME}/plugins/`java-config --browser-plugin=mozilla` ]
-	then
-		if [ -e `java-config --full-browser-plugin-path=mozilla` ]
-		then
-			ln -sf `java-config --full-browser-plugin-path=mozilla` \
-				${MOZILLA_FIVE_HOME}/plugins/`java-config --browser-plugin=mozilla` 
-		fi
-	fi
-
-	# Take care of component registration
-
-	# Remove any stale component.reg
-	if [ -e ${MOZILLA_FIVE_HOME}/component.reg ] ; then
-		rm -f ${MOZILLA_FIVE_HOME}/component.reg
-	fi
-
-	# Tempory fix for missing libtimer_gtk.so
-	# If it exists when generating component.reg (before unmerge of old),
-	# it 'corrupts' the newly generated component.reg with invalid references.
-	if [ -e ${MOZILLA_FIVE_HOME}/components/libtimer_gtk.so ] ; then
-		rm -f ${MOZILLA_FIVE_HOME}/components/libtimer_gtk.so
-	fi
-
-	# 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
-	umask 022
-	${MOZILLA_FIVE_HOME}/regxpcom
-	chmod g+r,o+r ${MOZILLA_FIVE_HOME}/component.reg
-	# Setup the default skin and locale to correctly generate the Chrome .rdf files
-	find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec rm -f {} \; || :
-	echo "skin,install,select,classic/1.0" >> \
-		${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt
-	echo "locale,install,select,en-US" >> \
-		${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt
-	${MOZILLA_FIVE_HOME}/regchrome
-	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 755 {} \; || :
-
-    
-	echo
-	echo "*****************************************************************"
-	echo "* NB:  Please unmerge old versions of mozilla, 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
-}
-
-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 [ -e ${MOZILLA_FIVE_HOME}/component.reg ] ; then
-			rm -f ${MOZILLA_FIVE_HOME}/component.reg
-		fi
-
-		${MOZILLA_FIVE_HOME}/regxpcom
-		chmod g+r,o+r ${MOZILLA_FIVE_HOME}/component.reg
-
-		find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec rm -f {} \; || :
-		${MOZILLA_FIVE_HOME}/regchrome
-		find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 755 {} \; || :
-	fi
-}
-
diff --git a/net-www/mozilla/mozilla-1.1_beta.ebuild b/net-www/mozilla/mozilla-1.1.ebuild
index 13ad97c7824c..1e68fc4dff64 100644
--- a/net-www/mozilla/mozilla-1.1_beta.ebuild
+++ b/net-www/mozilla/mozilla-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.1_beta.ebuild,v 1.10 2002/08/27 08:11:28 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.1.ebuild,v 1.1 2002/08/30 19:49:25 azarah Exp $
 
 # NOTE: to build without the mail and news component:  export NO_MAIL="YES"
 inherit makeedit
@@ -10,9 +10,13 @@ MY_PV1=${PV/_}
 MY_PV2=${MY_PV1/eta}
 S=${WORKDIR}/mozilla
 DESCRIPTION="The Mozilla Web Browser"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla/releases/${PN}${MY_PV2}/src/${PN}-source-${MY_PV2}.tar.bz2"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla/releases/${PN}${MY_PV2}/src/${PN}-source-${MY_PV2}.tar.gz
+	crypt? ( http://enigmail.mozdev.org/dload/src/enigmail-0.63.3.tar.gz
+	         http://enigmail.mozdev.org/dload/src/ipc-0.99.63.tar.gz )"
 HOMEPAGE="http://www.mozilla.org"
+
 KEYWORDS="x86 ppc sparc sparc64"
+SLOT="0"
 LICENSE="MPL-1.1 | NPL-1.1"
 
 RDEPEND=">=x11-base/xfree-4.2.0-r11
@@ -30,15 +34,11 @@ RDEPEND=">=x11-base/xfree-4.2.0-r11
 	( gtk2? >=dev-libs/glib-2.0.4 :
 	  =dev-libs/glib-1.2* )
 	java?  ( virtual/jre )"
-#	gtk?   ( x11-libs/gtk+ )
-#	mozqt? ( x11-libs/qt )"
 
-DEPEND="java?  ( >=dev-java/java-config-0.2.0 )
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	virtual/x11
-	sys-devel/perl"
-
-SLOT="0"
+	sys-devel/perl
+	java? ( >=dev-java/java-config-0.2.0 )"
 
 # needed by src_compile() and src_install()
 export MOZILLA_OFFICIAL=1
@@ -60,69 +60,52 @@ src_unpack() {
 	
 	unpack ${A}
 
-	# Fix a compile error with freetype-2.0.9 or later
-	#
-	# This is not needed with mozilla-1.1_beta anymore ...
 	cd ${S}
-#	patch -p1 < ${FILESDIR}/mozilla-new-freetype2.patch || die
+
+	# Fix a ownership porblem
+	chown -R root.root *
 
 	[ -z "${CC}" ] && CC=gcc
 	if [ "`${CC} -dumpversion | cut -d. -f1,2`" != "2.95" ] ; then
 		# Fix bogus asm (from Mandrake .spec)
-		patch -p1 < ${FILESDIR}/mozilla-1.0-asmfixes.patch || die
-
-#		patch -p1 < ${FILESDIR}/${P}-gcc3-java-plugin.patch || die
-
-		# ABI compat patch for gcc-3.x to use gcc-2.95 plugins
-		#
-		# http://bugzilla.mozilla.org/show_bug.cgi?id=154206
-		# http://bugzilla.mozilla.org/show_bug.cgi?id=124006
-		# http://bugzilla.mozilla.org/show_bug.cgi?id=116444
-		#
-		if [ "${ARCH}" = "x86" ] ; then
-			patch -p0 < ${FILESDIR}/mozilla-1.0-abi-compat-wrappers.patch || die
-		fi
-
-                # ABI Patch for ppc/xpcom for gcc-3.x
-                # http://bugzilla.mozilla.org/show_bug.cgi?id=142594
+#		patch -p1 < ${FILESDIR}/mozilla-1.0-asmfixes.patch || die
 
-                if [ "${ARCH}" = "ppc" ] ; then
-                        patch -p0 < ${FILESDIR}/mozilla-1.0-abi-xpcom-ppc.patch || die
-                fi
+		# ABI Patch for ppc/xpcom for gcc-3.x
+		# http://bugzilla.mozilla.org/show_bug.cgi?id=142594
+		if [ "${ARCH}" = "ppc" ] ; then
+			patch -p0 < ${FILESDIR}/mozilla-1.0-abi-xpcom-ppc.patch || die
+		fi
 	fi
 
 	# Apply the bytecode patch for freetype2
 	patch -p1 < ${FILESDIR}/mozilla-ft-bytecode.patch || die
 
-	# Use gtk+-2.0 as widget toolkit
-	if [ "`use gtk2`" ] ; then
-		cd ${S}/embedding/browser/gtk/src
-		#bzip2 -dc ${FILESDIR}/gtk2_embed.patch.bz2 | patch -p0 || die
-		cd ${S}/widget/src/gtk2
-		#bzip2 -dc ${FILESDIR}/gtk2_widget.patch.bz2 | patch -p0 || die
+	# Unpack the enigmail plugin
+	if [ -n "`use crypt`" ] && [ -z "`use moznomail`" ] && \
+	   [ "${NO_MAIL}" != "YES" ] && [ "${NO_MAIL}" != "yes" ]
+	then
+		mv ${WORKDIR}/ipc ${S}/extensions/
+		mv ${WORKDIR}/enigmail ${S}/extensions/
 	fi
 }
 
 src_compile() {
 
-	chown -R root.root *
-	#This should enable parallel builds, I hope
-	export MAKE="emake"
 	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"
+			              --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"
+			              --enable-default-toolkit=gtk \
+			              --disable-toolkit-qt \
+			              --disable-toolkit-xlib \
+			              --disable-toolkit-gtk2"
 	fi
 
 	if [ -z "`use ldap`" ] ; then
@@ -131,18 +114,15 @@ src_compile() {
 
 	if [ -z "${DEBUG}" ] ; then
 		myconf="${myconf} --enable-strip-libs \
-			--disable-debug \
-			--disable-dtd-debug \
-			--disable-tests"
+			              --disable-debug \
+			              --disable-dtd-debug \
+			              --disable-tests"
 	fi
 
 	if [ -n "${MOZ_ENABLE_XFT}" ] ; then
-		# for this we have to use freetype-2.0.8 included with XFree86
-		myconf="${myconf} --enable-xft --enable-freetype2"
-#			--with-ft-prefix=/usr/X11R6 \
-#			--with-ft-exec-prefix=/usr/X11R6/bin"
-			
-#		export FT2_CONFIG="/usr/X11R6/bin/freetype-config"
+		# Enable Xft (currently this is done via freetype2 for gtk1,
+		# and libpangoXft for gtk2).
+		myconf="${myconf} --enable-xft"
 	fi
 
 
@@ -185,13 +165,14 @@ src_compile() {
 	# Currently gcc-3.1.1 dont work well if we specify "-march"
 	# and other optimizations for pentium4.
 	[ -z "${CC}" ] && CC=gcc
-	if [ "`${CC} -dumpversion`" = "3.1.1" ] || \
-	   [ "`${CC} -dumpversion`" = "3.2" ]
-	then
+	if [ "`${CC} -dumpversion | cut -d. -f1`" -eq "3" ] ; then
 		export CFLAGS="${CFLAGS/pentium4/pentium3}"
 		export CXXFLAGS="${CXXFLAGS/pentium4/pentium3}"
 	fi
-
+	
+	#This should enable parallel builds, I hope
+	export MAKE="emake"
+		
 	# Crashes on start when compiled with -fomit-frame-pointer
 	CFLAGS="${CFLAGS/-fomit-frame-pointer}"
 	CXXFLAGS="${CXXFLAGS/-fomit-frame-pointer} -Wno-deprecated"
@@ -235,6 +216,17 @@ src_compile() {
 		make || die
 		cd ${S}
 	fi
+
+	# Build the enigmail plugin
+	if [ -n "`use crypt`" ] && [ -z "`use moznomail`" ] && \
+	   [ "${NO_MAIL}" != "YES" ] && [ "${NO_MAIL}" != "yes" ]
+	then
+		cd ${S}/extensions/ipc
+		make || die
+
+		cd ${S}/extensions/enigmail
+		make || die
+	fi
 }
 
 src_install() {
@@ -242,8 +234,9 @@ src_install() {
 	# Install, don't create tarball
 	dodir /usr/lib
 	cd ${S}/xpinstall/packager
-	make MOZ_PKG_FORMAT=raw TAR_CREATE_FLAGS=-chf> /dev/null || die
-    mv ${S}/dist/mozilla ${D}/usr/lib/mozilla
+	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
 
 	# Copy the include and idl files
 	dodir /usr/lib/mozilla/include/idl /usr/include
@@ -266,6 +259,7 @@ src_install() {
 		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
 
@@ -301,11 +295,11 @@ src_install() {
 		cd ${S}/build/package/rpm/SOURCES
 		cp mozilla.desktop mozilla.desktop.orig
 		sed -e 's:Comment=Mozilla:Comment=Mozilla Web Browser:'	\
-			mozilla.desktop.orig >mozilla.desktop
+			mozilla.desktop.orig > mozilla.desktop
 		cd ${S}
 		insinto /usr/share/gnome/apps/Internet
 		doins ${S}/build/package/rpm/SOURCES/mozilla.desktop
-        fi
+	fi
 
 	if [ -n "${MOZ_ENABLE_XFT}" ] ; then
 		cd ${D}/usr/lib/mozilla/defaults/pref
@@ -320,14 +314,17 @@ src_install() {
 
 pkg_preinst() {
 	# Stale components and chrome files break when unmerging old
-	if [ -d ${ROOT}/usr/lib/mozilla/components ]
-	then
+	if [ -d ${ROOT}/usr/lib/mozilla/components ] ; then
 		rm -rf ${ROOT}/usr/lib/mozilla/components
 	fi
-	if [ -d ${ROOT}/usr/lib/mozilla/components ]
-	then 
+	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/component.reg ] ; then
+		rm -f ${ROOT}/usr/lib/component.reg
+	fi
 }
 
 pkg_postinst() {
@@ -372,6 +369,7 @@ pkg_postinst() {
 	# (do not remove next line!)
 	env-update
 	# Register components, setup Chrome .rdf files and fix file permissions
+	einfo "Registering Components and Chrome..."
 	umask 022
 	${MOZILLA_FIVE_HOME}/regxpcom
 	if [ -e ${MOZILLA_FIVE_HOME}/component.reg ] ; then
@@ -386,7 +384,8 @@ pkg_postinst() {
 	${MOZILLA_FIVE_HOME}/regchrome
 	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 755 {} \; || :
 
-    
+
+    echo
 	einfo
 	einfo "*****************************************************************"
 	einfo "* NB:  Please unmerge old versions of mozilla, as the header    *"
@@ -394,9 +393,12 @@ pkg_postinst() {
 	einfo "* result in compile errors when compiling programs that need    *"
 	einfo "* mozilla headers and libs (galeon, nautilus, ...)              *"
 	einfo "*****************************************************************"
-	einfo
-	einfo "This ebuild is an alpha of beta software which means it will have"
-	einfo "problems. Do not count on this to work flawlessly."
+	echo
+	einfo "*****************************************************************"
+	einfo "* Any Errors seen during Component and Chrome registration is   *"
+	einfo "* caused by pre 1.1 versions of mozilla being installed.        *"
+	einfo "* Please unmerge older versions and everything should be fine.  *"
+	einfo "*****************************************************************"
 	einfo
 }