cleanup

15 files changed, 17 insertions, 1063 deletions

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
new file mode 100644
index 000000000000..fdf52046ced7
--- /dev/null
+++ b/net-mail/cyrus-imapd/Manifest
@@ -0,0 +1,17 @@
+MD5 9ecb4c3096bec278cb55be046313e91a ChangeLog 4850
+MD5 e2494a6bb94bf802cd1b0d0a8dc4ef0e cyrus-imapd-2.1.11-r1.ebuild 6299
+MD5 c26714aa036de2bd0e7c8a39433f32c1 cyrus-imapd-2.1.12.ebuild 6850
+MD5 e2c00049c69e3eca58d5a635dd3fd6dc files/configure.diff 6285
+MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
+MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imapd-2.1.12-libwrap.patch 494
+MD5 0e719522fa5fdeeb6299875a7ab67f36 files/cyrus.conf 1340
+MD5 49f1642ca5d96db10f40a7c37a52dbd8 files/cyrus.rc6_2 631
+MD5 8ef2ff8ab18c79ca0fc96e0ec58e084a files/cyrus_2.conf 1340
+MD5 a73606d0350e6883a11a4c525af59551 files/digest-cyrus-imapd-2.1.12 71
+MD5 074362acae4027842361a769407b8645 files/digest-cyrus-imapd-2.1.11-r1 71
+MD5 cbd00df5ef9288b1c830d95fa5e5831f files/gentestcrt.sh 8799
+MD5 a26c1601811d0fd0cc3da0bae6d76693 files/imap-overflow.diff 871
+MD5 df60f59cb6da75d7ca5e71a0d1ad52e7 files/imapd_2.conf 765
+MD5 374ae77d5cbb38777c1416e60b12c1d6 files/libsieve-overflow.diff 1898
+MD5 959399de17330ea5f52ef56cb6c5ffcd files/master.8.diff 1280
+MD5 f4074e463596703804133990ab7b00fd files/pam.d-imap 209
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.11.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.11.ebuild
deleted file mode 100644
index c2d9ea788518..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.11.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.11.ebuild,v 1.5 2003/02/13 14:27:34 vapier Exp $
-
-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 -ppc -sparc "
-
-PROVIDE="virtual/imapd"
-DEPEND="virtual/glibc
-	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/kth-krb-1.2 )
-	>=sys-libs/db-3.2
-	>=sys-libs/pam-0.75
-	>=dev-libs/cyrus-sasl-2.1.2
-	>=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 -p1 < ${FILESDIR}/configure.diff || die "patch failed"
-
-}
-
-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} --with-krb=/usr/athena --with-auth=krb --enable-gssapi" \
-		|| myconf="${myconf} --without-krb --with-auth=unix --disable-gssapi"
-
-	econf \
-		--enable-listext \
-		--with-cyrus-group=mail \
-		--enable-netscapehack \
-		--with-com_err=yes \
-		--without-perl \
-		--disable-cyradm \
-		--with-libwrap=/usr \
-		${myconf}
-
-	# 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 
-	mkdir -m 0755 ${D}var/imap/db
-	chown -R cyrus.mail ${D}var/imap/db
-	mkdir -m 0755 ${D}var/imap/log
-	chown -R cyrus.mail ${D}var/imap/log
-	mkdir -m 0755 ${D}var/imap/msg
-	chown -R cyrus.mail ${D}var/imap/msg
-	mkdir -m 0755 ${D}var/imap/user
-	chown -R cyrus.mail ${D}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
-	done
-	mkdir -m 0755 ${D}var/imap/proc
-	chown -R cyrus.mail ${D}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
-	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 ; done
-   	mkdir -m 0755 ${D}var/imap/socket
-        chown -R cyrus.mail ${D}var/imap/socket
-
-	mkdir ${D}var/spool
-	mkdir -m 0750 ${D}var/spool/imap
-        chown -R cyrus.mail ${D}var/spool/imap
-	mkdir -m 0755 ${D}var/spool/imap/stage.
-        chown -R cyrus.mail ${D}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 ; 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.5-r2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.5-r2.ebuild
deleted file mode 100644
index 8b2e008a4ddd..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.5-r2.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.5-r2.ebuild,v 1.7 2003/03/11 21:11:46 seemant Exp $
-
-IUSE="ssl perl snmp afs"
-
-inherit perl-module
-inherit perl-post
-
-S=${WORKDIR}/${P}
-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 -ppc -sparc "
-
-PROVIDE="virtual/imapd"
-RDEPEND="virtual/glibc
-	afs? ( >=net-fs/openafs-1.2.2 )
-	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-    perl? ( >=dev-lang/perl-5.6.1 )
-	>=sys-libs/db-3.2
-	>=sys-libs/pam-0.75
-	>=dev-libs/cyrus-sasl-2.1.2
-	>=sys-apps/tcp-wrappers-7.6"
-DEPEND="virtual/glibc
-	afs? ( >=net-fs/openafs-1.2.2 )
-	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-    perl? ( >=dev-lang/perl-5.6.1 )
-	>=sys-libs/db-3.2
-	>=sys-libs/pam-0.75
-	>=dev-libs/cyrus-sasl-2.1.2
-	>=sys-apps/tcp-wrappers-7.6
-	net-mail/mailbase"
-
-
-# recommended: flex, maybe: net-snmp, postfix, perl?, afs, inn, tcl (cyradm)
-	
-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 ${WORKDIR}
-	patch -p0 < ${FILESDIR}/e2fsprogs-et.diff
-}
-
-src_compile() {
-
-	local myconf
-	
-	use afs || myconf="--without-afs"
-	use snmp || myconf="${myconf} --without-ucdsnmp"
-	use ssl || myconf="${myconf} --without-openssl"
-    	use perl || myconf="${myconf} --without-perl --disable-cyradm"
-
-
-	./configure \
-		--prefix=/usr \
-		--without-krb \
-		--without-gssapi \
-		--enable-listext \
-		--disable-cyradm \
-		--with-cyrus-group=mail \
-		--enable-shared \
-		--enable-netscapehack \
-		--with-com_err=yes \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	# make depends break with -f... in CFLAGS
-	make depend CFLAGS="" || die "make depend problem"
-
-	make || die "compile problem"
-
-}
-
-src_install () {
-	# remove perl subdirs from beeing installed
-	sed "s:SUBDIRS = imap sieve:SUBDIRS =:" ${S}/perl/Makefile > ${S}/perl/Makefile.install
-	mv ${S}/perl/Makefile ${S}/perl/Makefile.orig
-	mv ${S}/perl/Makefile.install ${S}/perl/Makefile
-
-	emake DESTDIR=${D} install || die
-
-	# Remove the developer stuff (-> dev-libs/cyrus-imap-devel)
-	rm -rf ${D}usr/include ${D}usr/lib
-
-	# Remove the manpages (wrong place)
-	rm -rf ${D}usr/man
-	
-	mkdir ${D}etc
-	cp ${FILESDIR}/imapd.conf ${D}etc/imapd.conf
-	cp ${FILESDIR}/cyrus.conf ${D}etc/cyrus.conf
-	mkdir ${D}etc/pam.d
-	cp ${FILESDIR}/pam.d-imap ${D}etc/pam.d/imap
-
-	mkdir ${D}var ${D}var/log
-	touch ${D}var/log/imapd.log
-	touch ${D}var/log/auth.log
-
-   	mkdir -m 0750 ${D}var/imap
-   	chown -R cyrus.mail ${D}var/imap 
-   	mkdir -m 0755 ${D}var/imap/db
-        chown -R cyrus.mail ${D}var/imap/db
-   	mkdir -m 0755 ${D}var/imap/log
-        chown -R cyrus.mail ${D}var/imap/log
-   	mkdir -m 0755 ${D}var/imap/msg
-        chown -R cyrus.mail ${D}var/imap/msg
-   	mkdir -m 0755 ${D}var/imap/user
-        chown -R cyrus.mail ${D}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 ; done
-   	mkdir -m 0755 ${D}var/imap/proc
-        chown -R cyrus.mail ${D}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 ; 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 ; done
-   	mkdir -m 0755 ${D}var/imap/socket
-        chown -R cyrus.mail ${D}var/imap/socket
-
-	mkdir ${D}var/spool
-	mkdir -m 0750 ${D}var/spool/imap
-        chown -R cyrus.mail ${D}var/spool/imap
-	mkdir -m 0755 ${D}var/spool/imap/stage.
-        chown -R cyrus.mail ${D}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 ; done
-
-
-	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
-
-	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 cyrus
-
-	if use perl ; then
-		export DESTDIR=${D}
-		cd ${S}/perl/imap
-		perl-module_src_prep
-		perl-module_src_compile
-		perl-module_src_test
-		perl-module_src_install
-        cd ${S}/perl/sieve/acap
-		perl-module_src_prep
-		perl-module_src_compile
-		perl-module_src_test
-		perl-module_src_install
-        cd ${S}/perl/sieve/managesieve
-		perl-module_src_prep
-		perl-module_src_compile
-		perl-module_src_test
-		perl-module_src_install
-	fi
-
-}
-
-pkg_postinst() {
-	perl-post_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 add"
-	einfo "\tlocal6.* /var/log/imapd.log"
-	einfo "\tauth.debug /var/log/auth.log"
-	einfo "to /etc/syslog.conf."
-	echo
-
-	if [ "'use ssl'" ]; then
-		ewarn "WARNING: Read the section about SSL and TLS of"
-		ewarn "/usr/share/doc/${P}/html/install-configure.html."
-		ewarn "about installing the needed keys."
-	fi
-}
-
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.9-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.9-r1.ebuild
deleted file mode 100644
index b67a4dfd60c9..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.9-r1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.9-r1.ebuild,v 1.9 2003/02/13 14:27:52 vapier Exp $
-
-S=${WORKDIR}/${P}
-
-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 -ppc -sparc "
-
-PROVIDE="virtual/imapd"
-DEPEND="virtual/glibc
-	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/krb5-1.2.5 )
-	>=sys-libs/db-3.2
-	>=sys-libs/pam-0.75
-	>=dev-libs/cyrus-sasl-2.1.2
-	>=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 < ${FILESDIR}/config.diff || die "patch failed"
-
-}
-
-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} --with-krb --with-auth=krb --enable-gssapi" \
-		|| myconf="${myconf} --without-krb --with-auth=unix --disable-gssapi"
-
-	econf \
-		--enable-listext \
-		--with-cyrus-group=mail \
-		--enable-netscapehack \
-		--with-com_err=yes \
-		--without-perl \
-		--disable-cyradm \
-		${myconf} || die "bad ./configure"
-
-	# make depends break with -f... in CFLAGS
-	make depend CFLAGS="" || die "make depend problem"
-
-	make || die "compile problem"
-
-}
-
-src_install () {
-
-	# 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
-
-	mkdir ${D}etc 
-	cp ${FILESDIR}/imapd_2.conf ${D}etc/imapd.conf
-	cp ${FILESDIR}/cyrus_2.conf ${D}etc/cyrus.conf
-	mkdir ${D}etc/pam.d
-	cp ${FILESDIR}/pam.d-imap ${D}etc/pam.d/imap
-
-	mkdir ${D}var
-   	mkdir -m 0750 ${D}var/imap
-   	chown -R cyrus.mail ${D}var/imap 
-   	mkdir -m 0755 ${D}var/imap/db
-        chown -R cyrus.mail ${D}var/imap/db
-   	mkdir -m 0755 ${D}var/imap/log
-        chown -R cyrus.mail ${D}var/imap/log
-   	mkdir -m 0755 ${D}var/imap/msg
-        chown -R cyrus.mail ${D}var/imap/msg
-   	mkdir -m 0755 ${D}var/imap/user
-        chown -R cyrus.mail ${D}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 ; done
-   	mkdir -m 0755 ${D}var/imap/proc
-        chown -R cyrus.mail ${D}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 ; 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 ; done
-   	mkdir -m 0755 ${D}var/imap/socket
-        chown -R cyrus.mail ${D}var/imap/socket
-
-	mkdir ${D}var/spool
-	mkdir -m 0750 ${D}var/spool/imap
-        chown -R cyrus.mail ${D}var/spool/imap
-	mkdir -m 0755 ${D}var/spool/imap/stage.
-        chown -R cyrus.mail ${D}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 ; 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.9-r2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.9-r2.ebuild
deleted file mode 100644
index 49daa8255b91..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.9-r2.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.9-r2.ebuild,v 1.4 2003/02/13 14:27:58 vapier Exp $
-
-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 -ppc -sparc "
-
-PROVIDE="virtual/imapd"
-DEPEND="virtual/glibc
-	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/krb5-1.2.5 )
-	>=sys-libs/db-3.2
-	>=sys-libs/pam-0.75
-	>=dev-libs/cyrus-sasl-2.1.2
-	>=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 < ${FILESDIR}/config.diff || die "patch failed"
-
-	cp configure configure.orig
-	sed -e "s:-ldes:-ldes425:" \
-		< configure.orig > configure || die "patch failed"
-}
-
-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} --with-krb --with-auth=krb --enable-gssapi" \
-		|| myconf="${myconf} --without-krb --with-auth=unix --disable-gssapi"
-
-	econf \
-		--enable-listext \
-		--with-cyrus-group=mail \
-		--enable-netscapehack \
-		--with-com_err=yes \
-		--without-perl \
-		--disable-cyradm \
-		${myconf}
-
-	# 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 
-	mkdir -m 0755 ${D}var/imap/db
-	chown -R cyrus.mail ${D}var/imap/db
-	mkdir -m 0755 ${D}var/imap/log
-	chown -R cyrus.mail ${D}var/imap/log
-	mkdir -m 0755 ${D}var/imap/msg
-	chown -R cyrus.mail ${D}var/imap/msg
-	mkdir -m 0755 ${D}var/imap/user
-	chown -R cyrus.mail ${D}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
-	done
-	mkdir -m 0755 ${D}var/imap/proc
-	chown -R cyrus.mail ${D}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
-	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 ; done
-   	mkdir -m 0755 ${D}var/imap/socket
-        chown -R cyrus.mail ${D}var/imap/socket
-
-	mkdir ${D}var/spool
-	mkdir -m 0750 ${D}var/spool/imap
-        chown -R cyrus.mail ${D}var/spool/imap
-	mkdir -m 0755 ${D}var/spool/imap/stage.
-        chown -R cyrus.mail ${D}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 ; 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.9.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.9.ebuild
deleted file mode 100644
index c0c5669f6ac4..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.9.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.9.ebuild,v 1.11 2003/03/11 21:11:46 seemant Exp $
-
-inherit perl-module
-
-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 -ppc -sparc "
-IUSE="ssl kerberos perl snmp afs"
-
-PROVIDE="virtual/imapd"
-DEPEND="virtual/glibc
-	afs? ( >=net-fs/openafs-1.2.2 )
-	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-    	perl? ( >=dev-lang/perl-5.6.1 )
-	kerberos? ( >=app-crypt/krb5-1.2.5 )
-	>=sys-libs/db-3.2
-	>=sys-libs/pam-0.75
-	>=dev-libs/cyrus-sasl-2.1.2
-	>=sys-apps/tcp-wrappers-7.6
-	net-mail/mailbase"
-
-# recommended: flex, maybe: net-snmp, postfix, perl?, afs, inn, tcl (cyradm)
-	
-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 < ${FILESDIR}/config.diff || die "patch failed"
-}
-
-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 perl && myconf="${myconf} --with-perl --enable-cyradm" \
-		|| myconf="${myconf} --without-perl --disable-cyradm"
-
-	use kerberos && myconf="${myconf} --with-krb --with-auth=krb" \
-		|| myconf="${myconf} --without-krb --with-auth=unix"
-
-	econf \
-		--enable-listext \
-		--with-cyrus-group=mail \
-		--enable-netscapehack \
-		--with-com_err=yes \
-		${myconf}
-
-	# make depends break with -f... in CFLAGS
-	make depend CFLAGS="" || die "make depend problem"
-
-	make || die "compile problem"
-}
-
-src_install() {
-	# remove perl subdirs from beeing installed
-	sed "s:SUBDIRS = imap sieve:SUBDIRS =:" ${S}/perl/Makefile > ${S}/perl/Makefile.install
-	mv ${S}/perl/Makefile ${S}/perl/Makefile.orig
-	mv ${S}/perl/Makefile.install ${S}/perl/Makefile
-
-	# Install!
-	make DESTDIR=${D} install || die
-
-	# Fix manpage stuff
-	rm -rf ${D}usr/man
-	doman man/*.?
-
-	dodir /etc
-	cp ${FILESDIR}/imapd.conf ${D}etc/imapd.conf
-	cp ${FILESDIR}/cyrus.conf ${D}etc/cyrus.conf
-	dodir /etc/pam.d
-	cp ${FILESDIR}/pam.d-imap ${D}etc/pam.d/imap
-
-	dodir /var ${D}var/log
-	touch ${D}var/log/imapd.log
-	touch ${D}var/log/auth.log
-
-   	mkdir -m 0750 ${D}var/imap
-   	chown -R cyrus.mail ${D}var/imap 
-   	mkdir -m 0755 ${D}var/imap/db
-        chown -R cyrus.mail ${D}var/imap/db
-   	mkdir -m 0755 ${D}var/imap/log
-        chown -R cyrus.mail ${D}var/imap/log
-   	mkdir -m 0755 ${D}var/imap/msg
-        chown -R cyrus.mail ${D}var/imap/msg
-   	mkdir -m 0755 ${D}var/imap/user
-        chown -R cyrus.mail ${D}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 ; done
-   	mkdir -m 0755 ${D}var/imap/proc
-        chown -R cyrus.mail ${D}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 ; 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 ; done
-   	mkdir -m 0755 ${D}var/imap/socket
-        chown -R cyrus.mail ${D}var/imap/socket
-
-	dodir /var/spool
-	mkdir -m 0750 ${D}var/spool/imap
-        chown -R cyrus.mail ${D}var/spool/imap
-	mkdir -m 0755 ${D}var/spool/imap/stage.
-        chown -R cyrus.mail ${D}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 ; 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 cyrus
-
-	if use perl ; then
-		export DESTDIR=${D}
-		cd ${S}/perl/imap
-		perl-module_src_prep
-		perl-module_src_compile
-		perl-module_src_test
-		perl-module_src_install 
-        cd ${S}/perl/sieve/acap
-		perl-module_src_prep
-		perl-module_src_compile
-		perl-module_src_test
-        perl-module_src_install
-        cd ${S}/perl/sieve/acap/managesieve
-		perl-module_src_prep
-		perl-module_src_compile
-		perl-module_src_test
-        perl-module_src_install
-	fi
-
-	# remove empty log files installed by default
-	rm ${D}/var/log/{auth,imapd}.log
-
-}
-
-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 add"
-	einfo "\tlocal6.* /var/log/imapd.log"
-	einfo "\tauth.debug /var/log/auth.log"
-	einfo "to /etc/syslog.conf."
-	echo ""
-
-	if [ "'use ssl'" ]; then
-		ewarn "Read the section about SSL and TLS of"
-		ewarn "/usr/share/doc/${P}/html/install-configure.html."
-		ewarn "about installing the needed keys."
-	fi
-}
-
diff --git a/net-mail/cyrus-imapd/files/config.diff b/net-mail/cyrus-imapd/files/config.diff
deleted file mode 100644
index 49ac51c55e66..000000000000
--- a/net-mail/cyrus-imapd/files/config.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure	Tue Sep 10 15:30:44 2002
-+++ configure.modified	Tue Sep 10 15:30:34 2002
-@@ -4036,9 +4036,9 @@
- 
- 		
- 		;;
--	*)  OPENSSL_INC="-I${with_openssl}/include"
-+	*)  OPENSSL_INC=""
- 	    OPENSSL_LIB="-L${with_openssl}/lib"
--	    CPPFLAGS="${CPPFLAGS} ${OPENSSL_INC}"
-+	    CPPFLAGS="${CPPFLAGS}"
- 	    LDFLAGS="${LDFLAGS} ${OPENSSL_LIB}"
- 	    LIBS="${LIBS} -lssl -lcrypto";;
- esac
diff --git a/net-mail/cyrus-imapd/files/cyrus.rc6 b/net-mail/cyrus-imapd/files/cyrus.rc6
deleted file mode 100644
index 1b9fe5718ebb..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus.rc6
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/files/cyrus.rc6,v 1.2 2003/02/14 23:02:56 vapier Exp $
-
-depend() {
-	need net
-	after saslauthd
-}
-
-start() {
-	ebegin "Starting Cyrus imapd"
-	start-stop-daemon --start --quiet --background --make-pidfile --pidfile /var/run/cyrus.pid --exec /usr/cyrus/bin/master
-	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/digest-cyrus-imapd-2.1.11 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.11
deleted file mode 100644
index b65aec333d9e..000000000000
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5742500ce1f6c655d1a49273d8b46261 cyrus-imapd-2.1.11.tar.gz 1646196
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.12 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.12
deleted file mode 100644
index a1facafbb82d..000000000000
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dc3355d0170509ccebd9788ed2daad39 cyrus-imapd-2.1.12.tar.gz 1664202
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.5-r2 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.5-r2
deleted file mode 100644
index 0ef6f5ee45b9..000000000000
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 86eb126e818f998cf7ff2e1fe1a09cb3 cyrus-imapd-2.1.5.tar.gz 1627592
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.9 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.9
deleted file mode 100644
index 4613b3ff368d..000000000000
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 09e9a5ad1d20c0650b3787b951d2e86f cyrus-imapd-2.1.9.tar.gz 1633031
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.9-r1 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.9-r1
deleted file mode 100644
index 4613b3ff368d..000000000000
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 09e9a5ad1d20c0650b3787b951d2e86f cyrus-imapd-2.1.9.tar.gz 1633031
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.9-r2 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.9-r2
deleted file mode 100644
index 4613b3ff368d..000000000000
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.9-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 09e9a5ad1d20c0650b3787b951d2e86f cyrus-imapd-2.1.9.tar.gz 1633031
diff --git a/net-mail/cyrus-imapd/files/imapd.conf b/net-mail/cyrus-imapd/files/imapd.conf
deleted file mode 100644
index 84a58bd8647a..000000000000
--- a/net-mail/cyrus-imapd/files/imapd.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/files/imapd.conf,v 1.1 2002/07/13 21:56:06 raker 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
-
-# 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