Cleanup, fix #195927 and #201684

(Portage version: 2.1.4_rc9)

13 files changed, 28 insertions, 1056 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 512c00e8884b..81ec4b26be99 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.109 2007/10/01 18:55:51 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.110 2007/12/09 19:21:45 dertobi123 Exp $
+
+*cyrus-imapd-2.3.9-r1 (09 Dec 2007)
+
+  09 Dec 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/cyrus-imapd-2.2.10-drac.patch,
+  -files/cyrus-imapd-2.2.10-libwrap.patch,
+  -files/cyrus-imapd-2.2.12-drac.patch, -files/cyrus-imapd-2.3.6-afs.patch,
+  -cyrus-imapd-2.2.12-r4.ebuild, -cyrus-imapd-2.2.12-r5.ebuild,
+  -cyrus-imapd-2.2.12-r6.ebuild, -cyrus-imapd-2.3.9.ebuild,
+  +cyrus-imapd-2.3.9-r1.ebuild:
+  Cleanup, fix #195927 and #201684
 
   01 Oct 2007; Wulf C. Krueger <philantrop@gentoo.org>
   cyrus-imapd-2.2.13-r1.ebuild:
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild
deleted file mode 100644
index 17703ef6ca8f..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2007 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.12-r4.ebuild,v 1.13 2007/07/22 09:23:51 dertobi123 Exp $
-
-inherit autotools eutils ssl-cert fixheadtails pam
-
-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="amd64 hppa ppc ppc64 sparc x86"
-IUSE="afs drac idled kerberos pam snmp ssl tcpd unsupported_8bit"
-
-PROVIDE="virtual/imapd"
-RDEPEND=">=sys-libs/db-3.2
-	>=dev-libs/cyrus-sasl-2.1.13
-	afs? ( >=net-fs/openafs-1.2.2 )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	kerberos? ( virtual/krb5 )
-	snmp? ( net-analyzer/net-snmp )
-	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"
-
-# "borrow" this from eldad in bug 60495 util portage can handle dep USE flags.
-check_useflag() {
-	local my_pkg=$(best_version ${1})
-	local my_flag=${2}
-
-	if [[ $(grep -wo ${my_flag} ${ROOT}/var/db/pkg/${my_pkg}/USE) ]]; then
-		return 0
-	fi
-
-	return 1
-}
-
-tcpd_flag_check() {
-	local tcpd_flag
-	local cyrus_imapd_has_tcpd_flag
-	local my_pkg=${1}
-	einfo "${my_pkg} found"
-	check_useflag ${my_pkg} tcpd
-	tcpd_flag="$?"
-
-	if [ "${tcpd_flag}" == "0" ]; then
-		einfo "\"${my_pkg}\" has been emerged with \"tcpd\" USE flag"
-	else
-		einfo "\"${my_pkg}\" has been emerged without \"tcpd\" USE flag"
-	fi
-
-	if use tcpd; then
-		cyrus_imapd_has_tcpd_flag="0"
-	else
-		cyrus_imapd_has_tcpd_flag="1"
-	fi
-
-	if [ "${tcpd_flag}" != "${cyrus_imapd_has_tcpd_flag}" ]; then
-		eerror "both \"net-mail/cyrus-imapd\" and \"${my_pkg}\" have to be emerged"
-		eerror "with or without \"tcpd\" USE flag if you want to emerge"
-		eerror "this package with \"snmp\" USE flag. Bug #68254"
-		die "see above error message."
-	fi
-}
-
-net-snmp_check() {
-	if has_version net-analyzer/ucd-snmp; then
-		tcpd_flag_check net-analyzer/ucd-snmp
-	fi
-
-	if has_version net-analyzer/net-snmp; then
-		tcpd_flag_check net-analyzer/net-snmp
-		# check for minimal USE flag.
-		local has_minimal
-		check_useflag net-analyzer/net-snmp minimal
-		has_minimal="$?"
-		if [ "${has_minimal}" == "0" ]; then
-			eerror "If you want to emerge this package with \"snmp\" USE flag"
-			eerror "reemerge \"net-snmp\" without \"minimal\" USE flag"
-			die "see error message above"
-		fi
-
-		# check for tcpd USE flag in sync for both packages.
-
-		if [ "${net_snmp_has_tcpd_flag}" != "${cyrus_imapd_has_tcpd_flag}" ]; then
-			eerror "both \"cyrus-imapd\" and \"net-snmp\" have to be emerged"
-			eerror "with or without \"tcpd\" USE flag if you want to emerge"
-			eerror "this package with \"snmp\" USE flag. Bug #68254"
-			die "see above error message."
-		fi
-
-		# an atemptto solve bug #67411. Is there a better solution?
-		# check for net-snmp-config exit and executable.
-		if [ -x "$(type -p net-snmp-config)" ]; then
-			einfo "$(type -p net-snmp-config) is found and executable."
-			NSC_AGENTLIBS="$(net-snmp-config --agent-libs)"
-			einfo "NSC_AGENTLIBS=\""${NSC_AGENTLIBS}"\""
-			if [ -z "$NSC_AGENTLIBS" ]; then
-				eerror "NSC_AGENTLIBS is null"
-				einfo "please report this to bugs.gentoo.org"
-			fi
-			for i in ${NSC_AGENTLIBS}; do
-				# check for the DynaLoader path.
-				if [ "$(expr "$i" : '.*\(DynaLoader\)')" == "DynaLoader" ] ; then
-					DYNALOADER_PATH="$i"
-					einfo "DYNALOADER_PATH=\""${DYNALOADER_PATH}"\""
-					if [[ ! -f "${DYNALOADER_PATH}" ]]; then
-						eerror "\""${DYNALOADER_PATH}"\" is not found."
-						einfo "Have you upgraded \"perl\" after"
-						einfo "you emerged \"net-snmp\". Please re-emerge"
-						einfo "\"net-snmp\" then try again. Bug #67411."
-						die "\""${DYNALOADER_PATH}"\" is not found."
-					fi
-				fi
-			done
-		else
-			eerror "\"net-snmp-config\" not found or not executable!"
-			die "You have \"net-snmp\" installed but \"net-snmp-config\" is not found or not executable. Please re-emerge \"net-snmp\" and try again!"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if use snmp; then
-		net-snmp_check
-	fi
-
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	ht_fix_file ${S}/imap/xversion.sh
-
-	# gcc4 patch. Bug #118449
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-
-	# Parallel make fix
-	epatch "${FILESDIR}"/${PN}-parallel.patch
-
-	# db-4.5 fix
-	epatch "${FILESDIR}/${PN}-2.2-db45.patch"
-
-	# Add unsupported patch wrt #18706 and #80630
-	use unsupported_8bit && epatch "${FILESDIR}/${PN}-unsupported-8bit.patch"
-
-	# Add drac database support.
-	if use drac ; then
-		# better check for drac. Bug #79442.
-		epatch "${FILESDIR}/${P}-drac.patch" || die "epatch failed"
-		epatch "${S}/contrib/drac_auth.patch" || die "epatch failed"
-	fi
-
-	# Add libwrap defines as we don't have a dynamicly linked library.
-	if use tcpd ; then
-		epatch "${FILESDIR}/${PN}-2.2-libwrap.patch" || die "epatch failed"
-	fi
-
-	# DB4 detection and versioned symbols.
-	# The new cyrus-imapd has a new DB detection.
-	# Hopefully we don't need this patch anymore.
-	# epatch "${FILESDIR}/${P}-db4.patch" || die "epatch failed"
-
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# Recreate configure.
-	WANT_AUTOCONF="2.5"
-	eautoreconf
-
-	# When linking with rpm, you need to link with more libraries.
-	sed -i -e "s:lrpm:lrpm -lrpmio -lrpmdb:" 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)"
-
-	if use idled; then
-		myconf="${myconf} --with-idle=idled"
-	else
-		myconf="${myconf} --with-idle=poll"
-	fi
-
-	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"
-
-	# needed for parallel make. Bug #72352.
-	cd ${S}/imap
-	emake xversion.h || die "emake xversion.h failed"
-
-	cd ${S}
-	emake || die "compile problem"
-}
-
-src_install() {
-	dodir /usr/bin /usr/lib
-	for subdir in master imap imtest timsieved notifyd sieve; 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
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	newinitd "${FILESDIR}/cyrus.rc6" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	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,sieve} 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
-
-	enewuser cyrus -1 -1 /usr/cyrus mail
-
-	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.12-r5.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r5.ebuild
deleted file mode 100644
index e2e63ce0335d..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r5.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2007 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.12-r5.ebuild,v 1.6 2007/07/28 15:42:30 dertobi123 Exp $
-
-inherit autotools eutils ssl-cert fixheadtails pam
-
-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
-	mirror://gentoo/${P}-64bit-quota.tgz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~hppa ~ppc64"
-IUSE="afs drac idled kerberos pam snmp ssl tcpd unsupported_8bit"
-
-PROVIDE="virtual/imapd"
-RDEPEND=">=sys-libs/db-3.2
-	>=dev-libs/cyrus-sasl-2.1.13
-	afs? ( >=net-fs/openafs-1.2.2 )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	kerberos? ( virtual/krb5 )
-	snmp? ( net-analyzer/net-snmp )
-	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"
-
-# "borrow" this from eldad in bug 60495 util portage can handle dep USE flags.
-check_useflag() {
-	local my_pkg=$(best_version ${1})
-	local my_flag=${2}
-
-	if [[ $(grep -wo ${my_flag} ${ROOT}/var/db/pkg/${my_pkg}/USE) ]]; then
-		return 0
-	fi
-
-	return 1
-}
-
-tcpd_flag_check() {
-	local tcpd_flag
-	local cyrus_imapd_has_tcpd_flag
-	local my_pkg=${1}
-	einfo "${my_pkg} found"
-	check_useflag ${my_pkg} tcpd
-	tcpd_flag="$?"
-
-	if [ "${tcpd_flag}" == "0" ]; then
-		einfo "\"${my_pkg}\" has been emerged with \"tcpd\" USE flag"
-	else
-		einfo "\"${my_pkg}\" has been emerged without \"tcpd\" USE flag"
-	fi
-
-	if use tcpd; then
-		cyrus_imapd_has_tcpd_flag="0"
-	else
-		cyrus_imapd_has_tcpd_flag="1"
-	fi
-
-	if [ "${tcpd_flag}" != "${cyrus_imapd_has_tcpd_flag}" ]; then
-		eerror "both \"net-mail/cyrus-imapd\" and \"${my_pkg}\" have to be emerged"
-		eerror "with or without \"tcpd\" USE flag if you want to emerge"
-		eerror "this package with \"snmp\" USE flag. Bug #68254"
-		die "see above error message."
-	fi
-}
-
-net-snmp_check() {
-	if has_version net-analyzer/ucd-snmp; then
-		tcpd_flag_check net-analyzer/ucd-snmp
-	fi
-
-	if has_version net-analyzer/net-snmp; then
-		tcpd_flag_check net-analyzer/net-snmp
-		# check for minimal USE flag.
-		local has_minimal
-		check_useflag net-analyzer/net-snmp minimal
-		has_minimal="$?"
-		if [ "${has_minimal}" == "0" ]; then
-			eerror "If you want to emerge this package with \"snmp\" USE flag"
-			eerror "reemerge \"net-snmp\" without \"minimal\" USE flag"
-			die "see error message above"
-		fi
-
-		# check for tcpd USE flag in sync for both packages.
-
-		if [ "${net_snmp_has_tcpd_flag}" != "${cyrus_imapd_has_tcpd_flag}" ]; then
-			eerror "both \"cyrus-imapd\" and \"net-snmp\" have to be emerged"
-			eerror "with or without \"tcpd\" USE flag if you want to emerge"
-			eerror "this package with \"snmp\" USE flag. Bug #68254"
-			die "see above error message."
-		fi
-
-		# an atemptto solve bug #67411. Is there a better solution?
-		# check for net-snmp-config exit and executable.
-		if [ -x "$(type -p net-snmp-config)" ]; then
-			einfo "$(type -p net-snmp-config) is found and executable."
-			NSC_AGENTLIBS="$(net-snmp-config --agent-libs)"
-			einfo "NSC_AGENTLIBS=\""${NSC_AGENTLIBS}"\""
-			if [ -z "$NSC_AGENTLIBS" ]; then
-				eerror "NSC_AGENTLIBS is null"
-				einfo "please report this to bugs.gentoo.org"
-			fi
-			for i in ${NSC_AGENTLIBS}; do
-				# check for the DynaLoader path.
-				if [ "$(expr "$i" : '.*\(DynaLoader\)')" == "DynaLoader" ] ; then
-					DYNALOADER_PATH="$i"
-					einfo "DYNALOADER_PATH=\""${DYNALOADER_PATH}"\""
-					if [[ ! -f "${DYNALOADER_PATH}" ]]; then
-						eerror "\""${DYNALOADER_PATH}"\" is not found."
-						einfo "Have you upgraded \"perl\" after"
-						einfo "you emerged \"net-snmp\". Please re-emerge"
-						einfo "\"net-snmp\" then try again. Bug #67411."
-						die "\""${DYNALOADER_PATH}"\" is not found."
-					fi
-				fi
-			done
-		else
-			eerror "\"net-snmp-config\" not found or not executable!"
-			die "You have \"net-snmp\" installed but \"net-snmp-config\" is not found or not executable. Please re-emerge \"net-snmp\" and try again!"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if use snmp; then
-		net-snmp_check
-	fi
-
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	ht_fix_file ${S}/imap/xversion.sh
-
-	# 64-bit quota patch. Bug #142817.
-	epatch "${WORKDIR}/${P}-64bit-quota.patch"
-
-	# gcc4 patch. Bug #118449
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-
-	# Add unsupported patch wrt #18706 and #80630
-	use unsupported_8bit && epatch "${FILESDIR}/${PN}-unsupported-8bit.patch"
-
-	# Add drac database support.
-	if use drac ; then
-		# better check for drac. Bug #79442.
-		epatch "${FILESDIR}/${P}-drac.patch" || die "epatch failed"
-		epatch "${S}/contrib/drac_auth.patch" || die "epatch failed"
-	fi
-
-	# Add libwrap defines as we don't have a dynamicly linked library.
-	if use tcpd ; then
-		epatch "${FILESDIR}/${PN}-2.2-libwrap.patch" || die "epatch failed"
-	fi
-
-	# DB4 detection and versioned symbols.
-	# The new cyrus-imapd has a new DB detection.
-	# Hopefully we don't need this patch anymore.
-	# epatch "${FILESDIR}/${P}-db4.patch" || die "epatch failed"
-
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# Recreate configure.
-	WANT_AUTOCONF="2.5"
-	eautoreconf
-
-	# When linking with rpm, you need to link with more libraries.
-	sed -i -e "s:lrpm:lrpm -lrpmio -lrpmdb:" 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)"
-
-	if use idled; then
-		myconf="${myconf} --with-idle=idled"
-	else
-		myconf="${myconf} --with-idle=poll"
-	fi
-
-	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"
-
-	# needed for parallel make. Bug #72352.
-	cd ${S}/imap
-	emake xversion.h || die "emake xversion.h failed"
-
-	cd ${S}
-	emake || die "compile problem"
-}
-
-src_install() {
-	dodir /usr/bin /usr/lib
-	for subdir in master imap imtest timsieved notifyd sieve; 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
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	newinitd "${FILESDIR}/cyrus.rc6" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	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,sieve} 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
-
-	enewuser cyrus -1 -1 /usr/cyrus mail
-
-	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.12-r6.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r6.ebuild
deleted file mode 100644
index e0818e7fac4a..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r6.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2007 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.12-r6.ebuild,v 1.1 2007/07/22 18:57:10 dertobi123 Exp $
-
-inherit autotools eutils ssl-cert fixheadtails pam
-
-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
-	mirror://gentoo/${P}-64bit-quotas.patch.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs drac idled kerberos pam snmp ssl tcpd unsupported_8bit"
-
-PROVIDE="virtual/imapd"
-RDEPEND=">=sys-libs/db-3.2
-	>=dev-libs/cyrus-sasl-2.1.13
-	afs? ( >=net-fs/openafs-1.2.2 )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	kerberos? ( virtual/krb5 )
-	snmp? ( net-analyzer/net-snmp )
-	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"
-
-# "borrow" this from eldad in bug 60495 util portage can handle dep USE flags.
-check_useflag() {
-	local my_pkg=$(best_version ${1})
-	local my_flag=${2}
-
-	if [[ $(grep -wo ${my_flag} ${ROOT}/var/db/pkg/${my_pkg}/USE) ]]; then
-		return 0
-	fi
-
-	return 1
-}
-
-tcpd_flag_check() {
-	local tcpd_flag
-	local cyrus_imapd_has_tcpd_flag
-	local my_pkg=${1}
-	einfo "${my_pkg} found"
-	check_useflag ${my_pkg} tcpd
-	tcpd_flag="$?"
-
-	if [ "${tcpd_flag}" == "0" ]; then
-		einfo "\"${my_pkg}\" has been emerged with \"tcpd\" USE flag"
-	else
-		einfo "\"${my_pkg}\" has been emerged without \"tcpd\" USE flag"
-	fi
-
-	if use tcpd; then
-		cyrus_imapd_has_tcpd_flag="0"
-	else
-		cyrus_imapd_has_tcpd_flag="1"
-	fi
-
-	if [ "${tcpd_flag}" != "${cyrus_imapd_has_tcpd_flag}" ]; then
-		eerror "both \"net-mail/cyrus-imapd\" and \"${my_pkg}\" have to be emerged"
-		eerror "with or without \"tcpd\" USE flag if you want to emerge"
-		eerror "this package with \"snmp\" USE flag. Bug #68254"
-		die "see above error message."
-	fi
-}
-
-net-snmp_check() {
-	if has_version net-analyzer/ucd-snmp; then
-		tcpd_flag_check net-analyzer/ucd-snmp
-	fi
-
-	if has_version net-analyzer/net-snmp; then
-		tcpd_flag_check net-analyzer/net-snmp
-		# check for minimal USE flag.
-		local has_minimal
-		check_useflag net-analyzer/net-snmp minimal
-		has_minimal="$?"
-		if [ "${has_minimal}" == "0" ]; then
-			eerror "If you want to emerge this package with \"snmp\" USE flag"
-			eerror "reemerge \"net-snmp\" without \"minimal\" USE flag"
-			die "see error message above"
-		fi
-
-		# check for tcpd USE flag in sync for both packages.
-
-		if [ "${net_snmp_has_tcpd_flag}" != "${cyrus_imapd_has_tcpd_flag}" ]; then
-			eerror "both \"cyrus-imapd\" and \"net-snmp\" have to be emerged"
-			eerror "with or without \"tcpd\" USE flag if you want to emerge"
-			eerror "this package with \"snmp\" USE flag. Bug #68254"
-			die "see above error message."
-		fi
-
-		# an atemptto solve bug #67411. Is there a better solution?
-		# check for net-snmp-config exit and executable.
-		if [ -x "$(type -p net-snmp-config)" ]; then
-			einfo "$(type -p net-snmp-config) is found and executable."
-			NSC_AGENTLIBS="$(net-snmp-config --agent-libs)"
-			einfo "NSC_AGENTLIBS=\""${NSC_AGENTLIBS}"\""
-			if [ -z "$NSC_AGENTLIBS" ]; then
-				eerror "NSC_AGENTLIBS is null"
-				einfo "please report this to bugs.gentoo.org"
-			fi
-			for i in ${NSC_AGENTLIBS}; do
-				# check for the DynaLoader path.
-				if [ "$(expr "$i" : '.*\(DynaLoader\)')" == "DynaLoader" ] ; then
-					DYNALOADER_PATH="$i"
-					einfo "DYNALOADER_PATH=\""${DYNALOADER_PATH}"\""
-					if [[ ! -f "${DYNALOADER_PATH}" ]]; then
-						eerror "\""${DYNALOADER_PATH}"\" is not found."
-						einfo "Have you upgraded \"perl\" after"
-						einfo "you emerged \"net-snmp\". Please re-emerge"
-						einfo "\"net-snmp\" then try again. Bug #67411."
-						die "\""${DYNALOADER_PATH}"\" is not found."
-					fi
-				fi
-			done
-		else
-			eerror "\"net-snmp-config\" not found or not executable!"
-			die "You have \"net-snmp\" installed but \"net-snmp-config\" is not found or not executable. Please re-emerge \"net-snmp\" and try again!"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if use snmp; then
-		net-snmp_check
-	fi
-
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	ht_fix_file ${S}/imap/xversion.sh
-
-	# 64-bit quota patch. Bug #142817.
-	epatch "${WORKDIR}/${P}-64bit-quotas.patch"
-
-	# gcc4 patch. Bug #118449
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-
-	# Parallel make fix
-	epatch "${FILESDIR}"/${PN}-parallel.patch
-
-	# db-4.5 fix
-	epatch "${FILESDIR}/${PN}-2.2-db45.patch"
-
-	# Add unsupported patch wrt #18706 and #80630
-	use unsupported_8bit && epatch "${FILESDIR}/${PN}-unsupported-8bit.patch"
-
-	# Add drac database support.
-	if use drac ; then
-		# better check for drac. Bug #79442.
-		epatch "${FILESDIR}/${P}-drac.patch" || die "epatch failed"
-		epatch "${S}/contrib/drac_auth.patch" || die "epatch failed"
-	fi
-
-	# Add libwrap defines as we don't have a dynamicly linked library.
-	if use tcpd ; then
-		epatch "${FILESDIR}/${PN}-2.2-libwrap.patch" || die "epatch failed"
-	fi
-
-	# DB4 detection and versioned symbols.
-	# The new cyrus-imapd has a new DB detection.
-	# Hopefully we don't need this patch anymore.
-	# epatch "${FILESDIR}/${P}-db4.patch" || die "epatch failed"
-
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# Recreate configure.
-	WANT_AUTOCONF="2.5"
-	eautoreconf
-
-	# When linking with rpm, you need to link with more libraries.
-	sed -i -e "s:lrpm:lrpm -lrpmio -lrpmdb:" 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)"
-
-	if use idled; then
-		myconf="${myconf} --with-idle=idled"
-	else
-		myconf="${myconf} --with-idle=poll"
-	fi
-
-	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"
-
-	# needed for parallel make. Bug #72352.
-	cd ${S}/imap
-	emake xversion.h || die "emake xversion.h failed"
-
-	cd ${S}
-	emake || die "compile problem"
-}
-
-src_install() {
-	dodir /usr/bin /usr/lib
-	for subdir in master imap imtest timsieved notifyd sieve; 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
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	newinitd "${FILESDIR}/cyrus.rc6" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	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,sieve} 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
-
-	enewuser cyrus -1 -1 /usr/cyrus mail
-
-	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.3.9.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.9-r1.ebuild
index 11685a3be544..452c25edcb06 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.3.9.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.3.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.3.9.ebuild,v 1.2 2007/09/07 19:53:24 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.9-r1.ebuild,v 1.1 2007/12/09 19:21:45 dertobi123 Exp $
 
 inherit autotools eutils ssl-cert fixheadtails pam
 
