--- /usr/portage/net-mail/dovecot/dovecot-1.1.16.ebuild	2009-06-09 09:01:35.000000000 +0200
+++ dovecot-1.2.0.ebuild	2009-07-05 21:06:00.000000000 +0200
@@ -7,15 +7,14 @@
 MY_P="${P/_/.}"
 MY_PV12=$(get_version_component_range 1-2 ${PV})
 S="${WORKDIR}/${MY_P}"
-SIEVE="dovecot-sieve-1.1.6"
+SIEVE="${PN}-${MY_PV12}-sieve-0.1.7"
 SIEVE_S="${WORKDIR}/${SIEVE}"
-MANAGESIEVE_PATCH="managesieve-0.10.6"
-MANAGESIEVE="managesieve-0.10.6"
+MANAGESIEVE="managesieve-0.11.6"
 MANAGESIEVE_S="${WORKDIR}/${PN}-${MY_PV12}-${MANAGESIEVE}"
 
 SRC_URI="http://dovecot.org/releases/${MY_PV12}/${MY_P}.tar.gz
-sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )
-managesieve? ( http://www.rename-it.nl/${PN}/${MY_PV12}/${MY_P}-${MANAGESIEVE_PATCH}.diff.gz
+sieve? ( http://www.rename-it.nl/${PN}/${MY_PV12}/${SIEVE}.tar.gz )
+managesieve? ( http://www.rename-it.nl/${PN}/${MY_PV12}/${MY_P}-${MANAGESIEVE}.diff.gz
 http://www.rename-it.nl/${PN}/${MY_PV12}/${PN}-${MY_PV12}-${MANAGESIEVE}.tar.gz )"
 
 DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
@@ -25,13 +24,13 @@
 LICENSE="LGPL-2.1"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
 
-IUSE="berkdb debug doc ipv6 kerberos ldap managesieve mbox mysql pop3d pam postgres sieve sqlite3 ssl suid vpopmail"
+IUSE="berkdb caps debug doc ipv6 kerberos ldap managesieve mbox mysql pam postgres sieve sqlite3 ssl suid vpopmail"
 
 # Developer documentation, controlled by the doc USE flag
 DEVDOCS="auth-protocol index multiaccess securecoding"
 
 DEPEND=">=sys-apps/sed-4
-	sys-libs/libcap
+	caps? ( sys-libs/libcap )
 	berkdb? ( >=sys-libs/db-4.2 )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
@@ -49,7 +48,7 @@
 	unpack ${A}
 	cd "${S}"
 	if use managesieve; then
-		epatch "${WORKDIR}"/${MY_P}-${MANAGESIEVE_PATCH}.diff
+		epatch "${WORKDIR}"/${MY_P}-${MANAGESIEVE}.diff
 		eautoreconf
 	fi
 }
@@ -73,15 +72,13 @@
 		--sysconfdir=/etc/dovecot \
 		--enable-header-install \
 		--with-ioloop=best \
-		--with-poll=best \
+		$(use_with caps libcap) \
 		$(use_with berkdb db) \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
+		$(use_enable debug devel-checks) \
 		$(use_with kerberos gssapi) \
 		$(use_with ldap) \
 		$(use_with mysql) \
 		$(use_with pam) \
-		$(use_with pop3d) \
 		$(use_with postgres pgsql) \
 		$(use_with sqlite3 sqlite) \
 		$(use_with vpopmail) \