repoman'd

60 files changed, 169 insertions, 2543 deletions

diff --git a/net-mail/amavis/amavis-0.2.1-r2.ebuild b/net-mail/amavis/amavis-0.2.1-r2.ebuild
index 73559a9b09f0..30f8e6aa3846 100644
--- a/net-mail/amavis/amavis-0.2.1-r2.ebuild
+++ b/net-mail/amavis/amavis-0.2.1-r2.ebuild
@@ -1,45 +1,42 @@
 # 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/amavis/amavis-0.2.1-r2.ebuild,v 1.4 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/amavis/amavis-0.2.1-r2.ebuild,v 1.5 2002/07/17 04:20:39 seemant Exp $
 
-A="${P}.tar.gz"
 S=${WORKDIR}/${P}
 DESCRIPTION="Virus Scanner"
-SRC_URI="http://www.amavis.org/dist/${A}"
-
+SRC_URI="http://www.amavis.org/dist/${P}.tar.gz"
 HOMEPAGE="http://www.amavis.org"
 
-DEPEND="virtual/glibc
-	net-mail/maildrop
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86"
+
+DEPEND="net-mail/maildrop
 	>=net-mail/tnef-0.13
 	>=net-mail/vlnx-407e
 	net-mail/qmail"
 
 src_compile() {
 
-  ./reconf
-  try ./configure --host=${CHOST} --prefix=/usr \
-	--with-logdir=/var/log/scanmail \
-	--with-virusdir=/var/tmp/virusmails \
-	--enable-qmail
-  try make
+	./reconf
+	econf \
+		--with-logdir=/var/log/scanmail \
+		--with-virusdir=/var/tmp/virusmails \
+		--enable-qmail || die
+
+	make || die
 }
 
 src_install() {
 
-  try make prefix=${D}/usr install
-  into /usr
-  dodoc AUTHORS BUGS COPYING ChangeLog FAQ HINTS NEWS README* TODO
-  dodoc doc/amavis.txt
-  docinto html
-  dodoc doc/*.png doc/*.html
-  dodir /var/log/scanmail
-  dodir /var/tmp/virusmails
-  chmod 777 ${D}/var/log/scanmail
-  chmod 777 ${D}/var/tmp/virusmails
+	try make prefix=${D}/usr install
+	into /usr
+	dodoc AUTHORS BUGS COPYING ChangeLog FAQ HINTS NEWS README* TODO
+	dodoc doc/amavis.txt
+	dohtml -r doc
+	dodir /var/log/scanmail
+	dodir /var/tmp/virusmails
+	chmod 777 ${D}/var/log/scanmail
+	chmod 777 ${D}/var/tmp/virusmails
 
 }
-
-
-
-
diff --git a/net-mail/balsa/balsa-1.3.6-r1.ebuild b/net-mail/balsa/balsa-1.3.6-r1.ebuild
index eb4b7c192385..5a07faad850a 100644
--- a/net-mail/balsa/balsa-1.3.6-r1.ebuild
+++ b/net-mail/balsa/balsa-1.3.6-r1.ebuild
@@ -8,6 +8,10 @@ DESCRIPTION="Balsa: email client for GNOME"
 SRC_URI="http://www.theochem.kth.se/~pawsa/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.balsa.net"
 
+SLOT="1"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="=dev-libs/glib-1.2*
 	=x11-libs/gtk+-1.2*
 	>=media-libs/imlib-1.9.10-r1
diff --git a/net-mail/balsa/balsa-1.3.6.ebuild b/net-mail/balsa/balsa-1.3.6.ebuild
deleted file mode 100644
index d73c17a3963c..000000000000
--- a/net-mail/balsa/balsa-1.3.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Modified by Riccardo Persichetti (ricpersi@libero.it)
-# /space/gentoo/cvsroot/gentoo-x86/net-mail/balsa/balsa-1.3.5-r1.ebuild,v 1.2 2002/05/23 06:50:16 seemant Exp
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Balsa: email client for GNOME"
-SRC_URI="http://www.theochem.kth.se/~pawsa/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.balsa.net"
-
-DEPEND="=dev-libs/glib-1.2*
-	=x11-libs/gtk+-1.2*
-	>=media-libs/imlib-1.9.10-r1
-	>=gnome-base/gnome-libs-1.4.1.4
-	>=gnome-base/ORBit-0.5.10-r1
-	>=media-libs/gdk-pixbuf-0.13.0
-	>=net-libs/libesmtp-0.8.11
-	nls? ( sys-devel/gettext )
-	ssl? ( dev-libs/openssl )
-	cups? ( >=gnome-base/gnome-print-0.30 )
-	perl? ( >=dev-libs/libpcre-3.4 )
-	spell? ( >=app-text/pspell-0.11.2 )
-	gtkhtml? ( >=gnome-extra/gtkhtml-0.16.1 )"
-
-src_unpack() {
-	 unpack ${P}.tar.bz2
-	# this patch is from Riccardo Persichetti
-	# (ricpersi@libero.it) to make balsa compile
-	patch -p0 < ${FILESDIR}/${PF}.diff
-}
-
-src_compile() {
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-	use ssl && myconf="${myconf} --with-ssl"
-	use gtkhtml && myconf="${myconf} --with-gtkhtml"
-	use perl && myconf="${myconf} --enable-pcre"
-	use spell && myconf="${myconf} --enable-all"
-
-	libmutt/configure --prefix=/usr \
-		--host=${CHOST} \
-		--with-mailpath=/var/mail || die "configure libmutt failed"
-
-	myconf="${myconf} --enable-threads"
-
-	econf ${myconf} || die "configure balsa failed"
-	emake || die "emake failed"
-}
-
-
-
-src_install () {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		gnomeconfdir=${D}/etc \
-		gnomedatadir=${D}/usr/share install || die "make install failed"
-	dodoc AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO
-	docinto docs
-	dodoc docs/*
-}
diff --git a/net-mail/balsa/balsa-2.0.1-r1.ebuild b/net-mail/balsa/balsa-2.0.1-r1.ebuild
index c8d3f08f0576..8db8c47b73d4 100644
--- a/net-mail/balsa/balsa-2.0.1-r1.ebuild
+++ b/net-mail/balsa/balsa-2.0.1-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/balsa/balsa-2.0.1-r1.ebuild,v 1.1 2002/07/02 01:55:07 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/balsa-2.0.1-r1.ebuild,v 1.2 2002/07/17 04:20:39 seemant Exp $
 
 inherit debug 
 
@@ -9,8 +9,10 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Balsa: Technical Preview email client for GNOME"
 SRC_URI="http://balsa.gnome.org/${P}.tar.bz2"
 HOMEPAGE="http://balsa.gnome.org"
-SLOT="0"
+
+SLOT="2"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
 RDEPEND=">=dev-libs/glib-2.0.4
 	>=x11-libs/gtk+-2.0.5
diff --git a/net-mail/balsa/balsa-2.0.1.ebuild b/net-mail/balsa/balsa-2.0.1.ebuild
deleted file mode 100644
index 1da6d470e8f3..000000000000
--- a/net-mail/balsa/balsa-2.0.1.ebuild
+++ /dev/null
@@ -1,73 +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/balsa/balsa-2.0.1.ebuild,v 1.1 2002/06/18 01:46:26 spider Exp $
-
-inherit debug 
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="Balsa: Technical Preview email client for GNOME"
-SRC_URI="http://balsa.gnome.org/${P}.tar.bz2"
-HOMEPAGE="http://balsa.gnome.org"
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND=">=dev-libs/glib-2.0.3
-	>=x11-libs/gtk+-2.0.3
-	>=net-libs/libesmtp-0.8.11
-	app-text/scrollkeeper
-	app-text/pspell
-	>=gnome-base/libgnome-2.0.0
-	>=gnome-base/libgnomeui-2.0.0
-	>=gnome-base/gnome-vfs-2.0.0
-	>=gnome-base/libgnomeprint-1.115.0
-	>=gnome-base/libgnomeprintui-1.115.0
-	nls? ( sys-devel/gettext )
-	ssl? ( dev-libs/openssl )
-	perl? ( >=dev-libs/libpcre-3.4 )
-	gtkhtml? ( >=gnome-extra/libgtkhtml-2.0.0 )"
-
-DEPEND="dev-util/pkgconfig
-	${RDEPEND}"
-
-	
-src_unpack() {
-	unpack ${A}
-	# this patch is from Riccardo Persichetti
-	# (ricpersi@libero.it) to make balsa compile
-	patch -p0 < ${FILESDIR}/${P}-gentoo.patch || die
-	# This patch is from me, stroke (stroke@gentoo.org)
-	# patch fails against 2.0.1 
-#	patch -p0 < ${FILESDIR}/${P}-varmail.patch || die "patch failed"
-}
-
-src_compile() {
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-	use ssl && myconf="${myconf} --with-ssl"
-	use gtkhtml && myconf="${myconf} --with-gtkhtml"
-	use perl && myconf="${myconf} --enable-pcre"
-# 	use spell && myconf="${myconf} --enable-all"
-
-	libmutt/configure --prefix=/usr \
-		--host=${CHOST} \
-		--with-mailpath=/var/mail || die "configure libmutt failed"
-
-	myconf="${myconf} --enable-threads"
-
-	econf ${myconf} || die "configure balsa failed"
-	emake || die "emake failed"
-}
-
-
-
-src_install () {
-	local myinst
-	myinst="gnomeconfdir=${D}/etc \
-		gnomedatadir=${D}/usr/share"
-
-	einstall ${myinst} || die "make install failed"
-	dodoc AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO
-	docinto docs
-	dodoc docs/*
-}
diff --git a/net-mail/balsa/files/digest-balsa-1.3.6 b/net-mail/balsa/files/digest-balsa-1.3.6
deleted file mode 100644
index 67b373cc2f5c..000000000000
--- a/net-mail/balsa/files/digest-balsa-1.3.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9960c21ce02ee6218ea9524d1d817986 balsa-1.3.6.tar.bz2 2250436
diff --git a/net-mail/balsa/files/digest-balsa-2.0.1 b/net-mail/balsa/files/digest-balsa-2.0.1
deleted file mode 100644
index 0526b3e46bee..000000000000
--- a/net-mail/balsa/files/digest-balsa-2.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 30f867b45b202a34e161f61ced8be73b balsa-2.0.1.tar.bz2 2117754
diff --git a/net-mail/courier/courier-0.39.1.ebuild b/net-mail/courier/courier-0.39.1.ebuild
index b5e93ce8c6e3..dde027258294 100644
--- a/net-mail/courier/courier-0.39.1.ebuild
+++ b/net-mail/courier/courier-0.39.1.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Adapted for courier MTA by Andreas Erhart <andi@as-computer.de> and
-# Alex Hartmann <alex@as-computer.de>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/courier-0.39.1.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/courier-0.39.1.ebuild,v 1.3 2002/07/17 04:20:39 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="An MTA designed specifically for maildirs"
 SRC_URI="http://ftp1.sourceforge.net/courier/${P}.tar.gz"
 HOMEPAGE="http://www.courier-mta.org/"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 PROVIDE="virtual/mta
 	 virtual/imapd"
 RDEPEND="virtual/glibc
@@ -152,6 +154,8 @@ insinto /etc/skel
 insinto /etc/courier
     newins ${FILESDIR}/bofh bofh
     newins ${FILESDIR}/locallowercase locallowercase
+
+	dodoc AUTHORS BENCHMARKS ChangeLog* NEWS README TODO
 }
 
 pkg_preinst() {
diff --git a/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.3.ebuild b/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.3.ebuild
index dfeb07c6c981..cddc6d05b8d1 100644
--- a/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.3.ebuild
+++ b/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.3.ebuild
@@ -1,13 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.3.ebuild,v 1.3 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.3.ebuild,v 1.4 2002/07/17 04:20:39 seemant Exp $
 
 S=${WORKDIR}/${P}
-
 DESCRIPTION="CVM modules for use with vmailmgr"
 SRC_URI="http://untroubled.org/cvm-vmailmgr/${P}.tar.gz"
 HOMEPAGE="http://untroubled.org/cvm-vmailmgr/"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="virtual/glibc"
 
 RDEPEND=">=net-mail/vmailmgr-0.96.9-r1
@@ -34,6 +37,7 @@ src_install () {
 	insinto /etc/vmailmgr
 	doins ${FILESDIR}/cvm-vmailmgr-socket
 
+	dodoc ANNOUNCEMENT COPYING FILES NEWS README TARGETS TODO VERSION
 }
 
 pkg_postinst() {
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.5.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.5.ebuild
index e4a56f5b5e5a..51ed5adac7fe 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.5.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.5.ebuild,v 1.2 2002/07/17 04:20:39 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="The Cyrus IMAP Server"
 HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
-
-S=${WORKDIR}/${P}
 SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
+
 LICENSE="as-is"
 SLOT="1"
 KEYWORDS="x86"
diff --git a/net-mail/evolution/evolution-1.0.3-r6.ebuild b/net-mail/evolution/evolution-1.0.3-r6.ebuild
deleted file mode 100644
index 0cc73887e862..000000000000
--- a/net-mail/evolution/evolution-1.0.3-r6.ebuild
+++ /dev/null
@@ -1,181 +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/evolution/evolution-1.0.3-r6.ebuild,v 1.5 2002/07/11 06:30:47 drobbins Exp $
-
-#provide Xmake and Xemake
-
-inherit virtualx
-
-DB3=db-3.1.17
-S=${WORKDIR}/${P}
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${P}.tar.gz
-	ftp://ftp.ximian.com/pub/source/${PN}/${P}.tar.gz
-	http://people.codefactory.se/~micke/${PN}/${P}.tar.gz
-	http://www.sleepycat.com/update/3.1.17/${DB3}.tar.gz"
-HOMEPAGE="http://www.ximian.com"
-
-RDEPEND=">=gnome-extra/bonobo-conf-0.14
-	>=gnome-base/bonobo-1.0.18
-	>=gnome-extra/gal-0.19
-	>=gnome-base/gconf-1.0.7
-	>=gnome-extra/gtkhtml-1.0.1
-	>=gnome-base/oaf-0.6.7
-	>=gnome-base/ORBit-0.5.12
-	>=gnome-base/libglade-0.17-r1
-	>=media-libs/gdk-pixbuf-0.14.0
-	>=dev-libs/libxml-1.8.16
-	>=gnome-base/gnome-vfs-1.0.2-r1
-	>=gnome-base/gnome-print-0.34
-	>=app-text/scrollkeeper-0.2
-	dev-util/gob
-	ssl?     ( >=net-www/mozilla-0.9.9 )
-	ldap?    ( >=net-nds/openldap-2.0 )
-	mozilla? ( >=net-www/mozilla-0.9.9 )
-	pda?     ( >=gnome-extra/gnome-pilot-0.1.61-r2 )
-	spell?   ( >=app-text/gnome-spell-0.4.1-r1 )"
-
-# Added dependency on "dev-util/gob" this should fix a configure bug
-
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-1.4.1-r1
-	doc? ( dev-util/gtk-doc )
-	nls?  ( >=dev-util/intltool-0.11
-	        sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	
-	cd ${S}
-	# Fix the filter crash.  This is actually a problem in the add and
-	# edit code.  Mikael Hallendal originally fixed the bug in the add
-	# code.  I added the fixes for the edit code.
-	#
-	# Martin Schlemmer (02 April 2002)
-	patch -p0 < ${FILESDIR}/evolution-1.0.3-filter-crash.patch || die
-	# add mandrake patches
-	# fix KDE detection
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-kde.patch || die
-	# call pilot conduit applet (not pilot link applet)
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-conduit.patch || die
-	# Patch from Preston A. Elder to resolve bug #1355
-	# fix a problem with literal strings and sertain IMAP servers
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-imapfix.diff || die
-
-	# lobtoolize to fix not all libs installing, and buggy .la files.
-	# also add the gnome-pilot.m4 to the macros directory to fix
-	# problems with the pilot conduct
-	cd ${S}
-	if [ ! -f ${S}/macros/gnome-pilot.m4 ]
-	then
-		cp -f ${FILESDIR}/gnome-pilot.m4 ${S}/macros || die
-	fi
-	[ -z "`use pda`" ] && libtoolize --copy --force
-	aclocal -I macros
-	automake --add-missing
-	autoconf
-}
-
-src_compile() {
-
-	cd ${WORKDIR}/${DB3}/build_unix
-	../dist/configure --prefix=${WORKDIR}/db3 || die
-
-	make || die
-	make prefix=${WORKDIR}/db3 install || die
-
-	cd ${S}
-  
-	local myconf=""
-
-	MOZILLA=$MOZILLA_FIVE_HOME
-
-	if [ -n "`use pda`" ] ; then
-		myconf="${myconf} --with-pisock=/usr --enable-pilot-conduits=yes"
-	else
-		myconf="${myconf} --enable-pilot-conduits=no"
-	fi
-
-	if [ -n "`use ldap`" ] ; then
-		myconf="${myconf} --with-openldap=yes"
-	else
-		myconf="${myconf} --with-openldap=no"
-	fi
-
-	if [ -n "`use mozilla`" ] ; then
-		myconf="${myconf} --with-nspr-includes=${MOZILLA}/include/nspr \
-			        --with-nspr-libs=${MOZILLA}"
-	else
-		myconf="${myconf} --without-nspr-libs --without-nspr-includes"
-	fi
-
-	if [ -n "`use ssl`" ] ; then
-		myconf="${myconf} --with-nss-includes=${MOZILLA}/include/nss   \
-				--with-nss-libs=${MOZILLA}"
-	else
-		myconf="${myconf} --without-nss-libs --without-nss-includes"
-	fi
-
-	# SSL needs NSPR libs  ...
-	if [ -n "`use ssl`" ] && [ -z "`use mozilla`" ] ; then
-		myconf="${myconf} --with-nspr-includes=${MOZILLA}/include/nspr \
-				--with-nspr-libs=${MOZILLA}"
-	fi
-
-	if [ -n "`use doc`" ] ; then
-		myconf="${myconf} --enable-gtk-doc"
-	else
-		myconf="${myconf} --disable-gtk-doc"
-	fi
-
-	if [ -z "`use nls`" ] ; then
-		myconf="${myconf} --disable-nls"
-	fi
-
-	CFLAGS="${CFLAGS} -I/usr/include/libpisock"
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--datadir=/usr/share \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		--with-db3=${WORKDIR}/db3 \
-		--disable-python-bindings \
-		${myconf} || die
-
-	#needs to be able to connect to X display to build.
-	Xemake || Xmake || die
-}
-
-src_install() {
-	cd omf-install
-	cp Makefile Makefile.old
-	sed -e "s:scrollkeeper-update.*::g" Makefile.old > Makefile
-	rm Makefile.old
-	cd ${S}
-
-	# Don't use DESTDIR it violates sandbox // Hallski
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		datadir=${D}/usr/share \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var/lib \
-		KDE_APPLNK_DIR=${D}/usr/share/applnk \
-		install || die
-
-	dodoc AUTHORS COPYING* ChangeLog HACKING MAINTAINERS
-	dodoc NEWS README
-}
-
-pkg_postinst() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-
-pkg_postrm() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-
diff --git a/net-mail/evolution/evolution-1.0.3-r7.ebuild b/net-mail/evolution/evolution-1.0.3-r7.ebuild
deleted file mode 100644
index d7732cc61e25..000000000000
--- a/net-mail/evolution/evolution-1.0.3-r7.ebuild
+++ /dev/null
@@ -1,183 +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/evolution/evolution-1.0.3-r7.ebuild,v 1.3 2002/07/11 06:30:47 drobbins Exp $
-
-#provide Xmake and Xemake
-
-inherit virtualx
-
-DB3=db-3.1.17
-S=${WORKDIR}/${P}
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${P}.tar.gz
-	ftp://ftp.ximian.com/pub/source/${PN}/${P}.tar.gz
-	http://people.codefactory.se/~micke/${PN}/${P}.tar.gz
-	http://www.sleepycat.com/update/3.1.17/${DB3}.tar.gz"
-HOMEPAGE="http://www.ximian.com"
-
-RDEPEND=">=gnome-extra/bonobo-conf-0.14
-	>=gnome-base/bonobo-1.0.18
-	>=gnome-extra/gal-0.19
-	>=gnome-base/gconf-1.0.7
-	>=gnome-extra/gtkhtml-1.0.1
-	>=gnome-base/oaf-0.6.7
-	>=gnome-base/ORBit-0.5.12
-	>=gnome-base/libglade-0.17-r1
-	>=media-libs/gdk-pixbuf-0.14.0
-	>=dev-libs/libxml-1.8.16
-	>=gnome-base/gnome-vfs-1.0.2-r1
-	>=gnome-base/gnome-print-0.34
-	>=app-text/scrollkeeper-0.2
-	dev-util/gob
-	ssl?     ( >=net-www/mozilla-0.9.9 )
-	ldap?    ( >=net-nds/openldap-2.0 )
-	mozilla? ( >=net-www/mozilla-0.9.9 )
-	pda?     ( >=gnome-extra/gnome-pilot-0.1.61-r2 )
-	spell?   ( >=app-text/gnome-spell-0.4.1-r1 )"
-
-# Added dependency on "dev-util/gob" this should fix a configure bug
-
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-1.4.1-r1
-	doc? ( dev-util/gtk-doc )
-	nls?  ( >=dev-util/intltool-0.11
-	        sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	
-	cd ${S}
-	# Fix the filter crash.  This is actually a problem in the add and
-	# edit code.  Mikael Hallendal originally fixed the bug in the add
-	# code.  I added the fixes for the edit code.
-	#
-	# Martin Schlemmer (02 April 2002)
-	patch -p0 < ${FILESDIR}/evolution-1.0.3-filter-crash.patch || die
-	# add mandrake patches
-	# fix KDE detection
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-kde.patch || die
-	# call pilot conduit applet (not pilot link applet)
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-conduit.patch || die
-	# Patch from Preston A. Elder to resolve bug #1355
-	# fix a problem with literal strings and sertain IMAP servers
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-imapfix.diff || die
-
-	# A fix for a recent security related issue 
-	patch -d ${S} -p0 < ${FILESDIR}/${PN}-${PV}-24140.patch || die "security-patch failed"  
-	# lobtoolize to fix not all libs installing, and buggy .la files.
-	# also add the gnome-pilot.m4 to the macros directory to fix
-	# problems with the pilot conduct
-	cd ${S}
-	if [ ! -f ${S}/macros/gnome-pilot.m4 ]
-	then
-		cp -f ${FILESDIR}/gnome-pilot.m4 ${S}/macros || die
-	fi
-	[ -z "`use pda`" ] && libtoolize --copy --force
-	aclocal -I macros
-	automake --add-missing
-	autoconf
-}
-
-src_compile() {
-
-	cd ${WORKDIR}/${DB3}/build_unix
-	../dist/configure --prefix=${WORKDIR}/db3 || die
-
-	make || die
-	make prefix=${WORKDIR}/db3 install || die
-
-	cd ${S}
-  
-	local myconf=""
-
-	MOZILLA=$MOZILLA_FIVE_HOME
-
-	if [ -n "`use pda`" ] ; then
-		myconf="${myconf} --with-pisock=/usr --enable-pilot-conduits=yes"
-	else
-		myconf="${myconf} --enable-pilot-conduits=no"
-	fi
-
-	if [ -n "`use ldap`" ] ; then
-		myconf="${myconf} --with-openldap=yes"
-	else
-		myconf="${myconf} --with-openldap=no"
-	fi
-
-	if [ -n "`use mozilla`" ] ; then
-		myconf="${myconf} --with-nspr-includes=${MOZILLA}/include/nspr \
-			        --with-nspr-libs=${MOZILLA}"
-	else
-		myconf="${myconf} --without-nspr-libs --without-nspr-includes"
-	fi
-
-	if [ -n "`use ssl`" ] ; then
-		myconf="${myconf} --with-nss-includes=${MOZILLA}/include/nss   \
-				--with-nss-libs=${MOZILLA}"
-	else
-		myconf="${myconf} --without-nss-libs --without-nss-includes"
-	fi
-
-	# SSL needs NSPR libs  ...
-	if [ -n "`use ssl`" ] && [ -z "`use mozilla`" ] ; then
-		myconf="${myconf} --with-nspr-includes=${MOZILLA}/include/nspr \
-				--with-nspr-libs=${MOZILLA}"
-	fi
-
-	if [ -n "`use doc`" ] ; then
-		myconf="${myconf} --enable-gtk-doc"
-	else
-		myconf="${myconf} --disable-gtk-doc"
-	fi
-
-	if [ -z "`use nls`" ] ; then
-		myconf="${myconf} --disable-nls"
-	fi
-
-	CFLAGS="${CFLAGS} -I/usr/include/libpisock"
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--datadir=/usr/share \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		--with-db3=${WORKDIR}/db3 \
-		--disable-python-bindings \
-		${myconf} || die
-
-	#needs to be able to connect to X display to build.
-	Xemake || Xmake || die
-}
-
-src_install() {
-	cd omf-install
-	cp Makefile Makefile.old
-	sed -e "s:scrollkeeper-update.*::g" Makefile.old > Makefile
-	rm Makefile.old
-	cd ${S}
-
-	# Don't use DESTDIR it violates sandbox // Hallski
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		datadir=${D}/usr/share \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var/lib \
-		KDE_APPLNK_DIR=${D}/usr/share/applnk \
-		install || die
-
-	dodoc AUTHORS COPYING* ChangeLog HACKING MAINTAINERS
-	dodoc NEWS README
-}
-
-pkg_postinst() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-
-pkg_postrm() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-
diff --git a/net-mail/evolution/evolution-1.0.5-r1.ebuild b/net-mail/evolution/evolution-1.0.5-r1.ebuild
deleted file mode 100644
index ebf8e85dda97..000000000000
--- a/net-mail/evolution/evolution-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,187 +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/evolution/evolution-1.0.5-r1.ebuild,v 1.2 2002/06/09 13:19:18 stroke Exp $
-
-#provide Xmake and Xemake
-
-inherit virtualx
-
-DB3=db-3.1.17
-S=${WORKDIR}/${P}
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz
-	ftp://ftp.ximian.com/pub/source/${PN}/${P}.tar.gz
-	http://people.codefactory.se/~micke/${PN}/${P}.tar.gz
-	http://www.sleepycat.com/update/3.1.17/${DB3}.tar.gz"
-HOMEPAGE="http://www.ximian.com"
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND=">=gnome-extra/bonobo-conf-0.14
-	>=gnome-base/bonobo-1.0.18
-	>=gnome-extra/gal-0.19.2
-	( >=gnome-base/gconf-1.0.7 
-			<gnome-base/gconf-1.1 )
-	>=gnome-extra/gtkhtml-1.0.1
-	>=gnome-base/oaf-0.6.7
-	>=gnome-base/ORBit-0.5.12
-	( >=gnome-base/libglade-0.17-r1
-			<gnome-base/libglade-2.0 )		
-	>=media-libs/gdk-pixbuf-0.14.0
-	>=dev-libs/libxml-1.8.16
-	( >=gnome-base/gnome-vfs-1.0.2-r2
-			<gnome-base/gnome-vfs-1.9 )		
-	>=gnome-base/gnome-print-0.34
-	( >=app-text/scrollkeeper-0.2
-			<app-text/scrollkeeper-0.3 )
-	dev-util/gob
-	ssl?     ( >=net-www/mozilla-0.9.9 )
-	ldap?    ( >=net-nds/openldap-2.0 )
-	mozilla? ( >=net-www/mozilla-0.9.9 )
-	pda?     ( >=gnome-extra/gnome-pilot-0.1.61-r2 )
-	spell?   ( >=app-text/gnome-spell-0.4.1-r1 )"
-
-# Added dependency on "dev-util/gob" this should fix a configure bug
-
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-1.4.1-r1
-	doc? ( dev-util/gtk-doc )
-	nls?  ( >=dev-util/intltool-0.11
-	        sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	
-	cd ${S}
-	# Fix the filter crash.  This is actually a problem in the add and
-	# edit code.  Mikael Hallendal originally fixed the bug in the add
-	# code.  I added the fixes for the edit code.
-	#
-	# Martin Schlemmer (02 April 2002)
-	patch -p0 < ${FILESDIR}/evolution-1.0.3-filter-crash.patch || die
-	# add mandrake patches
-	# fix KDE detection
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-kde.patch || die
-	# call pilot conduit applet (not pilot link applet)
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-conduit.patch || die
-	# Patch from Preston A. Elder to resolve bug #1355
-	# fix a problem with literal strings and sertain IMAP servers
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-imapfix.diff || die
-
-	# lobtoolize to fix not all libs installing, and buggy .la files.
-	# also add the gnome-pilot.m4 to the macros directory to fix
-	# problems with the pilot conduct
-	cd ${S}
-	if [ ! -f ${S}/macros/gnome-pilot.m4 ]
-	then
-		cp -f ${FILESDIR}/gnome-pilot.m4 ${S}/macros || die
-	fi
-	[ -z "`use pda`" ] && libtoolize --copy --force
-	aclocal -I macros
-	automake --add-missing
-	autoconf
-}
-
-src_compile() {
-
-	cd ${WORKDIR}/${DB3}/build_unix
-	../dist/configure --prefix=${WORKDIR}/db3 || die
-
-	make || die
-	make prefix=${WORKDIR}/db3 install || die
-
-	cd ${S}
-  
-	local myconf=""
-
-	MOZILLA=$MOZILLA_FIVE_HOME
-
-	if [ -n "`use pda`" ] ; then
-		myconf="${myconf} --with-pisock=/usr --enable-pilot-conduits=yes"
-	else
-		myconf="${myconf} --enable-pilot-conduits=no"
-	fi
-
-	if [ -n "`use ldap`" ] ; then
-		myconf="${myconf} --with-openldap=yes"
-	else
-		myconf="${myconf} --with-openldap=no"
-	fi
-
-	if [ -n "`use mozilla`" ] ; then
-		myconf="${myconf} --with-nspr-includes=${MOZILLA}/include/nspr \
-			        --with-nspr-libs=${MOZILLA}"
-	else
-		myconf="${myconf} --without-nspr-libs --without-nspr-includes"
-	fi
-
-	if [ -n "`use ssl`" ] ; then
-		myconf="${myconf} --with-nss-includes=${MOZILLA}/include/nss   \
-				--with-nss-libs=${MOZILLA}"
-	else
-		myconf="${myconf} --without-nss-libs --without-nss-includes"
-	fi
-
-	# SSL needs NSPR libs  ...
-	if [ -n "`use ssl`" ] && [ -z "`use mozilla`" ] ; then
-		myconf="${myconf} --with-nspr-includes=${MOZILLA}/include/nspr \
-				--with-nspr-libs=${MOZILLA}"
-	fi
-
-	if [ -n "`use doc`" ] ; then
-		myconf="${myconf} --enable-gtk-doc"
-	else
-		myconf="${myconf} --disable-gtk-doc"
-	fi
-
-	if [ -z "`use nls`" ] ; then
-		myconf="${myconf} --disable-nls"
-	fi
-
-	CFLAGS="${CFLAGS} -I/usr/include/libpisock"
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--datadir=/usr/share \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		--with-db3=${WORKDIR}/db3 \
-		--disable-python-bindings \
-		${myconf} || die
-
-	#needs to be able to connect to X display to build.
-	Xemake || Xmake || die
-}
-
-src_install() {
-	cd omf-install
-	cp Makefile Makefile.old
-	sed -e "s:scrollkeeper-update.*::g" Makefile.old > Makefile
-	rm Makefile.old
-	cd ${S}
-
-	# Don't use DESTDIR it violates sandbox // Hallski
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		datadir=${D}/usr/share \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var/lib \
-		KDE_APPLNK_DIR=${D}/usr/share/applnk \
-		install || die
-
-	dodoc AUTHORS COPYING* ChangeLog HACKING MAINTAINERS
-	dodoc NEWS README
-}
-
-pkg_postinst() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-
-pkg_postrm() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-
diff --git a/net-mail/evolution/evolution-1.0.5-r2.ebuild b/net-mail/evolution/evolution-1.0.5-r2.ebuild
deleted file mode 100644
index f473ae850fa2..000000000000
--- a/net-mail/evolution/evolution-1.0.5-r2.ebuild
+++ /dev/null
@@ -1,187 +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/evolution/evolution-1.0.5-r2.ebuild,v 1.1 2002/06/09 19:34:56 azarah Exp $
-
-#provide Xmake and Xemake
-
-inherit virtualx libtool
-
-DB3=db-3.1.17
-S=${WORKDIR}/${P}
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz
-	ftp://ftp.ximian.com/pub/source/${PN}/${P}.tar.gz
-	http://people.codefactory.se/~micke/${PN}/${P}.tar.gz
-	http://www.sleepycat.com/update/3.1.17/${DB3}.tar.gz"
-HOMEPAGE="http://www.ximian.com"
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND=">=gnome-extra/bonobo-conf-0.14
-	>=gnome-base/bonobo-1.0.18
-	>=gnome-extra/gal-0.19.2
-	( >=gnome-base/gconf-1.0.7 
-			<gnome-base/gconf-1.1 )
-	>=gnome-extra/gtkhtml-1.0.1
-	>=gnome-base/oaf-0.6.7
-	>=gnome-base/ORBit-0.5.12
-	( >=gnome-base/libglade-0.17-r1
-			<gnome-base/libglade-2.0 )		
-	>=media-libs/gdk-pixbuf-0.14.0
-	>=dev-libs/libxml-1.8.16
-	( >=gnome-base/gnome-vfs-1.0.2-r2
-			<gnome-base/gnome-vfs-1.9 )		
-	>=gnome-base/gnome-print-0.34
-	( >=app-text/scrollkeeper-0.2
-			<app-text/scrollkeeper-0.3 )
-	dev-util/gob
-	ssl?     ( >=net-www/mozilla-0.9.9 )
-	ldap?    ( >=net-nds/openldap-2.0 )
-	mozilla? ( >=net-www/mozilla-0.9.9 )
-	pda?     ( >=gnome-extra/gnome-pilot-0.1.61-r2 )
-	spell?   ( >=app-text/gnome-spell-0.4.1-r1 )"
-
-# Added dependency on "dev-util/gob" this should fix a configure bug
-
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-1.4.1-r1
-	doc? ( dev-util/gtk-doc )
-	nls?  ( >=dev-util/intltool-0.11
-	        sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	
-	cd ${S}
-	# Fix the filter crash.  This is actually a problem in the add and
-	# edit code.  Mikael Hallendal originally fixed the bug in the add
-	# code.  I added the fixes for the edit code.
-	#
-	# Martin Schlemmer (02 April 2002)
-	patch -p0 < ${FILESDIR}/evolution-1.0.3-filter-crash.patch || die
-	# add mandrake patches
-	# fix KDE detection
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-kde.patch || die
-	# call pilot conduit applet (not pilot link applet)
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-conduit.patch || die
-	# Patch from Preston A. Elder to resolve bug #1355
-	# fix a problem with literal strings and sertain IMAP servers
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-imapfix.diff || die
-
-	# lobtoolize to fix not all libs installing, and buggy .la files.
-	# also add the gnome-pilot.m4 to the macros directory to fix
-	# problems with the pilot conduct
-	cd ${S}
-	if [ ! -f ${S}/macros/gnome-pilot.m4 ]
-	then
-		cp -f ${FILESDIR}/gnome-pilot.m4 ${S}/macros || die
-	fi
-	elibtoolize
-	aclocal -I macros
-	automake --add-missing
-	autoconf
-}
-
-src_compile() {
-
-	cd ${WORKDIR}/${DB3}/build_unix
-	../dist/configure --prefix=${WORKDIR}/db3 || die
-
-	make || die
-	make prefix=${WORKDIR}/db3 install || die
-
-	cd ${S}
-  
-	local myconf=""
-
-	MOZILLA=$MOZILLA_FIVE_HOME
-
-	if [ -n "`use pda`" ] ; then
-		myconf="${myconf} --with-pisock=/usr --enable-pilot-conduits=yes"
-	else
-		myconf="${myconf} --enable-pilot-conduits=no"
-	fi
-
-	if [ -n "`use ldap`" ] ; then
-		myconf="${myconf} --with-openldap=yes"
-	else
-		myconf="${myconf} --with-openldap=no"
-	fi
-
-	if [ -n "`use mozilla`" ] ; then
-		myconf="${myconf} --with-nspr-includes=${MOZILLA}/include/nspr \
-			        --with-nspr-libs=${MOZILLA}"
-	else
-		myconf="${myconf} --without-nspr-libs --without-nspr-includes"
-	fi
-
-	if [ -n "`use ssl`" ] ; then
-		myconf="${myconf} --with-nss-includes=${MOZILLA}/include/nss   \
-				--with-nss-libs=${MOZILLA}"
-	else
-		myconf="${myconf} --without-nss-libs --without-nss-includes"
-	fi
-
-	# SSL needs NSPR libs  ...
-	if [ -n "`use ssl`" ] && [ -z "`use mozilla`" ] ; then
-		myconf="${myconf} --with-nspr-includes=${MOZILLA}/include/nspr \
-				--with-nspr-libs=${MOZILLA}"
-	fi
-
-	if [ -n "`use doc`" ] ; then
-		myconf="${myconf} --enable-gtk-doc"
-	else
-		myconf="${myconf} --disable-gtk-doc"
-	fi
-
-	if [ -z "`use nls`" ] ; then
-		myconf="${myconf} --disable-nls"
-	fi
-
-	CFLAGS="${CFLAGS} -I/usr/include/libpisock"
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--datadir=/usr/share \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		--with-db3=${WORKDIR}/db3 \
-		--disable-python-bindings \
-		${myconf} || die
-
-	#needs to be able to connect to X display to build.
-	Xemake || Xmake || die
-}
-
-src_install() {
-	cd omf-install
-	cp Makefile Makefile.old
-	sed -e "s:scrollkeeper-update.*::g" Makefile.old > Makefile
-	rm Makefile.old
-	cd ${S}
-
-	# Don't use DESTDIR it violates sandbox // Hallski
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		datadir=${D}/usr/share \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var/lib \
-		KDE_APPLNK_DIR=${D}/usr/share/applnk \
-		install || die
-
-	dodoc AUTHORS COPYING* ChangeLog HACKING MAINTAINERS
-	dodoc NEWS README
-}
-
-pkg_postinst() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-
-pkg_postrm() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-
diff --git a/net-mail/evolution/evolution-1.0.5-r3.ebuild b/net-mail/evolution/evolution-1.0.5-r3.ebuild
index 2bcc73f93cf9..e2e4f1ecd045 100644
--- a/net-mail/evolution/evolution-1.0.5-r3.ebuild
+++ b/net-mail/evolution/evolution-1.0.5-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/evolution/evolution-1.0.5-r3.ebuild,v 1.1 2002/06/12 12:11:26 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.0.5-r3.ebuild,v 1.2 2002/07/17 04:20:39 seemant Exp $
 
 #provide Xmake and Xemake
 
@@ -16,6 +16,7 @@ SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz
 HOMEPAGE="http://www.ximian.com"
 SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
 RDEPEND=">=gnome-extra/bonobo-conf-0.14
 	>=gnome-base/bonobo-1.0.18
diff --git a/net-mail/evolution/evolution-1.0.5.ebuild b/net-mail/evolution/evolution-1.0.5.ebuild
deleted file mode 100644
index 2c851af5c52c..000000000000
--- a/net-mail/evolution/evolution-1.0.5.ebuild
+++ /dev/null
@@ -1,181 +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/evolution/evolution-1.0.5.ebuild,v 1.3 2002/07/11 06:30:47 drobbins Exp $
-
-#provide Xmake and Xemake
-
-inherit virtualx
-
-DB3=db-3.1.17
-S=${WORKDIR}/${P}
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz
-	ftp://ftp.ximian.com/pub/source/${PN}/${P}.tar.gz
-	http://people.codefactory.se/~micke/${PN}/${P}.tar.gz
-	http://www.sleepycat.com/update/3.1.17/${DB3}.tar.gz"
-HOMEPAGE="http://www.ximian.com"
-
-RDEPEND=">=gnome-extra/bonobo-conf-0.14
-	>=gnome-base/bonobo-1.0.18
-	>=gnome-extra/gal-0.19.2
-	>=gnome-base/gconf-1.0.7
-	>=gnome-extra/gtkhtml-1.0.1
-	>=gnome-base/oaf-0.6.7
-	>=gnome-base/ORBit-0.5.12
-	>=gnome-base/libglade-0.17-r1
-	>=media-libs/gdk-pixbuf-0.14.0
-	>=dev-libs/libxml-1.8.16
-	>=gnome-base/gnome-vfs-1.0.2-r1
-	>=gnome-base/gnome-print-0.34
-	>=app-text/scrollkeeper-0.2
-	dev-util/gob
-	ssl?     ( >=net-www/mozilla-0.9.9 )
-	ldap?    ( >=net-nds/openldap-2.0 )
-	mozilla? ( >=net-www/mozilla-0.9.9 )
-	pda?     ( >=gnome-extra/gnome-pilot-0.1.61-r2 )
-	spell?   ( >=app-text/gnome-spell-0.4.1-r1 )"
-
-# Added dependency on "dev-util/gob" this should fix a configure bug
-
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-1.4.1-r1
-	doc? ( dev-util/gtk-doc )
-	nls?  ( >=dev-util/intltool-0.11
-	        sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	
-	cd ${S}
-	# Fix the filter crash.  This is actually a problem in the add and
-	# edit code.  Mikael Hallendal originally fixed the bug in the add
-	# code.  I added the fixes for the edit code.
-	#
-	# Martin Schlemmer (02 April 2002)
-	patch -p0 < ${FILESDIR}/evolution-1.0.3-filter-crash.patch || die
-	# add mandrake patches
-	# fix KDE detection
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-kde.patch || die
-	# call pilot conduit applet (not pilot link applet)
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-conduit.patch || die
-	# Patch from Preston A. Elder to resolve bug #1355
-	# fix a problem with literal strings and sertain IMAP servers
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-imapfix.diff || die
-
-	# lobtoolize to fix not all libs installing, and buggy .la files.
-	# also add the gnome-pilot.m4 to the macros directory to fix
-	# problems with the pilot conduct
-	cd ${S}
-	if [ ! -f ${S}/macros/gnome-pilot.m4 ]
-	then
-		cp -f ${FILESDIR}/gnome-pilot.m4 ${S}/macros || die
-	fi
-	[ -z "`use pda`" ] && libtoolize --copy --force
-	aclocal -I macros
-	automake --add-missing
-	autoconf
-}
-
-src_compile() {
-
-	cd ${WORKDIR}/${DB3}/build_unix
-	../dist/configure --prefix=${WORKDIR}/db3 || die
-
-	make || die
-	make prefix=${WORKDIR}/db3 install || die
-
-	cd ${S}
-  
-	local myconf=""
-
-	MOZILLA=$MOZILLA_FIVE_HOME
-
-	if [ -n "`use pda`" ] ; then
-		myconf="${myconf} --with-pisock=/usr --enable-pilot-conduits=yes"
-	else
-		myconf="${myconf} --enable-pilot-conduits=no"
-	fi
-
-	if [ -n "`use ldap`" ] ; then
-		myconf="${myconf} --with-openldap=yes"
-	else
-		myconf="${myconf} --with-openldap=no"
-	fi
-
-	if [ -n "`use mozilla`" ] ; then
-		myconf="${myconf} --with-nspr-includes=${MOZILLA}/include/nspr \
-			        --with-nspr-libs=${MOZILLA}"
-	else
-		myconf="${myconf} --without-nspr-libs --without-nspr-includes"
-	fi
-
-	if [ -n "`use ssl`" ] ; then
-		myconf="${myconf} --with-nss-includes=${MOZILLA}/include/nss   \
-				--with-nss-libs=${MOZILLA}"
-	else
-		myconf="${myconf} --without-nss-libs --without-nss-includes"
-	fi
-
-	# SSL needs NSPR libs  ...
-	if [ -n "`use ssl`" ] && [ -z "`use mozilla`" ] ; then
-		myconf="${myconf} --with-nspr-includes=${MOZILLA}/include/nspr \
-				--with-nspr-libs=${MOZILLA}"
-	fi
-
-	if [ -n "`use doc`" ] ; then
-		myconf="${myconf} --enable-gtk-doc"
-	else
-		myconf="${myconf} --disable-gtk-doc"
-	fi
-
-	if [ -z "`use nls`" ] ; then
-		myconf="${myconf} --disable-nls"
-	fi
-
-	CFLAGS="${CFLAGS} -I/usr/include/libpisock"
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--datadir=/usr/share \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		--with-db3=${WORKDIR}/db3 \
-		--disable-python-bindings \
-		${myconf} || die
-
-	#needs to be able to connect to X display to build.
-	Xemake || Xmake || die
-}
-
-src_install() {
-	cd omf-install
-	cp Makefile Makefile.old
-	sed -e "s:scrollkeeper-update.*::g" Makefile.old > Makefile
-	rm Makefile.old
-	cd ${S}
-
-	# Don't use DESTDIR it violates sandbox // Hallski
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		datadir=${D}/usr/share \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var/lib \
-		KDE_APPLNK_DIR=${D}/usr/share/applnk \
-		install || die
-
-	dodoc AUTHORS COPYING* ChangeLog HACKING MAINTAINERS
-	dodoc NEWS README
-}
-
-pkg_postinst() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-
-pkg_postrm() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-
diff --git a/net-mail/evolution/evolution-1.0.7.ebuild b/net-mail/evolution/evolution-1.0.7.ebuild
index b4878afbf767..301f3131b4ce 100644
--- a/net-mail/evolution/evolution-1.0.7.ebuild
+++ b/net-mail/evolution/evolution-1.0.7.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/evolution/evolution-1.0.7.ebuild,v 1.1 2002/06/15 03:57:23 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.0.7.ebuild,v 1.2 2002/07/17 04:20:39 seemant Exp $
 
 #provide Xmake and Xemake
 
@@ -16,6 +16,7 @@ SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz
 HOMEPAGE="http://www.ximian.com"
 SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
 RDEPEND=">=gnome-extra/bonobo-conf-0.14
 	>=gnome-base/bonobo-1.0.18
diff --git a/net-mail/evolution/files/digest-evolution-1.0.3-r6 b/net-mail/evolution/files/digest-evolution-1.0.3-r6
deleted file mode 100644
index c04a2f7454ba..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.0.3-r6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 28ffb3911f46a591466a78f5c805c0aa evolution-1.0.3.tar.gz 12908768
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/digest-evolution-1.0.3-r7 b/net-mail/evolution/files/digest-evolution-1.0.3-r7
deleted file mode 100644
index c04a2f7454ba..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.0.3-r7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 28ffb3911f46a591466a78f5c805c0aa evolution-1.0.3.tar.gz 12908768
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/digest-evolution-1.0.5 b/net-mail/evolution/files/digest-evolution-1.0.5
deleted file mode 100644
index e66b02a7f198..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.0.5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 16a67877f63586e3fbd62c4070334cc1 evolution-1.0.5.tar.gz 13077615
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/digest-evolution-1.0.5-r1 b/net-mail/evolution/files/digest-evolution-1.0.5-r1
deleted file mode 100644
index e66b02a7f198..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.0.5-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 16a67877f63586e3fbd62c4070334cc1 evolution-1.0.5.tar.gz 13077615
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/digest-evolution-1.0.5-r2 b/net-mail/evolution/files/digest-evolution-1.0.5-r2
deleted file mode 100644
index e66b02a7f198..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.0.5-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 16a67877f63586e3fbd62c4070334cc1 evolution-1.0.5.tar.gz 13077615
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/exim/exim-3.32-r6.ebuild b/net-mail/exim/exim-3.32-r6.ebuild
deleted file mode 100644
index 1b237fe248c1..000000000000
--- a/net-mail/exim/exim-3.32-r6.ebuild
+++ /dev/null
@@ -1,151 +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/exim/exim-3.32-r6.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/${P}.tar.gz"
-HOMEPAGE="http://www.exim.org/"
-
-DEPEND="virtual/glibc
-        >=sys-libs/db-3.2
-        >=sys-devel/perl-5.6.0
-        pam? ( >=sys-libs/pam-0.75 )
-        tcpd? ( sys-apps/tcp-wrappers )
-        mta-tls? ( >=dev-libs/openssl-0.9.6 )
-        mta-ldap? ( >=net-nds/openldap-2.0.7 )
-        mta-mysql? ( >=dev-db/mysql-3.23.28 )"
-
-RDEPEND="${DEPEND}
-         !virtual/mta
-         >=net-mail/mailbase-0.00"
-
-PROVIDE="virtual/mta"
-
-
-src_unpack() {
-
-    local myconf
-    unpack ${A}
-    cd ${S}
-
-    mkdir Local
-    sed -e "48i\CFLAGS=${CFLAGS}" \
-	-e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \
-	-e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \
-	-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=/usr/sbin:" \
-	-e "s:COMPRESS_COMMAND=/opt/gnu/bin/gzip:COMPRESS_COMMAND=/usr/bin/gzip:" \
-	-e "s:ZCAT_COMMAND=/opt/gnu/bin/zcat:ZCAT_COMMAND=/usr/bin/zcat:" \
-	-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=/etc/exim/configure:" \
-	-e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \
-	-e "s:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-	-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=/usr/share/info:" \
-	-e "s:# LOG_FILE_PATH=syslog:LOG_FILE_PATH=syslog:" \
-	-e "s:# PID_FILE_PATH=/var/lock/exim%s.pid:PID_FILE_PATH=/var/run/exim%s.pid:" \
-	-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=/var/spool/exim:" \
-	-e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \
-	src/EDITME > Local/Makefile
-
-    cd Local
-    if [ "`use pam`" ] ; then
-	cp Makefile Makefile.orig
-	sed -e "s:# SUPPORT_PAM=yes:SUPPORT_PAM=yes:" Makefile.orig > Makefile
-	myconf="${myconf} -lpam"
-    fi
-    if [ "`use tcpd`" ] ; then
-	cp Makefile Makefile.orig
-	sed -e "s:# USE_TCP_WRAPPERS=yes:USE_TCP_WRAPPERS=yes:" Makefile.orig > Makefile
-	myconf="${myconf} -lwrap"
-    fi
-    if [ "$myconf" ] ; then
-	echo "EXTRALIBS=${myconf}" >> Makefile
-    fi
-
-    cd ${S}
-    if [ "`use mta-tls`" ] ; then
-	cp Local/Makefile Local/Makefile.tmp
-	sed -e "s:# SUPPORT_TLS=yes:SUPPORT_TLS=yes:" \
-	    -e "s:# TLS_LIBS=-lssl -lcrypto:TLS_LIBS=-lssl -lcrypto:" Local/Makefile.tmp > Local/Makefile
-    fi
-    if [ "`use mta-ldap`" ] ; then
-	cp Local/Makefile Local/Makefile.tmp
-	sed -e "s:# LOOKUP_LDAP=yes:LOOKUP_LDAP=yes:" \
-	    -e "s:# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include:LOOKUP_INCLUDE=-I/usr/include/ldap -I/usr/include/mysql:" \
-	    -e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" \
-	    -e "s:# LDAP_LIB_TYPE=OPENLDAP2:LDAP_LIB_TYPE=OPENLDAP2:" Local/Makefile.tmp >| Local/Makefile
-    fi
-    if [ -n "`use mta-mysql`" ] ; then
-	cp Local/Makefile Local/Makefile.tmp
-	sed -e "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" \
-	    -e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" Local/Makefile.tmp >| Local/Makefile
-    fi
-}
-
-
-src_compile() {
-
-    try make
-}
-
-
-src_install () {
-
-    cd ${S}/build-Linux-i386
-    insopts -o root -g root -m 4755
-    insinto /usr/sbin
-    doins exim
-
-    dodir /usr/bin /usr/sbin /usr/lib
-    dosym /usr/sbin/exim /usr/bin/mailq
-    dosym /usr/sbin/exim /usr/bin/newaliases
-    dosym /usr/sbin/exim /usr/bin/mail
-    dosym /usr/sbin/exim /usr/lib/sendmail
-    dosym /usr/sbin/exim /usr/sbin/sendmail
-
-    exeinto /usr/sbin
-    for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock exim_tidydb exinext exiwhat
-    do
-	doexe $i
-    done
-
-    cd ${S}/util
-    exeinto /usr/sbin
-    for i in exigrep eximstats exiqsumm
-    do
-	doexe $i
-    done
-
-    dodir /etc/exim /etc/exim/samples
-
-    insopts -o root -g root -m 0644
-    insinto /etc/exim
-    doins ${FILESDIR}/configure
-
-    cd ${S}/src
-    insopts -o root -g root -m 0644
-    insinto /etc/exim/samples
-    doins configure.default
-
-    dodoc ${S}/doc/*
-
-    # INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
-    insinto /etc/pam.d
-    doins ${FILESDIR}/pam.d-exim
-
-    # A nice filter for exim to protect your windows clients.
-    insinto /etc/exim
-    doins ${FILESDIR}/system_filter.exim
-    einfo "Read the bottom of /etc/exim/system_filter.exim for usage"
-    dodoc ${FILESDIR}/auth_conf.sub
-    einfo "Cat this to the end of your configure for AUTH=PAM support"
-    # FIXME The above messages should be moved into pkg_postinst !!!
-
-    exeinto /etc/init.d
-    newexe ${FILESDIR}/exim.rc6 exim
-}
-
-
-pkg_config() {
-
-    ${ROOT}/usr/sbin/rc-update add exim
-}
diff --git a/net-mail/exim/exim-3.32.ebuild b/net-mail/exim/exim-3.32.ebuild
deleted file mode 100644
index 46c2b8519517..000000000000
--- a/net-mail/exim/exim-3.32.ebuild
+++ /dev/null
@@ -1,151 +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/exim/exim-3.32.ebuild,v 1.8 2002/07/11 06:30:47 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/${P}.tar.gz"
-HOMEPAGE="http://www.exim.org/"
-
-DEPEND="virtual/glibc
-        >=sys-libs/db-3.2
-        >=sys-devel/perl-5.6.0
-        pam? ( >=sys-libs/pam-0.75 )
-        tcpd? ( sys-apps/tcp-wrappers )
-        mta-tls? ( >=dev-libs/openssl-0.9.6 )
-        mta-ldap? ( >=net-nds/openldap-2.0.7 )
-        mta-mysql? ( >=dev-db/mysql-3.23.28 )"
-
-RDEPEND="${DEPEND}
-         !virtual/mta
-         >=net-mail/mailbase-0.00"
-
-PROVIDE="virtual/mta"
-
-
-src_unpack() {
-
-    local myconf
-    unpack ${A}
-    cd ${S}
-
-    mkdir Local
-    sed -e "48i\CFLAGS=${CFLAGS}" \
-	-e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \
-	-e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \
-	-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=/usr/sbin:" \
-	-e "s:COMPRESS_COMMAND=/opt/gnu/bin/gzip:COMPRESS_COMMAND=/usr/bin/gzip:" \
-	-e "s:ZCAT_COMMAND=/opt/gnu/bin/zcat:ZCAT_COMMAND=/usr/bin/zcat:" \
-	-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=/etc/exim/configure:" \
-	-e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \
-	-e "s:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-	-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=/usr/share/info:" \
-	-e "s:# LOG_FILE_PATH=syslog:LOG_FILE_PATH=syslog:" \
-	-e "s:# PID_FILE_PATH=/var/lock/exim%s.pid:PID_FILE_PATH=/var/run/exim%s.pid:" \
-	-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=/var/spool/exim:" \
-	-e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \
-	src/EDITME > Local/Makefile
-
-    cd Local
-    if [ "`use pam`" ] ; then
-	cp Makefile Makefile.orig
-	sed -e "s:# SUPPORT_PAM=yes:SUPPORT_PAM=yes:" Makefile.orig > Makefile
-	myconf="${myconf} -lpam"
-    fi
-    if [ "`use tcpd`" ] ; then
-	cp Makefile Makefile.orig
-	sed -e "s:# USE_TCP_WRAPPERS=yes:USE_TCP_WRAPPERS=yes:" Makefile.orig > Makefile
-	myconf="${myconf} -lwrap"
-    fi
-    if [ "$myconf" ] ; then
-	echo "EXTRALIBS=${myconf}" >> Makefile
-    fi
-
-    cd ${S}
-    if [ "`use mta-tls`" ] ; then
-	cp Local/Makefile Local/Makefile.tmp
-	sed -e "s:# SUPPORT_TLS=yes:SUPPORT_TLS=yes:" \
-	    -e "s:# TLS_LIBS=-lssl -lcrypto:TLS_LIBS=-lssl -lcrypto:" Local/Makefile.tmp > Local/Makefile
-    fi
-    if [ "`use mta-ldap`" ] ; then
-	cp Local/Makefile Local/Makefile.tmp
-	sed -e "s:# LOOKUP_LDAP=yes:LOOKUP_LDAP=yes:" \
-	    -e "s:# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include:LOOKUP_INCLUDE=-I/usr/include/ldap -I/usr/include/mysql:" \
-	    -e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" \
-	    -e "s:# LDAP_LIB_TYPE=OPENLDAP2:LDAP_LIB_TYPE=OPENLDAP2:" Local/Makefile.tmp >| Local/Makefile
-    fi
-    if [ -n "`use mta-mysql`" ] ; then
-	cp Local/Makefile Local/Makefile.tmp
-	sed -e "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" \
-	    -e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" Local/Makefile.tmp >| Local/Makefile
-    fi
-}
-
-
-src_compile() {
-
-    try make
-}
-
-
-src_install () {
-
-    cd ${S}/build-Linux-i386
-    insopts -o root -g root -m 4755
-    insinto /usr/sbin
-    doins exim
-
-    dodir /usr/bin /usr/sbin /usr/lib
-    dosym /usr/sbin/exim /usr/bin/mailq
-    dosym /usr/sbin/exim /usr/bin/newaliases
-    dosym /usr/sbin/exim /usr/bin/mail
-    dosym /usr/sbin/exim /usr/lib/sendmail
-    dosym /usr/sbin/exim /usr/sbin/sendmail
-
-    exeinto /usr/sbin
-    for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock exim_tidydb exinext exiwhat
-    do
-	doexe $i
-    done
-
-    cd ${S}/util
-    exeinto /usr/sbin
-    for i in exigrep eximstats exiqsumm
-    do
-	doexe $i
-    done
-
-    dodir /etc/exim /etc/exim/samples
-
-    insopts -o root -g root -m 0644
-    insinto /etc/exim
-    doins ${FILESDIR}/configure
-
-    cd ${S}/src
-    insopts -o root -g root -m 0644
-    insinto /etc/exim/samples
-    doins configure.default
-
-    dodoc ${S}/doc/*
-
-    # INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
-    insinto /etc/pam.d
-    doins ${FILESDIR}/pam.d-exim
-
-    # A nice filter for exim to protect your windows clients.
-    insinto /etc/exim
-    doins ${FILESDIR}/system_filter.exim
-    einfo "Read the bottom of /etc/exim/system_filter.exim for usage"
-    dodoc ${FILESDIR}/auth_conf.sub
-    einfo "Cat this to the end of your configure for AUTH=PAM support"
-    # FIXME The above messages should be moved into pkg_postinst !!!
-
-    exeinto /etc/rc.d/init.d
-    newexe ${FILESDIR}/exim.rc5 exim
-}
-
-
-pkg_config() {
-
-    ${ROOT}/usr/sbin/rc-update add exim
-}
diff --git a/net-mail/exim/exim-3.33-r1.ebuild b/net-mail/exim/exim-3.33-r1.ebuild
deleted file mode 100644
index 7e95ea7907fe..000000000000
--- a/net-mail/exim/exim-3.33-r1.ebuild
+++ /dev/null
@@ -1,152 +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/exim/exim-3.33-r1.ebuild,v 1.3 2002/07/11 06:30:47 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim3/${P}.tar.gz"
-HOMEPAGE="http://www.exim.org/"
-
-DEPEND="virtual/glibc
-		>=sys-libs/db-3.2
-		>=sys-devel/perl-5.6.0
-		pam? ( >=sys-libs/pam-0.75 )
-		tcpd? ( sys-apps/tcp-wrappers )
-		mta-tls? ( >=dev-libs/openssl-0.9.6 )
-		mta-ldap? ( >=net-nds/openldap-2.0.7 )
-		mta-mysql? ( >=dev-db/mysql-3.23.28 )"
-
-RDEPEND="${DEPEND}
-		 !virtual/mta
-		 >=net-mail/mailbase-0.00"
-
-PROVIDE="virtual/mta"
-
-
-src_unpack() {
-
-	local myconf
-	unpack ${A}
-	cd ${S}
-
-	mkdir Local
-	sed -e "48i\CFLAGS=${CFLAGS}" \
-		-e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \
-		-e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \
-		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=/usr/sbin:" \
-		-e "s:COMPRESS_COMMAND=/opt/gnu/bin/gzip:COMPRESS_COMMAND=/usr/bin/gzip:" \
-		-e "s:ZCAT_COMMAND=/opt/gnu/bin/zcat:ZCAT_COMMAND=/usr/bin/zcat:" \
-		-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=/etc/exim/configure:" \
-		-e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \
-		-e "s:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-		-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=/usr/share/info:" \
-		-e "s:# LOG_FILE_PATH=syslog:LOG_FILE_PATH=syslog:" \
-		-e "s:# PID_FILE_PATH=/var/lock/exim%s.pid:PID_FILE_PATH=/var/run/exim%s.pid:" \
-		-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=/var/spool/exim:" \
-		-e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-	if use pam; then
-		cp Makefile Makefile.orig
-		sed -e "s:# SUPPORT_PAM=yes:SUPPORT_PAM=yes:" Makefile.orig > Makefile
-		myconf="${myconf} -lpam"
-	fi
-	if use tcpd; then
-		cp Makefile Makefile.orig
-		sed -e "s:# USE_TCP_WRAPPERS=yes:USE_TCP_WRAPPERS=yes:" Makefile.orig > Makefile
-		myconf="${myconf} -lwrap"
-	fi
-	if [ -n "$myconf" ] ; then
-		echo "EXTRALIBS=${myconf}" >> Makefile
-	fi
-
-	cd ${S}
-	if use mta-tls; then
-		cp Local/Makefile Local/Makefile.tmp
-		sed -e "s:# SUPPORT_TLS=yes:SUPPORT_TLS=yes:" \
-			-e "s:# TLS_LIBS=-lssl -lcrypto:TLS_LIBS=-lssl -lcrypto:" Local/Makefile.tmp > Local/Makefile
-	fi
-	if use mta-ldap; then
-		cp Local/Makefile Local/Makefile.tmp
-		sed -e "s:# LOOKUP_LDAP=yes:LOOKUP_LDAP=yes:" \
-			-e "s:# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include:LOOKUP_INCLUDE=-I/usr/include/ldap -I/usr/include/mysql:" \
-			-e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" \
-			-e "s:# LDAP_LIB_TYPE=OPENLDAP2:LDAP_LIB_TYPE=OPENLDAP2:" Local/Makefile.tmp >| Local/Makefile
-	fi
-	if use mta-mysql; then
-		cp Local/Makefile Local/Makefile.tmp
-		sed -e "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" \
-			-e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" Local/Makefile.tmp >| Local/Makefile
-	fi
-}
-
-
-src_compile() {
-	make || die
-}
-
-
-src_install () {
-
-	cd ${S}/build-Linux-i386
-	insopts -o root -g root -m 4755
-	insinto /usr/sbin
-	doins exim
-
-	dodir /usr/bin /usr/sbin /usr/lib
-	dosym /usr/sbin/exim /usr/bin/mailq
-	dosym /usr/sbin/exim /usr/bin/newaliases
-	dosym /usr/sbin/exim /usr/bin/mail
-	dosym /usr/sbin/exim /usr/lib/sendmail
-	dosym /usr/sbin/exim /usr/sbin/sendmail
-
-	exeinto /usr/sbin
-	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock exim_tidydb exinext exiwhat
-	do
-		doexe $i
-	done
-
-	cd ${S}/util
-	exeinto /usr/sbin
-	for i in exigrep eximstats exiqsumm
-	do
-		doexe $i
-	done
-
-	dodir /etc/exim /etc/exim/samples
-
-	insopts -o root -g root -m 0644
-	insinto /etc/exim
-	doins ${FILESDIR}/configure
-
-	cd ${S}/src
-	insopts -o root -g root -m 0644
-	insinto /etc/exim/samples
-	doins configure.default
-
-	dodoc ${S}/doc/*
-
-	# INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
-	insinto /etc/pam.d
-	doins ${FILESDIR}/pam.d-exim
-
-	# A nice filter for exim to protect your windows clients.
-	insinto /etc/exim
-	doins ${FILESDIR}/system_filter.exim
-	einfo "Read the bottom of /etc/exim/system_filter.exim for usage"
-	dodoc ${FILESDIR}/auth_conf.sub
-	einfo "Cat this to the end of your configure for AUTH=PAM support"
-	# FIXME The above messages should be moved into pkg_postinst !!!
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/exim.rc6 exim
-	insinto /etc/conf.d
-	newins ${FILESDIR}/exim.confd exim
-}
-
-
-pkg_config() {
-
-	${ROOT}/usr/sbin/rc-update add exim
-}
diff --git a/net-mail/exim/exim-3.33.ebuild b/net-mail/exim/exim-3.33.ebuild
deleted file mode 100644
index 5b5e2688474d..000000000000
--- a/net-mail/exim/exim-3.33.ebuild
+++ /dev/null
@@ -1,151 +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/exim/exim-3.33.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/${P}.tar.gz"
-HOMEPAGE="http://www.exim.org/"
-
-DEPEND="virtual/glibc
-        >=sys-libs/db-3.2
-        >=sys-devel/perl-5.6.0
-        pam? ( >=sys-libs/pam-0.75 )
-        tcpd? ( sys-apps/tcp-wrappers )
-        mta-tls? ( >=dev-libs/openssl-0.9.6 )
-        mta-ldap? ( >=net-nds/openldap-2.0.7 )
-        mta-mysql? ( >=dev-db/mysql-3.23.28 )"
-
-RDEPEND="${DEPEND}
-         !virtual/mta
-         >=net-mail/mailbase-0.00"
-
-PROVIDE="virtual/mta"
-
-
-src_unpack() {
-
-    local myconf
-    unpack ${A}
-    cd ${S}
-
-    mkdir Local
-    sed -e "48i\CFLAGS=${CFLAGS}" \
-	-e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \
-	-e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \
-	-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=/usr/sbin:" \
-	-e "s:COMPRESS_COMMAND=/opt/gnu/bin/gzip:COMPRESS_COMMAND=/usr/bin/gzip:" \
-	-e "s:ZCAT_COMMAND=/opt/gnu/bin/zcat:ZCAT_COMMAND=/usr/bin/zcat:" \
-	-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=/etc/exim/configure:" \
-	-e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \
-	-e "s:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-	-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=/usr/share/info:" \
-	-e "s:# LOG_FILE_PATH=syslog:LOG_FILE_PATH=syslog:" \
-	-e "s:# PID_FILE_PATH=/var/lock/exim%s.pid:PID_FILE_PATH=/var/run/exim%s.pid:" \
-	-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=/var/spool/exim:" \
-	-e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \
-	src/EDITME > Local/Makefile
-
-    cd Local
-    if [ "`use pam`" ] ; then
-	cp Makefile Makefile.orig
-	sed -e "s:# SUPPORT_PAM=yes:SUPPORT_PAM=yes:" Makefile.orig > Makefile
-	myconf="${myconf} -lpam"
-    fi
-    if [ "`use tcpd`" ] ; then
-	cp Makefile Makefile.orig
-	sed -e "s:# USE_TCP_WRAPPERS=yes:USE_TCP_WRAPPERS=yes:" Makefile.orig > Makefile
-	myconf="${myconf} -lwrap"
-    fi
-    if [ "$myconf" ] ; then
-	echo "EXTRALIBS=${myconf}" >> Makefile
-    fi
-
-    cd ${S}
-    if [ "`use mta-tls`" ] ; then
-	cp Local/Makefile Local/Makefile.tmp
-	sed -e "s:# SUPPORT_TLS=yes:SUPPORT_TLS=yes:" \
-	    -e "s:# TLS_LIBS=-lssl -lcrypto:TLS_LIBS=-lssl -lcrypto:" Local/Makefile.tmp > Local/Makefile
-    fi
-    if [ "`use mta-ldap`" ] ; then
-	cp Local/Makefile Local/Makefile.tmp
-	sed -e "s:# LOOKUP_LDAP=yes:LOOKUP_LDAP=yes:" \
-	    -e "s:# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include:LOOKUP_INCLUDE=-I/usr/include/ldap -I/usr/include/mysql:" \
-	    -e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" \
-	    -e "s:# LDAP_LIB_TYPE=OPENLDAP2:LDAP_LIB_TYPE=OPENLDAP2:" Local/Makefile.tmp >| Local/Makefile
-    fi
-    if [ -n "`use mta-mysql`" ] ; then
-	cp Local/Makefile Local/Makefile.tmp
-	sed -e "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" \
-	    -e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" Local/Makefile.tmp >| Local/Makefile
-    fi
-}
-
-
-src_compile() {
-
-    try make
-}
-
-
-src_install () {
-
-    cd ${S}/build-Linux-i386
-    insopts -o root -g root -m 4755
-    insinto /usr/sbin
-    doins exim
-
-    dodir /usr/bin /usr/sbin /usr/lib
-    dosym /usr/sbin/exim /usr/bin/mailq
-    dosym /usr/sbin/exim /usr/bin/newaliases
-    dosym /usr/sbin/exim /usr/bin/mail
-    dosym /usr/sbin/exim /usr/lib/sendmail
-    dosym /usr/sbin/exim /usr/sbin/sendmail
-
-    exeinto /usr/sbin
-    for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock exim_tidydb exinext exiwhat
-    do
-	doexe $i
-    done
-
-    cd ${S}/util
-    exeinto /usr/sbin
-    for i in exigrep eximstats exiqsumm
-    do
-	doexe $i
-    done
-
-    dodir /etc/exim /etc/exim/samples
-
-    insopts -o root -g root -m 0644
-    insinto /etc/exim
-    doins ${FILESDIR}/configure
-
-    cd ${S}/src
-    insopts -o root -g root -m 0644
-    insinto /etc/exim/samples
-    doins configure.default
-
-    dodoc ${S}/doc/*
-
-    # INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
-    insinto /etc/pam.d
-    doins ${FILESDIR}/pam.d-exim
-
-    # A nice filter for exim to protect your windows clients.
-    insinto /etc/exim
-    doins ${FILESDIR}/system_filter.exim
-    einfo "Read the bottom of /etc/exim/system_filter.exim for usage"
-    dodoc ${FILESDIR}/auth_conf.sub
-    einfo "Cat this to the end of your configure for AUTH=PAM support"
-    # FIXME The above messages should be moved into pkg_postinst !!!
-
-    exeinto /etc/init.d
-    newexe ${FILESDIR}/exim.rc6 exim
-}
-
-
-pkg_config() {
-
-    ${ROOT}/usr/sbin/rc-update add exim
-}
diff --git a/net-mail/exim/exim-3.34-r1.ebuild b/net-mail/exim/exim-3.34-r1.ebuild
deleted file mode 100644
index 99a3d017a5a0..000000000000
--- a/net-mail/exim/exim-3.34-r1.ebuild
+++ /dev/null
@@ -1,154 +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/exim/exim-3.34-r1.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim3/${P}.tar.gz"
-HOMEPAGE="http://www.exim.org/"
-
-DEPEND="virtual/glibc
-		>=sys-libs/db-3.2
-		>=sys-devel/perl-5.6.0
-		>=dev-libs/libpcre-3.4
-		pam? ( >=sys-libs/pam-0.75 )
-		tcpd? ( sys-apps/tcp-wrappers )
-		mta-tls? ( >=dev-libs/openssl-0.9.6 )
-		mta-ldap? ( >=net-nds/openldap-2.0.7 )
-		mta-mysql? ( >=dev-db/mysql-3.23.28 )"
-
-RDEPEND="${DEPEND}
-		 !virtual/mta
-		 >=net-mail/mailbase-0.00"
-
-PROVIDE="virtual/mta"
-
-
-src_unpack() {
-
-	local myconf
-	unpack ${A}
-	cd ${S}
-
-	mkdir Local
-	sed -e "48i\CFLAGS=${CFLAGS}" \
-		-e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \
-		-e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \
-		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=/usr/sbin:" \
-		-e "s:COMPRESS_COMMAND=/opt/gnu/bin/gzip:COMPRESS_COMMAND=/usr/bin/gzip:" \
-		-e "s:ZCAT_COMMAND=/opt/gnu/bin/zcat:ZCAT_COMMAND=/usr/bin/zcat:" \
-		-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=/etc/exim/configure:" \
-		-e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \
-		-e "s:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-		-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=/usr/share/info:" \
-		-e "s:# LOG_FILE_PATH=syslog:LOG_FILE_PATH=syslog:" \
-		-e "s:# PID_FILE_PATH=/var/lock/exim%s.pid:PID_FILE_PATH=/var/run/exim%s.pid:" \
-		-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=/var/spool/exim:" \
-		-e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-	if use pam; then
-		cp Makefile Makefile.orig
-		sed -e "s:# SUPPORT_PAM=yes:SUPPORT_PAM=yes:" Makefile.orig > Makefile
-		myconf="${myconf} -lpam"
-	fi
-	if use tcpd; then
-		cp Makefile Makefile.orig
-		sed -e "s:# USE_TCP_WRAPPERS=yes:USE_TCP_WRAPPERS=yes:" Makefile.orig > Makefile
-		myconf="${myconf} -lwrap"
-	fi
-	if [ -n "$myconf" ] ; then
-		echo "EXTRALIBS=${myconf}" >> Makefile
-	fi
-
-	cd ${S}
-	if use mta-tls; then
-		cp Local/Makefile Local/Makefile.tmp
-		sed -e "s:# SUPPORT_TLS=yes:SUPPORT_TLS=yes:" \
-			-e "s:# TLS_LIBS=-lssl -lcrypto:TLS_LIBS=-lssl -lcrypto:" Local/Makefile.tmp > Local/Makefile
-	fi
-	if use mta-ldap; then
-		cp Local/Makefile Local/Makefile.tmp
-		sed -e "s:# LOOKUP_LDAP=yes:LOOKUP_LDAP=yes:" \
-			-e "s:# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include:LOOKUP_INCLUDE=-I/usr/include/ldap -I/usr/include/mysql:" \
-			-e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" \
-			-e "s:# LDAP_LIB_TYPE=OPENLDAP2:LDAP_LIB_TYPE=OPENLDAP2:" Local/Makefile.tmp >| Local/Makefile
-	fi
-	if use mta-mysql; then
-		cp Local/Makefile Local/Makefile.tmp
-		sed -e "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" \
-			-e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" Local/Makefile.tmp >| Local/Makefile
-	fi
-	cat Makefile | sed -e 's/^buildname=.*/buildname=exim-gentoo/g' > Makefile.gentoo && mv -f Makefile.gentoo Makefile
-}
-
-
-src_compile() {
-	make || die
-}
-
-
-src_install () {
-
-	cd ${S}/build-exim-gentoo
-	insopts -o root -g root -m 4755
-	insinto /usr/sbin
-	doins exim
-
-	dodir /usr/bin /usr/sbin /usr/lib
-	dosym /usr/sbin/exim /usr/bin/mailq
-	dosym /usr/sbin/exim /usr/bin/newaliases
-	dosym /usr/sbin/exim /usr/bin/mail
-	dosym /usr/sbin/exim /usr/lib/sendmail
-	dosym /usr/sbin/exim /usr/sbin/sendmail
-
-	exeinto /usr/sbin
-	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock exim_tidydb exinext exiwhat
-	do
-		doexe $i
-	done
-
-	cd ${S}/util
-	exeinto /usr/sbin
-	for i in exigrep eximstats exiqsumm
-	do
-		doexe $i
-	done
-
-	dodir /etc/exim /etc/exim/samples
-
-	insopts -o root -g root -m 0644
-	insinto /etc/exim
-	doins ${FILESDIR}/configure
-
-	cd ${S}/src
-	insopts -o root -g root -m 0644
-	insinto /etc/exim/samples
-	doins configure.default
-
-	dodoc ${S}/doc/*
-
-	# INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
-	insinto /etc/pam.d
-	doins ${FILESDIR}/pam.d-exim
-
-	# A nice filter for exim to protect your windows clients.
-	insinto /etc/exim
-	doins ${FILESDIR}/system_filter.exim
-	einfo "Read the bottom of /etc/exim/system_filter.exim for usage"
-	dodoc ${FILESDIR}/auth_conf.sub
-	einfo "Cat this to the end of your configure for AUTH=PAM support"
-	# FIXME The above messages should be moved into pkg_postinst !!!
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/exim.rc6 exim
-	insinto /etc/conf.d
-	newins ${FILESDIR}/exim.confd exim
-}
-
-
-pkg_config() {
-
-	${ROOT}/usr/sbin/rc-update add exim
-}
diff --git a/net-mail/exim/exim-3.34-r2.ebuild b/net-mail/exim/exim-3.34-r2.ebuild
deleted file mode 100644
index 00757571e031..000000000000
--- a/net-mail/exim/exim-3.34-r2.ebuild
+++ /dev/null
@@ -1,153 +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/exim/exim-3.34-r2.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim3/${P}.tar.gz"
-HOMEPAGE="http://www.exim.org/"
-
-DEPEND=">=sys-libs/db-3.2
-		>=sys-devel/perl-5.6.0
-		>=dev-libs/libpcre-3.4
-		pam? ( >=sys-libs/pam-0.75 )
-		ssl? ( >=dev-libs/openssl-0.9.6 )
-		ldap? ( >=net-nds/openldap-2.0.7 )
-		tcpd? ( sys-apps/tcp-wrappers )
-		mysql? ( >=dev-db/mysql-3.23.28 )"
-
-RDEPEND="${DEPEND}
-		 !virtual/mta
-		 >=net-mail/mailbase-0.00"
-
-PROVIDE="virtual/mta"
-
-
-src_unpack() {
-
-	local myconf
-	unpack ${A}
-	cd ${S}
-
-	mkdir Local
-	sed -e "48i\CFLAGS=${CFLAGS}" \
-		-e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \
-		-e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \
-		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=/usr/sbin:" \
-		-e "s:COMPRESS_COMMAND=/opt/gnu/bin/gzip:COMPRESS_COMMAND=/usr/bin/gzip:" \
-		-e "s:ZCAT_COMMAND=/opt/gnu/bin/zcat:ZCAT_COMMAND=/usr/bin/zcat:" \
-		-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=/etc/exim/configure:" \
-		-e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \
-		-e "s:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-		-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=/usr/share/info:" \
-		-e "s:# LOG_FILE_PATH=syslog:LOG_FILE_PATH=syslog:" \
-		-e "s:# PID_FILE_PATH=/var/lock/exim%s.pid:PID_FILE_PATH=/var/run/exim%s.pid:" \
-		-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=/var/spool/exim:" \
-		-e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-	if use pam; then
-		cp Makefile Makefile.orig
-		sed -e "s:# SUPPORT_PAM=yes:SUPPORT_PAM=yes:" Makefile.orig > Makefile
-		myconf="${myconf} -lpam"
-	fi
-	if use tcpd; then
-		cp Makefile Makefile.orig
-		sed -e "s:# USE_TCP_WRAPPERS=yes:USE_TCP_WRAPPERS=yes:" Makefile.orig > Makefile
-		myconf="${myconf} -lwrap"
-	fi
-	if [ -n "$myconf" ] ; then
-		echo "EXTRALIBS=${myconf}" >> Makefile
-	fi
-
-	cd ${S}
-	if use ssl; then
-		cp Local/Makefile Local/Makefile.tmp
-		sed -e "s:# SUPPORT_TLS=yes:SUPPORT_TLS=yes:" \
-			-e "s:# TLS_LIBS=-lssl -lcrypto:TLS_LIBS=-lssl -lcrypto:" Local/Makefile.tmp > Local/Makefile
-	fi
-	if use ldap; then
-		cp Local/Makefile Local/Makefile.tmp
-		sed -e "s:# LOOKUP_LDAP=yes:LOOKUP_LDAP=yes:" \
-			-e "s:# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include:LOOKUP_INCLUDE=-I/usr/include/ldap -I/usr/include/mysql:" \
-			-e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" \
-			-e "s:# LDAP_LIB_TYPE=OPENLDAP2:LDAP_LIB_TYPE=OPENLDAP2:" Local/Makefile.tmp >| Local/Makefile
-	fi
-	if use mysql; then
-		cp Local/Makefile Local/Makefile.tmp
-		sed -e "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" \
-			-e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" Local/Makefile.tmp >| Local/Makefile
-	fi
-	cat Makefile | sed -e 's/^buildname=.*/buildname=exim-gentoo/g' > Makefile.gentoo && mv -f Makefile.gentoo Makefile
-}
-
-
-src_compile() {
-	make || die
-}
-
-
-src_install () {
-
-	cd ${S}/build-exim-gentoo
-	insopts -o root -g root -m 4755
-	insinto /usr/sbin
-	doins exim
-
-	dodir /usr/bin /usr/sbin /usr/lib
-	dosym /usr/sbin/exim /usr/bin/mailq
-	dosym /usr/sbin/exim /usr/bin/newaliases
-	dosym /usr/sbin/exim /usr/bin/mail
-	dosym /usr/sbin/exim /usr/lib/sendmail
-	dosym /usr/sbin/exim /usr/sbin/sendmail
-
-	exeinto /usr/sbin
-	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock exim_tidydb exinext exiwhat
-	do
-		doexe $i
-	done
-
-	cd ${S}/util
-	exeinto /usr/sbin
-	for i in exigrep eximstats exiqsumm
-	do
-		doexe $i
-	done
-
-	dodir /etc/exim /etc/exim/samples
-
-	insopts -o root -g root -m 0644
-	insinto /etc/exim
-	doins ${FILESDIR}/configure
-
-	cd ${S}/src
-	insopts -o root -g root -m 0644
-	insinto /etc/exim/samples
-	doins configure.default
-
-	dodoc ${S}/doc/*
-
-	# INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
-	insinto /etc/pam.d
-	doins ${FILESDIR}/pam.d-exim
-
-	# A nice filter for exim to protect your windows clients.
-	insinto /etc/exim
-	doins ${FILESDIR}/system_filter.exim
-	einfo "Read the bottom of /etc/exim/system_filter.exim for usage"
-	dodoc ${FILESDIR}/auth_conf.sub
-	einfo "Cat this to the end of your configure for AUTH=PAM support"
-	# FIXME The above messages should be moved into pkg_postinst !!!
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/exim.rc6 exim
-	insinto /etc/conf.d
-	newins ${FILESDIR}/exim.confd exim
-}
-
-
-pkg_config() {
-
-	${ROOT}/usr/sbin/rc-update add exim
-}
diff --git a/net-mail/exim/exim-3.34-r3.ebuild b/net-mail/exim/exim-3.34-r3.ebuild
index 18d42eed8674..624778eb3f25 100644
--- a/net-mail/exim/exim-3.34-r3.ebuild
+++ b/net-mail/exim/exim-3.34-r3.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/exim/exim-3.34-r3.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-3.34-r3.ebuild,v 1.3 2002/07/17 04:20:40 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
@@ -22,6 +22,9 @@ RDEPEND="${DEPEND}
 
 PROVIDE="virtual/mta"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_unpack() {
 
diff --git a/net-mail/exim/exim-3.36-r1.ebuild b/net-mail/exim/exim-3.36-r1.ebuild
deleted file mode 100644
index 000d18b5db1b..000000000000
--- a/net-mail/exim/exim-3.36-r1.ebuild
+++ /dev/null
@@ -1,154 +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/exim/exim-3.36-r1.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim3/${P}.tar.gz"
-HOMEPAGE="http://www.exim.org/"
-
-DEPEND="virtual/glibc
-		>=sys-libs/db-3.2
-		>=sys-devel/perl-5.6.0
-		>=dev-libs/libpcre-3.4
-		pam? ( >=sys-libs/pam-0.75 )
-		tcpd? ( sys-apps/tcp-wrappers )
-		mta-tls? ( >=dev-libs/openssl-0.9.6 )
-		mta-ldap? ( >=net-nds/openldap-2.0.7 )
-		mta-mysql? ( >=dev-db/mysql-3.23.28 )"
-
-RDEPEND="${DEPEND}
-		 !virtual/mta
-		 >=net-mail/mailbase-0.00"
-
-PROVIDE="virtual/mta"
-
-
-src_unpack() {
-
-	local myconf
-	unpack ${A}
-	cd ${S}
-
-	mkdir Local
-	sed -e "48i\CFLAGS=${CFLAGS}" \
-		-e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \
-		-e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \
-		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=/usr/sbin:" \
-		-e "s:COMPRESS_COMMAND=/opt/gnu/bin/gzip:COMPRESS_COMMAND=/usr/bin/gzip:" \
-		-e "s:ZCAT_COMMAND=/opt/gnu/bin/zcat:ZCAT_COMMAND=/usr/bin/zcat:" \
-		-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=/etc/exim/configure:" \
-		-e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \
-		-e "s:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-		-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=/usr/share/info:" \
-		-e "s:# LOG_FILE_PATH=syslog:LOG_FILE_PATH=syslog:" \
-		-e "s:# PID_FILE_PATH=/var/lock/exim%s.pid:PID_FILE_PATH=/var/run/exim%s.pid:" \
-		-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=/var/spool/exim:" \
-		-e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-	if use pam; then
-		cp Makefile Makefile.orig
-		sed -e "s:# SUPPORT_PAM=yes:SUPPORT_PAM=yes:" Makefile.orig > Makefile
-		myconf="${myconf} -lpam"
-	fi
-	if use tcpd; then
-		cp Makefile Makefile.orig
-		sed -e "s:# USE_TCP_WRAPPERS=yes:USE_TCP_WRAPPERS=yes:" Makefile.orig > Makefile
-		myconf="${myconf} -lwrap"
-	fi
-	if [ -n "$myconf" ] ; then
-		echo "EXTRALIBS=${myconf}" >> Makefile
-	fi
-
-	cd ${S}
-	if use mta-tls; then
-		cp Local/Makefile Local/Makefile.tmp
-		sed -e "s:# SUPPORT_TLS=yes:SUPPORT_TLS=yes:" \
-			-e "s:# TLS_LIBS=-lssl -lcrypto:TLS_LIBS=-lssl -lcrypto:" Local/Makefile.tmp > Local/Makefile
-	fi
-	if use mta-ldap; then
-		cp Local/Makefile Local/Makefile.tmp
-		sed -e "s:# LOOKUP_LDAP=yes:LOOKUP_LDAP=yes:" \
-			-e "s:# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include:LOOKUP_INCLUDE=-I/usr/include/ldap -I/usr/include/mysql:" \
-			-e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" \
-			-e "s:# LDAP_LIB_TYPE=OPENLDAP2:LDAP_LIB_TYPE=OPENLDAP2:" Local/Makefile.tmp >| Local/Makefile
-	fi
-	if use mta-mysql; then
-		cp Local/Makefile Local/Makefile.tmp
-		sed -e "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" \
-			-e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" Local/Makefile.tmp >| Local/Makefile
-	fi
-	cat Makefile | sed -e 's/^buildname=.*/buildname=exim-gentoo/g' > Makefile.gentoo && mv -f Makefile.gentoo Makefile
-}
-
-
-src_compile() {
-	make || die
-}
-
-
-src_install () {
-
-	cd ${S}/build-exim-gentoo
-	insopts -o root -g root -m 4755
-	insinto /usr/sbin
-	doins exim
-
-	dodir /usr/bin /usr/sbin /usr/lib
-	dosym /usr/sbin/exim /usr/bin/mailq
-	dosym /usr/sbin/exim /usr/bin/newaliases
-	dosym /usr/sbin/exim /usr/bin/mail
-	dosym /usr/sbin/exim /usr/lib/sendmail
-	dosym /usr/sbin/exim /usr/sbin/sendmail
-
-	exeinto /usr/sbin
-	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock exim_tidydb exinext exiwhat
-	do
-		doexe $i
-	done
-
-	cd ${S}/util
-	exeinto /usr/sbin
-	for i in exigrep eximstats exiqsumm
-	do
-		doexe $i
-	done
-
-	dodir /etc/exim /etc/exim/samples
-
-	insopts -o root -g root -m 0644
-	insinto /etc/exim
-	doins ${FILESDIR}/configure
-
-	cd ${S}/src
-	insopts -o root -g root -m 0644
-	insinto /etc/exim/samples
-	doins configure.default
-
-	dodoc ${S}/doc/*
-
-	# INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
-	insinto /etc/pam.d
-	doins ${FILESDIR}/pam.d-exim
-
-	# A nice filter for exim to protect your windows clients.
-	insinto /etc/exim
-	doins ${FILESDIR}/system_filter.exim
-	einfo "Read the bottom of /etc/exim/system_filter.exim for usage"
-	dodoc ${FILESDIR}/auth_conf.sub
-	einfo "Cat this to the end of your configure for AUTH=PAM support"
-	# FIXME The above messages should be moved into pkg_postinst !!!
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/exim.rc6 exim
-	insinto /etc/conf.d
-	newins ${FILESDIR}/exim.confd exim
-}
-
-
-pkg_config() {
-
-	${ROOT}/usr/sbin/rc-update add exim
-}
diff --git a/net-mail/exim/exim-3.36-r2.ebuild b/net-mail/exim/exim-3.36-r2.ebuild
index 9c78b7aa6ed6..e87f2a55161e 100644
--- a/net-mail/exim/exim-3.36-r2.ebuild
+++ b/net-mail/exim/exim-3.36-r2.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/exim/exim-3.36-r2.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-3.36-r2.ebuild,v 1.3 2002/07/17 04:20:40 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
@@ -23,6 +23,9 @@ RDEPEND="${DEPEND}
 
 PROVIDE="virtual/mta"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_unpack() {
 
diff --git a/net-mail/exim/exim-4.04-r1.ebuild b/net-mail/exim/exim-4.04-r1.ebuild
index 32781a68b0c6..bef52cf7e8e2 100644
--- a/net-mail/exim/exim-4.04-r1.ebuild
+++ b/net-mail/exim/exim-4.04-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Updated to exim-4 by Ben Lutgens <lamer@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.04-r1.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.04-r1.ebuild,v 1.3 2002/07/17 04:20:40 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
@@ -24,6 +24,9 @@ RDEPEND="${DEPEND}
 
 PROVIDE="virtual/mta"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_unpack() {
 
diff --git a/net-mail/exim/exim-4.04.ebuild b/net-mail/exim/exim-4.04.ebuild
deleted file mode 100644
index 264d158224af..000000000000
--- a/net-mail/exim/exim-4.04.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Updated to exim-4 by Ben Lutgens <lamer@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-4.04.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.gz"
-HOMEPAGE="http://www.exim.org/"
-
-DEPEND="virtual/glibc
-		>=sys-libs/db-3.2
-		>=sys-devel/perl-5.6.0
-		>=dev-libs/libpcre-3.4
-		pam? ( >=sys-libs/pam-0.75 )
-		tcpd? ( sys-apps/tcp-wrappers )
-		mta-tls? ( >=dev-libs/openssl-0.9.6 )
-		mta-ldap? ( >=net-nds/openldap-2.0.7 )
-		mta-mysql? ( >=dev-db/mysql-3.23.28 )"
-
-RDEPEND="${DEPEND}
-		 !virtual/mta
-		 >=net-mail/mailbase-0.00"
-
-PROVIDE="virtual/mta"
-
-
-src_unpack() {
-
-	local myconf
-	unpack ${A}
-	cd ${S}
-	
-	# Don't need this in exim4 dir exists
-	#mkdir Local
-	sed -e "48i\CFLAGS=${CFLAGS}" \
-		-e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \
-		-e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \
-		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=/usr/sbin:" \
-		-e "s:COMPRESS_COMMAND=/opt/gnu/bin/gzip:COMPRESS_COMMAND=/usr/bin/gzip:" \
-		-e "s:ZCAT_COMMAND=/opt/gnu/bin/zcat:ZCAT_COMMAND=/usr/bin/zcat:" \
-		-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=/etc/exim/configure:" \
-		-e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \
-		-e "s:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-		-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=/usr/share/info:" \
-		-e "s:# LOG_FILE_PATH=syslog:LOG_FILE_PATH=syslog:" \
-		-e "s:LOG_FILE_PATH=syslog\:/var/log/exim_%slog::" \
-		-e "s:# PID_FILE_PATH=/var/lock/exim%s.pid:PID_FILE_PATH=/var/run/exim%s.pid:" \
-		-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=/var/spool/exim:" \
-		-e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \
-		-e "s:# SUPPORT_MAILSTOR=yes:SUPPORT_MAILSTORE=yes:" \
-		-e "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" \
-		-e "s:EXIM_USER=:EXIM_USER=mail:" \
-		-e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \
-		src/EDITME > Local/Makefile
-
-	cd Local
-	if use pam; then
-		cp Makefile Makefile.orig
-		sed -e "s:# SUPPORT_PAM=yes:SUPPORT_PAM=yes:" Makefile.orig > Makefile
-		myconf="${myconf} -lpam"
-	fi
-	if use tcpd; then
-		cp Makefile Makefile.orig
-		sed -e "s:# USE_TCP_WRAPPERS=yes:USE_TCP_WRAPPERS=yes:" Makefile.orig > Makefile
-		myconf="${myconf} -lwrap"
-	fi
-	if [ -n "$myconf" ] ; then
-		echo "EXTRALIBS=${myconf}" >> Makefile
-	fi
-
-	cd ${S}
-	if use mta-tls; then
-		cp Local/Makefile Local/Makefile.tmp
-		sed -e "s:# SUPPORT_TLS=yes:SUPPORT_TLS=yes:" \
-			-e "s:# TLS_LIBS=-lssl -lcrypto:TLS_LIBS=-lssl -lcrypto:" Local/Makefile.tmp > Local/Makefile
-	fi
-	if use mta-ldap; then
-		cp Local/Makefile Local/Makefile.tmp
-		sed -e "s:# LOOKUP_LDAP=yes:LOOKUP_LDAP=yes:" \
-			-e "s:# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include:LOOKUP_INCLUDE=-I/usr/include/ldap -I/usr/include/mysql:" \
-			-e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" \
-			-e "s:# LDAP_LIB_TYPE=OPENLDAP2:LDAP_LIB_TYPE=OPENLDAP2:" Local/Makefile.tmp >| Local/Makefile
-	fi
-	if use mta-mysql; then
-		cp Local/Makefile Local/Makefile.tmp
-		sed -e "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" \
-			-e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" Local/Makefile.tmp >| Local/Makefile
-	fi
-	cat Makefile | sed -e 's/^buildname=.*/buildname=exim-gentoo/g' > Makefile.gentoo && mv -f Makefile.gentoo Makefile
-}
-
-
-src_compile() {
-	make || die
-}
-
-
-src_install () {
-
-	cd ${S}/build-exim-gentoo
-	insopts -o root -g root -m 4755
-	insinto /usr/sbin
-	doins exim
-
-	dodir /usr/bin /usr/sbin /usr/lib
-	dosym /usr/sbin/exim /usr/bin/mailq
-	dosym /usr/sbin/exim /usr/bin/newaliases
-	dosym /usr/sbin/exim /usr/bin/mail
-	dosym /usr/sbin/exim /usr/lib/sendmail
-	dosym /usr/sbin/exim /usr/sbin/sendmail
-
-	exeinto /usr/sbin
-	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
-		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm
-	do
-		doexe $i
-	done
-	
-	# This stuff shows up in ${S}/exim-build-gentoo now. Wierd.
-	#cd ${S}/util
-	#exeinto /usr/sbin
-	#for i in exigrep eximstats exiqsumm
-	#do
-	#	doexe $i
-	#done
-
-	dodir /etc/exim /etc/exim/samples
-	
-	insopts -o root -g root -m 0644
-	insinto /etc/exim/samples
-	doins ${FILESDIR}/smtp-auth-tls-client-configure
-	cd ${S}/src
-	insopts -o root -g root -m 0644
-	insinto /etc/exim
-	doins configure.default
-
-	dodoc ${S}/doc/*
-	doman ${S}/doc/exim.8
-	# INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
-	insinto /etc/pam.d
-	doins ${FILESDIR}/pam.d-exim
-
-	# A nice filter for exim to protect your windows clients.
-	insinto /etc/exim
-	doins ${FILESDIR}/system_filter.exim
-	dodoc ${FILESDIR}/auth_conf.sub
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/exim.rc6 exim
-	insinto /etc/conf.d
-	newins ${FILESDIR}/exim.confd exim
-}
-
-
-pkg_config() {
-
-	${ROOT}/usr/sbin/rc-update add exim
-}
-pkg_postinst() {
-	einfo "Read the bottom of /etc/exim/system_filter.exim for usage."
-	einfo "/usr/share/doc/${P}/auth_conf.sub.gz contains the configuration sub for using smtp auth."
-	einfo "Please create /etc/exim/configure from /etc/exim/configure.default."
-	einfo "Also see /etc/exim/samples dir for example configs."
-}
diff --git a/net-mail/exim/files/digest-exim-3.32 b/net-mail/exim/files/digest-exim-3.32
deleted file mode 100644
index b4701fa83349..000000000000
--- a/net-mail/exim/files/digest-exim-3.32
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d299f68420a9c8359a5106a605258bb6 exim-3.32.tar.gz 1267558
diff --git a/net-mail/exim/files/digest-exim-3.32-r6 b/net-mail/exim/files/digest-exim-3.32-r6
deleted file mode 100644
index b4701fa83349..000000000000
--- a/net-mail/exim/files/digest-exim-3.32-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d299f68420a9c8359a5106a605258bb6 exim-3.32.tar.gz 1267558
diff --git a/net-mail/exim/files/digest-exim-3.33 b/net-mail/exim/files/digest-exim-3.33
deleted file mode 100644
index f1312f6c4c8c..000000000000
--- a/net-mail/exim/files/digest-exim-3.33
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b383f1f68794c70fc4e7333fe0ac92ca exim-3.33.tar.gz 1269801
diff --git a/net-mail/exim/files/digest-exim-3.33-r1 b/net-mail/exim/files/digest-exim-3.33-r1
deleted file mode 100644
index f1312f6c4c8c..000000000000
--- a/net-mail/exim/files/digest-exim-3.33-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b383f1f68794c70fc4e7333fe0ac92ca exim-3.33.tar.gz 1269801
diff --git a/net-mail/exim/files/digest-exim-3.34-r1 b/net-mail/exim/files/digest-exim-3.34-r1
deleted file mode 100644
index 6a2ace19b6c2..000000000000
--- a/net-mail/exim/files/digest-exim-3.34-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ef0e1116acce2849701691fd159ad204 exim-3.34.tar.gz 1270469
diff --git a/net-mail/exim/files/digest-exim-3.34-r2 b/net-mail/exim/files/digest-exim-3.34-r2
deleted file mode 100644
index 6a2ace19b6c2..000000000000
--- a/net-mail/exim/files/digest-exim-3.34-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ef0e1116acce2849701691fd159ad204 exim-3.34.tar.gz 1270469
diff --git a/net-mail/exim/files/digest-exim-3.36-r1 b/net-mail/exim/files/digest-exim-3.36-r1
deleted file mode 100644
index dd032e61ae43..000000000000
--- a/net-mail/exim/files/digest-exim-3.36-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8f74735d6bc4a519f31463be38dd2087 exim-3.36.tar.gz 1271585
diff --git a/net-mail/exim/files/digest-exim-4.04 b/net-mail/exim/files/digest-exim-4.04
deleted file mode 100644
index 3a9c1aaa7444..000000000000
--- a/net-mail/exim/files/digest-exim-4.04
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cfe70a927d66a4bd5ec075b5127d3529 exim-4.04.tar.gz 1338993
diff --git a/net-mail/exmh/exmh-2.5.ebuild b/net-mail/exmh/exmh-2.5.ebuild
index f0b24f1596b5..7d1580566a06 100644
--- a/net-mail/exmh/exmh-2.5.ebuild
+++ b/net-mail/exmh/exmh-2.5.ebuild
@@ -1,11 +1,14 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exmh/exmh-2.5.ebuild,v 1.1 2002/05/31 08:39:53 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/exmh/exmh-2.5.ebuild,v 1.2 2002/07/17 04:20:40 seemant Exp $
 
 DESCRIPTION="An X user interface for MH mail"
 SRC_URI="ftp://ftp.scriptics.com/pub/tcl/${PN}/${PN}-${PV}.tar.gz"
 HOMEPAGE="http://beedub.com/exmh/"
+
+SLOT="0"
 LICENSE="as-is"
+KEYWORDS="x86"
 
 DEPEND="net-mail/nmh
 	dev-tcltk/expect
diff --git a/net-mail/ezmlm/ezmlm-0.53.ebuild b/net-mail/ezmlm/ezmlm-0.53.ebuild
index ef346c3ef4a5..a9cd0036b2f8 100644
--- a/net-mail/ezmlm/ezmlm-0.53.ebuild
+++ b/net-mail/ezmlm/ezmlm-0.53.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/ezmlm/ezmlm-0.53.ebuild,v 1.5 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/ezmlm/ezmlm-0.53.ebuild,v 1.6 2002/07/17 04:20:40 seemant Exp $
 
 S=${WORKDIR}/${P}
-
-DEPEND="virtual/glibc
-	sys-apps/groff"
-
-RDEPEND="net-mail/qmail"
-
 DESCRIPTION="Simple yet powerful mailing list manager for qmail."
 SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
-
 HOMEPAGE="http://cr.yp.to/software/ezmlm.html"
+
+SLOT="0"
 LICENSE="as-is"
+KEYWORDS="x86"
+
+DEPEND=" sys-apps/groff"
+
+RDEPEND="net-mail/qmail"
 
 
 src_compile() {
diff --git a/net-mail/f-prot/f-prot-3.12a.ebuild b/net-mail/f-prot/f-prot-3.12a.ebuild
index 3107b7e9f1bd..1d72e13edc7e 100644
--- a/net-mail/f-prot/f-prot-3.12a.ebuild
+++ b/net-mail/f-prot/f-prot-3.12a.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/f-prot/f-prot-3.12a.ebuild,v 1.1 2002/06/10 21:06:25 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/f-prot/f-prot-3.12a.ebuild,v 1.2 2002/07/17 04:20:40 seemant Exp $
 
+MY_P=${PN}_${PV}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="Frisk Software's f-prot virus scanner"
 HOMEPAGE="http://www.f-prot.com/"
+SRC_URI="ftp://ftp.f-prot.com/pub/${MY_P}.tar.gz"
 
 # unzip and wget are needed for the check-updates.sh script
-DEPEND=""
-RDEPEND="virtual/glibc
-         >=app-arch/unzip-5.42-r1
-         >=net-misc/wget-1.8.2"
+RDEPEND=">=app-arch/unzip-5.42-r1
+	>=net-misc/wget-1.8.2"
 
-A="f-prot_3.12a.tar.gz"
-SRC_URI="ftp://ftp.f-prot.com/pub/${A}"
-
-S="${WORKDIR}/f-prot_3.12a"
+SLOT="0"
+LICENSE="F-PROT"
+KEYWORDS="x86"
 
 src_compile () {
     echo "Nothing to compile."
diff --git a/net-mail/fastforward/fastforward-0.51.ebuild b/net-mail/fastforward/fastforward-0.51.ebuild
index 64b8f958ecf2..bda07e29db1c 100644
--- a/net-mail/fastforward/fastforward-0.51.ebuild
+++ b/net-mail/fastforward/fastforward-0.51.ebuild
@@ -1,15 +1,17 @@
 # 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/fastforward/fastforward-0.51.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fastforward/fastforward-0.51.ebuild,v 1.3 2002/07/17 04:20:40 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Fastforward handles qmail forwarding according to a cdb database"
 HOMEPAGE="http://cr.yp.to/fastforward.html"
-
 SRC_URI="http://cr.yp.to/software/fastforward-0.51.tar.gz"
 
-DEPEND="virtual/glibc
-	sys-apps/groff"
+DEPEND="sys-apps/groff"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86"
 
 src_unpack() {
 
diff --git a/net-mail/fetchmail/fetchmail-5.9.11.ebuild b/net-mail/fetchmail/fetchmail-5.9.11.ebuild
index 801efe8d6b51..c2b6f6b98ff7 100644
--- a/net-mail/fetchmail/fetchmail-5.9.11.ebuild
+++ b/net-mail/fetchmail/fetchmail-5.9.11.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/fetchmail/fetchmail-5.9.11.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-5.9.11.ebuild,v 1.3 2002/07/17 04:20:40 seemant Exp $
 
+S="${WORKDIR}/${P}"
 DESCRIPTION="Fetchmail is a full-featured remote-mail retrieval and forwarding utility"
 HOMEPAGE="http://www.tuxedo.org/~esr/fetchmail/"
 SRC_URI="http://www.tuxedo.org/~esr/fetchmail/${P}.tar.gz"
-S="${WORKDIR}/${P}"
         
 DEPEND="virtual/glibc
 	ssl? ( >=dev-libs/openssl-0.9.6 )"
 
 RDEPEND="nls? ( sys-devel/gettext )"
-	
+
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86"
+
 src_compile() {
 	local myconf
 	use ssl && myconf="${myconf} --with-ssl=/usr"
diff --git a/net-mail/fetchmail/fetchmail-5.9.6.ebuild b/net-mail/fetchmail/fetchmail-5.9.6.ebuild
deleted file mode 100644
index f6d43c879abb..000000000000
--- a/net-mail/fetchmail/fetchmail-5.9.6.ebuild
+++ /dev/null
@@ -1,40 +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/fetchmail/fetchmail-5.9.6.ebuild,v 1.2 2002/07/11 06:30:47 drobbins Exp $
-
-DESCRIPTION="Fetchmail is a full-featured remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://www.tuxedo.org/~esr/fetchmail/"
-SRC_URI="http://www.tuxedo.org/~esr/fetchmail/${P}.tar.gz"
-S=${WORKDIR}/${P}
-        
-DEPEND="virtual/glibc ssl? ( >=dev-libs/openssl-0.9.6 ) nls? ( sys-devel/gettext )"
-
-src_compile() {
-
-	local myconf
-	use ssl && myconf="${myconf} --with-ssl=/usr"
-	use nls || myconf="${myconf} --disable-nls"
-	# This needs inet6-apps, which we don't have
-	#use ipv6 && myconf="{myconf} --enable-inet6"
-
-	./configure \
-	--enable-RPA \
-	--enable-NTLM \
-	--enable-SDPS \
-	--prefix=/usr \
-	--mandir=/usr/share/man \
-	--infodir=/usr/share/info \
-	--host=${CHOST} ${myconf} || die "bad configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc FAQ FEATURES ABOUT-NLS NEWS NOTES README
-	dodoc README.NTLM README.SSL TODO COPYING MANIFEST
-	docinto html ; dodoc *.html
-	docinto contrib ; dodoc contrib/*
-}
diff --git a/net-mail/fetchmail/fetchmail-5.9.7.ebuild b/net-mail/fetchmail/fetchmail-5.9.7.ebuild
deleted file mode 100644
index 1bd52ee2ee04..000000000000
--- a/net-mail/fetchmail/fetchmail-5.9.7.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/fetchmail/fetchmail-5.9.7.ebuild,v 1.6 2002/07/11 06:30:47 drobbins Exp $
-
-DESCRIPTION="Fetchmail is a full-featured remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://www.tuxedo.org/~esr/fetchmail/"
-SRC_URI="http://www.tuxedo.org/~esr/fetchmail/${P}.tar.gz"
-S="${WORKDIR}/${P}"
-        
-DEPEND="virtual/glibc
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-	
-src_compile() {
-	local myconf
-	use ssl && myconf="${myconf} --with-ssl=/usr"
-	use nls || myconf="${myconf} --disable-nls"
-	# This needs inet6-apps, which we don't have
-	#use ipv6 && myconf="{myconf} --enable-inet6"
-
-	./configure --enable-RPA \
-		--enable-NTLM \
-		--enable-SDPS \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--host="${CHOST}" \
-		${myconf} \
-		|| die "Configuration failed."
-	emake || die "Compilation failed."
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dohtml *.html
-	dodoc FAQ FEATURES ABOUT-NLS NEWS NOTES README \
-		README.NTLM README.SSL TODO COPYING MANIFEST
-	docinto contrib
-
-	local f
-	for f in contrib/*
-	do
-		[ -f "${f}" ] && dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	if ! python -c "import Tkinter" >/dev/null 2>&1
-	then
-		einfo
-		einfo "You will not be able to use fetchmailconf(1), because you"
-		einfo "don't seem to have Python with tkinter support."
-		einfo
-		einfo "If you want to be able to use fetchmailconf(1), do the following:"
-		einfo "  1.  Include 'tcltk' in USE variable in your /etc/make.conf."
-		einfo "  2.  (Re-)merge Python."
-		einfo
-	fi
-}
diff --git a/net-mail/fetchmail/files/digest-fetchmail-5.9.6 b/net-mail/fetchmail/files/digest-fetchmail-5.9.6
deleted file mode 100644
index 5dafe7e38a92..000000000000
--- a/net-mail/fetchmail/files/digest-fetchmail-5.9.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8a97f627da2f09c536b3ba86e2ae8919 fetchmail-5.9.6.tar.gz 866845
diff --git a/net-mail/fetchmail/files/digest-fetchmail-5.9.7 b/net-mail/fetchmail/files/digest-fetchmail-5.9.7
deleted file mode 100644
index f6b4284a41d9..000000000000
--- a/net-mail/fetchmail/files/digest-fetchmail-5.9.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 51b1d24c0894a2b9c456770babd95357 fetchmail-5.9.7.tar.gz 898361
diff --git a/net-mail/flap/flap-0.3.ebuild b/net-mail/flap/flap-0.3.ebuild
index 27e4723b8d50..84b1d4727916 100644
--- a/net-mail/flap/flap-0.3.ebuild
+++ b/net-mail/flap/flap-0.3.ebuild
@@ -5,11 +5,16 @@
 S="${WORKDIR}/${P}-src"
 DESCRIPTION="mail user agent written in Java"
 HOMEPAGE="http://flap.sourceforge.net"
-LICENSE="GPL-2"
-DEPEND=">=dev-java/ant-1.4.1 >=dev-java/jikes-1.15"
-RDEPEND=">=virtual/jdk-1.4"
 SRC_URI="http://unc.dl.sourceforge.net/sourceforge/flap/${P}-src.tar.gz"
 
+DEPEND=">=dev-java/ant-1.4.1
+	>=dev-java/jikes-1.15"
+RDEPEND=">=virtual/jdk-1.4"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 src_compile() {
 	ant || die
 }
diff --git a/net-mail/getmail/getmail-2.3.8.ebuild b/net-mail/getmail/getmail-2.3.8.ebuild
index efdcf3e36ffd..45b6a2f899b6 100644
--- a/net-mail/getmail/getmail-2.3.8.ebuild
+++ b/net-mail/getmail/getmail-2.3.8.ebuild
@@ -1,33 +1,29 @@
 # 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/getmail/getmail-2.3.8.ebuild,v 1.1 2002/06/18 18:09:02 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/getmail-2.3.8.ebuild,v 1.2 2002/07/17 04:20:40 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="A POP3 mail retriever with reliable Maildir and mbox delivery"
-
 HOMEPAGE="http://www.qcc.ca/~charlesc/software/getmail-2.0/"
-
-LICENSE="GPL-2"
-
 SRC_URI="http://www.qcc.ca/~charlesc/software/getmail-2.0/${P}.tar.gz"
 
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 DEPEND="virtual/python"
 
-RDEPEND="${DEPEND}"
-
 src_install () {
- into /usr
- doman getmail.1
- dobin getmail
-
- # fudged, don't like, but works
- insinto /usr/lib/getmail
- doins getmail.py
- doins ConfParser.py
- doins timeoutsocket.py
-
- dodoc BUGS CHANGELOG COPYING THANKS TODO docs.html docs.txt faq.html
-faq.txt getmail.txt getmailrc-example 
+	into /usr
+	doman getmail.1
+	dobin getmail
+
+	# fudged, don't like, but works
+	insinto /usr/lib/getmail
+	doins getmail.py
+	doins ConfParser.py
+	doins timeoutsocket.py
+
+	dodoc BUGS CHANGELOG COPYING THANKS TODO *.txt getmailrc-example
+	dohtml *.html
 }
-
diff --git a/net-mail/gotmail/gotmail-0.7.2_p1.ebuild b/net-mail/gotmail/gotmail-0.7.2_p1.ebuild
index 8b8aef94bc7d..d2708614fb72 100644
--- a/net-mail/gotmail/gotmail-0.7.2_p1.ebuild
+++ b/net-mail/gotmail/gotmail-0.7.2_p1.ebuild
@@ -1,18 +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/gotmail/gotmail-0.7.2_p1.ebuild,v 1.1 2002/07/04 16:26:33 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/gotmail/gotmail-0.7.2_p1.ebuild,v 1.2 2002/07/17 04:20:40 seemant Exp $
 
 PV0=0.7.2
 PDP=1
+S=${WORKDIR}/${PN}-${PV0}
 DESCRIPTION="Utility to download mail from a HotMail account"
 SRC_URI="http://ftp.debian.org/debian/pool/main/g/${PN}/${PN}_${PV0}.orig.tar.gz
-		 http://ftp.debian.org/debian/pool/main/g/${PN}/${PN}_${PV0}-${PDP}.diff.gz"
+	http://ftp.debian.org/debian/pool/main/g/${PN}/${PN}_${PV0}-${PDP}.diff.gz"
 HOMEPAGE="http://ssl.usu.edu/paul/gotmail/"
-S=${WORKDIR}/${PN}-${PV0}
+
 RDEPEND="virtual/glibc net-ftp/curl dev-perl/URI dev-perl/libnet"
 DEPEND=${RDEPEND}
-LICENSE="GPL-2"
+
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_unpack() {
 	unpack ${PN}_${PV0}.orig.tar.gz
diff --git a/net-mail/grepmail/ChangeLog b/net-mail/grepmail/ChangeLog
index c2610a9cb60b..c870db42677c 100644
--- a/net-mail/grepmail/ChangeLog
+++ b/net-mail/grepmail/ChangeLog
@@ -1,9 +1,19 @@
 # ChangeLog for dev-perl/DateManip
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/grepmail/ChangeLog,v 1.1 2002/04/22 20:51:23 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/grepmail/ChangeLog,v 1.2 2002/07/17 04:20:40 seemant Exp $
+
+*grepmail-4.70-r1 (16 Jul 2002)
+
+  16 Jul 2002; Seemant Kulleen <seemant@gentoo.org> grepmail-4.70-r1.ebuild
+  files/digest-grepmail-4.70-r1 :
+
+  Completely NEW ebuild, which is actually a perl module, it turns out, so
+  it might be better in dev-perl than in net-mail.  This ebuild extends the
+  perl-module eclass, and the DEPEND list is sorted out, so it actually
+  compiles now.
 
 *grepmail-4.70 (22 April 2002)
 
   22 Apr 2002; Arcady Genkin <agenkin@thpoon.com>: grepmail-4.70.ebuild
   
-  Initial version of the package.
\ No newline at end of file
+  Initial version of the package.
diff --git a/net-mail/grepmail/files/digest-grepmail-4.70 b/net-mail/grepmail/files/digest-grepmail-4.70-r1
index 72dd2dc1c75b..72dd2dc1c75b 100644
--- a/net-mail/grepmail/files/digest-grepmail-4.70
+++ b/net-mail/grepmail/files/digest-grepmail-4.70-r1
diff --git a/net-mail/grepmail/grepmail-4.70-r1.ebuild b/net-mail/grepmail/grepmail-4.70-r1.ebuild
new file mode 100644
index 000000000000..81a83ee4df91
--- /dev/null
+++ b/net-mail/grepmail/grepmail-4.70-r1.ebuild
@@ -0,0 +1,25 @@
+# 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/grepmail/grepmail-4.70-r1.ebuild,v 1.1 2002/07/17 04:20:40 seemant Exp $
+
+inherit perl-module
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Search normal or compressed mailbox using a regular expression or dates."
+HOMEPAGE="http://grepmail.sourceforge.net/"
+SRC_URI="mirror://sourceforge/grepmail/${P}.tar.gz"
+
+SLOT="0"
+LICENSE=""
+KEYWORDS="x86"
+
+DEPEND="${DEPEND}
+	dev-perl/Inline
+	dev-perl/TimeDate
+	dev-perl/DateManip"
+
+src_compile () {
+
+	echo "" | base_src_compile
+	base_src_test || die
+}
diff --git a/net-mail/grepmail/grepmail-4.70.ebuild b/net-mail/grepmail/grepmail-4.70.ebuild
deleted file mode 100644
index 3058f484268e..000000000000
--- a/net-mail/grepmail/grepmail-4.70.ebuild
+++ /dev/null
@@ -1,27 +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/grepmail/grepmail-4.70.ebuild,v 1.3 2002/07/11 06:30:47 drobbins Exp $
-
-DESCRIPTION="Search normal or compressed mailbox using a regular expression or dates."
-HOMEPAGE="http://grepmail.sourceforge.net/"
-
-SRC_URI="mirror://sourceforge/grepmail/${P}.tar.gz"
-S=${WORKDIR}/${P}
-
-DEPEND="dev-perl/TimeDate
-        dev-perl/DateManip"
-
-src_compile () {
-    perl Makefile.PL FASTREADER=0 PREFIX=/usr
-    emake || die
-}
-
-src_install () {
-    # BUG: Can't quite work out the compilation of the FastReader module.
-    # For now it's disabled.
-    make PREFIX=${D}/usr \
-         INSTALLMAN1DIR=${D}/usr/share/man/man1 \
-         INSTALLMAN3DIR=${D}/usr/share/man/man3 \
-         install || die
-    dodoc MANIFEST LICENSE CHANGES README
-}
diff --git a/net-mail/kbiff/files/digest-kbiff-3.5.5 b/net-mail/kbiff/files/digest-kbiff-3.5.5
deleted file mode 100644
index 9446deac321e..000000000000
--- a/net-mail/kbiff/files/digest-kbiff-3.5.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9e327792fc086a3e70aa6a66bee0222d kbiff-3.5.5.tar.bz2 537910
diff --git a/net-mail/kbiff/kbiff-3.5.5.ebuild b/net-mail/kbiff/kbiff-3.5.5.ebuild
deleted file mode 100644
index 4b363586e410..000000000000
--- a/net-mail/kbiff/kbiff-3.5.5.ebuild
+++ /dev/null
@@ -1,13 +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/kbiff/kbiff-3.5.5.ebuild,v 1.3 2002/07/11 06:30:47 drobbins Exp $
-
-inherit kde-base || die
-
-need-kde 2.2
-
-DESCRIPTION="KDE new mail notification utility (biff)"
-SRC_URI="http://devel-home.kde.org/~granroth/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.granroth.org/kbiff/"
-
-newdepend ">=kde-base/kdebase-2.2"
diff --git a/net-mail/kbiff/kbiff-3.6.1.ebuild b/net-mail/kbiff/kbiff-3.6.1.ebuild
index 49d53d3daa7f..0824873e7e09 100644
--- a/net-mail/kbiff/kbiff-3.6.1.ebuild
+++ b/net-mail/kbiff/kbiff-3.6.1.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/kbiff/kbiff-3.6.1.ebuild,v 1.4 2002/07/11 06:30:47 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/kbiff/kbiff-3.6.1.ebuild,v 1.5 2002/07/17 04:20:40 seemant Exp $
 
 inherit kde-base || die
 
@@ -9,6 +9,9 @@ need-kde 3
 DESCRIPTION="KDE new mail notification utility (biff)"
 SRC_URI="http://devel-home.kde.org/~granroth/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.granroth.org/kbiff/"
+
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
 newdepend ">=kde-base/kdebase-3"