version bump

Package-Manager: portage-2.1.4_rc11

6 files changed, 497 insertions, 15 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index eda96b9926cd..45295a53817b 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.132 2007/12/25 16:24:02 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.133 2007/12/29 16:39:58 wschlich Exp $
+
+*dovecot-1.1_beta12 (29 Dec 2007)
+*dovecot-1.0.10 (29 Dec 2007)
+
+  29 Dec 2007; Wolfram Schlich <wschlich@gentoo.org> +dovecot-1.0.10.ebuild,
+  +dovecot-1.1_beta12.ebuild:
+  version bump
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing uberlord from metadata.xml as per #199318.
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 7eb8b1bcb113..1c6f1d57d85e 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dovecot.init 890 RMD160 376dca3d8b422dd4d5cb7c4d47adc51de9222908 SHA1 b34d2658961ab250b1e3790287e5ea2e6ffa0307 SHA256 401302b57efdb00c76aef03e16e927af47007f222b98413ab3f4f1fa83f2813f
 MD5 caee0eebf8ac3fb226539520b68a1ce5 files/dovecot.init 890
 RMD160 376dca3d8b422dd4d5cb7c4d47adc51de9222908 files/dovecot.init 890
 SHA256 401302b57efdb00c76aef03e16e927af47007f222b98413ab3f4f1fa83f2813f files/dovecot.init 890
+DIST dovecot-1.0.10.tar.gz 1797790 RMD160 6d5120e7173f399590da5d3f5eee3752125faa33 SHA1 7693b5be369e1b3f9ce13ebc29c3cb2ca814087e SHA256 df7aca6e7be748e02148bcc07173a19fcd5f4777b102e3f49b60f491f86b0fd3
 DIST dovecot-1.0.3.tar.gz 1773226 RMD160 fa3d832799a16212eb9e80b21e60aa6b8c8bfd3d SHA1 85a609b6fe979e76b84850d9ba6355f942360490 SHA256 5f361980448d0d2411bd9ad950ac8aafb95f39cb7c2bc7652df5f624f7d26391
 DIST dovecot-1.0.5.tar.gz 1775898 RMD160 da34fe38101b067644276144f189688e0827e54b SHA1 93782c065dd4962487da9faf3f5f6cb1ae6a101b SHA256 938edb1c767282ec0299fd99e71e4ce1a1f9f119623ef9f8b47776ab6a504024
 DIST dovecot-1.0.6.tar.gz 1783566 RMD160 eb4d76e70820a4ed5f03806ad2fd6bd793a597b5 SHA1 d261d9f7fda1d7436cbb96c678b76702989bf729 SHA256 96d3c20811e269a8ed367a9a420580d2098403182b41b2cb0383b6e56191e5e6
@@ -13,8 +11,13 @@ DIST dovecot-1.0.7.tar.gz 1783918 RMD160 94a1f99aa0c2a7c2db8a106733f2de37080fd1e
 DIST dovecot-1.0.8.tar.gz 1793784 RMD160 d892f958b0531b13519c03c32f74138f97b27099 SHA1 ffb71a6d1c7f6dd963cb1f7313652c7a6d1b409f SHA256 f4fa1c5c5d10b04b924f19737a74bb5d1b99b403582a38e89dc786279fcd66d1
 DIST dovecot-1.0.9.tar.gz 1796543 RMD160 535cf4c9672c8e44e751f5ffad911440707fc7d4 SHA1 87d89ff79d967c95ab8e59a1c1b3f710caffc290 SHA256 a1861f42954a5497dc27eb6549e980524f75a50a03f58ac184e1770cff8a881d
 DIST dovecot-1.1.beta11.tar.gz 2191702 RMD160 8e12488e4d1c7023d6a95f5e49963898861b7ade SHA1 ca20b8c15f98014413212b1ded32fb0cd024552b SHA256 273b06a5b69873f7b29c0e67809cf4b1a9e41f14194089f65718739fe7e99509
