whitespace cleanup

6 files changed, 470 insertions, 493 deletions

diff --git a/net-mail/mozilla-thunderbird/Manifest b/net-mail/mozilla-thunderbird/Manifest
index 46ed1a4395ae..ff0406e59d12 100644
--- a/net-mail/mozilla-thunderbird/Manifest
+++ b/net-mail/mozilla-thunderbird/Manifest
@@ -1,15 +1,15 @@
-MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
-MD5 f1c76394356bdca2a0982c583044943d mozilla-thunderbird-0.2_alpha20030813.ebuild 5151
-MD5 021ce52c1c9f6c03af1b1d7e29e45125 mozilla-thunderbird-0.2_alpha20030826.ebuild 5894
-MD5 e9792150421ace3fe4721d4b7116929b mozilla-thunderbird-0.1_alpha20030727.ebuild 4440
-MD5 02c3718083744ac4796fa7f44ceb8816 mozilla-thunderbird-0.2_alpha20030807.ebuild 4424
-MD5 f5272f1dad5b1a22edf9d36200cdf4a0 mozilla-thunderbird-0.2.ebuild 6212
 MD5 2ac5b7fbb11608b2950a64aadd8957ff ChangeLog 2267
+MD5 69cb1b56dc5b5a66c860e217ad829d53 mozilla-thunderbird-0.1_alpha20030727.ebuild 4103
+MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
+MD5 04533b9cfe482fd507fa1ee9e4fb0537 mozilla-thunderbird-0.2_alpha20030826.ebuild 5573
+MD5 40d7c841fcae2a677eed75207ab5efff mozilla-thunderbird-0.2_alpha20030807.ebuild 4087
+MD5 21a19ba9b222782569350f11f3582bbb mozilla-thunderbird-0.2_alpha20030813.ebuild 4812
+MD5 89f4bfeb5ad8bdaff25b5dd38801062f mozilla-thunderbird-0.2.ebuild 5891
 MD5 1adb062c6ed356e75ec53d1e35c9d350 files/MozillaThunderbird 302
-MD5 fdede59cd75244a953f882f5c3ac4b3b files/digest-mozilla-thunderbird-0.1_alpha20030727 89
-MD5 442b4b9da283205c20408669cf14e687 files/digest-mozilla-thunderbird-0.2_alpha20030807 89
 MD5 31f0d7553ef92beffbe53b0b4c722e3b files/digest-mozilla-thunderbird-0.2_alpha20030813 89
 MD5 4eff56a3a573691015ce9ab9211c4e6d files/digest-mozilla-thunderbird-0.2_alpha20030826 222
+MD5 fdede59cd75244a953f882f5c3ac4b3b files/digest-mozilla-thunderbird-0.1_alpha20030727 89
+MD5 442b4b9da283205c20408669cf14e687 files/digest-mozilla-thunderbird-0.2_alpha20030807 89
 MD5 754723dde90adc61f278ce292c8ba99e files/digest-mozilla-thunderbird-0.2 210
 MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
 MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
diff --git a/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.1_alpha20030727.ebuild b/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.1_alpha20030727.ebuild
index 4c0e90a654f3..90cfbfbf7b5f 100644
--- a/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.1_alpha20030727.ebuild
+++ b/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.1_alpha20030727.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.1_alpha20030727.ebuild,v 1.4 2003/08/01 15:35:43 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.1_alpha20030727.ebuild,v 1.5 2003/09/05 02:20:58 msterret Exp $
 
 inherit makeedit flag-o-matic gcc nsplugins
 
@@ -20,24 +20,24 @@ LICENSE="MPL-1.1 | NPL-1.1"
 IUSE="gtk2 ipv6"
 
 RDEPEND="virtual/x11
-   >=dev-libs/libIDL-0.8.0
-   >=gnome-base/ORBit-0.5.10-r1
-   virtual/xft
-   >=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.36
-   dev-libs/expat
-   app-arch/zip
-   app-arch/unzip
-   ( gtk2? >=x11-libs/gtk+-2.1.1 :
-     =x11-libs/gtk+-1.2* ) "
+	>=dev-libs/libIDL-0.8.0
+	>=gnome-base/ORBit-0.5.10-r1
+	virtual/xft
+	>=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.36
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	( gtk2? >=x11-libs/gtk+-2.1.1 :
+		=x11-libs/gtk+-1.2* ) "
 
 DEPEND="${RDEPEND}
-   virtual/glibc
-   dev-lang/perl"
-   
+	virtual/glibc
+	dev-lang/perl"
+
 # needed by src_compile() and src_install()
 export MOZ_THUNDERBIRD=1
 export MOZ_ENABLE_XFT=1
