Version bump, bug #167659

Package-Manager: portage-2.1.3_rc9

11 files changed, 121 insertions, 596 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index b5de8c3b8eda..b6697d5487c2 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,15 @@
 # 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.97 2007/07/23 18:51:45 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.98 2007/07/28 15:22:26 dertobi123 Exp $
+
+*cyrus-imapd-2.3.8 (28 Jul 2007)
+
+  28 Jul 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  +files/cyrus-imapd-2.3.8-drac_with_autocreate.patch,
+  +files/cyrus-imapd-2.3.8-pts.patch, -cyrus-imapd-2.3.1.ebuild,
+  -cyrus-imapd-2.3.6.ebuild, -cyrus-imapd-2.3.7.ebuild,
+  +cyrus-imapd-2.3.8.ebuild:
+  Version bump, bug #167659
 
 *cyrus-imapd-2.2.13-r1 (23 Jul 2007)
 
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index e3c63e73c52a..a6ece7e9d9e9 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -62,6 +62,14 @@ AUX cyrus-imapd-2.3.7-drac_with_autocreate.patch 2263 RMD160 c35df0707dd42101cfc
 MD5 9572a89d39fde94bab2049b8d95078d2 files/cyrus-imapd-2.3.7-drac_with_autocreate.patch 2263
 RMD160 c35df0707dd42101cfc00f827e8458eb064a449a files/cyrus-imapd-2.3.7-drac_with_autocreate.patch 2263
 SHA256 c710a8b52b662b82979fa3bf82b7cc1f3a57cc18c762efba51f7aa8430cf58a1 files/cyrus-imapd-2.3.7-drac_with_autocreate.patch 2263
+AUX cyrus-imapd-2.3.8-drac_with_autocreate.patch 2378 RMD160 a545ffbf21e7d14897d177b2866bc5df9df3130f SHA1 16e29ddddd924877d9d7dd572a6bcafe25c67725 SHA256 f55235912bcec09c91270dfeb9f2846300f70c22eef945781e77473ea7013aa6
+MD5 687f311749b0a998d7cf832aa451fbf5 files/cyrus-imapd-2.3.8-drac_with_autocreate.patch 2378
+RMD160 a545ffbf21e7d14897d177b2866bc5df9df3130f files/cyrus-imapd-2.3.8-drac_with_autocreate.patch 2378
+SHA256 f55235912bcec09c91270dfeb9f2846300f70c22eef945781e77473ea7013aa6 files/cyrus-imapd-2.3.8-drac_with_autocreate.patch 2378
+AUX cyrus-imapd-2.3.8-pts.patch 632 RMD160 1efbbdb925fae4c6d330022cd4e3530be054c4b2 SHA1 4e99d9c68138bee4f25a8fbda29835a09e32f9d5 SHA256 6c95ec45eba762a3240cc7836c563bca98d2b9a6bdfc6b0912516c58d9e5c20f
+MD5 31bd5ec70884c610a5385ec1407f858e files/cyrus-imapd-2.3.8-pts.patch 632
+RMD160 1efbbdb925fae4c6d330022cd4e3530be054c4b2 files/cyrus-imapd-2.3.8-pts.patch 632
+SHA256 6c95ec45eba762a3240cc7836c563bca98d2b9a6bdfc6b0912516c58d9e5c20f files/cyrus-imapd-2.3.8-pts.patch 632
 AUX cyrus-imapd-parallel.patch 256 RMD160 fa7c53c847c4af9a7c218943be46b136b69f911c SHA1 8f4a7cbf91652354681e81e5c31f53728273a1c9 SHA256 adc6d031f2e9f547b192b36685d7873fdb5c5cb690e951b173fdcd55163cc68c
 MD5 9e059d45972ef25f2c05753867aa54c5 files/cyrus-imapd-parallel.patch 256
 RMD160 fa7c53c847c4af9a7c218943be46b136b69f911c files/cyrus-imapd-parallel.patch 256