+DIST dovecot-1.1.beta12.tar.gz 2185627 RMD160 19dc6477fd6f0a9415f883e97c546e7dbbb382a6 SHA1 6cafc03f479f7a1929047eba117106391e26c45c SHA256 d9b769139f9c3b644bd2be6c1b5e01d930dac956aa7940c106ec0b6fe9b9d4a9
 DIST dovecot-sieve-1.0.2.tar.gz 451753 RMD160 8bed283ae672aafa61271f154f1f58d200bd4f5f SHA1 70b423eae6e47bc38f81faa36503228c1a8a5550 SHA256 9042eaf6d1237577a67ab3aa233953d640f62a296c5ffaaaed75ff25b657642a
 DIST dovecot-sieve-1.1.2.tar.gz 464909 RMD160 69ed0d7cdbc4a1299ff0483748d968a761acd794 SHA1 81e317b4d5a58a180253d08fb32713d5c861d934 SHA256 fb531f1ccee182b53af4473bff80fefc59899068b5eca8a037e9d1cc719c75ef
+EBUILD dovecot-1.0.10.ebuild 7099 RMD160 d4c668b2d6f27bb85e3d5a5e6a27e33f7d30ea1c SHA1 df432583dc282988c08a60ca7a06ab3ef4ace82a SHA256 747a3e3de44d8a8516cd6a44f75c6420b0b50fac3d7c10cbf1a10aabd3eb6754
+MD5 53841c8de181c69b6e40f73d760fab90 dovecot-1.0.10.ebuild 7099
+RMD160 d4c668b2d6f27bb85e3d5a5e6a27e33f7d30ea1c dovecot-1.0.10.ebuild 7099
+SHA256 747a3e3de44d8a8516cd6a44f75c6420b0b50fac3d7c10cbf1a10aabd3eb6754 dovecot-1.0.10.ebuild 7099
 EBUILD dovecot-1.0.3.ebuild 6265 RMD160 589c924113f22f2d9a987bb08cde3d9af51b119d SHA1 c381fe220b91f5777b76046a2dca43e62b0ff823 SHA256 605f498e92b2d8d2bc3c56852cb5823e1c6db7f0aa8c7b7ac185096f400a5493
 MD5 0c0a8621003c8008a7b5a523e6c03d73 dovecot-1.0.3.ebuild 6265
 RMD160 589c924113f22f2d9a987bb08cde3d9af51b119d dovecot-1.0.3.ebuild 6265
@@ -43,14 +46,21 @@ EBUILD dovecot-1.1_beta11.ebuild 7124 RMD160 080c84542c993510cc84a1e0f65d24c0515
 MD5 b5e3908163a37db4e4a0df2e60909d0d dovecot-1.1_beta11.ebuild 7124
 RMD160 080c84542c993510cc84a1e0f65d24c051532ca9 dovecot-1.1_beta11.ebuild 7124
 SHA256 1875056f39fde2d762d150eab9cb95894e8f88bfc5dc8f69a45611f7844699f9 dovecot-1.1_beta11.ebuild 7124
-MISC ChangeLog 20957 RMD160 7b008d25080e6aff14f9d86b1319c425ee7997e0 SHA1 642584a264045cac2881e01288df2e38cc757a88 SHA256 49384307c987d0ce852cef00748663578d1211e469fb25889a4561a30f2735fe
-MD5 8e943f0470c6cdc4dd0d6b2a360e0540 ChangeLog 20957
-RMD160 7b008d25080e6aff14f9d86b1319c425ee7997e0 ChangeLog 20957
-SHA256 49384307c987d0ce852cef00748663578d1211e469fb25889a4561a30f2735fe ChangeLog 20957
+EBUILD dovecot-1.1_beta12.ebuild 7123 RMD160 b239ab7e4e45fee062b6e8a48be5342cb4f6b3dd SHA1 ace805a6ff60983c846fd16a2433511dbee714b6 SHA256 23dab5e4bbb03325db3184d5e6078b5047384f0065e8af8f6bae5b6ed8ab13d8
+MD5 0cc31934526872250e9d9c0fa75f5353 dovecot-1.1_beta12.ebuild 7123
+RMD160 b239ab7e4e45fee062b6e8a48be5342cb4f6b3dd dovecot-1.1_beta12.ebuild 7123
+SHA256 23dab5e4bbb03325db3184d5e6078b5047384f0065e8af8f6bae5b6ed8ab13d8 dovecot-1.1_beta12.ebuild 7123
+MISC ChangeLog 21147 RMD160 c2850e770162bbbd0ef8823ac81e68f6b547ce9b SHA1 8c65c7d7cb1c2e57f9d40076f9e121cd94794bb7 SHA256 5250c08be3314217cb3d3a1db41e65a39ba731fe1bbba0ca4a9f8ae04404dd16
+MD5 3dced2260e6f7d28b1ff64f699cfef44 ChangeLog 21147
+RMD160 c2850e770162bbbd0ef8823ac81e68f6b547ce9b ChangeLog 21147
+SHA256 5250c08be3314217cb3d3a1db41e65a39ba731fe1bbba0ca4a9f8ae04404dd16 ChangeLog 21147
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
 MD5 2169405288c432c981b23bc7965d15c9 metadata.xml 162
 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 metadata.xml 162
 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b metadata.xml 162