@@ -49,93 +49,91 @@ src_unpack() {
 }
 
 src_compile() {
-   local myconf="--with-x \
-      --with-system-jpeg \
-      --with-system-zlib \
-      --with-system-png \
-      --with-system-mng \
-      --disable-calendar \
-      --enable-xft \
-      --disable-pedantic \
-      --disable-svg \
-      --enable-mathml \
-      --without-system-nspr \
-      --enable-nspr-autoconf \
-      --enable-xsl \
-      --enable-crypto \
-      --enable-xinerama=no \
-      --with-pthreads \
-      --with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
-      --with-user-appdir=.thunderbird \
-      --disable-jsd \
-      --disable-accessibility \
-      --disable-profilesharing \
-      --disable-necko-disk-cache \
-      --disable-activex-scripting \
-      --disable-installer \
-      --disable-activex \
-      --disable-tests \
-      --disable-debug \
-      --disable-dtd-debug \
-      --disable-logging \
-      --enable-reorder \
-	  --enable-optimize="-O2" \
-      --enable-strip \
-      --enable-strip-libs \
-      --enable-cpp-rtti \
-      --enable-xterm-updates \
-      --disable-toolkit-qt \
-      --disable-toolkit-xlib \
-	  --enable-extensions=wallet \
-	  --enable-necko-protocols=http,file,jar,viewsource,res,data \
-	  --enable-image-decoders=png,gif,jpeg"
-
-    if [ -n "`use gtk2`" ] ; then
-        myconf="${myconf} --enable-toolkit-gtk2 \
-                          --enable-default-toolkit=gtk2 \
-                          --disable-toolkit-gtk"
-    else
-        myconf="${myconf} --enable-toolkit-gtk \
-                          --enable-default-toolkit=gtk \
-                          --disable-toolkit-gtk2"
-    fi
-
-    if [ -n "`use ipv6`" ] ; then
-        myconf="${myconf} --enable-ipv6"
-    fi
-
-   # Crashes on start when compiled with -fomit-frame-pointer
-   filter-flags -fomit-frame-pointer
-   filter-flags -ffast-math
-   append-flags -s -fforce-addr
-
-   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
-
-   fi
-
-   econf ${myconf} || die
-
-   edit_makefiles
-   emake MOZ_THUNDERBIRD=1 || die
-
+	local myconf="--with-x \
+		--with-system-jpeg \
+		--with-system-zlib \
+		--with-system-png \
+		--with-system-mng \
+		--disable-calendar \
+		--enable-xft \
+		--disable-pedantic \
+		--disable-svg \
+		--enable-mathml \
+		--without-system-nspr \
+		--enable-nspr-autoconf \
+		--enable-xsl \
+		--enable-crypto \
+		--enable-xinerama=no \
+		--with-pthreads \
+		--with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
+		--with-user-appdir=.thunderbird \
+		--disable-jsd \
+		--disable-accessibility \
+		--disable-profilesharing \
+		--disable-necko-disk-cache \
+		--disable-activex-scripting \
+		--disable-installer \
+		--disable-activex \
+		--disable-tests \
+		--disable-debug \
+		--disable-dtd-debug \
+		--disable-logging \
+		--enable-reorder \
+		--enable-optimize="-O2" \
+		--enable-strip \
+		--enable-strip-libs \
+		--enable-cpp-rtti \
+		--enable-xterm-updates \
+		--disable-toolkit-qt \
+		--disable-toolkit-xlib \
+		--enable-extensions=wallet \
+		--enable-necko-protocols=http,file,jar,viewsource,res,data \
+		--enable-image-decoders=png,gif,jpeg"
+
+	if [ -n "`use gtk2`" ] ; then
+		myconf="${myconf} --enable-toolkit-gtk2 \
+							--enable-default-toolkit=gtk2 \
+							--disable-toolkit-gtk"
+	else
+		myconf="${myconf} --enable-toolkit-gtk \
+							--enable-default-toolkit=gtk \
+							--disable-toolkit-gtk2"
+	fi
+
+	if [ -n "`use ipv6`" ] ; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+	# Crashes on start when compiled with -fomit-frame-pointer
+	filter-flags -fomit-frame-pointer
+	filter-flags -ffast-math
+	append-flags -s -fforce-addr
+
+	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
+
+	fi
+
+	econf ${myconf} || die
+
+	edit_makefiles
+	emake MOZ_THUNDERBIRD=1 || die
 }
 
 src_install() {
+	dodir /usr/lib
+	dodir /usr/lib/MozillaThunderbird
+	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaThunderbird
 
-   dodir /usr/lib
-   dodir /usr/lib/MozillaThunderbird
-   cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaThunderbird
+	#fix permissions
+	chown -R root.root ${D}/usr/lib/MozillaThunderbird
 
-   #fix permissions
-   chown -R root.root ${D}/usr/lib/MozillaThunderbird
-   
-   dobin ${FILESDIR}/MozillaThunderbird
+	dobin ${FILESDIR}/MozillaThunderbird
 
 #	# Install icon and .desktop for menu entry
 #	if [ "`use gnome`" ]
@@ -153,6 +151,4 @@ src_install() {
 #		insinto /usr/share/gnome/apps/Internet
 #		doins ${S}/build/package/rpm/SOURCES/mozillathunderbird.desktop
 #	fi
-
 }
-
diff --git a/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2.ebuild b/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2.ebuild
index 57ed12619cae..3211a99f6aea 100644
--- a/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2.ebuild
+++ b/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2.ebuild,v 1.1 2003/09/04 19:29:29 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2.ebuild,v 1.2 2003/09/05 02:20:58 msterret Exp $
 
 inherit makeedit flag-o-matic gcc nsplugins
 
@@ -36,13 +36,13 @@ RDEPEND="virtual/x11
 	app-arch/zip
 	app-arch/unzip
 	( gtk2? >=x11-libs/gtk+-2.1.1 :
-     =x11-libs/gtk+-1.2* )
-	crypt? ( >=app-crypt/gnupg-1.2.1 )"
+		=x11-libs/gtk+-1.2* )
+		crypt? ( >=app-crypt/gnupg-1.2.1 )"
 
 DEPEND="${RDEPEND}
 	virtual/glibc
 	dev-lang/perl"