@@ -96,11 +96,14 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A} && cd "${S}"
 
-	ht_fix_file ${S}/imap/xversion.sh
+	ht_fix_file "${S}"/imap/xversion.sh
 
 	# Fix prestripped binaries
 	epatch "${FILESDIR}/${PN}-strip.patch"
 
+	# Parallel make fix
+	epatch "${FILESDIR}"/${PN}-parallel.patch
+
 	# Unsupported UoA patch. Bug #112912 .
 	# http://email.uoa.gr/projects/cyrus/autocreate/
 	if use autocreate ; then
@@ -170,10 +173,10 @@ src_compile() {
 		${myconf} || die "econf failed"
 
 	# needed for parallel make. Bug #72352.
-	cd ${S}/imap
+	cd "${S}"/imap
 	emake xversion.h || die "emake xversion.h failed"
 
-	cd ${S}
+	cd "${S}"
 	emake || die "compile problem"
 }
 
@@ -200,14 +203,6 @@ src_install() {
 	newconfd "${FILESDIR}/cyrus.confd" cyrus
 	newpamd "${FILESDIR}/cyrus.pam-include" sieve
 
-	# do not install server.{key,pem) if they are exist.
-	if use ssl && [[ ! -f /etc/ssl/cyrus/server.key && ! -f /etc/ssl/cyrus/server.pem ]] ; 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,sieve} spool/imap/{,stage.} ; do
 		keepdir "/var/${subdir}"
 		fowners cyrus:mail "/var/${subdir}"
