repoman'd

60 files changed, 198 insertions, 1429 deletions

diff --git a/net-mail/maildrop/files/digest-maildrop-1.3.9 b/net-mail/maildrop/files/digest-maildrop-1.3.9
deleted file mode 100644
index ea4bf715cbba..000000000000
--- a/net-mail/maildrop/files/digest-maildrop-1.3.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9059a6fb8cf48edd950047b19e3278de maildrop-1.3.9.tar.gz 635022
diff --git a/net-mail/maildrop/files/digest-maildrop-1.3.9-r1 b/net-mail/maildrop/files/digest-maildrop-1.3.9-r1
deleted file mode 100644
index ea4bf715cbba..000000000000
--- a/net-mail/maildrop/files/digest-maildrop-1.3.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9059a6fb8cf48edd950047b19e3278de maildrop-1.3.9.tar.gz 635022
diff --git a/net-mail/maildrop/maildrop-1.3.9-r1.ebuild b/net-mail/maildrop/maildrop-1.3.9-r1.ebuild
deleted file mode 100644
index b1b62cfa32c1..000000000000
--- a/net-mail/maildrop/maildrop-1.3.9-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/maildrop/maildrop-1.3.9-r1.ebuild,v 1.2 2002/06/24 13:49:11 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Mail delivery agent/filter"
-SRC_URI="http://download.sourceforge.net/courier/${P}.tar.gz"
-HOMEPAGE="http://www.flounder.net/~mrsam/maildrop/index.html"
-
-DEPEND="virtual/glibc >=sys-libs/gdbm-1.8.0 sys-devel/perl"
-SLOT="0"
-LICENSE="GPL-2"
-
-src_compile() {
-	export CFLAGS="${CFLAGS/-fomit-frame-pointer/} -g"
-	export CFLAGS="${CFLAGS/-ffast-math/} -g"
-	# These next two lines are a MUST! If tries to unroll the loops in
-	# CFLAGS or CXXFLAGS maildrop will not compile :-( <lamer@gentoo.org>
-	export CFLAGS="${CFLAGS/-funroll-loops/} -g"
-	export CXXFLAGS="${CFLAGS}"
-	./configure \
-		--prefix=/usr \
-		--with-devel \
-		--enable-userdb \
-		--disable-tempdir \
-		--enable-syslog=1 \
-		--enable-use-flock=1 \
-		--enable-maildirquota \
-		--enable-use-dotlock=1 \
-		--mandir=/usr/share/man \
-		--with-etcdir=/etc/maildrop \
-		--with-default-maildrop=./.maildir/ \
-		--enable-sendmail=/usr/sbin/sendmail \
-		--host=${CHOST} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	local i
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README \
-		README.postfix UPGRADE
-	mv ${D}/usr/share/maildrop/html ${D}/usr/share/doc/${PF}
-	dohtml {INSTALL,README,UPGRADE}.html
-
-	# this just cleans up /usr/share/maildrop a little bit..
-	for i in makedat makeuserdb pw2userdb userdb userdbpw vchkpw2userdb
-	do
-		rm -f ${D}/usr/bin/$i
-		mv -f ${D}/usr/share/maildrop/scripts/$i \
-			${D}/usr/share/maildrop
-		dosym /usr/share/maildrop/$i /usr/bin/$i
-	done
-	rm -rf ${D}/usr/share/maildrop/scripts
-
-	insinto /etc/maildrop
-	doins ${FILESDIR}/maildroprc
-}
diff --git a/net-mail/maildrop/maildrop-1.3.9.ebuild b/net-mail/maildrop/maildrop-1.3.9.ebuild
deleted file mode 100644
index 11bcea098b5f..000000000000
--- a/net-mail/maildrop/maildrop-1.3.9.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/maildrop/maildrop-1.3.9.ebuild,v 1.1 2002/05/06 20:05:42 woodchip Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Mail delivery agent/filter"
-SRC_URI="http://download.sourceforge.net/courier/${P}.tar.gz"
-HOMEPAGE="http://www.flounder.net/~mrsam/maildrop/index.html"
-
-DEPEND="virtual/glibc >=sys-libs/gdbm-1.8.0 sys-devel/perl"
-SLOT="0"
-LICENSE="GPL-2"
-
-src_compile() {
-	export CFLAGS="${CFLAGS/-fomit-frame-pointer -ffast-math/}"
-	./configure \
-		--prefix=/usr \
-		--with-devel \
-		--enable-userdb \
-		--disable-tempdir \
-		--enable-syslog=1 \
-		--enable-use-flock=1 \
-		--enable-maildirquota \
-		--enable-use-dotlock=1 \
-		--mandir=/usr/share/man \
-		--with-etcdir=/etc/maildrop \
-		--with-default-maildrop=./.maildir/ \
-		--enable-sendmail=/usr/sbin/sendmail \
-		--host=${CHOST} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	local i
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README \
-		README.postfix UPGRADE
-	mv ${D}/usr/share/maildrop/html ${D}/usr/share/doc/${PF}
-	dohtml {INSTALL,README,UPGRADE}.html
-
-	# this just cleans up /usr/share/maildrop a little bit..
-	for i in makedat makeuserdb pw2userdb userdb userdbpw vchkpw2userdb
-	do
-		rm -f ${D}/usr/bin/$i
-		mv -f ${D}/usr/share/maildrop/scripts/$i \
-			${D}/usr/share/maildrop
-		dosym /usr/share/maildrop/$i /usr/bin/$i
-	done
-	rm -rf ${D}/usr/share/maildrop/scripts
-
-	insinto /etc/maildrop
-	doins ${FILESDIR}/maildroprc
-}
diff --git a/net-mail/maildrop/maildrop-1.4.0.ebuild b/net-mail/maildrop/maildrop-1.4.0.ebuild
index 65159759691e..e239f171afef 100644
--- a/net-mail/maildrop/maildrop-1.4.0.ebuild
+++ b/net-mail/maildrop/maildrop-1.4.0.ebuild
@@ -1,15 +1,18 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/maildrop/maildrop-1.4.0.ebuild,v 1.1 2002/06/24 20:33:45 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/maildrop/maildrop-1.4.0.ebuild,v 1.2 2002/07/17 05:07:49 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Mail delivery agent/filter"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.gz"
 HOMEPAGE="http://www.flounder.net/~mrsam/maildrop/index.html"
 
-DEPEND="virtual/glibc >=sys-libs/gdbm-1.8.0 sys-devel/perl"
+DEPEND=">=sys-libs/gdbm-1.8.0
+	sys-devel/perl"
+
 SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_compile() {
 	# These next two lines are a MUST! If tries to unroll the loops in
diff --git a/net-mail/mailfilter/files/digest-mailfilter-0.3.1 b/net-mail/mailfilter/files/digest-mailfilter-0.3.1
deleted file mode 100644
index 7a068f38e65b..000000000000
--- a/net-mail/mailfilter/files/digest-mailfilter-0.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ef08189ce06ff913672089f560d94658 mailfilter-0.3.1.tar.gz 345507
diff --git a/net-mail/mailfilter/mailfilter-0.3.1.ebuild b/net-mail/mailfilter/mailfilter-0.3.1.ebuild
deleted file mode 100644
index 9b103e883670..000000000000
--- a/net-mail/mailfilter/mailfilter-0.3.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailfilter/mailfilter-0.3.1.ebuild,v 1.4 2002/07/11 06:30:47 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Mailfilter is a utility to get rid of unwanted spam mails"
-SRC_URI="mirror://sourceforge/mailfilter/${P}.tar.gz"
-HOMEPAGE="http://mailfilter.sourceforge.net/index.html"
-
-DEPEND="virtual/glibc 
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-
-	local myconf
-	if [ -z "`use nls`" ]
-	then
-          myconf="${myconf} --disable-nls"
-	fi
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man ${myconf} || die "./configure failed"
-	make || die
-}
-
-src_install () {
-
-	make DESTDIR=${D} install || die
-	dodoc INSTALL doc/FAQ doc/rcfile.example1 doc/rcfile.example2
-
-
-}
diff --git a/net-mail/mailfilter/mailfilter-0.4.0.ebuild b/net-mail/mailfilter/mailfilter-0.4.0.ebuild
index 842025ce12df..00d990142d19 100644
--- a/net-mail/mailfilter/mailfilter-0.4.0.ebuild
+++ b/net-mail/mailfilter/mailfilter-0.4.0.ebuild
@@ -1,22 +1,23 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailfilter/mailfilter-0.4.0.ebuild,v 1.1 2002/06/06 05:50:20 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailfilter/mailfilter-0.4.0.ebuild,v 1.2 2002/07/17 05:07:50 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Mailfilter is a utility to get rid of unwanted spam mails"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/mailfilter/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/mailfilter/${P}.tar.gz"
 HOMEPAGE="http://mailfilter.sourceforge.net/index.html"
 
-DEPEND="virtual/glibc 
-	nls? ( sys-devel/gettext )"
+DEPEND="virtual/glibc"
+RDEPEND="nls? ( sys-devel/gettext )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_compile() {
 
 	local myconf
-	if [ -z "`use nls`" ]
-	then
-		myconf="${myconf} --disable-nls"
-	fi
+	use nls || myconf="${myconf} --disable-nls"
 
 	./configure \
 		--host=${CHOST} \
@@ -30,6 +31,6 @@ src_install () {
 
 	make DESTDIR=${D} install || die
 	dodoc INSTALL doc/FAQ doc/rcfile.example1 doc/rcfile.example2
-
+	dodoc README THANKS ChangeLog AUTHORS NEWS TODO
 
 }
diff --git a/net-mail/mailfront/mailfront-0.76.ebuild b/net-mail/mailfront/mailfront-0.76.ebuild
index d59f75c7a431..f4f6f2424fbf 100644
--- a/net-mail/mailfront/mailfront-0.76.ebuild
+++ b/net-mail/mailfront/mailfront-0.76.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailfront/mailfront-0.76.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailfront/mailfront-0.76.ebuild,v 1.3 2002/07/17 05:07:50 seemant Exp $
 
 S=${WORKDIR}/${P}
+DESCRIPTION="Mail server network protocol front-ends."
+SRC_URI="http://untroubled.org/mailfront/${P}.tar.gz"
+HOMEPAGE="http://untroubled.org/mailfront/"
 
 DEPEND="virtual/glibc
 	dev-libs/bglibs"
@@ -12,10 +15,8 @@ RDEPEND="net-mail/cvm-vmailmgr
 	net-mail/qmail-pop3d"
 
 SLOT="0"