-   
+
 # needed by src_compile() and src_install()
 export MOZ_THUNDERBIRD=1
 export MOZ_ENABLE_XFT=1
@@ -75,80 +75,80 @@ src_unpack() {
 }
 
 src_compile() {
-   local myconf="--with-x \
-      --with-system-jpeg \
-      --with-system-zlib \
-      --with-system-png \
-      --with-system-mng \
-      --disable-calendar \
-      --enable-xft \
-      --disable-pedantic \
-      --disable-svg \
-      --enable-mathml \
-      --without-system-nspr \
-      --enable-nspr-autoconf \
-      --enable-xsl \
-      --enable-crypto \
-      --enable-xinerama=no \
-      --with-pthreads \
-      --with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
-      --with-user-appdir=.thunderbird \
-      --disable-jsd \
-      --disable-accessibility \
-      --disable-profilesharing \
-      --disable-necko-disk-cache \
-      --disable-activex-scripting \
-      --disable-installer \
-      --disable-activex \
-      --disable-tests \
-      --disable-debug \
-      --disable-dtd-debug \
-      --disable-logging \
-      --enable-reorder \
-	  --enable-optimize="-O2" \
-      --enable-strip \
-      --enable-strip-libs \
-      --enable-cpp-rtti \
-      --enable-xterm-updates \
-      --disable-toolkit-qt \
-      --disable-toolkit-xlib \
-	  --enable-extensions=wallet \
-	  --enable-necko-protocols=http,file,jar,viewsource,res,data \
-	  --enable-image-decoders=png,gif,jpeg"
-
-    if [ -n "`use gtk2`" ] ; then
-        myconf="${myconf} --enable-toolkit-gtk2 \
-                          --enable-default-toolkit=gtk2 \
-                          --disable-toolkit-gtk"
-    else
-        myconf="${myconf} --enable-toolkit-gtk \
-                          --enable-default-toolkit=gtk \
-                          --disable-toolkit-gtk2"
-    fi
-
-    if [ -n "`use ipv6`" ] ; then
-        myconf="${myconf} --enable-ipv6"
-    fi
-
-   # Crashes on start when compiled with -fomit-frame-pointer
-   filter-flags -fomit-frame-pointer
-   filter-flags -ffast-math
-   append-flags -s -fforce-addr
-
-   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
-
-   fi
-
-   econf ${myconf} || die
-
-   edit_makefiles
-   emake MOZ_THUNDERBIRD=1 || die
+	local myconf="--with-x \
+		--with-system-jpeg \
+		--with-system-zlib \
+		--with-system-png \
+		--with-system-mng \
+		--disable-calendar \
+		--enable-xft \
+		--disable-pedantic \
+		--disable-svg \
+		--enable-mathml \
+		--without-system-nspr \
+		--enable-nspr-autoconf \
+		--enable-xsl \
+		--enable-crypto \
+		--enable-xinerama=no \
+		--with-pthreads \
+		--with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
+		--with-user-appdir=.thunderbird \
+		--disable-jsd \
+		--disable-accessibility \
+		--disable-profilesharing \
+		--disable-necko-disk-cache \
+		--disable-activex-scripting \
+		--disable-installer \
+		--disable-activex \
+		--disable-tests \
+		--disable-debug \
+		--disable-dtd-debug \
+		--disable-logging \
+		--enable-reorder \
+		--enable-optimize="-O2" \
+		--enable-strip \
+		--enable-strip-libs \
+		--enable-cpp-rtti \
+		--enable-xterm-updates \
+		--disable-toolkit-qt \
+		--disable-toolkit-xlib \
+		--enable-extensions=wallet \
+		--enable-necko-protocols=http,file,jar,viewsource,res,data \
+		--enable-image-decoders=png,gif,jpeg"
+
+	if [ -n "`use gtk2`" ] ; then
+		myconf="${myconf} --enable-toolkit-gtk2 \
+							--enable-default-toolkit=gtk2 \
+							--disable-toolkit-gtk"
+	else
+		myconf="${myconf} --enable-toolkit-gtk \
+							--enable-default-toolkit=gtk \
+							--disable-toolkit-gtk2"
+	fi
+
+	if [ -n "`use ipv6`" ] ; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+	# Crashes on start when compiled with -fomit-frame-pointer
+	filter-flags -fomit-frame-pointer
+	filter-flags -ffast-math
+	append-flags -s -fforce-addr
+
+	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
+
+	fi
+
+	econf ${myconf} || die
+
+	edit_makefiles
+	emake MOZ_THUNDERBIRD=1 || die
 
 	# Build the enigmail plugin
 	if use crypt
@@ -156,23 +156,21 @@ src_compile() {
 		einfo "Building Enigmail plugin..."
 		cd ${S}/extensions/ipc
 		make || die
-           
+
 		cd ${S}/extensions/enigmail
 		make || die
 	fi
-
 }
 
 src_install() {
+	dodir /usr/lib
+	dodir /usr/lib/MozillaThunderbird
+	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaThunderbird
 
-   dodir /usr/lib
-   dodir /usr/lib/MozillaThunderbird
-   cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaThunderbird
+	#fix permissions
+	chown -R root.root ${D}/usr/lib/MozillaThunderbird
 
-   #fix permissions
-   chown -R root.root ${D}/usr/lib/MozillaThunderbird
-   
-   dobin ${FILESDIR}/MozillaThunderbird
+	dobin ${FILESDIR}/MozillaThunderbird
 
 	# Install icon and .desktop for menu entry
 	if [ "`use gnome`" ]
@@ -190,14 +188,12 @@ src_install() {
 		insinto /usr/share/gnome/apps/Internet
 		doins ${S}/build/package/rpm/SOURCES/mozillathunderbird.desktop
 	fi
-
 }
 
 pkg_postinst() {
-
 	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaThunderbird"
 
-	# Needed to update the run time bindings for REGXPCOM 
+	# Needed to update the run time bindings for REGXPCOM
 	# (do not remove next line!)
 	env-update
 	# Register Components and Chrome
@@ -210,5 +206,4 @@ pkg_postinst() {
 	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 {} \; || :
-
 }
diff --git a/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2_alpha20030807.ebuild b/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2_alpha20030807.ebuild
index 418c9b29f750..aa4c9aac6426 100644
--- a/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2_alpha20030807.ebuild
+++ b/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2_alpha20030807.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2_alpha20030807.ebuild,v 1.3 2003/08/18 01:47:09 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2_alpha20030807.ebuild,v 1.4 2003/09/05 02:20:58 msterret Exp $
 
 inherit makeedit flag-o-matic gcc nsplugins
 
@@ -20,24 +20,24 @@ LICENSE="MPL-1.1 | NPL-1.1"
 IUSE="gtk2 ipv6"
 
 RDEPEND="virtual/x11
-   >=dev-libs/libIDL-0.8.0
-   >=gnome-base/ORBit-0.5.10-r1
-   virtual/xft
-   >=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.36
-   dev-libs/expat
-   app-arch/zip
-   app-arch/unzip
-   ( gtk2? >=x11-libs/gtk+-2.1.1 :
-     =x11-libs/gtk+-1.2* ) "
+	>=dev-libs/libIDL-0.8.0
+	>=gnome-base/ORBit-0.5.10-r1
+	virtual/xft
+	>=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.36
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	( gtk2? >=x11-libs/gtk+-2.1.1 :
+		=x11-libs/gtk+-1.2* ) "
 
 DEPEND="${RDEPEND}
-   virtual/glibc
-   dev-lang/perl"
-   
+	virtual/glibc
+	dev-lang/perl"
+
 # needed by src_compile() and src_install()
 export MOZ_THUNDERBIRD=1
 export MOZ_ENABLE_XFT=1
@@ -49,93 +49,91 @@ src_unpack() {
 }
 
 src_compile() {
-   local myconf="--with-x \
-      --with-system-jpeg \
-      --with-system-zlib \
-      --with-system-png \
-      --with-system-mng \
-      --disable-calendar \
-      --enable-xft \
-      --disable-pedantic \
-      --disable-svg \
-      --enable-mathml \
-      --without-system-nspr \
-      --enable-nspr-autoconf \
-      --enable-xsl \
-      --enable-crypto \
-      --enable-xinerama=no \
-      --with-pthreads \
-      --with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
-      --with-user-appdir=.thunderbird \
-      --disable-jsd \
-      --disable-accessibility \
-      --disable-profilesharing \
-      --disable-necko-disk-cache \
-      --disable-activex-scripting \
-      --disable-installer \
-      --disable-activex \
-      --disable-tests \
-      --disable-debug \
-      --disable-dtd-debug \
-      --disable-logging \
-      --enable-reorder \
-	  --enable-optimize="-O2" \
-      --enable-strip \
-      --enable-strip-libs \
-      --enable-cpp-rtti \
-      --enable-xterm-updates \
-      --disable-toolkit-qt \
-      --disable-toolkit-xlib \
-	  --enable-extensions=wallet \
-	  --enable-necko-protocols=http,file,jar,viewsource,res,data \
-	  --enable-image-decoders=png,gif,jpeg"
-
-    if [ -n "`use gtk2`" ] ; then
-        myconf="${myconf} --enable-toolkit-gtk2 \
-                          --enable-default-toolkit=gtk2 \
-                          --disable-toolkit-gtk"
-    else
-        myconf="${myconf} --enable-toolkit-gtk \
-                          --enable-default-toolkit=gtk \
-                          --disable-toolkit-gtk2"
-    fi
-
-    if [ -n "`use ipv6`" ] ; then
-        myconf="${myconf} --enable-ipv6"
-    fi
-
-   # Crashes on start when compiled with -fomit-frame-pointer
-   filter-flags -fomit-frame-pointer
-   filter-flags -ffast-math
-   append-flags -s -fforce-addr
-
-   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
-
-   fi
-
-   econf ${myconf} || die
-
-   edit_makefiles
-   emake MOZ_THUNDERBIRD=1 || die
+	local myconf="--with-x \
+		--with-system-jpeg \
+		--with-system-zlib \
+		--with-system-png \
+		--with-system-mng \
+		--disable-calendar \
+		--enable-xft \
+		--disable-pedantic \
+		--disable-svg \
+		--enable-mathml \
+		--without-system-nspr \
+		--enable-nspr-autoconf \
+		--enable-xsl \
+		--enable-crypto \
+		--enable-xinerama=no \
+		--with-pthreads \
+		--with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
+		--with-user-appdir=.thunderbird \
+		--disable-jsd \
+		--disable-accessibility \
+		--disable-profilesharing \
+		--disable-necko-disk-cache \
+		--disable-activex-scripting \
+		--disable-installer \
+		--disable-activex \
+		--disable-tests \
+		--disable-debug \
+		--disable-dtd-debug \
+		--disable-logging \
+		--enable-reorder \
+		--enable-optimize="-O2" \
+		--enable-strip \
+		--enable-strip-libs \
+		--enable-cpp-rtti \
+		--enable-xterm-updates \
+		--disable-toolkit-qt \
+		--disable-toolkit-xlib \
+		--enable-extensions=wallet \
+		--enable-necko-protocols=http,file,jar,viewsource,res,data \
+		--enable-image-decoders=png,gif,jpeg"
+
+	if [ -n "`use gtk2`" ] ; then
+		myconf="${myconf} --enable-toolkit-gtk2 \
+							--enable-default-toolkit=gtk2 \
+							--disable-toolkit-gtk"
+	else
+		myconf="${myconf} --enable-toolkit-gtk \
+							--enable-default-toolkit=gtk \
+							--disable-toolkit-gtk2"
+	fi
+
+	if [ -n "`use ipv6`" ] ; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+	# Crashes on start when compiled with -fomit-frame-pointer
+	filter-flags -fomit-frame-pointer
+	filter-flags -ffast-math
+	append-flags -s -fforce-addr
+
+	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
 
+	fi
+
+	econf ${myconf} || die
+
+	edit_makefiles
+	emake MOZ_THUNDERBIRD=1 || die
 }
 
 src_install() {
+	dodir /usr/lib
+	dodir /usr/lib/MozillaThunderbird
+	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaThunderbird
 
-   dodir /usr/lib
-   dodir /usr/lib/MozillaThunderbird
-   cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaThunderbird
+	#fix permissions
+	chown -R root.root ${D}/usr/lib/MozillaThunderbird
 
-   #fix permissions
-   chown -R root.root ${D}/usr/lib/MozillaThunderbird
-   
-   dobin ${FILESDIR}/MozillaThunderbird
+	dobin ${FILESDIR}/MozillaThunderbird
 
 	# Install icon and .desktop for menu entry
 	if [ "`use gnome`" ]
@@ -153,6 +151,4 @@ src_install() {
 		insinto /usr/share/gnome/apps/Internet
 		doins ${S}/build/package/rpm/SOURCES/mozillathunderbird.desktop
 	fi
-
 }
-
diff --git a/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2_alpha20030813.ebuild b/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2_alpha20030813.ebuild
index e1071aaa870f..376974baf3a9 100644
--- a/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2_alpha20030813.ebuild
+++ b/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2_alpha20030813.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2_alpha20030813.ebuild,v 1.2 2003/08/18 01:47:09 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2_alpha20030813.ebuild,v 1.3 2003/09/05 02:20:58 msterret Exp $
 
 inherit makeedit flag-o-matic gcc nsplugins
 
@@ -20,24 +20,24 @@ LICENSE="MPL-1.1 | NPL-1.1"
 IUSE="gtk2 ipv6"
 
 RDEPEND="virtual/x11
-   >=dev-libs/libIDL-0.8.0
-   >=gnome-base/ORBit-0.5.10-r1
-   virtual/xft
-   >=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.36
-   dev-libs/expat
-   app-arch/zip
-   app-arch/unzip
-   ( gtk2? >=x11-libs/gtk+-2.1.1 :
-     =x11-libs/gtk+-1.2* ) "
+	>=dev-libs/libIDL-0.8.0
+	>=gnome-base/ORBit-0.5.10-r1
+	virtual/xft
+	>=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.36
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	( gtk2? >=x11-libs/gtk+-2.1.1 :
+		=x11-libs/gtk+-1.2* ) "
 
 DEPEND="${RDEPEND}
-   virtual/glibc
-   dev-lang/perl"
-   
+	virtual/glibc
+	dev-lang/perl"
+
 # needed by src_compile() and src_install()
 export MOZ_THUNDERBIRD=1
 export MOZ_ENABLE_XFT=1
@@ -49,93 +49,91 @@ src_unpack() {
 }
 
 src_compile() {
-   local myconf="--with-x \
-      --with-system-jpeg \
-      --with-system-zlib \
-      --with-system-png \
-      --with-system-mng \
-      --disable-calendar \
-      --enable-xft \
-      --disable-pedantic \
-      --disable-svg \
-      --enable-mathml \
-      --without-system-nspr \
-      --enable-nspr-autoconf \
-      --enable-xsl \
-      --enable-crypto \
-      --enable-xinerama=no \
-      --with-pthreads \
-      --with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
-      --with-user-appdir=.thunderbird \
-      --disable-jsd \
-      --disable-accessibility \
-      --disable-profilesharing \
-      --disable-necko-disk-cache \
-      --disable-activex-scripting \
-      --disable-installer \
-      --disable-activex \
-      --disable-tests \
-      --disable-debug \
-      --disable-dtd-debug \
-      --disable-logging \
-      --enable-reorder \
-	  --enable-optimize="-O2" \
-      --enable-strip \
-      --enable-strip-libs \
-      --enable-cpp-rtti \
-      --enable-xterm-updates \
-      --disable-toolkit-qt \
-      --disable-toolkit-xlib \
-	  --enable-extensions=wallet \
-	  --enable-necko-protocols=http,file,jar,viewsource,res,data \
-	  --enable-image-decoders=png,gif,jpeg"
-
-    if [ -n "`use gtk2`" ] ; then
-        myconf="${myconf} --enable-toolkit-gtk2 \
-                          --enable-default-toolkit=gtk2 \
-                          --disable-toolkit-gtk"
-    else
-        myconf="${myconf} --enable-toolkit-gtk \
-                          --enable-default-toolkit=gtk \
-                          --disable-toolkit-gtk2"
-    fi
-
-    if [ -n "`use ipv6`" ] ; then
-        myconf="${myconf} --enable-ipv6"
-    fi
-
-   # Crashes on start when compiled with -fomit-frame-pointer
-   filter-flags -fomit-frame-pointer
-   filter-flags -ffast-math
-   append-flags -s -fforce-addr
-
-   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
-
-   fi
-
-   econf ${myconf} || die
-
-   edit_makefiles
-   emake MOZ_THUNDERBIRD=1 || die
+	local myconf="--with-x \
+		--with-system-jpeg \
+		--with-system-zlib \
+		--with-system-png \
+		--with-system-mng \
+		--disable-calendar \
+		--enable-xft \
+		--disable-pedantic \
+		--disable-svg \
+		--enable-mathml \
+		--without-system-nspr \
+		--enable-nspr-autoconf \
+		--enable-xsl \
+		--enable-crypto \
+		--enable-xinerama=no \
+		--with-pthreads \
+		--with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
+		--with-user-appdir=.thunderbird \
+		--disable-jsd \
+		--disable-accessibility \
+		--disable-profilesharing \
+		--disable-necko-disk-cache \
+		--disable-activex-scripting \
+		--disable-installer \
+		--disable-activex \
+		--disable-tests \
+		--disable-debug \
+		--disable-dtd-debug \
+		--disable-logging \
+		--enable-reorder \
+		--enable-optimize="-O2" \
+		--enable-strip \
+		--enable-strip-libs \
+		--enable-cpp-rtti \
+		--enable-xterm-updates \
+		--disable-toolkit-qt \
+		--disable-toolkit-xlib \
+		--enable-extensions=wallet \
+		--enable-necko-protocols=http,file,jar,viewsource,res,data \
+		--enable-image-decoders=png,gif,jpeg"
+
+	if [ -n "`use gtk2`" ] ; then
+		myconf="${myconf} --enable-toolkit-gtk2 \
+							--enable-default-toolkit=gtk2 \
+							--disable-toolkit-gtk"
+	else
+		myconf="${myconf} --enable-toolkit-gtk \
+							--enable-default-toolkit=gtk \
+							--disable-toolkit-gtk2"
+	fi
+
+	if [ -n "`use ipv6`" ] ; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+	# Crashes on start when compiled with -fomit-frame-pointer
+	filter-flags -fomit-frame-pointer
+	filter-flags -ffast-math
+	append-flags -s -fforce-addr
+
+	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
 
+	fi
+
+	econf ${myconf} || die
+
+	edit_makefiles
+	emake MOZ_THUNDERBIRD=1 || die
 }
 
 src_install() {
+	dodir /usr/lib
+	dodir /usr/lib/MozillaThunderbird
+	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaThunderbird
 
-   dodir /usr/lib
-   dodir /usr/lib/MozillaThunderbird
-   cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaThunderbird
+	#fix permissions
+	chown -R root.root ${D}/usr/lib/MozillaThunderbird
 
-   #fix permissions
-   chown -R root.root ${D}/usr/lib/MozillaThunderbird
-   
-   dobin ${FILESDIR}/MozillaThunderbird
+	dobin ${FILESDIR}/MozillaThunderbird
 
 	# Install icon and .desktop for menu entry
 	if [ "`use gnome`" ]
@@ -153,14 +151,12 @@ src_install() {
 		insinto /usr/share/gnome/apps/Internet
 		doins ${S}/build/package/rpm/SOURCES/mozillathunderbird.desktop
 	fi
-
 }
 
 pkg_postinst() {
-
 	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaThunderbird"
 
-	# Needed to update the run time bindings for REGXPCOM 
+	# Needed to update the run time bindings for REGXPCOM
 	# (do not remove next line!)
 	env-update
 	# Register Components and Chrome
@@ -173,5 +169,4 @@ pkg_postinst() {
 	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 {} \; || :
-
 }
diff --git a/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2_alpha20030826.ebuild b/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2_alpha20030826.ebuild
index 00c8fdef83af..e8ee74e73ca8 100644
--- a/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2_alpha20030826.ebuild
+++ b/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2_alpha20030826.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2_alpha20030826.ebuild,v 1.1 2003/09/01 19:55:18 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.2_alpha20030826.ebuild,v 1.2 2003/09/05 02:20:58 msterret Exp $
 
 inherit makeedit flag-o-matic gcc nsplugins
 
@@ -37,13 +37,13 @@ RDEPEND="virtual/x11
 	app-arch/zip
 	app-arch/unzip
 	( gtk2? >=x11-libs/gtk+-2.1.1 :
-     =x11-libs/gtk+-1.2* )
-	crypt? ( >=app-crypt/gnupg-1.2.1 )"
+		=x11-libs/gtk+-1.2* )
+		crypt? ( >=app-crypt/gnupg-1.2.1 )"
 
 DEPEND="${RDEPEND}
 	virtual/glibc
 	dev-lang/perl"
-   
+
 # needed by src_compile() and src_install()
 export MOZ_THUNDERBIRD=1
 export MOZ_ENABLE_XFT=1
@@ -67,80 +67,80 @@ src_unpack() {
 }
 
 src_compile() {
-   local myconf="--with-x \
-      --with-system-jpeg \
-      --with-system-zlib \
-      --with-system-png \
-      --with-system-mng \
-      --disable-calendar \
-      --enable-xft \
-      --disable-pedantic \
-      --disable-svg \
-      --enable-mathml \
-      --without-system-nspr \
-      --enable-nspr-autoconf \
-      --enable-xsl \
-      --enable-crypto \
-      --enable-xinerama=no \
-      --with-pthreads \
-      --with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
-      --with-user-appdir=.thunderbird \
-      --disable-jsd \
-      --disable-accessibility \
-      --disable-profilesharing \
-      --disable-necko-disk-cache \
-      --disable-activex-scripting \
-      --disable-installer \
-      --disable-activex \
-      --disable-tests \
-      --disable-debug \
-      --disable-dtd-debug \
-      --disable-logging \
-      --enable-reorder \
-	  --enable-optimize="-O2" \
-      --enable-strip \
-      --enable-strip-libs \
-      --enable-cpp-rtti \
-      --enable-xterm-updates \
-      --disable-toolkit-qt \
-      --disable-toolkit-xlib \
-	  --enable-extensions=wallet \
-	  --enable-necko-protocols=http,file,jar,viewsource,res,data \
-	  --enable-image-decoders=png,gif,jpeg"
-
-    if [ -n "`use gtk2`" ] ; then
-        myconf="${myconf} --enable-toolkit-gtk2 \
-                          --enable-default-toolkit=gtk2 \
-                          --disable-toolkit-gtk"
-    else
-        myconf="${myconf} --enable-toolkit-gtk \
-                          --enable-default-toolkit=gtk \
-                          --disable-toolkit-gtk2"
-    fi
-
-    if [ -n "`use ipv6`" ] ; then
-        myconf="${myconf} --enable-ipv6"
-    fi
-
-   # Crashes on start when compiled with -fomit-frame-pointer
-   filter-flags -fomit-frame-pointer
-   filter-flags -ffast-math
-   append-flags -s -fforce-addr
-
-   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
-
-   fi
-
-   econf ${myconf} || die
-
-   edit_makefiles
-   emake MOZ_THUNDERBIRD=1 || die
+	local myconf="--with-x \
+		--with-system-jpeg \
+		--with-system-zlib \
+		--with-system-png \
+		--with-system-mng \
+		--disable-calendar \
+		--enable-xft \
+		--disable-pedantic \
+		--disable-svg \
+		--enable-mathml \
+		--without-system-nspr \
+		--enable-nspr-autoconf \
+		--enable-xsl \
+		--enable-crypto \
+		--enable-xinerama=no \
+		--with-pthreads \
+		--with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
+		--with-user-appdir=.thunderbird \
+		--disable-jsd \
+		--disable-accessibility \
+		--disable-profilesharing \
+		--disable-necko-disk-cache \
+		--disable-activex-scripting \
+		--disable-installer \
+		--disable-activex \
+		--disable-tests \
+		--disable-debug \
+		--disable-dtd-debug \
+		--disable-logging \
+		--enable-reorder \
+		--enable-optimize="-O2" \
+		--enable-strip \
+		--enable-strip-libs \
+		--enable-cpp-rtti \
+		--enable-xterm-updates \
+		--disable-toolkit-qt \
+		--disable-toolkit-xlib \
+		--enable-extensions=wallet \
+		--enable-necko-protocols=http,file,jar,viewsource,res,data \
+		--enable-image-decoders=png,gif,jpeg"
+
+	if [ -n "`use gtk2`" ] ; then
+		myconf="${myconf} --enable-toolkit-gtk2 \
+							--enable-default-toolkit=gtk2 \
+							--disable-toolkit-gtk"
+	else
+		myconf="${myconf} --enable-toolkit-gtk \
+							--enable-default-toolkit=gtk \
+							--disable-toolkit-gtk2"
+	fi
+
+	if [ -n "`use ipv6`" ] ; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+	# Crashes on start when compiled with -fomit-frame-pointer
+	filter-flags -fomit-frame-pointer
+	filter-flags -ffast-math
+	append-flags -s -fforce-addr
+
+	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
+
+	fi
+
+	econf ${myconf} || die
+
+	edit_makefiles
+	emake MOZ_THUNDERBIRD=1 || die
 
 	# Build the enigmail plugin
 	if use crypt
@@ -148,23 +148,21 @@ src_compile() {
 		einfo "Building Enigmail plugin..."
 		cd ${S}/extensions/ipc
 		make || die
-           
+
 		cd ${S}/extensions/enigmail
 		make || die
 	fi
-
 }
 
 src_install() {
+	dodir /usr/lib
+	dodir /usr/lib/MozillaThunderbird
+	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaThunderbird
 
-   dodir /usr/lib
-   dodir /usr/lib/MozillaThunderbird
-   cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaThunderbird
+	#fix permissions
+	chown -R root.root ${D}/usr/lib/MozillaThunderbird
 
-   #fix permissions
-   chown -R root.root ${D}/usr/lib/MozillaThunderbird
-   
-   dobin ${FILESDIR}/MozillaThunderbird
+	dobin ${FILESDIR}/MozillaThunderbird
 
 	# Install icon and .desktop for menu entry
 	if [ "`use gnome`" ]
@@ -182,14 +180,12 @@ src_install() {
 		insinto /usr/share/gnome/apps/Internet
 		doins ${S}/build/package/rpm/SOURCES/mozillathunderbird.desktop
 	fi
-
 }
 
 pkg_postinst() {
-
 	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaThunderbird"
 
-	# Needed to update the run time bindings for REGXPCOM 
+	# Needed to update the run time bindings for REGXPCOM
 	# (do not remove next line!)
 	env-update
 	# Register Components and Chrome
@@ -202,5 +198,4 @@ pkg_postinst() {
 	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 {} \; || :
-
 }