@@ -223,6 +218,15 @@ src_install() {
 }
 
 pkg_postinst() {
+	# do not install server.{key,pem) if they are exist.
+	use ssl && {
+		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
+			dodir "${ROOT}"/etc/ssl/cyrus
+			insinto "${ROOT}"etc/ssl/cyrus/
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT:-/}"etc/ssl/cyrus/server.{key,pem}
+	fi
+	}
 
 	enewuser cyrus -1 -1 /usr/cyrus mail
 
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.10-drac.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.10-drac.patch
deleted file mode 100644
index dacf61c0a8d8..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.10-drac.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- contrib/drac_auth.patch.orig	2005-01-25 10:56:05.263875816 -0800
-+++ contrib/drac_auth.patch	2005-01-25 10:59:32.395359608 -0800
-@@ -71,7 +71,7 @@
- diff -u -r1.273 configure.in
- --- configure.in	15 Dec 2003 20:00:35 -0000	1.273
- +++ configure.in	19 Dec 2003 19:56:16 -0000
--@@ -945,6 +945,19 @@
-+@@ -945,6 +945,20 @@
-  SNMP_SUBDIRS=""
-  AC_SUBST(SNMP_SUBDIRS)
-  
-@@ -80,12 +80,13 @@
- +dnl
- +DRACLIBS=
- +AC_ARG_WITH(drac, [  --with-drac=DIR         use DRAC library in <DIR> [no] ],
--+	if test -d "$withval"; then
--+		LDFLAGS="$LDFLAGS -L${withval}"
--+		AC_CHECK_LIB(drac, dracauth,
--+			AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?])
--+			DRACLIBS="-ldrac")
--+	fi)
-++       drac="$withval",
-++       drac="no")
-++if test "$drac" != "no"; then
-++       AC_CHECK_LIB(drac, dracauth,
-++               AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?])
-++               DRACLIBS="-ldrac")
-++fi
- +AC_SUBST(DRACLIBS)
- +
-  CMU_LIBWRAP
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.10-libwrap.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.10-libwrap.patch
deleted file mode 100644
index 6157c879ae88..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.10-libwrap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- master/Makefile.in.orig	2004-10-17 19:48:01.923901016 -0700
-+++ master/Makefile.in	2004-10-17 19:48:33.639079576 -0700
-@@ -59,7 +59,7 @@
- 
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
--LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
-+LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@ @LIB_WRAP@
- 
- SHELL = /bin/sh
- MAKEDEPEND = @MAKEDEPEND@
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.12-drac.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.12-drac.patch
deleted file mode 100644
index dacf61c0a8d8..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.12-drac.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- contrib/drac_auth.patch.orig	2005-01-25 10:56:05.263875816 -0800
-+++ contrib/drac_auth.patch	2005-01-25 10:59:32.395359608 -0800
-@@ -71,7 +71,7 @@
- diff -u -r1.273 configure.in
- --- configure.in	15 Dec 2003 20:00:35 -0000	1.273
- +++ configure.in	19 Dec 2003 19:56:16 -0000
--@@ -945,6 +945,19 @@
-+@@ -945,6 +945,20 @@
-  SNMP_SUBDIRS=""
-  AC_SUBST(SNMP_SUBDIRS)
-  
-@@ -80,12 +80,13 @@
- +dnl
- +DRACLIBS=
- +AC_ARG_WITH(drac, [  --with-drac=DIR         use DRAC library in <DIR> [no] ],
--+	if test -d "$withval"; then
--+		LDFLAGS="$LDFLAGS -L${withval}"
--+		AC_CHECK_LIB(drac, dracauth,
--+			AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?])
--+			DRACLIBS="-ldrac")
--+	fi)
-++       drac="$withval",
-++       drac="no")
-++if test "$drac" != "no"; then
-++       AC_CHECK_LIB(drac, dracauth,
-++               AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?])
-++               DRACLIBS="-ldrac")
-++fi
- +AC_SUBST(DRACLIBS)
- +
-  CMU_LIBWRAP
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.6-afs.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.6-afs.patch
deleted file mode 100644
index c45816cf875f..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.6-afs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	2006-06-12 10:44:15.000000000 -0700
-+++ configure.in	2006-06-12 10:49:00.000000000 -0700
-@@ -479,7 +479,7 @@
-         $with_afs=/usr/local
-     fi
-     CFLAGS="${CFLAGS} -I${with_afs}/include"
--    AFS_LIBS="${with_afs}/lib/afs/libkauth.a ${with_afs}/lib/afs/libprot.a  ${with_afs}/lib/afs/libauth.a ${with_afs}/lib/afs/libsys.a ${with_afs}/lib/librxkad.a ${with_afs}/lib/librx.a ${with_afs}/lib/afs/libsys.a ${with_afs}/lib/libubik.a  ${with_afs}/lib/liblwp.a ${with_afs}/lib/afs/util.a"
-+    AFS_LIBS=" -lafsrpc -lafsauthent ${with_afs}/lib/afs/libkauth.a ${with_afs}/lib/afs/libprot.a  ${with_afs}/lib/afs/libauth.a ${with_afs}/lib/afs/libsys.a ${with_afs}/lib/librxkad.a ${with_afs}/lib/librx.a ${with_afs}/lib/afs/libsys.a ${with_afs}/lib/libubik.a  ${with_afs}/lib/liblwp.a ${with_afs}/lib/afs/util.a"
-     if test -f ${with_afs}/lib/afs/libaudit.a; then
-       AFS_LIBS="$AFS_LIBS ${with_afs}/lib/afs/libaudit.a"
-     fi
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r4 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r4
deleted file mode 100644
index 9892eb1bb989..000000000000
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 70b3bba526a8d36d3bb23a87d37e9188 cyrus-imapd-2.2.12.tar.gz 1961161
-RMD160 ff4a95e519ea066ed9b21b515b18bdacaf0d1852 cyrus-imapd-2.2.12.tar.gz 1961161
-SHA256 3c6f41255ba15d8b2ea78320dd5e0c98e07fe0b5c3c4b84bc20f503427bd1b7b cyrus-imapd-2.2.12.tar.gz 1961161
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r5 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r5
deleted file mode 100644
index 1aeec9a2bcfe..000000000000
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 d0790375ccef27242003422da93309c1 cyrus-imapd-2.2.12-64bit-quota.tgz 6537
-RMD160 d739761d39656b7081f52f4ba2e5f3428c19203e cyrus-imapd-2.2.12-64bit-quota.tgz 6537
-SHA256 a7e1fde21479dbce7441f68e0a86de1947744cea0ec424f759e77583ee7e90f6 cyrus-imapd-2.2.12-64bit-quota.tgz 6537
-MD5 70b3bba526a8d36d3bb23a87d37e9188 cyrus-imapd-2.2.12.tar.gz 1961161
-RMD160 ff4a95e519ea066ed9b21b515b18bdacaf0d1852 cyrus-imapd-2.2.12.tar.gz 1961161
-SHA256 3c6f41255ba15d8b2ea78320dd5e0c98e07fe0b5c3c4b84bc20f503427bd1b7b cyrus-imapd-2.2.12.tar.gz 1961161
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r6 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r6
deleted file mode 100644
index 6ac96126c109..000000000000
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r6
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 55bdd80ddec288c7a99715c05774f001 cyrus-imapd-2.2.12-64bit-quotas.patch.bz2 6251
-RMD160 4c9493ee7f1a251dc8fff816341dbd7d32851e98 cyrus-imapd-2.2.12-64bit-quotas.patch.bz2 6251
-SHA256 2a1b7eb5dee6bc6d3d7bd25ddb10a142d49cbde4af5982403362b09967d39069 cyrus-imapd-2.2.12-64bit-quotas.patch.bz2 6251
-MD5 70b3bba526a8d36d3bb23a87d37e9188 cyrus-imapd-2.2.12.tar.gz 1961161
-RMD160 ff4a95e519ea066ed9b21b515b18bdacaf0d1852 cyrus-imapd-2.2.12.tar.gz 1961161
-SHA256 3c6f41255ba15d8b2ea78320dd5e0c98e07fe0b5c3c4b84bc20f503427bd1b7b cyrus-imapd-2.2.12.tar.gz 1961161
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.9 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.9-r1
index 69290b05354e..69290b05354e 100644
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.9
+++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.9-r1