repoman'd

37 files changed, 100 insertions, 650 deletions

diff --git a/net-mail/randomsig/randomsig-1.10.0.ebuild b/net-mail/randomsig/randomsig-1.10.0.ebuild
index 9a162d9a040e..d244be99f7ab 100644
--- a/net-mail/randomsig/randomsig-1.10.0.ebuild
+++ b/net-mail/randomsig/randomsig-1.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# /space/gentoo/cvsroot/gentoo-x86/skel.ebuild,v 1.7 2002/05/18 17:25:12 agenkin Exp
+# $Header: /var/cvsroot/gentoo-x86/net-mail/randomsig/randomsig-1.10.0.ebuild,v 1.2 2002/07/17 05:26:36 seemant Exp $
 
 MY_P=${PN}-v${PV}
 S=${WORKDIR}/${MY_P}
diff --git a/net-mail/razor/razor-2.12.ebuild b/net-mail/razor/razor-2.12.ebuild
index 0b306a00aa8a..63b1d2f91675 100644
--- a/net-mail/razor/razor-2.12.ebuild
+++ b/net-mail/razor/razor-2.12.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/razor/razor-2.12.ebuild,v 1.1 2002/07/09 14:42:48 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/razor/razor-2.12.ebuild,v 1.2 2002/07/17 05:26:36 seemant Exp $
 
 inherit perl-module
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://razor.sourceforge.net"
 SRC_URI="http://unc.dl.sourceforge.net/sourceforge/razor/razor-agents-${PV}.tar.gz"
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="*"
+KEYWORDS="x86 ppc"
 
 RDEPEND="sys-devel/perl
 	dev-perl/Net-DNS
diff --git a/net-mail/relay-ctrl/files/digest-relay-ctrl-3.0 b/net-mail/relay-ctrl/files/digest-relay-ctrl-3.0
deleted file mode 100644
index 2c245b0a5ac9..000000000000
--- a/net-mail/relay-ctrl/files/digest-relay-ctrl-3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bbdd4b14fa79bda085d1142aaa1f13be relay-ctrl-3.0.tar.gz 31219
diff --git a/net-mail/relay-ctrl/relay-ctrl-3.0.ebuild b/net-mail/relay-ctrl/relay-ctrl-3.0.ebuild
deleted file mode 100644
index 361f51d9c9b9..000000000000
--- a/net-mail/relay-ctrl/relay-ctrl-3.0.ebuild
+++ /dev/null
@@ -1,30 +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/relay-ctrl/relay-ctrl-3.0.ebuild,v 1.3 2002/07/11 06:30:47 drobbins Exp $
-
-S=${WORKDIR}/${P}
-
-DEPEND="virtual/glibc"
-
-RDEPEND="net-mail/qmail"
-
-
-DESCRIPTION="SMTP Relaying Control for qmail & tcpserver."
-SRC_URI="http://untroubled.org/relay-ctrl/${P}.tar.gz"
-
-HOMEPAGE="http://untroubled.org/relay-ctrl/"
-
-src_compile() {
-	cd ${S}
-	echo "gcc ${CFLAGS}" > conf-cc
-	echo "gcc" > conf-ld
-	emake || die
-}
-
-src_install () {
-	exeinto /usr/bin
-	doexe relay-ctrl-age relay-ctrl-allow relay-ctrl-check relay-ctrl-send relay-ctrl-udp
-	doman relay-ctrl-age.8 relay-ctrl-allow.8 relay-ctrl-check.8 relay-ctrl-send.8 relay-ctrl-udp.8
-	dodoc README ANNOUNCEMENT NEWS
-
-}
diff --git a/net-mail/relay-ctrl/relay-ctrl-3.1.1.ebuild b/net-mail/relay-ctrl/relay-ctrl-3.1.1.ebuild
index 00130cdf61d8..ad848b773261 100644
--- a/net-mail/relay-ctrl/relay-ctrl-3.1.1.ebuild
+++ b/net-mail/relay-ctrl/relay-ctrl-3.1.1.ebuild
@@ -1,19 +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/relay-ctrl/relay-ctrl-3.1.1.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/relay-ctrl/relay-ctrl-3.1.1.ebuild,v 1.3 2002/07/17 05:26:36 seemant Exp $
 
 S=${WORKDIR}/${P}
-
-DEPEND="virtual/glibc"
-
-RDEPEND="net-mail/qmail"
-
-LICENSE="GPL-2"
 DESCRIPTION="SMTP Relaying Control for qmail & tcpserver."
 SRC_URI="http://untroubled.org/relay-ctrl/${P}.tar.gz"
-
 HOMEPAGE="http://untroubled.org/relay-ctrl/"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND="virtual/glibc"