@@ -98,10 +106,8 @@ DIST cyrus-imapd-2.2.12-64bit-quota.tgz 6537 RMD160 d739761d39656b7081f52f4ba2e5
 DIST cyrus-imapd-2.2.12-64bit-quotas.patch.bz2 6251 RMD160 4c9493ee7f1a251dc8fff816341dbd7d32851e98 SHA1 b07235f27a4655cc491b26fa88ceed2d8292d559 SHA256 2a1b7eb5dee6bc6d3d7bd25ddb10a142d49cbde4af5982403362b09967d39069
 DIST cyrus-imapd-2.2.12.tar.gz 1961161 RMD160 ff4a95e519ea066ed9b21b515b18bdacaf0d1852 SHA1 08adc5dfde1288c0d9e7de44e7ea4d17a7940d06 SHA256 3c6f41255ba15d8b2ea78320dd5e0c98e07fe0b5c3c4b84bc20f503427bd1b7b
 DIST cyrus-imapd-2.2.13.tar.gz 2109770 RMD160 7e8ac84b5ddd9f1206e71d5b659d07d8400f9ac2 SHA1 ba84b67a1cae4c15d5a588d010764031167970c4 SHA256 109e85b901bfcdbdd6a76d7cac83af866aa9c37a40919be7f58813319082d09c
-DIST cyrus-imapd-2.3.1.tar.gz 2212999 RMD160 68b40b89f5558afe19886724a8bb8736139254e5 SHA1 6af81e311992a3d89c2f093f00b88ea38708c176 SHA256 79f95ed36160056f5ca60fad312fda8c6c95eafeab44f49b360b4a02790f156c
-DIST cyrus-imapd-2.3.6.tar.gz 2250241 RMD160 c7a07a2e95ca08d0348ce7de2849d56e21341eb0 SHA1 adbd02f629d38152a1380360a7348f79261aa078 SHA256 6fc963c7d1f34b3b3368bb14f3604c7309e1f42d157e871bc186f8832e1a9cbd
-DIST cyrus-imapd-2.3.7-uoa.tbz2 17788 RMD160 22f2aa3f0755bc924e9bef8613e59924b3d971a6 SHA1 678eea9049058ad7ea8e34da51034f3d70b0f92e SHA256 5a79970e70af26525d48c279ed53267c6a285bc259bf9201ff289a4c1050aca7
-DIST cyrus-imapd-2.3.7.tar.gz 2254961 RMD160 5f2170677f1a013a3707b1fbb07713a8f93fc3c6 SHA1 8eaad216859d4aaa2a4ec3b37ed215bde9abb6ff SHA256 ff58c60999f2c6495e218b81a25b6f5ef1805e4a160122db2744a6645a753b6d
+DIST cyrus-imapd-2.3.8-uoa.tbz2 17894 RMD160 c824671df6b36aadf9c6d76131bd467a407a5e5e SHA1 311769f5ffd81a7eb24bbaa531997c7c4c4a0bc1 SHA256 dfe6d498991335c2c9f06bf2dd2c716ce865c043f857f5633650c029e17c3549
+DIST cyrus-imapd-2.3.8.tar.gz 2207366 RMD160 e89054f75f106c26f497bc37f7d514b0bf80bfe0 SHA1 c671f631753a138b9fa9b5bed7efa46adc8b4e3e SHA256 0f5c04a7de2da737e5ca0b4f8df8647175188b22972000192bbc7cd87ffda7fe
 EBUILD cyrus-imapd-2.2.12-r4.ebuild 9291 RMD160 33aafae49131264bcf0458391e6e8e6ac8d7305f SHA1 4c3f97280bfb18fcc75c9896a273fe186fb9a53a SHA256 ece32053f0764ca2e4bcd066fa784aaf46275ea71a4a7b9bff2f8103fe6504b0
 MD5 eaaaef280594ffc872c7de53016c5eff cyrus-imapd-2.2.12-r4.ebuild 9291
 RMD160 33aafae49131264bcf0458391e6e8e6ac8d7305f cyrus-imapd-2.2.12-r4.ebuild 9291
@@ -118,22 +124,14 @@ EBUILD cyrus-imapd-2.2.13-r1.ebuild 9456 RMD160 dabc69ec8ac5f39441e907ea0bfd8a23
 MD5 37a03d60220fbca67cfc409705846244 cyrus-imapd-2.2.13-r1.ebuild 9456
 RMD160 dabc69ec8ac5f39441e907ea0bfd8a2332ee7966 cyrus-imapd-2.2.13-r1.ebuild 9456
 SHA256 83a85408f732e7fc3f4df92bd44262cd27483b17845b803e0f8d4fe3c65d3d16 cyrus-imapd-2.2.13-r1.ebuild 9456
