whitespace cleanup

author: Michael Sterrett <mr_bones_@gentoo.org> 2003-09-05 02:45:41 +0000
committer: Michael Sterrett <mr_bones_@gentoo.org> 2003-09-05 02:45:41 +0000
commit: 50fd407cdc95fcef73e913e71b90e7daeebf53b6 (patch)
tree: 8875ea9189f76fc2a41081412d95313dfa8ffd41 /net-mail
parent: header fix; whitespace cleanup (diff)
download: historical-50fd407cdc95fcef73e913e71b90e7daeebf53b6.tar.gz
historical-50fd407cdc95fcef73e913e71b90e7daeebf53b6.tar.bz2
historical-50fd407cdc95fcef73e913e71b90e7daeebf53b6.zip
66 files changed, 1152 insertions, 1186 deletions
diff --git a/net-mail/amavis/Manifest b/net-mail/amavis/Manifest
index 373f72bc1ed9..411cd472656c 100644
--- a/net-mail/amavis/Manifest
+++ b/net-mail/amavis/Manifest
@@ -1,13 +1,13 @@
-MD5 9ce862df0429c536f548710322ae6059 amavis-0.3.12_pre8.ebuild 3296
-MD5 b4f6dcebb2b66c8ea2643a72e127a166 amavis-0.3.12.ebuild 3020
-MD5 c0e6c82bd2075907930f5984f4cd09c6 amavis-0.2.1-r2.ebuild 938
-MD5 232fdf5c5453e82b2cea6b60e0afac22 amavis-0.2.1-r3.ebuild 2062
 MD5 55802fa83de944f651979bf3afdd84f0 ChangeLog 2437
+MD5 ce9341f2de302bb99d185f5d7d5f5931 amavis-0.2.1-r2.ebuild 939
+MD5 92acba93f05297332851712289cb8e7d amavis-0.2.1-r3.ebuild 2063
+MD5 2b11a0696cc33aadd43399e0738dd287 amavis-0.3.12.ebuild 3020
+MD5 ba619841ce7633c735bc4c06fe5f9526 amavis-0.3.12_pre8.ebuild 3251
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 c21bb514e50b3103fbf00d4e877018f9 files/0.3.12-postfix.diff 969
 MD5 587d7c8f2f2fce495116525321748c66 files/amavis-0.2.1-gentoo.diff 706
+MD5 08dee7bd07762dc8704f4d6a13f86d64 files/amavis-0.2.1-securetar.patch 479
 MD5 5eb67922799dba116044631c52860bd4 files/digest-amavis-0.2.1-r2 64
 MD5 5eb67922799dba116044631c52860bd4 files/digest-amavis-0.2.1-r3 64
-MD5 c21bb514e50b3103fbf00d4e877018f9 files/0.3.12-postfix.diff 969
-MD5 08dee7bd07762dc8704f4d6a13f86d64 files/amavis-0.2.1-securetar.patch 479
-MD5 4c7e6a625d2e6b010b8ed7b2911eb83b files/digest-amavis-0.3.12_pre8 69
 MD5 dd107599b6f61744ffb5e84f36a2a93d files/digest-amavis-0.3.12 65
+MD5 4c7e6a625d2e6b010b8ed7b2911eb83b files/digest-amavis-0.3.12_pre8 69
diff --git a/net-mail/amavis/amavis-0.2.1-r2.ebuild b/net-mail/amavis/amavis-0.2.1-r2.ebuild
index 31d4c4ce822d..42301edf5975 100644
--- a/net-mail/amavis/amavis-0.2.1-r2.ebuild
+++ b/net-mail/amavis/amavis-0.2.1-r2.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/amavis/amavis-0.2.1-r2.ebuild,v 1.11 2003/02/13 14:22:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/amavis/amavis-0.2.1-r2.ebuild,v 1.12 2003/09/05 02:35:44 msterret Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Virus Scanner"
@@ -38,5 +38,4 @@ src_install() {
 	dodir /var/tmp/virusmails
 	chmod 777 ${D}/var/log/scanmail
 	chmod 777 ${D}/var/tmp/virusmails
-
 }
diff --git a/net-mail/amavis/amavis-0.2.1-r3.ebuild b/net-mail/amavis/amavis-0.2.1-r3.ebuild
index 6f6550475d7f..bc14a80d6cd8 100644
--- a/net-mail/amavis/amavis-0.2.1-r3.ebuild
+++ b/net-mail/amavis/amavis-0.2.1-r3.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/amavis/amavis-0.2.1-r3.ebuild,v 1.6 2003/02/13 14:22:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/amavis/amavis-0.2.1-r3.ebuild,v 1.7 2003/09/05 02:35:44 msterret Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Virus Scanner"
@@ -18,7 +18,7 @@ DEPEND="net-mail/maildrop
 
 src_unpack() {
 	unpack ${A}
-	
+
 	cd ${S}
 	patch -p0 < ${FILESDIR}/${P}-securetar.patch
 }
diff --git a/net-mail/amavis/amavis-0.3.12.ebuild b/net-mail/amavis/amavis-0.3.12.ebuild
index 86979d43f58b..ec3616b2520a 100644
--- a/net-mail/amavis/amavis-0.3.12.ebuild
+++ b/net-mail/amavis/amavis-0.3.12.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/amavis/amavis-0.3.12.ebuild,v 1.4 2003/06/22 20:49:38 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/amavis/amavis-0.3.12.ebuild,v 1.5 2003/09/05 02:35:44 msterret Exp $
 
 DESCRIPTION="A perl module which integrates virus scanning software with your MTA"
 HOMEPAGE="http://www.amavis.org"
