--- dovecot-1.0_rc14.ebuild	2006-11-12 14:35:23.000000000 -0600
+++ dovecot-1.0_rc7-r1.ebuild	2006-11-17 07:34:28.380736057 -0600
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0_rc14.ebuild,v 1.1 2006/11/12 20:35:23 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0_rcXX.ebuild,v 1.3 2006/09/05 13:18:39 sieve Exp $
 
 inherit autotools eutils
 
@@ -8,13 +8,15 @@
 HOMEPAGE="http://dovecot.org/"
 MY_P="${P/_/.}"
 S="${WORKDIR}/${MY_P}"
-SRC_URI="http://dovecot.org/releases/${MY_P}.tar.gz"
+SIEVE="dovecot-sieve-1.0.tar.gz"
+SIEVE_S="${WORKDIR}/${SIEVE}"
+SRC_URI="http://dovecot.org/releases/${MY_P}.tar.gz sieve? ( http://gentoo.thev0id.net/distfiles/${SIEVE}.tar.gz )"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
-IUSE="debug doc ipv6 kerberos ldap mbox mysql pop3d pam postgres ssl vpopmail"
+IUSE="debug doc ipv6 kerberos ldap mbox mysql pop3d pam postgres sieve ssl vpopmail"
 
 # Developer documentation, controlled by the doc USE flag
 DEVDOCS="auth-protocol index multiaccess securecoding"
@@ -54,6 +56,23 @@
 		$(use_with vpopmail) \
 		${myconf} || die "configure failed"
 	emake || die "make failed"
+
+	if use sieve ; then
+		cd "${SIEVE_S}"
+		econf --localstatedir=/var \
+			--with-dovecot="${S}" \
+			$(use_enable debug) \
+			$(use_enable ipv6) \
+			$(use_with kerberos gssapi) \
+			$(use_with ldap) \
+			$(use_with mysql) \
+			$(use_with pam) \
+			$(use_with pop3d) \
+			$(use_with postgres pgsql) \
+			$(use_with vpopmail) \
+			${myconf} || die "configure failed"
+		emake || die "make failed"
+	fi
 }
 
 src_install () {
@@ -81,14 +100,14 @@
 	fperms 0600 /etc/dovecot/dovecot.conf
 
 	# .maildir is the Gentoo default, but we need to support mbox to
-	local mail_location="maildir:~/.maildir"
+	local mailenv="maildir:%h/.maildir"
 	if use mbox ; then
-		mail_loctation="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+		mailenv="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
 		keepdir /var/dovecot
 		sed -i -e 's|#mail_extra_groups =|mail_extra_groups = mail|' "${conf}"
 	fi
 	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" "${conf}" || die
+		"s|#default_mail_env =|default_mail_env = ${mailenv}|" "${conf}" || die
 
 	# We're using pam files (imap and pop3) provided by mailbase
 	if use pam ; then
@@ -105,7 +124,7 @@
 	if use mysql || use postgres ; then
 		cp doc/dovecot-sql.conf "${D}"/etc/dovecot
 		fperms 600 /etc/dovecot/dovecot-sql.conf
-		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}"
+		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot/dovecot-sql.conf|' "${conf}"
 		dodoc doc/dovecot-sql.conf
 	fi
 
@@ -113,7 +132,7 @@
 	if use ldap ; then
 		cp doc/dovecot-ldap.conf "${D}"/etc/dovecot
 		fperms 600 /etc/dovecot/dovecot-ldap.conf
-		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}"
+		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot/dovecot-ldap.conf|' "${conf}"
 		dodoc doc/dovecot-ldap.conf
 	fi
 
@@ -133,6 +152,12 @@
 		dodoc doc/*.cnf doc/mkcert.sh
 	fi
 
+	# Install sieve plugin
+	if use sieve ; then
+		cd "${SIEVE_S}"
+		make DESTDIR="${D}" install || die "make install failed"
+	fi
+
 	dodir /var/run/dovecot
 	fowners root:0 /var/run/dovecot
 	fperms 0700 /var/run/dovecot