-EBUILD cyrus-imapd-2.3.1.ebuild 8161 RMD160 be4a5851672f49e6b40c2b56a643878e1cff2305 SHA1 b4c14ceb108532841a8c889e76d46eb4490f72f7 SHA256 7a727d28abcc34606453deeab668a5962d07d3de10cafba96d25d35060aaaf4b
-MD5 f8792828f711dcd95e88fd30d75caeb5 cyrus-imapd-2.3.1.ebuild 8161
-RMD160 be4a5851672f49e6b40c2b56a643878e1cff2305 cyrus-imapd-2.3.1.ebuild 8161
-SHA256 7a727d28abcc34606453deeab668a5962d07d3de10cafba96d25d35060aaaf4b cyrus-imapd-2.3.1.ebuild 8161
-EBUILD cyrus-imapd-2.3.6.ebuild 8218 RMD160 96ceb4fe83a61f3704c42e73a2476cf1e8a9ac85 SHA1 138f56a23b3fcc1f399f3bf3dd69f88281ac6e46 SHA256 b128bd51da5525a5b3cfb893dc7f48b4f95743a50ccd7b25c11e7d532fb5e10f
-MD5 60c6d134793a9320fc4754fc75bda845 cyrus-imapd-2.3.6.ebuild 8218
-RMD160 96ceb4fe83a61f3704c42e73a2476cf1e8a9ac85 cyrus-imapd-2.3.6.ebuild 8218
-SHA256 b128bd51da5525a5b3cfb893dc7f48b4f95743a50ccd7b25c11e7d532fb5e10f cyrus-imapd-2.3.6.ebuild 8218
-EBUILD cyrus-imapd-2.3.7.ebuild 8233 RMD160 8b9067cbf6d0698309ba05d421d738c25a6d8d22 SHA1 1f3efa865e9ddcf48e92a29a7f5cce6a52374014 SHA256 946b3441e42ca5b4b7e2e2f6e37e51975681030e2d355bedd2086d70d0e7fbeb
-MD5 a95de77e8b35c59006c79e5404de0f71 cyrus-imapd-2.3.7.ebuild 8233
-RMD160 8b9067cbf6d0698309ba05d421d738c25a6d8d22 cyrus-imapd-2.3.7.ebuild 8233
-SHA256 946b3441e42ca5b4b7e2e2f6e37e51975681030e2d355bedd2086d70d0e7fbeb cyrus-imapd-2.3.7.ebuild 8233
-MISC ChangeLog 19449 RMD160 ea937b8ca080f0c9a3a67008a5e433698e8d21ee SHA1 a9979ef8265bfa7cba278d8abc2fe6de130a4a54 SHA256 f41c4af0c7f71ecb7f8c789d1ccca39a0d9bef2e08c4a781f82dbdf35ad59c4d
-MD5 7617bd62bf82260607afb9460cb72d12 ChangeLog 19449
-RMD160 ea937b8ca080f0c9a3a67008a5e433698e8d21ee ChangeLog 19449
-SHA256 f41c4af0c7f71ecb7f8c789d1ccca39a0d9bef2e08c4a781f82dbdf35ad59c4d ChangeLog 19449
+EBUILD cyrus-imapd-2.3.8.ebuild 8076 RMD160 3823f4d65c7b1b67ba89294e87f669b1ea182641 SHA1 47aada9488600501c40d70fe08b3b8abf3aa2faf SHA256 d0fcac99dfd184eca448058dfb05e7b8049d603ab7eda50779af939b8e430d27
+MD5 6b78191daa4120f22921984a7a3b7941 cyrus-imapd-2.3.8.ebuild 8076
+RMD160 3823f4d65c7b1b67ba89294e87f669b1ea182641 cyrus-imapd-2.3.8.ebuild 8076
+SHA256 d0fcac99dfd184eca448058dfb05e7b8049d603ab7eda50779af939b8e430d27 cyrus-imapd-2.3.8.ebuild 8076
+MISC ChangeLog 19773 RMD160 49cbc2ed4f113fc2d038ddd85e913dfa8afe354d SHA1 749ad2cd52ee9e4a9924887e38c29335e4ff22c4 SHA256 2d78ea255426143e8e01af726bce870bc963fe410650631bac2e6ab361450145
+MD5 7d316e911b97b295fc8bb89bcb4302fd ChangeLog 19773
+RMD160 49cbc2ed4f113fc2d038ddd85e913dfa8afe354d ChangeLog 19773
+SHA256 2d78ea255426143e8e01af726bce870bc963fe410650631bac2e6ab361450145 ChangeLog 19773
 MISC metadata.xml 227 RMD160 dea45630aba3c22da6ccfe5867e88797658a9e41 SHA1 82018ee8f0b71c0e29e01aa374a89275a46dde26 SHA256 d3c03c4962fef1e25acac4875ada3102e5122e3eb7292d83d9833df8ef581d5c
 MD5 a562a93428a4efa4b0b4c0943075e3ff metadata.xml 227
 RMD160 dea45630aba3c22da6ccfe5867e88797658a9e41 metadata.xml 227