+MD5 f66251ef8346cbae4fbf2e8e7cdd57d0 files/digest-dovecot-1.0.10 795
+RMD160 a7507b46854a5c7bbe9bc0c8152ab6cd49131b4d files/digest-dovecot-1.0.10 795
+SHA256 50d0025d5892a2b1aea21a35a63ec3fd2842a73ad82fc8716b5e4b0097d320a8 files/digest-dovecot-1.0.10 795
 MD5 038614e1f70a099987728b786ec0cd23 files/digest-dovecot-1.0.3 503
 RMD160 f7895bba3e6cbcb9458d6118004c618a1ebfa8b6 files/digest-dovecot-1.0.3 503
 SHA256 c0f41f955d3002146c6d51bc8f0dcbe0c0f25730e3d0d873bb89e580048faaa4 files/digest-dovecot-1.0.3 503
@@ -72,10 +82,6 @@ SHA256 305a490145cfd5055caba4fecfd604baeec315b049b815783d2c1dd04184cf35 files/di
 MD5 a9d03917d7516d92ed8f6a812d8f5222 files/digest-dovecot-1.1_beta11 518
 RMD160 3114f906c03563b16a5dd425f2ec19dd88769fed files/digest-dovecot-1.1_beta11 518
 SHA256 094dda670e323aebad52e3dd1bb7319d6c3aeeabac7736b60e4fc6a3e812760a files/digest-dovecot-1.1_beta11 518
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHcS6nyuNVb5qfaOYRApGkAJ9B50awOSNU69F2ehPQ7guKU5EV6gCglP7L
-UPnws9bCh5phVFGxrvSreDI=
-=+DKy
------END PGP SIGNATURE-----
+MD5 ab06dfda6af39cd5d238b82949998773 files/digest-dovecot-1.1_beta12 518
+RMD160 ace02a6539780b849adcfd6927b42d9b87444b2f files/digest-dovecot-1.1_beta12 518
+SHA256 8290f48c613f34aef55c95cc12a57231a0c4da817dc8576993123dd635624742 files/digest-dovecot-1.1_beta12 518
diff --git a/net-mail/dovecot/dovecot-1.0.10.ebuild b/net-mail/dovecot/dovecot-1.0.10.ebuild
new file mode 100644
index 000000000000..348fcef83f1f
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.0.10.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0.10.ebuild,v 1.1 2007/12/29 16:39:58 wschlich Exp $
+
+inherit autotools eutils ssl-cert
+
+MY_P="${P/_/.}"
+S="${WORKDIR}/${MY_P}"
+SIEVE="dovecot-sieve-1.0.2"
+SIEVE_S="${WORKDIR}/${SIEVE}"
+MANAGESIEVE="dovecot-1.0.7-MANAGESIEVE-v9"
+
+SRC_URI="http://dovecot.org/releases/1.0/${MY_P}.tar.gz
+sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )
+managesieve? ( http://sinas.rename-it.nl/~sirius/${MANAGESIEVE}.diff.gz )"
+
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+
+IUSE="debug doc ipv6 kerberos ldap managesieve mbox mysql pop3d pam postgres sieve ssl suid vpopmail"
+
+# Developer documentation, controlled by the doc USE flag
+DEVDOCS="auth-protocol index multiaccess securecoding"
+
+DEPEND=">=sys-apps/sed-4
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	postgres? ( dev-db/postgresql )
+	mysql? ( virtual/mysql )
+	vpopmail? ( net-mail/vpopmail )"
+
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00-r8"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	use managesieve && epatch "${DISTDIR}"/${MANAGESIEVE}.diff.gz
+}
+
+pkg_setup() {
+	if ! use sieve && use managesieve; then
+		eerror "managesieve USE flag selected but sieve USE flag unselected"
+		die "USE flag problem"
+	fi
+	# Add user and group for login process (same as for fedora/redhat)
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+}
+
+src_compile() {
+	use managesieve && eautoreconf
+	local myconf=
+	use ssl && myconf="${myconf} --with-ssl=openssl" \
+		|| myconf="${myconf} --without-ssl"
+	econf \
+		--localstatedir=/var \
+		--sysconfdir=/etc/dovecot \
+		--enable-header-install \
+		--with-ioloop=best \
+		--with-poll=best \
+		$(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"
+
+	if use sieve; then
+		einfo "Building sieve"
+		cd "${SIEVE_S}"
+		econf --with-dovecot="${S}" || die "configure failed (sieve)"
+		emake || die "make failed (sieve)"
+	fi
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+	use suid && fperms u+s /usr/libexec/dovecot/deliver
+
+	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
+
+	newinitd "${FILESDIR}"/dovecot.init dovecot
+
+	# Documentation
+	rm -rf "${D}"/usr/share/doc/dovecot
+	dodoc AUTHORS NEWS README TODO dovecot-example.conf
+	use managesieve && dodoc README.managesieve
+	if use doc; then
+		dodoc doc/*.txt
+	else
+		local x= n=
+		for x in doc/*.txt; do
+			n=$(basename "${x}" .txt)
+			[[ " ${DEVDOCS} " != *" ${n} "* ]] && dodoc "${x}"
+		done
+	fi
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${D}/etc/dovecot/dovecot.conf"
+	mv "${D}"/etc/dovecot/dovecot-example.conf "${D}"/etc/dovecot/dovecot.conf
+
+	# .maildir is the Gentoo default, but we need to support mbox to
+	local mail_location="maildir:~/.maildir"
+	if use mbox; then
+		mail_location="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 "failed to update mail location settings in dovecot.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/passdb pam/, /^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${conf}" || die "failed to update PAM settings in dovecot.conf"
+	fi
+
+	# Listen on ipv6 and ipv4
+	if use ipv6; then
+		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	fi
+
+	# Update ssl cert locations
+	if use ssl; then
+		sed -i -e 's,^#ssl_cert_file =.*,ssl_cert_file = /etc/ssl/dovecot/server.pem,' \
+			-e 's,^#ssl_key_file =.*,ssl_key_file = /etc/ssl/dovecot/server.key,' \
+			"${conf}" || die "failed to update SSL settings in dovecot.conf"
+	fi
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		cp doc/dovecot-sql-example.conf "${D}"/etc/dovecot/dovecot-sql.conf
+		fperms 600 /etc/dovecot/dovecot-sql.conf
+		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}" \
+			|| die "failed to update SQL settings in dovecot-sql.conf"
+		dodoc doc/dovecot-sql-example.conf
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		cp doc/dovecot-ldap-example.conf "${D}"/etc/dovecot/dovecot-ldap.conf
+		fperms 600 /etc/dovecot/dovecot-ldap.conf
+		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}" \
+			|| die "failed to update LDAP settings in dovecot-ldap.conf"
+		dodoc doc/dovecot-ldap-example.conf
+	fi
+
+	# Install sieve plugin
+	if use sieve; then
+		make -C "${SIEVE_S}" DESTDIR="${D}" install \
+			|| die "make install failed (sieve)"
+	fi
+
+	dodir /var/run/dovecot
+	fowners root:0 /var/run/dovecot
+	fperms 0755 /var/run/dovecot
+	keepdir /var/run/dovecot/login
+	fowners root:dovecot /var/run/dovecot/login
+	fperms 0750 /var/run/dovecot/login
+}
+
+get_config_var() {
+	local varname=${1}
+	if [[ -z ${varname} ]]; then
+		die "${FUNCNAME}: variable name missing"
+	fi
+	sed -n 's/^[[:space:]]\?'"${varname}"'[[:space:]]*="*\([^#"]\+\)"*/\1/p' \
+		"${ROOT}"/etc/dovecot/dovecot.conf
+}
+
+pkg_postinst() {
+	elog "The Dovecot configuration has vastly changed since 0.99."
+	elog "You are encouraged to start afresh with a new configuration file."
+	elog "see http://wiki.dovecot.org/ for configuration examples."
+
+	if [[ -e "${ROOT}"/etc/dovecot.conf ]]; then
+		echo
+		ewarn "The Dovecot configuration now resides in ${ROOT}/etc/dovecot"
+	fi
+
+	local base_dir="$(get_config_var base_dir)"
+	base_dir="${base_dir:-/var/run/dovecot}"
+	if use ssl; then
+		# Let's not make a new certificate if we already have one
+		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+			-e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
+			einfo "Creating SSL certificate"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+			install_cert /etc/ssl/dovecot/server
+			chown dovecot:mail "${ROOT}"/etc/ssl/dovecot/server.{key,pem}
+		fi
+		if [[ ! -e "${ROOT}${base_dir}/login/ssl-parameters.dat" ]]; then
+			echo
+			elog "Dovecot requires DH SSL Parameters if you use SSL connections"
+			elog "These take some time to make, and dovecot will create them before"
+			elog "it allows any SSL connections."
+			elog "You can create them now before starting dovecot like so"
+			elog "   emerge --config =${PF}"
+		fi
+	fi
+}
+
+pkg_config() {
+	local base_dir="$(get_config_var base_dir)"
+	base_dir="${base_dir:-/var/run/dovecot}"
+
+	if use ssl; then
+		einfo "Regenerating SSL parameters. This will take some time."
+		"${ROOT}"/usr/libexec/dovecot/ssl-build-param "${base_dir}/login/ssl-parameters.dat"
+	fi
+}
diff --git a/net-mail/dovecot/dovecot-1.1_beta12.ebuild b/net-mail/dovecot/dovecot-1.1_beta12.ebuild
new file mode 100644
index 000000000000..570012fb6744
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.1_beta12.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.1_beta12.ebuild,v 1.1 2007/12/29 16:39:58 wschlich Exp $
+
+inherit autotools eutils ssl-cert
+
+MY_P="${P/_/.}"
+S="${WORKDIR}/${MY_P}"
+SIEVE="dovecot-sieve-1.1.2"
+SIEVE_S="${WORKDIR}/${SIEVE}"
+#MANAGESIEVE="dovecot-1.0.7-MANAGESIEVE-v9"
+
+SRC_URI="http://dovecot.org/releases/1.1/beta/${MY_P}.tar.gz
+sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )"
+#managesieve? ( http://sinas.rename-it.nl/~sirius/${MANAGESIEVE}.diff.gz )"
+
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="-* ~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+
+IUSE="debug doc ipv6 kerberos ldap mbox mysql pop3d pam postgres sieve ssl suid vpopmail" # managesieve
+
+# Developer documentation, controlled by the doc USE flag
+DEVDOCS="auth-protocol index multiaccess securecoding"
+
+DEPEND=">=sys-apps/sed-4
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	postgres? ( dev-db/postgresql )
+	mysql? ( virtual/mysql )
+	vpopmail? ( net-mail/vpopmail )"
+
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00-r8"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+#	use managesieve && epatch "${DISTDIR}"/${MANAGESIEVE}.diff.gz
+}
+
+pkg_setup() {
+#	if ! use sieve && use managesieve; then
+#		eerror "managesieve USE flag selected but sieve USE flag unselected"
+#		die "USE flag problem"
+#	fi
+	# Add user and group for login process (same as for fedora/redhat)
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+}
+
+src_compile() {
+#	use managesieve && eautoreconf
+	local myconf=
+	use ssl && myconf="${myconf} --with-ssl=openssl" \
+		|| myconf="${myconf} --without-ssl"
+	econf \
+		--localstatedir=/var \
+		--sysconfdir=/etc/dovecot \
+		--enable-header-install \
+		--with-ioloop=best \
+		--with-poll=best \
+		$(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"
+
+	if use sieve; then
+		einfo "Building sieve"
+		cd "${SIEVE_S}"
+		econf --with-dovecot="${S}" || die "configure failed (sieve)"
+		emake || die "make failed (sieve)"
+	fi
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+	use suid && fperms u+s /usr/libexec/dovecot/deliver
+
+	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
+
+	newinitd "${FILESDIR}"/dovecot.init dovecot
+
+	# Documentation
+	rm -rf "${D}"/usr/share/doc/dovecot
+	dodoc AUTHORS NEWS README TODO dovecot-example.conf
+#	use managesieve && dodoc README.managesieve
+	if use doc; then
+		dodoc doc/*.txt
+	else
+		local x= n=
+		for x in doc/*.txt; do
+			n=$(basename "${x}" .txt)
+			[[ " ${DEVDOCS} " != *" ${n} "* ]] && dodoc "${x}"
+		done
+	fi
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${D}/etc/dovecot/dovecot.conf"
+	mv "${D}"/etc/dovecot/dovecot-example.conf "${D}"/etc/dovecot/dovecot.conf
+
+	# .maildir is the Gentoo default, but we need to support mbox to
+	local mail_location="maildir:~/.maildir"
+	if use mbox; then
+		mail_location="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 "failed to update mail location settings in dovecot.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/passdb pam/, /^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${conf}" || die "failed to update PAM settings in dovecot.conf"
+	fi
+
+	# Listen on ipv6 and ipv4
+	if use ipv6; then
+		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	fi
+
+	# Update ssl cert locations
+	if use ssl; then
+		sed -i -e 's,^#ssl_cert_file =.*,ssl_cert_file = /etc/ssl/dovecot/server.pem,' \
+			-e 's,^#ssl_key_file =.*,ssl_key_file = /etc/ssl/dovecot/server.key,' \
+			"${conf}" || die "failed to update SSL settings in dovecot.conf"
+	fi
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		cp doc/dovecot-sql-example.conf "${D}"/etc/dovecot/dovecot-sql.conf
+		fperms 600 /etc/dovecot/dovecot-sql.conf
+		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}" \
+			|| die "failed to update SQL settings in dovecot-sql.conf"
+		dodoc doc/dovecot-sql-example.conf
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		cp doc/dovecot-ldap-example.conf "${D}"/etc/dovecot/dovecot-ldap.conf
+		fperms 600 /etc/dovecot/dovecot-ldap.conf
+		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}" \
+			|| die "failed to update LDAP settings in dovecot-ldap.conf"
+		dodoc doc/dovecot-ldap-example.conf
+	fi
+
+	# Install sieve plugin
+	if use sieve; then
+		make -C "${SIEVE_S}" DESTDIR="${D}" install \
+			|| die "make install failed (sieve)"
+	fi
+
+	dodir /var/run/dovecot
+	fowners root:0 /var/run/dovecot
+	fperms 0755 /var/run/dovecot
+	keepdir /var/run/dovecot/login
+	fowners root:dovecot /var/run/dovecot/login
+	fperms 0750 /var/run/dovecot/login
+}
+
+get_config_var() {
+	local varname=${1}
+	if [[ -z ${varname} ]]; then
+		die "${FUNCNAME}: variable name missing"
+	fi
+	sed -n 's/^[[:space:]]\?'"${varname}"'[[:space:]]*="*\([^#"]\+\)"*/\1/p' \
+		"${ROOT}"/etc/dovecot/dovecot.conf
+}
+
+pkg_postinst() {
+	elog "The Dovecot configuration has vastly changed since 0.99."
+	elog "You are encouraged to start afresh with a new configuration file."
+	elog "see http://wiki.dovecot.org/ for configuration examples."
+
+	if [[ -e "${ROOT}"/etc/dovecot.conf ]]; then
+		echo
+		ewarn "The Dovecot configuration now resides in ${ROOT}/etc/dovecot"
+	fi
+
+	local base_dir="$(get_config_var base_dir)"
+	base_dir="${base_dir:-/var/run/dovecot}"
+	if use ssl; then
+		# Let's not make a new certificate if we already have one
+		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+			-e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
+			einfo "Creating SSL certificate"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+			install_cert /etc/ssl/dovecot/server
+			chown dovecot:mail "${ROOT}"/etc/ssl/dovecot/server.{key,pem}
+		fi
+		if [[ ! -e "${ROOT}${base_dir}/login/ssl-parameters.dat" ]]; then
+			echo
+			elog "Dovecot requires DH SSL Parameters if you use SSL connections"
+			elog "These take some time to make, and dovecot will create them before"
+			elog "it allows any SSL connections."
+			elog "You can create them now before starting dovecot like so"
+			elog "   emerge --config =${PF}"
+		fi
+	fi
+}
+
+pkg_config() {
+	local base_dir="$(get_config_var base_dir)"
+	base_dir="${base_dir:-/var/run/dovecot}"
+
+	if use ssl; then
+		einfo "Regenerating SSL parameters. This will take some time."
+		"${ROOT}"/usr/libexec/dovecot/ssl-build-param "${base_dir}/login/ssl-parameters.dat"
+	fi
+}
diff --git a/net-mail/dovecot/files/digest-dovecot-1.0.10 b/net-mail/dovecot/files/digest-dovecot-1.0.10
new file mode 100644
index 000000000000..59e8e90d33af
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-1.0.10
@@ -0,0 +1,9 @@
+MD5 c050fa2a7dae8984d432595e3e8183e1 dovecot-1.0.10.tar.gz 1797790
+RMD160 6d5120e7173f399590da5d3f5eee3752125faa33 dovecot-1.0.10.tar.gz 1797790
+SHA256 df7aca6e7be748e02148bcc07173a19fcd5f4777b102e3f49b60f491f86b0fd3 dovecot-1.0.10.tar.gz 1797790
+MD5 52ee240e7ab9d63b047bcdf636d1fa8b dovecot-1.0.7-MANAGESIEVE-v9.diff.gz 103777
+RMD160 6e8557c435b581edf89837d240eb1813bab0bff6 dovecot-1.0.7-MANAGESIEVE-v9.diff.gz 103777
+SHA256 575b5a971f759aa5a0b22d0657bfed8d6bba5661e2d7823142f8fec6ed49cb88 dovecot-1.0.7-MANAGESIEVE-v9.diff.gz 103777
+MD5 508926fc9ff8e0f6e13506e237d4916b dovecot-sieve-1.0.2.tar.gz 451753
+RMD160 8bed283ae672aafa61271f154f1f58d200bd4f5f dovecot-sieve-1.0.2.tar.gz 451753
+SHA256 9042eaf6d1237577a67ab3aa233953d640f62a296c5ffaaaed75ff25b657642a dovecot-sieve-1.0.2.tar.gz 451753
diff --git a/net-mail/dovecot/files/digest-dovecot-1.1_beta12 b/net-mail/dovecot/files/digest-dovecot-1.1_beta12
new file mode 100644
index 000000000000..1d89786fa772
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-1.1_beta12
@@ -0,0 +1,6 @@
+MD5 7dd19d44d7325fe9d893da11579a82d2 dovecot-1.1.beta12.tar.gz 2185627
+RMD160 19dc6477fd6f0a9415f883e97c546e7dbbb382a6 dovecot-1.1.beta12.tar.gz 2185627
+SHA256 d9b769139f9c3b644bd2be6c1b5e01d930dac956aa7940c106ec0b6fe9b9d4a9 dovecot-1.1.beta12.tar.gz 2185627
+MD5 39a078ca358dbc3f2b70e5f32e480d21 dovecot-sieve-1.1.2.tar.gz 464909
+RMD160 69ed0d7cdbc4a1299ff0483748d968a761acd794 dovecot-sieve-1.1.2.tar.gz 464909
+SHA256 fb531f1ccee182b53af4473bff80fefc59899068b5eca8a037e9d1cc719c75ef dovecot-sieve-1.1.2.tar.gz 464909