Index: cyrus-imapd-2.3.11.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.11.ebuild,v
--- cyrus-imapd-2.3.11.ebuild	15 Mar 2008 23:14:05 -0000	1.5
+++ cyrus-imapd-2.3.11.ebuild	18 Apr 2008 13:03:18 -0000
@@ -16,7 +16,7 @@ 
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="autocreate autosieve drac idled kerberos nntp pam replication snmp ssl tcpd"
+IUSE="autocreate autosieve drac idled kerberos kolab nntp pam replication snmp ssl tcpd"
 
 PROVIDE="virtual/imapd"
 RDEPEND=">=sys-libs/db-3.2
@@ -123,6 +123,21 @@ 
 	# Add libwrap defines as we don't have a dynamicly linked library.
 	use tcpd && epatch "${FILESDIR}/${PN}-${LIBWRAP_PATCH_VER}-libwrap.patch"
 
+	# Add kolab support.
+	if use kolab ; then
+		# For information on these patches see patch headers and
+		# http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/patches/cyrus-imapd/
+		epatch "${FILESDIR}/${P}-KOLAB_Groups.patch" || die "epatch failed"
+		epatch "${FILESDIR}/${P}-KOLAB_Annotations2.patch" || die "epatch failed"
+		epatch "${FILESDIR}/${P}-KOLAB_Logging.patch" || die "epatch failed"
+		epatch "${FILESDIR}/${P}-KOLAB_Folder-names.patch" || die "epatch failed"
+		epatch "${FILESDIR}/${P}-KOLAB_UID.patch" || die "epatch failed"
+		epatch "${FILESDIR}/${P}-KOLAB_starttls-sendcaps.patch" || die "epatch failed"
+		# These files are being created automatically and need to be updated
+		# after the patches used above
+		rm -f lib/imapopts.h lib/imapopts.c
+	fi
+
 	# 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' \
@@ -141,6 +156,10 @@ 
 
 	# When linking with rpm, you need to link with more libraries.
 	sed -i -e "s:lrpm:lrpm -lrpmio -lrpmdb:" configure || die "sed failed"
+
+	if use kolab ; then
+		sed -i -e "s/{LIB_SASL}/{LIB_SASL} -lldap -llber /" configure || die "sed failed"
+	fi
 }
 
 src_compile() {
Index: files/cyrus-imapd-2.3.11-KOLAB_Annotations2.patch
===================================================================
RCS file: files/cyrus-imapd-2.3.11-KOLAB_Annotations2.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/cyrus-imapd-2.3.11-KOLAB_Annotations2.patch	18 Apr 2008 13:03:18 -0000
@@ -0,0 +1,359 @@ 
+Provides a new version of annotation support for the cyrus imapd server [Version: 2.3.9]
+
+diff -r b693d1281318 imap/annotate.c
+--- a/imap/annotate.c	Thu Oct 25 08:21:36 2007 +0200
@@ -0,0 +1,20 @@ 
+Modifies the set of accepted characters in folder names for the cyrus imapd server [Version: 2.3.9]
+
+diff -r a83b43bb79a3 imap/mboxname.c
+--- a/imap/mboxname.c	Tue Dec 11 11:22:14 2007 +0100
@@ -0,0 +1,220 @@ 
+Allows to use a file other than /etc/groups for group definitions within the cyrus imapd server [Version: 2.3.9]
+
+diff -r 5f6f7a246f32 lib/auth_unix.c
+--- a/lib/auth_unix.c	Tue Dec 11 11:20:37 2007 +0100
@@ -0,0 +1,58 @@ 
+Provides improved logging for the cyrus imapd server [Version: 2.3.9]
+
+diff -r 6162fc947b22 imap/append.c
+--- a/imap/append.c	Tue Dec 11 11:22:03 2007 +0100
@@ -0,0 +1,115 @@ 
+Allows login by uid rather than the mail address on the cyrus imapd server [Version: 2.3.9]
+
+diff -r d62bf3b0902d configure
+--- a/configure	Thu Oct 25 08:30:57 2007 +0200