remove old ebuilds.

19 files changed, 13 insertions, 1279 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index a909688ceda8..6a77fd0f705a 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.54 2004/10/24 00:55:01 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.55 2004/11/01 19:14:12 langthang Exp $
+
+  01 Nov 2004; Tuan Van <langthang@gentoo.org>
+  -files/cyrus-imapd-2.1.12-includepath.patch,
+  -files/cyrus-imapd-2.1.14-db4.patch, -files/cyrus-imapd-2.1.15-db4.patch,
+  -files/cyrus-imapd-2.2.3-db4.patch, -files/cyrus-imapd-libwrap.patch,
+  -files/cyrus.rc6_2, -files/cyrus_2.conf, -files/gentestcrt.sh,
+  -files/imapd_2.conf, -files/master.8.diff, -files/pam.d-imap,
+  -cyrus-imapd-2.1.15-r1.ebuild, -cyrus-imapd-2.1.15.ebuild,
+  -cyrus-imapd-2.2.3.ebuild, cyrus-imapd-2.2.8.ebuild:
+  remove old ebuilds.
 
   23 Oct 2004; Tuan Van <langthang@gentoo.org>
   +files/cyrus-imapd-2.2.8-libwrap.patch, cyrus-imapd-2.2.8-r1.ebuild:
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild
deleted file mode 100644
index eb1527b63d21..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild,v 1.8 2004/07/01 22:30:53 eradicator Exp $
-
-inherit eutils fixheadtails
-IPV6_P="${P}-ipv6-20030819"
-
-IUSE="afs snmp ssl kerberos ipv6"
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz
-	ipv6? ( http://www.imasy.or.jp/~ume/ipv6/${IPV6_P}.diff.gz )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 -ppc ~sparc"
-
-PROVIDE="virtual/imapd"
-DEPEND="virtual/libc
-	afs? ( >=net-fs/openafs-1.2.2 )
-	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	kerberos? ( >=app-crypt/mit-krb5-1.2.6 )
-	>=sys-libs/db-3.2
-	>=sys-libs/pam-0.75
-	>=dev-libs/cyrus-sasl-2.1.14
-	>=sys-apps/tcp-wrappers-7.6
-	net-mail/mailbase"
-
-pkg_setup() {
-	if ! grep -q ^cyrus: /etc/passwd ; then
-		useradd -c cyrus -d /usr/cyrus -g mail -s /bin/false -u 96 cyrus \
-			|| die "problem adding user cyrus"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# patch for db4 detection and their respective versioned symbols
-	epatch ${FILESDIR}/${P}-db4.patch
-
-	# add libwrap defines as we don't have a dynamicly linked library.
-	epatch ${FILESDIR}/${PN}-libwrap.patch
-
-	# Does running autoconf squash any of this?
-	use ipv6 && epatch ${WORKDIR}/${IPV6_P}.diff
-
-	libtoolize --copy --force
-	aclocal -I cmulocal || die
-	autoheader || die
-	autoconf || die
-
-	# remove spurious -I/usr/includes which make configure tests fail
-	epatch ${FILESDIR}/cyrus-imapd-2.1.12-includepath.patch
-
-	# when linking with rpm, you need to link with more libraries.
-	cp configure configure.orig
-	sed -e "s:lrpm:lrpm -lrpmio -lrpmdb:" \
-		< configure.orig > configure
-
-	cd ${S}
-	ht_fix_file imap/xversion.sh
-}
-
-src_compile() {
-	local myconf
-
-	use afs && myconf="--with-afs" \
-		|| myconf="--without-afs"
-
-	use snmp && myconf="${myconf} --with-ucdsnmp=/usr" \
-		|| myconf="${myconf} --without-ucdsnmp"
-
-	use ssl && myconf="${myconf} --with-openssl=/usr" \
-		|| myconf="${myconf} --without-openssl"
-
-	use kerberos && myconf="${myconf} --enable-gssapi" \
-		|| myconf="${myconf} --disable-gssapi"
-
-	econf \
-		--enable-listext \
-		--with-cyrus-group=mail \
-		--enable-netscapehack \
-		--with-com_err=yes \
-		--without-perl \
-		--disable-cyradm \
-		--with-auth=unix \
-		--with-libwrap=/usr \
-		${myconf} || die "econf failed"
-
-	# make depends break with -f... in CFLAGS
-	make depend CFLAGS="" || die "make depend problem"
-
-	make || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	# Remove the developer stuff (-> dev-libs/cyrus-imap-devel)
-	rm -rf ${D}usr/include ${D}usr/lib
-
-	# Rename the master from cyrus to cyrusmaster (postfix has a master too)
-	mv ${D}usr/cyrus/bin/master ${D}usr/cyrus/bin/cyrusmaster
-
-	# Fix manpage stuff
-	rm -rf ${D}usr/man
-
-	# master is renamed to cyrusmaster because postfix has a master too
-	mv man/master.8 man/cyrusmaster.8
-	patch man/cyrusmaster.8 ${FILESDIR}/master.8.diff || die "error patching master.8"
-
-	doman man/*.?
-
-	# remove man-pages from packet net-mail/cyrus-imapd-admin
-	rm ${D}usr/share/man/man1/installsieve.1.gz ${D}usr/share/man/man1/sieveshell.1.gz
-
-	dodir /etc
-	cp ${FILESDIR}/imapd_2.conf ${D}etc/imapd.conf
-	cp ${FILESDIR}/cyrus_2.conf ${D}etc/cyrus.conf
-	dodir /etc/pam.d
-	cp ${FILESDIR}/pam.d-imap ${D}etc/pam.d/imap
-
-	dodir /var
-	mkdir -m 0750 ${D}var/imap
-	chown -R cyrus:mail ${D}var/imap
-	keepdir /var/imap
-	mkdir -m 0755 ${D}var/imap/db
-	chown -R cyrus:mail ${D}var/imap/db
-	keepdir /var/imap/db
-	mkdir -m 0755 ${D}var/imap/log
-	chown -R cyrus:mail ${D}var/imap/log
-	keepdir /var/imap/log
-	mkdir -m 0755 ${D}var/imap/msg
-	chown -R cyrus:mail ${D}var/imap/msg
-	keepdir /var/imap/msg
-	mkdir -m 0755 ${D}var/imap/user
-	chown -R cyrus:mail ${D}var/imap/user
-	keepdir /var/imap/user
-	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/user/$i ; \
-		chown -R cyrus:mail ${D}var/imap/user/$i
-		keepdir /var/imap/user/$i
-	done
-	mkdir -m 0755 ${D}var/imap/proc
-	chown -R cyrus:mail ${D}var/imap/proc
-	keepdir /var/imap/proc
-	mkdir -m 0755 ${D}var/imap/quota
-	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/quota/$i ; \
-		chown -R cyrus:mail ${D}var/imap/quota/$i
-		keepdir /var/imap/quota/$i
-	done
-	mkdir -m 0755 ${D}var/imap/sieve
-	chown -R cyrus:mail ${D}var/imap/sieve
-	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/sieve/$i ; \
-		chown -R cyrus:mail ${D}var/imap/sieve/$i
-		keepdir /var/imap/sieve/$i
-	done
-	mkdir -m 0755 ${D}var/imap/socket
-	chown -R cyrus:mail ${D}var/imap/socket
-	keepdir /var/imap/socket
-	mkdir ${D}var/spool
-	mkdir -m 0750 ${D}var/spool/imap
-	chown -R cyrus:mail ${D}var/spool/imap
-	keepdir /var/spool/imap
-	mkdir -m 0755 ${D}var/spool/imap/stage.
-	chown -R cyrus:mail ${D}var/spool/imap/stage.
-	keepdir /var/spool/imap/stage.
-	# For hashimapspool
-	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/spool/imap/$i ; \
-		chown -R cyrus:mail ${D}var/spool/imap/$i
-		keepdir /var/spool/imap/$i
-	done
-
-	dodoc COPYRIGHT README*
-	dohtml doc/*.html doc/murder.png
-	cp doc/cyrusv2.mc ${D}usr/share/doc/${PF}/html
-	cp -r contrib tools ${D}usr/share/doc/${PF}
-
-	# Remove the CVS directories
-	find 2>/dev/null ${D}usr/share/doc/ -type d -name CVS -exec rm -rf '{}' \;
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/cyrus.rc6_2 cyrus
-
-	if use ssl; then
-		# from mod_ssl
-		echo "Generating self-signed test certificate"
-		echo "(Ignore any message from the yes command below)"
-		mkdir certs
-		cd certs
-		yes "" | ${FILESDIR}/gentestcrt.sh >/dev/null 2>&1
-		mkdir ${D}etc/cyrusimapd
-		cp server.crt server.key ${D}etc/cyrusimapd
-		chown cyrus:root ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
-		chmod 0400 ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
-	fi
-}
-
-pkg_postinst() {
-	ewarn "If you change the fs-type of /var/imap or"
-	ewarn "/var/spool/imap you should read step 9 of"
-	ewarn "/usr/share/doc/${P}/html/install-configure.html."
-	echo ""
-
-	if df -T /var/imap | grep -q ' ext[23] ' ; then
-		ewarn "Setting /var/imap/user/* and /var/imap/quota/* to synchronous"
-		ewarn "updates."
-		chattr +S /var/imap/user /var/imap/user/* /var/imap/quota /var/imap/quota/*
-		echo ""
-	fi
-
-	if df -T /var/spool/imap | grep -q ' ext[23] ' ; then
-		ewarn "Setting /var/spool/imap/* to synchronous updates."
-		chattr +S /var/spool/imap /var/spool/imap/*
-		echo ""
-	fi
-
-	ewarn "If the queue directory of the mail daemon resides on an ext2"
-	ewarn "or ext3 partition you need to set it manually to update"
-	ewarn "synchronously. E.g. 'chattr +S /var/spool/mqueue'."
-	echo ""
-
-	einfo "For correct logging with syslog add"
-	einfo "\tlocal6.* /var/log/imapd.log"
-	einfo "\tauth.debug /var/log/auth.log"
-	einfo "to /etc/syslog.conf."
-	echo ""
-
-	ewarn "You have to add user cyrus to the sasldb2. Do this with:"
-	ewarn "\tsaslpasswd2 cyrus"
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.15.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.15.ebuild
deleted file mode 100644
index 17ea903dbccc..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.15.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.15.ebuild,v 1.8 2004/07/01 22:30:53 eradicator Exp $
-
-inherit eutils
-IPV6_P="${P}-ipv6-20030819"
-
-IUSE="afs snmp ssl kerberos ipv6"
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz
-	ipv6? ( http://www.imasy.or.jp/~ume/ipv6/${IPV6_P}.diff.gz )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc"
-
-PROVIDE="virtual/imapd"
-DEPEND="virtual/libc
-	afs? ( >=net-fs/openafs-1.2.2 )
-	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	kerberos? ( >=app-crypt/mit-krb5-1.2.6 )
-	>=sys-libs/db-3.2
-	>=sys-libs/pam-0.75
-	>=dev-libs/cyrus-sasl-2.1.14
-	>=sys-apps/tcp-wrappers-7.6
-	net-mail/mailbase"
-
-pkg_setup() {
-	if ! grep -q ^cyrus: /etc/passwd ; then
-		useradd -c cyrus -d /usr/cyrus -g mail -s /bin/false -u 96 cyrus \
-			|| die "problem adding user cyrus"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# patch for db4 detection and their respective versioned symbols
-	epatch ${FILESDIR}/${P}-db4.patch
-
-	# add libwrap defines as we don't have a dynamicly linked library.
-	epatch ${FILESDIR}/${PN}-libwrap.patch
-
-	# Does running autoconf squash any of this?
-	use ipv6 && epatch ${WORKDIR}/${IPV6_P}.diff
-
-	libtoolize --copy --force
-	aclocal -I cmulocal || die
-	autoheader || die
-	autoconf || die
-
-	# remove spurious -I/usr/includes which make configure tests fail
-	epatch ${FILESDIR}/cyrus-imapd-2.1.12-includepath.patch
-
-	# when linking with rpm, you need to link with more libraries.
-	cp configure configure.orig
-	sed -e "s:lrpm:lrpm -lrpmio -lrpmdb:" \
-		< configure.orig > configure
-
-}
-
-src_compile() {
-	local myconf
-
-	use afs && myconf="--with-afs" \
-		|| myconf="--without-afs"
-
-	use snmp && myconf="${myconf} --with-ucdsnmp=/usr" \
-		|| myconf="${myconf} --without-ucdsnmp"
-
-	use ssl && myconf="${myconf} --with-openssl=/usr" \
-		|| myconf="${myconf} --without-openssl"
-
-	use kerberos && myconf="${myconf} --enable-gssapi" \
-		|| myconf="${myconf} --disable-gssapi"
-
-	econf \
-		--enable-listext \
-		--with-cyrus-group=mail \
-		--enable-netscapehack \
-		--with-com_err=yes \
-		--without-perl \
-		--disable-cyradm \
-		--with-auth=unix \
-		--with-libwrap=/usr \
-		${myconf} || die "econf failed"
-
-	# make depends break with -f... in CFLAGS
-	make depend CFLAGS="" || die "make depend problem"
-
-	make || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	# Remove the developer stuff (-> dev-libs/cyrus-imap-devel)
-	rm -rf ${D}usr/include ${D}usr/lib
-
-	# Rename the master from cyrus to cyrusmaster (postfix has a master too)
-	mv ${D}usr/cyrus/bin/master ${D}usr/cyrus/bin/cyrusmaster
-
-	# Fix manpage stuff
-	rm -rf ${D}usr/man
-
-	# master is renamed to cyrusmaster because postfix has a master too
-	mv man/master.8 man/cyrusmaster.8
-	patch man/cyrusmaster.8 ${FILESDIR}/master.8.diff || die "error patching master.8"
-
-	doman man/*.?
-
-	# remove man-pages from packet net-mail/cyrus-imapd-admin
-	rm ${D}usr/share/man/man1/installsieve.1.gz ${D}usr/share/man/man1/sieveshell.1.gz
-
-	dodir /etc
-	cp ${FILESDIR}/imapd_2.conf ${D}etc/imapd.conf
-	cp ${FILESDIR}/cyrus_2.conf ${D}etc/cyrus.conf
-	dodir /etc/pam.d
-	cp ${FILESDIR}/pam.d-imap ${D}etc/pam.d/imap
-
-	dodir /var
-	mkdir -m 0750 ${D}var/imap
-	chown -R cyrus:mail ${D}var/imap
-	keepdir /var/imap
-	mkdir -m 0755 ${D}var/imap/db
-	chown -R cyrus:mail ${D}var/imap/db
-	keepdir /var/imap/db
-	mkdir -m 0755 ${D}var/imap/log
-	chown -R cyrus:mail ${D}var/imap/log
-	keepdir /var/imap/log
-	mkdir -m 0755 ${D}var/imap/msg
-	chown -R cyrus:mail ${D}var/imap/msg
-	keepdir /var/imap/msg
-	mkdir -m 0755 ${D}var/imap/user
-	chown -R cyrus:mail ${D}var/imap/user
-	keepdir /var/imap/user
-	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/user/$i ; \
-		chown -R cyrus:mail ${D}var/imap/user/$i
-		keepdir /var/imap/user/$i
-	done
-	mkdir -m 0755 ${D}var/imap/proc
-	chown -R cyrus:mail ${D}var/imap/proc
-	keepdir /var/imap/proc
-	mkdir -m 0755 ${D}var/imap/quota
-	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/quota/$i ; \
-		chown -R cyrus:mail ${D}var/imap/quota/$i
-		keepdir /var/imap/quota/$i
-	done
-	mkdir -m 0755 ${D}var/imap/sieve
-	chown -R cyrus:mail ${D}var/imap/sieve
-	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/sieve/$i ; \
-		chown -R cyrus:mail ${D}var/imap/sieve/$i
-		keepdir /var/imap/sieve/$i
-	done
-	mkdir -m 0755 ${D}var/imap/socket
-	chown -R cyrus:mail ${D}var/imap/socket
-	keepdir /var/imap/socket
-	mkdir ${D}var/spool
-	mkdir -m 0750 ${D}var/spool/imap
-	chown -R cyrus:mail ${D}var/spool/imap
-	keepdir /var/spool/imap
-	mkdir -m 0755 ${D}var/spool/imap/stage.
-	chown -R cyrus:mail ${D}var/spool/imap/stage.
-	keepdir /var/spool/imap/stage.
-	# For hashimapspool
-	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/spool/imap/$i ; \
-		chown -R cyrus:mail ${D}var/spool/imap/$i
-		keepdir /var/spool/imap/$i
-	done
-
-	dodoc COPYRIGHT README*
-	dohtml doc/*.html doc/murder.png
-	cp doc/cyrusv2.mc ${D}usr/share/doc/${PF}/html
-	cp -r contrib tools ${D}usr/share/doc/${PF}
-
-	# Remove the CVS directories
-	find 2>/dev/null ${D}usr/share/doc/ -type d -name CVS -exec rm -rf '{}' \;
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/cyrus.rc6_2 cyrus
-
-	if use ssl; then
-		# from mod_ssl
-		echo "Generating self-signed test certificate"
-		echo "(Ignore any message from the yes command below)"
-		mkdir certs
-		cd certs
-		yes "" | ${FILESDIR}/gentestcrt.sh >/dev/null 2>&1
-		mkdir ${D}etc/cyrusimapd
-		cp server.crt server.key ${D}etc/cyrusimapd
-		chown cyrus:root ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
-		chmod 0400 ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
-	fi
-}
-
-pkg_postinst() {
-	ewarn "If you change the fs-type of /var/imap or"
-	ewarn "/var/spool/imap you should read step 9 of"
-	ewarn "/usr/share/doc/${P}/html/install-configure.html."
-	echo ""
-
-	if df -T /var/imap | grep -q ' ext[23] ' ; then
-		ewarn "Setting /var/imap/user/* and /var/imap/quota/* to synchronous"
-		ewarn "updates."
-		chattr +S /var/imap/user /var/imap/user/* /var/imap/quota /var/imap/quota/*
-		echo ""
-	fi
-
-	if df -T /var/spool/imap | grep -q ' ext[23] ' ; then
-		ewarn "Setting /var/spool/imap/* to synchronous updates."
-		chattr +S /var/spool/imap /var/spool/imap/*
-		echo ""
-	fi
-
-	ewarn "If the queue directory of the mail daemon resides on an ext2"
-	ewarn "or ext3 partition you need to set it manually to update"
-	ewarn "synchronously. E.g. 'chattr +S /var/spool/mqueue'."
-	echo ""
-
-	einfo "For correct logging with syslog add"
-	einfo "\tlocal6.* /var/log/imapd.log"
-	einfo "\tauth.debug /var/log/auth.log"
-	einfo "to /etc/syslog.conf."
-	echo ""
-
-	ewarn "You have to add user cyrus to the sasldb2. Do this with:"
-	ewarn "\tsaslpasswd2 cyrus"
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.2.3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.2.3.ebuild
deleted file mode 100644
index 227758fbb5a4..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.2.3.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.3.ebuild,v 1.9 2004/10/20 21:22:47 swegener Exp $
-
-inherit eutils ssl-cert fixheadtails
-
-DESCRIPTION="The Cyrus IMAP Server."
-HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-IUSE="afs drac kerberos pam snmp ssl tcpd"
-
-PROVIDE="virtual/imapd"
-RDEPEND=">=sys-libs/db-3.2
-	>=dev-libs/cyrus-sasl-2.1.13
-	afs? ( >=net-fs/openafs-1.2.2 )
-	pam? ( >=sys-libs/pam-0.75 )
-	kerberos? ( virtual/krb5 )
-	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	drac? ( >=mail-client/drac-1.12-r1 )"
-
-DEPEND="$RDEPEND
-	sys-devel/libtool
-	>=sys-devel/autoconf-2.58
-	sys-devel/automake
-	>=sys-apps/sed-4"
-
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	ht_fix_file ${S}/imap/xversion.sh
-
-	# Add drac database support.
-	if use drac ; then
-		epatch "${S}/contrib/drac_auth.patch"
-	fi
-
-	# Add libwrap defines as we don't have a dynamicly linked library.
-	if use tcpd ; then
-		epatch "${FILESDIR}/${PN}-libwrap.patch"
-	fi
-
-	# DB4 detection and versioned symbols.
-	epatch "${FILESDIR}/${P}-db4.patch"
-
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			-i "${i}" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8
-	sed -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		-i man/cyrusmaster.8 || die "sed failed"
-
-	# Recreate configure.
-	export WANT_AUTOCONF="2.5"
-	rm -f configure config.h.in
-	ebegin "Recreating configure"
-	sh SMakefile &>/dev/null || die "SMakefile failed"
-	eend $?
-
-	# When linking with rpm, you need to link with more libraries.
-	sed -e "s:lrpm:lrpm -lrpmio -lrpmdb:" -i configure || die "sed failed"
-}
-
-src_compile() {
-	local myconf
-	myconf="${myconf} `use_with afs`"
-	myconf="${myconf} `use_with drac`"
-	myconf="${myconf} `use_with ssl openssl`"
-	myconf="${myconf} `use_with snmp ucdsnmp`"
-	myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} `use_enable kerberos gssapi`"
-
-	econf \
-		--enable-murder \
-		--enable-listext \
-		--enable-netscapehack \
-		--with-extraident=Gentoo \
-		--with-service-path=/usr/lib/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-auth=unix \
-		--without-perl \
-		--disable-cyradm \
-		${myconf} || die "econf failed"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	dodir /usr/bin /usr/lib
-	for subdir in master imap imtest timsieved notifyd ; do
-		make -C "${subdir}" DESTDIR="${D}" install || die "make install failed"
-	done
-
-	# Link master to cyrusmaster (postfix has a master too)
-	dosym /usr/lib/cyrus/master /usr/lib/cyrus/cyrusmaster
-
-	doman man/*.[0-8]
-	dodoc COPYRIGHT README*
-	dohtml doc/*.html doc/murder.png
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	find "${D}/usr/share/doc" -name CVS -print0 | xargs -0 rm -rf
-
-	insinto /etc
-	newins "${FILESDIR}/imapd.conf" imapd.conf
-	newins "${FILESDIR}/cyrus.conf" cyrus.conf
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/cyrus.rc6" cyrus
-
-	if use pam ; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/imap.pam" imap
-	fi
-
-	if use ssl ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Cyrus IMAP Server}"
-		insinto /etc/ssl/cyrus
-		docert server
-		fowners cyrus:mail /etc/ssl/cyrus/server.{key,pem}
-	fi
-
-	for subdir in imap/{,db,log,msg,proc,socket} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_postinst() {
-	ewarn "*****NOTE*****"
-	ewarn "If you're upgrading from versions prior to 2.2.2_BETA"
-	ewarn "be sure to read the following thoroughly:"
-	ewarn "http://asg.web.cmu.edu/cyrus/download/imapd/install-upgrade.html"
-	ewarn "*****NOTE*****"
-	echo
-
-	ewarn "If you change the fs-type of /var/imap or"
-	ewarn "/var/spool/imap you should read step 9 of"
-	ewarn "/usr/share/doc/${P}/html/install-configure.html."
-	echo
-
-	if df -T /var/imap | grep -q ' ext[23] ' ; then
-		ebegin "Making /var/imap/user/* and /var/imap/quota/* synchronous."
-		chattr +S /var/imap/{user,quota}{,/*}
-		eend $?
-	fi
-
-	if df -T /var/spool/imap | grep -q ' ext[23] ' ; then
-		ebegin "Making /var/spool/imap/* synchronous."
-		chattr +S /var/spool/imap{,/*}
-		eend $?
-	fi
-
-	ewarn "If the queue directory of the mail daemon resides on an ext2"
-	ewarn "or ext3 filesystem you need to set it manually to update"
-	ewarn "synchronously. E.g. 'chattr +S /var/spool/mqueue'."
-	echo
-
-	einfo "For correct logging add the following to /etc/syslog.conf:"
-	einfo "    local6.*         /var/log/imapd.log"
-	einfo "    auth.debug       /var/log/auth.log"
-	echo
-
-	ewarn "You have to add user cyrus to the sasldb2. Do this with:"
-	ewarn "    saslpasswd2 cyrus"
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.2.8.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.2.8.ebuild
index 2df7cda96fdd..90bb2c79e58a 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.2.8.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.8.ebuild,v 1.7 2004/10/20 21:22:47 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.8.ebuild,v 1.8 2004/11/01 19:14:12 langthang Exp $
 
 inherit eutils ssl-cert gnuconfig fixheadtails
 
@@ -43,7 +43,7 @@ src_unpack() {
 
 	# Add libwrap defines as we don't have a dynamicly linked library.
 	if use tcpd ; then
-		epatch "${FILESDIR}/${PN}-libwrap.patch"
+		epatch "${FILESDIR}/${P}-libwrap.patch"
 	fi
 
 	# DB4 detection and versioned symbols.
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.12-includepath.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.12-includepath.patch
deleted file mode 100644
index 4a59a0c0c541..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.12-includepath.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -urN cyrus-imapd-2.1.12/configure cyrus-imapd-2.1.12-modified/configure
---- cyrus-imapd-2.1.12/configure	2003-02-03 15:31:13.000000000 -0600
-+++ cyrus-imapd-2.1.12-modified/configure	2003-02-11 04:40:39.000000000 -0600
-@@ -1499,10 +1499,10 @@
-     CFLAGS="-Wall ${CFLAGS}"
-   GCC_VERSION=`$CC -v 2>&1 | sed -n -e '/version/s/.*version \([0-9]\)\..*/\1/p'`
-   if test "$GCC_VERSION" != "3"; then
--    CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
-+    CPPFLAGS="${CPPFLAGS}"
-   fi
- else
--  CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
-+  CPPFLAGS="${CPPFLAGS}"
- fi 
- 
-   # this is CMU ADD LIBPATH
-@@ -4501,7 +4501,7 @@
- if test "${with_afs+set}" = set; then
-   withval="$with_afs"
-   with_afs="${withval}"
--	CFLAGS="${CFLAGS} -I${withval}/include"
-+	CFLAGS="${CFLAGS}"
- else
-   with_afs="/usr/local"
- fi
-@@ -5028,7 +5028,7 @@
- 
- 		
- 		;;
--	*)  OPENSSL_INC="-I${with_openssl}/include"
-+	*)  OPENSSL_INC=""
- 	    OPENSSL_LIBPATH="${with_openssl}/lib"
- 	    CPPFLAGS="${CPPFLAGS} ${OPENSSL_INC}"
- 	    
-@@ -5131,7 +5131,7 @@
-        *)  if test -d ${with_zephyr}/include/zephyr; then
-                ZEPHYR_CPPFLAGS="-I${with_zephyr}/include/zephyr"
-            else
--               ZEPHYR_CPPFLAGS="-I${with_zephyr}/include"
-+               ZEPHYR_CPPFLAGS=""
-            fi
-            ZEPHYR_LIBS="-lzephyr";;
- esac
-@@ -5384,7 +5384,7 @@
-   *) # use whatever they told us, or whatever we found
-      COMPILE_ET="${with_com_err}/bin/compile_et"
-      COM_ERR_LIBS="${with_com_err}/lib/libcom_err.a"
--     COM_ERR_CPPFLAGS="-I${with_com_err}/include"
-+     COM_ERR_CPPFLAGS=""
-      # Ever get the feeling people hide this stuff on purpose?
-      if test -d "${with_com_err}/include/et" ; then
-        COM_ERR_CPPFLAGS="-I${with_com_err}/include"
-@@ -5796,7 +5796,7 @@
- 
-  if test "$gssapi" != no; then
-     if test -d ${gssapi}; then
--       CPPFLAGS="$CPPFLAGS -I$gssapi/include"
-+       CPPFLAGS="$CPPFLAGS"
-        LDFLAGS="$LDFLAGS -L$gssapi/lib"
-     fi
-     ac_safe=`echo "gssapi.h" | sed 'y%./+-%__p_%'`
-@@ -5970,7 +5970,7 @@
- fi
- 
-   if test -d ${gssapi}; then 
--     CPPFLAGS="$CPPFLAGS -I$gssapi/include"
-+     CPPFLAGS="$CPPFLAGS"
-      LDFLAGS="$LDFLAGS -L$gssapi/lib"
-   fi
- 
-@@ -6587,7 +6587,7 @@
- 
-   if test "$with_libwrap" != no; then
-     if test -d "$with_libwrap"; then
--      CPPFLAGS="$CPPFLAGS -I${with_libwrap}/include"
-+      CPPFLAGS="$CPPFLAGS"
-       LDFLAGS="$LDFLAGS -L${with_libwrap}/lib"
-     fi
-     cmu_save_LIBS="$LIBS"
-@@ -6733,7 +6733,7 @@
- 
-   if test "$with_ucdsnmp" != no; then
-     if test -d "$with_ucdsnmp"; then
--      CPPFLAGS="$CPPFLAGS -I${with_ucdsnmp}/include"
-+      CPPFLAGS="$CPPFLAGS"
-       LDFLAGS="$LDFLAGS -L${with_ucdsnmp}/lib"
-     fi
-     cmu_save_LIBS="$LIBS"
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.14-db4.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.14-db4.patch
deleted file mode 100644
index 78578f3a0969..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.14-db4.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -urN cyrus-sasl-2.1.14/cmulocal/berkdb.m4 cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4
---- cyrus-sasl-2.1.14/cmulocal/berkdb.m4	2003-04-15 17:25:41.000000000 -0500
-+++ cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4	2003-07-09 03:17:48.000000000 -0500
-@@ -211,12 +211,20 @@
- 	    BDB_LIBADD=""
- 	fi
- 
--        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
-           do
--            AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
--              dblib="berkeley"; break, dblib="no")
-+            AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+              dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+               dblib="berkeley"; break, dblib="no"))
-           done
-         if test "$dblib" = "no"; then
-+          for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-+            do
-+              AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+                dblib="berkeley"; break, dblib="no")
-+            done
-+       fi
-+        if test "$dblib" = "no"; then
-           AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb";
-             dblib="berkeley"; dbname=db,
-             dblib="no")
-diff -urN cyrus-sasl-2.1.14/cmulocal/sasl2.m4 cyrus-sasl-2.1.14-modified/cmulocal/sasl2.m4
---- cyrus-sasl-2.1.14/cmulocal/sasl2.m4	2003-05-14 13:36:41.000000000 -0500
-+++ cyrus-sasl-2.1.14-modified/cmulocal/sasl2.m4	2003-07-09 03:18:31.000000000 -0500
-@@ -25,8 +25,9 @@
-   dnl
-   dnl The choice is reflected in GSSAPIBASE_LIBS
-   dnl we might need libdb
--  AC_CHECK_LIB(db, db_open)
--
-+  AC_CHECK_LIB(db, db_open,,
-+       AC_CHECK_LIB(db, db_open_4001,,
-+       AC_CHECK_LIB(db, db_open_4000)))
-   gss_impl="mit";
-   AC_CHECK_LIB(resolv,res_search)
-   if test -d ${gssapi}; then 
-diff -urN cyrus-imapd-2.1.15/lib/cyrusdb_db3.c cyrus-imapd-2.1.15-modified/lib/cyrusdb_db3.c
---- cyrus-imapd-2.1.15/lib/cyrusdb_db3.c	2003-08-12 20:51:31.000000000 +0200
-+++ cyrus-imapd-2.1.15-modified/lib/cyrusdb_db3.c	2003-08-12 20:56:41.000000000 +0200
-@@ -80,6 +80,9 @@
- #define txn_checkpoint(xx1,xx2,xx3,xx4) (xx1)->txn_checkpoint(xx1,xx2,xx3,xx4)
- #define txn_id(xx1) (xx1)->id(xx1)
- #define log_archive(xx1,xx2,xx3,xx4) (xx1)->log_archive(xx1,xx2,xx3)
-+#define	txn_begin(xx1,xx2,xx3,xx4) (xx1)->txn_begin(xx1,xx2,xx3,xx4)
-+#define	txn_abort(xx1) (xx1)->abort(xx1)
-+#define	txn_commit(xx1,xx2) (xx1)->commit(xx1,xx2)
- #elif DB_VERSION_MINOR == 3
- #define log_archive(xx1,xx2,xx3,xx4) log_archive(xx1,xx2,xx3)
- #endif
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.15-db4.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.15-db4.patch
deleted file mode 100644
index 9ad444fa985c..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.15-db4.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -urN cyrus-sasl-2.1.14/cmulocal/berkdb.m4 cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4
---- cyrus-sasl-2.1.14/cmulocal/berkdb.m4	2003-04-15 17:25:41.000000000 -0500
-+++ cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4	2003-07-09 03:17:48.000000000 -0500
-@@ -211,12 +211,20 @@
- 	    BDB_LIBADD=""
- 	fi
- 
--        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
-           do
--            AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
--              dblib="berkeley"; break, dblib="no")
-+            AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+              dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+               dblib="berkeley"; break, dblib="no"))
-           done
-         if test "$dblib" = "no"; then
-+          for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-+            do
-+              AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+                dblib="berkeley"; break, dblib="no")
-+            done
-+       fi
-+        if test "$dblib" = "no"; then
-           AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb";
-             dblib="berkeley"; dbname=db,
-             dblib="no")
-diff -urN cyrus-imapd-2.1.15/cmulocal/sasl2.m4 cyrus-imapd-2.1.15-modified/cmulocal/sasl2.m4
---- cyrus-imapd-2.1.15/cmulocal/sasl2.m4	2003-05-15 13:36:41.000000000 -0500
-+++ cyrus-imapd-2.1.15-modified/cmulocal/sasl2.m4	2003-07-09 03:18:31.000000000 -0500
-@@ -26,8 +26,9 @@
-   dnl
-   dnl The choice is reflected in GSSAPIBASE_LIBS
-   dnl we might need libdb
--  AC_CHECK_LIB(db, db_open)
--
-+  AC_CHECK_LIB(db, db_open,,
-+       AC_CHECK_LIB(db, db_open_4001,,
-+       AC_CHECK_LIB(db, db_open_4000)))
-   gss_impl="no";
-   AC_CHECK_LIB(resolv,res_search)
-   if test -d ${gssapi}; then 
-diff -urN cyrus-imapd-2.1.15/lib/cyrusdb_db3.c cyrus-imapd-2.2.15-modified/lib/cyrusdb_db3.c
---- cyrus-imapd-2.1.15/lib/cyrusdb_db3.c	2003-08-12 20:51:31.000000000 +0200
-+++ cyrus-imapd-2.1.15-modified/lib/cyrusdb_db3.c	2003-08-12 20:56:41.000000000 +0200
-@@ -80,6 +80,9 @@
- #define txn_checkpoint(xx1,xx2,xx3,xx4) (xx1)->txn_checkpoint(xx1,xx2,xx3,xx4)
- #define txn_id(xx1) (xx1)->id(xx1)
- #define log_archive(xx1,xx2,xx3,xx4) (xx1)->log_archive(xx1,xx2,xx3)
-+#define	txn_begin(xx1,xx2,xx3,xx4) (xx1)->txn_begin(xx1,xx2,xx3,xx4)
-+#define	txn_abort(xx1) (xx1)->abort(xx1)
-+#define	txn_commit(xx1,xx2) (xx1)->commit(xx1,xx2)
- #elif DB_VERSION_MINOR == 3
- #define log_archive(xx1,xx2,xx3,xx4) log_archive(xx1,xx2,xx3)
- #endif
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.3-db4.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.3-db4.patch
deleted file mode 100644
index ace2f28ea8e1..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.3-db4.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN cyrus-imapd-2.2.3/cmulocal/berkdb.m4 cyrus-imapd-2.2.3/cmulocal/berkdb.m4
---- cyrus-imapd-2.2.3/cmulocal/berkdb.m4	2003-04-15 17:25:41.000000000 -0500
-+++ cyrus-imapd-2.2.3/cmulocal/berkdb.m4	2003-07-09 03:17:48.000000000 -0500
-@@ -211,12 +211,21 @@
- 	    BDB_LIBADD=""
- 	fi
- 
--        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
-           do
--            AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
--              dblib="berkeley"; break, dblib="no")
-+            AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+              dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+               dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4002, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+                dblib="berkeley"; break, dblib="no")))
-           done
-         if test "$dblib" = "no"; then
-+          for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-+            do
-+              AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+                dblib="berkeley"; break, dblib="no")
-+            done
-+       fi
-+        if test "$dblib" = "no"; then
-           AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb";
-             dblib="berkeley"; dbname=db,
-             dblib="no")
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-libwrap.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-libwrap.patch
deleted file mode 100644
index ee800779f5e4..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-libwrap.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN cyrus-imapd-2.1.11/master/master.c cyrus-imapd-2.1.11-modified/master/master.c
---- cyrus-imapd-2.1.11/master/master.c	2002-11-01 10:44:33.000000000 -0600
-+++ cyrus-imapd-2.1.11-modified/master/master.c	2002-12-07 18:21:41.000000000 -0600
-@@ -103,6 +103,10 @@
- static int verbose = 0;
- static int listen_queue_backlog = 32;
- 
-+int allow_severity = LOG_DEBUG;
-+int deny_severity = LOG_ERR;
-+int hosts_ctl;
-+
- struct service *Services = NULL;
- int allocservices = 0;
- int nservices = 0;
diff --git a/net-mail/cyrus-imapd/files/cyrus.rc6_2 b/net-mail/cyrus-imapd/files/cyrus.rc6_2
deleted file mode 100644
index aafa2e030c17..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus.rc6_2
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/files/cyrus.rc6_2,v 1.4 2004/07/14 23:49:02 agriffis Exp $
-
-depend() {
-	need net
-	after saslauthd
-	use dns logger
-}
-
-start() {
-	ebegin "Starting Cyrus imapd"
-	start-stop-daemon --start --quiet --background --make-pidfile --pidfile /var/run/cyrus.pid --exec /usr/cyrus/bin/cyrusmaster
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Cyrus imapd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/cyrus.pid
-	rm /var/run/cyrus.pid
-	eend $?
-}
diff --git a/net-mail/cyrus-imapd/files/cyrus_2.conf b/net-mail/cyrus-imapd/files/cyrus_2.conf
deleted file mode 100644
index 58704e37b5b2..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus_2.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/files/cyrus_2.conf,v 1.2 2004/07/18 04:02:23 dragonheart Exp $
-
-# standard standalone server implementation
-
-START {
-  # do not delete this entry!
-  recover	cmd="ctl_cyrusdb -r"
-
-  # this is only necessary if using idled for IMAP IDLE
-#  idled		cmd="idled"
-}
-
-# UNIX sockets start with a slash and are put into /var/imap/socket
-SERVICES {
-  # add or remove based on preferences
-  imap		cmd="imapd" listen="imap2" prefork=0
-  pop3		cmd="pop3d" listen="pop-3" prefork=0
-  # Don't forget to generate the needed keys for SSL or TLS
-  # (see doc/html/install-configure.html)
-  imaps		cmd="imapd -s" listen="imaps" prefork=0
-  pop3s		cmd="pop3d -s" listen="pop3s" prefork=0
-  sieve		cmd="timsieved" listen="sieve" prefork=0
-
-  # at least one LMTP is required for delivery
-#  lmtp		cmd="lmtpd" listen="lmtp" prefork=0
-  lmtpunix	cmd="lmtpd" listen="/var/imap/socket/lmtp" prefork=0
-
-  # this is only necessary if using notifications
-#  notify	cmd="notifyd" listen="/var/imap/socket/notify" proto="udp" prefork=1
-}
-
-EVENTS {
-  # this is required
-  checkpoint	cmd="ctl_cyrusdb -c" period=30
-
-  # this is only necessary if using duplicate delivery suppression
-  delprune	cmd="ctl_deliver -E 3" period=1440
-
-  # this is only necessary if caching TLS sessions
-  tlsprune	cmd="tls_prune" period=1440
-}
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.15 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.15
deleted file mode 100644
index 556a6f5137cc..000000000000
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.15
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 17f1272218478bcc71665d9a756d5c07 cyrus-imapd-2.1.15.tar.gz 1698648
-MD5 de6e1de7a65938d1561cea38c39d77db cyrus-imapd-2.1.15-ipv6-20030819.diff.gz 33437
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.15-r1 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.15-r1
deleted file mode 100644
index 556a6f5137cc..000000000000
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.15-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 17f1272218478bcc71665d9a756d5c07 cyrus-imapd-2.1.15.tar.gz 1698648
-MD5 de6e1de7a65938d1561cea38c39d77db cyrus-imapd-2.1.15-ipv6-20030819.diff.gz 33437
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.3 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.3
deleted file mode 100644
index 68980bd5b063..000000000000
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 32888c5120edeb2867d6283fedbdb7d5 cyrus-imapd-2.2.3.tar.gz 1887717
diff --git a/net-mail/cyrus-imapd/files/gentestcrt.sh b/net-mail/cyrus-imapd/files/gentestcrt.sh
deleted file mode 100644
index 15aab1e01c4e..000000000000
--- a/net-mail/cyrus-imapd/files/gentestcrt.sh
+++ /dev/null
@@ -1,243 +0,0 @@
-#!/bin/sh
-## $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/files/gentestcrt.sh,v 1.2 2004/07/18 04:02:23 dragonheart Exp $
-##
-##  gentestcrt -- Create self-signed test certificate
-##  (C) 2001 Jean-Michel Dault <jmdault@mandrakesoft.com> and Mandrakesoft
-##  Based on cca.sh script by Ralf S. Engelschall
-##
-
-#   external tools
-openssl="/usr/bin/openssl"
-
-#   some optional terminal sequences
-case $TERM in
-    xterm|xterm*|vt220|vt220*)
-        T_MD=`echo dummy | awk '{ printf("%c%c%c%c", 27, 91, 49, 109); }'`
-        T_ME=`echo dummy | awk '{ printf("%c%c%c", 27, 91, 109); }'`
-        ;;
-    vt100|vt100*)
-        T_MD=`echo dummy | awk '{ printf("%c%c%c%c%c%c", 27, 91, 49, 109, 0, 0); }'`
-        T_ME=`echo dummy | awk '{ printf("%c%c%c%c%c", 27, 91, 109, 0, 0); }'`
-        ;;
-    default)
-        T_MD=''
-        T_ME=''
-        ;;
-esac
-
-#   find some random files
-#   (do not use /dev/random here, because this device 
-#   doesn't work as expected on all platforms)
-randfiles=''
-for file in /var/log/messages /var/adm/messages \
-            /kernel /vmunix /vmlinuz \
-            /etc/hosts /etc/resolv.conf; do
-    if [ -f $file ]; then
-        if [ ".$randfiles" = . ]; then
-            randfiles="$file"
-        else
-            randfiles="${randfiles}:$file"
-        fi
-    fi
-done
-
-
-echo "${T_MD}maketestcrt -- Create self-signed test certificate${T_ME}"
-echo "(C) 2001 Jean-Michel Dault <jmdault@mandrakesoft.com> and Mandrakesoft"
-echo "Based on cca.sh script by Ralf S. Engelschall"
-echo ""
-
-grep -q -s DUMMY server.crt && mv server.crt server.crt.dummy
-grep -q -s DUMMY server.key && mv server.key server.key.dummy
-
-echo ""
-echo ""
-
-if [ ! -e ./server.crt -a ! -e ./server.key ];then 
-	echo "Will create server.key and server.crt in `pwd`"
-else
-	echo "server.key and server.crt already exist, dying"
-	exit
-fi
-
-echo ""
-
-
-mkdir -p /tmp/tmpssl-$$
-pushd /tmp/tmpssl-$$ > /dev/null
-
-
-    echo "${T_MD}INITIALIZATION${T_ME}"
-
-    echo ""
-    echo "${T_MD}Generating custom Certificate Authority (CA)${T_ME}"
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}STEP 1: Generating RSA private key for CA (1024 bit)${T_ME}"
-    cp /dev/null ca.rnd
-    echo '01' >ca.ser
-    if [ ".$randfiles" != . ]; then
-        $openssl genrsa -rand $randfiles -out ca.key 1024
-    else
-        $openssl genrsa -out ca.key 1024
-    fi
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to generate RSA private key" 1>&2
-        exit 1
-    fi
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}STEP 2: Generating X.509 certificate signing request for CA${T_ME}"
-    cat >.cfg <<EOT
-[ req ]
-default_bits                    = 1024
-distinguished_name              = req_DN
-RANDFILE                        = ca.rnd
-[ req_DN ]
-countryName                     = "1. Country Name             (2 letter code)"
-#countryName_default             = CA
-#countryName_min                 = 2
-countryName_max                 = 2
-stateOrProvinceName             = "2. State or Province Name   (full name)    "
-#stateOrProvinceName_default     = "Quebec"
-localityName                    = "3. Locality Name            (eg, city)     "
-#localityName_default            = "Montreal"
-0.organizationName              = "4. Organization Name        (eg, company)  "
-0.organizationName_default      = "Cyrus IMAP Server"
-organizationalUnitName          = "5. Organizational Unit Name (eg, section)  "
-organizationalUnitName_default  = "For testing purposes only"
-commonName                      = "6. Common Name              (eg, CA name)  "
-commonName_max                  = 64
-commonName_default              = "localhost"
-emailAddress                    = "7. Email Address            (eg, name@FQDN)"
-emailAddress_max                = 40
-#emailAddress_default            = "root@localhost"
-EOT
-    $openssl req -config .cfg -new -key ca.key -out ca.csr
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to generate certificate signing request" 1>&2
-        exit 1
-    fi
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}STEP 3: Generating X.509 certificate for CA signed by itself${T_ME}"
-    cat >.cfg <<EOT
-#extensions = x509v3
-#[ x509v3 ]
-#subjectAltName   = email:copy
-#basicConstraints = CA:true,pathlen:0
-#nsComment        = "CCA generated custom CA certificate"
-#nsCertType       = sslCA
-EOT
-    $openssl x509 -extfile .cfg -req -days 365 -signkey ca.key -in ca.csr -out ca.crt
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to generate self-signed CA certificate" 1>&2
-        exit 1
-    fi
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}RESULT:${T_ME}"
-    $openssl verify ca.crt
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to verify resulting X.509 certificate" 1>&2
-        exit 1
-    fi
-    $openssl x509 -text -in ca.crt
-    $openssl rsa -text -in ca.key
-
-    echo "${T_MD}CERTIFICATE GENERATION${T_ME}"
-    user="server"
-
-    echo ""
-    echo "${T_MD}Generating custom USER${T_ME} [$user]"
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}STEP 5: Generating RSA private key for USER (1024 bit)${T_ME}"
-    if [ ".$randfiles" != . ]; then
-        $openssl genrsa -rand $randfiles -out $user.key 1024
-    else
-        $openssl genrsa -out $user.key 1024
-    fi
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to generate RSA private key" 1>&2
-        exit 1
-    fi
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}STEP 6: Generating X.509 certificate signing request for USER${T_ME}"
-    cat >.cfg <<EOT
-[ req ]
-default_bits                    = 1024
-distinguished_name              = req_DN
-RANDFILE                        = ca.rnd
-[ req_DN ]
-countryName                     = "1. Country Name             (2 letter code)"
-#countryName_default             = XY
-#countryName_min                 = 2
-countryName_max                 = 2
-stateOrProvinceName             = "2. State or Province Name   (full name)    "
-#stateOrProvinceName_default     = "Unknown"
-localityName                    = "3. Locality Name            (eg, city)     "
-#localityName_default            = "Server Room"
-0.organizationName              = "4. Organization Name        (eg, company)  "
-0.organizationName_default      = "Cyrus IMAP Server"
-organizationalUnitName          = "5. Organizational Unit Name (eg, section)  "
-organizationalUnitName_default  = "Test Certificate"
-commonName                      = "6. Common Name              (eg, DOMAIN NAME)  "
-commonName_max                  = 64
-commonName_default              = "localhost"
-emailAddress                    = "7. Email Address            (eg, name@fqdn)"
-emailAddress_max                = 40
-#emailAddress_default            = "root@localhost"
-EOT
-    $openssl req -config .cfg -new -key $user.key -out $user.csr
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to generate certificate signing request" 1>&2
-        exit 1
-    fi
-    rm -f .cfg
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}STEP 7: Generating X.509 certificate signed by own CA${T_ME}"
-    cat >.cfg <<EOT
-#extensions = x509v3
-#[ x509v3 ]
-#subjectAltName   = email:copy
-#basicConstraints = CA:false,pathlen:0
-#nsComment        = "CCA generated client certificate"
-#nsCertType       = client
-EOT
-    $openssl x509 -extfile .cfg -days 365 -CAserial ca.ser -CA ca.crt -CAkey ca.key -in $user.csr -req -out $user.crt
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to generate X.509 certificate" 1>&2
-        exit 1
-    fi
-    caname="`$openssl x509 -noout -text -in ca.crt |\
-             grep Subject: | sed -e 's;.*CN=;;' -e 's;/Em.*;;'`"
-    username="`$openssl x509 -noout -text -in $user.crt |\
-               grep Subject: | sed -e 's;.*CN=;;' -e 's;/Em.*;;'`"
-#    echo "Assembling PKCS#12 package"
-#    $openssl pkcs12 -export -in $user.crt -inkey $user.key -certfile ca.crt -name "$username" -caname "$caname" -out $user.p12
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}RESULT:${T_ME}"
-    $openssl verify -CAfile ca.crt $user.crt
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to verify resulting X.509 certificate" 1>&2
-        exit 1
-    fi
-    $openssl x509 -text -in $user.crt
-    $openssl rsa -text -in $user.key
-
-
-popd >/dev/null
-
-
-rm -f /tmp/tmpssl-$$/*.csr
-rm -f /tmp/tmpssl-$$/ca.*
-chmod 400 /tmp/tmpssl-$$/*
-
-echo "Certificate creation done!"
-cp /tmp/tmpssl-$$/server.* .
-
-rm -rf /tmp/tmpssl-$$
diff --git a/net-mail/cyrus-imapd/files/imapd_2.conf b/net-mail/cyrus-imapd/files/imapd_2.conf
deleted file mode 100644
index c894c1fda3ef..000000000000
--- a/net-mail/cyrus-imapd/files/imapd_2.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/files/imapd_2.conf,v 1.2 2004/07/18 04:02:23 dragonheart Exp $
-#
-# Don't forget to use chattr +S (if you are using ext[23]) 
-# when you change these directories (read the docs).
-configdirectory:	/var/imap
-partition-default:	/var/spool/imap
-sievedir:		/var/imap/sieve
-
-tls_cert_file:		/etc/cyrusimapd/server.crt
-tls_key_file:		/etc/cyrusimapd/server.key
-
-# Don't use an everyday user as admin.
-admins:			cyrus
-
-hashimapspool:		yes
-allowanonymouslogin:	no
-allowplaintext:		no
-
-# Use this if sieve-scripts could be in ~user/.sieve.
-#sieveusehomedir:	yes
-
-# Use saslauthd if you want to use pam for imap.
-# But be warned: login with DIGEST-MD5 or CRAM-MD5 
-# is not possible using pam.
-#sasl_pwcheck_method:	saslauthd
diff --git a/net-mail/cyrus-imapd/files/master.8.diff b/net-mail/cyrus-imapd/files/master.8.diff
deleted file mode 100644
index 5122c9646901..000000000000
--- a/net-mail/cyrus-imapd/files/master.8.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- master.8	2002-05-25 21:57:48.000000000 +0200
-+++ cyrusmaster.8	2002-09-29 12:50:37.000000000 +0200
-@@ -1,5 +1,5 @@
- .\" -*- nroff -*-
--.TH MASTER 8 "Project Cyrus" CMU
-+.TH CYRUSMASTER 8 "Project Cyrus" CMU
- .\" 
- .\" Copyright (c) 1996-2000 Carnegie Mellon University.  All rights reserved.
- .\"
-@@ -41,9 +41,9 @@
- .\" 
- .\" $Id: master.8.diff,v 1.1 2002/10/11 14:51:49 raker Exp $
- .SH NAME
--master \- master Cyrus process
-+cyrusmaster \- master Cyrus process
- .SH SYNOPSIS
--.B master
-+.B cyrusmaster
- [
- .B \-l
- .I listen queue
-@@ -52,7 +52,7 @@
- .B \-D
- ]
- .SH DESCRIPTION
--.I Master
-+.I Cyrusmaster
- is the process that controls all of the Cyrus processes. This process
- is responsible for creating all imapd, pop3d, lmtpd and sieved child
- processes. This process also initializes the Berkeley DB code and
-@@ -73,12 +73,12 @@
- Don't close stdin/stdout/stderr. Primiarly useful for debugging.
- .SH CONFIGURATION
- Upon execution,
--.I master
-+.I cyrusmaster
- reads its configuration information out of the
- .IR cyrus.conf (5)
- file.
- .PP
--.I Master
-+.I Cyrusmaster
- rereads its configuration file when it receives a hangup signal,
- SIGHUP.  Services and events may be added, deleted or modified when the
- configuration file is reread.  Any active services removed from the
diff --git a/net-mail/cyrus-imapd/files/pam.d-imap b/net-mail/cyrus-imapd/files/pam.d-imap
deleted file mode 100644
index 4d9a64106e89..000000000000
--- a/net-mail/cyrus-imapd/files/pam.d-imap
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/files/pam.d-imap,v 1.2 2004/07/18 04:02:23 dragonheart Exp $
-auth	required	/lib/security/pam_pwdb.so nullok shadow
-account	required	/lib/security/pam_pwdb.so