@@ -75,7 +75,7 @@ src_compile() {
 	sed \
 		-e "s:/usr/local/f-prot:/opt/f-prot:" \
 		-e "s:ac_dummy=\"\$PATH\:/usr/bin\:/usr/local/bin\":ac_dummy=\"\$PATH\:/usr/bin\:/usr/local/bin\:/opt/vlnx\":" \
-		< configure.tmp > configure 
+		< configure.tmp > configure
 
 	local myconf
 
@@ -106,7 +106,7 @@ src_install() {
 		chown -R qmailq:qmail ${D}/var/amavis
 	else
 		chown -R amavis:amavis ${D}/var/amavis
-	fi	
+	fi
 
 	chmod -R 770 ${D}/var/amavis
 
@@ -119,7 +119,6 @@ src_install() {
 		|| die "make install failed"
 
 	dodoc AUTHORS BUGS ChangeLog FAQ HINTS INSTALL NEWS README* TODO
-
 }
 
 pkg_postinst() {
@@ -130,5 +129,4 @@ pkg_postinst() {
 	einfo ""
 	einfo "less /usr/share/doc/${P}/README.$mymta.gz"
 	einfo ""
-
 }
diff --git a/net-mail/amavis/amavis-0.3.12_pre8.ebuild b/net-mail/amavis/amavis-0.3.12_pre8.ebuild
index e1fd0bfd0066..1dc6fc1854d2 100644
--- a/net-mail/amavis/amavis-0.3.12_pre8.ebuild
+++ b/net-mail/amavis/amavis-0.3.12_pre8.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/amavis/amavis-0.3.12_pre8.ebuild,v 1.8 2003/03/11 21:11:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/amavis/amavis-0.3.12_pre8.ebuild,v 1.9 2003/09/05 02:35:44 msterret Exp $
 
 DESCRIPTION="A perl module which integrates virus scanning software with your MTA"
 HOMEPAGE="http://www.amavis.org"
@@ -40,16 +40,16 @@ S="${WORKDIR}/${P/_/}"
 pkg_setup() {
 
 	if ! grep -q ^amavis: /etc/group ; then
-                groupadd -g 10025 amavis \
+		groupadd -g 10025 amavis \
 			|| die "problem adding the amavis group"
 		grpconv || die "failed running grpconv"
-        fi
+	fi
 
 	if ! grep -q ^amavis: /etc/passwd ; then
-                useradd -u 10025 -g amavis amavis \
+		useradd -u 10025 -g amavis amavis \
 			|| die "problem adding the amavis user"
 		pwconv || die "failed running pwconv"
-        fi
+	fi
 
 	if ! grep -a ^virusalert: /etc/mail/aliases ; then
 		cp /etc/mail/aliases /etc/mail/aliases.orig
@@ -81,7 +81,7 @@ src_compile() {
 	sed \
 		-e "s:/usr/local/f-prot:/opt/f-prot:" \
 		-e "s:ac_dummy=\"\$PATH\:/usr/bin\:/usr/local/bin\":ac_dummy=\"\$PATH\:/usr/bin\:/usr/local/bin\:/opt/vlnx\":" \
-		< configure.tmp > configure 
+		< configure.tmp > configure
 
 	local myconf
 
@@ -112,7 +112,7 @@ src_install() {
 		chown -R qmailq:qmail ${D}/var/amavis
 	else
 		chown -R amavis:amavis ${D}/var/amavis
-	fi	
+	fi
 
 	chmod -R 770 ${D}/var/amavis
 
@@ -125,7 +125,6 @@ src_install() {
 		|| die "make install failed"
 
 	dodoc AUTHORS BUGS ChangeLog FAQ HINTS INSTALL NEWS README* TODO
-
 }
 
 pkg_postinst() {
@@ -136,5 +135,4 @@ pkg_postinst() {
 	einfo ""
 	einfo "less /usr/share/doc/amavis-0.3.12_pre8/README.$mymta.gz"
 	einfo ""
-
 }
diff --git a/net-mail/bogofilter/Manifest b/net-mail/bogofilter/Manifest
index c92742b6d94c..e8f32f5756f3 100644
--- a/net-mail/bogofilter/Manifest
+++ b/net-mail/bogofilter/Manifest
@@ -1,16 +1,16 @@
-MD5 3c2992749377c1bf1beb439f43b55c03 bogofilter-0.11.2.ebuild 1296
-MD5 371da997112e483904086125258937e3 bogofilter-0.13.3.ebuild 1885
-MD5 21b95822aed6cd9ccb2aa398e521fe52 bogofilter-0.13.7.3.ebuild 1936
-MD5 479bdf5a924573e83dc5c587e940d197 bogofilter-0.14.5.2.ebuild 1911
-MD5 45a6ff499c9ef8a4bd331e79998a9f73 bogofilter-0.13.6.2.ebuild 1802
-MD5 86a7494f4b240e63a5cbea6db9f2a6e6 bogofilter-0.14.5.ebuild 1909
-MD5 97136bf9cbd4e16c39323977d199224b bogofilter-0.13.7.2.ebuild 1933
 MD5 8ee1b7f0dd39f7f78845305194716703 ChangeLog 3396
+MD5 577280790ffbc9559f802d047f6f3616 bogofilter-0.11.2.ebuild 1298
+MD5 f824ab732f0259de1438986706479fc5 bogofilter-0.13.6.2.ebuild 1798
+MD5 410e18c62332e5ac4eece55f0e4170c4 bogofilter-0.13.7.2.ebuild 1932
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 c1746d400d88ff578aa8a9e30173e930 bogofilter-0.13.3.ebuild 1882
+MD5 3bb7f8960dd061231d9a237412aa0e6c bogofilter-0.13.7.3.ebuild 1935
+MD5 5847fd754f8dd9e3287a3352ff0b6df6 bogofilter-0.14.5.ebuild 1906
+MD5 359df0fd0003f8976b794505c412a65a bogofilter-0.14.5.2.ebuild 1908
+MD5 c32343db7444ec70462f26b49fdee65f files/digest-bogofilter-0.11.2 69
+MD5 1ec9835c10fd7a1f02715652f1bac91e files/digest-bogofilter-0.13.3 69
 MD5 99b78224a48cb1a8c062dc29d40f00ce files/digest-bogofilter-0.13.6.2 71
 MD5 efc05dcba28085b716cc0e64166bd03b files/digest-bogofilter-0.13.7.2 71
 MD5 23dea37013aa783a31cd6a713e040752 files/digest-bogofilter-0.13.7.3 71
-MD5 411af24907850911139e0dcd559a97e8 files/digest-bogofilter-0.14.5.2 71
-MD5 c32343db7444ec70462f26b49fdee65f files/digest-bogofilter-0.11.2 69
-MD5 1ec9835c10fd7a1f02715652f1bac91e files/digest-bogofilter-0.13.3 69
 MD5 38ee73c996e06398584c206a0d25e29f files/digest-bogofilter-0.14.5 69
+MD5 411af24907850911139e0dcd559a97e8 files/digest-bogofilter-0.14.5.2 71
diff --git a/net-mail/bogofilter/bogofilter-0.11.2.ebuild b/net-mail/bogofilter/bogofilter-0.11.2.ebuild
index 1793927d0e08..dbd6f60a44cb 100644
--- a/net-mail/bogofilter/bogofilter-0.11.2.ebuild
+++ b/net-mail/bogofilter/bogofilter-0.11.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/bogofilter/bogofilter-0.11.2.ebuild,v 1.2 2003/06/02 22:53:39 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bogofilter/bogofilter-0.11.2.ebuild,v 1.3 2003/09/05 02:24:48 msterret Exp $
 
 DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
 HOMEPAGE="http://bogofilter.sourceforge.net/"
@@ -33,7 +33,7 @@ src_install() {
 
 	dohtml doc/*.html
 	docinto programmer ; dodoc doc/programmer/*
-	
+
 	einfo "With version 0.11 the options of bogofilter are changed."
 	einfo "If you update from an old version, you eventually must change"
 	einfo "your configuration."
diff --git a/net-mail/bogofilter/bogofilter-0.13.3.ebuild b/net-mail/bogofilter/bogofilter-0.13.3.ebuild
index 2825cfa69bc1..22ca28aff45f 100644
--- a/net-mail/bogofilter/bogofilter-0.13.3.ebuild
+++ b/net-mail/bogofilter/bogofilter-0.13.3.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/bogofilter/bogofilter-0.13.3.ebuild,v 1.1 2003/05/29 19:06:14 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bogofilter/bogofilter-0.13.3.ebuild,v 1.2 2003/09/05 02:24:48 msterret Exp $
 
 DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
 HOMEPAGE="http://bogofilter.sourceforge.net/"
@@ -29,13 +29,13 @@ src_install() {
 	doexe tuning/bogolex.sh tuning/distrib tuning/mkdb tuning/sizes tuning/smindev.sh
 	insinto /usr/lib/${PN}/tuning
 	doins tuning/smindev.R tuning/setR tuning/README
-	
+
 	exeinto /usr/lib/${PN}/contrib
 	doexe contrib/bogofilter-qfe contrib/bogogrep contrib/parmtest.sh contrib/printmaildir.pl
 	doexe contrib/randomtrain contrib/scramble
 	insinto /usr/lib/${PN}/contrib
 	doins contrib/README.randomtrain contrib/bogo.R contrib/trainbogo.sh
-	
+
 	dodoc AUTHORS INSTALL COPYING METHODS NEWS README README.cvs TODO UPGRADE
 	dodoc RELEASE.NOTES-0.1* CHANGES-0.1* doc/integrating-with-* doc/*.HOWTO
 	dodoc contrib/mailfilter.example contrib/procmailrc.example
@@ -49,7 +49,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	
+
 	einfo "With version 0.11 the options of bogofilter have changed."
 	einfo "If you update from an older version, you eventually must change"
 	einfo "your configuration."
diff --git a/net-mail/bogofilter/bogofilter-0.13.6.2.ebuild b/net-mail/bogofilter/bogofilter-0.13.6.2.ebuild
index 09d4b2d80d20..491fb0e1f710 100644
--- a/net-mail/bogofilter/bogofilter-0.13.6.2.ebuild
+++ b/net-mail/bogofilter/bogofilter-0.13.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
+# $Header:
 
 DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
 HOMEPAGE="http://bogofilter.sourceforge.net/"
@@ -29,13 +29,13 @@ src_install() {
 	doexe tuning/bogolex.sh tuning/distrib tuning/mkdb tuning/sizes tuning/tuning.R tuning/tuning.sh
 	insinto /usr/lib/${PN}/tuning
 	doins tuning/README tuning/setR
-	
+
 	exeinto /usr/lib/${PN}/contrib
 	doexe contrib/bogofilter-qfe contrib/bogogrep contrib/mime.get.rfc822 contrib/parmtest.sh
 	doexe contrib/printmaildir.pl contrib/randomtrain contrib/scramble
 	insinto /usr/lib/${PN}/contrib
 	doins contrib/README.randomtrain contrib/bogo.R contrib/trainbogo.sh
-	
+
 	dodoc AUTHORS INSTALL COPYING METHODS NEWS README README.cvs TODO UPGRADE
 	dodoc RELEASE.NOTES-0.1* CHANGES-0.1* doc/integrating-with-* doc/*.HOWTO
 	dodoc contrib/mailfilter.example contrib/procmailrc.example
@@ -49,7 +49,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	
+
 	einfo "With version 0.11 the options of bogofilter have changed."
 	einfo "If you update from an older version, you eventually must change"
 	einfo "your configuration."
diff --git a/net-mail/bogofilter/bogofilter-0.13.7.2.ebuild b/net-mail/bogofilter/bogofilter-0.13.7.2.ebuild
index 11b9f09dc5bc..edb63d505cfc 100644
--- a/net-mail/bogofilter/bogofilter-0.13.7.2.ebuild
+++ b/net-mail/bogofilter/bogofilter-0.13.7.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/bogofilter/bogofilter-0.13.7.2.ebuild,v 1.5 2003/07/21 15:01:42 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bogofilter/bogofilter-0.13.7.2.ebuild,v 1.6 2003/09/05 02:24:48 msterret Exp $
 
 DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
 HOMEPAGE="http://bogofilter.sourceforge.net/"
@@ -29,13 +29,13 @@ src_install() {
 	insinto /usr/lib/${PN}/tuning
 	doexe tuning/bogolex.sh tuning/bogol tuning/bogotune
 	doins tuning/README.bogotune tuning/bogol.1 tuning/bogotune.1
-	
+
 	exeinto /usr/lib/${PN}/contrib
 	doexe contrib/bogofilter-qfe contrib/bogogrep contrib/mime.get.rfc822 contrib/parmtest.sh
 	doexe contrib/printmaildir.pl contrib/randomtrain contrib/scramble contrib/bogofilter-milter.pl
 	insinto /usr/lib/${PN}/contrib
 	doins contrib/README.randomtrain contrib/bogo.R contrib/trainbogo.sh
-	
+
 	dodoc AUTHORS INSTALL COPYING METHODS NEWS README README.cvs TODO UPGRADE
 	dodoc RELEASE.NOTES-0.1* CHANGES-0.1* doc/integrating-with-* doc/*.HOWTO
 	dodoc contrib/mailfilter.example contrib/procmailrc.example
@@ -49,7 +49,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	
+
 	einfo "With version 0.11 the options of bogofilter have changed."
 	einfo "If you update from an older version, you eventually must change"
 	einfo "your configuration."
diff --git a/net-mail/bogofilter/bogofilter-0.13.7.3.ebuild b/net-mail/bogofilter/bogofilter-0.13.7.3.ebuild
index 89aefe69528d..2315e4ca45d4 100644
--- a/net-mail/bogofilter/bogofilter-0.13.7.3.ebuild
+++ b/net-mail/bogofilter/bogofilter-0.13.7.3.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/bogofilter/bogofilter-0.13.7.3.ebuild,v 1.2 2003/07/21 15:01:42 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bogofilter/bogofilter-0.13.7.3.ebuild,v 1.3 2003/09/05 02:24:48 msterret Exp $
 
 DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
 HOMEPAGE="http://bogofilter.sourceforge.net/"
@@ -29,13 +29,13 @@ src_install() {
 	insinto /usr/lib/${PN}/tuning
 	doexe tuning/bogolex.sh tuning/bogol tuning/bogotune
 	doins tuning/README.bogotune tuning/bogol.1 tuning/bogotune.1
-	
+
 	exeinto /usr/lib/${PN}/contrib
 	doexe contrib/bogofilter-qfe contrib/bogogrep contrib/mime.get.rfc822 contrib/parmtest.sh
 	doexe contrib/printmaildir.pl contrib/randomtrain contrib/scramble contrib/bogofilter-milter.pl
 	insinto /usr/lib/${PN}/contrib
 	doins contrib/README.randomtrain contrib/bogo.R contrib/trainbogo.sh
-	
+
 	dodoc AUTHORS INSTALL COPYING METHODS NEWS README README.cvs TODO UPGRADE
 	dodoc RELEASE.NOTES-0.1* CHANGES-0.1* doc/integrating-with-* doc/*.HOWTO
 	dodoc contrib/mailfilter.example contrib/procmailrc.example
@@ -49,7 +49,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	
+
 	einfo "With version 0.11 the options of bogofilter have changed."
 	einfo "If you update from an older version, you eventually must change"
 	einfo "your configuration."
diff --git a/net-mail/bogofilter/bogofilter-0.14.5.2.ebuild b/net-mail/bogofilter/bogofilter-0.14.5.2.ebuild
index a4427045d836..5a962d381df4 100644
--- a/net-mail/bogofilter/bogofilter-0.14.5.2.ebuild
+++ b/net-mail/bogofilter/bogofilter-0.14.5.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/bogofilter/bogofilter-0.14.5.2.ebuild,v 1.1 2003/08/22 14:32:38 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bogofilter/bogofilter-0.14.5.2.ebuild,v 1.2 2003/09/05 02:24:48 msterret Exp $
 
 IUSE=""
 
@@ -22,14 +22,14 @@ src_install() {
 	insinto /usr/lib/${PN}/tuning
 	doexe tuning/bogolex.sh tuning/bogol tuning/bogotune
 	doins tuning/README.bogotune tuning/bogol.1 tuning/bogotune.1
-	
+
 	exeinto /usr/lib/${PN}/contrib
 	doexe contrib/bogofilter-qfe contrib/bogogrep contrib/mime.get.rfc822 contrib/parmtest.sh
 	doexe contrib/printmaildir.pl contrib/randomtrain contrib/scramble contrib/bogofilter-milter.pl
 	doexe contrib/bogominitrain.pl
 	insinto /usr/lib/${PN}/contrib
 	doins contrib/README.randomtrain contrib/bogo.R contrib/trainbogo.sh
-	
+
 	dodoc AUTHORS INSTALL COPYING METHODS NEWS README README.cvs TODO UPGRADE
 	dodoc RELEASE.NOTES-0.1* CHANGES-0.1* doc/integrating-with-* doc/*.HOWTO
 	dodoc contrib/mailfilter.example contrib/procmailrc.example
@@ -43,7 +43,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	
+
 	einfo "With version 0.14 the options of bogofilter have changed."
 	einfo "If you update from an older version, you eventually must change"
 	einfo "your configuration."
diff --git a/net-mail/bogofilter/bogofilter-0.14.5.ebuild b/net-mail/bogofilter/bogofilter-0.14.5.ebuild
index 928defd71531..7d57bb4d98fc 100644
--- a/net-mail/bogofilter/bogofilter-0.14.5.ebuild
+++ b/net-mail/bogofilter/bogofilter-0.14.5.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/bogofilter/bogofilter-0.14.5.ebuild,v 1.2 2003/08/18 01:28:26 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bogofilter/bogofilter-0.14.5.ebuild,v 1.3 2003/09/05 02:24:48 msterret Exp $
 
 IUSE=""
 
@@ -22,14 +22,14 @@ src_install() {
 	insinto /usr/lib/${PN}/tuning
 	doexe tuning/bogolex.sh tuning/bogol tuning/bogotune
 	doins tuning/README.bogotune tuning/bogol.1 tuning/bogotune.1
-	
+
 	exeinto /usr/lib/${PN}/contrib
 	doexe contrib/bogofilter-qfe contrib/bogogrep contrib/mime.get.rfc822 contrib/parmtest.sh
 	doexe contrib/printmaildir.pl contrib/randomtrain contrib/scramble contrib/bogofilter-milter.pl
 	doexe contrib/bogominitrain.pl
 	insinto /usr/lib/${PN}/contrib
 	doins contrib/README.randomtrain contrib/bogo.R contrib/trainbogo.sh
-	
+
 	dodoc AUTHORS INSTALL COPYING METHODS NEWS README README.cvs TODO UPGRADE
 	dodoc RELEASE.NOTES-0.1* CHANGES-0.1* doc/integrating-with-* doc/*.HOWTO
 	dodoc contrib/mailfilter.example contrib/procmailrc.example
@@ -43,7 +43,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	
+
 	einfo "With version 0.14 the options of bogofilter have changed."
 	einfo "If you update from an older version, you eventually must change"
 	einfo "your configuration."
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index dd86dea893cf..b962430b55f2 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,39 +1,39 @@
-MD5 bb9fc1d0628d1a719bbf4f52bbe59fcd courier-imap-1.7.1.ebuild 5262
-MD5 fb165fc2d4178bc45ab1c41600196098 courier-imap-1.7.3-r1.ebuild 6869
-MD5 c6bc519510721ac4af838457798367e3 courier-imap-1.6.2-r1.ebuild 4813
-MD5 e399aedb51a23ab288d5f2d2d2be868c courier-imap-1.7.3.ebuild 6856
-MD5 7a974af8a51e0f760d3fcb108f349fdb courier-imap-1.7.0.ebuild 4954
-MD5 3ceeec6646001e4da5a2e32051f19267 courier-imap-1.7.2.ebuild 6696
-MD5 0369925937ff6d863eaa85a1c960fa94 courier-imap-2.1.1.ebuild 6828
-MD5 a074046c78e24dede9be1793b5b95b0d ChangeLog 7434
+MD5 8cd60b672e73dd21553fb156eb6a8ec1 ChangeLog 7435
+MD5 4fb63f01bfafdead1cf2bc0f4d13d29e courier-imap-1.7.1.ebuild 5255
+MD5 699781252b0713781073e649c50e2972 courier-imap-1.7.2.ebuild 6686
+MD5 a2c9eba27ccf5c8879378a1fa3de621f courier-imap-1.7.3.ebuild 6856
 MD5 6b964abdc013cf2bb64040e8e33215ae metadata.xml 242
-MD5 fba567e34491b014536e1ee20da7bdc9 courier-imap-2.0.0.ebuild 6598
-MD5 f959e38175d1fd8f8e7a977a14f7265f files/gentoo-pop3d-1.7.3-r1.rc 1018
-MD5 ff6234859377e6e830592de36bc84797 files/courier-imap-2.1.1-db40vs41.patch 559
-MD5 e448df5fdbc088132766b33d27f27073 files/gentoo-imapd.rc 1006
-MD5 6eabb1afe28900b3ed92bc9889116303 files/courier-imapd-ssl.rc6 1207
-MD5 420424625a31fa7dc9378e7877faba7a files/courier-imapd.rc6 952
-MD5 40deca440b71ed8d78e39968fb5a30e9 files/mkimapdcert 996
-MD5 8ec16f9f2d26e30684d8ddbd327e9556 files/gentoo-imapd-1.6.1.rc 1007
-MD5 3dd72120d20476368b64811318e0b721 files/gentoo-pop3d-ssl-1.7.3-r1.rc 1010
-MD5 a2d52d98e3f5b3241e1ed40943d5a4a8 files/gentoo-pop3d-ssl.rc 989
-MD5 4f24c08767f06ab12e572bb0236064bb files/digest-courier-imap-1.6.2-r1 72
-MD5 7f82274e3a25ba7ff6852f78d9eb2f69 files/digest-courier-imap-1.7.3-r1 72
-MD5 8df275b074ff61602d3c0e0bbfcc9750 files/authdaemond.conf 456
-MD5 58631496675a58dbb19ccd058088c6e1 files/gentoo-imapd-ssl-1.7.3-r1.rc 1034
-MD5 c13a4bcb06660f1e589e95709b7a3f01 files/gentoo-pop3d-ssl-1.6.1.rc 990
-MD5 24ac993caf8157415fbe8eff04bf7c68 files/gentoo-pop3d-1.6.1.rc 998
-MD5 8f8fe760e10ffe35689d791e1d7b8d16 files/courier-pop3d-ssl.rc6 1215
-MD5 20598de15b5368fd70065b36e8b4b4d6 files/gentoo-imapd-ssl-1.6.1.rc 1014
-MD5 f287a12e157d9a3280951ab876b5159b files/digest-courier-imap-1.7.0 72
+MD5 91151aafebe9d3bae6f3e63eea76d14f courier-imap-1.6.2-r1.ebuild 4805
+MD5 18a94e511e64115e525a7713458c630a courier-imap-1.7.0.ebuild 4946
+MD5 2effbb953eeb00f2e0bb666d5992aa78 courier-imap-1.7.3-r1.ebuild 6870
+MD5 d87ee21ee471a7f32cef5240c67e1e89 courier-imap-2.0.0.ebuild 6599
+MD5 96591b781d81dc564d59781acc80d382 courier-imap-2.1.1.ebuild 6826
+MD5 e2b026fe60176521e97df76389366955 files/authdaemond.conf 457
+MD5 9249739b006f7f0daa345dd8ac6e6b5b files/authdaemond.rc6 977
+MD5 c5993255c6be57914cb943789f59931e files/courier-imapd-ssl.rc6 1208
+MD5 fc75e6af35eeaecec10d7276e9b61747 files/courier-imapd.rc6 953
+MD5 32bc690ac270adbfe95dbbeaab37904b files/courier-pop3d-ssl.rc6 1216
+MD5 572530bc373ee70a6f524d554b1d139c files/courier-pop3d.rc6 961
 MD5 f8379da2c3af9757896cf51719923edd files/digest-courier-imap-1.7.1 72
 MD5 517c7b900eb23152a59d3054f98431e8 files/digest-courier-imap-1.7.2 72
 MD5 7f82274e3a25ba7ff6852f78d9eb2f69 files/digest-courier-imap-1.7.3 72
-MD5 2c48420faba16395e99faa48d098414a files/digest-courier-imap-2.0.0 72
-MD5 c7fcdd240762eddd559da4a56028d167 files/digest-courier-imap-2.1.1 72
-MD5 a949b3b821df42c3cfee300c25a53750 files/gentoo-imapd-1.7.3-r1.rc 1027
+MD5 4f24c08767f06ab12e572bb0236064bb files/digest-courier-imap-1.6.2-r1 72
+MD5 f287a12e157d9a3280951ab876b5159b files/digest-courier-imap-1.7.0 72
+MD5 8ec16f9f2d26e30684d8ddbd327e9556 files/gentoo-imapd-1.6.1.rc 1007
+MD5 20598de15b5368fd70065b36e8b4b4d6 files/gentoo-imapd-ssl-1.6.1.rc 1014
 MD5 9626da27b0e11f495ea062e6166e11d3 files/gentoo-imapd-ssl.rc 1013
+MD5 e448df5fdbc088132766b33d27f27073 files/gentoo-imapd.rc 1006
+MD5 24ac993caf8157415fbe8eff04bf7c68 files/gentoo-pop3d-1.6.1.rc 998
+MD5 c13a4bcb06660f1e589e95709b7a3f01 files/gentoo-pop3d-ssl-1.6.1.rc 990
+MD5 a2d52d98e3f5b3241e1ed40943d5a4a8 files/gentoo-pop3d-ssl.rc 989
 MD5 70a999ccc2bc13e7df65b72959fa6f7d files/gentoo-pop3d.rc 997
-MD5 12b60a6d075d607adf99f90af1a300e3 files/authdaemond.rc6 976
-MD5 70a104ae9721e2f5d86a8f7c326d9f1d files/courier-pop3d.rc6 960
+MD5 40deca440b71ed8d78e39968fb5a30e9 files/mkimapdcert 996
 MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
+MD5 7f82274e3a25ba7ff6852f78d9eb2f69 files/digest-courier-imap-1.7.3-r1 72
+MD5 2c48420faba16395e99faa48d098414a files/digest-courier-imap-2.0.0 72
+MD5 a949b3b821df42c3cfee300c25a53750 files/gentoo-imapd-1.7.3-r1.rc 1027
+MD5 58631496675a58dbb19ccd058088c6e1 files/gentoo-imapd-ssl-1.7.3-r1.rc 1034
+MD5 f959e38175d1fd8f8e7a977a14f7265f files/gentoo-pop3d-1.7.3-r1.rc 1018
+MD5 3dd72120d20476368b64811318e0b721 files/gentoo-pop3d-ssl-1.7.3-r1.rc 1010
+MD5 c7fcdd240762eddd559da4a56028d167 files/digest-courier-imap-2.1.1 72
+MD5 ff6234859377e6e830592de36bc84797 files/courier-imap-2.1.1-db40vs41.patch 559
diff --git a/net-mail/courier-imap/courier-imap-1.6.2-r1.ebuild b/net-mail/courier-imap/courier-imap-1.6.2-r1.ebuild
index dc844c010704..519825b62721 100644
--- a/net-mail/courier-imap/courier-imap-1.6.2-r1.ebuild
+++ b/net-mail/courier-imap/courier-imap-1.6.2-r1.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/courier-imap/courier-imap-1.6.2-r1.ebuild,v 1.4 2003/05/20 18:57:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.6.2-r1.ebuild,v 1.5 2003/09/05 02:31:27 msterret Exp $
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -111,7 +111,7 @@ src_install() {
 	do
 		mv ${x}.dist ${x}
 	done
-	
+
 	insinto /etc/courier-imap
 	doins ${FILESDIR}/authdaemond.conf
 
@@ -133,14 +133,14 @@ src_install() {
 
 	cd ../share
 	mv * ../sbin
-        mv ../sbin/man .
+	mv ../sbin/man .
 	cd ..
 
 	rm -f ${D}/usr/sbin/mkimapdcert ${D}/usr/sbin/mkpop3dcert
-	exeinto /usr/sbin 
+	exeinto /usr/sbin
 		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert
 
- 	exeinto /etc/init.d
+	exeinto /etc/init.d
 		newexe ${FILESDIR}/authdaemond.rc6 authdaemond
 		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
 		newexe ${FILESDIR}/courier-imapd-ssl.rc6 courier-imapd-ssl
diff --git a/net-mail/courier-imap/courier-imap-1.7.0.ebuild b/net-mail/courier-imap/courier-imap-1.7.0.ebuild
index 26eb44e322fd..830a20c6afa9 100644
--- a/net-mail/courier-imap/courier-imap-1.7.0.ebuild
+++ b/net-mail/courier-imap/courier-imap-1.7.0.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/courier-imap/courier-imap-1.7.0.ebuild,v 1.7 2003/05/20 18:57:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.7.0.ebuild,v 1.8 2003/09/05 02:31:27 msterret Exp $
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -113,7 +113,7 @@ src_install() {
 	do
 		mv ${x}.dist ${x}
 	done
-	
+
 	insinto /etc/courier-imap
 	doins ${FILESDIR}/authdaemond.conf
 
@@ -135,14 +135,14 @@ src_install() {
 
 	cd ../share
 	mv * ../sbin
-        mv ../sbin/man .
+	mv ../sbin/man .
 	cd ..
 
 	rm -f ${D}/usr/sbin/mkimapdcert ${D}/usr/sbin/mkpop3dcert
-	exeinto /usr/sbin 
+	exeinto /usr/sbin
 		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert
 
- 	exeinto /etc/init.d
+	exeinto /etc/init.d
 		newexe ${FILESDIR}/authdaemond.rc6 authdaemond
 		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
 		newexe ${FILESDIR}/courier-imapd-ssl.rc6 courier-imapd-ssl
diff --git a/net-mail/courier-imap/courier-imap-1.7.1.ebuild b/net-mail/courier-imap/courier-imap-1.7.1.ebuild
index a298b2432aad..e35c098c08a7 100644
--- a/net-mail/courier-imap/courier-imap-1.7.1.ebuild
+++ b/net-mail/courier-imap/courier-imap-1.7.1.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/courier-imap/courier-imap-1.7.1.ebuild,v 1.3 2003/06/11 01:48:34 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.7.1.ebuild,v 1.4 2003/09/05 02:31:27 msterret Exp $
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -148,14 +148,14 @@ src_install() {
 
 	cd ../share
 	mv * ../sbin
-        mv ../sbin/man .
+	mv ../sbin/man .
 	cd ..
 
 	rm -f ${D}/usr/sbin/mkimapdcert ${D}/usr/sbin/mkpop3dcert
 	exeinto /usr/sbin
 		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert
 
- 	exeinto /etc/init.d
+	exeinto /etc/init.d
 		newexe ${FILESDIR}/authdaemond.rc6 authdaemond
 		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
 		newexe ${FILESDIR}/courier-imapd-ssl.rc6 courier-imapd-ssl
diff --git a/net-mail/courier-imap/courier-imap-1.7.2.ebuild b/net-mail/courier-imap/courier-imap-1.7.2.ebuild
index 0b5f2cce58a7..06b148a1025d 100644
--- a/net-mail/courier-imap/courier-imap-1.7.2.ebuild
+++ b/net-mail/courier-imap/courier-imap-1.7.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/courier-imap/courier-imap-1.7.2.ebuild,v 1.3 2003/06/11 01:48:34 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.7.2.ebuild,v 1.4 2003/09/05 02:31:27 msterret Exp $
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -20,20 +20,20 @@ RDEPEND="virtual/glibc
 	ldap? ( >=net-nds/openldap-1.2.11 )
 	postgres? ( >=dev-db/postgresql-7.2 )
 	>=dev-tcltk/expect-5.33.0"
-DEPEND="${RDEPEND} 
+DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
-	dev-lang/perl 
+	dev-lang/perl
 	sys-apps/procps"
 
 inherit flag-o-matic
 filter-flags -funroll-loops
 filter-flags -fomit-frame-pointer
 
-#sandbox breaks linking against vpopmail 
+#sandbox breaks linking against vpopmail
 VPOPMAIL_DIR=`cat /etc/passwd | grep ^vpopmail | cut -d: -f6`
 if [ -n "${VPOPMAIL_DIR}" ]; then
 	VPOPMAIL_ERROR=
-	if [ "`has userpriv ${FEATURES}`" ]; then 
+	if [ "`has userpriv ${FEATURES}`" ]; then
 		VPOPMAIL_ERROR=1
 	fi
 fi
@@ -43,7 +43,7 @@ src_unpack() {
 
 	unpack ${A}
 	cd ${S}
-	
+
 	# explicitly use db3 over db4
 	if [ -n "`use berkdb`" ]; then
 		sed -i -e 's,-ldb,-ldb-3.2,g' configure
@@ -101,7 +101,7 @@ src_compile() {
 		--enable-workarounds-for-imap-client-bugs \
 		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
 		--cache-file=${cachefile} \
-		${myconf} 
+		${myconf}
 
 	# change the pem file location..
 	cp imap/imapd-ssl.dist imap/imapd-ssl.dist.old
@@ -116,7 +116,7 @@ src_compile() {
 }
 
 src_install() {
-	dodir /var/lib/courier-imap /etc/pam.d 
+	dodir /var/lib/courier-imap /etc/pam.d
 	make install DESTDIR=${D} || die
 
 	# avoid name collisions in /usr/sbin wrt imapd and pop3d
@@ -150,7 +150,7 @@ src_install() {
 	do
 		mv ${x}.dist ${x}
 	done
-	
+
 	insinto /etc/courier-imap
 	doins ${FILESDIR}/authdaemond.conf
 
@@ -178,10 +178,10 @@ src_install() {
 	cd ..
 
 	rm -f ${D}/usr/sbin/mkimapdcert ${D}/usr/sbin/mkpop3dcert
-	exeinto /usr/sbin 
+	exeinto /usr/sbin
 		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert
 
- 	exeinto /etc/init.d
+	exeinto /etc/init.d
 		newexe ${FILESDIR}/authdaemond.rc6 authdaemond
 		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
 		newexe ${FILESDIR}/courier-imapd-ssl.rc6 courier-imapd-ssl
@@ -193,7 +193,7 @@ src_install() {
 		newexe ${FILESDIR}/gentoo-imapd-ssl-1.6.1.rc gentoo-imapd-ssl.rc
 		newexe ${FILESDIR}/gentoo-pop3d-1.6.1.rc gentoo-pop3d.rc
 		newexe ${FILESDIR}/gentoo-pop3d-ssl-1.6.1.rc gentoo-pop3d-ssl.rc
-	
+
 	local authmods
 	authmods="authsystem.passwd authcram authshadow authuserdb authpwd authtest authinfo authmksock authcustom authdaemontest"
 	use mysql && authmods="${authmods} authmysql"
diff --git a/net-mail/courier-imap/courier-imap-1.7.3-r1.ebuild b/net-mail/courier-imap/courier-imap-1.7.3-r1.ebuild
index b518f86c4b54..33a1f0ce7eda 100644
--- a/net-mail/courier-imap/courier-imap-1.7.3-r1.ebuild
+++ b/net-mail/courier-imap/courier-imap-1.7.3-r1.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/courier-imap/courier-imap-1.7.3-r1.ebuild,v 1.1 2003/08/01 02:25:34 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.7.3-r1.ebuild,v 1.2 2003/09/05 02:31:27 msterret Exp $
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -183,7 +183,7 @@ src_install() {
 	exeinto /usr/sbin
 		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert
 
- 	exeinto /etc/init.d
+	exeinto /etc/init.d
 		newexe ${FILESDIR}/authdaemond.rc6 authdaemond
 		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
 		newexe ${FILESDIR}/courier-imapd-ssl.rc6 courier-imapd-ssl
diff --git a/net-mail/courier-imap/courier-imap-1.7.3.ebuild b/net-mail/courier-imap/courier-imap-1.7.3.ebuild
index 3b362b9d008a..256d9c12b151 100644
--- a/net-mail/courier-imap/courier-imap-1.7.3.ebuild
+++ b/net-mail/courier-imap/courier-imap-1.7.3.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/courier-imap/courier-imap-1.7.3.ebuild,v 1.6 2003/06/11 01:48:34 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.7.3.ebuild,v 1.7 2003/09/05 02:31:27 msterret Exp $
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -183,7 +183,7 @@ src_install() {
 	exeinto /usr/sbin
 		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert
 
- 	exeinto /etc/init.d
+	exeinto /etc/init.d
 		newexe ${FILESDIR}/authdaemond.rc6 authdaemond
 		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
 		newexe ${FILESDIR}/courier-imapd-ssl.rc6 courier-imapd-ssl
diff --git a/net-mail/courier-imap/courier-imap-2.0.0.ebuild b/net-mail/courier-imap/courier-imap-2.0.0.ebuild
index a0307e82e6ec..53628ea90cba 100644
--- a/net-mail/courier-imap/courier-imap-2.0.0.ebuild
+++ b/net-mail/courier-imap/courier-imap-2.0.0.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/courier-imap/courier-imap-2.0.0.ebuild,v 1.1 2003/08/01 02:45:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-2.0.0.ebuild,v 1.2 2003/09/05 02:31:27 msterret Exp $
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -179,7 +179,7 @@ src_install() {
 	exeinto /usr/sbin
 		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert
 
- 	exeinto /etc/init.d
+	exeinto /etc/init.d
 		newexe ${FILESDIR}/authdaemond.rc6 authdaemond
 		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
 		newexe ${FILESDIR}/courier-imapd-ssl.rc6 courier-imapd-ssl
diff --git a/net-mail/courier-imap/courier-imap-2.1.1.ebuild b/net-mail/courier-imap/courier-imap-2.1.1.ebuild
index c76b64d6ba41..b2f9b1c94a6d 100644
--- a/net-mail/courier-imap/courier-imap-2.1.1.ebuild
+++ b/net-mail/courier-imap/courier-imap-2.1.1.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/courier-imap/courier-imap-2.1.1.ebuild,v 1.3 2003/09/03 09:58:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-2.1.1.ebuild,v 1.4 2003/09/05 02:31:27 msterret Exp $
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -37,7 +37,7 @@ src_unpack() {
 	# patch to fix db4.0 detection as db4.1
 	# bug #27517, patch needs to go upstream
 	epatch ${FILESDIR}/courier-imap-2.1.1-db40vs41.patch
-	
+
 	cd ${S}
 	# explicitly use db3 over db4
 	if use berkdb; then
@@ -91,9 +91,9 @@ src_compile() {
 	CXXFLAGS=`echo ${CXXFLAGS} | xargs`
 	LDFLAGS=`echo ${LDFLAGS} | xargs`
 
-	# fix for bug #27528 
+	# fix for bug #27528
 	# they really should use a better way to detect redhat
-	myconf="${myconf} --without-redhat" 
+	myconf="${myconf} --without-redhat"
 
 	# Do the actual build now
 	LDFLAGS="${LDFLAGS}" econf \
@@ -186,7 +186,7 @@ src_install() {
 	exeinto /usr/sbin
 		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert
 
- 	exeinto /etc/init.d
+	exeinto /etc/init.d
 		newexe ${FILESDIR}/authdaemond.rc6 authdaemond
 		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
 		newexe ${FILESDIR}/courier-imapd-ssl.rc6 courier-imapd-ssl
diff --git a/net-mail/courier/courier-0.42.2-r3.ebuild b/net-mail/courier/courier-0.42.2-r3.ebuild
index 83a1b1c98c6e..39254ef6136a 100644
--- a/net-mail/courier/courier-0.42.2-r3.ebuild
+++ b/net-mail/courier/courier-0.42.2-r3.ebuild
@@ -34,7 +34,7 @@ RDEPEND="virtual/glibc
 	!virtual/imapd"
 
 	# Removed these from RDEP until the tcltk situation is clarified.
-	# They are only necessary for non-virtual users to be able to change 
+	# They are only necessary for non-virtual users to be able to change
 	# passwords via webmail. Hopefully not a highly used feature.
 	#>=dev-tcltk/expect-5.33.0
 	#tcltk? ( >=dev-tcltk/expect-5.33.0 )
@@ -65,27 +65,27 @@ src_compile() {
 		|| myconf="${myconf} --without-ispell"
 
 	if [ -f /var/vpopmail/etc/lib_deps ]; then
-                myconf="${myconf} --with-authvchkpw"
-        else
-                myconf="${myconf} --without-authvchkpw"
-        fi
-	
+		myconf="${myconf} --with-authvchkpw"
+	else
+		myconf="${myconf} --without-authvchkpw"
+	fi
+
 	#
 	# 1. If nls is enabled and ENABLE_UNICODE is not empty...
 	#    enable the specified unicode sets
-	# 2. If nls is enabled and no unicode sets are specified, 
+	# 2. If nls is enabled and no unicode sets are specified,
 	#    enable them all
 	# 3. If nls is disabled, disable unicode sets
 	#
 	if use nls && [ ! -z "$ENABLE_UNICODE" ]; then
-                myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-        elif use nls; then
-                myconf="${myconf} --enable-unicode"
-        else
-                myconf="${myconf} --disable-unicode"
-        fi
+		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
+	elif use nls; then
+		myconf="${myconf} --enable-unicode"
+	else
+		myconf="${myconf} --disable-unicode"
+	fi
 
-	myconf="${myconf} debug=true"	
+	myconf="${myconf} debug=true"
 
 	./configure \
 		--prefix=/usr \
@@ -118,7 +118,7 @@ chg_cfg() {
 	sed -e "/\#\#NAME: ${key}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file} > ${file}.tmp && chmod --reference ${file} ${file}.tmp && mv ${file}.tmp ${file}
 	rm -f ${f}.tmp 1>/dev/null 2>&1
 }
-	
+
 set_mime() {
 	local files=$*
 
@@ -155,12 +155,12 @@ set_maildir() {
 
 	local f
 	for f in ${files}
-	do	
+	do
 		echo "changing ${origmaildir} in ${f} to ${newmaildir}"
 		sed -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f} > ${f}.tmp && chmod --reference ${f} ${f}.tmp && mv -f ${f}.tmp ${f}
 		rm -f ${f}.tmp 1> /dev/null 2>&1
 	done
-}						
+}
 
 src_install() {
 	dodir /var/lib/courier
@@ -185,7 +185,7 @@ src_install() {
 	exeinto /etc/init.d
 	# we install the new single init script as courier
 	newexe ${FILESDIR}/courier-init courier
-	# and install the old main init script as courier-old if the old one 
+	# and install the old main init script as courier-old if the old one
 	# is installed which it will be now, but for the future...
 	`grep DAEMONLIST /etc/init.d/courier >&/dev/null` && \
 		newexe ${FILESDIR}/courier courier-old
@@ -203,7 +203,7 @@ src_install() {
 	newins ${FILESDIR}/locallowercase locallowercase
 	newins ${FILESDIR}/sizelimit sizelimit
 	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-	
+
 	touch ${D}/var/lib/courier/webmail-logincache/.keep
 	touch ${D}/var/lib/courier/tmp/broken/.keep
 	touch ${D}/var/lib/courier/msgs/.keep
@@ -240,7 +240,7 @@ pkg_preinst() {
 	do
 		mv ${y} courier-${y}
 	done
-	
+
 	cd ${D}/etc/courier
 	for y in *.dist
 	do
@@ -261,13 +261,13 @@ pkg_postinst() {
 	cd ${S}
 	make install-configure
 
-	# fixes bug #15873 for upgrades, should be able to yank this sometime in 
+	# fixes bug #15873 for upgrades, should be able to yank this sometime in
 	# the future
 	chown --recursive mail.mail ${ROOT}/var/run/courier
 
-	# need to do this for new installs to be able to start courier 
-        # without having to run rc-update ...
-        /etc/init.d/depscan.sh
+	# need to do this for new installs to be able to start courier
+	# without having to run rc-update ...
+	/etc/init.d/depscan.sh
 
 	einfo "The following command will setup courier for you system:"
 	einfo "ebuild /var/db/pkg/${CATEGORY}/${PN}-${PV}/${PN}-${PV}.ebuild config"
@@ -302,10 +302,10 @@ pkg_postinst() {
 pkg_config() {
 	mailhost=`hostname`
 	export mailhost
-	
+
 	domainname=`echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/"`
 	export domainname
-	
+
 
 	if [ ${ROOT} = "/" ] ; then
 		file=${ROOT}/etc/courier/locals
@@ -318,7 +318,7 @@ pkg_config() {
 			echo ${domainname} > ${file}
 			/usr/sbin/makeacceptmailfor
 		fi
-		
+
 		file=${ROOT}/etc/courier/smtpaccess/${domainname}
 		if [ ! -f ${file} ]
 		then
@@ -345,7 +345,7 @@ pkg_config() {
 			/usr/sbin/makesmtpaccess
 		fi
 	fi
-	
+
 	echo "creating cert for esmtpd-ssl:"
 	/usr/sbin/mkesmtpdcert
 	echo "creating cert for imapd-ssl:"
diff --git a/net-mail/courier/courier-0.42.2.ebuild b/net-mail/courier/courier-0.42.2.ebuild
index 25b4b4e9c67f..6558e6959654 100644
--- a/net-mail/courier/courier-0.42.2.ebuild
+++ b/net-mail/courier/courier-0.42.2.ebuild
@@ -51,35 +51,35 @@ src_compile() {
 	use mysql || myconf="${myconf} --without-authmysql"
 	use postgres || myconf="${myconf} --without-authpostgresql"
 	use berkdb \
-                && myconf="${myconf} --with-db=db" \
-                || myconf="${myconf} --with-db=gdbm"
+		&& myconf="${myconf} --with-db=db" \
+		|| myconf="${myconf} --with-db=gdbm"
 	use ipv6 || myconf="${myconf} --without-ipv6"
 	use spell \
 		&& myconf="${myconf} --with-ispell" \
 		|| myconf="${myconf} --without-ispell"
 
 	if [ -f /var/vpopmail/etc/lib_deps ]; then
-                myconf="${myconf} --with-authvchkpw"
-        else
-                myconf="${myconf} --without-authvchkpw"
-        fi
-	
+		myconf="${myconf} --with-authvchkpw"
+	else
+		myconf="${myconf} --without-authvchkpw"
+	fi
+
 	#
 	# 1. If nls is enabled and ENABLE_UNICODE is not empty...
 	#    enable the specified unicode sets
-	# 2. If nls is enabled and no unicode sets are specified, 
+	# 2. If nls is enabled and no unicode sets are specified,
 	#    enable them all
 	# 3. If nls is disabled, disable unicode sets
 	#
 	if use nls && [ ! -z "$ENABLE_UNICODE" ]; then
-                myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-        elif use nls; then
-                myconf="${myconf} --enable-unicode"
-        else
-                myconf="${myconf} --disable-unicode"
-        fi
+		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
+	elif use nls; then
+		myconf="${myconf} --enable-unicode"
+	else
+		myconf="${myconf} --disable-unicode"
+	fi
 
-	myconf="${myconf} debug=true"	
+	myconf="${myconf} debug=true"
 
 	./configure \
 		--prefix=/usr \
@@ -112,7 +112,7 @@ chg_cfg() {
 	sed -e "/\#\#NAME: ${key}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file} > ${file}.tmp && chmod --reference ${file} ${file}.tmp && mv ${file}.tmp ${file}
 	rm -f ${f}.tmp 1>/dev/null 2>&1
 }
-	
+
 set_mime() {
 	local files=$*
 
@@ -149,12 +149,12 @@ set_maildir() {
 
 	local f
 	for f in ${files}
-	do	
+	do
 		echo "changing ${origmaildir} in ${f} to ${newmaildir}"
 		sed -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f} > ${f}.tmp && chmod --reference ${f} ${f}.tmp && mv -f ${f}.tmp ${f}
 		rm -f ${f}.tmp 1> /dev/null 2>&1
 	done
-}						
+}
 
 src_install() {
 	dodir /var/lib/courier
@@ -199,7 +199,7 @@ src_install() {
 	newins ${FILESDIR}/locallowercase locallowercase
 	newins ${FILESDIR}/sizelimit sizelimit
 	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-	
+
 	touch ${D}/var/lib/courier/webmail-logincache/.keep
 	touch ${D}/var/lib/courier/tmp/broken/.keep
 	touch ${D}/var/lib/courier/msgs/.keep
@@ -233,7 +233,7 @@ pkg_preinst() {
 	do
 		mv ${y} courier-${y}
 	done
-	
+
 	cd ${D}/etc/courier
 	for y in *.dist
 	do
@@ -254,13 +254,13 @@ pkg_postinst() {
 	cd ${S}
 	make install-configure
 
-	# fixes bug #15873 for upgrades, should be able to yank this sometime in 
+	# fixes bug #15873 for upgrades, should be able to yank this sometime in
 	# the future
 	chown --recursive mail.mail ${ROOT}/var/run/courier
 
-	# need to do this for new installs to be able to start courier 
-        # without having to run rc-update ...
-        /etc/init.d/depscan.sh
+	# need to do this for new installs to be able to start courier
+	# without having to run rc-update ...
+	/etc/init.d/depscan.sh
 
 	echo -e "\e[32;01m The following command :\033[0m"
 	echo -e "\e[32;01m ebuild /var/db/pkg/${CATEGORY}/${PN}-${PV}/${PN}-${PV}.ebuild config \033[0m"
@@ -280,10 +280,10 @@ pkg_postinst() {
 pkg_config() {
 	mailhost=`hostname`
 	export mailhost
-	
+
 	domainname=`echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/"`
 	export domainname
-	
+
 
 	if [ ${ROOT} = "/" ] ; then
 		file=${ROOT}/etc/courier/locals
@@ -296,7 +296,7 @@ pkg_config() {
 			echo ${domainname} > ${file}
 			/usr/sbin/makeacceptmailfor
 		fi
-		
+
 		file=${ROOT}/etc/courier/smtpaccess/${domainname}
 		if [ ! -f ${file} ]
 		then
@@ -323,7 +323,7 @@ pkg_config() {
 			/usr/sbin/makesmtpaccess
 		fi
 	fi
-	
+
 	echo "creating cert for esmtpd-ssl:"
 	/usr/sbin/mkesmtpdcert
 	echo "creating cert for imapd-ssl:"
diff --git a/net-mail/courier/courier-0.43.1.ebuild b/net-mail/courier/courier-0.43.1.ebuild
index d531b44b84e1..411532def5c0 100644
--- a/net-mail/courier/courier-0.43.1.ebuild
+++ b/net-mail/courier/courier-0.43.1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="virtual/glibc
 	!virtual/imapd"
 
 	# Removed these from RDEP until the tcltk situation is clarified.
-	# They are only necessary for non-virtual users to be able to change 
+	# They are only necessary for non-virtual users to be able to change
 	# passwords via webmail. Hopefully not a highly used feature.
 	#>=dev-tcltk/expect-5.33.0
 	#tcltk? ( >=dev-tcltk/expect-5.33.0 )
@@ -65,27 +65,27 @@ src_compile() {
 		|| myconf="${myconf} --without-ispell"
 
 	if [ -f /var/vpopmail/etc/lib_deps ]; then
-                myconf="${myconf} --with-authvchkpw"
-        else
-                myconf="${myconf} --without-authvchkpw"
-        fi
-	
+		myconf="${myconf} --with-authvchkpw"
+	else
+		myconf="${myconf} --without-authvchkpw"
+	fi
+
 	#
 	# 1. If nls is enabled and ENABLE_UNICODE is not empty...
 	#    enable the specified unicode sets
-	# 2. If nls is enabled and no unicode sets are specified, 
+	# 2. If nls is enabled and no unicode sets are specified,
 	#    enable them all
 	# 3. If nls is disabled, disable unicode sets
 	#
 	if use nls && [ ! -z "$ENABLE_UNICODE" ]; then
-                myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-        elif use nls; then
-                myconf="${myconf} --enable-unicode"
-        else
-                myconf="${myconf} --disable-unicode"
-        fi
+		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
+	elif use nls; then
+		myconf="${myconf} --enable-unicode"
+	else
+		myconf="${myconf} --disable-unicode"
+	fi
 
-	myconf="${myconf} debug=true"	
+	myconf="${myconf} debug=true"
 
 	./configure \
 		--prefix=/usr \
@@ -118,7 +118,7 @@ chg_cfg() {
 	sed -e "/\#\#NAME: ${key}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file} > ${file}.tmp && chmod --reference ${file} ${file}.tmp && mv ${file}.tmp ${file}
 	rm -f ${f}.tmp 1>/dev/null 2>&1
 }
-	
+
 set_mime() {
 	local files=$*
 
@@ -155,12 +155,12 @@ set_maildir() {
 
 	local f
 	for f in ${files}
-	do	
+	do
 		echo "changing ${origmaildir} in ${f} to ${newmaildir}"
 		sed -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f} > ${f}.tmp && chmod --reference ${f} ${f}.tmp && mv -f ${f}.tmp ${f}
 		rm -f ${f}.tmp 1> /dev/null 2>&1
 	done
-}						
+}
 
 src_install() {
 	dodir /var/lib/courier
@@ -185,7 +185,7 @@ src_install() {
 	exeinto /etc/init.d
 	# we install the new single init script as courier
 	newexe ${FILESDIR}/courier-init courier
-	# and install the old main init script as courier-old if the old one 
+	# and install the old main init script as courier-old if the old one
 	# is installed which it will be now, but for the future...
 	`grep DAEMONLIST /etc/init.d/courier >&/dev/null` && \
 		newexe ${FILESDIR}/courier courier-old
@@ -203,7 +203,7 @@ src_install() {
 	newins ${FILESDIR}/locallowercase locallowercase
 	newins ${FILESDIR}/sizelimit sizelimit
 	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-	
+
 	touch ${D}/var/lib/courier/webmail-logincache/.keep
 	touch ${D}/var/lib/courier/tmp/broken/.keep
 	touch ${D}/var/lib/courier/msgs/.keep
@@ -240,7 +240,7 @@ pkg_preinst() {
 	do
 		mv ${y} courier-${y}
 	done
-	
+
 	cd ${D}/etc/courier
 	for y in *.dist
 	do
@@ -261,13 +261,13 @@ pkg_postinst() {
 	cd ${S}
 	make install-configure
 
-	# fixes bug #15873 for upgrades, should be able to yank this sometime in 
+	# fixes bug #15873 for upgrades, should be able to yank this sometime in
 	# the future
 	chown --recursive mail:mail ${ROOT}/var/run/courier
 
-	# need to do this for new installs to be able to start courier 
-        # without having to run rc-update ...
-        /etc/init.d/depscan.sh
+	# need to do this for new installs to be able to start courier
+	# without having to run rc-update ...
+	/etc/init.d/depscan.sh
 
 	einfo "The following command will setup courier for you system:"
 	einfo "ebuild /var/db/pkg/${CATEGORY}/${PN}-${PV}/${PN}-${PV}.ebuild config"
@@ -306,10 +306,10 @@ pkg_postinst() {
 pkg_config() {
 	mailhost=`hostname`
 	export mailhost
-	
+
 	domainname=`echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/"`
 	export domainname
-	
+
 
 	if [ ${ROOT} = "/" ] ; then
 		file=${ROOT}/etc/courier/locals
@@ -322,7 +322,7 @@ pkg_config() {
 			echo ${domainname} > ${file}
 			/usr/sbin/makeacceptmailfor
 		fi
-		
+
 		file=${ROOT}/etc/courier/smtpaccess/${domainname}
 		if [ ! -f ${file} ]
 		then
@@ -349,7 +349,7 @@ pkg_config() {
 			/usr/sbin/makesmtpaccess
 		fi
 	fi
-	
+
 	echo "creating cert for esmtpd-ssl:"
 	/usr/sbin/mkesmtpdcert
 	echo "creating cert for imapd-ssl:"
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 {} \; || :
-
 }
diff --git a/net-mail/nail/Manifest b/net-mail/nail/Manifest
index 0b641837afea..1941b67a412b 100644
--- a/net-mail/nail/Manifest
+++ b/net-mail/nail/Manifest
@@ -1,4 +1,4 @@
-MD5 5ed8f9bdd731fe8bd70df0819ab82157 nail-9.30.ebuild 2298
 MD5 ac4682bd16785149304ea36f690eaa09 ChangeLog 846
+MD5 94f35a484f3ea4cf4df5b3f4a422fce7 nail-9.30.ebuild 2178
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 7e34958d8627a2cf4e1097009af12d90 files/digest-nail-9.30 61
diff --git a/net-mail/nail/nail-9.30.ebuild b/net-mail/nail/nail-9.30.ebuild
index 98d847281b3e..31f57eeedce0 100644
--- a/net-mail/nail/nail-9.30.ebuild
+++ b/net-mail/nail/nail-9.30.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/nail/nail-9.30.ebuild,v 1.9 2003/02/13 14:34:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/nail/nail-9.30.ebuild,v 1.10 2003/09/05 02:45:39 msterret Exp $
 
 S=${WORKDIR}/${P}
 
@@ -22,38 +22,37 @@ src_compile() {
 }
 
 src_install () {
-    #add smtp flag to nail.rc so that it uses smtp by default (making it
-    #essentially mailer independent
-    echo -e "\n#use smtp on the local system by default.  Change" >> nail.rc
-    echo -e "#\"localhost\" to your smtp server if you use a remote" >> nail.rc
-    echo -e "#smtp server.  (Delete this line to use sendmail instead)" >> nail.rc
-    echo -e "set smtp=localhost" >> nail.rc
-	
-    make DESTDIR=${D} install || die "install failed"
-    dodoc AUTHORS COPYING I18N INSTALL README
-    dodir /bin
-    dosym /usr/bin/nail /bin/mail
-    dosym /usr/bin/nail /usr/bin/mail
-    dosym /usr/bin/nail /usr/bin/Mail
+	#add smtp flag to nail.rc so that it uses smtp by default (making it
+	#essentially mailer independent
+	echo -e "\n#use smtp on the local system by default.  Change" >> nail.rc
+	echo -e "#\"localhost\" to your smtp server if you use a remote" >> nail.rc
+	echo -e "#smtp server.  (Delete this line to use sendmail instead)" >> nail.rc
+	echo -e "set smtp=localhost" >> nail.rc
+
+	make DESTDIR=${D} install || die "install failed"
+	dodoc AUTHORS COPYING I18N INSTALL README
+	dodir /bin
+	dosym /usr/bin/nail /bin/mail
+	dosym /usr/bin/nail /usr/bin/mail
+	dosym /usr/bin/nail /usr/bin/Mail
 }
 
 pkg_postinst () {
 
-    echo -e "\nNOTE: The nail mailer does _not_ support maildir format.\n" \
-              "      It is best to use nail only for outgoing mail, and\n" \
-	      "      really only use it for scripts that require it.\n\n" \
-	      "NOTE: This build has ~/.maildir compiled in as the\n" \
-	      "      mail spool directory (for incoming mail).\n" \
-	      "      Nail will work for sending outgoing mail even if\n" \
-	      "      the mail spool directory does not exist.\n\n" \
-	      "NOTE: When used to send mail via a remote smtp server\n" \
-	      "      nail does not require a local mail transfer agent.\n" \
-	      "      ISP smtp servers tend to have names like\n" \
-	      "        mail.ispname.com\n" \
-	      "      or\n" \
-	      "        smtp.ispname.com.\n" \
-	      "      If you do not wish to use a remote smtp server,\n" \
-	      "      then you WILL have to install a mta such as sendmail,\n" \
-	      "      postfix, exim, etcetera.\n"
-
+	echo -e "\nNOTE: The nail mailer does _not_ support maildir format.\n" \
+		"      It is best to use nail only for outgoing mail, and\n" \
+		"      really only use it for scripts that require it.\n\n" \
+		"NOTE: This build has ~/.maildir compiled in as the\n" \
+		"      mail spool directory (for incoming mail).\n" \
+		"      Nail will work for sending outgoing mail even if\n" \
+		"      the mail spool directory does not exist.\n\n" \
+		"NOTE: When used to send mail via a remote smtp server\n" \
+		"      nail does not require a local mail transfer agent.\n" \
+		"      ISP smtp servers tend to have names like\n" \
+		"        mail.ispname.com\n" \
+		"      or\n" \
+		"        smtp.ispname.com.\n" \
+		"      If you do not wish to use a remote smtp server,\n" \
+		"      then you WILL have to install a mta such as sendmail,\n" \
+		"      postfix, exim, etcetera.\n"
 }
diff --git a/net-mail/qmail-ldap/Manifest b/net-mail/qmail-ldap/Manifest
index f816428055b5..1f28196b2595 100644
--- a/net-mail/qmail-ldap/Manifest
+++ b/net-mail/qmail-ldap/Manifest
@@ -1,35 +1,35 @@
-MD5 894f3c1e6d44754c8fe9a54c37eedfce qmail-ldap-1.03-r1.ebuild 11936
 MD5 b67ba71ba26f018d8f50a59fc1d0eef9 ChangeLog 356
-MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/rc 108
-MD5 931b3ed00571e8e2a22b550fcd1d7137 files/qmail-queue.patch.bz2 722
-MD5 3866e15deb8a69d44cacb5b3680d1b61 files/qmail-linksync.patch.bz2 687
-MD5 cdeca5e6a3d82ed7b85e372433576bb2 files/samples.ldif 821
-MD5 0078aede689ce77bc32e32124a5e7fbb files/homedir.patch.bz2 527
-MD5 1dcd3bb9666d5015bca6b7eb33478542 files/errno.patch.bz2 401
+MD5 431f8c324c569051234f8d71a36f08a1 qmail-ldap-1.03-r1.ebuild 11844
 MD5 b69ae80155ab4d0555b66a79ae5ab95d files/digest-qmail-ldap-1.03-r1 452
 MD5 c378c5845848ee31d70f0d05cbcf86be files/dot_qmail 12
-MD5 8af1f30a164fbdec0d51d11ef82dcaa9 files/tls.patch.bz2 406
+MD5 1dcd3bb9666d5015bca6b7eb33478542 files/errno.patch.bz2 401
+MD5 0078aede689ce77bc32e32124a5e7fbb files/homedir.patch.bz2 527
 MD5 1a590268c013010a19477f9eb7397972 files/qmail-control 805
+MD5 3866e15deb8a69d44cacb5b3680d1b61 files/qmail-linksync.patch.bz2 687
+MD5 931b3ed00571e8e2a22b550fcd1d7137 files/qmail-queue.patch.bz2 722
+MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/rc 108
+MD5 cdeca5e6a3d82ed7b85e372433576bb2 files/samples.ldif 821
+MD5 8af1f30a164fbdec0d51d11ef82dcaa9 files/tls.patch.bz2 406
+MD5 44f0ea3c13cabc96782b1e26042865c4 files/control/defaultdelivery 11
+MD5 eb6ed326fe4b42303e2ff32aabe581ab files/control/defaultdomain 13
+MD5 eb6ed326fe4b42303e2ff32aabe581ab files/control/defaulthost 13
+MD5 4a4e6ef110d83f712d5df669e7ca3a0b files/control/dirmaker 24
 MD5 d24fa37b58967d2d8022c84c88148ed6 files/control/file 41
 MD5 04f43d57aee8dc0b8e2465eeb7035e2b files/control/ldapbasedn 19
+MD5 91929a0ba1be35ed2656fc733674c210 files/control/ldapgid 5
+MD5 897316929176464ebc9ad085f31e7284 files/control/ldaplocaldelivery 2
 MD5 f77794722007d48a2d7751684ac23580 files/control/ldaplogin 45
-MD5 eb6ed326fe4b42303e2ff32aabe581ab files/control/defaultdomain 13
 MD5 0dbac736b055522776d091c24a941b38 files/control/ldapmessagestore 21
 MD5 40d7e85fdd014acc169817b5dc1c43da files/control/ldappassword 26
-MD5 91929a0ba1be35ed2656fc733674c210 files/control/ldapgid 5
-MD5 0ce18f24e2bb34b7680aaf80ab44ec56 files/control/ldapuid 6
-MD5 eb6ed326fe4b42303e2ff32aabe581ab files/control/defaulthost 13
 MD5 b8419160170a41ae01abab13a3b887df files/control/ldapserver 10
-MD5 7a046b4c43e5e5848d27420909e096c2 files/control/qmail-pop3d-softlimit 9
-MD5 4a4e6ef110d83f712d5df669e7ca3a0b files/control/dirmaker 24
-MD5 897316929176464ebc9ad085f31e7284 files/control/ldaplocaldelivery 2
-MD5 44f0ea3c13cabc96782b1e26042865c4 files/control/defaultdelivery 11
+MD5 0ce18f24e2bb34b7680aaf80ab44ec56 files/control/ldapuid 6
 MD5 6d7fce9fee471194aa8b5b6e47267f03 files/control/qmail-pop3d-loglevel 2
-MD5 6d7fce9fee471194aa8b5b6e47267f03 files/control/qmail-start-loglevel 2
+MD5 7a046b4c43e5e5848d27420909e096c2 files/control/qmail-pop3d-softlimit 9
 MD5 0ae1000c6026575b9a847a9cfa0badb4 files/control/qmail-smtpd-softlimit 8
+MD5 6d7fce9fee471194aa8b5b6e47267f03 files/control/qmail-start-loglevel 2
 MD5 a04bed51dfb2bedba57a5b42e7eb71b9 files/supervise/run-qmailpop3d 448
+MD5 34f7022d4bda6c19752a878f8da7289b files/supervise/run-qmailpop3dlog 100
+MD5 23a2babf3049fe012de21c17e550b3e5 files/supervise/run-qmailsend 29
+MD5 834dad5113515d0f00981fdc1d07fa84 files/supervise/run-qmailsendlog 96
 MD5 cc0cf4631ac9d86397660f91c62332b2 files/supervise/run-qmailsmtpd 270
 MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/supervise/run-qmailsmtpdlog 97
-MD5 834dad5113515d0f00981fdc1d07fa84 files/supervise/run-qmailsendlog 96
-MD5 23a2babf3049fe012de21c17e550b3e5 files/supervise/run-qmailsend 29
-MD5 34f7022d4bda6c19752a878f8da7289b files/supervise/run-qmailpop3dlog 100
diff --git a/net-mail/qmail-ldap/qmail-ldap-1.03-r1.ebuild b/net-mail/qmail-ldap/qmail-ldap-1.03-r1.ebuild
index 3748d578baf0..f96720e6a844 100644
--- a/net-mail/qmail-ldap/qmail-ldap-1.03-r1.ebuild
+++ b/net-mail/qmail-ldap/qmail-ldap-1.03-r1.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/qmail-ldap/qmail-ldap-1.03-r1.ebuild,v 1.1 2003/07/26 02:03:33 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/qmail-ldap-1.03-r1.ebuild,v 1.2 2003/09/05 02:33:22 msterret Exp $
 
 IUSE="ssl"
 
@@ -19,7 +19,7 @@ SRC_URI="http://cr.yp.to/software/qmail-1.03.tar.gz
 	http://www.ckdhr.com/ckd/qmail-103.patch
 	http://www.lifewithqmail.org/ldap/patches/smtp-auth/smtp-auth-20030301.patch
 	http://www.suspectclass.com/~sgifford/qmail/qmail-0.0.0.0.patch
-	http://www.nrg4u.com/qmail/qmail-ldap-1.03-20020901.patch.gz" 
+	http://www.nrg4u.com/qmail/qmail-ldap-1.03-20020901.patch.gz"
 
 DEPEND="virtual/glibc
 	net-nds/openldap
@@ -53,7 +53,7 @@ src_unpack() {
 
 	cd ${S}
 
-        # a patch for faster queue processing
+	# a patch for faster queue processing
 	epatch ${DISTDIR}/big-todo.103.patch || die "big-todo patch failed"
 
 	#Suppprt for XFS and reiserfs
@@ -66,9 +66,9 @@ src_unpack() {
 	epatch ${WORKDIR}/qmail-ldap-1.03-20020901.patch || die "ldap patch failed"
 
 	#define 0.0.0.0 as local system/network
-        epatch ${DISTDIR}/qmail-0.0.0.0.patch || die "0.0.0.0 patch did not apply"
+	epatch ${DISTDIR}/qmail-0.0.0.0.patch || die "0.0.0.0 patch did not apply"
 
-        # Let the system decide how to define errno
+	# Let the system decide how to define errno
 	epatch ${FILESDIR}/errno.patch.bz2
 
 	# AUTOHOME DIR MAKE PATCH
@@ -77,9 +77,9 @@ src_unpack() {
 	#SMTP_AUTH PATCH
 	epatch ${DISTDIR}/smtp-auth-20030301.patch || die "SMTP_AUTH patch did not apply"
 
-        if [ `use ssl` ]; then
+	if [ `use ssl` ]; then
 		use ssl && { epatch ${FILESDIR}/tls.patch.bz2 || die "tls+auth patch failed"; }
-        fi
+	fi
 
 	echo "gcc ${CFLAGS}" > conf-cc
 	echo "gcc" > conf-ld
@@ -115,30 +115,30 @@ src_install() {
 	diropts -m 755 -o alias -g qmail
 	dodir /var/qmail/alias
 
-	einfo "Installing the qmail software ..." 
+	einfo "Installing the qmail software ..."
 
 	insopts -o root -g qmail -m 755
 	insinto /var/qmail/boot
 	doins home home+df proc proc+df binm1 binm1+df binm2 binm2+df binm3 binm3+df
- 
+
 	into /usr
 	dodoc ${FILESDIR}/samples.ldif
-	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY 
+	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY
 	dodoc SYSDEPS TARGETS THANKS THOUGHTS TODO VERSION
- 
+
 	insopts -o qmailq -g qmail -m 4711
 	insinto /var/qmail/bin
 	doins qmail-queue qmail-queue
-        
+
 	insopts -o root -g qmail -m 700
 	insinto /var/qmail/bin
 	doins qmail-lspawn qmail-start qmail-newu qmail-newmrh
-        
+
 	insopts -o root -g qmail -m 711
 	insinto /var/qmail/bin
 	doins qmail-getpw qmail-local qmail-remote qmail-rspawn \
 	qmail-clean qmail-send splogger qmail-pw2u
- 
+
 	insopts -o root -g qmail -m 755
 	insinto /var/qmail/bin
 	doins qmail-inject predate datemail mailsubj qmail-showctl \
@@ -176,7 +176,7 @@ src_install() {
 		touch ${D}/var/qmail/alias/.qmail-${i}
 		fowners alias.qmail /var/qmail/alias/.qmail-${i}
 	done
- 
+
 	einfo "Setting up maildirs by default in the account skeleton ..."
 	diropts -m 755 -o root -g root
 	insinto /etc/skel
@@ -246,8 +246,8 @@ src_install() {
 	${FILESDIR}/control/qmail-smtpd-softlimit \
 	${FILESDIR}/control/qmail-start-loglevel
 
-        insopts -o qmaild -g root -m 600
-        insinto /var/qmail/control
+	insopts -o qmaild -g root -m 600
+	insinto /var/qmail/control
 	doins ${FILESDIR}/control/ldappassword
 }
 
@@ -289,19 +289,19 @@ pkg_postinst() {
 	touch ${ROOT}/var/qmail/queue/lock/sendmutex
 	chmod 600 ${ROOT}/var/qmail/queue/lock/sendmutex
 	chown qmails.qmail ${ROOT}/var/qmail/queue/lock/sendmutex
- 
+
 	if [ ! -p ${ROOT}/var/qmail/queue/lock/trigger ] ; then
 	mkfifo ${ROOT}/var/qmail/queue/lock/trigger
 	chmod 622 ${ROOT}/var/qmail/queue/lock/trigger
 	chown qmails.qmail ${ROOT}/var/qmail/queue/lock/trigger
 	fi
-	
-	if [ `getent passwd ldapauth | cut -d: -f1` != ldapauth ]; then  
+
+	if [ `getent passwd ldapauth | cut -d: -f1` != ldapauth ]; then
 	useradd -g ldapauth -d /var/qmail/maildirs -s /bin/true -u 11184 ldapauth
 	fi
 
-        if [ `getent group ldapauth | cut -d: -f1` != ldapauth ]; then
-        groupadd ldapauth &>/dev/null
+	if [ `getent group ldapauth | cut -d: -f1` != ldapauth ]; then
+		groupadd ldapauth &>/dev/null
 	fi
 
 	echo -e "\e[32;01m Please do not forget to run, the following syntax :\033[0m"
@@ -334,15 +334,15 @@ pkg_postinst() {
 		echo -e "\e[32;01m Send req.pem to your CA to obtain signed_req.pem, and do: \033[0m"
 		echo -e "\e[32;01m cat signed_req.pem >> /var/qmail/control/servercert.pem \033[0m"
 	fi
-		
+
 }
 
 pkg_config() {
 
-export qhost=`hostname`			
+export qhost=`hostname`
 	if [ ${ROOT} = "/" ] ; then
 		if [ ! -f ${ROOT}/var/qmail/control/me ] ; then
-			${ROOT}/var/qmail/bin/config-fast $qhost 
+			${ROOT}/var/qmail/bin/config-fast $qhost
 		fi
 	fi
 
diff --git a/net-mail/qmail-mysql/Manifest b/net-mail/qmail-mysql/Manifest
index 43f16d38e036..cb13a7514e84 100644
--- a/net-mail/qmail-mysql/Manifest
+++ b/net-mail/qmail-mysql/Manifest
@@ -1,14 +1,14 @@
-MD5 90b95837c60f389c54cbc4836bc47f09 qmail-mysql-1.03.ebuild 8588
 MD5 aaab984437497b31ff784dfb2fe1103a ChangeLog 553
+MD5 14c8fdb063c0bbcc3a2958ae6b663f85 qmail-mysql-1.03.ebuild 8565
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 7dbe164188aa14fd05fa2c26d1095a9a files/digest-qmail-mysql-1.03 385
-MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03/rc 108
-MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03/run-qmailsmtpd 231
+MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03/dot_qmail 12
 MD5 5cb0c8c4c9feeee55362d77a99076c2f files/1.03/99qmail 44
-MD5 c47d861aeef098d12d022d44c27386b5 files/1.03/errno.patch 850
 MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03/defaultdelivery 34
-MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03/dot_qmail 12
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03/run-qmailsmtpdlog 97
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03/run-qmailsendlog 96
+MD5 c47d861aeef098d12d022d44c27386b5 files/1.03/errno.patch 850
 MD5 4b6834904a00eff57c10a9a68f9e3723 files/1.03/qmail-control 812
+MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03/rc 108
 MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03/run-qmailsend 29
+MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03/run-qmailsendlog 96
+MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03/run-qmailsmtpd 231
+MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03/run-qmailsmtpdlog 97
diff --git a/net-mail/qmail-mysql/qmail-mysql-1.03.ebuild b/net-mail/qmail-mysql/qmail-mysql-1.03.ebuild
index 6cbcbc929d9b..f8bf55605cff 100644
--- a/net-mail/qmail-mysql/qmail-mysql-1.03.ebuild
+++ b/net-mail/qmail-mysql/qmail-mysql-1.03.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/qmail-mysql/qmail-mysql-1.03.ebuild,v 1.6 2003/07/13 13:32:32 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-mysql/qmail-mysql-1.03.ebuild,v 1.7 2003/09/05 02:40:30 msterret Exp $
 
 inherit eutils
 
@@ -94,30 +94,30 @@ src_install() {
 	diropts -m 755 -o alias -g qmail
 	dodir /var/qmail/alias
 
-	einfo "Installing the qmail software ..." 
+	einfo "Installing the qmail software ..."
 
 	insopts -o root -g qmail -m 755
 	insinto /var/qmail/boot
 	doins home home+df proc proc+df binm1 binm1+df binm2 binm2+df binm3 binm3+df
- 
+
 	into /usr
-	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY 
+	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY
 	dodoc SYSDEPS TARGETS THANKS THOUGHTS TODO VERSION
-	dodoc ${FILESDIR}/${PV}/tls-patch.txt 
+	dodoc ${FILESDIR}/${PV}/tls-patch.txt
 
 	insopts -o qmailq -g qmail -m 4711
 	insinto /var/qmail/bin
 	doins qmail-queue qmail-queue
-        
+
 	insopts -o root -g qmail -m 700
 	insinto /var/qmail/bin
 	doins qmail-lspawn qmail-start qmail-newu qmail-newmrh
-        
+
 	insopts -o root -g qmail -m 711
 	insinto /var/qmail/bin
 	doins qmail-getpw qmail-local qmail-remote qmail-rspawn \
 	qmail-clean qmail-send splogger qmail-pw2u
- 
+
 	insopts -o root -g qmail -m 755
 	insinto /var/qmail/bin
 	doins qmail-inject predate datemail mailsubj qmail-showctl \
@@ -158,7 +158,7 @@ src_install() {
 		touch ${D}/var/qmail/alias/.qmail-${i}
 		fowners alias.qmail /var/qmail/alias/.qmail-${i}
 	done
- 
+
 	einfo "Setting up maildirs by default in the account skeleton ..."
 	diropts -m 755 -o root -g root
 	insinto /etc/skel
@@ -247,7 +247,7 @@ pkg_postinst() {
 	touch ${ROOT}/var/qmail/queue/lock/sendmutex
 	chmod 600 ${ROOT}/var/qmail/queue/lock/sendmutex
 	chown qmails.qmail ${ROOT}/var/qmail/queue/lock/sendmutex
- 
+
 	mkfifo ${ROOT}/var/qmail/queue/lock/trigger
 	chmod 622 ${ROOT}/var/qmail/queue/lock/trigger
 	chown qmails.qmail ${ROOT}/var/qmail/queue/lock/trigger
@@ -264,10 +264,10 @@ pkg_postinst() {
 
 pkg_config() {
 
-export qhost=`hostname`			
+export qhost=`hostname`
 	if [ ${ROOT} = "/" ] ; then
 		if [ ! -f ${ROOT}/var/qmail/control/me ] ; then
-			${ROOT}/var/qmail/bin/config-fast $qhost 
+			${ROOT}/var/qmail/bin/config-fast $qhost
 		fi
 	fi
 
diff --git a/net-mail/qmail-scanner/Manifest b/net-mail/qmail-scanner/Manifest
index 9810ecae0b2d..b1b45d7d9f02 100644
--- a/net-mail/qmail-scanner/Manifest
+++ b/net-mail/qmail-scanner/Manifest
@@ -1,6 +1,6 @@
-MD5 48909ffbdce4f89d0bcbe54f2bb6c11d qmail-scanner-1.16.ebuild 2773
-MD5 f771c30f85748df6a55fa381d77330ed qmail-scanner-1.16-r1.ebuild 2785
 MD5 ad7f17def896f49d73f79ac9a39f5200 ChangeLog 1495
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 afe37a64c42accc2f37231d0c3679b7f qmail-scanner-1.16-r1.ebuild 2581
+MD5 154fc0c1c6e61d988cd310eb748424d9 qmail-scanner-1.16.ebuild 2573
 MD5 21cbccfc2015bf74d509a5b329ef4b30 files/digest-qmail-scanner-1.16 67
 MD5 21cbccfc2015bf74d509a5b329ef4b30 files/digest-qmail-scanner-1.16-r1 67
diff --git a/net-mail/qmail-scanner/qmail-scanner-1.16-r1.ebuild b/net-mail/qmail-scanner/qmail-scanner-1.16-r1.ebuild
index 65fc4d367c9b..8ed7163adf2a 100644
--- a/net-mail/qmail-scanner/qmail-scanner-1.16-r1.ebuild
+++ b/net-mail/qmail-scanner/qmail-scanner-1.16-r1.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/qmail-scanner/qmail-scanner-1.16-r1.ebuild,v 1.4 2003/07/13 13:32:32 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-scanner/qmail-scanner-1.16-r1.ebuild,v 1.5 2003/09/05 02:26:58 msterret Exp $
 
 S=${WORKDIR}/${P}
 
@@ -9,78 +9,77 @@ HOMEPAGE="http://qmail-scanner.sourceforge.net/"
 SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz"
 
 DEPEND=">=dev-lang/perl-5.6.1-r1
-        >=dev-perl/Time-HiRes-01.20-r2
-        >=net-mail/tnef-1.1.1
-        >=net-mail/maildrop-1.3.9
-        >=dev-perl/DB_File-1.803-r2
-        >=net-mail/qmail-1.03-r8
-        >=app-arch/unzip-5.42-r1
-        virtual/antivirus"
+	>=dev-perl/Time-HiRes-01.20-r2
+	>=net-mail/tnef-1.1.1
+	>=net-mail/maildrop-1.3.9
+	>=dev-perl/DB_File-1.803-r2
+	>=net-mail/qmail-1.03-r8
+	>=app-arch/unzip-5.42-r1
+	virtual/antivirus"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~sparc"
 
 src_compile () {
-    yes | PATH=${PATH}:/opt/f-prot:/opt/vlnx ./configure \
-        --domain localhost \
-           || die "./configure failed!"
+	yes | PATH=${PATH}:/opt/f-prot:/opt/vlnx ./configure \
+		--domain localhost \
+			|| die "./configure failed!"
 }
 
 src_install () {
+	# Create Directory Structure
+	diropts -m 755 -o qmailq -g qmail
+	dodir /var/spool/qmailscan
+	keepdir /var/spool/qmailscan
+	dodir /var/spool/qmailscan/quarantine
+	keepdir /var/spool/qmailscan/quarantine
+	dodir /var/spool/qmailscan/quarantine/tmp
+	keepdir /var/spool/qmailscan/quarantine/tmp
+	dodir /var/spool/qmailscan/quarantine/new
+	keepdir /var/spool/qmailscan/quarantine/new
+	dodir /var/spool/qmailscan/quarantine/cur
+	keepdir /var/spool/qmailscan/quarantine/cur
+	dodir /var/spool/qmailscan/working
+	keepdir /var/spool/qmailscan/working
+	dodir /var/spool/qmailscan/working/tmp
+	keepdir /var/spool/qmailscan/working/tmp
+	dodir /var/spool/qmailscan/working/new
+	keepdir /var/spool/qmailscan/working/new
+	dodir /var/spool/qmailscan/working/cur
+	keepdir /var/spool/qmailscan/working/cur
+	dodir /var/spool/qmailscan/archive
+	keepdir /var/spool/qmailscan/archive
+	dodir /var/spool/qmailscan/archive/tmp
+	keepdir /var/spool/qmailscan/archive/tmp
+	dodir /var/spool/qmailscan/archive/new
+	keepdir /var/spool/qmailscan/archive/new
+	dodir /var/spool/qmailscan/archive/cur
+	keepdir /var/spool/qmailscan/archive/cur
 
-    # Create Directory Structure
-    diropts -m 755 -o qmailq -g qmail
-    dodir /var/spool/qmailscan
-    keepdir /var/spool/qmailscan
-    dodir /var/spool/qmailscan/quarantine
-    keepdir /var/spool/qmailscan/quarantine
-    dodir /var/spool/qmailscan/quarantine/tmp
-    keepdir /var/spool/qmailscan/quarantine/tmp
-    dodir /var/spool/qmailscan/quarantine/new
-    keepdir /var/spool/qmailscan/quarantine/new
-    dodir /var/spool/qmailscan/quarantine/cur
-    keepdir /var/spool/qmailscan/quarantine/cur
-    dodir /var/spool/qmailscan/working
-    keepdir /var/spool/qmailscan/working
-    dodir /var/spool/qmailscan/working/tmp
-    keepdir /var/spool/qmailscan/working/tmp
-    dodir /var/spool/qmailscan/working/new
-    keepdir /var/spool/qmailscan/working/new
-    dodir /var/spool/qmailscan/working/cur
-    keepdir /var/spool/qmailscan/working/cur
-    dodir /var/spool/qmailscan/archive
-    keepdir /var/spool/qmailscan/archive
-    dodir /var/spool/qmailscan/archive/tmp
-    keepdir /var/spool/qmailscan/archive/tmp
-    dodir /var/spool/qmailscan/archive/new
-    keepdir /var/spool/qmailscan/archive/new
-    dodir /var/spool/qmailscan/archive/cur
-    keepdir /var/spool/qmailscan/archive/cur
+	# Install standard quarantine attachments file
+	insinto /var/spool/qmailscan
+	insopts -m 644 -o qmailq -g qmail
+	doins quarantine-attachments.txt
 
-    # Install standard quarantine attachments file
-    insinto /var/spool/qmailscan
-    insopts -m 644 -o qmailq -g qmail
-    doins quarantine-attachments.txt
+	# Install qmail-scanner script
+	insinto /var/qmail/bin
+	insopts -m 4755 -o qmailq -g qmail
+	doins qmail-scanner-queue.pl
 
-    # Install qmail-scanner script
-    insinto /var/qmail/bin
-    insopts -m 4755 -o qmailq -g qmail
-    doins qmail-scanner-queue.pl
-
-    # Install documentation
-    dodoc README CHANGES COPYING
-    dohtml README.html
+	# Install documentation
+	dodoc README CHANGES COPYING
+	dohtml README.html
 }
 
 pkg_postinst () {
-    # Setup perlscanner + Version Info
-    /var/qmail/bin/qmail-scanner-queue.pl -z
-    /var/qmail/bin/qmail-scanner-queue.pl -g
+	# Setup perlscanner + Version Info
+	/var/qmail/bin/qmail-scanner-queue.pl -z
+	/var/qmail/bin/qmail-scanner-queue.pl -g
 
-    einfo
-    einfo "NOTICE:"
-    einfo "Set QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue.pl"
-    einfo "in your /etc/tcp.smtp file to activate qmail-scanner."
-    einfo
+	einfo
+	einfo "NOTICE:"
+	einfo "Set QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue.pl"
+	einfo "in your /etc/tcp.smtp file to activate qmail-scanner."
+	einfo
 }
diff --git a/net-mail/qmail-scanner/qmail-scanner-1.16.ebuild b/net-mail/qmail-scanner/qmail-scanner-1.16.ebuild
index ded2d79e3864..7bb6a4fbf923 100644
--- a/net-mail/qmail-scanner/qmail-scanner-1.16.ebuild
+++ b/net-mail/qmail-scanner/qmail-scanner-1.16.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/qmail-scanner/qmail-scanner-1.16.ebuild,v 1.2 2003/03/11 21:11:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-scanner/qmail-scanner-1.16.ebuild,v 1.3 2003/09/05 02:26:58 msterret Exp $
 
 S=${WORKDIR}/${P}
 
@@ -9,12 +9,12 @@ HOMEPAGE="http://qmail-scanner.sourceforge.net/"
 SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz"
 
 DEPEND=">=dev-lang/perl-5.6.1-r1
-        >=dev-perl/Time-HiRes-01.20-r2
-        >=net-mail/tnef-1.1.1
-        >=net-mail/f-prot-3.12a
-        >=net-mail/maildrop-1.3.9
-        >=dev-perl/DB_File-1.803-r2
-        >=net-mail/qmail-1.03-r8
+	>=dev-perl/Time-HiRes-01.20-r2
+	>=net-mail/tnef-1.1.1
+	>=net-mail/f-prot-3.12a
+	>=net-mail/maildrop-1.3.9
+	>=dev-perl/DB_File-1.803-r2
+	>=net-mail/qmail-1.03-r8
 	>=app-arch/unzip-5.42-r1"
 
 SLOT="0"
@@ -22,65 +22,64 @@ LICENSE="GPL-2"
 KEYWORDS="x86 sparc"
 
 src_compile () {
-    yes | PATH=${PATH}:/opt/f-prot ./configure \
-        --domain localhost \
-           || die "./configure failed!"
+	yes | PATH=${PATH}:/opt/f-prot ./configure \
+		--domain localhost \
+			|| die "./configure failed!"
 }
 
 src_install () {
+	# Create Directory Structure
+	diropts -m 755 -o qmailq -g qmail
+	dodir /var/spool/qmailscan
+	keepdir /var/spool/qmailscan
+	dodir /var/spool/qmailscan/quarantine
+	keepdir /var/spool/qmailscan/quarantine
+	dodir /var/spool/qmailscan/quarantine/tmp
+	keepdir /var/spool/qmailscan/quarantine/tmp
+	dodir /var/spool/qmailscan/quarantine/new
+	keepdir /var/spool/qmailscan/quarantine/new
+	dodir /var/spool/qmailscan/quarantine/cur
+	keepdir /var/spool/qmailscan/quarantine/cur
+	dodir /var/spool/qmailscan/working
+	keepdir /var/spool/qmailscan/working
+	dodir /var/spool/qmailscan/working/tmp
+	keepdir /var/spool/qmailscan/working/tmp
+	dodir /var/spool/qmailscan/working/new
+	keepdir /var/spool/qmailscan/working/new
+	dodir /var/spool/qmailscan/working/cur
+	keepdir /var/spool/qmailscan/working/cur
+	dodir /var/spool/qmailscan/archive
+	keepdir /var/spool/qmailscan/archive
+	dodir /var/spool/qmailscan/archive/tmp
+	keepdir /var/spool/qmailscan/archive/tmp
+	dodir /var/spool/qmailscan/archive/new
+	keepdir /var/spool/qmailscan/archive/new
+	dodir /var/spool/qmailscan/archive/cur
+	keepdir /var/spool/qmailscan/archive/cur
 
-    # Create Directory Structure
-    diropts -m 755 -o qmailq -g qmail
-    dodir /var/spool/qmailscan
-    keepdir /var/spool/qmailscan
-    dodir /var/spool/qmailscan/quarantine
-    keepdir /var/spool/qmailscan/quarantine
-    dodir /var/spool/qmailscan/quarantine/tmp
-    keepdir /var/spool/qmailscan/quarantine/tmp
-    dodir /var/spool/qmailscan/quarantine/new
-    keepdir /var/spool/qmailscan/quarantine/new
-    dodir /var/spool/qmailscan/quarantine/cur
-    keepdir /var/spool/qmailscan/quarantine/cur
-    dodir /var/spool/qmailscan/working
-    keepdir /var/spool/qmailscan/working
-    dodir /var/spool/qmailscan/working/tmp
-    keepdir /var/spool/qmailscan/working/tmp
-    dodir /var/spool/qmailscan/working/new
-    keepdir /var/spool/qmailscan/working/new
-    dodir /var/spool/qmailscan/working/cur
-    keepdir /var/spool/qmailscan/working/cur
-    dodir /var/spool/qmailscan/archive
-    keepdir /var/spool/qmailscan/archive
-    dodir /var/spool/qmailscan/archive/tmp
-    keepdir /var/spool/qmailscan/archive/tmp
-    dodir /var/spool/qmailscan/archive/new
-    keepdir /var/spool/qmailscan/archive/new
-    dodir /var/spool/qmailscan/archive/cur
-    keepdir /var/spool/qmailscan/archive/cur
+	# Install standard quarantine attachments file
+	insinto /var/spool/qmailscan
+	insopts -m 644 -o qmailq -g qmail
+	doins quarantine-attachments.txt
 
-    # Install standard quarantine attachments file
-    insinto /var/spool/qmailscan
-    insopts -m 644 -o qmailq -g qmail
-    doins quarantine-attachments.txt
+	# Install qmail-scanner script
+	insinto /var/qmail/bin
+	insopts -m 4755 -o qmailq -g qmail
+	doins qmail-scanner-queue.pl
 
-    # Install qmail-scanner script
-    insinto /var/qmail/bin
-    insopts -m 4755 -o qmailq -g qmail
-    doins qmail-scanner-queue.pl
-
-    # Install documentation
-    dodoc README CHANGES COPYING
-    dohtml README.html
+	# Install documentation
+	dodoc README CHANGES COPYING
+	dohtml README.html
 }
 
 pkg_postinst () {
-    # Setup perlscanner + Version Info
-    /var/qmail/bin/qmail-scanner-queue.pl -z
-    /var/qmail/bin/qmail-scanner-queue.pl -g
+	# Setup perlscanner + Version Info
+	/var/qmail/bin/qmail-scanner-queue.pl -z
+	/var/qmail/bin/qmail-scanner-queue.pl -g
 
-    einfo
-    einfo "NOTICE:"
-    einfo "Set QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue.pl"
-    einfo "in your /etc/tcp.smtp file to activate qmail-scanner."
-    einfo
+	einfo
+	einfo "NOTICE:"
+	einfo "Set QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue.pl"
+	einfo "in your /etc/tcp.smtp file to activate qmail-scanner."
+	einfo
 }
diff --git a/net-mail/qmail/Manifest b/net-mail/qmail/Manifest
index f53bf77d8682..f406982137df 100644
--- a/net-mail/qmail/Manifest
+++ b/net-mail/qmail/Manifest
@@ -1,3 +1,20 @@
+MD5 3430746edd2d87e5f30dab4f463f4976 ChangeLog 9908
+MD5 c883ca07b054f8d1b0785699041fefd2 qmail-1.03-r10.ebuild 11153
+MD5 0eb29b49378fee3fb4559d30d09a0163 qmail-1.03-r8.ebuild 8116
+MD5 d7b75510b470696601c9f36f89a9eae4 qmail-1.03-r9.ebuild 9964
+MD5 ff596e74b015e067a180fc78855aa87a metadata.xml 360
+MD5 b6ae3b220911cf9ed686d76bacb6c96e qmail-1.03-r11.ebuild 11397
+MD5 a54c19747f413564e62b447f3d5de2b9 qmail-1.03-r12.ebuild 12519
+MD5 1fa33b460954492678129c60520e9cba files/digest-qmail-1.03-r10 442
+MD5 5897cb300c3233c91c7e221c8b4b8501 files/digest-qmail-1.03-r8 245
+MD5 48a1e168db29ab4e6c57f1ac135ee2bf files/digest-qmail-1.03-r9 323
+MD5 d6b150617bc5d76374fe010fc2902923 files/digest-qmail-1.03-r11 764
+MD5 16e191692e083dab3de54f7e39709871 files/digest-qmail-1.03-r12 1050
+MD5 734ea9dfff4513984d2d69123ce54fb8 files/gencert.sh 224
+MD5 55b519379b1330f57110fa6d60982cff files/tcp.pop3.sample 285
+MD5 e0686e52df7f0c840a7ac2bfe1fd291a files/tcp.qmqp.sample 337
+MD5 76d218a258e2ec859ab80c377351afce files/tcp.qmtp.sample 370
+MD5 946a715ffdd5e6d2d29c6fdfb29376dd files/tcp.smtp.sample 3726
 MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r10/dot_qmail 12
 MD5 5cb0c8c4c9feeee55362d77a99076c2f files/1.03-r10/99qmail 44
 MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r10/defaultdelivery 34
@@ -8,14 +25,11 @@ MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r10/run-qmailsend 29
 MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r10/run-qmailsendlog 96
 MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r10/run-qmailsmtpd 231
 MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r10/run-qmailsmtpdlog 97
+MD5 3933f961a8a65da65afaa65d22b075ef files/1.03-r10/smtp-auth-close3.patch 535
 MD5 b1a3fcd28ed415f92d775ac6fbe54dda files/1.03-r10/tls-patch.txt 5803
 MD5 dd5158b78a3878d78a68878f1910e0e4 files/1.03-r10/tls.patch.bz2 10458
-MD5 3933f961a8a65da65afaa65d22b075ef files/1.03-r10/smtp-auth-close3.patch 535
 MD5 ec7a73ba2bca7d6dd54ba92cf13136c9 files/1.03-r10/run-qmailpop3d 223
 MD5 0e97c0b031776f40cacdfbf3114af574 files/1.03-r10/run-qmailpop3dlog 97
-MD5 1fa33b460954492678129c60520e9cba files/digest-qmail-1.03-r10 442
-MD5 5897cb300c3233c91c7e221c8b4b8501 files/digest-qmail-1.03-r8 245
-MD5 48a1e168db29ab4e6c57f1ac135ee2bf files/digest-qmail-1.03-r9 323
 MD5 64197a14228076ba92cd033bc4798130 files/1.03-r11/conf-common 837
 MD5 180a513f34e3f00abc609672a190072c files/1.03-r11/99qmail 137
 MD5 1095fccd39b78e8534c0554c45d5b6f8 files/1.03-r11/conf-qmqpd 485
@@ -39,17 +53,12 @@ MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r11/run-qmailsmtpdlog 97
 MD5 3933f961a8a65da65afaa65d22b075ef files/1.03-r11/smtp-auth-close3.patch 535
 MD5 3a6ceb001139b6c9e8fd7477602c4165 files/1.03-r12/conf-common 1095
 MD5 180a513f34e3f00abc609672a190072c files/1.03-r12/99qmail 137
-MD5 a993cab8b077162680bb09fa8e5ed896 files/1.03-r12/bad-rcpt-noisy-patch 10388
-MD5 dda736a7fb5a56209abead6e840252e8 files/1.03-r12/badrcptto-morebadrcptto-accdias-gentoo 19322
-MD5 34f7596fc9a7dd82ac15d3219d530650 files/1.03-r12/conf-pop3d 1072
 MD5 e79f7c227fc10d6d653850d36abe319a files/1.03-r12/conf-qmqpd 471
 MD5 657bd64b1e3e9b9c784e60f3c41a7e91 files/1.03-r12/conf-qmtpd 563
 MD5 97dcc908045855f4615851c230c1d4c1 files/1.03-r12/conf-smtpd 1710
-MD5 75d59722b51a097bb3c09b5b5d5b5874 files/1.03-r12/config-sanity-check 815
 MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r12/dot_qmail 34
 MD5 c47d861aeef098d12d022d44c27386b5 files/1.03-r12/errno.patch 850
 MD5 9d4267c5dd8af7bc1a095a644368201c files/1.03-r12/qmail-control 859
-MD5 2a725c31201c59077cd389486407624f files/1.03-r12/qmail-smtpd-esmtp-size-gentoo.patch 2131
 MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r12/rc 108
 MD5 4925f6854709734bf0e068060a6bdbfb files/1.03-r12/run-qmailpop3d 1177
 MD5 0e97c0b031776f40cacdfbf3114af574 files/1.03-r12/run-qmailpop3dlog 97
@@ -62,6 +71,11 @@ MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r12/run-qmailsendlog 96
 MD5 42b44c0e7dd6afc184d526cd90d7a3e0 files/1.03-r12/run-qmailsmtpd 1166
 MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r12/run-qmailsmtpdlog 97
 MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r12/smtp-auth-close3.patch 728
+MD5 a993cab8b077162680bb09fa8e5ed896 files/1.03-r12/bad-rcpt-noisy-patch 10388
+MD5 75d59722b51a097bb3c09b5b5d5b5874 files/1.03-r12/config-sanity-check 815
+MD5 dda736a7fb5a56209abead6e840252e8 files/1.03-r12/badrcptto-morebadrcptto-accdias-gentoo 19322
+MD5 34f7596fc9a7dd82ac15d3219d530650 files/1.03-r12/conf-pop3d 1072
+MD5 2a725c31201c59077cd389486407624f files/1.03-r12/qmail-smtpd-esmtp-size-gentoo.patch 2131
 MD5 546b88fd5657cae5ba8e0ae7257c8171 files/1.03-r12/maildir-quota-fix.patch 547
 MD5 598b04b6274ef4d946a60a5d30fd95ff files/1.03-r12/qmail-remote-auth-login.patch 7504
 MD5 d3997795df512803e6a27b5486d2b81e files/1.03-r12/qmail-smtpd-relay-reject.gentoo.patch 1433
@@ -86,17 +100,3 @@ MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r9/run-qmailsend 29
 MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r9/run-qmailsendlog 96
 MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r9/run-qmailsmtpd 231
 MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r9/run-qmailsmtpdlog 97
-MD5 d6b150617bc5d76374fe010fc2902923 files/digest-qmail-1.03-r11 764
-MD5 16e191692e083dab3de54f7e39709871 files/digest-qmail-1.03-r12 1050
-MD5 734ea9dfff4513984d2d69123ce54fb8 files/gencert.sh 224
-MD5 55b519379b1330f57110fa6d60982cff files/tcp.pop3.sample 285
-MD5 e0686e52df7f0c840a7ac2bfe1fd291a files/tcp.qmqp.sample 337
-MD5 76d218a258e2ec859ab80c377351afce files/tcp.qmtp.sample 370
-MD5 946a715ffdd5e6d2d29c6fdfb29376dd files/tcp.smtp.sample 3726
-MD5 2d5e1e44905fc1776d083088d6bef177 qmail-1.03-r10.ebuild 11181
-MD5 19dd9b9232eb66c5adb8263df11c2873 qmail-1.03-r8.ebuild 8143
-MD5 30ae1187a48ebe4c70c38c08c5706d76 qmail-1.03-r9.ebuild 9991
-MD5 3430746edd2d87e5f30dab4f463f4976 ChangeLog 9908
-MD5 ff596e74b015e067a180fc78855aa87a metadata.xml 360
-MD5 4106d2eea0c45dbf99e7d5d3c6b5893a qmail-1.03-r11.ebuild 11432
-MD5 471ff0cdf1770bc872a08add57b9edf5 qmail-1.03-r12.ebuild 12569
diff --git a/net-mail/qmail/qmail-1.03-r10.ebuild b/net-mail/qmail/qmail-1.03-r10.ebuild
index 23b85e1bf50b..1658807f0c4e 100644
--- a/net-mail/qmail/qmail-1.03-r10.ebuild
+++ b/net-mail/qmail/qmail-1.03-r10.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/qmail/qmail-1.03-r10.ebuild,v 1.22 2003/07/31 11:21:08 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r10.ebuild,v 1.23 2003/09/05 02:44:16 msterret Exp $
 
 inherit eutils
 
@@ -52,7 +52,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}-${PR}/smtp-auth-close3.patch
 
 	# TLS support and an EHLO patch
-	if use ssl 
+	if use ssl
 	then
 		ebegin "Applying tls.patch.bz2..."
 		bzcat ${FILESDIR}/${PV}-${PR}/tls.patch.bz2 | patch -p1 &>/dev/null || die
@@ -61,7 +61,7 @@ src_unpack() {
 
 	# patch so an alternate queue processor can be used
 	# i.e. - qmail-scanner
-	epatch ${DISTDIR}/qmailqueue-patch	
+	epatch ${DISTDIR}/qmailqueue-patch
 
 	# a patch for faster queue processing
 	epatch ${DISTDIR}/big-todo.103.patch
@@ -117,29 +117,29 @@ src_install() {
 	diropts -m 755 -o alias -g qmail
 	dodir /var/qmail/alias
 
-	einfo "Installing the qmail software ..." 
+	einfo "Installing the qmail software ..."
 
 	insopts -o root -g qmail -m 755
 	insinto /var/qmail/boot
 	doins home home+df proc proc+df binm1 binm1+df binm2 binm2+df binm3 binm3+df
- 
-	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY 
+
+	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY
 	dodoc SYSDEPS TARGETS THANKS THOUGHTS TODO VERSION
-	dodoc ${FILESDIR}/${PV}-${PR}/tls-patch.txt 
+	dodoc ${FILESDIR}/${PV}-${PR}/tls-patch.txt
 
 	insopts -o qmailq -g qmail -m 4711
 	insinto /var/qmail/bin
 	doins qmail-queue qmail-queue
-        
+
 	insopts -o root -g qmail -m 700
 	insinto /var/qmail/bin
 	doins qmail-lspawn qmail-start qmail-newu qmail-newmrh
-        
+
 	insopts -o root -g qmail -m 711
 	insinto /var/qmail/bin
 	doins qmail-getpw qmail-local qmail-remote qmail-rspawn \
 	qmail-clean qmail-send splogger qmail-pw2u
- 
+
 	insopts -o root -g qmail -m 755
 	insinto /var/qmail/bin
 	doins qmail-inject predate datemail mailsubj qmail-showctl \
@@ -182,7 +182,7 @@ src_install() {
 			fowners alias.qmail /var/qmail/alias/.qmail-${i}
 		fi
 	done
- 
+
 	einfo "Setting up maildirs by default in the account skeleton ..."
 	diropts -m 755 -o root -g root
 	insinto /etc/skel
@@ -285,7 +285,7 @@ pkg_postinst() {
 	touch ${ROOT}/var/qmail/queue/lock/sendmutex
 	chmod 600 ${ROOT}/var/qmail/queue/lock/sendmutex
 	chown qmails.qmail ${ROOT}/var/qmail/queue/lock/sendmutex
- 
+
 	mkfifo ${ROOT}/var/qmail/queue/lock/trigger
 	chmod 622 ${ROOT}/var/qmail/queue/lock/trigger
 	chown qmails.qmail ${ROOT}/var/qmail/queue/lock/trigger
@@ -305,10 +305,10 @@ pkg_postinst() {
 
 pkg_config() {
 
-export qhost=`hostname --fqdn`			
+export qhost=`hostname --fqdn`
 	if [ ${ROOT} = "/" ] ; then
 		if [ ! -f ${ROOT}/var/qmail/control/me ] ; then
-			${ROOT}/var/qmail/bin/config-fast $qhost 
+			${ROOT}/var/qmail/bin/config-fast $qhost
 		fi
 	fi
 
diff --git a/net-mail/qmail/qmail-1.03-r11.ebuild b/net-mail/qmail/qmail-1.03-r11.ebuild
index b52a6f64a18a..1b7f13fa37bd 100644
--- a/net-mail/qmail/qmail-1.03-r11.ebuild
+++ b/net-mail/qmail/qmail-1.03-r11.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/qmail/qmail-1.03-r11.ebuild,v 1.3 2003/08/06 08:44:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r11.ebuild,v 1.4 2003/09/05 02:44:16 msterret Exp $
 
 inherit eutils
 
@@ -45,7 +45,7 @@ S=${WORKDIR}/${P}
 src_unpack() {
 
 	# This makes life easy
-	EPATCH_OPTS="-d ${S}" 
+	EPATCH_OPTS="-d ${S}"
 
 	# unpack the initial stuff
 	unpack ${P}.tar.gz qmail-tls.patch.tbz2 qmail-smtpd-auth-0.31.tar.gz
@@ -60,10 +60,10 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}-${PR}/smtp-auth-close3.patch
 
 	# TLS support and an EHLO patch
-	if use ssl 
+	if use ssl
 	then
 		#bzcat ${WORKDIR}/tls.patch.bz2 | patch -p1 &>/dev/null || die
-		ebegin "Adding TLS support" 
+		ebegin "Adding TLS support"
 		bzcat ${WORKDIR}/tls.patch.bz2 | patch -p1 -d ${S} &>/dev/null || die
 		eend $?
 	fi
@@ -71,7 +71,7 @@ src_unpack() {
 	# patch so an alternate queue processor can be used
 	# i.e. - qmail-scanner
 	EPATCH_SINGLE_MSG="Adding QMAILQUEUE support" \
-	epatch ${DISTDIR}/qmailqueue-patch	
+	epatch ${DISTDIR}/qmailqueue-patch
 
 	# a patch for faster queue processing
 	EPATCH_SINGLE_MSG="Patching for large queues" \
@@ -83,7 +83,7 @@ src_unpack() {
 
 	# Fix for tabs in .qmail bug noted at
 	# http://www.ornl.gov/its/archives/mailing-lists/qmail/2000/10/msg00696.html
-	# gentoo bug #24293 
+	# gentoo bug #24293
 	epatch ${DISTDIR}/qmail-local-tabs.patch
 
 	# Account for Linux filesystems lack of a synchronus link()
@@ -102,7 +102,7 @@ src_unpack() {
 	epatch ${DISTDIR}/sendmail-flagf.patch
 
 	# Reject some bad relaying attempts
-	# gentoo bug #18064 
+	# gentoo bug #18064
 	epatch ${DISTDIR}/qmail-smtpd-relay-reject
 
 	cd ${S}
@@ -144,29 +144,29 @@ src_install() {
 	diropts -m 755 -o alias -g qmail
 	dodir /var/qmail/alias
 
-	einfo "Installing the qmail software ..." 
+	einfo "Installing the qmail software ..."
 
 	insopts -o root -g qmail -m 755
 	insinto /var/qmail/boot
 	doins home home+df proc proc+df binm1 binm1+df binm2 binm2+df binm3 binm3+df
- 
-	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY 
+
+	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY
 	dodoc SYSDEPS TARGETS THANKS THOUGHTS TODO VERSION
-	dodoc ${WORKDIR}/tls-patch.txt 
+	dodoc ${WORKDIR}/tls-patch.txt
 
 	insopts -o qmailq -g qmail -m 4711
 	insinto /var/qmail/bin
 	doins qmail-queue qmail-queue
-        
+
 	insopts -o root -g qmail -m 700
 	insinto /var/qmail/bin
 	doins qmail-lspawn qmail-start qmail-newu qmail-newmrh
-        
+
 	insopts -o root -g qmail -m 711
 	insinto /var/qmail/bin
 	doins qmail-getpw qmail-local qmail-remote qmail-rspawn \
 	qmail-clean qmail-send splogger qmail-pw2u
- 
+
 	insopts -o root -g qmail -m 755
 	insinto /var/qmail/bin
 	doins qmail-inject predate datemail mailsubj qmail-showctl \
@@ -185,7 +185,7 @@ src_install() {
 	einfo "Adding env.d entry for qmail"
 	dodir /etc/env.d
 	insinto /etc/env.d
-	doins ${FILESDIR}/${PV}-${PR}/99qmail 
+	doins ${FILESDIR}/${PV}-${PR}/99qmail
 
 	einfo "Creating sendmail replacement ..."
 	diropts -m 755
@@ -199,14 +199,14 @@ src_install() {
 	# for good measure
 	keepdir /var/qmail/alias/.maildir/{cur,new,tmp}
 
-	for i in mailer-daemon postmaster root 
+	for i in mailer-daemon postmaster root
 	do
 		if [ ! -f ${ROOT}/var/qmail/alias/.qmail-${i} ]; then
 			touch ${D}/var/qmail/alias/.qmail-${i}
 			fowners alias.qmail /var/qmail/alias/.qmail-${i}
 		fi
 	done
- 
+
 	einfo "Setting up maildirs by default in the account skeleton ..."
 	diropts -m 755 -o root -g root
 	insinto /etc/skel
@@ -282,7 +282,7 @@ pkg_postinst() {
 	chmod 644 ${ROOT}/var/qmail/queue/lock/tcpto
 	chown qmailr.qmail ${ROOT}/var/qmail/queue/lock/tcpto
 
-	
+
 	[ -e ${ROOT}/var/qmail/queue/lock/sendmutex ] || touch ${ROOT}/var/qmail/queue/lock/sendmutex
 	chmod 600 ${ROOT}/var/qmail/queue/lock/sendmutex
 	chown qmails.qmail ${ROOT}/var/qmail/queue/lock/sendmutex
@@ -309,17 +309,17 @@ pkg_postinst() {
 	einfo "Additionally, the QMTP and QMQP protocols are supported, and can be started as:"
 	einfo "ln -s /var/qmail/supervise/qmail-qmtpd /service/qmail-qmtpd"
 	einfo "ln -s /var/qmail/supervise/qmail-qmqpd /service/qmail-qmqpd"
-	echo 
+	echo
 	einfo "Additionally, if you wish to run qmail right now, you should run:"
 	einfo "source /etc/profile"
 }
 
 pkg_config() {
 
-	export qhost=`hostname --fqdn`			
+	export qhost=`hostname --fqdn`
 	if [ ${ROOT} = "/" ] ; then
 		if [ ! -f ${ROOT}/var/qmail/control/me ] ; then
-			${ROOT}/var/qmail/bin/config-fast $qhost 
+			${ROOT}/var/qmail/bin/config-fast $qhost
 		fi
 	fi
 
diff --git a/net-mail/qmail/qmail-1.03-r12.ebuild b/net-mail/qmail/qmail-1.03-r12.ebuild
index bda29177b90a..18ed34b93eaa 100644
--- a/net-mail/qmail/qmail-1.03-r12.ebuild
+++ b/net-mail/qmail/qmail-1.03-r12.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/qmail/qmail-1.03-r12.ebuild,v 1.8 2003/09/02 09:02:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r12.ebuild,v 1.9 2003/09/05 02:44:16 msterret Exp $
 
 inherit eutils
 
@@ -19,9 +19,9 @@ SRC_URI="mirror://qmail/qmail-1.03.tar.gz
 	mirror://qmail/qmail-1.03-qmtpc.patch
 	http://qmail.goof.com/qmail-smtpd-relay-reject
 	mirror://gentoo/qmail-local-tabs.patch
-  	http://www.shupp.org/patches/qmail-maildir++.patch
-  	ftp://ftp.pipeline.com.au/pipeint/sources/linux/WebMail/qmail-date-localtime.patch.txt
-  	ftp://ftp.pipeline.com.au/pipeint/sources/linux/WebMail/qmail-limit-bounce-size.patch.txt
+	http://www.shupp.org/patches/qmail-maildir++.patch
+	ftp://ftp.pipeline.com.au/pipeint/sources/linux/WebMail/qmail-date-localtime.patch.txt
+	ftp://ftp.pipeline.com.au/pipeint/sources/linux/WebMail/qmail-limit-bounce-size.patch.txt
 	http://www.ckdhr.com/ckd/qmail-103.patch
 	http://www.arda.homeunix.net/store/qmail/qregex-starttls-2way-auth.patch
 	http://www.soffian.org/downloads/qmail/qmail-remote-auth-patch-doc.txt"
@@ -52,22 +52,22 @@ src_unpack() {
 
 
 	# unpack the initial stuff
-	unpack ${P}.tar.gz 
-	
+	unpack ${P}.tar.gz
+
 	# This makes life easy
-	EPATCH_OPTS="-d ${S}" 
+	EPATCH_OPTS="-d ${S}"
 
 	# this patch merges a few others already
 	EPATCH_SINGLE_MSG="Adding SMTP AUTH (2 way), Qregex and STARTTLS support" \
 	epatch ${DISTDIR}/qregex-starttls-2way-auth.patch
-	
+
 	# Fixes a problem when utilizing "morercpthosts"
 	epatch ${FILESDIR}/${PV}-${PR}/smtp-auth-close3.patch
 
 	# patch so an alternate queue processor can be used
 	# i.e. - qmail-scanner
 	EPATCH_SINGLE_MSG="Adding QMAILQUEUE support" \
-	epatch ${DISTDIR}/qmailqueue-patch	
+	epatch ${DISTDIR}/qmailqueue-patch
 
 	# a patch for faster queue processing
 	EPATCH_SINGLE_MSG="Patching for large queues" \
@@ -83,7 +83,7 @@ src_unpack() {
 
 	# Fix for tabs in .qmail bug noted at
 	# http://www.ornl.gov/its/archives/mailing-lists/qmail/2000/10/msg00696.html
-	# gentoo bug #24293 
+	# gentoo bug #24293
 	epatch ${DISTDIR}/qmail-local-tabs.patch
 
 	# Account for Linux filesystems lack of a synchronus link()
@@ -111,21 +111,21 @@ src_unpack() {
 	# This will make the emails headers be written in localtime rather than GMT
 	# If you really want, uncomment it yourself, as mail really should be in GMT
 	epatch ${DISTDIR}/qmail-date-localtime.patch.txt
-	
+
 	# Apply patch to trim large bouncing messages down greatly reduces traffic
 	# when multiple bounces occur (As in with spam)
 	epatch ${DISTDIR}/qmail-limit-bounce-size.patch.txt
-	
+
 	#TODO TEST
 	# Apply patch to add ESMTP SIZE support to qmail-smtpd
 	# This helps your server to be able to reject excessively large messages
 	# "up front", rather than waiting the whole message to arrive and then
 	# bouncing it because it exceeded your databytes setting
 	epatch ${FILESDIR}/${PV}-${PR}/qmail-smtpd-esmtp-size-gentoo.patch
-	
+
 	#TODO TEST
 	# Reject some bad relaying attempts
-	# gentoo bug #18064 
+	# gentoo bug #18064
 	epatch ${FILESDIR}/${PV}-${PR}/qmail-smtpd-relay-reject.gentoo.patch
 
 	#TODO REDIFF
@@ -135,7 +135,7 @@ src_unpack() {
 	# presently this breaks qmail so it is disabled
 	#epatch ${FILESDIR}/${PV}-${PR}/badrcptto-morebadrcptto-accdias-gentoo
 
-	echo -n "${CC} ${CFLAGS}" >${S}/conf-cc	
+	echo -n "${CC} ${CFLAGS}" >${S}/conf-cc
 	use ssl && echo -n ' -DTLS' >>${S}/conf-cc
 	echo -n "${CC} ${LDFLAGS}" > ${S}/conf-ld
 	echo -n "500" > ${S}/conf-spawn
@@ -152,7 +152,7 @@ src_compile() {
 }
 
 src_install() {
-	
+
 	einfo "Setting up directory hierarchy ..."
 
 	diropts -m 755 -o root -g qmail
@@ -168,33 +168,33 @@ src_install() {
 	diropts -m 755 -o alias -g qmail
 	dodir /var/qmail/alias
 
-	einfo "Installing the qmail software ..." 
+	einfo "Installing the qmail software ..."
 
 	insopts -o root -g qmail -m 755
 	insinto /var/qmail/boot
 	doins home home+df proc proc+df binm1 binm1+df binm2 binm2+df binm3 binm3+df
- 
-	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY 
+
+	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY
 	dodoc SYSDEPS TARGETS THANKS THOUGHTS TODO VERSION README* ${DISTDIR}/qmail-remote-auth-patch-doc.txt
 
 	insinto /var/qmail/bin
 	insopts -o qmailq -g qmail -m 4711
-	doins qmail-queue 
-        
+	doins qmail-queue
+
 	insopts -o root -g qmail -m 700
 	doins qmail-lspawn qmail-start qmail-newu qmail-newmrh
-        
+
 	insopts -o root -g qmail -m 711
 	doins qmail-getpw qmail-local qmail-remote qmail-rspawn \
 	qmail-clean qmail-send splogger qmail-pw2u
- 
+
 	insopts -o root -g qmail -m 755
 	doins qmail-inject predate datemail mailsubj qmail-showctl \
 	qmail-qread qmail-qstat qmail-tcpto qmail-tcpok qmail-pop3d \
 	qmail-popup qmail-qmqpc qmail-qmqpd qmail-qmtpd qmail-smtpd \
 	sendmail tcp-env qreceipt qsmhook qbiff forward preline \
 	condredirect bouncesaying except maildirmake maildir2mbox \
-	maildirwatch qail elq pinq config-fast 
+	maildirwatch qail elq pinq config-fast
 	#doins qmail-newbrt
 
 	into /usr
@@ -208,7 +208,7 @@ src_install() {
 	einfo "Adding env.d entry for qmail"
 	dodir /etc/env.d
 	insinto /etc/env.d
-	doins ${FILESDIR}/${PV}-${PR}/99qmail 
+	doins ${FILESDIR}/${PV}-${PR}/99qmail
 
 	einfo "Creating sendmail replacement ..."
 	diropts -m 755
@@ -222,14 +222,14 @@ src_install() {
 	# for good measure
 	keepdir /var/qmail/alias/.maildir/{cur,new,tmp}
 
-	for i in mailer-daemon postmaster root 
+	for i in mailer-daemon postmaster root
 	do
 		if [ ! -f ${ROOT}/var/qmail/alias/.qmail-${i} ]; then
 			touch ${D}/var/qmail/alias/.qmail-${i}
 			fowners alias.qmail /var/qmail/alias/.qmail-${i}
 		fi
 	done
- 
+
 	einfo "Setting up maildirs by default in the account skeleton ..."
 	diropts -m 755 -o root -g root
 	insinto /etc/skel
@@ -237,7 +237,7 @@ src_install() {
 	newins ${FILESDIR}/${PV}-${PR}/dot_qmail .qmail
 	fperms 644 /etc/skel/.qmail
 	# for good measure
-	keepdir /etc/skel/.maildir/{cur,new,tmp} 
+	keepdir /etc/skel/.maildir/{cur,new,tmp}
 
 	einfo "Setting up all services (send, smtp, qmtp, qmqp, pop3) ..."
 	insopts -o root -g root -m 755
@@ -261,7 +261,7 @@ src_install() {
 			[ -f ${D}/etc/tcp.${i} ] && tcprules ${D}/etc/tcp.${i}.cdb ${D}/etc/.tcp.${i}.tmp < ${D}/etc/tcp.${i}
 		done
 	done
-	
+
 	einfo "Installing the qmail startup file ..."
 	insinto /var/qmail
 	insopts -o root -g root -m 755
@@ -289,7 +289,7 @@ pkg_postinst() {
 
 	einfo "Setting up the message queue hierarchy ..."
 	# queue-fix makes life easy!
-	/var/qmail/bin/queue-fix /var/qmail/queue >/dev/null 
+	/var/qmail/bin/queue-fix /var/qmail/queue >/dev/null
 
 	# use the correct maildirmake
 	# the courier-imap one has some extensions that are nicer
@@ -318,7 +318,7 @@ pkg_postinst() {
 	einfo "Additionally, the QMTP and QMQP protocols are supported, and can be started as:"
 	einfo "ln -s /var/qmail/supervise/qmail-qmtpd /service/qmail-qmtpd"
 	einfo "ln -s /var/qmail/supervise/qmail-qmqpd /service/qmail-qmqpd"
-	echo 
+	echo
 	einfo "Additionally, if you wish to run qmail right now, you should run:"
 	einfo "source /etc/profile"
 }
@@ -330,8 +330,8 @@ pkg_config() {
 
 	if [ ${ROOT} = "/" ] ; then
 		if [ ! -f ${ROOT}/var/qmail/control/me ] ; then
-			export qhost=`hostname --fqdn`			
-			${ROOT}/var/qmail/bin/config-fast $qhost 
+			export qhost=`hostname --fqdn`
+			${ROOT}/var/qmail/bin/config-fast $qhost
 		fi
 	fi
 
diff --git a/net-mail/qmail/qmail-1.03-r8.ebuild b/net-mail/qmail/qmail-1.03-r8.ebuild
index 1cbcad77b1f2..dc1c664ffd17 100644
--- a/net-mail/qmail/qmail-1.03-r8.ebuild
+++ b/net-mail/qmail/qmail-1.03-r8.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/qmail/qmail-1.03-r8.ebuild,v 1.10 2003/06/12 21:29:40 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r8.ebuild,v 1.11 2003/09/05 02:44:16 msterret Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A modern replacement for sendmail which uses maildirs"
@@ -90,29 +90,29 @@ src_install() {
 	diropts -m 755 -o alias -g qmail
 	dodir /var/qmail/alias
 
-	einfo "Installing the qmail software ..." 
+	einfo "Installing the qmail software ..."
 
 	insopts -o root -g qmail -m 755
 	insinto /var/qmail/boot
 	doins home home+df proc proc+df binm1 binm1+df binm2 binm2+df binm3 binm3+df
- 
+
 	into /usr
-	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY 
+	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY
 	dodoc SYSDEPS TARGETS THANKS THOUGHTS TODO VERSION
- 
+
 	insopts -o qmailq -g qmail -m 4711
 	insinto /var/qmail/bin
 	doins qmail-queue qmail-queue
-        
+
 	insopts -o root -g qmail -m 700
 	insinto /var/qmail/bin
 	doins qmail-lspawn qmail-start qmail-newu qmail-newmrh
-        
+
 	insopts -o root -g qmail -m 711
 	insinto /var/qmail/bin
 	doins qmail-getpw qmail-local qmail-remote qmail-rspawn \
 	qmail-clean qmail-send splogger qmail-pw2u
- 
+
 	insopts -o root -g qmail -m 755
 	insinto /var/qmail/bin
 	doins qmail-inject predate datemail mailsubj qmail-showctl \
@@ -149,7 +149,7 @@ src_install() {
 		touch ${D}/var/qmail/alias/.qmail-${i}
 		fowners alias.qmail /var/qmail/alias/.qmail-${i}
 	done
- 
+
 	einfo "Setting up maildirs by default in the account skeleton ..."
 	diropts -m 755 -o root -g root
 	insinto /etc/skel
@@ -238,7 +238,7 @@ pkg_postinst() {
 	touch ${ROOT}/var/qmail/queue/lock/sendmutex
 	chmod 600 ${ROOT}/var/qmail/queue/lock/sendmutex
 	chown qmails.qmail ${ROOT}/var/qmail/queue/lock/sendmutex
- 
+
 	mkfifo ${ROOT}/var/qmail/queue/lock/trigger
 	chmod 622 ${ROOT}/var/qmail/queue/lock/trigger
 	chown qmails.qmail ${ROOT}/var/qmail/queue/lock/trigger
@@ -256,10 +256,10 @@ pkg_postinst() {
 
 pkg_config() {
 
-export qhost=`hostname`			
+export qhost=`hostname`
 	if [ ${ROOT} = "/" ] ; then
 		if [ ! -f ${ROOT}/var/qmail/control/me ] ; then
-			${ROOT}/var/qmail/bin/config-fast $qhost 
+			${ROOT}/var/qmail/bin/config-fast $qhost
 		fi
 	fi
 
diff --git a/net-mail/qmail/qmail-1.03-r9.ebuild b/net-mail/qmail/qmail-1.03-r9.ebuild
index db8a6abf4bfd..736b862fee89 100644
--- a/net-mail/qmail/qmail-1.03-r9.ebuild
+++ b/net-mail/qmail/qmail-1.03-r9.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/qmail/qmail-1.03-r9.ebuild,v 1.8 2003/02/17 08:41:57 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r9.ebuild,v 1.9 2003/09/05 02:44:16 msterret Exp $
 
 IUSE="ssl ldap"
 
@@ -15,7 +15,7 @@ SRC_URI="http://cr.yp.to/software/qmail-1.03.tar.gz
 	http://www.qmail.org/big-todo.103.patch
 	http://www.qmail.org/big-concurrency.patch
 	http://www.ckdhr.com/ckd/qmail-103.patch
-	ldap? ( http://www.nrg4u.com/qmail/qmail-ldap-1.03-20020901.patch.gz )" 
+	ldap? ( http://www.nrg4u.com/qmail/qmail-ldap-1.03-20020901.patch.gz )"
 
 DEPEND="virtual/glibc
 	sys-apps/groff
@@ -110,29 +110,29 @@ src_install() {
 	diropts -m 755 -o alias -g qmail
 	dodir /var/qmail/alias
 
-	einfo "Installing the qmail software ..." 
+	einfo "Installing the qmail software ..."
 
 	insopts -o root -g qmail -m 755
 	insinto /var/qmail/boot
 	doins home home+df proc proc+df binm1 binm1+df binm2 binm2+df binm3 binm3+df
- 
+
 	into /usr
-	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY 
+	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY
 	dodoc SYSDEPS TARGETS THANKS THOUGHTS TODO VERSION
- 
+
 	insopts -o qmailq -g qmail -m 4711
 	insinto /var/qmail/bin
 	doins qmail-queue qmail-queue
-        
+
 	insopts -o root -g qmail -m 700
 	insinto /var/qmail/bin
 	doins qmail-lspawn qmail-start qmail-newu qmail-newmrh
-        
+
 	insopts -o root -g qmail -m 711
 	insinto /var/qmail/bin
 	doins qmail-getpw qmail-local qmail-remote qmail-rspawn \
 	qmail-clean qmail-send splogger qmail-pw2u
- 
+
 	insopts -o root -g qmail -m 755
 	insinto /var/qmail/bin
 	doins qmail-inject predate datemail mailsubj qmail-showctl \
@@ -169,7 +169,7 @@ src_install() {
 		touch ${D}/var/qmail/alias/.qmail-${i}
 		fowners alias.qmail /var/qmail/alias/.qmail-${i}
 	done
- 
+
 	einfo "Setting up maildirs by default in the account skeleton ..."
 	diropts -m 755 -o root -g root
 	insinto /etc/skel
@@ -258,7 +258,7 @@ pkg_postinst() {
 	touch ${ROOT}/var/qmail/queue/lock/sendmutex
 	chmod 600 ${ROOT}/var/qmail/queue/lock/sendmutex
 	chown qmails.qmail ${ROOT}/var/qmail/queue/lock/sendmutex
- 
+
 	mkfifo ${ROOT}/var/qmail/queue/lock/trigger
 	chmod 622 ${ROOT}/var/qmail/queue/lock/trigger
 	chown qmails.qmail ${ROOT}/var/qmail/queue/lock/trigger
@@ -289,15 +289,15 @@ pkg_postinst() {
 		echo -e "\e[32;01m Send req.pem to your CA to obtain signed_req.pem, and do: \033[0m"
 		echo -e "\e[32;01m cat signed_req.pem >> /var/qmail/control/servercert.pem \033[0m"
 	fi
-		
+
 }
 
 pkg_config() {
 
-export qhost=`hostname`			
+export qhost=`hostname`
 	if [ ${ROOT} = "/" ] ; then
 		if [ ! -f ${ROOT}/var/qmail/control/me ] ; then
-			${ROOT}/var/qmail/bin/config-fast $qhost 
+			${ROOT}/var/qmail/bin/config-fast $qhost
 		fi
 	fi
 
diff --git a/net-mail/sendmail/Manifest b/net-mail/sendmail/Manifest
index dd5912be75c6..8e9021ed2ddf 100644
--- a/net-mail/sendmail/Manifest
+++ b/net-mail/sendmail/Manifest
@@ -1,20 +1,20 @@
 MD5 65cc32275d36e625d530b32bd43623cf ChangeLog 5749
-MD5 d9643e58665e5eccc1136fbf5625af03 sendmail-8.12.8.ebuild 5141
-MD5 aa5decc2307eecfa55d69f4562ed9dff sendmail-8.12.9-r1.ebuild 5675
-MD5 98c29ccf9fba2d734006bb1fa23888de sendmail-8.12.9-r2.ebuild 5575
-MD5 2351fe7d3056270638ecc1fc8bf96db0 sendmail-8.12.9.ebuild 5141
+MD5 197f9878518b74fd0554b6ebbf196cdb sendmail-8.12.8.ebuild 5140
+MD5 b143fe3d1548932ea64d34949b1b51a2 sendmail-8.12.9.ebuild 5140
+MD5 f582ee4620d3d5cf4f024472d9b719cf sendmail-8.12.9-r1.ebuild 5497
+MD5 1ae89cd7275080b4f9cbdddbcfcc8a44 sendmail-8.12.9-r2.ebuild 5573
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 0a63a2d919ba41dba080aeb57bb66841 files/digest-sendmail-8.12.8 68
 MD5 6d2d3106fb3c1c317310e4bf80228741 files/digest-sendmail-8.12.9 68
-MD5 6d2d3106fb3c1c317310e4bf80228741 files/digest-sendmail-8.12.9-r1 68
-MD5 6d2d3106fb3c1c317310e4bf80228741 files/digest-sendmail-8.12.9-r2 68
 MD5 1592ad14370b0373e1e7a60aad9d8d00 files/sendmail 616
 MD5 074c1f0534fd3bf4e541a70e001bc533 files/sendmail-8.12.2-makemapman.patch 2089
 MD5 4b37f61de2fd8de372a4bd8ab6f92edf files/sendmail-8.12.2-smrsh-paths.patch 5625
 MD5 b412547381b852586d5d4d6ffcd80b4a files/sendmail-8.12.2-unix.patch 395
 MD5 95d58f15432e44c91f8018839f65327c files/sendmail-8.12.6-r1-gentoo.diff 1701
-MD5 6faca1941f582ad8a893b0e4fa4dd757 files/sendmail-procmail.cf 39867
-MD5 03494c29693bd3ceb921bbc398be4cda files/sendmail-procmail.mc 985
 MD5 5476fde164f12162d60ed3cffb0a41e3 files/sendmail.cf 39325
 MD5 57c515d75ee6bcb32fc673141ebc41fa files/sendmail.mc 930
 MD5 b908d7f9fe5b925927e6603fad156dfc files/site.config.m4 590
+MD5 6d2d3106fb3c1c317310e4bf80228741 files/digest-sendmail-8.12.9-r1 68
+MD5 6faca1941f582ad8a893b0e4fa4dd757 files/sendmail-procmail.cf 39867
+MD5 03494c29693bd3ceb921bbc398be4cda files/sendmail-procmail.mc 985
+MD5 6d2d3106fb3c1c317310e4bf80228741 files/digest-sendmail-8.12.9-r2 68
diff --git a/net-mail/sendmail/sendmail-8.12.8.ebuild b/net-mail/sendmail/sendmail-8.12.8.ebuild
index 6129df821ef6..cafbdebfbd87 100644
--- a/net-mail/sendmail/sendmail-8.12.8.ebuild
+++ b/net-mail/sendmail/sendmail-8.12.8.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/sendmail/sendmail-8.12.8.ebuild,v 1.4 2003/05/13 03:11:16 tberman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/sendmail-8.12.8.ebuild,v 1.5 2003/09/05 02:39:51 msterret Exp $
 
 IUSE="ssl ldap sasl berkdb tcpd gdbm"
 
@@ -80,14 +80,14 @@ src_compile() {
 	for x in libmilter libsmutil sendmail mailstats rmail praliases smrsh makemap vacation mail.local
 	do
 		pushd ${x}
-		sh Build 
+		sh Build
 		popd
 	done
 }
 
 src_install () {
 	OBJDIR="obj.`uname -s`.`uname -r`.`arch`"
-	dodir /etc/pam.d /usr/bin /usr/include/libmilter /usr/lib 
+	dodir /etc/pam.d /usr/bin /usr/include/libmilter /usr/lib
 	dodir /usr/share/man/man{1,5,8} /usr/sbin /var/log /usr/share/sendmail-cf
 	dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
 	keepdir /var/spool/{clientmqueue,mqueue}
diff --git a/net-mail/sendmail/sendmail-8.12.9-r1.ebuild b/net-mail/sendmail/sendmail-8.12.9-r1.ebuild
index 1f3487e0c780..b556286d276c 100644
--- a/net-mail/sendmail/sendmail-8.12.9-r1.ebuild
+++ b/net-mail/sendmail/sendmail-8.12.9-r1.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/sendmail/sendmail-8.12.9-r1.ebuild,v 1.5 2003/07/13 13:32:32 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/sendmail-8.12.9-r1.ebuild,v 1.6 2003/09/05 02:39:51 msterret Exp $
 
 IUSE="ssl ldap sasl berkdb tcpd gdbm mbox"
 
@@ -84,14 +84,14 @@ src_compile() {
 	for x in libmilter libsmutil sendmail mailstats rmail praliases smrsh makemap vacation mail.local
 	do
 		pushd ${x}
-		sh Build 
+		sh Build
 		popd
 	done
 }
 
 src_install () {
 	OBJDIR="obj.`uname -s`.`uname -r`.`arch`"
-	dodir /etc/pam.d /usr/bin /usr/include/libmilter /usr/lib 
+	dodir /etc/pam.d /usr/bin /usr/include/libmilter /usr/lib
 	dodir /usr/share/man/man{1,5,8} /usr/sbin /var/log /usr/share/sendmail-cf
 	dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
 	keepdir /var/spool/{clientmqueue,mqueue}
@@ -131,8 +131,8 @@ src_install () {
 	newdoc cf/cf/README README.install-cf
 	cp -a cf/* ${D}/usr/share/sendmail-cf
 	insinto /etc/mail
-	if [ -n "` use mbox `" ] 
-	then  
+	if [ -n "` use mbox `" ]
+	then
 		doins ${FILESDIR}/{sendmail.cf,sendmail.mc}
 	else
 		newins ${FILESDIR}/sendmail-procmail.cf sendmail.cf
@@ -169,9 +169,6 @@ EOF
 }
 
 pkg_postinst() {
-                                                                                
-        einfo "This ebuild uses mbox support by default. If you are"
-        einfo "looking for maildir support put -mbox into your USE variables."
-                                                                                
+	einfo "This ebuild uses mbox support by default. If you are"
+	einfo "looking for maildir support put -mbox into your USE variables."
 }
-
diff --git a/net-mail/sendmail/sendmail-8.12.9-r2.ebuild b/net-mail/sendmail/sendmail-8.12.9-r2.ebuild
index a33b39cc997a..f694d9113a9a 100644
--- a/net-mail/sendmail/sendmail-8.12.9-r2.ebuild
+++ b/net-mail/sendmail/sendmail-8.12.9-r2.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/sendmail/sendmail-8.12.9-r2.ebuild,v 1.8 2003/07/13 14:51:59 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/sendmail-8.12.9-r2.ebuild,v 1.9 2003/09/05 02:39:51 msterret Exp $
 
 IUSE="ssl ldap sasl berkdb tcpd gdbm mbox"
 
@@ -84,14 +84,14 @@ src_compile() {
 	for x in libmilter libsmutil sendmail mailstats rmail praliases smrsh makemap vacation mail.local
 	do
 		pushd ${x}
-		sh Build 
+		sh Build
 		popd
 	done
 }
 
 src_install () {
 	OBJDIR="obj.`uname -s`.`uname -r`.`arch`"
-	dodir /etc/pam.d /usr/bin /usr/include/libmilter /usr/lib 
+	dodir /etc/pam.d /usr/bin /usr/include/libmilter /usr/lib
 	dodir /usr/share/man/man{1,5,8} /usr/sbin /var/log /usr/share/sendmail-cf
 	dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
 	keepdir /var/spool/{clientmqueue,mqueue}
@@ -131,8 +131,8 @@ src_install () {
 	newdoc cf/cf/README README.install-cf
 	cp -a cf/* ${D}/usr/share/sendmail-cf
 	insinto /etc/mail
-	if [ -n "` use mbox `" ] 
-	then  
+	if [ -n "` use mbox `" ]
+	then
 		doins ${FILESDIR}/{sendmail.cf,sendmail.mc}
 	else
 		newins ${FILESDIR}/sendmail-procmail.cf sendmail.cf
diff --git a/net-mail/sendmail/sendmail-8.12.9.ebuild b/net-mail/sendmail/sendmail-8.12.9.ebuild
index 0fcbe1e1abe7..8bf3a221e995 100644
--- a/net-mail/sendmail/sendmail-8.12.9.ebuild
+++ b/net-mail/sendmail/sendmail-8.12.9.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/sendmail/sendmail-8.12.9.ebuild,v 1.4 2003/05/13 03:11:16 tberman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/sendmail-8.12.9.ebuild,v 1.5 2003/09/05 02:39:51 msterret Exp $
 
 IUSE="ssl ldap sasl berkdb tcpd gdbm"
 
@@ -80,14 +80,14 @@ src_compile() {
 	for x in libmilter libsmutil sendmail mailstats rmail praliases smrsh makemap vacation mail.local
 	do
 		pushd ${x}
-		sh Build 
+		sh Build
 		popd
 	done
 }
 
 src_install () {
 	OBJDIR="obj.`uname -s`.`uname -r`.`arch`"
-	dodir /etc/pam.d /usr/bin /usr/include/libmilter /usr/lib 
+	dodir /etc/pam.d /usr/bin /usr/include/libmilter /usr/lib
 	dodir /usr/share/man/man{1,5,8} /usr/sbin /var/log /usr/share/sendmail-cf
 	dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
 	keepdir /var/spool/{clientmqueue,mqueue}
diff --git a/net-mail/ssmtp/Manifest b/net-mail/ssmtp/Manifest
index 6d60c1fcc44c..cd7ae2a46ae5 100644
--- a/net-mail/ssmtp/Manifest
+++ b/net-mail/ssmtp/Manifest
@@ -1,8 +1,8 @@
 MD5 4162dff5d625b568b2257214423cfe7f ChangeLog 2592
+MD5 9d260a5e3ba800b7fe887088118a3a2f ssmtp-2.38.14-r1.ebuild 1489
+MD5 a49ccfcccd8e1546ebd0e54b71ec2e19 ssmtp-2.48.ebuild 1570
+MD5 640d6311c74df58e1f94b98f238d3dcd ssmtp-2.60.3.ebuild 2203
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 6096cf673dfb54bc14f20a14bc9cc8eb ssmtp-2.38.14-r1.ebuild 1506
-MD5 318740d5bf2c90b64bebfd496207f6c9 ssmtp-2.48.ebuild 1587
-MD5 a557a14f6126afdecd28155873add485 ssmtp-2.60.3.ebuild 2317
 MD5 0c220581f9fe43f95d74864b63cf5121 files/digest-ssmtp-2.38.14-r1 64
 MD5 7acea6571783e2e8d40bb7aafad39d21 files/digest-ssmtp-2.48 62
 MD5 fdf4a04b5fc0cec5d1e9b0cf355d0567 files/digest-ssmtp-2.60.3 64
diff --git a/net-mail/ssmtp/ssmtp-2.38.14-r1.ebuild b/net-mail/ssmtp/ssmtp-2.38.14-r1.ebuild
index dd3b15ebf528..f2344fd7f36a 100644
--- a/net-mail/ssmtp/ssmtp-2.38.14-r1.ebuild
+++ b/net-mail/ssmtp/ssmtp-2.38.14-r1.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/ssmtp/ssmtp-2.38.14-r1.ebuild,v 1.19 2003/02/13 14:40:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/ssmtp/ssmtp-2.38.14-r1.ebuild,v 1.20 2003/09/05 02:28:08 msterret Exp $
 
 S=${WORKDIR}/${P}
 
@@ -15,12 +15,12 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc alpha hppa"
 LICENSE="GPL-2"
 
-src_compile() {						   
+src_compile() {
 	make clean || die
 	make ${MAKEOPTS} || die
 }
 
-src_install() {							   
+src_install() {
 	dodir /usr/bin /usr/sbin /usr/lib
 	dosbin ssmtp
 	chmod 755 ${D}/usr/sbin/ssmtp
diff --git a/net-mail/ssmtp/ssmtp-2.48.ebuild b/net-mail/ssmtp/ssmtp-2.48.ebuild
index c0d523c1ccfe..d2bbb6c5109f 100644
--- a/net-mail/ssmtp/ssmtp-2.48.ebuild
+++ b/net-mail/ssmtp/ssmtp-2.48.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/ssmtp/ssmtp-2.48.ebuild,v 1.11 2003/07/25 04:53:30 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/ssmtp/ssmtp-2.48.ebuild,v 1.12 2003/09/05 02:28:09 msterret Exp $
 
 DESCRIPTION="Extremely simple MTA to get mail off the system to a
 Mailhub"
@@ -18,12 +18,12 @@ PROVIDE="virtual/mta"
 
 S=${WORKDIR}/${P}
 
-src_compile() {						   
+src_compile() {
 	make clean || die
 	make ${MAKEOPTS} || die
 }
 
-src_install() {							   
+src_install() {
 	dodir /usr/bin /usr/sbin /usr/lib
 	dosbin ssmtp
 	chmod 755 ${D}/usr/sbin/ssmtp
diff --git a/net-mail/ssmtp/ssmtp-2.60.3.ebuild b/net-mail/ssmtp/ssmtp-2.60.3.ebuild
index 5a1f7438e94d..ada070ea88a2 100644
--- a/net-mail/ssmtp/ssmtp-2.60.3.ebuild
+++ b/net-mail/ssmtp/ssmtp-2.60.3.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/ssmtp/ssmtp-2.60.3.ebuild,v 1.5 2003/07/21 14:58:03 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/ssmtp/ssmtp-2.60.3.ebuild,v 1.6 2003/09/05 02:28:09 msterret Exp $
 
 DESCRIPTION="Extremely simple MTA to get mail off the system to a Mailhub"
 SRC_URI="ftp://ftp.es.debian.org/debian/pool/main/s/ssmtp/ssmtp_${PV}.tar.gz"
@@ -31,12 +31,12 @@ src_compile() {
 	econf \
 		--sysconfdir=/etc/ssmtp \
 		${myconf} || die
-	
+
 	make clean || die
 	make etcdir=/etc || die
 }
 
-src_install() {							   
+src_install() {
 	dodir /usr/bin /usr/sbin /usr/lib
 	dosbin ssmtp
 	chmod 755 ${D}/usr/sbin/ssmtp
@@ -56,22 +56,22 @@ src_install() {
 
 	# Set up config file
 	# See bug #22658
-        #local conffile="/etc/ssmtp/ssmtp.conf"
-        #local hostname=`hostname -f`
-        #local domainname=`hostname -d`
-        #mv ${conffile} ${conffile}.orig
-        #sed -e "s:rewriteDomain=:rewriteDomain=${domainname}:g" \
-        #        -e "s:_HOSTNAME_:${hostname}:" \
-        #        -e "s:^mailhub=mail:mailhub=mail.${domainname}:g" \
-        #        ${conffile}.orig > ${conffile}.pre
+	#local conffile="/etc/ssmtp/ssmtp.conf"
+	#local hostname=`hostname -f`
+	#local domainname=`hostname -d`
+	#mv ${conffile} ${conffile}.orig
+	#sed -e "s:rewriteDomain=:rewriteDomain=${domainname}:g" \
+	#        -e "s:_HOSTNAME_:${hostname}:" \
+	#        -e "s:^mailhub=mail:mailhub=mail.${domainname}:g" \
+	#        ${conffile}.orig > ${conffile}.pre
 	#if [ `use ssl` ];
-        #then
-        #        sed -e "s:^#UseTLS=YES:UseTLS=YES:g" \
-        #                ${conffile}.pre > ${conffile}
-        #        mv ${conffile}.pre ${conffile}.orig
-        #else
-        #        mv ${conffile}.pre ${conffile}
-        #fi
+	#then
+	#        sed -e "s:^#UseTLS=YES:UseTLS=YES:g" \
+	#                ${conffile}.pre > ${conffile}
+	#        mv ${conffile}.pre ${conffile}.orig
+	#else
+	#        mv ${conffile}.pre ${conffile}
+	#fi
 }
 
 
diff --git a/net-mail/sylpheed-claws/Manifest b/net-mail/sylpheed-claws/Manifest
index 813046b03830..08c67ae0db31 100644
--- a/net-mail/sylpheed-claws/Manifest
+++ b/net-mail/sylpheed-claws/Manifest
@@ -1,14 +1,14 @@
-MD5 db26a8cdd52bde2c189717166ff5064b sylpheed-claws-0.9.0.ebuild 3062
-MD5 bb4d29f92885dc3c258b6d6d23a4a55e sylpheed-claws-0.9.4.ebuild 3497
-MD5 cfb206e546329329c3c03b8d684fbf8b sylpheed-claws-0.9.0-r1.ebuild 3357
-MD5 a3a8e5b3da5e581d6674f4e65a1926b8 sylpheed-claws-0.8.11.ebuild 2965
 MD5 be4da8247109048b4dfe2b6fdc075f6e ChangeLog 8224
+MD5 03f89b288f02fedd5fb19703bfabc9c7 sylpheed-claws-0.8.11.ebuild 2944
+MD5 2d300e00b36e5182a09df6cd89609396 sylpheed-claws-0.9.0.ebuild 3039
+MD5 4ac17c6bbfde751ffa7111f86e2bf306 sylpheed-claws-0.9.0-r1.ebuild 3336
 MD5 6969798bba9c8660991790c2cb77fe46 sylpheed-claws-0.9.3.ebuild 3345
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 2af6aec240ec9c8d19548ac57c03786a sylpheed-claws-0.9.4.ebuild 3476
 MD5 d9e778ef490a8e07e7b931d13052fca2 files/digest-sylpheed-claws-0.9.0 73
-MD5 07b639d20c786fdd9426a268d9c08a70 files/digest-sylpheed-claws-0.9.3 73
-MD5 bc2cbfb7afd5f4264ea57fbdc55874f8 files/digest-sylpheed-claws-0.9.4 73
 MD5 8b029fc7176a8bad264d1676bd83984b files/digest-sylpheed-claws-0.8.11 74
-MD5 debd84fa61847ff672e179bcb7845e2b files/sylpheed-0.8.3claws32-dillo.patch 9123
 MD5 d9e778ef490a8e07e7b931d13052fca2 files/digest-sylpheed-claws-0.9.0-r1 73
+MD5 07b639d20c786fdd9426a268d9c08a70 files/digest-sylpheed-claws-0.9.3 73
 MD5 bf4c9cd9cb7cdc6ece7d4d327910f0cf files/procmime.patch 977
+MD5 debd84fa61847ff672e179bcb7845e2b files/sylpheed-0.8.3claws32-dillo.patch 9123
+MD5 bc2cbfb7afd5f4264ea57fbdc55874f8 files/digest-sylpheed-claws-0.9.4 73
diff --git a/net-mail/sylpheed-claws/sylpheed-claws-0.8.11.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.8.11.ebuild
index f307aadbc4b0..7c50d6ac1afd 100644
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.8.11.ebuild
+++ b/net-mail/sylpheed-claws/sylpheed-claws-0.8.11.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/sylpheed-claws/sylpheed-claws-0.8.11.ebuild,v 1.6 2003/08/30 09:28:30 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/sylpheed-claws-0.8.11.ebuild,v 1.7 2003/09/05 02:23:42 msterret Exp $
 
 IUSE="nls gnome xface gtkhtml crypt spell imlib ssl ldap ipv6 pda"
 
@@ -28,7 +28,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	xface? ( >=media-libs/compface-1.4 )
 	gtkhtml? ( net-www/dillo )
 	x11-misc/shared-mime-info"
-	
+
 RDEPEND="nls? ( sys-devel/gettext )"
 
 PROVIDE="virtual/sylpheed"
@@ -50,7 +50,7 @@ src_unpack() {
 		sed -e "s/PACKAGE\=sylpheed/PACKAGE\=sylpheed-claws/" \
 			${i}.orig > ${i}
 	done
-	
+
 	# use shared-mime-info
 	cd ${S}/src
 	epatch ${FILESDIR}/procmime.patch
@@ -62,29 +62,29 @@ src_compile() {
 	use gnome \
 	    && myconf="${myconf} --enable-gdk-pixbuf" \
 	    || myconf="${myconf} --disable-gdk-pixbuf"
-	
+
 	use imlib \
 	    && myconf="${myconf} --enable-imlib" \
 	    || myconf="${myconf} --disable-imlib"
-	    
+
 	use spell \
 	    && myconf="${myconf} --enable-aspell" \
 	    || myconf="${myconf} --disable-aspell"
-	    
+
 	use ldap && myconf="${myconf} --enable-ldap"
-	
+
 	use ssl && myconf="${myconf} --enable-openssl"
-	
+
 	use crypt && myconf="${myconf} --enable-gpgme"
-	
+
 	use ipv6 && myconf="${myconf} --enable-ipv6"
-	
+
 	use pda && myconf="${myconf} --enable-jpilot"
-	
+
 	use nls || myconf="${myconf} --disable-nls"
-	
+
 	echo ${myconf}
-	
+
 	econf \
 		--program-suffix=-claws \
 		--enable-spamassassin-plugin \
@@ -108,7 +108,7 @@ src_install() {
 	mv ${D}/usr/share/pixmaps/sylpheed.png \
 		${D}/usr/share/pixmaps/sylpheed-claws.png
 
-	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*  
+	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
 }
 
 pkg_postinst() {
diff --git a/net-mail/sylpheed-claws/sylpheed-claws-0.9.0-r1.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.9.0-r1.ebuild
index ca5c589971c5..7b5c9a1eda05 100644
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.9.0-r1.ebuild
+++ b/net-mail/sylpheed-claws/sylpheed-claws-0.9.0-r1.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/sylpheed-claws/sylpheed-claws-0.9.0-r1.ebuild,v 1.4 2003/08/30 09:28:30 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/sylpheed-claws-0.9.0-r1.ebuild,v 1.5 2003/09/05 02:23:42 msterret Exp $
 
 IUSE="nls gnome xface gtkhtml crypt spell imlib ssl ldap ipv6 pda clamav"
 
@@ -28,7 +28,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	xface? ( >=media-libs/compface-1.4 )
 	clamav? ( net-mail/clamav )
 	x11-misc/shared-mime-info"
-	
+
 RDEPEND="nls? ( sys-devel/gettext )"
 
 PROVIDE="virtual/sylpheed"
@@ -43,7 +43,7 @@ src_unpack() {
 		sed -e "s/PACKAGE\=sylpheed/PACKAGE\=sylpheed-claws/" \
 			${i}.orig > ${i}
 	done
-	
+
 	# use shared-mime-info
 	cd ${S}/src
 	epatch ${FILESDIR}/procmime.patch
@@ -55,37 +55,37 @@ src_compile() {
 	use gnome \
 	    && myconf="${myconf} --enable-gdk-pixbuf" \
 	    || myconf="${myconf} --disable-gdk-pixbuf"
-	
+
 	use imlib \
 	    && myconf="${myconf} --enable-imlib" \
 	    || myconf="${myconf} --disable-imlib"
-	    
+
 	use spell \
 	    && myconf="${myconf} --enable-aspell" \
 	    || myconf="${myconf} --disable-aspell"
-	    
+
 	use ldap && myconf="${myconf} --enable-ldap"
-	
+
 	use ssl && myconf="${myconf} --enable-openssl"
-	
+
 	use crypt && myconf="${myconf} --enable-gpgme"
-	
+
 	use ipv6 && myconf="${myconf} --enable-ipv6"
-	
+
 	use pda && myconf="${myconf} --enable-jpilot"
-	
+
 	use nls || myconf="${myconf} --disable-nls"
-	
+
 	use gtkhtml \
 		&& myconf="${myconf} --enable-dillo-viewer-plugin" \
 		|| myconf="${myconf} --disable-dillo-viewer-plugin"
-	
+
 	use clamav \
 		&& myconf="${myconf} --enable-clamav-plugin" \
 		|| myconf="${myconf} --disable-clamav-plugin"
-	
+
 	echo ${myconf}
-	
+
 	econf \
 		--program-suffix=-claws \
 		--enable-trayicon-plugin \
diff --git a/net-mail/sylpheed-claws/sylpheed-claws-0.9.0.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.9.0.ebuild
index 89f1a5a229f7..11ca8129228f 100644
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.9.0.ebuild
+++ b/net-mail/sylpheed-claws/sylpheed-claws-0.9.0.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/sylpheed-claws/sylpheed-claws-0.9.0.ebuild,v 1.3 2003/08/30 09:28:30 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/sylpheed-claws-0.9.0.ebuild,v 1.4 2003/09/05 02:23:42 msterret Exp $
 
 IUSE="nls gnome xface gtkhtml crypt spell imlib ssl ldap ipv6 pda clamav"
 
@@ -28,7 +28,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	xface? ( >=media-libs/compface-1.4 )
 	clamav? ( net-mail/clamav )
 	x11-misc/shared-mime-info"
-	
+
 RDEPEND="nls? ( sys-devel/gettext )"
 
 PROVIDE="virtual/sylpheed"
@@ -43,7 +43,7 @@ src_unpack() {
 		sed -e "s/PACKAGE\=sylpheed/PACKAGE\=sylpheed-claws/" \
 			${i}.orig > ${i}
 	done
-	
+
 	# use shared-mime-info
 	cd ${S}/src
 	epatch ${FILESDIR}/procmime.patch
@@ -55,37 +55,37 @@ src_compile() {
 	use gnome \
 	    && myconf="${myconf} --enable-gdk-pixbuf" \
 	    || myconf="${myconf} --disable-gdk-pixbuf"
-	
+
 	use imlib \
 	    && myconf="${myconf} --enable-imlib" \
 	    || myconf="${myconf} --disable-imlib"
-	    
+
 	use spell \
 	    && myconf="${myconf} --enable-aspell" \
 	    || myconf="${myconf} --disable-aspell"
-	    
+
 	use ldap && myconf="${myconf} --enable-ldap"
-	
+
 	use ssl && myconf="${myconf} --enable-openssl"
-	
+
 	use crypt && myconf="${myconf} --enable-gpgme"
-	
+
 	use ipv6 && myconf="${myconf} --enable-ipv6"
-	
+
 	use pda && myconf="${myconf} --enable-jpilot"
-	
+
 	use nls || myconf="${myconf} --disable-nls"
-	
+
 	use gtkhtml \
 		&& myconf="${myconf} --enable-dillo-viewer-plugin" \
 		|| myconf="${myconf} --disable-dillo-viewer-plugin"
-	
+
 	use clamav \
 		&& myconf="${myconf} --enable-clamav-plugin" \
 		|| myconf="${myconf} --disable-clamav-plugin"
-	
+
 	echo ${myconf}
-	
+
 	econf \
 		--program-suffix=-claws \
 		--enable-spamassassin-plugin \
@@ -109,7 +109,7 @@ src_install() {
 	mv ${D}/usr/share/pixmaps/sylpheed.png \
 		${D}/usr/share/pixmaps/sylpheed-claws.png
 
-	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*  
+	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
 }
 
 pkg_postinst() {
diff --git a/net-mail/sylpheed-claws/sylpheed-claws-0.9.4.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.9.4.ebuild
index 7718d644e9d7..3fe64e0b52ab 100644
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.9.4.ebuild
+++ b/net-mail/sylpheed-claws/sylpheed-claws-0.9.4.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/sylpheed-claws/sylpheed-claws-0.9.4.ebuild,v 1.5 2003/09/04 00:27:45 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/sylpheed-claws-0.9.4.ebuild,v 1.6 2003/09/05 02:23:42 msterret Exp $
 
 IUSE="nls gnome xface gtkhtml crypt spell imlib ssl ldap ipv6 pda clamav"
 
@@ -30,7 +30,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	clamav? ( net-mail/clamav )
 	gtkhtml? ( net-www/dillo )
 	x11-misc/shared-mime-info"
-	
+
 RDEPEND="nls? ( sys-devel/gettext )"
 
 PROVIDE="virtual/sylpheed"
@@ -45,7 +45,7 @@ src_unpack() {
 		sed -e "s/PACKAGE\=sylpheed/PACKAGE\=sylpheed-claws/" \
 			${i}.orig > ${i}
 	done
-	
+
 	# use shared-mime-info
 	cd ${S}/src
 	epatch ${FILESDIR}/procmime.patch
@@ -57,39 +57,39 @@ src_compile() {
 	use gnome \
 	    && myconf="${myconf} --enable-gdk-pixbuf" \
 	    || myconf="${myconf} --disable-gdk-pixbuf"
-	
+
 	use imlib \
 	    && myconf="${myconf} --enable-imlib" \
 	    || myconf="${myconf} --disable-imlib"
-	    
+
 	use spell \
 	    && myconf="${myconf} --enable-aspell" \
 	    || myconf="${myconf} --disable-aspell"
-	    
+
 	use ldap && myconf="${myconf} --enable-ldap"
-	
+
 	use ssl && myconf="${myconf} --enable-openssl"
-	
+
 	use crypt && myconf="${myconf} --enable-gpgme"
-	
+
 	use ipv6 && myconf="${myconf} --enable-ipv6"
-	
+
 	use pda && myconf="${myconf} --enable-jpilot"
-	
+
 	use nls || myconf="${myconf} --disable-nls"
-	
+
 	#use xml && myconf="${myconf} --enable-mathml-viewer-plugin"
-	
+
 	#use gtkhtml \
 	#	&& myconf="${myconf} --enable-dillo-viewer-plugin" \
 	#	|| myconf="${myconf} --disable-dillo-viewer-plugin"
-	
+
 	#use clamav \
 	#	&& myconf="${myconf} --enable-clamav-plugin" \
 	#	|| myconf="${myconf} --disable-clamav-plugin"
-	
+
 	echo ${myconf}
-	
+
 	econf \
 		--program-suffix=-claws \
 		--enable-spamassassin-plugin \
diff --git a/net-mail/tmda/Manifest b/net-mail/tmda/Manifest
index 06700e9ec3aa..c8a6f22f0186 100644
--- a/net-mail/tmda/Manifest
+++ b/net-mail/tmda/Manifest
@@ -1,12 +1,12 @@
-MD5 e30e62156e0a084e16fe982be661812e tmda-0.65.ebuild 1352
-MD5 603a08c15dd7cc518555a0e6889d6ac1 tmda-0.79.ebuild 1558
 MD5 982c56cfedd6c634ccbf637846c0a1f4 ChangeLog 5241
-MD5 0fe58a11479b3cbbf97ce7c3f0fff359 tmda-0.80.ebuild 1558
-MD5 a1962131631ecc54bfd57c140a2c1cee tmda-0.82.ebuild 1559
+MD5 b988ae94d7d577fb93bb0130f4938aa0 tmda-0.65.ebuild 1353
+MD5 21991d69108848122b659fd336031044 tmda-0.79.ebuild 1556
+MD5 9fc5f10566d2a23159eadc25e15a2e06 tmda-0.80.ebuild 1556
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 7b1d022a0369839f94ee0755b3960a2d tmda-0.74.ebuild 1558
+MD5 d24d18e02fd8faa8168df58d93e91c98 tmda-0.74.ebuild 1556
+MD5 ac871c7f155f190b840526a47b3c1525 tmda-0.82.ebuild 1557
 MD5 991fd8624aa478637fdbd5882e2527ba files/digest-tmda-0.79 58
 MD5 8ce39f234c191b0b501bedcfebabbc6d files/digest-tmda-0.65 58
 MD5 42462478761427da2aeb91f7bdd47328 files/digest-tmda-0.80 58
-MD5 cd268ee6ff6b0b618d5033beafe75465 files/digest-tmda-0.82 58
 MD5 585657593ed64b41a94dd019d5e5ef79 files/digest-tmda-0.74 58
+MD5 cd268ee6ff6b0b618d5033beafe75465 files/digest-tmda-0.82 58
diff --git a/net-mail/tmda/tmda-0.65.ebuild b/net-mail/tmda/tmda-0.65.ebuild
index d4718238db3d..acf19384ecf1 100644
--- a/net-mail/tmda/tmda-0.65.ebuild
+++ b/net-mail/tmda/tmda-0.65.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2002 Arcady Genkin <agenkin@thpoon.com>
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/tmda/tmda-0.65.ebuild,v 1.3 2002/12/09 04:33:15 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/tmda/tmda-0.65.ebuild,v 1.4 2003/09/05 02:32:14 msterret Exp $
 
 DESCRIPTION="Python-based SPAM reduction system"
 HOMEPAGE="http://www.tmda.net/"
@@ -38,7 +38,7 @@ src_install () {
 	# The templates
 	insinto /etc/tmda
 	doins templates/*.txt
-	
+
 	# Documentation
 	dodoc COPYING ChangeLog README THANKS UPGRADE CRYPTO CODENAMES INSTALL
 	dodoc contrib/tmda.spec contrib/sample.tmdarc
diff --git a/net-mail/tmda/tmda-0.74.ebuild b/net-mail/tmda/tmda-0.74.ebuild
index 93538d00382b..140775fdf673 100644
--- a/net-mail/tmda/tmda-0.74.ebuild
+++ b/net-mail/tmda/tmda-0.74.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2002 Arcady Genkin <agenkin@thpoon.com>
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/tmda/tmda-0.74.ebuild,v 1.1 2003/04/14 18:46:22 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/tmda/tmda-0.74.ebuild,v 1.2 2003/09/05 02:32:14 msterret Exp $
 
 DESCRIPTION="Python-based SPAM reduction system"
 HOMEPAGE="http://www.tmda.net/"
@@ -38,7 +38,7 @@ src_install () {
 	# The templates
 	insinto /etc/tmda
 	doins templates/*.txt
-	
+
 	# Documentation
 	dodoc COPYING ChangeLog README THANKS UPGRADE CRYPTO CODENAMES INSTALL
 	dohtml -r htdocs/*.html
@@ -53,6 +53,6 @@ src_install () {
 
 	insinto /usr/lib/tmda/contrib
 	doins ChangeLog sample.config tmda.el tmda.spec \
-	      tofmipd.init tofmipd.sysconfig vtmdarc 
-	
+	      tofmipd.init tofmipd.sysconfig vtmdarc
+
 }
diff --git a/net-mail/tmda/tmda-0.79.ebuild b/net-mail/tmda/tmda-0.79.ebuild
index f6112c7c9960..9764bf4d2a5e 100644
--- a/net-mail/tmda/tmda-0.79.ebuild
+++ b/net-mail/tmda/tmda-0.79.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2002 Arcady Genkin <agenkin@thpoon.com>
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/tmda/tmda-0.79.ebuild,v 1.1 2003/06/04 22:05:18 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/tmda/tmda-0.79.ebuild,v 1.2 2003/09/05 02:32:14 msterret Exp $
 
 DESCRIPTION="Python-based SPAM reduction system"
 HOMEPAGE="http://www.tmda.net/"
@@ -38,7 +38,7 @@ src_install () {
 	# The templates
 	insinto /etc/tmda
 	doins templates/*.txt
-	
+
 	# Documentation
 	dodoc COPYING ChangeLog README THANKS UPGRADE CRYPTO CODENAMES INSTALL
 	dohtml -r htdocs/*.html
@@ -53,6 +53,6 @@ src_install () {
 
 	insinto /usr/lib/tmda/contrib
 	doins ChangeLog sample.config tmda.el tmda.spec \
-	      tofmipd.init tofmipd.sysconfig vtmdarc 
-	
+	      tofmipd.init tofmipd.sysconfig vtmdarc
+
 }
diff --git a/net-mail/tmda/tmda-0.80.ebuild b/net-mail/tmda/tmda-0.80.ebuild
index 23df3c639be4..1e64dec3fd24 100644
--- a/net-mail/tmda/tmda-0.80.ebuild
+++ b/net-mail/tmda/tmda-0.80.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2002 Arcady Genkin <agenkin@thpoon.com>
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/tmda/tmda-0.80.ebuild,v 1.2 2003/07/10 19:20:40 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/tmda/tmda-0.80.ebuild,v 1.3 2003/09/05 02:32:14 msterret Exp $
 
 DESCRIPTION="Python-based SPAM reduction system"
 HOMEPAGE="http://www.tmda.net/"
@@ -38,7 +38,7 @@ src_install () {
 	# The templates
 	insinto /etc/tmda
 	doins templates/*.txt
-	
+
 	# Documentation
 	dodoc COPYING ChangeLog README THANKS UPGRADE CRYPTO CODENAMES INSTALL
 	dohtml -r htdocs/*.html
@@ -53,6 +53,6 @@ src_install () {
 
 	insinto /usr/lib/tmda/contrib
 	doins ChangeLog sample.config tmda.el tmda.spec \
-	      tofmipd.init tofmipd.sysconfig vtmdarc 
-	
+	      tofmipd.init tofmipd.sysconfig vtmdarc
+
 }
diff --git a/net-mail/tmda/tmda-0.82.ebuild b/net-mail/tmda/tmda-0.82.ebuild
index e37cd89edf9c..e9e4517d170b 100644
--- a/net-mail/tmda/tmda-0.82.ebuild
+++ b/net-mail/tmda/tmda-0.82.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2002 Arcady Genkin <agenkin@thpoon.com>
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/tmda/tmda-0.82.ebuild,v 1.1 2003/08/09 10:09:32 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/tmda/tmda-0.82.ebuild,v 1.2 2003/09/05 02:32:14 msterret Exp $
 
 DESCRIPTION="Python-based SPAM reduction system"
 HOMEPAGE="http://www.tmda.net/"
@@ -38,7 +38,7 @@ src_install () {
 	# The templates
 	insinto /etc/tmda
 	doins templates/*.txt
-	
+
 	# Documentation
 	dodoc COPYING ChangeLog README THANKS UPGRADE CRYPTO CODENAMES INSTALL
 	dohtml -r htdocs/*.html
@@ -53,6 +53,6 @@ src_install () {
 
 	insinto /usr/lib/tmda/contrib
 	doins ChangeLog sample.config tmda.el tmda.spec \
-	      tofmipd.init tofmipd.sysconfig vtmdarc 
-	
+	      tofmipd.init tofmipd.sysconfig vtmdarc
+
 }
author	Michael Sterrett <mr_bones_@gentoo.org>	2003-09-05 02:45:41 +0000
committer	Michael Sterrett <mr_bones_@gentoo.org>	2003-09-05 02:45:41 +0000
commit	50fd407cdc95fcef73e913e71b90e7daeebf53b6 (patch)
tree	8875ea9189f76fc2a41081412d95313dfa8ffd41 /net-mail
parent	header fix; whitespace cleanup (diff)
download	historical-50fd407cdc95fcef73e913e71b90e7daeebf53b6.tar.gz historical-50fd407cdc95fcef73e913e71b90e7daeebf53b6.tar.bz2 historical-50fd407cdc95fcef73e913e71b90e7daeebf53b6.zip