@@ -150,12 +148,6 @@ SHA256 3760068629a0eb327e951c8f1f47f02f8e8e97db9929720386044f2d0b507cff files/di
 MD5 557d07d40c036efbbd10ef852a0b6c57 files/digest-cyrus-imapd-2.2.13-r1 259
 RMD160 232835b5f24ede499731cb761b501e47d4c884be files/digest-cyrus-imapd-2.2.13-r1 259
 SHA256 7afc422d893280bcc49f9e7bf45d2292f6560132160d5c7f98d35782a6167291 files/digest-cyrus-imapd-2.2.13-r1 259
-MD5 6f2c8cbfcf2caa95d33c1c8c6c09aacd files/digest-cyrus-imapd-2.3.1 186
-RMD160 a84d702135952e23541552559c2434921bfefede files/digest-cyrus-imapd-2.3.1 186
-SHA256 be4cbbd521f5d517ac49d9186a9d272cd9e5f21a9597e809427f5e7a1dfa016c files/digest-cyrus-imapd-2.3.1 186
-MD5 2432c066e23e34cc86ec3c0dd4ba6970 files/digest-cyrus-imapd-2.3.6 186
-RMD160 7e0f394d5a8d508052e812a00e800602ceee1b8a files/digest-cyrus-imapd-2.3.6 186
-SHA256 52ea7c1d4e09fdb7e294fa2c78f76668a7cb05024073c078148a43c8d3c4a6d3 files/digest-cyrus-imapd-2.3.6 186
-MD5 768436622f94cc5196bbb3cda4805329 files/digest-cyrus-imapd-2.3.7 512
-RMD160 b7165ccf101117cd86d58a293137f04b06400d71 files/digest-cyrus-imapd-2.3.7 512
-SHA256 1c0548867e2394baac1b0eac963fbc6074760defc5895dec4db8776109d9ff31 files/digest-cyrus-imapd-2.3.7 512
+MD5 5a8232f4b9e3f3058e42486de0ad47a7 files/digest-cyrus-imapd-2.3.8 512
+RMD160 2d7ca633bdae5bd71d0c4b70187b3ba2fbd6b8d4 files/digest-cyrus-imapd-2.3.8 512
+SHA256 97b76dc1900afad7cb2521a8dcf231b1f64daf53fa8c8b0049e67dfae68b4224 files/digest-cyrus-imapd-2.3.8 512
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.3.1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.1.ebuild
deleted file mode 100644
index e48ce20b3c89..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.3.1.ebuild
+++ /dev/null
@@ -1,270 +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.3.1.ebuild,v 1.6 2007/07/14 22:22:19 mr_bones_ Exp $
-
-inherit 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"
-LIBWRAP_PATCH_VER="2.2.10"
-DRAC_PATCH_VER="2.3.1"
-
-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"
-
-new_net-snmp_check() {
-	# tcpd USE flag check. Bug #68254.
-	local i
-	for i in net-analyzer/ucd-snmp net-analyzer/net-snmp; do
-		if use tcpd ; then
-			if has_version $i && ! built_with_use $i tcpd ; then
-				eerror "You are emerging this package with USE=\"tcpd\""
-				eerror "but ${i} has been emerged with USE=\"-tcpd\""
-				fail_msg $i
-			fi
-		else
-			if has_version $i && built_with_use $i tcpd ; then
-				eerror "You are emerging this package with USE=\"-tcpd\""
-				eerror "but ${i} has been emerged with USE=\"tcpd\""
-				fail_msg $i
-			fi
-		fi
-	done
-	# DynaLoader check. Bug #67411
-	if built_with_use net-analyzer/net-snmp minimal ; 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
-
-	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
-}
-
-fail_msg() {
-	local i
-	i=$1
-	eerror "enable "snmp" USE flag for this package requires"
-	eerror "that ${i} and this package both build with"
-	eerror "\"tcpd\" or \"-tcpd\". Bug #68254"
-	die "sanity check failed."
-}
-
-pkg_setup() {
-	if use snmp; then
-		new_net-snmp_check
-	fi
-
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	ht_fix_file ${S}/imap/xversion.sh
-
-	# 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}/${PN}-${DRAC_PATCH_VER}-drac.patch"
-		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_VER}-libwrap.patch"
-	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"
-
-	# 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.
-	export WANT_AUTOCONF="2.5"
-	rm -rf configure config.h.in autom4te.cache || die
-	ebegin "Recreating configure"
-	sh SMakefile &>/dev/null || die "SMakefile failed"
-	eend $?
-
-	# 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)"
-	myconf="${myconf} $(use_enable idled)"
-
-	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.6.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.6.ebuild
deleted file mode 100644
index 6251f96b2df0..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.3.6.ebuild
+++ /dev/null
@@ -1,268 +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.3.6.ebuild,v 1.5 2007/07/14 22:22:19 mr_bones_ Exp $
-
-inherit 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"
-LIBWRAP_PATCH_VER="2.2.10"
-DRAC_PATCH_VER="2.3.6"
-MY_8BIT_PATCH_VER="2.3.6"
-
-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-5.2.2-r1 )
-	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"
-
-new_net-snmp_check() {
-	# tcpd USE flag check. Bug #68254.
-	local i
-	for i in net-analyzer/ucd-snmp net-analyzer/net-snmp; do
-		if use tcpd ; then
-			if has_version $i && ! built_with_use $i tcpd ; then
-				eerror "You are emerging this package with USE=\"tcpd\""
-				eerror "but ${i} has been emerged with USE=\"-tcpd\""
-				fail_msg $i
-			fi
-		else
-			if has_version $i && built_with_use $i tcpd ; then
-				eerror "You are emerging this package with USE=\"-tcpd\""
-				eerror "but ${i} has been emerged with USE=\"tcpd\""
-				fail_msg $i
-			fi
-		fi
-	done
-	# DynaLoader check. Bug #67411
-
-	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
-}
-
-fail_msg() {
-	local i
-	i=$1
-	eerror "enable "snmp" USE flag for this package requires"
-	eerror "that ${i} and this package both build with"
-	eerror "\"tcpd\" or \"-tcpd\". Bug #68254"
-	die "sanity check failed."
-}
-
-pkg_setup() {
-	if use snmp; then
-		new_net-snmp_check
-	fi
-
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	ht_fix_file ${S}/imap/xversion.sh
-
-	epatch "${FILESDIR}/cyrus-imapd-2.3.6-afs.patch"
-	# Add unsupported patch wrt #18706 and #80630
-	use unsupported_8bit && epatch "${FILESDIR}/${PN}-${MY_8BIT_PATCH_VER}-unsupported-8bit.patch"
-
-	# Add drac database support.
-	if use drac ; then
-		# better check for drac. Bug #79442.
-		epatch "${FILESDIR}/${PN}-${DRAC_PATCH_VER}-drac.patch"
-		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_VER}-libwrap.patch"
-	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"
-
-	# 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.
-	export WANT_AUTOCONF="2.5"
-	rm -rf configure config.h.in autom4te.cache || die
-	ebegin "Recreating configure"
-	sh SMakefile &>/dev/null || die "SMakefile failed"
-	eend $?
-
-	# 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
-	use afs && myconf="${myconf} -with-afs=/usr"
-	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) $(use_enable kerberos krb5afspts)"
-	myconf="${myconf} $(use_enable idled)"
-
-	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
-
-	# 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}"
-		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.7.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.8.ebuild
index 3c2c1a078c1d..99be55afc045 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.3.7.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.3.8.ebuild
@@ -1,17 +1,17 @@
 # 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.7.ebuild,v 1.5 2007/07/14 22:22:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.8.ebuild,v 1.1 2007/07/28 15:22:26 dertobi123 Exp $
 