+RDEPEND="net-mail/qmail"
+
 src_compile() {
 	cd ${S}
 	echo "gcc ${CFLAGS}" > conf-cc
diff --git a/net-mail/ripmime/ripmime-1.2.16.16.ebuild b/net-mail/ripmime/ripmime-1.2.16.16.ebuild
index 7d0095447a35..854bc60510c9 100644
--- a/net-mail/ripmime/ripmime-1.2.16.16.ebuild
+++ b/net-mail/ripmime/ripmime-1.2.16.16.ebuild
@@ -1,15 +1,15 @@
 # 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/ripmime/ripmime-1.2.16.16.ebuild,v 1.1 2002/07/10 20:48:54 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/ripmime/ripmime-1.2.16.16.ebuild,v 1.2 2002/07/17 05:26:37 seemant Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="ripMIME extracts attachment files out of a MIME-encoded email pack."
 SRC_URI="http://www.pldaniels.com/ripmime/${P}.tar.gz"
 HOMEPAGE="http://www.pldaniels.com/ripmime"
-LICENSE="GPL-2"
-DEPEND=""
-RDEPEND="${DEPEND}"
+
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_compile() {
 	emake || die
diff --git a/net-mail/sendmail/sendmail-8.12.4-r5.ebuild b/net-mail/sendmail/sendmail-8.12.4-r5.ebuild
index 85df042151c9..52afeecba110 100644
--- a/net-mail/sendmail/sendmail-8.12.4-r5.ebuild
+++ b/net-mail/sendmail/sendmail-8.12.4-r5.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2002 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.4-r5.ebuild,v 1.1 2002/07/13 21:59:36 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/sendmail-8.12.4-r5.ebuild,v 1.2 2002/07/17 05:26:37 seemant Exp $
 
 DESCRIPTION="Widely-used Mail Transport Agent (MTA)."
 HOMEPAGE="http://www.sendmail.org"
+
 LICENSE="Sendmail"
 SLOT="0"
 KEYWORDS="x86"
diff --git a/net-mail/signify/signify-1.07.ebuild b/net-mail/signify/signify-1.07.ebuild
index dfea774dfd60..0a03115415f9 100644
--- a/net-mail/signify/signify-1.07.ebuild
+++ b/net-mail/signify/signify-1.07.ebuild
@@ -1,25 +1,26 @@
 # 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/signify/signify-1.07.ebuild,v 1.3 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/signify/signify-1.07.ebuild,v 1.4 2002/07/17 05:26:37 seemant Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${PN}
 DESCRIPTION="A (semi-)random e-mail signature rotator"
-SRC_URI="http://www.ibiblio.org/pub/Linux/utils/text/${A}"
+SRC_URI="http://www.ibiblio.org/pub/Linux/utils/text/${P}.tar.gz"
 
-DEPEND="virtual/glibc
-	 >=sys-devel/perl-5"
+DEPEND="sys-devel/perl"
 
-src_compile() {                           
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86"
+
+src_compile() {						   
    echo "Perl script!  Woohoo!  No need to compile!"
 }
 
-src_install() {                               
-    try make install PREFIX=${D}/usr/ MANDIR=${D}/usr/share/man
-    dodoc COPYING README signify.txt signify.lsm
-    docinto examples
-    cd examples
-    dodoc Columned Complex Simple SimpleOrColumned
+src_install() {							   
+	make PREFIX=${D}/usr/ MANDIR=${D}/usr/share/man install || die
+	dodoc COPYING README signify.txt signify.lsm
+	docinto examples
+	cd examples
+	dodoc Columned Complex Simple SimpleOrColumned
 
 }
-
diff --git a/net-mail/spruce/spruce-0.7.6-r2.ebuild b/net-mail/spruce/spruce-0.7.6-r2.ebuild
index 7f3cfd505e64..fc6dfa51215d 100644
--- a/net-mail/spruce/spruce-0.7.6-r2.ebuild
+++ b/net-mail/spruce/spruce-0.7.6-r2.ebuild
@@ -1,20 +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/spruce/spruce-0.7.6-r2.ebuild,v 1.5 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/spruce/spruce-0.7.6-r2.ebuild,v 1.6 2002/07/17 05:26:37 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Gtk email client"
 SRC_URI="ftp://spruce.sourceforge.net/pub/spruce/devel/${P}.tar.gz"
 HOMEPAGE="http://spruce.sourceforge.net/"
 
-RDEPEND="=x11-libs/gtk+-1.2*
+DEPEND="=x11-libs/gtk+-1.2*
 	gnome-base/libglade
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	crypt? ( app-crypt/gnupg )
 	gnome? ( >=gnome-base/gnome-print-0.29-r1 )"
 
-DEPEND="$RDEPEND
-        nls? ( sys-devel/gettext )"
+RDEPEND="nls? ( sys-devel/gettext )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_unpack() {
 	unpack ${A}
@@ -23,43 +26,36 @@ src_unpack() {
 }
 
 src_compile() {
-	local myopts
+	local myconf
 
 	use nls \
-		|| myopts="--disable-nls"
+		|| myconf="--disable-nls"
 
 	use ssl \
 		&& echo "SSL does not work"
-		#  myopts="$myopts --with-ssl"
+		#  myconf="${myconf} --with-ssl"
 
 	use crypt \
-		&& myopts="$myopts --enable-pgp" \
-		|| myopts="$myopts --disable-pgp"
+		&& myconf="${myconf} --enable-pgp" \
+		|| myconf="${myconf} --disable-pgp"
 
 	use gnome \
-		&& myopts="$myopts --enable-gnome"
+		&& myconf="${myconf} --enable-gnome"
 
 	CFLAGS="${CFLAGS} `gnome-config --cflags print gdk_pixbuf`"
 
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc					\
-		    --localstatedir=/var/lib				\
-		    --mandir=/usr/share/man				\
-		    --infodir=/usr/share/info				\
-	 	    ${myopts} || die
-
+	econf ${myconf} || die
 	emake || die
 }
 
 src_install () {
 	# Don't use DESTDIR, it doesn't follow the rules
-	make prefix=${D}/usr						\
-	     sysconfdir=${D}/etc					\
-	     localstatedir=${D}/var/lib					\
-	     mandir=${D}/usr/share/man					\
-	     infodir=${D}/usr/share/info				\
+	make prefix=${D}/usr \
+	     sysconfdir=${D}/etc \
+	     localstatedir=${D}/var/lib \
+	     mandir=${D}/usr/share/man \
+	     infodir=${D}/usr/share/info \
 	     install || die
 
-	dodoc ChangeLog README README.firewall INSTALL
+	dodoc ChangeLog README* AUTHORS DESIGN NEWS THANKS TODO WISHLIST
 }
diff --git a/net-mail/squirrelmail/files/digest-squirrelmail-1.2.5 b/net-mail/squirrelmail/files/digest-squirrelmail-1.2.5
deleted file mode 100644
index eef2f78aa451..000000000000
--- a/net-mail/squirrelmail/files/digest-squirrelmail-1.2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 de41bce330c891e1bdd238cc45e9ec25 squirrelmail-1.2.5.tar.bz2 1138398
diff --git a/net-mail/squirrelmail/files/digest-squirrelmail-1.2.6-r1 b/net-mail/squirrelmail/files/digest-squirrelmail-1.2.6-r1
deleted file mode 100644
index e6ccfe05b881..000000000000
--- a/net-mail/squirrelmail/files/digest-squirrelmail-1.2.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6ce3f2f33ddd9aee60e103a8381bc760 squirrelmail-1.2.6.tar.bz2 1209704
diff --git a/net-mail/squirrelmail/squirrelmail-1.2.5.ebuild b/net-mail/squirrelmail/squirrelmail-1.2.5.ebuild
deleted file mode 100644
index 2beb858f42ed..000000000000
--- a/net-mail/squirrelmail/squirrelmail-1.2.5.ebuild
+++ /dev/null
@@ -1,30 +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/squirrelmail/squirrelmail-1.2.5.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
-
-S=${WORKDIR}/${P}
-HTTPD_ROOT="/home/httpd/htdocs"
-
-DESCRIPTION="Webmail for nuts!"
-
-SRC_URI="http://prdownloads.sf.net/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.squirrelmail.org"
-
-DEPEND="dev-lang/php
-        net-www/apache"
-
-RDEPEND="virtual/imapd"
-
-src_compile() {
-	#nothing to compile
-	echo "Nothing to compile"
-}
-
-src_install () {
-	dodir ${HTTPD_ROOT}/${P}
-	dosym ${HTTPD_ROOT}/${P} ${HTTPD_ROOT}/${PN}
-	cp -r . ${D}/${HTTPD_ROOT}/${P}
-	cd ${D}/${HTTPD_ROOT}
-	chown -R nobody.nobody ${P}
-}
-
diff --git a/net-mail/squirrelmail/squirrelmail-1.2.6-r1.ebuild b/net-mail/squirrelmail/squirrelmail-1.2.6-r1.ebuild
deleted file mode 100644
index ee4d1782848c..000000000000
--- a/net-mail/squirrelmail/squirrelmail-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,37 +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/squirrelmail/squirrelmail-1.2.6-r1.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
-
-S=${WORKDIR}/${P}
-HTTPD_ROOT="/home/httpd/htdocs"
-HTTPD_USER="apache"
-
-DESCRIPTION="Webmail for nuts!"
-
-SRC_URI="http://prdownloads.sf.net/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.squirrelmail.org"
-
-DEPEND="dev-lang/php
-        net-www/apache"
-
-RDEPEND="virtual/imapd"
-
-src_compile() {
-	#nothing to compile
-	echo "Nothing to compile"
-}
-
-src_install () {
-	dodir ${HTTPD_ROOT}/${P}
-	dosym ${HTTPD_ROOT}/${P} ${HTTPD_ROOT}/${PN}
-	cp -r . ${D}/${HTTPD_ROOT}/${P}
-	cd ${D}/${HTTPD_ROOT}
-	chown -R ${HTTPD_USER}.${HTTPD_USER} ${P}
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Squirrelmail requires PHP to have 'register_globals = On'"
-	einfo "Please edit /etc/php4/php.ini."
-	einfo
-}
diff --git a/net-mail/squirrelmail/squirrelmail-1.2.7.ebuild b/net-mail/squirrelmail/squirrelmail-1.2.7.ebuild
index 239ca6783bf6..f0824b170664 100644
--- a/net-mail/squirrelmail/squirrelmail-1.2.7.ebuild
+++ b/net-mail/squirrelmail/squirrelmail-1.2.7.ebuild
@@ -1,6 +1,6 @@
 # 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/squirrelmail/squirrelmail-1.2.7.ebuild,v 1.3 2002/07/16 08:47:56 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/squirrelmail/squirrelmail-1.2.7.ebuild,v 1.4 2002/07/17 05:26:37 seemant Exp $
 
 S=${WORKDIR}/${P}
 HTTPD_ROOT="/home/httpd/htdocs"
@@ -12,7 +12,7 @@ SRC_URI="http://unc.dl.sourceforge.net/sourceforge/squirrelmail/${P}.tar.bz2"
 HOMEPAGE="http://www.squirrelmail.org"
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="*"
+KEYWORDS="x86 ppc"
 
 RDEPEND="dev-php/mod_php"
 DEPEND="${RDEPEND}"
diff --git a/net-mail/sylpheed-claws-nc/sylpheed-claws-nc-0.7.8.ebuild b/net-mail/sylpheed-claws-nc/sylpheed-claws-nc-0.7.8.ebuild
index 403bad136b4b..9fc39d31d0d4 100644
--- a/net-mail/sylpheed-claws-nc/sylpheed-claws-nc-0.7.8.ebuild
+++ b/net-mail/sylpheed-claws-nc/sylpheed-claws-nc-0.7.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws-nc/sylpheed-claws-nc-0.7.8.ebuild,v 1.2 2002/06/29 09:42:57 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws-nc/sylpheed-claws-nc-0.7.8.ebuild,v 1.3 2002/07/17 05:26:37 seemant Exp $
 
 
 MY_P="sylpheed-${PV}claws-nc"
@@ -24,6 +24,7 @@ RDEPEND="$DEPEND
 
 SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
 PROVIDE="virtual/sylpheed"
 
diff --git a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.7.6 b/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.7.6
deleted file mode 100644
index 9b1292d0adb7..000000000000
--- a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.7.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e80a700478b01a00170864c7b59d910e sylpheed-0.7.6claws.tar.bz2 1540297
diff --git a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.7.8 b/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.7.8
deleted file mode 100644
index f6f898eb6524..000000000000
--- a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.7.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94724f28b92a20297783aa29625b558c sylpheed-0.7.8claws.tar.bz2 1711787
diff --git a/net-mail/sylpheed-claws/sylpheed-claws-0.7.6.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.7.6.ebuild
deleted file mode 100644
index 204ae60cf05f..000000000000
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.7.6.ebuild
+++ /dev/null
@@ -1,79 +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/sylpheed-claws/sylpheed-claws-0.7.6.ebuild,v 1.3 2002/07/11 06:30:47 drobbins Exp $
-
-
-MY_P="sylpheed-${PV}claws"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Bleeding edge version of Sylpheed"
-SRC_URI="http://telia.dl.sourceforge.net/sourceforge/sylpheed-claws/${MY_P}.tar.bz2"
-HOMEPAGE="http://sylpheed-claws.sf.net"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	crypt? ( >=app-crypt/gpgme-0.2.3 )
-	gnome? ( >=media-libs/gdk-pixbuf-0.16 )
-	imlib? ( >=media-libs/imlib-1.9.10 )
-	spell? ( >=app-text/pspell-0.12.2 )
-	xface? ( >=media-libs/compface-1.4 )
-	pda? ( >=app-misc/jpilot-0.99 )"
-	
-RDEPEND="$DEPEND
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-
-	use ssl && myconf="${myconf} --enable-ssl"
-
-	use crypt && myconf="${myconf} --enable-gpgme"
-
-	use gnome && \
-		myconf="${myconf} --enable-gdk-pixbuf" || \
-		myconf="${myconf} --disable-gdk-pixbuf"
-
-	use imlib && \
-		myconf="${myconf} --enable-imlib" || \
-		myconf="${myconf} --disable-imlib"
-	
-	use ldap && myconf="${myconf} --enable-ldap"
-	
-	use spell && myconf="${myconf} --enable-pspell"
-	
-	use ipv6 && myconf="${myconf} --enable-ipv6"
-
-	use pda && myconf="${myconf} --enable-jpilot"
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--program-suffix=-claws \
-		${myconf} || die "./configure failed"
-
-	for i in `find . -name Makefile` ; do
-		cp $i ${i}.orig
-		sed "s/PACKAGE = sylpheed/PACKAGE = sylpheed-claws/" \
-			< ${i}.orig \
-			> ${i}
-	done
-	cp sylpheed.desktop sylpheed.desktop.orig
-	sed "s/sylpheed.png/sylpheed-claws.png/" \
-		< sylpheed.desktop.orig
-		> sylpheed.desktop
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	
-	use gnome || rm -rf ${D}/usr/share/gnome
-
-	mv ${D}/usr/share/pixmaps/sylpheed.png \
-		${D}/usr/share/pixmaps/sylpheed-claws.png
-}
diff --git a/net-mail/sylpheed-claws/sylpheed-claws-0.7.8-r1.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.7.8-r1.ebuild
index 3f51137a2676..205cab91f875 100644
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.7.8-r1.ebuild
+++ b/net-mail/sylpheed-claws/sylpheed-claws-0.7.8-r1.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/sylpheed-claws/sylpheed-claws-0.7.8-r1.ebuild,v 1.1 2002/06/29 09:42:36 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/sylpheed-claws-0.7.8-r1.ebuild,v 1.2 2002/07/17 05:26:37 seemant Exp $
 
 
 MY_P="sylpheed-${PV}claws"
@@ -9,8 +9,9 @@ DESCRIPTION="Bleeding edge version of Sylpheed"
 SRC_URI="mirror://sourceforge/sylpheed-claws/${MY_P}.tar.bz2"
 HOMEPAGE="http://sylpheed-claws.sf.net"
 
-SLOT=""
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
 DEPEND="=x11-libs/gtk+-1.2*
 	ssl? ( >=dev-libs/openssl-0.9.6b )
diff --git a/net-mail/sylpheed-claws/sylpheed-claws-0.7.8.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.7.8.ebuild
deleted file mode 100644
index 562896d66088..000000000000
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.7.8.ebuild
+++ /dev/null
@@ -1,79 +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/sylpheed-claws/sylpheed-claws-0.7.8.ebuild,v 1.3 2002/07/11 06:30:47 drobbins Exp $
-
-
-MY_P="sylpheed-${PV}claws"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Bleeding edge version of Sylpheed"
-SRC_URI="mirror://sourceforge/sylpheed-claws/${MY_P}.tar.bz2"
-HOMEPAGE="http://sylpheed-claws.sf.net"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	crypt? ( >=app-crypt/gpgme-0.2.3 )
-	gnome? ( >=media-libs/gdk-pixbuf-0.16 )
-	imlib? ( >=media-libs/imlib-1.9.10 )
-	spell? ( >=app-text/pspell-0.12.2 )
-	xface? ( >=media-libs/compface-1.4 )
-	pda? ( >=app-misc/jpilot-0.99 )"
-	
-RDEPEND="$DEPEND
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-
-	use ssl && myconf="${myconf} --enable-ssl"
-
-	use crypt && myconf="${myconf} --enable-gpgme"
-
-	use gnome && \
-		myconf="${myconf} --enable-gdk-pixbuf" || \
-		myconf="${myconf} --disable-gdk-pixbuf"
-
-	use imlib && \
-		myconf="${myconf} --enable-imlib" || \
-		myconf="${myconf} --disable-imlib"
-	
-	use ldap && myconf="${myconf} --enable-ldap"
-	
-	use spell && myconf="${myconf} --enable-pspell"
-	
-	use ipv6 && myconf="${myconf} --enable-ipv6"
-
-	use pda && myconf="${myconf} --enable-jpilot"
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--program-suffix=-claws \
-		${myconf} || die "./configure failed"
-
-	for i in `find . -name Makefile` ; do
-		cp $i ${i}.orig
-		sed "s/PACKAGE = sylpheed/PACKAGE = sylpheed-claws/" \
-			< ${i}.orig \
-			> ${i}
-	done
-	cp sylpheed.desktop sylpheed.desktop.orig
-	sed "s/sylpheed.png/sylpheed-claws.png/" \
-		< sylpheed.desktop.orig
-		> sylpheed.desktop
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	
-	use gnome || rm -rf ${D}/usr/share/gnome
-
-	mv ${D}/usr/share/pixmaps/sylpheed.png \
-		${D}/usr/share/pixmaps/sylpheed-claws.png
-}
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.7.8-r1 b/net-mail/sylpheed/files/digest-sylpheed-0.7.8-r1
deleted file mode 100644
index 567a99d2a500..000000000000
--- a/net-mail/sylpheed/files/digest-sylpheed-0.7.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dc20883985568620ca69e8189a7f55ce sylpheed-0.7.8.tar.bz2 1800175
diff --git a/net-mail/sylpheed/sylpheed-0.7.8-r1.ebuild b/net-mail/sylpheed/sylpheed-0.7.8-r1.ebuild
deleted file mode 100644
index 044a457f4126..000000000000
--- a/net-mail/sylpheed/sylpheed-0.7.8-r1.ebuild
+++ /dev/null
@@ -1,57 +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/sylpheed/sylpheed-0.7.8-r1.ebuild,v 1.2 2002/07/15 08:50:18 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A lightweight email client and newsreader"
-SRC_URI="http://sylpheed.good-day.net/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://sylpheed.good-day.net"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-PROVIDE="virtual/sylpheed"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	>=media-libs/compface-1.4
-	ssl? ( dev-libs/openssl )
-	pda? ( app-misc/jpilot )
-	crypt? ( >=app-crypt/gnupg-1.0.6 >=app-crypt/gpgme-0.2.3 )
-	ldap? ( >=net-nds/openldap-2.0.11 )
-	gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1 )"
-
-
-RDEPEND="=x11-libs/gtk+-1.2*
-	nls? ( sys-devel/gettext )
-	ssl? ( dev-libs/openssl )
-	crypt? ( >=app-crypt/gnupg-1.0.6 >=app-crypt/gpgme-0.2.3 )
-	ldap? ( >=net-nds/openldap-2.0.11 )
-	gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1 )"
-
-src_compile() {
-
-	local myconf
-
-	use gnome || myconf="--disable-gdk-pixbuf --disable-imlib"
-	use nls || myconf="$myconf --disable-nls"
-	use ssl && myconf="$myconf --enable-ssl"
-	use crypt && myconf="$myconf --enable-gpgme"
-	use pda && myconf="$myconf --enable-jpilot"
-	use ldap && myconf="$myconf --enable-ldap"
-	
-	./configure \
-		--prefix=/usr \
-		--host=${CHOST}  \
-		--enable-ipv6 $myconf || die
-	emake || die
-}
-
-src_install () {
-
-	make prefix=${D}/usr \
-		manualdir=${D}/usr/share/doc/${PF}/html \
-		install || die
-	dodoc AUTHORS COPYING ChangeLog* NEWS README* TODO*
-}
-
diff --git a/net-mail/teapop/teapop-0.3.3.ebuild b/net-mail/teapop/teapop-0.3.3.ebuild
index 88fe06231ed9..f82e774c7c3d 100644
--- a/net-mail/teapop/teapop-0.3.3.ebuild
+++ b/net-mail/teapop/teapop-0.3.3.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/teapop/teapop-0.3.3.ebuild,v 1.4 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/teapop/teapop-0.3.3.ebuild,v 1.5 2002/07/17 05:26:37 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Tiny POP3 server"
-SRC_URI="ftp://ftp.toontown.org/pub/teapop/teapop-0.3.3.tar.gz"
+SRC_URI="ftp://ftp.toontown.org/pub/teapop/${P}.tar.gz"
 HOMEPAGE="http://www.toontown.org/teapop/"
 DEPEND=""
 
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86"
+
 src_compile() {
 	local myconf 
-	use mysql && myconf="$myconf --enable-mysql"
-	use postgres && myconf="$myconf --enable-pgsql"
+	use mysql && myconf="${myconf} --enable-mysql"
+	use postgres && myconf="${myconf} --enable-pgsql"
 	./configure \
 		--host=${CHOST} \
 		--prefix=/usr \
@@ -22,7 +26,7 @@ src_compile() {
 		--enable-mailsppol=/var/spool/mail \
 		--mandir=/usr/share/man \
 		--enable-apop \
-		$myconf || die "./configure failed"
+		${myconf} || die "./configure failed"
 	emake || die
 }
 
diff --git a/net-mail/tmda/files/digest-tmda-0.57 b/net-mail/tmda/files/digest-tmda-0.57
deleted file mode 100644
index 5452a61fc8bc..000000000000
--- a/net-mail/tmda/files/digest-tmda-0.57
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a71c47e02904604557021ab1c8f4be0b tmda-0.57.tgz 133782
diff --git a/net-mail/tmda/tmda-0.57.ebuild b/net-mail/tmda/tmda-0.57.ebuild
deleted file mode 100644
index 8c29dde3365c..000000000000
--- a/net-mail/tmda/tmda-0.57.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2002 Arcady Genkin <agenkin@thpoon.com>
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/tmda/tmda-0.57.ebuild,v 1.2 2002/07/11 06:30:48 drobbins Exp $
-
-DESCRIPTION="Python-based SPAM reduction system"
-HOMEPAGE="http://software.libertine.org/tmda/index.html"
-
-SRC_URI="http://software.libertine.org/tmda/releases/${P}.tgz
-	http://software.libertine.org/tmda/releases/old/${P}.tgz"
-S="${WORKDIR}/${P}"
-
-DEPEND=">=dev-lang/python-2.0
-	virtual/mta"
-
-src_compile() {
-	./compileall || die
-}
-
-src_install () {
-	# Figure out python version
-	# below hack should be replaced w/ pkg-config, when we get it working
-	local pv=`python -V 2>&1 | sed -e 's:Python \([0-9].[0-9]\).*:\1:'`
-
-	# Executables
-	dobin bin/tmda-*
-
-	# The Python TMDA module
-	insinto "/usr/lib/python${pv}/site-packages/TMDA"
-	doins TMDA/*.py*
-
-	# The templates
-	insinto /etc/tmda
-	doins templates/*.txt
-	
-	# Documentation
-	dodoc COPYRIGHT ChangeLog README THANKS UPGRADE CRYPTO
-	dohtml -r htdocs/*.html
-
-	# Contributed binaries and stuff
-	cd contrib
-	dodoc README.RELAY qmail-smtpd_auth.patch tmda.spec sample.tmdarc
-	exeinto /usr/lib/tmda/bin
-	doexe printcdb printdbm collectaddys
-}
diff --git a/net-mail/tmda/tmda-0.58.ebuild b/net-mail/tmda/tmda-0.58.ebuild
index f9bb4776adcd..8903b486e277 100644
--- a/net-mail/tmda/tmda-0.58.ebuild
+++ b/net-mail/tmda/tmda-0.58.ebuild
@@ -1,17 +1,20 @@
 # Copyright 2002 Arcady Genkin <agenkin@thpoon.com>
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/tmda/tmda-0.58.ebuild,v 1.1 2002/07/16 18:49:10 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/tmda/tmda-0.58.ebuild,v 1.2 2002/07/17 05:26:37 seemant Exp $
 
+S="${WORKDIR}/${P}"
 DESCRIPTION="Python-based SPAM reduction system"
 HOMEPAGE="http://software.libertine.org/tmda/index.html"
-
 SRC_URI="http://software.libertine.org/tmda/releases/${P}.tgz
 	http://software.libertine.org/tmda/releases/old/${P}.tgz"
-S="${WORKDIR}/${P}"
 
 DEPEND=">=dev-lang/python-2.0
 	virtual/mta"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 src_compile() {
 	./compileall || die
 }
diff --git a/net-mail/tnef/ChangeLog b/net-mail/tnef/ChangeLog
index 9bb710a0f9a8..6314d7455b62 100644
--- a/net-mail/tnef/ChangeLog
+++ b/net-mail/tnef/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/tnef
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/tnef/ChangeLog,v 1.2 2002/05/27 02:47:41 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/tnef/ChangeLog,v 1.3 2002/07/17 05:26:37 seemant Exp $
+
+*tnef-1.1.1 (26 May 2002)
+
+  26 May 2002; Ben Lutgens <lamer@gentoo.org> ChangeLog :
+	
+  Updated to the latest version.
 
 *tnef-0.15 (1 Feb 2002)
 
@@ -11,8 +17,3 @@
   comments should well explained and written in clean English. The details about
   writing correct changelogs are explained in the skel.ChangeLog file which you
   can find in the root directory of the portage repository.
-
-*tnef-1.1.1 (26 May 2002)
-	26 May 2002; Ben Lutgens <lamer@gentoo.org> ChangeLog :
-	
-	Updated to the latest version.
diff --git a/net-mail/tnef/files/digest-tnef-0.15 b/net-mail/tnef/files/digest-tnef-0.15
deleted file mode 100644
index 9cdfbc35ef32..000000000000
--- a/net-mail/tnef/files/digest-tnef-0.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1e6fe85f1217bb5b8fc04fd97fa28919 tnef-0.15.tar.gz 129669
diff --git a/net-mail/tnef/tnef-0.15.ebuild b/net-mail/tnef/tnef-0.15.ebuild
deleted file mode 100644
index 1ceb7bd09125..000000000000
--- a/net-mail/tnef/tnef-0.15.ebuild
+++ /dev/null
@@ -1,29 +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/tnef/tnef-0.15.ebuild,v 1.2 2002/07/11 06:30:48 drobbins Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Decodes MS-TNEF MIME attachments"
-SRC_URI="http://world.std.com/~damned/${A}"
-HOMEPAGE="http://world.std.com/~damned/software.html"
-
-DEPEND=">=sys-libs/glibc-2.1.3"
-
-src_compile() {
-
-    cd ${S}
-    try ./configure --prefix=/usr --host=${CHOST}
-    try make
-
-}
-
-src_install () {
-
-    cd ${S}
-    try make DESTDIR=${D} install
-    dodoc AUTHORS BUGS ChangeLog COPYING NEWS README TODO
-
-}
-
-
diff --git a/net-mail/tnef/tnef-1.1.1.ebuild b/net-mail/tnef/tnef-1.1.1.ebuild
index 5fab6c960a03..c0bab59270ae 100644
--- a/net-mail/tnef/tnef-1.1.1.ebuild
+++ b/net-mail/tnef/tnef-1.1.1.ebuild
@@ -1,14 +1,18 @@
 # 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/tnef/tnef-1.1.1.ebuild,v 1.3 2002/07/17 05:26:37 seemant Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Decodes MS-TNEF MIME attachments"
-SRC_URI="http://world.std.com/~damned/${A}"
+SRC_URI="http://world.std.com/~damned/${P}.tar.gz"
 HOMEPAGE="http://world.std.com/~damned/software.html"
 
 DEPEND=">=sys-libs/glibc-2.1.3"
 
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86"
+
 src_compile() {
 
     cd ${S}
diff --git a/net-mail/uw-imap/files/digest-uw-imap-2001a b/net-mail/uw-imap/files/digest-uw-imap-2001a
deleted file mode 100644
index b752e9d05f97..000000000000
--- a/net-mail/uw-imap/files/digest-uw-imap-2001a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 42c5c8d049c209b15513a4f6ebba34d2 imap-2001a.tar.Z 1959777
diff --git a/net-mail/uw-imap/files/digest-uw-imap-2001a-r1 b/net-mail/uw-imap/files/digest-uw-imap-2001a-r1
deleted file mode 100644
index b752e9d05f97..000000000000
--- a/net-mail/uw-imap/files/digest-uw-imap-2001a-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 42c5c8d049c209b15513a4f6ebba34d2 imap-2001a.tar.Z 1959777
diff --git a/net-mail/uw-imap/uw-imap-2001a-r1.ebuild b/net-mail/uw-imap/uw-imap-2001a-r1.ebuild
deleted file mode 100644
index 48df7cfe4649..000000000000
--- a/net-mail/uw-imap/uw-imap-2001a-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Updated by Todd Wright <wylie@geekasylum.org> -r1
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2001a-r1.ebuild,v 1.3 2002/07/11 06:30:48 drobbins Exp $
-
-PN0=imap
-S=${WORKDIR}/${PN0}-${PV}
-DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
-SRC_URI="ftp://ftp.cac.washington.edu/${PN0}/${PN0}-${PV}.tar.Z"
-HOMEPAGE="http://www.washington.edu/imap/"
-
-DEPEND="virtual/glibc
-	>=sys-libs/pam-0.72
-        ssl? ( dev-libs/openssl )"
-
-PROVIDE="virtual/imapd"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src/osdep/unix/
-	sed "s:-g -fno-omit-frame-pointer -O6:${CFLAGS}:" Makefile > Makefile.bak
-	mv Makefile.bak Makefile
-}
-
-src_compile() {                           
-	if use ssl; then
-		make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix SSLDIR=/usr/ssl \
-			 SSLINCLUDE=/usr/include/openssl || die
-		local i
-		for i in imapd ipop3d; do
-			umask 077
-			PEM1=`/bin/mktemp ${T}/openssl.XXXXXX`
-			PEM2=`/bin/mktemp ${T}/openssl.XXXXXX`
-			/usr/bin/openssl req -newkey rsa:1024 -keyout $$PEM1 \
-				 -nodes -x509 -days 365 -out  $$PEM2 << EOF
---
-SomeState
-SomeCity
-SomeOrganization
-SomeOrganizationalUnit
-localhost.localdomain
-root@localhost.localdomain
-EOF
-
-			cat $$PEM1 >  ${i}.pem
-			echo ""    >> ${i}.pem
-			cat $$PEM2 >> ${i}.pem
-			rm $$PEM1 $$PEM2
-			umask 022
-		done
-	else
-		make lnp || die
-	fi
-}
-
-src_install() {                               
-	into /usr
-	dosbin imapd/imapd ipopd/ipop?d
-
-	if use ssl; then
-		mkdir -p ${D}/usr/ssl/certs
-		mv imapd.pem ${D}/usr/ssl/certs
-		mv ipop3d.pem ${D}/usr/ssl/certs
-	fi
-
-	insinto /usr/include/imap
-	doins c-client/{c-client,mail,imap4r1,rfc822,linkage,misc,smtp,nntp}.h
-	doins c-client/{osdep,env_unix,env,fs,ftl,nl,tcp}.h
-	dolib.a c-client/c-client.a
-	dosym /usr/lib/c-client.a /usr/lib/libc-client.a
-
-	doman src/ipopd/ipopd.8c src/imapd/imapd.8c
-
-	dodoc CPYRIGHT README docs/*.txt docs/CONFIG docs/FAQ docs/RELNOTES
-
-	docinto rfc
-	dodoc docs/rfc/*.txt
-
-        # gentoo config stuff
-	insinto /etc/pam.d
-	newins ${FILESDIR}/uw-imap.pam imap
-	newins ${FILESDIR}/uw-imap.pam pop
-        insinto /etc/xinetd.d
-	newins ${FILESDIR}/uw-imap.xinetd  imap
-	newins ${FILESDIR}/uw-ipop2.xinetd ipop2
-	newins ${FILESDIR}/uw-ipop3.xinetd ipop3
-	newins ${FILESDIR}/uw-imaps.xinetd imaps
-	
-}
diff --git a/net-mail/uw-imap/uw-imap-2001a-r2.ebuild b/net-mail/uw-imap/uw-imap-2001a-r2.ebuild
index b04cfe68e40c..3015ce2db4a4 100644
--- a/net-mail/uw-imap/uw-imap-2001a-r2.ebuild
+++ b/net-mail/uw-imap/uw-imap-2001a-r2.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/uw-imap/uw-imap-2001a-r2.ebuild,v 1.1 2002/06/07 02:01:38 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2001a-r2.ebuild,v 1.2 2002/07/17 05:26:37 seemant Exp $
 
 PN0=imap
 S=${WORKDIR}/${PN0}-${PV}
@@ -9,8 +9,11 @@ SRC_URI="ftp://ftp.cac.washington.edu/${PN0}/${PN0}-${PV}.tar.Z"
 HOMEPAGE="http://www.washington.edu/imap/"
 PROVIDE="virtual/imapd"
 DEPEND="virtual/glibc >=sys-libs/pam-0.72 ssl? ( dev-libs/openssl )"
+
+
 LICENSE="as-is"
 SLOT="0"
+KEYWORDS="x86"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-mail/uw-imap/uw-imap-2001a.ebuild b/net-mail/uw-imap/uw-imap-2001a.ebuild
deleted file mode 100644
index dfa3e8110e4a..000000000000
--- a/net-mail/uw-imap/uw-imap-2001a.ebuild
+++ /dev/null
@@ -1,88 +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/uw-imap/uw-imap-2001a.ebuild,v 1.4 2002/07/11 06:30:48 drobbins Exp $
-
-PN0=imap
-S=${WORKDIR}/${PN0}-${PV}
-DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
-SRC_URI="ftp://ftp.cac.washington.edu/${PN0}/${PN0}-${PV}.tar.Z"
-HOMEPAGE="http://www.washington.edu/imap/"
-
-DEPEND="virtual/glibc
-	>=sys-libs/pam-0.72
-        ssl? ( dev-libs/openssl )"
-
-PROVIDE="virtual/imapd"
-PROVIDE="virtual/imapUW"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src/osdep/unix/
-	sed "s:-g -fno-omit-frame-pointer -O6:${CFLAGS}:" Makefile > Makefile.bak
-	mv Makefile.bak Makefile
-}
-
-src_compile() {                           
-	if use ssl; then
-		make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix SSLDIR=/usr/ssl \
-			 SSLINCLUDE=/usr/include/openssl || die
-		local i
-		for i in imapd ipop3d; do
-			umask 077
-			PEM1=`/bin/mktemp ${T}/openssl.XXXXXX`
-			PEM2=`/bin/mktemp ${T}/openssl.XXXXXX`
-			/usr/bin/openssl req -newkey rsa:1024 -keyout $$PEM1 \
-				 -nodes -x509 -days 365 -out  $$PEM2 << EOF
---
-SomeState
-SomeCity
-SomeOrganization
-SomeOrganizationalUnit
-localhost.localdomain
-root@localhost.localdomain
-EOF
-
-			cat $$PEM1 >  ${i}.pem
-			echo ""    >> ${i}.pem
-			cat $$PEM2 >> ${i}.pem
-			rm $$PEM1 $$PEM2
-			umask 022
-		done
-	else
-		make lnp || die
-	fi
-}
-
-src_install() {                               
-	into /usr
-	dosbin imapd/imapd ipopd/ipop?d
-
-	if use ssl; then
-		mkdir -p ${D}/usr/ssl/certs
-		mv imapd.pem ${D}/usr/ssl/certs
-		mv ipop3d.pem ${D}/usr/ssl/certs
-	fi
-
-	insinto /usr/include
-	doins c-client/{mail,imap4r1,rfc822,linkage}.h
-	dolib.a c-client/c-client.a
-	dosym /usr/lib/c-client.a /usr/lib/libc-client.a
-
-	doman src/ipopd/ipopd.8c src/imapd/imapd.8c
-
-	dodoc CPYRIGHT README docs/*.txt docs/CONFIG docs/FAQ docs/RELNOTES
-
-	docinto rfc
-	dodoc docs/rfc/*.txt
-
-        # gentoo config stuff
-	insinto /etc/pam.d
-	newins ${FILESDIR}/uw-imap.pam imap
-	newins ${FILESDIR}/uw-imap.pam pop
-        insinto /etc/xinetd.d
-	newins ${FILESDIR}/uw-imap.xinetd  imap
-	newins ${FILESDIR}/uw-ipop2.xinetd ipop2
-	newins ${FILESDIR}/uw-ipop3.xinetd ipop3
-	newins ${FILESDIR}/uw-imaps.xinetd imaps
-	
-}
diff --git a/net-mail/vlnx/vlnx-414e-r2.ebuild b/net-mail/vlnx/vlnx-414e-r2.ebuild
index e356ca1c9d4b..f81f16f0735d 100644
--- a/net-mail/vlnx/vlnx-414e-r2.ebuild
+++ b/net-mail/vlnx/vlnx-414e-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Script Revised by Parag Mehta <pm@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vlnx/vlnx-414e-r2.ebuild,v 1.3 2002/07/11 06:30:48 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vlnx/vlnx-414e-r2.ebuild,v 1.4 2002/07/17 05:26:37 seemant Exp $
 
 MY_P=${PN}${PV}
 
@@ -10,6 +10,10 @@ DESCRIPTION="McAfee VirusScanner for Unix/Linux(Shareware)"
 SRC_URI="http://download.mcafee.com/products/evaluation/virusscan/english/unix/linux/${MY_P}.tar.Z
 	 http://download.nai.com/products/datfiles/4.x/nai/dat-4153.tar"
 
+SLOT="0"
+LICENSE="VirusScan"
+KEYWORDS="x86"
+
 DEPEND=""
 RDEPEND="sys-devel/ld.so"
 src_unpack() {
diff --git a/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild b/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild
index 611259989021..0610a847f0ea 100644
--- a/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild
+++ b/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild,v 1.4 2002/07/11 06:30:48 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild,v 1.5 2002/07/17 05:26:37 seemant Exp $
 
 S=${WORKDIR}/${P}
-
 DESCRIPTION="vmailmgr - virtual domains for qmail"
 SRC_URI="http://www.vmailmgr.org/current/${P}.tar.gz"
 HOMEPAGE="http://www.vmailmgr.org"
@@ -13,6 +12,10 @@ RDEPEND=">=sys-apps/ucspi-unix-0.34
 	>=net-mail/qmail-1.03-r7
 	>=net-mail/qmail-autoresponder-0.95"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 src_unpack() {
 	unpack ${A} ; cd ${S}