-
-DESCRIPTION="Mail server network protocol front-ends."
-SRC_URI="http://untroubled.org/mailfront/${P}.tar.gz"
-HOMEPAGE="http://untroubled.org/mailfront/"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_compile() {
 	cd ${S}
@@ -36,6 +37,7 @@ src_install () {
 	exeinto /var/qmail/supervise/qmail-pop3d
 	newexe ${FILESDIR}/run-pop3front run
 
+	dodoc ANNOUNCEMENT FILES NEWS README TARGETS TODO VERSION
 }
 
 pkg_postinst() {
diff --git a/net-mail/mailx/mailx-8.1.1.11.ebuild b/net-mail/mailx/mailx-8.1.1.11.ebuild
index 6dbbdcc3e039..680c36ff479b 100644
--- a/net-mail/mailx/mailx-8.1.1.11.ebuild
+++ b/net-mail/mailx/mailx-8.1.1.11.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailx/mailx-8.1.1.11.ebuild,v 1.5 2002/07/17 05:07:50 seemant Exp $
 
 MX_VER="8.1.1"
 S=${WORKDIR}/mailx-${MX_VER}.orig
@@ -7,9 +8,11 @@ DESCRIPTION="The /bin/mail program, which is used to send mail via shell scripts
 SRC_URI="ftp://ftp.debian.org/debian/pool/main/m/mailx/mailx_${MX_VER}.orig.tar.gz"
 HOMEPAGE="http://www.debian.org"
 
-DEPEND="virtual/glibc
-	>=net-libs/liblockfile-1.03"
+DEPEND=">=net-libs/liblockfile-1.03"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_unpack() {
 
@@ -17,7 +20,7 @@ src_unpack() {
 	
 	cd ${S}
 	
-        patch -p1 < ${FILESDIR}/${PF}.diff || die
+	patch -p1 < ${FILESDIR}/${PF}.diff || die
 	patch -p1 < ${FILESDIR}/${PF}-version.diff || die
 	# It needs to install to /bin/mail (else conflicts with Postfix)
 	# Also man pages go to /usr/share/man for FHS compliancy
@@ -46,4 +49,3 @@ src_install() {
 	dosym mail /bin/Mail
 	dosym mail.1 /usr/share/man/man1/Mail.1
 }
-
diff --git a/net-mail/mboxgrep/mboxgrep-0.7.3.ebuild b/net-mail/mboxgrep/mboxgrep-0.7.3.ebuild
index a11724105308..74138e129f9e 100644
--- a/net-mail/mboxgrep/mboxgrep-0.7.3.ebuild
+++ b/net-mail/mboxgrep/mboxgrep-0.7.3.ebuild
@@ -1,15 +1,19 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mboxgrep/mboxgrep-0.7.3.ebuild,v 1.3 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mboxgrep/mboxgrep-0.7.3.ebuild,v 1.4 2002/07/17 05:07:50 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Grep for mbox files"
-SRC_URI="mirror://sourceforge/mboxgrep/mboxgrep-0.7.3.tar.gz"
+SRC_URI="mirror://sourceforge/mboxgrep/${P}.tar.gz"
 HOMEPAGE="http://mboxgrep.sf.net"
 
 DEPEND="virtual/glibc"
 RDEPEND="$DEPEND"
 
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86"
+
 src_compile() {
 	./configure \
 		--host=${CHOST} \
diff --git a/net-mail/mpack/mpack-1.5.ebuild b/net-mail/mpack/mpack-1.5.ebuild
index abb14dc53d04..28607628209d 100644
--- a/net-mail/mpack/mpack-1.5.ebuild
+++ b/net-mail/mpack/mpack-1.5.ebuild
@@ -1,17 +1,19 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mpack/mpack-1.5.ebuild,v 1.1 2002/06/12 13:03:49 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mpack/mpack-1.5.ebuild,v 1.2 2002/07/17 05:07:50 seemant Exp $
 
+S=${WORKDIR}/${PN}
 DESCRIPTION="Command-line MIME encoding and decoding utilities"
 HOMEPAGE="ftp://ftp.andrew.cmu.edu/pub/mpack/"
-LICENSE="as-is"
 SRC_URI="ftp://ftp.andrew.cmu.edu/pub/mpack/${P}-src.tar.Z"
+
 SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86"
 
 DEPEND="virtual/glibc"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/mpack
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" || die
diff --git a/net-mail/mutt/files/digest-mutt-1.3.22 b/net-mail/mutt/files/digest-mutt-1.3.22
deleted file mode 100644
index af7c2586c2aa..000000000000
--- a/net-mail/mutt/files/digest-mutt-1.3.22
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c69053fc5fe4cc92d56c6e03cc99aef9 mutt-1.3.22i.tar.gz 2471783
diff --git a/net-mail/mutt/files/digest-mutt-1.3.22-r1 b/net-mail/mutt/files/digest-mutt-1.3.22-r1
deleted file mode 100644
index af7c2586c2aa..000000000000
--- a/net-mail/mutt/files/digest-mutt-1.3.22-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c69053fc5fe4cc92d56c6e03cc99aef9 mutt-1.3.22i.tar.gz 2471783
diff --git a/net-mail/mutt/files/digest-mutt-1.3.22.1 b/net-mail/mutt/files/digest-mutt-1.3.22.1
deleted file mode 100644
index 6d44103cb466..000000000000
--- a/net-mail/mutt/files/digest-mutt-1.3.22.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cef70b45444ddff0a1128d89f9fc7086 mutt-1.3.22.1i.tar.gz 2471986
diff --git a/net-mail/mutt/files/digest-mutt-1.3.25 b/net-mail/mutt/files/digest-mutt-1.3.25
deleted file mode 100644
index 201019d8d931..000000000000
--- a/net-mail/mutt/files/digest-mutt-1.3.25
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4ca669d6697faba8acb5f5b01d574f29 mutt-1.3.25i.tar.gz 2527168
diff --git a/net-mail/mutt/files/digest-mutt-1.3.28-r1 b/net-mail/mutt/files/digest-mutt-1.3.28-r1
deleted file mode 100644
index f6aa8f4cd3d3..000000000000
--- a/net-mail/mutt/files/digest-mutt-1.3.28-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eba9bd09853ff7e441712e2d10d8632b mutt-1.3.28i.tar.gz 2546513
diff --git a/net-mail/mutt/mutt-1.3.22-r1.ebuild b/net-mail/mutt/mutt-1.3.22-r1.ebuild
deleted file mode 100644
index 6139b6252e80..000000000000
--- a/net-mail/mutt/mutt-1.3.22-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-#          Daniel Robbins <drobbins@gentoo.org>, 
-#          Anonymous,
-#          Aron Griffis <agriffis@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/mutt-1.3.22-r1.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
-
-S=$WORKDIR/$P
-DESCRIPTION="a small but very powerful text-based mail client"
-SRC_URI="ftp://ftp.mutt.org/pub/mutt/mutt-${PV}i.tar.gz"
-HOMEPAGE="http://www.mutt.org"
-
-DEPEND="virtual/glibc 
-        nls?   ( sys-devel/gettext ) 
-	>=sys-libs/ncurses-5.2 
-	slang? ( >=sys-libs/slang-1.4.2 ) 
-	ssl?   ( >=dev-libs/openssl-0.9.6 )"
-
-src_compile() {
-	local myconf
-	use nls && myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-	use ssl && myconf="$myconf --with-ssl" \
-		|| myconf="$myconf --without-ssl"
-	# --without-slang doesn't work;
-	# specify --with-curses if you don't want slang
-	# (26 Sep 2001 agriffis)
-	use slang && myconf="$myconf --with-slang" \
-	          || myconf="$myconf --with-curses"
-	./configure --host=$CHOST \
-		--prefix=/usr --sysconfdir=/etc/mutt \
-		--mandir=/usr/share/man --with-docdir=/usr/share/doc/mutt-$PVR \
-		--with-regex --enable-pop --enable-imap --enable-nfs-fix \
-		--with-homespool=Maildir $myconf
-	assert "./configure failed (myconf=$myconf)"
-	cp doc/Makefile doc/Makefile.orig
-	sed 's/README.UPGRADE//' doc/Makefile.orig > doc/Makefile
-	make || die "make failed (myconf=$myconf)"
-}
-
-src_install () {
-	make DESTDIR=$D install || die
-	find $D/usr/share/doc -type f | xargs gzip
-	insinto /etc/mutt
-	doins $FILESDIR/Muttrc
-}
diff --git a/net-mail/mutt/mutt-1.3.22.1.ebuild b/net-mail/mutt/mutt-1.3.22.1.ebuild
deleted file mode 100644
index 6056af27f798..000000000000
--- a/net-mail/mutt/mutt-1.3.22.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-#          Daniel Robbins <drobbins@gentoo.org>, 
-#          Anonymous,
-#          Aron Griffis <agriffis@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/mutt-1.3.22.1.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
-
-S=$WORKDIR/$P
-DESCRIPTION="a small but very powerful text-based mail client"
-SRC_URI="ftp://ftp.mutt.org/pub/mutt/mutt-${PV}i.tar.gz"
-HOMEPAGE="http://www.mutt.org"
-
-DEPEND="virtual/glibc 
-        nls?   ( sys-devel/gettext ) 
-	>=sys-libs/ncurses-5.2 
-	slang? ( >=sys-libs/slang-1.4.2 ) 
-	ssl?   ( >=dev-libs/openssl-0.9.6 )"
-
-src_compile() {
-	local myconf
-	use nls && myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-	use ssl && myconf="$myconf --with-ssl" \
-		|| myconf="$myconf --without-ssl"
-	# --without-slang doesn't work;
-	# specify --with-curses if you don't want slang
-	# (26 Sep 2001 agriffis)
-	use slang && myconf="$myconf --with-slang" \
-	          || myconf="$myconf --with-curses"
-	./configure --host=$CHOST \
-		--prefix=/usr --sysconfdir=/etc/mutt \
-		--mandir=/usr/share/man --with-docdir=/usr/share/doc/mutt-$PVR \
-		--with-regex --enable-pop --enable-imap --enable-nfs-fix \
-		--with-homespool=Maildir $myconf
-	assert "./configure failed (myconf=$myconf)"
-	cp doc/Makefile doc/Makefile.orig
-	sed 's/README.UPGRADE//' doc/Makefile.orig > doc/Makefile
-	make || die "make failed (myconf=$myconf)"
-}
-
-src_install () {
-	make DESTDIR=$D install || die
-	find $D/usr/share/doc -type f | xargs gzip
-	insinto /etc/mutt
-	doins $FILESDIR/Muttrc
-}
diff --git a/net-mail/mutt/mutt-1.3.22.ebuild b/net-mail/mutt/mutt-1.3.22.ebuild
deleted file mode 100644
index 28cf729acf7b..000000000000
--- a/net-mail/mutt/mutt-1.3.22.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/mutt-1.3.22.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="a small but very powerful text-based mail client"
-SRC_URI="ftp://ftp.mutt.org/pub/mutt/mutt-1.3.22i.tar.gz"
-HOMEPAGE="http://www.mutt.org"
-
-DEPEND="virtual/glibc nls? ( sys-devel/gettext ) >=sys-libs/ncurses-5.2 slang? ( >=sys-libs/slang-1.4.2 ) ssl? ( >=dev-libs/openssl-0.9.6 )"
-RDEPEND="virtual/glibc >=sys-libs/ncurses-5.2 slang? ( >=sys-libs/slang-1.4.2 ) ssl? ( >=dev-libs/openssl-0.9.6 )" 
-
-src_compile() {
-	local myconf
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-	if [ "`use ssl`" ] ; then
-		myconf="$myconf --with-ssl"
-	fi
-	if [ "`use slang`" ] ; then
-		myconf="$myconf --with-slang"
-	fi
-	./configure --prefix=/usr --sysconfdir=/etc/mutt --host=${CHOST} --with-regex  --enable-pop --enable-imap --enable-nfs-fix --with-homespool=Maildir $myconf || die
-	cp doc/Makefile doc/Makefile.orig
-	sed 's/README.UPGRADE//' doc/Makefile.orig > doc/Makefile
-	make || die
-}
-
-src_install () {
-	cd ${S}
-	make DESTDIR=${D} install || die
-	dodir /usr/share/doc/${PVF}
-    mv ${D}/usr/doc/mutt/* ${D}/usr/share/doc/${PVF}
-    mv ${D}/usr/man ${D}/usr/share
-	rm -rf ${D}/usr/doc/mutt
-    gzip ${D}/usr/share/doc/${PVF}/html/*
-    gzip ${D}/usr/share/doc/${PVF}/samples/*
-    gzip ${D}/usr/share/doc/${PVF}/*
-	insinto /etc/mutt
-	doins ${FILESDIR}/Muttrc*
-}
diff --git a/net-mail/mutt/mutt-1.3.25.ebuild b/net-mail/mutt/mutt-1.3.25.ebuild
deleted file mode 100644
index cab5a3145918..000000000000
--- a/net-mail/mutt/mutt-1.3.25.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/mutt-1.3.25.ebuild,v 1.5 2002/07/11 06:30:47 drobbins Exp $
-
-S=$WORKDIR/$P
-DESCRIPTION="a small but very powerful text-based mail client"
-SRC_URI="ftp://ftp.mutt.org/pub/mutt/mutt-${PV}i.tar.gz"
-HOMEPAGE="http://www.mutt.org"
-
-DEPEND="virtual/glibc 
-	nls? ( sys-devel/gettext ) 
-	>=sys-libs/ncurses-5.2 
-	slang? ( >=sys-libs/slang-1.4.2 ) 
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
-
-src_compile() {
-	local myconf
-	use nls && myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-	use ssl && myconf="$myconf --with-ssl" \
-		|| myconf="$myconf --without-ssl"
-	# --without-slang doesn't work;
-	# specify --with-curses if you don't want slang
-	# (26 Sep 2001 agriffis)
-	use slang && myconf="$myconf --with-slang" \
-	          || myconf="$myconf --with-curses"
-	./configure --host=$CHOST \
-		--prefix=/usr --sysconfdir=/etc/mutt \
-		--mandir=/usr/share/man --with-docdir=/usr/share/doc/mutt-$PVR \
-		--with-regex --enable-pop --enable-imap --enable-nfs-fix \
-		--with-homespool=Maildir $myconf
-	assert "./configure failed (myconf=$myconf)"
-	cp doc/Makefile doc/Makefile.orig
-	sed 's/README.UPGRADE//' doc/Makefile.orig > doc/Makefile
-	make || die "make failed (myconf=$myconf)"
-}
-
-src_install () {
-	make DESTDIR=$D install || die
-	find $D/usr/share/doc -type f | xargs gzip
-	insinto /etc/mutt
-	doins $FILESDIR/Muttrc
-}
diff --git a/net-mail/mutt/mutt-1.3.28-r1.ebuild b/net-mail/mutt/mutt-1.3.28-r1.ebuild
deleted file mode 100644
index 7d1ee30c359d..000000000000
--- a/net-mail/mutt/mutt-1.3.28-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/mutt-1.3.28-r1.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
-
-S=$WORKDIR/$P
-DESCRIPTION="a small but very powerful text-based mail client"
-SRC_URI="ftp://ftp.mutt.org/pub/mutt/mutt-${PV}i.tar.gz"
-HOMEPAGE="http://www.mutt.org"
-
-DEPEND="virtual/glibc 
-	nls? ( sys-devel/gettext ) 
-	>=sys-libs/ncurses-5.2 
-	slang? ( >=sys-libs/slang-1.4.2 ) 
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
-
-src_compile() {
-	local myconf
-	use nls && myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-	use ssl && myconf="$myconf --with-ssl" \
-		|| myconf="$myconf --without-ssl"
-	# --without-slang doesn't work;
-	# specify --with-curses if you don't want slang
-	# (26 Sep 2001 agriffis)
-	use slang && myconf="$myconf --with-slang" \
-	          || myconf="$myconf --with-curses"
-	./configure --host=$CHOST \
-		--prefix=/usr --sysconfdir=/etc/mutt \
-		--mandir=/usr/share/man --with-docdir=/usr/share/doc/mutt-$PVR \
-		--with-regex --enable-pop --enable-imap --enable-nfs-fix \
-		--disable-fcntl --enable-flock --enable-external-dotlock \
-		--with-homespool=Maildir $myconf
-	assert "./configure failed (myconf=$myconf)"
-	cp doc/Makefile doc/Makefile.orig
-	sed 's/README.UPGRADE//' doc/Makefile.orig > doc/Makefile
-	make || die "make failed (myconf=$myconf)"
-}
-
-src_install () {
-	make DESTDIR=$D install || die
-	find $D/usr/share/doc -type f |grep -v html | xargs gzip
-	insinto /etc/mutt
-	doins $FILESDIR/Muttrc
-}
diff --git a/net-mail/mutt/mutt-1.3.28.ebuild b/net-mail/mutt/mutt-1.3.28.ebuild
index f2846567c52f..7bda4e5acded 100644
--- a/net-mail/mutt/mutt-1.3.28.ebuild
+++ b/net-mail/mutt/mutt-1.3.28.ebuild
@@ -1,17 +1,21 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/mutt-1.3.28.ebuild,v 1.3 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/mutt-1.3.28.ebuild,v 1.4 2002/07/17 05:07:50 seemant Exp $
 
-S=$WORKDIR/$P
+S=$WORKDIR/${P}
 DESCRIPTION="a small but very powerful text-based mail client"
 SRC_URI="ftp://ftp.mutt.org/pub/mutt/mutt-${PV}i.tar.gz"
 HOMEPAGE="http://www.mutt.org"
 
-DEPEND="virtual/glibc 
-	nls? ( sys-devel/gettext ) 
-	>=sys-libs/ncurses-5.2 
-	slang? ( >=sys-libs/slang-1.4.2 ) 
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND=">=sys-libs/ncurses-5.2 
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	slang? ( >=sys-libs/slang-1.4.2 )"
+
+RDEPEND="nls? ( sys-devel/gettext )"
 
 src_compile() {
 	local myconf
@@ -40,4 +44,7 @@ src_install () {
 	find $D/usr/share/doc -type f |grep -v html | xargs gzip
 	insinto /etc/mutt
 	doins $FILESDIR/Muttrc
+
+	dodoc BEWARE COPYRIGHT ChangeLog GPL INSTALL NEWS OPS* PATCHES README* \
+		TODO VERSION
 }
diff --git a/net-mail/mutt/mutt-1.4.ebuild b/net-mail/mutt/mutt-1.4.ebuild
index 6c54652f35a9..48fdec1cb819 100644
--- a/net-mail/mutt/mutt-1.4.ebuild
+++ b/net-mail/mutt/mutt-1.4.ebuild
@@ -1,17 +1,21 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/mutt-1.4.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mutt/mutt-1.4.ebuild,v 1.3 2002/07/17 05:07:50 seemant Exp $
 
-S=$WORKDIR/$P
+S=$WORKDIR/${P}
 DESCRIPTION="a small but very powerful text-based mail client"
 SRC_URI="ftp://ftp.mutt.org/pub/mutt/mutt-${PV}i.tar.gz"
 HOMEPAGE="http://www.mutt.org"
 
-DEPEND="virtual/glibc 
-	nls? ( sys-devel/gettext ) 
-	>=sys-libs/ncurses-5.2 
-	slang? ( >=sys-libs/slang-1.4.2 ) 
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
+DEPEND=">=sys-libs/ncurses-5.2
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	slang? ( >=sys-libs/slang-1.4.2 )"
+
+RDEPEND="nls? ( sys-devel/gettext )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_compile() {
 	local myconf
@@ -41,4 +45,6 @@ src_install () {
 	find $D/usr/share/doc -type f |grep -v html | xargs gzip
 	insinto /etc/mutt
 	doins $FILESDIR/Muttrc
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
 }
diff --git a/net-mail/nail/files/digest-nail-9.27 b/net-mail/nail/files/digest-nail-9.27
deleted file mode 100644
index 87d1e822353e..000000000000
--- a/net-mail/nail/files/digest-nail-9.27
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6a2990c5e9e60f26dc5823b01172e824 nail-9.27.tar.gz 140151
diff --git a/net-mail/nail/nail-9.27.ebuild b/net-mail/nail/nail-9.27.ebuild
deleted file mode 100644
index 15ed8527dbec..000000000000
--- a/net-mail/nail/nail-9.27.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/nail/nail-9.27.ebuild,v 1.4 2002/07/11 06:30:47 drobbins Exp $
-
-#Remeber to add the proper Author line, above.  Don't worry about the fourth line;
-#it'll get automatically fixed when the ebuild is checked in.
-
-#Source directory; the dir where the sources can be found (automatically unpacked)
-#inside ${WORKDIR}
-S=${WORKDIR}/${P}
-
-#Short one-line description
-DESCRIPTION="Nail is a mail user agent derived from Berkeley Mail 8.1 and contains builtin support for MIME messages."
-
-#Point to any required sources; these will be automatically downloaded by Portage
-SRC_URI="http://omnibus.ruf.uni-freiburg.de/~gritter/archive/nail/${P}.tar.gz"
-
-#Homepage, not used by Portage directly but handy for developer reference
-HOMEPAGE="http://omnibus.ruf.uni-freiburg.de/~gritter/"
-
-#build-time dependencies
-DEPEND="virtual/glibc"
-
-#run-time dependencies, same as DEPEND if RDEPEND isn't defined:
-#RDEPEND=""
-
-src_compile() {
-    #the "try" command will stop the build process if the specified command fails.  Prefix critical
-	#commands with "try"
-	#try ./configure --infodir=/usr/share/info --mandir=/usr/share/man --prefix=/usr --host=${CHOST} --with-mailspool=/var/spool/mail
-	try ./configure --infodir=/usr/share/info --mandir=/usr/share/man --prefix=/usr --host=${CHOST} --with-mailspool=~/.maildir
-    #Note the use of --infodir and --mandir, above.  This is to make this package FHS 2.2-compliant
-	#(/usr/share is used for info and man now).
-	
-	try emake
-	#emake (previously known as pmake) is a script that calls the standard GNU make with parallel
-	#building options for speedier builds on SMP systems.  Use emake first; it make not work.  If
-	#not, then replace the line above with:
-	
-	#try make
-}
-
-src_install () {
-	#you must *personally verify* that this trick doesn't install
-	#anything outside of DESTDIR; do this by reading and understanding
-	#the install part of the Makefiles.  Also note that this will often
-	#also work for autoconf stuff (usually much more often than DESTDIR,
-	#which is actually quite rare.
-
-    #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
-	
-	# try make prefix=${D}/usr install
-
-    try make DESTDIR=${D} install
-	#again, verify the Makefiles!  We don't want anything falling outside
-	#of ${D}.
-    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"
-
-}
diff --git a/net-mail/nail/nail-9.30.ebuild b/net-mail/nail/nail-9.30.ebuild
index 1c7a538b846f..f7b521eb5832 100644
--- a/net-mail/nail/nail-9.30.ebuild
+++ b/net-mail/nail/nail-9.30.ebuild
@@ -1,16 +1,23 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/nail/nail-9.30.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/nail/nail-9.30.ebuild,v 1.3 2002/07/17 05:07:50 seemant Exp $
 
 S=${WORKDIR}/${P}
 
 DESCRIPTION="Nail is a mail user agent derived from Berkeley Mail 8.1 and contains builtin support for MIME messages."
 SRC_URI="http://omnibus.ruf.uni-freiburg.de/~gritter/archive/nail/${P}.tar.gz"
 HOMEPAGE="http://omnibus.ruf.uni-freiburg.de/~gritter/"
+
 DEPEND="virtual/glibc"
 
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86"
+
 src_compile() {
-	./configure --infodir=/usr/share/info --mandir=/usr/share/man --prefix=/usr --host=${CHOST} --with-mailspool=~/.maildir || die "configure failed"
+	econf \
+		--with-mailspool=~/.maildir || die "configure failed"
+
 	emake || die "emake failed"
 }
 
diff --git a/net-mail/nbsmtp/nbsmtp-0.8.ebuild b/net-mail/nbsmtp/nbsmtp-0.8.ebuild
index 5459a4c1e085..80d5ab29597f 100644
--- a/net-mail/nbsmtp/nbsmtp-0.8.ebuild
+++ b/net-mail/nbsmtp/nbsmtp-0.8.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/nbsmtp/nbsmtp-0.8.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/nbsmtp/nbsmtp-0.8.ebuild,v 1.3 2002/07/17 05:07:50 seemant Exp $
 
 S=${WORKDIR}
-
 DESCRIPTION="The No-Brainer SMTP"
-
 SRC_URI="http://physeeks.dyndns.org:8000/download/${P}.tgz"
-
 HOMEPAGE="http://physeeks.dyndns.org:8000/software.html"
 
 DEPEND="virtual/glibc"
-
 PROVIDE="virtual/mta"
 
+
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86"
+
 src_compile() {
 	gcc ${CFLAGS} -o nbsmtp nbsmtp.c || die
 }
diff --git a/net-mail/nmh/files/digest-nmh-1.0.4 b/net-mail/nmh/files/digest-nmh-1.0.4
deleted file mode 100644
index 96f0c1cac86b..000000000000
--- a/net-mail/nmh/files/digest-nmh-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fd0dc5c84f67cfbcdfdc1196a5298e47 nmh-1.0.4.tar.gz 683215
diff --git a/net-mail/nmh/files/digest-nmh-1.0.4-r1 b/net-mail/nmh/files/digest-nmh-1.0.4-r1
deleted file mode 100644
index 96f0c1cac86b..000000000000
--- a/net-mail/nmh/files/digest-nmh-1.0.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fd0dc5c84f67cfbcdfdc1196a5298e47 nmh-1.0.4.tar.gz 683215
diff --git a/net-mail/nmh/nmh-1.0.4-r1.ebuild b/net-mail/nmh/nmh-1.0.4-r1.ebuild
deleted file mode 100644
index 1fba59178351..000000000000
--- a/net-mail/nmh/nmh-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2001-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/nmh/nmh-1.0.4-r1.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="New MH mail reader"
-SRC_URI="ftp://ftp.mhost.com/pub/nmh/${P}.tar.gz"
-HOMEPAGE="http://www.mhost.com/nmh/"
-
-DEPEND="virtual/glibc
-	=sys-libs/db-1.85*
-	>=sys-libs/ncurses-5.2"
-
-src_compile() {
-	# Redifining libdir to be bindir so the support binaries get installed
-	# correctly.  Since no libraries are installed with nmh, this does not
-	# pose a problem at this time.
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-nmh-pop \
-		--sysconfdir=/etc/nmh \
-		--libdir=/usr/bin || die
-	make || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		libdir=${D}/usr/bin \
-		etcdir=${D}/etc/nmh install || die
-	dodoc COMPLETION-TCSH COMPLETION-ZSH TODO FAQ DIFFERENCES \
-		MAIL.FILTERING Changelog*
-}
-
diff --git a/net-mail/nmh/nmh-1.0.4-r2.ebuild b/net-mail/nmh/nmh-1.0.4-r2.ebuild
index e1aa3e7a60de..6fd07b6883d5 100644
--- a/net-mail/nmh/nmh-1.0.4-r2.ebuild
+++ b/net-mail/nmh/nmh-1.0.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2001-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/nmh/nmh-1.0.4-r2.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/nmh/nmh-1.0.4-r2.ebuild,v 1.3 2002/07/17 05:07:50 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="New MH mail reader"
@@ -8,6 +8,8 @@ SRC_URI="ftp://ftp.mhost.com/pub/nmh/${P}.tar.gz"
 HOMEPAGE="http://www.mhost.com/nmh/"
 
 SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86"
 
 DEPEND="virtual/glibc
 	=sys-libs/db-1.85*
@@ -53,6 +55,6 @@ src_install() {
 		libdir=${D}/usr/bin \
 		etcdir=${D}/etc/nmh install || die
 	dodoc COMPLETION-TCSH COMPLETION-ZSH TODO FAQ DIFFERENCES \
-		MAIL.FILTERING Changelog*
+		MAIL.FILTERING Changelog* COPYRIGHT
 }
 
diff --git a/net-mail/nmh/nmh-1.0.4.ebuild b/net-mail/nmh/nmh-1.0.4.ebuild
deleted file mode 100644
index d8242151c7dc..000000000000
--- a/net-mail/nmh/nmh-1.0.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2001-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/nmh/nmh-1.0.4.ebuild,v 1.5 2002/07/11 06:30:47 drobbins Exp $
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="New MH mail reader"
-SRC_URI="ftp://ftp.mhost.com/pub/nmh/${P}.tar.gz"
-HOMEPAGE="http://www.mhost.com/nmh/"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-	# Redifining libdir to be bindir so the support binaries get installed
-	# correctly.  Since no libraries are installed with nmh, this does not
-	# pose a problem at this time.
-
-	econf \
-		--enable-nmh-pop \
-		--sysconfdir=/etc/nmh \
-		--libdir=/usr/bin || die
-
-	make || die
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		libdir=${D}/usr/bin \
-		etcdir=${D}/etc/nmh \
-		install || die
-
-	dodoc COMPLETION-TCSH COMPLETION-ZSH TODO FAQ DIFFERENCES \
-		MAIL.FILTERING Changelog*
-}
diff --git a/net-mail/pine-maildir/pine-maildir-4.33.ebuild b/net-mail/pine-maildir/pine-maildir-4.33.ebuild
index 757d517223e5..9c374fde2f08 100644
--- a/net-mail/pine-maildir/pine-maildir-4.33.ebuild
+++ b/net-mail/pine-maildir/pine-maildir-4.33.ebuild
@@ -1,65 +1,62 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/pine-maildir/pine-maildir-4.33.ebuild,v 1.3 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/pine-maildir/pine-maildir-4.33.ebuild,v 1.4 2002/07/17 05:07:51 seemant Exp $
 
-A="pine4.33.tar.gz pine-maildir-4.33"
 S=${WORKDIR}/pine4.33
 DESCRIPTION="Pine, Pico, Pilot, imapd"
 SRC_URI="ftp://ftp.cac.washington.edu/pine/pine4.33.tar.gz
 	 http://qmail.lightwerk.com/pine-maildir-4.33"
-
 HOMEPAGE="http://www.washington.edu/pine/"
 
 DEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.1
 	>=sys-libs/pam-0.72"
 
+SLOT="0"
+LICENSE="PICO"
+KEYWORDS="x86"
+
 if [ "`use imap`" ] ; then
-  PROVIDE="virtual/imap"
+	PROVIDE="virtual/imap"
 fi
 src_unpack() {
-  unpack pine4.33.tar.gz
-  patch -p0 < ${DISTDIR}/pine-maildir-4.33 
-  patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
-  cd ${S}/pine
-  cp makefile.lnx makefile.orig
-  sed -e "s:-g -DDEBUG:${CFLAGS}:" makefile.orig > makefile.lnx
-
-  cd ${S}/pico
-  cp makefile.lnx makefile.orig
-  sed -e "s:-g -DDEBUG:${CFLAGS}:" makefile.orig > makefile.lnx
-
-  
+	unpack pine4.33.tar.gz
+	patch -p0 < ${DISTDIR}/pine-maildir-4.33 
+	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	cd ${S}/pine
+	cp makefile.lnx makefile.orig
+	sed -e "s:-g -DDEBUG:${CFLAGS}:" makefile.orig > makefile.lnx
+
+	cd ${S}/pico
+	cp makefile.lnx makefile.orig
+	sed -e "s:-g -DDEBUG:${CFLAGS}:" makefile.orig > makefile.lnx
+	
 }
 
-src_compile() {                           
-  try ./build slx
+src_compile() {													 
+	./build slx || die
 }
 
-src_install() {                               
-  cd ${S}
-  into /usr
-  dobin bin/pine bin/pico bin/pilot bin/mtest
-  dosbin bin/imapd
-  if [ "`use imap`" ] ; then
-    insinto /usr/include
-    doins imap/c-client/{mail,imap4r1,rfc822,linkage}.h
-    dolib.a imap/c-client/c-client.a
-  fi
-  doman doc/pico.1 doc/pine.1
-
-  insinto /etc
-  doins doc/mime.types
-  donewins doc/mailcap.unx mailcap
-
-  dodoc CPYRIGHT README* doc/brochure.txt doc/tech-notes.txt
-  docinto imap
-  dodoc imap/docs/*.txt imap/docs/CONFIG imap/docs/FAQ imap/docs/RELNOTES
-  docinto imap/rfc
-  dodoc imap/docs/rfc/*.txt
-  docinto html/tech-notes
-  dodoc doc/tech-notes/*.html
+src_install() {															 
+	cd ${S}
+	into /usr
+	dobin bin/pine bin/pico bin/pilot bin/mtest
+	dosbin bin/imapd
+	if [ "`use imap`" ] ; then
+		insinto /usr/include
+		doins imap/c-client/{mail,imap4r1,rfc822,linkage}.h
+		dolib.a imap/c-client/c-client.a
+	fi
+	doman doc/pico.1 doc/pine.1
+
+	insinto /etc
+	doins doc/mime.types
+	donewins doc/mailcap.unx mailcap
+
+	dodoc CPYRIGHT README* doc/brochure.txt doc/tech-notes.txt
+	docinto imap
+	dodoc imap/docs/*.txt imap/docs/CONFIG imap/docs/FAQ imap/docs/RELNOTES
+	docinto imap/rfc
+	dodoc imap/docs/rfc/*.txt
+	dohtml -r doc
 }
-
-
-
diff --git a/net-mail/pine/files/digest-pine-4.44-r3 b/net-mail/pine/files/digest-pine-4.44-r3
deleted file mode 100644
index d23758358512..000000000000
--- a/net-mail/pine/files/digest-pine-4.44-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bb405bd52b9fd84b9a981626847cc098 pine4.44.tar.gz 3478476
diff --git a/net-mail/pine/pine-4.44-r3.ebuild b/net-mail/pine/pine-4.44-r3.ebuild
deleted file mode 100644
index b12bfd3933a6..000000000000
--- a/net-mail/pine/pine-4.44-r3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/pine/pine-4.44-r3.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
-
-S=${WORKDIR}/${PN}${PV}
-DESCRIPTION="Pine 'a Program for Internet News & Email', email client"
-SRC_URI="ftp://ftp.cac.washington.edu/${PN}/${PN}${PV}.tar.gz"
-HOMEPAGE="http://www.washington.edu/pine/"
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1
-	>=sys-libs/pam-0.72
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )"
-
-if [ "`use imap`" ] ; then
-	PROVIDE="virtual/imapd"
-	PROVIDE="virtual/imapUW"
-fi
-
-src_unpack() {
-	unpack ${A}
-
-	# RH patches, although I've ignored the "RH" patch itself
-	patch -d ${S} -p1 < ${FILESDIR}/pine-4.21-fixhome.patch
-	patch -d ${S} -p0 < ${FILESDIR}/imap-4.7c2-flock.patch
-	cp ${FILESDIR}/flock.c ${S}/imap/src/osdep/unix
-	patch -d ${S} -p1 < ${FILESDIR}/pine-4.21-passwd.patch
-	if [ "`use ldap`" ] ; then
-		patch -d ${S} -p1 < ${FILESDIR}/pine-4.30-ldap.patch
-		mkdir ${S}/ldap
-		ln -s /usr/lib ${S}/ldap/libraries
-		ln -s /usr/include ${S}/ldap/include
-	fi
-	patch -d ${S} -p0 < ${FILESDIR}/pine-4.40-boguswarning.patch
-	patch -d ${S} -p1 < ${FILESDIR}/pine-4.31-segfix.patch
-	patch -d ${S} -p0 < ${FILESDIR}/pine-4.40-lockfile-perm.patch
-	patch -d ${S} -p1 < ${FILESDIR}/imap-2000-time.patch
-	patch -d ${S} -p1 < ${FILESDIR}/pine-4.33-whitespace.patch
-	patch -d ${S} -p1 < ${FILESDIR}/pine-4.44-multibyte.patch
-	
-	cd ${S}/pine
-	cp makefile.lnx makefile.orig
-	sed -e "s:-g -DDEBUG:${CFLAGS}:" makefile.orig > makefile.lnx
-
-	cd ${S}/pico
-	cp makefile.lnx makefile.orig
-	sed -e "s:-g -DDEBUG:${CFLAGS}:" makefile.orig > makefile.lnx
-}
-
-src_compile() {                           
-	BUILDOPTS=""
-	if [ "`use ssl`" ] 
-	then
-		BUILDOPTS="${BUILDOPTS} SSLDIR=/usr/ssl SSLINCLUDE=/usr/include/openssl"
-		BUILDOPTS="${BUILDOPTS} SSLLIB=/usr/lib SSLTYPE=unix"
-	else
-		BUILDOPTS="${BUILDOPTS} NOSSL"
-	fi
-	if [ "`use ldap`" ]
-	then
-		./contrib/ldap-setup lnp lnp
-	else
-		BUILDOPTS="${BUILDOPTS} NOLDAP"
-	fi
-		
-	./build ${BUILDOPTS} lnp || die
-}
-
-src_install() {                               
-	into /usr
-	dobin bin/pine bin/pico bin/pilot bin/mtest bin/rpdump bin/rpload
-	dosbin bin/imapd
-
-	if [ "`use imap`" ] ; then
-		insinto /usr/include
-		doins imap/c-client/{mail,imap4r1,rfc822,linkage}.h
-		dolib.a imap/c-client/c-client.a
-		dosym /usr/lib/c-client.a /usr/lib/libc-client.a
-	fi
-
-	doman doc/pico.1 doc/pine.1 doc/pine.1 doc/pilot.1 doc/rpdump.1 doc/rpload.1
-
-	insinto /etc
-	doins doc/mime.types
-	donewins doc/mailcap.unx mailcap
-
-	dodoc CPYRIGHT README doc/brochure.txt doc/tech-notes.txt
-
-	docinto imap
-	dodoc imap/docs/*.txt imap/docs/CONFIG imap/docs/FAQ imap/docs/RELNOTES
-
-	docinto imap/rfc
-	dodoc imap/docs/rfc/*.txt
-
-	docinto html/tech-notes
-	dodoc doc/tech-notes/*.html
-}
-
-
-
-
diff --git a/net-mail/pine/pine-4.44-r4.ebuild b/net-mail/pine/pine-4.44-r4.ebuild
index 2298e188d5e0..43eff811cd76 100644
--- a/net-mail/pine/pine-4.44-r4.ebuild
+++ b/net-mail/pine/pine-4.44-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/pine/pine-4.44-r4.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/pine/pine-4.44-r4.ebuild,v 1.3 2002/07/17 05:07:50 seemant Exp $
 
 S=${WORKDIR}/${PN}${PV}
 DESCRIPTION="A tool for reading, sending and managing electronic messages."
@@ -13,6 +13,11 @@ DEPEND="virtual/glibc
 	ssl? ( dev-libs/openssl )
 	ldap? ( net-nds/openldap )"
 
+SLOT="0"
+LICENSE="PICO"
+KEYWORDS="x86"
+
+
 src_unpack() {
 	unpack ${A}
 
diff --git a/net-mail/pop3vscan/pop3vscan-0.4.ebuild b/net-mail/pop3vscan/pop3vscan-0.4.ebuild
index 684276c990d7..18c95fa02bba 100644
--- a/net-mail/pop3vscan/pop3vscan-0.4.ebuild
+++ b/net-mail/pop3vscan/pop3vscan-0.4.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/pop3vscan/pop3vscan-0.4.ebuild,v 1.2 2002/07/10 21:32:18 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/pop3vscan/pop3vscan-0.4.ebuild,v 1.3 2002/07/17 05:07:51 seemant Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="A transparent POP3-Proxy with virus-scanning capabilities."
 SRC_URI="mirror://sourceforge/pop3vscan/${P}.tar.gz"
 HOMEPAGE="pop3vscan.sf.net"
-LICENSE="GPL-2"
+
 DEPEND="net-mail/ripmime"
-RDEPEND="${DEPEND}
-		sys-apps/iptables"
+RDEPEND="sys-apps/iptables"
+
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_compile() {
 	make || die
diff --git a/net-mail/postfix/files/digest-postfix-1.1.11 b/net-mail/postfix/files/digest-postfix-1.1.11
deleted file mode 100644
index 6ad541484afc..000000000000
--- a/net-mail/postfix/files/digest-postfix-1.1.11
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b34bb2b5018327c19456a77814141208 postfix-1.1.11.tar.gz 1190741
-MD5 82fc61f233f5edcece3baa749e53677d pfixtls-0.8.11a-1.1.11-0.9.6d.tar.gz 196051
diff --git a/net-mail/postfix/files/digest-postfix-1.1.11-r1 b/net-mail/postfix/files/digest-postfix-1.1.11-r1
deleted file mode 100644
index 6ad541484afc..000000000000
--- a/net-mail/postfix/files/digest-postfix-1.1.11-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b34bb2b5018327c19456a77814141208 postfix-1.1.11.tar.gz 1190741
-MD5 82fc61f233f5edcece3baa749e53677d pfixtls-0.8.11a-1.1.11-0.9.6d.tar.gz 196051
diff --git a/net-mail/postfix/files/digest-postfix-1.1.11-r2 b/net-mail/postfix/files/digest-postfix-1.1.11-r2
deleted file mode 100644
index 6ad541484afc..000000000000
--- a/net-mail/postfix/files/digest-postfix-1.1.11-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b34bb2b5018327c19456a77814141208 postfix-1.1.11.tar.gz 1190741
-MD5 82fc61f233f5edcece3baa749e53677d pfixtls-0.8.11a-1.1.11-0.9.6d.tar.gz 196051
diff --git a/net-mail/postfix/files/digest-postfix-1.1.7-r4 b/net-mail/postfix/files/digest-postfix-1.1.7-r4
deleted file mode 100644
index 9d34ea6d05c2..000000000000
--- a/net-mail/postfix/files/digest-postfix-1.1.7-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 320ea040f13c084a5e8bea680b422e06 postfix-1.1.7.tar.gz 1186995
-MD5 a00656e4e7fd1e4827c3e805799d2359 pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz 195132
diff --git a/net-mail/postfix/postfix-1.1.11-r1.ebuild b/net-mail/postfix/postfix-1.1.11-r1.ebuild
deleted file mode 100644
index 7dba8d6131c0..000000000000
--- a/net-mail/postfix/postfix-1.1.11-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# /space/gentoo/cvsroot/gentoo-x86/net-mail/postfix/postfix-1.1.8.ebuild,v 1.1 2002/05/14 03:49:25 woodchip Exp
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="*"
-
-POSTFIX_TLS_VER="0.8.11a-${PV}-0.9.6d"
-
-S=${WORKDIR}/${P}
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/pfixtls-${POSTFIX_TLS_VER}.tar.gz )"
-
-PROVIDE="virtual/mta"
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	sasl? ( >=dev-libs/cyrus-sasl-1.5.27 )
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( >=dev-db/mysql-3.23.28 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )"
-RDEPEND="${DEPEND} 
-	>=net-mail/mailbase-0.00
-	!virtual/mta"
-
-pkg_setup() {
-	if ! grep -q ^postdrop: /etc/group ; then
-		groupadd postdrop || die "problem adding group postdrop"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	use ssl && ( \
-		cd ${S}
-		patch -p1 < ${WORKDIR}/pfixtls-${POSTFIX_TLS_VER}/pfixtls.diff || die
-	)
-
-	cd ${S}/conf
-	cp main.cf main.cf.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf.orig > main.cf
-
-	cd ${S}/src/global
-	cp mail_params.h mail_params.h.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" mail_params.h.orig > mail_params.h
-
-	use mysql \
-		&& CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql" \
-		&& AUXLIBS="${AUXLIBS} -lmysqlclient -lm"
-
-	use ldap \
-		&& CCARGS="${CCARGS} -DHAS_LDAP" \
-		&& AUXLIBS="${AUXLIBS} -lldap -llber"
-
-	use ssl \
-		&& CCARGS="${CCARGS} -DHAS_SSL" \
-		&& AUXLIBS="${AUXLIBS} -lssl"
-
-	# note: if sasl is built w/ pam, then postfix _MUST_ be built w/ pam
-	use pam && AUXLIBS="${AUXLIBS} -lpam"
-
-	# stuff we always want...
-	CCARGS="${CCARGS} -I/usr/include -DHAS_PCRE"
-	AUXLIBS="${AUXLIBS} -L/usr/lib -lpcre -ldl -lcrypt"
-	if [ "`use sasl`" ]
-	then
-		AUXLIBS="${AUXLIBS} -lsasl"
-		CCARGS="${CCARGS} -DUSE_SASL_AUTH"
-	fi
-	DEBUG=""
-
-	cd ${S}
-	make tidy || die
-	make makefiles CC="cc" OPT="${CFLAGS}" DEBUG="${DEBUG}" \
-		CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" || die
-}
-
-src_compile() {
-	emake || die "compile problem"
-}
-
-src_install () {
-	dodir /usr/bin /usr/sbin /usr/lib/postfix /etc/postfix/sample
-
-	cd ${S}/bin
-	dosbin post* sendmail
-	chown root.postdrop ${D}/usr/sbin/{postdrop,postqueue}
-	chmod 2755 ${D}/usr/sbin/{postdrop,postqueue}
-
-	dosym /usr/sbin/sendmail /usr/bin/mail
-	dosym /usr/sbin/sendmail /usr/bin/mailq
-	dosym /usr/sbin/sendmail /usr/bin/newaliases
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	cd ${S}/libexec
-	exeinto /usr/lib/postfix
-	doexe *
-
-	cd ${S}/man
-	doman man*/*
-
-	cd ${S}
-	dodoc *README COMPATIBILITY HISTORY LICENSE PORTING RELEASE_NOTES INSTALL
-	dohtml html/*
-
-	cd ${S}/conf
-	insinto /etc/postfix/sample
-	doins access aliases canonical relocated transport \
-		pcre_table regexp_table postfix-script* *.cf
-
-	exeinto /etc/postfix
-	doexe postfix-script post-install postfix-files || die
-
-	insinto /etc/postfix
-	doins ${FILESDIR}/main.cf master.cf || die
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/postfix.rc6 postfix
-	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
-	insinto /etc/sasl ; doins ${FILESDIR}/smtpd.conf
-}
-
-pkg_postinst() {
-	install -d 0755 ${ROOT}/var/spool/postfix
-
-	ewarn "If you've upgraded from <postfix-1.1.8, you must update"
-	ewarn "/etc/postfix/master.cf to the latest version"
-	ewarn "(/etc/postfix/._cfg*_master.cf). Otherwise Postfix will"
-	ewarn "not work correctly."
-
-	if [ ! -e /etc/mail/aliases.db ] ; then
-		ewarn ""
-		ewarn "First time installers: You must edit"
-		ewarn "/etc/mail/aliases to suit your needs and then run"
-		ewarn "/usr/bin/aliases. Postfix will not work correctly"
-		ewarn "without it."
-	fi
-}
diff --git a/net-mail/postfix/postfix-1.1.11-r2.ebuild b/net-mail/postfix/postfix-1.1.11-r2.ebuild
deleted file mode 100644
index 0fd6a94519f8..000000000000
--- a/net-mail/postfix/postfix-1.1.11-r2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# /space/gentoo/cvsroot/gentoo-x86/net-mail/postfix/postfix-1.1.8.ebuild,v 1.1 2002/05/14 03:49:25 woodchip Exp
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="*"
-
-POSTFIX_TLS_VER="0.8.11a-${PV}-0.9.6d"
-
-S=${WORKDIR}/${P}
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/pfixtls-${POSTFIX_TLS_VER}.tar.gz )"
-
-PROVIDE="virtual/mta"
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	>=dev-libs/cyrus-sasl-2.1.5
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( >=dev-db/mysql-3.23.28 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )"
-RDEPEND="${DEPEND} 
-	>=net-mail/mailbase-0.00
-	!virtual/mta"
-
-pkg_setup() {
-	if ! grep -q ^postdrop: /etc/group ; then
-		groupadd postdrop || die "problem adding group postdrop"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	use ssl && ( \
-		cd ${S}
-		patch -p1 < ${WORKDIR}/pfixtls-${POSTFIX_TLS_VER}/pfixtls.diff || die
-	)
-
-	cd ${S}/conf
-	cp main.cf main.cf.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf.orig > main.cf
-
-	cd ${S}/src/global
-	cp mail_params.h mail_params.h.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" mail_params.h.orig > mail_params.h
-
-	use mysql \
-		&& CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql" \
-		&& AUXLIBS="${AUXLIBS} -lmysqlclient -lm"
-
-	use ldap \
-		&& CCARGS="${CCARGS} -DHAS_LDAP" \
-		&& AUXLIBS="${AUXLIBS} -lldap -llber"
-
-	use ssl \
-		&& CCARGS="${CCARGS} -DHAS_SSL" \
-		&& AUXLIBS="${AUXLIBS} -lssl"
-
-	# note: if sasl is built w/ pam, then postfix _MUST_ be built w/ pam
-	use pam && AUXLIBS="${AUXLIBS} -lpam"
-
-	# stuff we always want...
-	CCARGS="${CCARGS} -I/usr/include -DHAS_PCRE"
-	AUXLIBS="${AUXLIBS} -L/usr/lib -lpcre -ldl -lcrypt"
-
-	# sasl v1
-	#if [ "`use sasl`" ]
-	#then
-	#	AUXLIBS="${AUXLIBS} -lsasl"
-	#	CCARGS="${CCARGS} -DUSE_SASL_AUTH"
-	#fi
-
-	# sasl v2
-	cd ${S}
-	patch -p1 < ${FILESDIR}/postfix-1.1.11-saslv2.diff || die
-
-	DEBUG=""
-
-	cd ${S}
-	make tidy || die
-	make makefiles CC="cc" OPT="${CFLAGS}" DEBUG="${DEBUG}" \
-		CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" || die
-}
-
-src_compile() {
-	emake || die "compile problem"
-}
-
-src_install () {
-	dodir /usr/bin /usr/sbin /usr/lib/postfix /etc/postfix/sample
-
-	cd ${S}/bin
-	dosbin post* sendmail
-	chown root.postdrop ${D}/usr/sbin/{postdrop,postqueue}
-	chmod 2755 ${D}/usr/sbin/{postdrop,postqueue}
-
-	dosym /usr/sbin/sendmail /usr/bin/mail
-	dosym /usr/sbin/sendmail /usr/bin/mailq
-	dosym /usr/sbin/sendmail /usr/bin/newaliases
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	cd ${S}/libexec
-	exeinto /usr/lib/postfix
-	doexe *
-
-	cd ${S}/man
-	doman man*/*
-
-	cd ${S}
-	dodoc *README COMPATIBILITY HISTORY LICENSE PORTING RELEASE_NOTES INSTALL
-	dohtml html/*
-
-	cd ${S}/conf
-	insinto /etc/postfix/sample
-	doins access aliases canonical relocated transport \
-		pcre_table regexp_table postfix-script* *.cf
-
-	exeinto /etc/postfix
-	doexe postfix-script post-install postfix-files || die
-
-	insinto /etc/postfix
-	doins ${FILESDIR}/main.cf master.cf || die
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/postfix.rc6 postfix
-	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
-	insinto /etc/sasl ; doins ${FILESDIR}/smtpd.conf
-}
-
-pkg_postinst() {
-	install -d 0755 ${ROOT}/var/spool/postfix
-
-	ewarn "If you've upgraded from <postfix-1.1.8, you must update"
-	ewarn "/etc/postfix/master.cf to the latest version"
-	ewarn "(/etc/postfix/._cfg*_master.cf). Otherwise Postfix will"
-	ewarn "not work correctly."
-
-	if [ ! -e /etc/mail/aliases.db ] ; then
-		ewarn ""
-		ewarn "First time installers: You must edit"
-		ewarn "/etc/mail/aliases to suit your needs and then run"
-		ewarn "/usr/bin/aliases. Postfix will not work correctly"
-		ewarn "without it."
-	fi
-}
diff --git a/net-mail/postfix/postfix-1.1.11-r3.ebuild b/net-mail/postfix/postfix-1.1.11-r3.ebuild
index 7651b3f40dd3..14d9d853b559 100644
--- a/net-mail/postfix/postfix-1.1.11-r3.ebuild
+++ b/net-mail/postfix/postfix-1.1.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-1.1.11-r3.ebuild,v 1.1 2002/07/13 20:17:14 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-1.1.11-r3.ebuild,v 1.2 2002/07/17 05:07:51 seemant Exp $
 
 DESCRIPTION="A fast and secure drop-in replacement for sendmail"
 HOMEPAGE="http://www.postfix.org/"
@@ -21,8 +21,10 @@ DEPEND=">=sys-libs/db-3.2
 RDEPEND="${DEPEND} 
 	>=net-mail/mailbase-0.00
 	!virtual/mta"
-LICENSE="IPL-1"
+
 SLOT="0"
+LICENSE="IPL-1"
+KEYWORDS="x86"
 
 pkg_setup() {
 	if ! grep -q ^postdrop: /etc/group ; then
diff --git a/net-mail/postfix/postfix-1.1.11.ebuild b/net-mail/postfix/postfix-1.1.11.ebuild
deleted file mode 100644
index 1517dcf165f9..000000000000
--- a/net-mail/postfix/postfix-1.1.11.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# /space/gentoo/cvsroot/gentoo-x86/net-mail/postfix/postfix-1.1.8.ebuild,v 1.1 2002/05/14 03:49:25 woodchip Exp
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="*"
-
-POSTFIX_TLS_VER="0.8.11a-${PV}-0.9.6d"
-
-S=${WORKDIR}/${P}
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/pfixtls-${POSTFIX_TLS_VER}.tar.gz )"
-
-PROVIDE="virtual/mta"
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	sasl? ( >=dev-libs/cyrus-sasl-1.5.27 )
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( >=dev-db/mysql-3.23.28 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )"
-RDEPEND="${DEPEND} 
-	>=net-mail/mailbase-0.00
-	!virtual/mta"
-
-pkg_setup() {
-	if ! grep -q ^postdrop: /etc/group ; then
-		groupadd postdrop || die "problem adding group postdrop"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	use ssl && ( \
-		cd ${S}
-		patch -p1 < ${WORKDIR}/pfixtls-${POSTFIX_TLS_VER}/pfixtls.diff || die
-	)
-
-	cd ${S}/conf
-	cp main.cf main.cf.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf.orig > main.cf
-
-	cd ${S}/src/global
-	cp mail_params.h mail_params.h.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" mail_params.h.orig > mail_params.h
-
-	use mysql \
-		&& CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql" \
-		&& AUXLIBS="${AUXLIBS} -lmysqlclient -lm"
-
-	use ldap \
-		&& CCARGS="${CCARGS} -DHAS_LDAP" \
-		&& AUXLIBS="${AUXLIBS} -lldap -llber"
-
-	use ssl \
-		&& CCARGS="${CCARGS} -DHAS_SSL" \
-		&& AUXLIBS="${AUXLIBS} -lssl"
-
-	# note: if sasl is built w/ pam, then postfix _MUST_ be built w/ pam
-	use pam && AUXLIBS="${AUXLIBS} -lpam"
-
-	# stuff we always want...
-	CCARGS="${CCARGS} -I/usr/include -DHAS_PCRE"
-	AUXLIBS="${AUXLIBS} -L/usr/lib -lpcre -ldl -lcrypt"
-	if [ "`use sasl`" ]
-	then
-		AUXLIBS="${AUXLIBS} -lsasl"
-		CCARGS="${CCARGS} -DUSE_SASL_AUTH"
-	fi
-	DEBUG=""
-
-	cd ${S}
-	make tidy || die
-	make makefiles CC="cc" OPT="${CFLAGS}" DEBUG="${DEBUG}" \
-		CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" || die
-}
-
-src_compile() {
-	emake || die "compile problem"
-}
-
-src_install () {
-	dodir /usr/bin /usr/sbin /usr/lib/postfix /etc/postfix/sample
-
-	cd ${S}/bin
-	dosbin post* sendmail
-	chown root.postdrop ${D}/usr/sbin/{postdrop,postqueue}
-	chmod 2755 ${D}/usr/sbin/{postdrop,postqueue}
-
-	dosym /usr/sbin/sendmail /usr/bin/mail
-	dosym /usr/sbin/sendmail /usr/bin/mailq
-	dosym /usr/sbin/sendmail /usr/bin/newaliases
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	cd ${S}/libexec
-	exeinto /usr/lib/postfix
-	doexe *
-
-	cd ${S}/man
-	doman man*/*
-
-	cd ${S}
-	dodoc *README COMPATIBILITY HISTORY LICENSE PORTING RELEASE_NOTES INSTALL
-	dohtml html/*
-
-	cd ${S}/conf
-	insinto /etc/postfix/sample
-	doins access aliases canonical relocated transport \
-		pcre_table regexp_table postfix-script* *.cf
-
-	exeinto /etc/postfix
-	doexe postfix-script post-install postfix-files || die
-
-	insinto /etc/postfix
-	doins ${FILESDIR}/main.cf master.cf || die
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/postfix.rc6 postfix
-	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
-	insinto /etc/sasl ; doins ${FILESDIR}/smtpd.conf
-}
-
-pkg_postinst() {
-	install -d 0755 ${ROOT}/var/spool/postfix
-
-	einfo "***************************************************************"
-	einfo "* NOTE: If config file protection is enabled and you upgraded *"
-	einfo "*       from an earlier version of postfix you must update    *"
-	einfo "*       /etc/postfix/master.cf to the latest version	     *"
-	einfo "*       (/etc/postfix/._cfg????_master.cf). Otherwise postfix *"
-	einfo "*       will not work correctly.                              *"
-	einfo "***************************************************************"
-}
diff --git a/net-mail/postfix/postfix-1.1.7-r4.ebuild b/net-mail/postfix/postfix-1.1.7-r4.ebuild
deleted file mode 100644
index d0d3801cd919..000000000000
--- a/net-mail/postfix/postfix-1.1.7-r4.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-1.1.7-r4.ebuild,v 1.1 2002/05/04 03:55:29 woodchip Exp $
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-
-POSTFIX_TLS_VER="0.8.7-${PV}-0.9.6c"
-
-S=${WORKDIR}/${P}
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/pfixtls-${POSTFIX_TLS_VER}.tar.gz )"
-
-PROVIDE="virtual/mta"
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	>=dev-libs/cyrus-sasl-1.5.27
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( >=dev-db/mysql-3.23.28 )
-	ssl? ( >=dev-libs/openssl-0.9.6c )"
-
-RDEPEND="${DEPEND} 
-	>=net-mail/mailbase-0.00
-	!virtual/mta"
-LICENSE="IPL-1"
-SLOT="0"
-
-pkg_setup() {
-	if ! grep -q ^postdrop: /etc/group ; then
-		groupadd postdrop || die "problem adding group postdrop"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	use ssl && ( \
-		cd ${S}
-		patch -p1 < ${WORKDIR}/pfixtls-${POSTFIX_TLS_VER}/pfixtls.diff || die
-	)
-
-	cd ${S}/conf
-	cp main.cf main.cf.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf.orig > main.cf
-
-	cd ${S}/src/global
-	cp mail_params.h mail_params.h.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" mail_params.h.orig > mail_params.h
-
-	use mysql \
-		&& CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql" \
-		&& AUXLIBS="${AUXLIBS} -lmysqlclient -lm"
-
-	use ldap \
-		&& CCARGS="${CCARGS} -DHAS_LDAP" \
-		&& AUXLIBS="${AUXLIBS} -lldap -llber"
-
-	use ssl \
-		&& CCARGS="${CCARGS} -DHAS_SSL" \
-		&& AUXLIBS="${AUXLIBS} -lssl"
-
-	# note: if sasl is built w/ pam, then postfix _MUST_ be built w/ pam
-	use pam \
-		&& AUXLIBS="${AUXLIBS} -lpam"
-
-	# stuff we always want...
-	CCARGS="${CCARGS} -I/usr/include -DHAS_PCRE -DUSE_SASL_AUTH"
-	AUXLIBS="${AUXLIBS} -L/usr/lib -lpcre -lsasl -ldl -lcrypt"
-	DEBUG=""
-
-	cd ${S}
-	make tidy || die
-	make makefiles CC="cc" OPT="${CFLAGS}" DEBUG="${DEBUG}" \
-		CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" || die
-}
-
-src_compile() {
-	emake || die "compile problem"
-}
-
-src_install () {
-	dodir /usr/bin /usr/sbin /usr/lib/postfix /etc/postfix/sample
-
-	cd ${S}/bin
-	dosbin post* sendmail
-	chown root.postdrop ${D}/usr/sbin/{postdrop,postqueue}
-	chmod 2755 ${D}/usr/sbin/{postdrop,postqueue}
-
-	dosym /usr/sbin/sendmail /usr/bin/mail
-	dosym /usr/sbin/sendmail /usr/bin/mailq
-	dosym /usr/sbin/sendmail /usr/bin/newaliases
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	cd ${S}/libexec
-	exeinto /usr/lib/postfix
-	doexe *
-
-	cd ${S}/man
-	doman man*/*
-
-	cd ${S}
-	dodoc *README COMPATIBILITY HISTORY LICENSE PORTING RELEASE_NOTES INSTALL
-	dohtml html/*
-
-	cd ${S}/conf
-	insinto /etc/postfix/sample
-	doins access aliases canonical relocated transport \
-		pcre_table regexp_table postfix-script* *.cf
-
-	exeinto /etc/postfix
-	doexe postfix-script post-install postfix-files || die
-
-	insinto /etc/postfix
-	doins ${FILESDIR}/main.cf master.cf || die
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/postfix.rc6 postfix
-	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
-	insinto /etc/sasl ; doins ${FILESDIR}/smtpd.conf
-}
-
-pkg_postinst() {
-	install -d 0755 ${ROOT}/var/spool/postfix
-
-	einfo "***************************************************************"
-	einfo "* NOTE: If config file protection is enabled and you upgraded *"
-	einfo "*       from an earlier version of postfix you must update    *"
-	einfo "*       /etc/postfix/master.cf to the latest version	     *"
-	einfo "*       (/etc/postfix/._cfg????_master.cf). Otherwise postfix *"
-	einfo "*       will not work correctly. 			     *"
-	einfo "***************************************************************"
-}
diff --git a/net-mail/postfix/postfix-1.1.8.ebuild b/net-mail/postfix/postfix-1.1.8.ebuild
index e3d1e5b095b2..b47c5614def4 100644
--- a/net-mail/postfix/postfix-1.1.8.ebuild
+++ b/net-mail/postfix/postfix-1.1.8.ebuild
@@ -21,8 +21,10 @@ DEPEND=">=sys-libs/db-3.2
 RDEPEND="${DEPEND} 
 	>=net-mail/mailbase-0.00
 	!virtual/mta"
-LICENSE="IPL-1"
+
 SLOT="0"
+LICENSE="IPL-1"
+KEYWORDS="x86"
 
 pkg_setup() {
 	if ! grep -q ^postdrop: /etc/group ; then
diff --git a/net-mail/procmail/files/digest-procmail-3.22-r1 b/net-mail/procmail/files/digest-procmail-3.22-r1
deleted file mode 100644
index d14b9662a1d7..000000000000
--- a/net-mail/procmail/files/digest-procmail-3.22-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1678ea99b973eb77eda4ecf6acae53f1 procmail-3.22.tar.gz 226817
diff --git a/net-mail/procmail/procmail-3.22-r1.ebuild b/net-mail/procmail/procmail-3.22-r1.ebuild
deleted file mode 100644
index 88b3e4bfaf15..000000000000
--- a/net-mail/procmail/procmail-3.22-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Modified by $HOME/.maildir by Craig Joly <craig@taipan.mudshark.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/procmail-3.22-r1.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Mail delivery agent/filter"
-SRC_URI="http://www.procmail.org/${P}.tar.gz"
-HOMEPAGE="http://www.procmail.org/"
-
-DEPEND="virtual/glibc
-        virtual/mta"
-
-src_compile() {
-
-    cp Makefile Makefile.orig
-    sed -e "s:CFLAGS0 = -O:CFLAGS0 = ${CFLAGS}:" \
-        -e "s:LOCKINGTEST=__defaults__:#LOCKINGTEST=__defaults__:" \
-        -e "s:#LOCKINGTEST=/tmp:LOCKINGTEST=/tmp:" Makefile.orig > Makefile
-
-    if [ -z "`use mbox`" ];
-    then
-	cd ${S}/src
-	cp authenticate.c authenticate.c.orig
-	sed -e "s:/\*#define MAILSPOOLHOME \"/.mail\":#define MAILSPOOLHOME \"/.maildir/\":" authenticate.c.orig > authenticate.c
-	cd ${S}
-    fi
-
-    emake || die
-}
-
-src_install () {
-    cd ${S}/new
-    insinto /usr/bin
-    insopts -m 6755
-    doins procmail
-
-    insopts -m 2755
-    doins lockfile
-
-    dobin formail mailstat
-
-    doman *.1 *.5
-
-    cd ${S}
-    dodoc Artistic COPYING FAQ FEATURES HISTORY INSTALL KNOWN_BUGS README
-
-	docinto examples
-	dodoc examples/*
-}
-
diff --git a/net-mail/procmail/procmail-3.22-r2.ebuild b/net-mail/procmail/procmail-3.22-r2.ebuild
index 4cf63eeeab18..dce4265f2a8a 100644
--- a/net-mail/procmail/procmail-3.22-r2.ebuild
+++ b/net-mail/procmail/procmail-3.22-r2.ebuild
@@ -1,7 +1,6 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Modified by $HOME/.maildir by Craig Joly <craig@taipan.mudshark.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/procmail-3.22-r2.ebuild,v 1.3 2002/07/16 14:12:56 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/procmail-3.22-r2.ebuild,v 1.4 2002/07/17 05:07:51 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Mail delivery agent/filter"
@@ -11,6 +10,10 @@ HOMEPAGE="http://www.procmail.org/"
 DEPEND="virtual/glibc
         virtual/mta"
 
+SLOT="0"
+LICENSE="Artistic | GPL"
+KEYWORDS="x86"
+
 src_compile() {
 
     cp Makefile Makefile.orig
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-0.95.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-0.95.ebuild
index 79c667b04b90..5fb19588822d 100644
--- a/net-mail/qmail-autoresponder/qmail-autoresponder-0.95.ebuild
+++ b/net-mail/qmail-autoresponder/qmail-autoresponder-0.95.ebuild
@@ -1,17 +1,19 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-autoresponder/qmail-autoresponder-0.95.ebuild,v 1.3 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-autoresponder/qmail-autoresponder-0.95.ebuild,v 1.4 2002/07/17 05:07:51 seemant Exp $
 
 S=${WORKDIR}/${P}
-
-DEPEND="virtual/glibc"
-RDEPEND=">=net-mail/qmail-1.03-r7"
-
 DESCRIPTION="Rate-limited autoresponder for qmail."
 SRC_URI="http://untroubled.org/qmail-autoresponder/${P}.tar.gz"
-
 HOMEPAGE="http://untroubled.org/qmail-autoresponder/"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND="virtual/glibc"
+RDEPEND=">=net-mail/qmail-1.03-r7"
+
 src_compile() {
 	cd ${S}
 	echo "gcc ${CFLAGS}" > conf-cc
@@ -23,6 +25,8 @@ src_install () {
 	exeinto /usr/bin
 	doexe qmail-autoresponder
 	doman qmail-autoresponder.1
+
+	dodoc ANNOUNCEMENT FILES NEWS README TARGETS TODO VERSION
 }
 
 pkg_postinst() {
diff --git a/net-mail/qmail-notify/files/digest-qmail-notify-0.92 b/net-mail/qmail-notify/files/digest-qmail-notify-0.92
deleted file mode 100644
index 633f36b080d8..000000000000
--- a/net-mail/qmail-notify/files/digest-qmail-notify-0.92
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e786c23c0cc79000ad740ba5070fabe0 qmail-notify-0.92.tar.gz 15820
diff --git a/net-mail/qmail-notify/qmail-notify-0.92.ebuild b/net-mail/qmail-notify/qmail-notify-0.92.ebuild
deleted file mode 100644
index bbccc7bbe07f..000000000000
--- a/net-mail/qmail-notify/qmail-notify-0.92.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-notify/qmail-notify-0.92.ebuild,v 1.4 2002/07/11 06:30:47 drobbins Exp $
-
-S=${WORKDIR}/${P}
-
-DEPEND="virtual/glibc"
-
-RDEPEND="virtual/cron
-	net-mail/qmail"
-
-DESCRIPTION="Delayed delivery notification for qmail."
-SRC_URI="http://untroubled.org/qmail-notify/${P}.tar.gz"
-
-HOMEPAGE="http://untroubled.org/qmail-notify/"
-
-src_compile() {
-	cd ${S}
-	echo "gcc ${CFLAGS}" > conf-cc
-	echo "gcc" > conf-ld
-	emake || die
-}
-
-src_install () {
-	exeinto /usr/sbin
-	doexe qmail-notify
-
-	exeinto /etc/cron.hourly
-	doexe ${FILESDIR}/qmail-notify.cron
-
-	dodoc README ANNOUNCEMENT TODO cron.hourly
-}
-
-
-pkg_postinst() {
-
-    echo
-    einfo "Edit qmail-notify.cron in /etc/cron.hourly"
-    einfo "to activate qmail-notify!"
-    echo
-
-
-}
diff --git a/net-mail/qmail-notify/qmail-notify-0.93.ebuild b/net-mail/qmail-notify/qmail-notify-0.93.ebuild
index 69fe3e361bbc..20c324d937f1 100644
--- a/net-mail/qmail-notify/qmail-notify-0.93.ebuild
+++ b/net-mail/qmail-notify/qmail-notify-0.93.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-notify/qmail-notify-0.93.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-notify/qmail-notify-0.93.ebuild,v 1.3 2002/07/17 05:07:51 seemant Exp $
 
 S=${WORKDIR}/${P}
+DESCRIPTION="Delayed delivery notification for qmail."
+SRC_URI="http://untroubled.org/qmail-notify/${P}.tar.gz"
+HOMEPAGE="http://untroubled.org/qmail-notify/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 DEPEND="virtual/glibc"
 
 RDEPEND="virtual/cron
 	net-mail/qmail"
 
-DESCRIPTION="Delayed delivery notification for qmail."
-SRC_URI="http://untroubled.org/qmail-notify/${P}.tar.gz"
-
-HOMEPAGE="http://untroubled.org/qmail-notify/"
-LICENSE="GPL-2"
-
 src_compile() {
 	cd ${S}
 	echo "gcc ${CFLAGS}" > conf-cc
diff --git a/net-mail/qmail-pop3d/qmail-pop3d-1.03-r1.ebuild b/net-mail/qmail-pop3d/qmail-pop3d-1.03-r1.ebuild
index 7eb774042de8..c3600bfa1ca5 100644
--- a/net-mail/qmail-pop3d/qmail-pop3d-1.03-r1.ebuild
+++ b/net-mail/qmail-pop3d/qmail-pop3d-1.03-r1.ebuild
@@ -1,13 +1,16 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-pop3d/qmail-pop3d-1.03-r1.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-pop3d/qmail-pop3d-1.03-r1.ebuild,v 1.3 2002/07/17 05:07:51 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Pop3 configuration for qmail which used the maildirs of the users"
 HOMEPAGE="http://www.qmail.org"
-
 SRC_URI=""
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND=">=net-mail/qmail-1.03-r6"
 
 src_unpack() {
diff --git a/net-mail/qmail-scanner/qmail-scanner-1.12-r1.ebuild b/net-mail/qmail-scanner/qmail-scanner-1.12-r1.ebuild
index 0c4cf6b21e9c..e8b98ca63c4e 100644
--- a/net-mail/qmail-scanner/qmail-scanner-1.12-r1.ebuild
+++ b/net-mail/qmail-scanner/qmail-scanner-1.12-r1.ebuild
@@ -1,9 +1,13 @@
 # Copyright 1999-2002 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.12-r1.ebuild,v 1.1 2002/06/12 21:26:00 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-scanner/qmail-scanner-1.12-r1.ebuild,v 1.2 2002/07/17 05:07:51 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="E-Mail virus scanner for qmail."
 HOMEPAGE="http://qmail-scanner.sourceforge.net"
+SRC_URI="http://dl.sourceforge.net/qmail-scanner/${P}.tgz"
+
+
 DEPEND=">=sys-devel/perl-5.6.1-r1
         >=dev-perl/Time-HiRes-01.20
         >=net-mail/tnef-1.1.1
@@ -13,11 +17,9 @@ DEPEND=">=sys-devel/perl-5.6.1-r1
         >=net-mail/qmail-1.03-r8
 		>=app-arch/unzip-5.42-r1"
 
-#RDEPEND=""
-
-SRC_URI="http://dl.sourceforge.net/qmail-scanner/${P}.tgz"
-
-S=${WORKDIR}/${P}
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86"
 
 src_compile () {
     yes | PATH=${PATH}:/opt/f-prot ./configure \
diff --git a/net-mail/qmail-sumo/qmail-sumo-1.03-r7.ebuild b/net-mail/qmail-sumo/qmail-sumo-1.03-r7.ebuild
index 1f765617c722..ce00f368b406 100644
--- a/net-mail/qmail-sumo/qmail-sumo-1.03-r7.ebuild
+++ b/net-mail/qmail-sumo/qmail-sumo-1.03-r7.ebuild
@@ -1,10 +1,15 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-sumo/qmail-sumo-1.03-r7.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-sumo/qmail-sumo-1.03-r7.ebuild,v 1.3 2002/07/17 05:07:51 seemant Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Qmail - merge this package to merge all qmail packages"
 HOMEPAGE="http://www.qmail.org/"
+SRC_URI=""
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 RDEPEND=">=net-mail/qmail-1.03-r6
 	>=net-mail/qmail-pop3d-1.03-r1
diff --git a/net-mail/qmail-vmailmgr/qmail-vmailmgr-0.0.1-r1.ebuild b/net-mail/qmail-vmailmgr/qmail-vmailmgr-0.0.1-r1.ebuild
index 04bc5f8f03f7..478709f56419 100644
--- a/net-mail/qmail-vmailmgr/qmail-vmailmgr-0.0.1-r1.ebuild
+++ b/net-mail/qmail-vmailmgr/qmail-vmailmgr-0.0.1-r1.ebuild
@@ -1,10 +1,15 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-vmailmgr/qmail-vmailmgr-0.0.1-r1.ebuild,v 1.3 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-vmailmgr/qmail-vmailmgr-0.0.1-r1.ebuild,v 1.4 2002/07/17 05:07:51 seemant Exp $
 
 S=${WORKDIR}
 DESCRIPTION="qmail with vmailmgr - a fullfletched virtual domains hosting enviroment"
 HOMEPAGE="http://vmailmgr.org"
+SRC_URI=""
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 RDEPEND=">=net-mail/qmail-1.03-r7
 >=net-mail/vmailmgr-0.96.9-r1
diff --git a/net-mail/qmailanalog/qmailanalog-0.70.ebuild b/net-mail/qmailanalog/qmailanalog-0.70.ebuild
index 805cd01f3688..0f0814c875e2 100644
--- a/net-mail/qmailanalog/qmailanalog-0.70.ebuild
+++ b/net-mail/qmailanalog/qmailanalog-0.70.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailanalog/qmailanalog-0.70.ebuild,v 1.3 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailanalog/qmailanalog-0.70.ebuild,v 1.4 2002/07/17 05:07:51 seemant Exp $
 
 S=${WORKDIR}/${P}
-
 DESCRIPTION="collection of tools to help you analyze qmail's activity record."
 SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
 HOMEPAGE="http://cr.yp.to/qmailanalog.html"
+
+SLOT="0"
 LICENSE="as-is"
+KEYWORDS="x86"
 
-DEPEND="virtual/glibc
-		sys-apps/groff"
+DEPEND="sys-apps/groff"
 
 src_compile() {
 	echo "/var/qmail" > conf-home