-inherit eutils ssl-cert fixheadtails pam
+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}-uoa.tbz2"
-LIBWRAP_PATCH_VER="2.2.10"
-DRAC_PATCH_VER="2.3.7"
-AUTOCREATE_PATCH_VER="2.3.7"
-AUTOSIEVE_PATCH_VER="2.3.7"
+LIBWRAP_PATCH_VER="2.2"
+DRAC_PATCH_VER="2.3.8"
+AUTOCREATE_PATCH_VER="0.10-0"
+AUTOSIEVE_PATCH_VER="0.6.0"
 
 LICENSE="as-is"
 SLOT="0"
@@ -99,25 +99,27 @@ src_unpack() {
 
 	ht_fix_file ${S}/imap/xversion.sh
 
-	# Add unsupported patch wrt #18706 and #80630
-	# fixed upstream.
-	# use unsupported_8bit && epatch "${FILESDIR}/${PN}-${MY_8BIT_PATCH_VER}-unsupported-8bit.patch"
+	# db-4.5 fix
+	epatch "${FILESDIR}/${PN}-2.2-db45.patch"
 
 	# Unsupported UoA patch. Bug #112912 .
 	# http://email.uoa.gr/projects/cyrus/autocreate/
 	if use autocreate ; then
-		epatch "${WORKDIR}/${PN}-${AUTOCREATE_PATCH_VER}-autocreate.patch"
-		use drac && epatch "${FILESDIR}/${PN}-${DRAC_PATCH_VER}-drac_with_autocreate.patch"
+		epatch "${WORKDIR}/${P}-autocreate-${AUTOCREATE_PATCH_VER}.diff"
+		use drac \
+			&& epatch "${FILESDIR}/${PN}-${DRAC_PATCH_VER}-drac_with_autocreate.patch" \
+			&& epatch "${S}/contrib/drac_auth.patch"
 	else
-		use drac && epatch "${FILESDIR}/${PN}-${DRAC_PATCH_VER}-drac.patch"
+		use drac && epatch "${S}/contrib/drac_auth.patch"
 	fi
 
 	# Unsupported UoA patch. Bug #133187 .
 	# http://email.uoa.gr/projects/cyrus/autosievefolder/
-	use autosieve && epatch "${WORKDIR}/${PN}-${AUTOSIEVE_PATCH_VER}-autosieve.patch"
+	use autosieve && epatch	"${WORKDIR}/${P}-autosieve-${AUTOSIEVE_PATCH_VER}.diff"
 
 	# fix undefine symbols.
-	use afs && epatch "${FILESDIR}/cyrus-imapd-2.3.6-afs.patch"
+	use afs && epatch "${FILESDIR}/cyrus-imapd-2.3.6-afs.patch" \
+		&& epatch "${FILESDIR}/${P}-pts.patch"
 
 	# Add libwrap defines as we don't have a dynamicly linked library.
 	use tcpd && epatch "${FILESDIR}/${PN}-${LIBWRAP_PATCH_VER}-libwrap.patch"
@@ -136,10 +138,7 @@ src_unpack() {
 
 	# Recreate configure.
 	export WANT_AUTOCONF="2.5"
-	rm -rf configure config.h.in autom4te.cache || die
-	ebegin "Recreating configure"
-	sh SMakefile &>/dev/null || die "SMakefile failed"
-	eend $?
+	eautoreconf
 
 	# When linking with rpm, you need to link with more libraries.
 	sed -i -e "s:lrpm:lrpm -lrpmio -lrpmdb:" configure || die "sed failed"
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.8-drac_with_autocreate.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.8-drac_with_autocreate.patch
new file mode 100644
index 000000000000..3b57e952d262
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.8-drac_with_autocreate.patch
@@ -0,0 +1,46 @@
+--- contrib/drac_auth.patch.orig	2007-07-28 12:10:05.253222371 +0200
++++ contrib/drac_auth.patch	2007-07-28 12:12:51.105920502 +0200
+@@ -107,23 +107,23 @@
+  DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
+  
+ @@ -202,17 +203,17 @@
+- imapd: xversion $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
++ imapd: xversion $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
+  	$(CC) $(LDFLAGS) -o imapd \
+  	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o \
+--	libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
+-+	libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
++-	libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
+++	libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
+  
+- imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
++ imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
+  	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
+  	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
+--	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
+-+	$(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
++-	$(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
+++	$(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
+  
+- imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
++ imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
+  	$(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
+  	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
+--	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
+-+	$(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) $(DRAC_LIBS)
++-	$(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
+++	$(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) $(DRAC_LIBS)
+  
+  mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \
+  	libimap.a $(DEPLIBS)
+@@ -131,8 +131,8 @@
+  pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \
+  	$(DEPLIBS) $(SERVICE)
+  	$(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \
+--	 mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
+-+	 mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
++-	 mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
+++	 mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
+  
+  nntpd: nntpd.o proxy.o backend.o index.o smtpclient.o spool.o tls.o \
+  	 mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.8-pts.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.8-pts.patch
new file mode 100644
index 000000000000..a7bd4287a72b
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.8-pts.patch
@@ -0,0 +1,21 @@
+--- configure.in.old	2007-07-28 13:02:41.505734616 +0200
++++ configure.in	2007-07-28 13:04:37.431049483 +0200
+@@ -563,12 +563,12 @@
+     LDFLAGS=$save_LDFLAGS
+ fi
+  
+-if test "x$with_afs" != "xno" -o "x$with_ldap" != "xno"; then
+-        EXTRA_SUBDIRS="${EXTRA_SUBDIRS} ptclient"
+-        EXTRA_OUTPUT="${EXTRA_OUTPUT} ptclient/Makefile"
+-
+-	AC_DEFINE(WITH_PTS,[],[Build in PTS support?])
+-fi
++#if test "x$with_afs" != "xno" -o "x$with_ldap" != "xno"; then
++#        EXTRA_SUBDIRS="${EXTRA_SUBDIRS} ptclient"
++#        EXTRA_OUTPUT="${EXTRA_OUTPUT} ptclient/Makefile"
++#
++#	AC_DEFINE(WITH_PTS,[],[Build in PTS support?])
++#fi
+ 
+ 
+ 
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.1 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.1
deleted file mode 100644
index 611c431848f3..000000000000
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.1
+++ /dev/null
@@ -1,2 +0,0 @@
-RMD160 68b40b89f5558afe19886724a8bb8736139254e5 cyrus-imapd-2.3.1.tar.gz 2212999
-SHA256 79f95ed36160056f5ca60fad312fda8c6c95eafeab44f49b360b4a02790f156c cyrus-imapd-2.3.1.tar.gz 2212999
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.6 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.6
deleted file mode 100644
index 4558e3a68fca..000000000000
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.6
+++ /dev/null
@@ -1,2 +0,0 @@
-RMD160 c7a07a2e95ca08d0348ce7de2849d56e21341eb0 cyrus-imapd-2.3.6.tar.gz 2250241
-SHA256 6fc963c7d1f34b3b3368bb14f3604c7309e1f42d157e871bc186f8832e1a9cbd cyrus-imapd-2.3.6.tar.gz 2250241
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.7 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.7
deleted file mode 100644
index 2fbfe0adf427..000000000000
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.7
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 0aa233c0b510cf48e1a8efb233c447c1 cyrus-imapd-2.3.7-uoa.tbz2 17788
-RMD160 22f2aa3f0755bc924e9bef8613e59924b3d971a6 cyrus-imapd-2.3.7-uoa.tbz2 17788
-SHA256 5a79970e70af26525d48c279ed53267c6a285bc259bf9201ff289a4c1050aca7 cyrus-imapd-2.3.7-uoa.tbz2 17788
-MD5 07990f3a78a3a9d728cae627e31a9caf cyrus-imapd-2.3.7.tar.gz 2254961
-RMD160 5f2170677f1a013a3707b1fbb07713a8f93fc3c6 cyrus-imapd-2.3.7.tar.gz 2254961
-SHA256 ff58c60999f2c6495e218b81a25b6f5ef1805e4a160122db2744a6645a753b6d cyrus-imapd-2.3.7.tar.gz 2254961
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.8 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.8
new file mode 100644
index 000000000000..79a11d5a29b5
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.8
@@ -0,0 +1,6 @@
+MD5 13e519dec6d0c7b8a4f41170d38c3942 cyrus-imapd-2.3.8-uoa.tbz2 17894
+RMD160 c824671df6b36aadf9c6d76131bd467a407a5e5e cyrus-imapd-2.3.8-uoa.tbz2 17894
+SHA256 dfe6d498991335c2c9f06bf2dd2c716ce865c043f857f5633650c029e17c3549 cyrus-imapd-2.3.8-uoa.tbz2 17894
+MD5 ac03b02c1ae08d52f807b58c488b204f cyrus-imapd-2.3.8.tar.gz 2207366
+RMD160 e89054f75f106c26f497bc37f7d514b0bf80bfe0 cyrus-imapd-2.3.8.tar.gz 2207366
+SHA256 0f5c04a7de2da737e5ca0b4f8df8647175188b22972000192bbc7cd87ffda7fe cyrus-imapd-2.3.8.tar.gz 2207366