Remove many vulnerable versions, bug 314533 (and some stale newer ones)

(Portage version: 2.1.8.3/cvs/Linux x86_64)

10 files changed, 8 insertions, 2394 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 9971a9959513..0a57c0a49c1a 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.244 2010/06/20 10:29:06 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.245 2010/07/14 16:00:05 darkside Exp $
+
+  14 Jul 2010; Jeremy Olexa <darkside@gentoo.org> -dovecot-1.1.7-r1.ebuild,
+  -dovecot-1.1.16.ebuild, -dovecot-1.2.6.ebuild, -dovecot-1.2.7.ebuild,
+  -dovecot-1.2.9-r1.ebuild, -dovecot-1.2.10-r1.ebuild,
+  -dovecot-1.2.11.ebuild, -dovecot-2.0_beta4.ebuild,
+  -dovecot-2.0_beta5.ebuild:
+  Remove many vulnerable versions, bug 314533 (and some stale newer ones)
 
 *dovecot-1.2.12 (20 Jun 2010)
 
diff --git a/net-mail/dovecot/dovecot-1.1.16.ebuild b/net-mail/dovecot/dovecot-1.1.16.ebuild
deleted file mode 100644
index ef5135bcdfc5..000000000000
--- a/net-mail/dovecot/dovecot-1.1.16.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.1.16.ebuild,v 1.2 2010/06/17 20:52:06 patrick Exp $
-
-inherit autotools eutils ssl-cert versionator
-
-MY_P="${P/_/.}"
-MY_PV12=$(get_version_component_range 1-2 ${PV})
-S="${WORKDIR}/${MY_P}"
-SIEVE="dovecot-sieve-1.1.6"
-SIEVE_S="${WORKDIR}/${SIEVE}"
-MANAGESIEVE_PATCH="managesieve-0.10.6"
-MANAGESIEVE="managesieve-0.10.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
-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"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-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"
-
-# Developer documentation, controlled by the doc USE flag
-DEVDOCS="auth-protocol index multiaccess securecoding"
-
-DEPEND=">=sys-apps/sed-4
-	sys-libs/libcap
-	berkdb? ( >=sys-libs/db-4.2 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl )
-	postgres? ( dev-db/postgresql-base )
-	mysql? ( virtual/mysql )
-	sqlite3? ( =dev-db/sqlite-3* )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	if use managesieve; then
-		epatch "${WORKDIR}"/${MY_P}-${MANAGESIEVE_PATCH}.diff
-		eautoreconf
-	fi
-}
-
-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() {
-	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_with berkdb db) \
-		$(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 sqlite3 sqlite) \
-		$(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
-
-	if use managesieve; then
-		einfo "Building managesieve"
-		cd "${MANAGESIEVE_S}"
-		econf --with-dovecot="${S}" --with-dovecot-sieve="${SIEVE_S}" \
-			|| die "configure failed (managesieve)"
-		emake || die "make failed (managesieve)"
-	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-r2 dovecot
-
-	# Documentation
-	rm -rf "${D}"/usr/share/doc/dovecot
-	dodoc AUTHORS NEWS README TODO dovecot-example.conf
-	use managesieve && newdoc ${MANAGESIEVE_S}/README 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_privileged_group =|mail_privileged_group = 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"
-		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/managesieve
-	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
-
-	# Install managesieve
-	if use managesieve; then
-		make -C "${MANAGESIEVE_S}" DESTDIR="${D}" install \
-			|| die "make install failed (managesieve)"
-	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
-
-	if grep -q '^ssl_key_password' "${ROOT}"/etc/dovecot/dovecot.conf; then
-		echo
-		ewarn "*** ATTENTION ATTENTION ATTENTION ATTENTION ATTENTION ***"
-		ewarn
-		ewarn "You have set ssl_key_password in dovecot.conf!"
-		ewarn "You are URGED to read the advice in the current"
-		ewarn "dovecot-example.conf regarding sensible handling"
-		ewarn "of that password, as it might be readable by any"
-		ewarn "user on your system who can access that file!"
-		ewarn
-		ewarn "*** ATTENTION ATTENTION ATTENTION ATTENTION ATTENTION ***"
-		echo
-	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.7-r1.ebuild b/net-mail/dovecot/dovecot-1.1.7-r1.ebuild
deleted file mode 100644
index ab458a3e9141..000000000000
--- a/net-mail/dovecot/dovecot-1.1.7-r1.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.1.7-r1.ebuild,v 1.5 2010/06/17 20:52:06 patrick Exp $
-
-inherit autotools eutils ssl-cert versionator
-
-MY_P="${P/_/.}"
-MY_PV12=$(get_version_component_range 1-2 ${PV})
-S="${WORKDIR}/${MY_P}"
-SIEVE="dovecot-sieve-1.1.5"
-SIEVE_S="${WORKDIR}/${SIEVE}"
-MANAGESIEVE_PATCH="managesieve-0.10.4"
-MANAGESIEVE="managesieve-0.10.4"
-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
-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"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-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"
-
-# Developer documentation, controlled by the doc USE flag
-DEVDOCS="auth-protocol index multiaccess securecoding"
-
-DEPEND=">=sys-apps/sed-4
-	sys-libs/libcap
-	berkdb? ( >=sys-libs/db-4.2 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl )
-	postgres? ( dev-db/postgresql-base )
-	mysql? ( virtual/mysql )
-	sqlite3? ( =dev-db/sqlite-3* )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	if use managesieve; then
-		epatch "${WORKDIR}"/${MY_P}-${MANAGESIEVE_PATCH}.diff
-		eautoreconf
-	fi
-}
-
-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() {
-	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_with berkdb db) \
-		$(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 sqlite3 sqlite) \
-		$(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
-
-	if use managesieve; then
-		einfo "Building managesieve"
-		cd "${MANAGESIEVE_S}"
-		econf --with-dovecot="${S}" --with-dovecot-sieve="${SIEVE_S}" \
-			|| die "configure failed (managesieve)"
-		emake || die "make failed (managesieve)"
-	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-r2 dovecot
-
-	# Documentation
-	rm -rf "${D}"/usr/share/doc/dovecot
-	dodoc AUTHORS NEWS README TODO dovecot-example.conf
-	use managesieve && newdoc ${MANAGESIEVE_S}/README 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_privileged_group =|mail_privileged_group = 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"
-		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/managesieve
-	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
-
-	# Install managesieve
-	if use managesieve; then
-		make -C "${MANAGESIEVE_S}" DESTDIR="${D}" install \
-			|| die "make install failed (managesieve)"
-	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
-
-	if grep -q '^ssl_key_password' "${ROOT}"/etc/dovecot/dovecot.conf; then
-		echo
-		ewarn "*** ATTENTION ATTENTION ATTENTION ATTENTION ATTENTION ***"
-		ewarn
-		ewarn "You have set ssl_key_password in dovecot.conf!"
-		ewarn "You are URGED to read the advice in the current"
-		ewarn "dovecot-example.conf regarding sensible handling"
-		ewarn "of that password, as it might be readable by any"
-		ewarn "user on your system who can access that file!"
-		ewarn
-		ewarn "*** ATTENTION ATTENTION ATTENTION ATTENTION ATTENTION ***"
-		echo
-	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.2.10-r1.ebuild b/net-mail/dovecot/dovecot-1.2.10-r1.ebuild
deleted file mode 100644
index b9f435b580db..000000000000
--- a/net-mail/dovecot/dovecot-1.2.10-r1.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.2.10-r1.ebuild,v 1.4 2010/06/17 20:52:06 patrick Exp $
-
-EAPI="2"
-
-inherit eutils versionator
-
-major_minor="$( get_version_component_range 1-2 )"
-sieve_version="0.1.15"
-managesieve_version="0.11.11"
-SRC_URI="http://dovecot.org/releases/${major_minor}/${P}.tar.gz
-	sieve? ( http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-sieve-${sieve_version}.tar.gz )
-	managesieve? (
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-1.2.10-managesieve-${managesieve_version}.diff.gz
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-managesieve-${managesieve_version}.tar.gz
-	)"
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1" # MIT too?
-KEYWORDS="~alpha ~amd64 ~arm ~sparc ~x86"
-
-IUSE="berkdb bzip2 caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve mbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
-
-DEPEND="berkdb? ( sys-libs/db )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		eerror "managesieve USE flag selected but sieve USE flag unselected"
-		die "USE flag problem"
-	fi
-
-	if use dbox && ! use maildir; then
-		eerror "dbox USE flag needs maildir USE flag enabled"
-		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
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	use managesieve && epatch "${WORKDIR}"/dovecot-1.2.10-managesieve-${managesieve_version}.diff
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in cydir dbox maildir mbox; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	econf \
-		--sysconfdir=/etc/dovecot \
-		--localstatedir=/var \
-		--with-moduledir="/usr/$( get_libdir )/dovecot" \
-		$( use_with berkdb db ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with ssl ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_with ldap) \
-		--with-storages="${storages}" \
-		--with-pic \
-		--enable-header-install \
-		${conf}
-
-	if use sieve; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config || die "emake dovecot-config failed"
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		econf --with-dovecot="${S}"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			econf --with-dovecot="${S}" --with-dovecot-sieve="../dovecot-${major_minor}-sieve-${sieve_version}"
-		fi
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-		fi
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# insecure:
-	#use suid && fperms u+s /usr/libexec/dovecot/deliver
-	#better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail /usr/libexec/dovecot/deliver
-		fperms 4750 /usr/libexec/dovecot/deliver
-	fi
-
-	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
-
-	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
-
-	rm -rf "${D}"/usr/share/doc/dovecot
-
-	if use ssl; then
-		sed -i -e 's,^CERTDIR=.*,CERTDIR=\$SSLDIR/dovecot,' \
-			-e 's,^KEYDIR=.*,KEYDIR=\$SSLDIR/dovecot,' \
-			-e 's,^CERTFILE=.*,CERTFILE=\$CERTDIR/server.pem,' \
-			-e 's,^KEYFILE=.*,KEYFILE=\$KEYDIR/server.key,' \
-			doc/mkcert.sh || die "failed to update SSL settings in mkcert.sh"
-	fi
-
-	dodoc AUTHORS NEWS README TODO dovecot-example.conf || die "basic dodoc failed"
-	dodoc doc/* || die "dodoc doc/ failed"
-	docinto wiki
-	dodoc doc/wiki/* || die "dodoc doc/wiki/ failed"
-
-	# 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_privileged_group =|mail_privileged_group = 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"
-		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/managesieve
-	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
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake DESTDIR="${D}" install || die "make install failed (sieve)"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake DESTDIR="${D}" install || die "make install failed (managesieve)"
-		fi
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:root /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
-
-	ewarn "If you are upgrading from Dovecot 1.1, read "
-	ewarn " http://wiki.dovecot.org/Upgrading/1.2"
-	if use sieve; then
-		ewarn " http://wiki.dovecot.org/LDA/Sieve/Dovecot#Migration_from_CMUSieve"
-		ewarn " In particular, do not forget to change cmusieve to sieve"
-	fi
-}
diff --git a/net-mail/dovecot/dovecot-1.2.11.ebuild b/net-mail/dovecot/dovecot-1.2.11.ebuild
deleted file mode 100644
index a9e0cb627f54..000000000000
--- a/net-mail/dovecot/dovecot-1.2.11.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.2.11.ebuild,v 1.2 2010/06/17 20:52:06 patrick Exp $
-
-EAPI="2"
-
-inherit eutils versionator
-
-major_minor="$( get_version_component_range 1-2 )"
-sieve_version="0.1.15"
-managesieve_version="0.11.11"
-SRC_URI="http://dovecot.org/releases/${major_minor}/${P}.tar.gz
-	sieve? ( http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-sieve-${sieve_version}.tar.gz )
-	managesieve? (
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-1.2.10-managesieve-${managesieve_version}.diff.gz
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-managesieve-${managesieve_version}.tar.gz
-	)"
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1" # MIT too?
-KEYWORDS="~alpha ~amd64 ~arm ~sparc ~x86"
-
-IUSE="berkdb bzip2 caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve mbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
-
-DEPEND="berkdb? ( sys-libs/db )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		eerror "managesieve USE flag selected but sieve USE flag unselected"
-		die "USE flag problem"
-	fi
-
-	if use dbox && ! use maildir; then
-		eerror "dbox USE flag needs maildir USE flag enabled"
-		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
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	use managesieve && epatch "${WORKDIR}"/dovecot-1.2.10-managesieve-${managesieve_version}.diff
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in cydir dbox maildir mbox; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	econf \
-		--sysconfdir=/etc/dovecot \
-		--localstatedir=/var \
-		--with-moduledir="/usr/$( get_libdir )/dovecot" \
-		$( use_with berkdb db ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with ssl ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_with ldap) \
-		--with-storages="${storages}" \
-		--with-pic \
-		--enable-header-install \
-		${conf}
-
-	if use sieve; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config || die "emake dovecot-config failed"
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		econf --with-dovecot="${S}"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			econf --with-dovecot="${S}" --with-dovecot-sieve="../dovecot-${major_minor}-sieve-${sieve_version}"
-		fi
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-		fi
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# insecure:
-	#use suid && fperms u+s /usr/libexec/dovecot/deliver
-	#better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail /usr/libexec/dovecot/deliver
-		fperms 4750 /usr/libexec/dovecot/deliver
-	fi
-
-	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
-
-	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
-
-	rm -rf "${D}"/usr/share/doc/dovecot
-
-	if use ssl; then
-		sed -i -e 's,^CERTDIR=.*,CERTDIR=\$SSLDIR/dovecot,' \
-			-e 's,^KEYDIR=.*,KEYDIR=\$SSLDIR/dovecot,' \
-			-e 's,^CERTFILE=.*,CERTFILE=\$CERTDIR/server.pem,' \
-			-e 's,^KEYFILE=.*,KEYFILE=\$KEYDIR/server.key,' \
-			doc/mkcert.sh || die "failed to update SSL settings in mkcert.sh"
-	fi
-
-	dodoc AUTHORS NEWS README TODO dovecot-example.conf || die "basic dodoc failed"
-	dodoc doc/* || die "dodoc doc/ failed"
-	docinto wiki
-	dodoc doc/wiki/* || die "dodoc doc/wiki/ failed"
-
-	# 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_privileged_group =|mail_privileged_group = 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"
-		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/managesieve
-	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
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake DESTDIR="${D}" install || die "make install failed (sieve)"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake DESTDIR="${D}" install || die "make install failed (managesieve)"
-		fi
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:root /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
-
-	ewarn "If you are upgrading from Dovecot 1.1, read "
-	ewarn " http://wiki.dovecot.org/Upgrading/1.2"
-	if use sieve; then
-		ewarn " http://wiki.dovecot.org/LDA/Sieve/Dovecot#Migration_from_CMUSieve"
-		ewarn " In particular, do not forget to change cmusieve to sieve"
-	fi
-}
diff --git a/net-mail/dovecot/dovecot-1.2.6.ebuild b/net-mail/dovecot/dovecot-1.2.6.ebuild
deleted file mode 100644
index 6c382bd4328b..000000000000
--- a/net-mail/dovecot/dovecot-1.2.6.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.2.6.ebuild,v 1.7 2010/06/17 20:52:06 patrick Exp $
-
-EAPI="2"
-
-inherit eutils versionator
-
-major_minor="$( get_version_component_range 1-2 )"
-sieve_version="0.1.12"
-managesieve_version="0.11.9"
-SRC_URI="http://dovecot.org/releases/${major_minor}/${P}.tar.gz
-	sieve? ( http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-sieve-${sieve_version}.tar.gz )
-	managesieve? (
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${PV}-managesieve-${managesieve_version}.diff.gz
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-managesieve-${managesieve_version}.tar.gz
-	)"
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1" # MIT too?
-KEYWORDS="~alpha amd64 ~sparc x86"
-
-IUSE="berkdb bzip2 caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve mbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
-
-DEPEND="berkdb? ( sys-libs/db )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		eerror "managesieve USE flag selected but sieve USE flag unselected"
-		die "USE flag problem"
-	fi
-
-	if use dbox && ! use maildir; then
-		eerror "dbox USE flag needs maildir USE flag enabled"
-		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
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	use managesieve && epatch "${WORKDIR}"/dovecot-${PV}-managesieve-${managesieve_version}.diff
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in cydir dbox maildir mbox; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	econf \
-		--sysconfdir=/etc/dovecot \
-		--localstatedir=/var \
-		--with-moduledir="/usr/$( get_libdir )/dovecot" \
-		$( use_with berkdb db ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with ssl ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_with ldap) \
-		--with-storages="${storages}" \
-		--with-pic \
-		--enable-header-install \
-		${conf}
-
-	if use sieve; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config || die "emake dovecot-config failed"
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		econf --with-dovecot="${S}"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			econf --with-dovecot="${S}" --with-dovecot-sieve="../dovecot-${major_minor}-sieve-${sieve_version}"
-		fi
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-		fi
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# insecure:
-	#use suid && fperms u+s /usr/libexec/dovecot/deliver
-	#better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail /usr/libexec/dovecot/deliver
-		fperms 4750 /usr/libexec/dovecot/deliver
-	fi
-
-	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
-
-	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
-
-	rm -rf "${D}"/usr/share/doc/dovecot
-
-	if use doc; then
-		dodoc AUTHORS NEWS README TODO dovecot-example.conf || die "basic dodoc failed"
-		dodoc doc/* || die "dodoc doc/ failed"
-		docinto wiki
-		dodoc doc/wiki/* || die "dodoc doc/wiki/ failed"
-
-	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_privileged_group =|mail_privileged_group = 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"
-		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-	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
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake DESTDIR="${D}" install || die "make install failed (sieve)"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake DESTDIR="${D}" install || die "make install failed (managesieve)"
-		fi
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:root /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
-
-	ewarn "If you are upgrading from Dovecot 1.1, read "
-	ewarn " http://wiki.dovecot.org/Upgrading/1.2"
-	if use sieve; then
-		ewarn " http://wiki.dovecot.org/LDA/Sieve/Dovecot#Migration_from_CMUSieve"
-		ewarn " In particular, do not forget to change cmusieve to sieve"
-	fi
-}
diff --git a/net-mail/dovecot/dovecot-1.2.7.ebuild b/net-mail/dovecot/dovecot-1.2.7.ebuild
deleted file mode 100644
index 1a202016a0fc..000000000000
--- a/net-mail/dovecot/dovecot-1.2.7.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.2.7.ebuild,v 1.3 2010/06/17 20:52:06 patrick Exp $
-
-EAPI="2"
-
-inherit eutils versionator
-
-major_minor="$( get_version_component_range 1-2 )"
-sieve_version="0.1.12"
-managesieve_version="0.11.9"
-SRC_URI="http://dovecot.org/releases/${major_minor}/${P}.tar.gz
-	sieve? ( http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-sieve-${sieve_version}.tar.gz )
-	managesieve? (
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${PV}-managesieve-${managesieve_version}.diff.gz
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-managesieve-${managesieve_version}.tar.gz
-	)"
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1" # MIT too?
-KEYWORDS="~alpha ~amd64 ~sparc ~x86"
-
-IUSE="berkdb bzip2 caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve mbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
-
-DEPEND="berkdb? ( sys-libs/db )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		eerror "managesieve USE flag selected but sieve USE flag unselected"
-		die "USE flag problem"
-	fi
-
-	if use dbox && ! use maildir; then
-		eerror "dbox USE flag needs maildir USE flag enabled"
-		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
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	use managesieve && epatch "${WORKDIR}"/dovecot-${PV}-managesieve-${managesieve_version}.diff
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in cydir dbox maildir mbox; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	econf \
-		--sysconfdir=/etc/dovecot \
-		--localstatedir=/var \
-		--with-moduledir="/usr/$( get_libdir )/dovecot" \
-		$( use_with berkdb db ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with ssl ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_with ldap) \
-		--with-storages="${storages}" \
-		--with-pic \
-		--enable-header-install \
-		${conf}
-
-	if use sieve; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config || die "emake dovecot-config failed"
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		econf --with-dovecot="${S}"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			econf --with-dovecot="${S}" --with-dovecot-sieve="../dovecot-${major_minor}-sieve-${sieve_version}"
-		fi
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-		fi
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# insecure:
-	#use suid && fperms u+s /usr/libexec/dovecot/deliver
-	#better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail /usr/libexec/dovecot/deliver
-		fperms 4750 /usr/libexec/dovecot/deliver
-	fi
-
-	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
-
-	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
-
-	rm -rf "${D}"/usr/share/doc/dovecot
-
-	if use doc; then
-		dodoc AUTHORS NEWS README TODO dovecot-example.conf || die "basic dodoc failed"
-		dodoc doc/* || die "dodoc doc/ failed"
-		docinto wiki
-		dodoc doc/wiki/* || die "dodoc doc/wiki/ failed"
-
-	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_privileged_group =|mail_privileged_group = 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"
-		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/managesieve
-	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
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake DESTDIR="${D}" install || die "make install failed (sieve)"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake DESTDIR="${D}" install || die "make install failed (managesieve)"
-		fi
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:root /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
-
-	ewarn "If you are upgrading from Dovecot 1.1, read "
-	ewarn " http://wiki.dovecot.org/Upgrading/1.2"
-	if use sieve; then
-		ewarn " http://wiki.dovecot.org/LDA/Sieve/Dovecot#Migration_from_CMUSieve"
-		ewarn " In particular, do not forget to change cmusieve to sieve"
-	fi
-}
diff --git a/net-mail/dovecot/dovecot-1.2.9-r1.ebuild b/net-mail/dovecot/dovecot-1.2.9-r1.ebuild
deleted file mode 100644
index 62d15ca019bf..000000000000
--- a/net-mail/dovecot/dovecot-1.2.9-r1.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.2.9-r1.ebuild,v 1.2 2010/06/17 20:52:06 patrick Exp $
-
-EAPI="2"
-
-inherit eutils versionator
-
-major_minor="$( get_version_component_range 1-2 )"
-sieve_version="0.1.14"
-managesieve_version="0.11.10"
-SRC_URI="http://dovecot.org/releases/${major_minor}/${P}.tar.gz
-	sieve? ( http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-sieve-${sieve_version}.tar.gz )
-	managesieve? (
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-1.2.9-managesieve-${managesieve_version}.diff.gz
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-managesieve-${managesieve_version}.tar.gz
-	)"
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1" # MIT too?
-KEYWORDS="~alpha ~amd64 ~sparc ~x86"
-
-IUSE="berkdb bzip2 caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve mbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
-
-DEPEND="berkdb? ( sys-libs/db )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		eerror "managesieve USE flag selected but sieve USE flag unselected"
-		die "USE flag problem"
-	fi
-
-	if use dbox && ! use maildir; then
-		eerror "dbox USE flag needs maildir USE flag enabled"
-		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
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	use managesieve && epatch "${WORKDIR}"/dovecot-1.2.7-managesieve-${managesieve_version}.diff
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in cydir dbox maildir mbox; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	econf \
-		--sysconfdir=/etc/dovecot \
-		--localstatedir=/var \
-		--with-moduledir="/usr/$( get_libdir )/dovecot" \
-		$( use_with berkdb db ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with ssl ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_with ldap) \
-		--with-storages="${storages}" \
-		--with-pic \
-		--enable-header-install \
-		${conf}
-
-	if use sieve; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config || die "emake dovecot-config failed"
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		econf --with-dovecot="${S}"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			econf --with-dovecot="${S}" --with-dovecot-sieve="../dovecot-${major_minor}-sieve-${sieve_version}"
-		fi
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-		fi
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# insecure:
-	#use suid && fperms u+s /usr/libexec/dovecot/deliver
-	#better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail /usr/libexec/dovecot/deliver
-		fperms 4750 /usr/libexec/dovecot/deliver
-	fi
-
-	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
-
-	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
-
-	rm -rf "${D}"/usr/share/doc/dovecot
-
-	if use ssl; then
-		sed -i -e 's,^CERTDIR=.*,CERTDIR=\$SSLDIR/dovecot,' \
-			-e 's,^KEYDIR=.*,KEYDIR=\$SSLDIR/dovecot,' \
-			-e 's,^CERTFILE=.*,CERTFILE=\$CERTDIR/server.pem,' \
-			-e 's,^KEYFILE=.*,KEYFILE=\$KEYDIR/server.key,' \
-			doc/mkcert.sh || die "failed to update SSL settings in mkcert.sh"
-	fi
-
-	dodoc AUTHORS NEWS README TODO dovecot-example.conf || die "basic dodoc failed"
-	dodoc doc/* || die "dodoc doc/ failed"
-	docinto wiki
-	dodoc doc/wiki/* || die "dodoc doc/wiki/ failed"
-
-	# 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_privileged_group =|mail_privileged_group = 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"
-		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/managesieve
-	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
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake DESTDIR="${D}" install || die "make install failed (sieve)"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake DESTDIR="${D}" install || die "make install failed (managesieve)"
-		fi
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:root /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
-
-	ewarn "If you are upgrading from Dovecot 1.1, read "
-	ewarn " http://wiki.dovecot.org/Upgrading/1.2"
-	if use sieve; then
-		ewarn " http://wiki.dovecot.org/LDA/Sieve/Dovecot#Migration_from_CMUSieve"
-		ewarn " In particular, do not forget to change cmusieve to sieve"
-	fi
-}
diff --git a/net-mail/dovecot/dovecot-2.0_beta4.ebuild b/net-mail/dovecot/dovecot-2.0_beta4.ebuild
deleted file mode 100644
index 82b34aaa174c..000000000000
--- a/net-mail/dovecot/dovecot-2.0_beta4.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0_beta4.ebuild,v 1.3 2010/06/17 20:52:06 patrick Exp $
-
-EAPI="2"
-
-inherit eutils versionator ssl-cert
-
-MY_P="${P/_/.}"
-major_minor="$( get_version_component_range 1-2 )"
-sieve_snapshot="2cb08c188b6a"
-SRC_URI="http://dovecot.org/releases/${major_minor}/beta/${MY_P}.tar.gz
-	sieve? (
-	http://hg.rename-it.nl/dovecot-2.0-pigeonhole/archive/${sieve_snapshot}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1" # MIT too?
-KEYWORDS="~alpha ~amd64 ~arm ~sparc ~x86"
-
-IUSE="berkdb bzip2 caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve mbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
-
-DEPEND="berkdb? ( sys-libs/db )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		eerror "managesieve USE flag selected but sieve USE flag unselected"
-		die "USE flag problem"
-	fi
-
-	if use dbox && ! use maildir; then
-		eerror "dbox USE flag needs maildir USE flag enabled"
-		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
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in cydir dbox maildir mbox; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	cd ${MY_P}
-	econf \
-		--localstatedir=/var \
-		--with-moduledir="/usr/$( get_libdir )/dovecot" \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with ssl ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		--with-storages="${storages}" \
-		--with-pic \
-		--enable-header-install \
-		${conf}
-
-	if use sieve; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config || die "emake dovecot-config failed"
-
-		# snapshot. should not be necessary for 2.0
-		cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
-		./autogen.sh || die "autogen failed"
-
-		econf \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	cd "${MY_P}"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-	if use sieve; then
-		cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make sieve failed"
-	fi
-}
-
-src_install () {
-	cd "${MY_P}"
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${D}"/usr/libexec/dovecot/deliver
-		fperms 4750 "${D}"/usr/libexec/dovecot/deliver
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
-
-	rm -rf "${D}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO || die "basic dodoc failed"
-	rm -f doc/Makefile*
-	dodoc doc/* || die "dodoc doc failed"
-	docinto example-config
-	dodoc doc/example-config/* || die "dodoc example failed"
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/* || die "dodoc conf.d failed"
-	docinto wiki
-	dodoc doc/wiki/* || die "dodoc wiki failed"
-
-	# 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"
-	local confd="${D}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	sed -i -e "s:/usr/share/doc/dovecot/:/usr/share/doc/${PF}/:" \
-	"${confd}/../README" || die "sed failed"
-
-	# .maildir is the Gentoo default, but we need to support mbox too
-	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_privileged_group =|mail_privileged_group = mail|' \
-		"${confd}/mail.conf" || die "sed failed"
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/mail.conf" \
-		|| die "failed to update mail location settings in mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in dovecot.conf"
-		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/managesieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/auth.conf" \
-			|| die "failed to update PAM settings in auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	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 = yes:ssl = yes:' "${confd}/ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/ssl.conf" || die "failed to update SSL settings in ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/auth.conf" || die "failed to update SQL settings in \
-			auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/auth.conf" \
-			|| die "failed to update ldap settings in auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/auth.conf" \
-			|| die "failed to update vpopmail settings in auth.conf"
-	fi
-
-	if use sieve; then
-		cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
-		emake DESTDIR="${D}" install || die "make install failed (sieve)"
-		sed -i -e \
-			's/^#mail_plugins =/mail_plugins = sieve/' "${confd}/mail.conf" \
-			|| die "failed to update sieve settings in mail.conf"
-		rm -rf "${D}"/usr/share/doc/dovecot
-		dodoc doc/*.txt
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/example-config/conf.d
-		doins doc/example-config/conf.d/*.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:root /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
-
-}
-
-pkg_preinst() {
-
-	has_version =${CATEGORY}/${PN}-0*
-	dovecot_upgrade_from_0_x=$?
-
-	has_version =${CATEGORY}/${PN}-1*
-	dovecot_upgrade_from_1_x=$?
-
-	if [[ $dovecot_upgrade_from_0_x = 0 ]] ; then
-		einfo
-		elog "There are a lot of changes in configuration files.  Please read"
-		elog "http://wiki.dovecot.org/Upgrading and edit the conf files"
-		elog "in ${ROOT}etc/dovecot"
-		einfo
-	elif [[ $dovecot_upgrade_from_1_x = 0 ]] ; then
-		# might want to automate upgrade from 1.x when 2.0 is out
-		einfo
-		elog "There are a lot of changes in configuration files.  You should"
-		#elog "run \"emerge --config =${CATEGORY}/${PF}\" or"
-		elog "check the conf files in ${ROOT}etc/dovecot"
-		einfo
-	fi
-
-}
-
-pkg_postinst() {
-
-	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
-		fi
-	fi
-
-	if use mysql || use postgres || use sqlite ; then
-		if [[ $dovecot_upgrade_from_0_x = 0 || $dovecot_upgrade_from_1_x = 0 ]];
-		then
-			einfo
-			elog "Please edit ${ROOT}etc/dovecot/dovecot-sql.conf.ext"
-			elog "before starting dovecot"
-		fi
-	fi
-
-	if use ldap ; then
-		if [[ $dovecot_upgrade_from_0_x = 0 || $dovecot_upgrade_from_1_x = 0 ]];
-		then
-			einfo
-			elog "Please edit ${ROOT}etc/dovecot/dovecot-ldap.conf.ext"
-			elog "before starting dovecot"
-		fi
-	fi
-
-}
-
-pkg_config() {
-
-	# return for now
-	return
-
-	if [[ -x "${ROOT}"usr/sbin/dovecot ]] ; then
-		if [[ ! -e "${ROOT}"etc/dovecot/dovecot.conf ]] ;  then
-			eerror "Hmm, cannot find dovecot.conf.  Please edit"
-			eerror "conf files by hand"
-			die
-		else
-			if [[ $dovecot_upgrade_from_1_x = 0 ]] ; then
-				cp "${ROOT}"etc/dovecot/dovecot.conf \
-				"${ROOT}"etc/dovecot/dovecot.conf.old || die "cp failed"
-				if "$(${ROOT}usr/sbin/dovecot -n -c ${ROOT}etc/dovecot/dovecot.conf)";
-				then
-					einfo
-					elog "Old config file is saved as \
-					${ROOT}etc/dovecot/dovecot.conf.old"
-					elog "Please review the new conf files before starting dovecot"
-				fi
-			else
-				eerror "Cannot convert old configuration file."
-				eerror "Please check your conf files in	${ROOT}etc/dovecot"
-				die
-			fi
-		fi
-	else
-		eerror "Cannot find dovecot binary.  You might want to check that"
-		eerror "${CATEGORY}/${PN} was installed successfully."
-		die
-	fi
-
-}
diff --git a/net-mail/dovecot/dovecot-2.0_beta5.ebuild b/net-mail/dovecot/dovecot-2.0_beta5.ebuild
deleted file mode 100644
index 7f6d8611d997..000000000000
--- a/net-mail/dovecot/dovecot-2.0_beta5.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0_beta5.ebuild,v 1.2 2010/06/17 20:52:06 patrick Exp $
-
-EAPI="2"
-
-inherit eutils versionator ssl-cert
-
-MY_P="${P/_/.}"
-major_minor="$( get_version_component_range 1-2 )"
-sieve_snapshot="b8dbef9ec43b"
-SRC_URI="http://dovecot.org/releases/${major_minor}/beta/${MY_P}.tar.gz
-	sieve? (
-	http://hg.rename-it.nl/dovecot-2.0-pigeonhole/archive/${sieve_snapshot}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1" # MIT too?
-KEYWORDS="~alpha ~amd64 ~arm ~sparc ~x86"
-
-IUSE="berkdb bzip2 caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve mbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
-
-DEPEND="berkdb? ( sys-libs/db )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		eerror "managesieve USE flag selected but sieve USE flag unselected"
-		die "USE flag problem"
-	fi
-
-	if use dbox && ! use maildir; then
-		eerror "dbox USE flag needs maildir USE flag enabled"
-		die "USE flag problem"
-	fi
-
-	# Add user and group for login process (same as for fedora/redhat)
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in cydir dbox maildir mbox; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	cd ${MY_P}
-	econf \
-		--localstatedir=/var \
-		--with-moduledir="/usr/$( get_libdir )/dovecot" \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with ssl ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		--with-storages="${storages}" \
-		--with-pic \
-		--disable-rpath \
-		${conf}
-
-	if use sieve; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config || die "emake dovecot-config failed"
-
-		# snapshot. should not be necessary for 2.0 release
-		cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
-		./autogen.sh || die "autogen failed"
-
-		econf \
-			--localstatedir=/var \
-			--enable-shared \
-			--with-pic \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	cd "${MY_P}"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-	if use sieve; then
-		cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make sieve failed"
-	fi
-}
-
-src_install () {
-	cd "${MY_P}"
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${D}"/usr/libexec/dovecot/deliver
-		fperms 4750 "${D}"/usr/libexec/dovecot/deliver
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
-
-	rm -rf "${D}"/usr/share/doc/dovecot
-	rm -rf "${D}"/usr/share/aclocal
-
-	dodoc AUTHORS NEWS README TODO || die "basic dodoc failed"
-	rm -f doc/Makefile*
-	dodoc doc/* || die "dodoc doc failed"
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext} || die "dodoc example failed"
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext} || die "dodoc conf.d failed"
-	docinto wiki
-	dodoc doc/wiki/* || die "dodoc wiki failed"
-
-	# 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"
-	local confd="${D}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	sed -i -e "s:/usr/share/doc/dovecot/:/usr/share/doc/${PF}/:" \
-	"${confd}/../README" || die "sed failed"
-
-	# .maildir is the Gentoo default, but we need to support mbox too
-	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_privileged_group =|mail_privileged_group = mail|' \
-		"${confd}/10-mail.conf" || die "sed failed"
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/managesieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	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 = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve; then
-		cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
-		emake DESTDIR="${D}" install || die "make install failed (sieve)"
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins =/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${D}"/usr/share/doc/dovecot
-		dodoc doc/*.txt
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-	fi
-
-}
-
-pkg_preinst() {
-
-	has_version =${CATEGORY}/${PN}-0*
-	dovecot_upgrade_from_0_x=$?
-
-	has_version =${CATEGORY}/${PN}-1*
-	dovecot_upgrade_from_1_x=$?
-
-	if [[ $dovecot_upgrade_from_0_x = 0 ]] ; then
-		einfo
-		elog "There are a lot of changes in configuration files.  Please read"
-		elog "http://wiki.dovecot.org/Upgrading and edit the conf files"
-		elog "in ${ROOT}etc/dovecot"
-		einfo
-	elif [[ $dovecot_upgrade_from_1_x = 0 ]] ; then
-		# might want to automate upgrade from 1.x when 2.0 is out
-		einfo
-		elog "There are a lot of changes in configuration files in dovecot-2.0."
-		#elog "run \"emerge --config =${CATEGORY}/${PF}\" or"
-		elog "Please check the conf files in ${ROOT}etc/dovecot"
-		elog "You can run dovecot -n -c ${ROOT}etc/dovecot/dovecot.conf before"
-		elog "running etc-update or dispatch-conf to get an idea about"
-		elog "what needs to be changed."
-		ewarn "Do not {re}start dovecot without checking your conf files"
-		ewarn "and making the necessary changes."
-		einfo
-	fi
-
-}
-
-pkg_postinst() {
-
-	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
-		fi
-	fi
-
-	if use mysql || use postgres || use sqlite ; then
-		if [[ $dovecot_upgrade_from_0_x = 0 || $dovecot_upgrade_from_1_x = 0 ]];
-		then
-			einfo
-			elog "Please edit ${ROOT}etc/dovecot/dovecot-sql.conf.ext"
-			elog "before starting dovecot"
-		fi
-	fi
-
-	if use ldap ; then
-		if [[ $dovecot_upgrade_from_0_x = 0 || $dovecot_upgrade_from_1_x = 0 ]];
-		then
-			einfo
-			elog "Please edit ${ROOT}etc/dovecot/dovecot-ldap.conf.ext"
-			elog "before starting dovecot"
-		fi
-	fi
-
-}
-
-pkg_config() {
-
-	# return for now
-	return
-
-	if [[ -x "${ROOT}"usr/sbin/dovecot ]] ; then
-		if [[ ! -e "${ROOT}"etc/dovecot/dovecot.conf ]] ;  then
-			eerror "Hmm, cannot find dovecot.conf.  Please edit"
-			eerror "conf files by hand"
-			die
-		else
-			if [[ $dovecot_upgrade_from_1_x = 0 ]] ; then
-				cp "${ROOT}"etc/dovecot/dovecot.conf \
-				"${ROOT}"etc/dovecot/dovecot.conf.old || die "cp failed"
-				if "$(${ROOT}usr/sbin/dovecot -n -c ${ROOT}etc/dovecot/dovecot.conf)";
-				then
-					einfo
-					elog "Old config file is saved as \
-					${ROOT}etc/dovecot/dovecot.conf.old"
-					elog "Please review the new conf files before starting dovecot"
-				fi
-			else
-				eerror "Cannot convert old configuration file."
-				eerror "Please check your conf files in	${ROOT}etc/dovecot"
-				die
-			fi
-		fi
-	else
-		eerror "Cannot find dovecot binary.  You might want to check that"
-		eerror "${CATEGORY}/${PN} was installed successfully."
-		die
-	fi
-
-}