Punt old versions

(Portage version: 2.1.2.3)

18 files changed, 0 insertions, 1848 deletions

diff --git a/net-mail/dovecot/dovecot-1.0_rc15.ebuild b/net-mail/dovecot/dovecot-1.0_rc15.ebuild
deleted file mode 100644
index e8795451b8e3..000000000000
--- a/net-mail/dovecot/dovecot-1.0_rc15.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0_rc15.ebuild,v 1.8 2006/11/25 15:46:33 kloeri Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://dovecot.org/"
-MY_P="${P/_/.}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="http://dovecot.org/releases/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 ppc sparc x86"
-
-IUSE="debug doc ipv6 kerberos ldap mbox mysql pop3d pam postgres ssl vpopmail"
-
-# 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"
-
-pkg_setup() {
-	# 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 \
-		--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"
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	newinitd "${FILESDIR}"/dovecot.init dovecot
-
-	# Documentation
-	rm -rf "${D}"/usr/share/doc/dovecot
-	dodoc AUTHORS NEWS README TODO dovecot-example.conf
-	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
-	fperms 0600 /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
-
-	# 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
-	fi
-
-	# Listen on ipv6 and ipv4
-	if use ipv6 ; then
-		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" || die
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres ; then
-		cp doc/dovecot-sql.conf "${D}"/etc/dovecot
-		fperms 600 /etc/dovecot/dovecot-sql.conf
-		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}"
-		dodoc doc/dovecot-sql.conf
-	fi
-
-	# Install LDAP configuration
-	if use ldap ; then
-		cp doc/dovecot-ldap.conf "${D}"/etc/dovecot
-		fperms 600 /etc/dovecot/dovecot-ldap.conf
-		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}"
-		dodoc doc/dovecot-ldap.conf
-	fi
-
-
-	# Create SSL certificates
-	if use ssl ; then
-		dodir /etc/ssl/certs
-		dodir /etc/ssl/private
-		# Let's not make a new certificate if we already have one
-		if ! [[ -e /etc/ssl/certs/dovecot.pem && \
-			-e /etc/ssl/private/dovecot.pem ]]; then
-			einfo "Generating X.509 certificate for SSL"
-			pushd doc >/dev/null && \
-				SSLDIR="${D}"/etc/ssl sh mkcert.sh && \
-				popd >/dev/null
-		fi
-		dodoc doc/*.cnf doc/mkcert.sh
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:0 /var/run/dovecot
-	fperms 0700 /var/run/dovecot
-	keepdir /var/run/dovecot/login
-	fowners root:dovecot /var/run/dovecot/login
-	fperms 0750 /var/run/dovecot/login
-}
-
-get_config_var() {
-	sed -n 's/^[[:space:]]\?base_dir[[:space:]]*="*\([^#"]\+\)"*/\1/p' \
-		/etc/dovecot/dovecot.conf
-}
-
-pkg_postinst() {
-	einfo "The dovecot configuration has vastly changed since 0.99."
-	einfo "You are encouraged to start afresh with a new configuration file."
-	einfo "see http://wiki.dovecot.org/ for configuration examples."
-
-	if [[ -e ${ROOT}etc/dovecot.conf ]] ; then
-		ewarn
-		ewarn "dovecot configuration is now in ${ROOT}etc/dovecot"
-	fi
-
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${basedir:-/var/run/dovecot}"
-	if use ssl \
-		&& [[ ! -e "${ROOT}/${base_dir}/login/ssl-parameters.dat" ]] ; then
-		einfo
-		einfo "Dovecot requires DH SSL Parameters if you use SSL connections"
-		einfo "These take some time to make, and dovecot will create them before"
-		einfo "it allows any SSL connections."
-		einfo "You can create them now before starting dovecot like so"
-		einfo "   emerge --config =${PF}"
-	fi
-}
-
-pkg_config() {
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${base_dir:-/var/run/dovecot}"
-
-	einfo "Regenerating SSL parameters. This will take some time."
-	/usr/libexec/dovecot/ssl-build-param "${base_dir}/login/ssl-parameters.dat"
-}
diff --git a/net-mail/dovecot/dovecot-1.0_rc22.ebuild b/net-mail/dovecot/dovecot-1.0_rc22.ebuild
deleted file mode 100644
index ca9d27e41ce0..000000000000
--- a/net-mail/dovecot/dovecot-1.0_rc22.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# 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_rc22.ebuild,v 1.2 2007/02/12 21:45:06 uberlord Exp $
-
-inherit autotools eutils ssl-cert
-
-MY_P="${P/_/.}"
-S="${WORKDIR}/${MY_P}"
-SIEVE="dovecot-sieve-1.0"
-SIEVE_S="${WORKDIR}/${SIEVE}"
-
-SRC_URI="http://dovecot.org/releases/${MY_P}.tar.gz
-sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )"
-
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://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 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"
-
-pkg_setup() {
-	# 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 \
-		--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"
-		emake || die "make failed"
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	newinitd "${FILESDIR}"/dovecot.init dovecot
-
-	# Documentation
-	rm -rf "${D}"/usr/share/doc/dovecot
-	dodoc AUTHORS NEWS README TODO dovecot-example.conf
-	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
-
-	# 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
-	fi
-
-	# Listen on ipv6 and ipv4
-	if use ipv6 ; then
-		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" || die
-	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
-
-		# 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
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			insinto "${ROOT}"/etc/ssl/dovecot
-			docert server
-			fowners dovecot:mail /etc/ssl/dovecot/server.{key,pem}
-		fi
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres ; then
-		cp doc/dovecot-sql.conf "${D}"/etc/dovecot
-		fperms 600 /etc/dovecot/dovecot-sql.conf
-		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}"
-		dodoc doc/dovecot-sql.conf
-	fi
-
-	# Install LDAP configuration
-	if use ldap ; then
-		cp doc/dovecot-ldap.conf "${D}"/etc/dovecot
-		fperms 600 /etc/dovecot/dovecot-ldap.conf
-		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}"
-		dodoc doc/dovecot-ldap.conf
-	fi
-
-	# Install sieve plugin
-	if use sieve ; then
-		make -C "${SIEVE_S}" DESTDIR="${D}" install || die "make install failed"
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:0 /var/run/dovecot
-	fperms 0700 /var/run/dovecot
-	keepdir /var/run/dovecot/login
-	fowners root:dovecot /var/run/dovecot/login
-	fperms 0750 /var/run/dovecot/login
-}
-
-get_config_var() {
-	sed -n 's/^[[:space:]]\?base_dir[[:space:]]*="*\([^#"]\+\)"*/\1/p' \
-		/etc/dovecot/dovecot.conf
-}
-
-pkg_postinst() {
-	# Touch ssl certs so that they are modified outisde of src_install
-	# We do this so portage does't unmerge them - silly portage
-	if use ssl ; then
-		touch "${ROOT}"/etc/ssl/dovecot/server.{key,pem}
-	fi
-
-	einfo "The dovecot configuration has vastly changed since 0.99."
-	einfo "You are encouraged to start afresh with a new configuration file."
-	einfo "see http://wiki.dovecot.org/ for configuration examples."
-
-	if [[ -e ${ROOT}etc/dovecot.conf ]] ; then
-		ewarn
-		ewarn "dovecot configuration is now in ${ROOT}etc/dovecot"
-	fi
-
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${basedir:-/var/run/dovecot}"
-	if use ssl \
-		&& [[ ! -e "${ROOT}/${base_dir}/login/ssl-parameters.dat" ]] ; then
-		einfo
-		einfo "Dovecot requires DH SSL Parameters if you use SSL connections"
-		einfo "These take some time to make, and dovecot will create them before"
-		einfo "it allows any SSL connections."
-		einfo "You can create them now before starting dovecot like so"
-		einfo "   emerge --config =${PF}"
-	fi
-}
-
-pkg_config() {
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${base_dir:-/var/run/dovecot}"
-
-	einfo "Regenerating SSL parameters. This will take some time."
-	/usr/libexec/dovecot/ssl-build-param "${base_dir}/login/ssl-parameters.dat"
-}
diff --git a/net-mail/dovecot/dovecot-1.0_rc23.ebuild b/net-mail/dovecot/dovecot-1.0_rc23.ebuild
deleted file mode 100644
index 4641b9b35287..000000000000
--- a/net-mail/dovecot/dovecot-1.0_rc23.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# 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_rc23.ebuild,v 1.1 2007/02/20 13:26:43 uberlord Exp $
-
-inherit autotools eutils ssl-cert
-
-MY_P="${P/_/.}"
-S="${WORKDIR}/${MY_P}"
-SIEVE="dovecot-sieve-1.0"
-SIEVE_S="${WORKDIR}/${SIEVE}"
-
-SRC_URI="http://dovecot.org/releases/${MY_P}.tar.gz
-sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )"
-
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://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 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"
-
-pkg_setup() {
-	# 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 \
-		--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"
-		emake || die "make failed"
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	newinitd "${FILESDIR}"/dovecot.init dovecot
-
-	# Documentation
-	rm -rf "${D}"/usr/share/doc/dovecot
-	dodoc AUTHORS NEWS README TODO dovecot-example.conf
-	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
-
-	# 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
-	fi
-
-	# Listen on ipv6 and ipv4
-	if use ipv6 ; then
-		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" || die
-	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
-
-		# 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
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			insinto "${ROOT}"/etc/ssl/dovecot
-			docert server
-			fowners dovecot:mail /etc/ssl/dovecot/server.{key,pem}
-		fi
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres ; then
-		cp doc/dovecot-sql.conf "${D}"/etc/dovecot
-		fperms 600 /etc/dovecot/dovecot-sql.conf
-		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}"
-		dodoc doc/dovecot-sql.conf
-	fi
-
-	# Install LDAP configuration
-	if use ldap ; then
-		cp doc/dovecot-ldap.conf "${D}"/etc/dovecot
-		fperms 600 /etc/dovecot/dovecot-ldap.conf
-		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}"
-		dodoc doc/dovecot-ldap.conf
-	fi
-
-	# Install sieve plugin
-	if use sieve ; then
-		make -C "${SIEVE_S}" DESTDIR="${D}" install || die "make install failed"
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:0 /var/run/dovecot
-	fperms 0700 /var/run/dovecot
-	keepdir /var/run/dovecot/login
-	fowners root:dovecot /var/run/dovecot/login
-	fperms 0750 /var/run/dovecot/login
-}
-
-get_config_var() {
-	sed -n 's/^[[:space:]]\?base_dir[[:space:]]*="*\([^#"]\+\)"*/\1/p' \
-		/etc/dovecot/dovecot.conf
-}
-
-pkg_postinst() {
-	# Touch ssl certs so that they are modified outisde of src_install
-	# We do this so portage does't unmerge them - silly portage
-	if use ssl ; then
-		touch "${ROOT}"/etc/ssl/dovecot/server.{key,pem}
-	fi
-
-	einfo "The dovecot configuration has vastly changed since 0.99."
-	einfo "You are encouraged to start afresh with a new configuration file."
-	einfo "see http://wiki.dovecot.org/ for configuration examples."
-
-	if [[ -e ${ROOT}etc/dovecot.conf ]] ; then
-		ewarn
-		ewarn "dovecot configuration is now in ${ROOT}etc/dovecot"
-	fi
-
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${basedir:-/var/run/dovecot}"
-	if use ssl \
-		&& [[ ! -e "${ROOT}/${base_dir}/login/ssl-parameters.dat" ]] ; then
-		einfo
-		einfo "Dovecot requires DH SSL Parameters if you use SSL connections"
-		einfo "These take some time to make, and dovecot will create them before"
-		einfo "it allows any SSL connections."
-		einfo "You can create them now before starting dovecot like so"
-		einfo "   emerge --config =${PF}"
-	fi
-}
-
-pkg_config() {
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${base_dir:-/var/run/dovecot}"
-
-	einfo "Regenerating SSL parameters. This will take some time."
-	/usr/libexec/dovecot/ssl-build-param "${base_dir}/login/ssl-parameters.dat"
-}
diff --git a/net-mail/dovecot/dovecot-1.0_rc24.ebuild b/net-mail/dovecot/dovecot-1.0_rc24.ebuild
deleted file mode 100644
index 36b9a16aad0f..000000000000
--- a/net-mail/dovecot/dovecot-1.0_rc24.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# 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_rc24.ebuild,v 1.1 2007/02/22 19:49:50 uberlord Exp $
-
-inherit autotools eutils ssl-cert
-
-MY_P="${P/_/.}"
-S="${WORKDIR}/${MY_P}"
-SIEVE="dovecot-sieve-1.0"
-SIEVE_S="${WORKDIR}/${SIEVE}"
-
-SRC_URI="http://dovecot.org/releases/${MY_P}.tar.gz
-sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )"
-
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://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 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"
-
-pkg_setup() {
-	# 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 \
-		--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"
-		emake || die "make failed"
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	newinitd "${FILESDIR}"/dovecot.init dovecot
-
-	# Documentation
-	rm -rf "${D}"/usr/share/doc/dovecot
-	dodoc AUTHORS NEWS README TODO dovecot-example.conf
-	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
-
-	# 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
-	fi
-
-	# Listen on ipv6 and ipv4
-	if use ipv6 ; then
-		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" || die
-	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
-
-		# 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
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			insinto "${ROOT}"/etc/ssl/dovecot
-			docert server
-			fowners dovecot:mail /etc/ssl/dovecot/server.{key,pem}
-		fi
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres ; then
-		cp doc/dovecot-sql.conf "${D}"/etc/dovecot
-		fperms 600 /etc/dovecot/dovecot-sql.conf
-		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}"
-		dodoc doc/dovecot-sql.conf
-	fi
-
-	# Install LDAP configuration
-	if use ldap ; then
-		cp doc/dovecot-ldap.conf "${D}"/etc/dovecot
-		fperms 600 /etc/dovecot/dovecot-ldap.conf
-		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}"
-		dodoc doc/dovecot-ldap.conf
-	fi
-
-	# Install sieve plugin
-	if use sieve ; then
-		make -C "${SIEVE_S}" DESTDIR="${D}" install || die "make install failed"
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:0 /var/run/dovecot
-	fperms 0700 /var/run/dovecot
-	keepdir /var/run/dovecot/login
-	fowners root:dovecot /var/run/dovecot/login
-	fperms 0750 /var/run/dovecot/login
-}
-
-get_config_var() {
-	sed -n 's/^[[:space:]]\?base_dir[[:space:]]*="*\([^#"]\+\)"*/\1/p' \
-		/etc/dovecot/dovecot.conf
-}
-
-pkg_postinst() {
-	# Touch ssl certs so that they are modified outisde of src_install
-	# We do this so portage does't unmerge them - silly portage
-	if use ssl ; then
-		touch "${ROOT}"/etc/ssl/dovecot/server.{key,pem}
-	fi
-
-	einfo "The dovecot configuration has vastly changed since 0.99."
-	einfo "You are encouraged to start afresh with a new configuration file."
-	einfo "see http://wiki.dovecot.org/ for configuration examples."
-
-	if [[ -e ${ROOT}etc/dovecot.conf ]] ; then
-		ewarn
-		ewarn "dovecot configuration is now in ${ROOT}etc/dovecot"
-	fi
-
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${basedir:-/var/run/dovecot}"
-	if use ssl \
-		&& [[ ! -e "${ROOT}/${base_dir}/login/ssl-parameters.dat" ]] ; then
-		einfo
-		einfo "Dovecot requires DH SSL Parameters if you use SSL connections"
-		einfo "These take some time to make, and dovecot will create them before"
-		einfo "it allows any SSL connections."
-		einfo "You can create them now before starting dovecot like so"
-		einfo "   emerge --config =${PF}"
-	fi
-}
-
-pkg_config() {
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${base_dir:-/var/run/dovecot}"
-
-	einfo "Regenerating SSL parameters. This will take some time."
-	/usr/libexec/dovecot/ssl-build-param "${base_dir}/login/ssl-parameters.dat"
-}
diff --git a/net-mail/dovecot/dovecot-1.0_rc25.ebuild b/net-mail/dovecot/dovecot-1.0_rc25.ebuild
deleted file mode 100644
index deaba02ab032..000000000000
--- a/net-mail/dovecot/dovecot-1.0_rc25.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# 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_rc25.ebuild,v 1.1 2007/03/01 13:35:27 uberlord Exp $
-
-inherit autotools eutils ssl-cert
-
-MY_P="${P/_/.}"
-S="${WORKDIR}/${MY_P}"
-SIEVE="dovecot-sieve-1.0"
-SIEVE_S="${WORKDIR}/${SIEVE}"
-
-SRC_URI="http://dovecot.org/releases/${MY_P}.tar.gz
-sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )"
-
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://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 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"
-
-pkg_setup() {
-	# 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 \
-		--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"
-		emake || die "make failed"
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	newinitd "${FILESDIR}"/dovecot.init dovecot
-
-	# Documentation
-	rm -rf "${D}"/usr/share/doc/dovecot
-	dodoc AUTHORS NEWS README TODO dovecot-example.conf
-	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
-
-	# 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
-	fi
-
-	# Listen on ipv6 and ipv4
-	if use ipv6 ; then
-		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" || die
-	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
-
-		# 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
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			insinto "${ROOT}"/etc/ssl/dovecot
-			docert server
-			fowners dovecot:mail /etc/ssl/dovecot/server.{key,pem}
-		fi
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres ; then
-		cp doc/dovecot-sql.conf "${D}"/etc/dovecot
-		fperms 600 /etc/dovecot/dovecot-sql.conf
-		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}"
-		dodoc doc/dovecot-sql.conf
-	fi
-
-	# Install LDAP configuration
-	if use ldap ; then
-		cp doc/dovecot-ldap.conf "${D}"/etc/dovecot
-		fperms 600 /etc/dovecot/dovecot-ldap.conf
-		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}"
-		dodoc doc/dovecot-ldap.conf
-	fi
-
-	# Install sieve plugin
-	if use sieve ; then
-		make -C "${SIEVE_S}" DESTDIR="${D}" install || die "make install failed"
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:0 /var/run/dovecot
-	fperms 0700 /var/run/dovecot
-	keepdir /var/run/dovecot/login
-	fowners root:dovecot /var/run/dovecot/login
-	fperms 0750 /var/run/dovecot/login
-}
-
-get_config_var() {
-	sed -n 's/^[[:space:]]\?base_dir[[:space:]]*="*\([^#"]\+\)"*/\1/p' \
-		/etc/dovecot/dovecot.conf
-}
-
-pkg_postinst() {
-	# Touch ssl certs so that they are modified outisde of src_install
-	# We do this so portage does't unmerge them - silly portage
-	if use ssl ; then
-		touch "${ROOT}"/etc/ssl/dovecot/server.{key,pem}
-	fi
-
-	einfo "The dovecot configuration has vastly changed since 0.99."
-	einfo "You are encouraged to start afresh with a new configuration file."
-	einfo "see http://wiki.dovecot.org/ for configuration examples."
-
-	if [[ -e ${ROOT}etc/dovecot.conf ]] ; then
-		ewarn
-		ewarn "dovecot configuration is now in ${ROOT}etc/dovecot"
-	fi
-
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${basedir:-/var/run/dovecot}"
-	if use ssl \
-		&& [[ ! -e "${ROOT}/${base_dir}/login/ssl-parameters.dat" ]] ; then
-		einfo
-		einfo "Dovecot requires DH SSL Parameters if you use SSL connections"
-		einfo "These take some time to make, and dovecot will create them before"
-		einfo "it allows any SSL connections."
-		einfo "You can create them now before starting dovecot like so"
-		einfo "   emerge --config =${PF}"
-	fi
-}
-
-pkg_config() {
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${base_dir:-/var/run/dovecot}"
-
-	einfo "Regenerating SSL parameters. This will take some time."
-	/usr/libexec/dovecot/ssl-build-param "${base_dir}/login/ssl-parameters.dat"
-}
diff --git a/net-mail/dovecot/dovecot-1.0_rc26.ebuild b/net-mail/dovecot/dovecot-1.0_rc26.ebuild
deleted file mode 100644
index 711605c40c0b..000000000000
--- a/net-mail/dovecot/dovecot-1.0_rc26.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# 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_rc26.ebuild,v 1.1 2007/03/07 07:34:54 uberlord Exp $
-
-inherit autotools eutils ssl-cert
-
-MY_P="${P/_/.}"
-S="${WORKDIR}/${MY_P}"
-SIEVE="dovecot-sieve-1.0"
-SIEVE_S="${WORKDIR}/${SIEVE}"
-
-SRC_URI="http://dovecot.org/releases/${MY_P}.tar.gz
-sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )"
-
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://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 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"
-
-pkg_setup() {
-	# 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_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"
-		emake || die "make failed"
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	newinitd "${FILESDIR}"/dovecot.init dovecot
-
-	# Documentation
-	rm -rf "${D}"/usr/share/doc/dovecot
-	dodoc AUTHORS NEWS README TODO dovecot-example.conf
-	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
-
-	# 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
-	fi
-
-	# Listen on ipv6 and ipv4
-	if use ipv6 ; then
-		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" || die
-	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
-
-		# 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
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			insinto "${ROOT}"/etc/ssl/dovecot
-			docert server
-			fowners dovecot:mail /etc/ssl/dovecot/server.{key,pem}
-		fi
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres ; then
-		cp doc/dovecot-sql.conf "${D}"/etc/dovecot
-		fperms 600 /etc/dovecot/dovecot-sql.conf
-		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}"
-		dodoc doc/dovecot-sql.conf
-	fi
-
-	# Install LDAP configuration
-	if use ldap ; then
-		cp doc/dovecot-ldap.conf "${D}"/etc/dovecot
-		fperms 600 /etc/dovecot/dovecot-ldap.conf
-		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}"
-		dodoc doc/dovecot-ldap.conf
-	fi
-
-	# Install sieve plugin
-	if use sieve ; then
-		make -C "${SIEVE_S}" DESTDIR="${D}" install || die "make install failed"
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:0 /var/run/dovecot
-	fperms 0700 /var/run/dovecot
-	keepdir /var/run/dovecot/login
-	fowners root:dovecot /var/run/dovecot/login
-	fperms 0750 /var/run/dovecot/login
-}
-
-get_config_var() {
-	sed -n 's/^[[:space:]]\?base_dir[[:space:]]*="*\([^#"]\+\)"*/\1/p' \
-		/etc/dovecot/dovecot.conf
-}
-
-pkg_postinst() {
-	# Touch ssl certs so that they are modified outisde of src_install
-	# We do this so portage does't unmerge them - silly portage
-	if use ssl ; then
-		touch "${ROOT}"/etc/ssl/dovecot/server.{key,pem}
-	fi
-
-	einfo "The dovecot configuration has vastly changed since 0.99."
-	einfo "You are encouraged to start afresh with a new configuration file."
-	einfo "see http://wiki.dovecot.org/ for configuration examples."
-
-	if [[ -e ${ROOT}etc/dovecot.conf ]] ; then
-		ewarn
-		ewarn "dovecot configuration is now in ${ROOT}etc/dovecot"
-	fi
-
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${basedir:-/var/run/dovecot}"
-	if use ssl \
-		&& [[ ! -e "${ROOT}/${base_dir}/login/ssl-parameters.dat" ]] ; then
-		einfo
-		einfo "Dovecot requires DH SSL Parameters if you use SSL connections"
-		einfo "These take some time to make, and dovecot will create them before"
-		einfo "it allows any SSL connections."
-		einfo "You can create them now before starting dovecot like so"
-		einfo "   emerge --config =${PF}"
-	fi
-}
-
-pkg_config() {
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${base_dir:-/var/run/dovecot}"
-
-	einfo "Regenerating SSL parameters. This will take some time."
-	/usr/libexec/dovecot/ssl-build-param "${base_dir}/login/ssl-parameters.dat"
-}
diff --git a/net-mail/dovecot/dovecot-1.0_rc27.ebuild b/net-mail/dovecot/dovecot-1.0_rc27.ebuild
deleted file mode 100644
index 4ab83d0d7386..000000000000
--- a/net-mail/dovecot/dovecot-1.0_rc27.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# 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_rc27.ebuild,v 1.1 2007/03/13 20:57:38 uberlord Exp $
-
-inherit autotools eutils ssl-cert
-
-MY_P="${P/_/.}"
-S="${WORKDIR}/${MY_P}"
-SIEVE="dovecot-sieve-1.0"
-SIEVE_S="${WORKDIR}/${SIEVE}"
-
-SRC_URI="http://dovecot.org/releases/${MY_P}.tar.gz
-sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )"
-
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://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 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"
-
-pkg_setup() {
-	# 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_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"
-		emake || die "make failed"
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	newinitd "${FILESDIR}"/dovecot.init dovecot
-
-	# Documentation
-	rm -rf "${D}"/usr/share/doc/dovecot
-	dodoc AUTHORS NEWS README TODO dovecot-example.conf
-	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
-
-	# 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
-	fi
-
-	# Listen on ipv6 and ipv4
-	if use ipv6 ; then
-		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" || die
-	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
-
-		# 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
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			insinto "${ROOT}"/etc/ssl/dovecot
-			docert server
-			fowners dovecot:mail /etc/ssl/dovecot/server.{key,pem}
-		fi
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres ; then
-		cp doc/dovecot-sql.conf "${D}"/etc/dovecot
-		fperms 600 /etc/dovecot/dovecot-sql.conf
-		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}"
-		dodoc doc/dovecot-sql.conf
-	fi
-
-	# Install LDAP configuration
-	if use ldap ; then
-		cp doc/dovecot-ldap.conf "${D}"/etc/dovecot
-		fperms 600 /etc/dovecot/dovecot-ldap.conf
-		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}"
-		dodoc doc/dovecot-ldap.conf
-	fi
-
-	# Install sieve plugin
-	if use sieve ; then
-		make -C "${SIEVE_S}" DESTDIR="${D}" install || die "make install failed"
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:0 /var/run/dovecot
-	fperms 0700 /var/run/dovecot
-	keepdir /var/run/dovecot/login
-	fowners root:dovecot /var/run/dovecot/login
-	fperms 0750 /var/run/dovecot/login
-}
-
-get_config_var() {
-	sed -n 's/^[[:space:]]\?base_dir[[:space:]]*="*\([^#"]\+\)"*/\1/p' \
-		/etc/dovecot/dovecot.conf
-}
-
-pkg_postinst() {
-	# Touch ssl certs so that they are modified outisde of src_install
-	# We do this so portage does't unmerge them - silly portage
-	if use ssl ; then
-		touch "${ROOT}"/etc/ssl/dovecot/server.{key,pem}
-	fi
-
-	einfo "The dovecot configuration has vastly changed since 0.99."
-	einfo "You are encouraged to start afresh with a new configuration file."
-	einfo "see http://wiki.dovecot.org/ for configuration examples."
-
-	if [[ -e ${ROOT}etc/dovecot.conf ]] ; then
-		ewarn
-		ewarn "dovecot configuration is now in ${ROOT}etc/dovecot"
-	fi
-
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${basedir:-/var/run/dovecot}"
-	if use ssl \
-		&& [[ ! -e "${ROOT}/${base_dir}/login/ssl-parameters.dat" ]] ; then
-		einfo
-		einfo "Dovecot requires DH SSL Parameters if you use SSL connections"
-		einfo "These take some time to make, and dovecot will create them before"
-		einfo "it allows any SSL connections."
-		einfo "You can create them now before starting dovecot like so"
-		einfo "   emerge --config =${PF}"
-	fi
-}
-
-pkg_config() {
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${base_dir:-/var/run/dovecot}"
-
-	einfo "Regenerating SSL parameters. This will take some time."
-	/usr/libexec/dovecot/ssl-build-param "${base_dir}/login/ssl-parameters.dat"
-}
diff --git a/net-mail/dovecot/dovecot-1.0_rc28.ebuild b/net-mail/dovecot/dovecot-1.0_rc28.ebuild
deleted file mode 100644
index 56f399f122e9..000000000000
--- a/net-mail/dovecot/dovecot-1.0_rc28.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# 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_rc28.ebuild,v 1.1 2007/03/28 20:33:07 uberlord Exp $
-
-inherit autotools eutils ssl-cert
-
-MY_P="${P/_/.}"
-S="${WORKDIR}/${MY_P}"
-SIEVE="dovecot-sieve-1.0"
-SIEVE_S="${WORKDIR}/${SIEVE}"
-
-SRC_URI="http://dovecot.org/releases/${MY_P}.tar.gz
-sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )"
-
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://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"
-
-# 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"
-
-pkg_setup() {
-	# 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_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"
-		emake || die "make failed"
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-	use suid && fperms +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
-	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
-
-	# 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
-	fi
-
-	# Listen on ipv6 and ipv4
-	if use ipv6 ; then
-		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" || die
-	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
-
-		# 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
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			insinto "${ROOT}"/etc/ssl/dovecot
-			docert server
-			fowners dovecot:mail /etc/ssl/dovecot/server.{key,pem}
-		fi
-	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}"
-		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}"
-		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"
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:0 /var/run/dovecot
-	fperms 0700 /var/run/dovecot
-	keepdir /var/run/dovecot/login
-	fowners root:dovecot /var/run/dovecot/login
-	fperms 0750 /var/run/dovecot/login
-}
-
-get_config_var() {
-	sed -n 's/^[[:space:]]\?base_dir[[:space:]]*="*\([^#"]\+\)"*/\1/p' \
-		/etc/dovecot/dovecot.conf
-}
-
-pkg_postinst() {
-	# Touch ssl certs so that they are modified outisde of src_install
-	# We do this so portage does't unmerge them - silly portage
-	if use ssl ; then
-		touch "${ROOT}"/etc/ssl/dovecot/server.{key,pem}
-	fi
-
-	einfo "The dovecot configuration has vastly changed since 0.99."
-	einfo "You are encouraged to start afresh with a new configuration file."
-	einfo "see http://wiki.dovecot.org/ for configuration examples."
-
-	if [[ -e ${ROOT}etc/dovecot.conf ]] ; then
-		ewarn
-		ewarn "dovecot configuration is now in ${ROOT}etc/dovecot"
-	fi
-
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${basedir:-/var/run/dovecot}"
-	if use ssl \
-		&& [[ ! -e "${ROOT}/${base_dir}/login/ssl-parameters.dat" ]] ; then
-		einfo
-		einfo "Dovecot requires DH SSL Parameters if you use SSL connections"
-		einfo "These take some time to make, and dovecot will create them before"
-		einfo "it allows any SSL connections."
-		einfo "You can create them now before starting dovecot like so"
-		einfo "   emerge --config =${PF}"
-	fi
-}
-
-pkg_config() {
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${base_dir:-/var/run/dovecot}"
-
-	einfo "Regenerating SSL parameters. This will take some time."
-	/usr/libexec/dovecot/ssl-build-param "${base_dir}/login/ssl-parameters.dat"
-}
diff --git a/net-mail/dovecot/dovecot-1.0_rc30.ebuild b/net-mail/dovecot/dovecot-1.0_rc30.ebuild
deleted file mode 100644
index 7ba9a96c666a..000000000000
--- a/net-mail/dovecot/dovecot-1.0_rc30.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# 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_rc30.ebuild,v 1.1 2007/04/06 12:43:57 uberlord Exp $
-
-inherit autotools eutils ssl-cert
-
-MY_P="${P/_/.}"
-S="${WORKDIR}/${MY_P}"
-SIEVE="dovecot-sieve-1.0"
-SIEVE_S="${WORKDIR}/${SIEVE}"
-
-SRC_URI="http://dovecot.org/releases/${MY_P}.tar.gz
-sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )"
-
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://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"
-
-# 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"
-
-pkg_setup() {
-	# 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_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"
-		emake || die "make failed"
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-	use suid && fperms +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
-	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
-
-	# 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
-	fi
-
-	# Listen on ipv6 and ipv4
-	if use ipv6 ; then
-		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" || die
-	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
-
-		# 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
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			insinto "${ROOT}"/etc/ssl/dovecot
-			docert server
-			fowners dovecot:mail /etc/ssl/dovecot/server.{key,pem}
-		fi
-	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}"
-		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}"
-		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"
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:0 /var/run/dovecot
-	fperms 0700 /var/run/dovecot
-	keepdir /var/run/dovecot/login
-	fowners root:dovecot /var/run/dovecot/login
-	fperms 0750 /var/run/dovecot/login
-}
-
-get_config_var() {
-	sed -n 's/^[[:space:]]\?base_dir[[:space:]]*="*\([^#"]\+\)"*/\1/p' \
-		/etc/dovecot/dovecot.conf
-}
-
-pkg_postinst() {
-	# Touch ssl certs so that they are modified outisde of src_install
-	# We do this so portage does't unmerge them - silly portage
-	if use ssl ; then
-		touch "${ROOT}"/etc/ssl/dovecot/server.{key,pem}
-	fi
-
-	einfo "The dovecot configuration has vastly changed since 0.99."
-	einfo "You are encouraged to start afresh with a new configuration file."
-	einfo "see http://wiki.dovecot.org/ for configuration examples."
-
-	if [[ -e ${ROOT}etc/dovecot.conf ]] ; then
-		ewarn
-		ewarn "dovecot configuration is now in ${ROOT}etc/dovecot"
-	fi
-
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${basedir:-/var/run/dovecot}"
-	if use ssl \
-		&& [[ ! -e "${ROOT}/${base_dir}/login/ssl-parameters.dat" ]] ; then
-		einfo
-		einfo "Dovecot requires DH SSL Parameters if you use SSL connections"
-		einfo "These take some time to make, and dovecot will create them before"
-		einfo "it allows any SSL connections."
-		einfo "You can create them now before starting dovecot like so"
-		einfo "   emerge --config =${PF}"
-	fi
-}
-
-pkg_config() {
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${base_dir:-/var/run/dovecot}"
-
-	einfo "Regenerating SSL parameters. This will take some time."
-	/usr/libexec/dovecot/ssl-build-param "${base_dir}/login/ssl-parameters.dat"
-}
diff --git a/net-mail/dovecot/files/digest-dovecot-1.0_rc15 b/net-mail/dovecot/files/digest-dovecot-1.0_rc15
deleted file mode 100644
index 22003a4f2a49..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0_rc15
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 26f3d2b075856b1b1d180146363819e6 dovecot-1.0.rc15.tar.gz 1463069
-RMD160 904ef7d1f0fbfe8055f13d9036f7107f498b522e dovecot-1.0.rc15.tar.gz 1463069
-SHA256 e1e42e5c808301c5a709d54c5949cd8c1d3c43861e4e918548ded5841865487f dovecot-1.0.rc15.tar.gz 1463069
diff --git a/net-mail/dovecot/files/digest-dovecot-1.0_rc22 b/net-mail/dovecot/files/digest-dovecot-1.0_rc22
deleted file mode 100644
index 1e1d90bfd882..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0_rc22
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 d5bd3ce8ba7ca2ee9f563fe63a1f700a dovecot-1.0.rc22.tar.gz 1501122
-RMD160 e0fdb65d668f5fdaedd10d4359bd2bf3e42728d2 dovecot-1.0.rc22.tar.gz 1501122
-SHA256 ad93b4b1376c24f60eceb790f1ab162a99d1315920a8da802c08b0b73719470f dovecot-1.0.rc22.tar.gz 1501122
-MD5 dabe564d2ef262a008622737ad84579f dovecot-sieve-1.0.tar.gz 442943
-RMD160 b56f5a7391607125184755b9bbcbe749e79e26d4 dovecot-sieve-1.0.tar.gz 442943
-SHA256 c1ce887c1c6e09d9d1b4af6825db5c50befb10c1fed742a6666a12ac9492d98a dovecot-sieve-1.0.tar.gz 442943
diff --git a/net-mail/dovecot/files/digest-dovecot-1.0_rc23 b/net-mail/dovecot/files/digest-dovecot-1.0_rc23
deleted file mode 100644
index e20011091944..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0_rc23
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 d595481d6c355106114f4263e49f70f3 dovecot-1.0.rc23.tar.gz 1496678
-RMD160 67c8622f957698bd017828c54bd59341c4a30cc9 dovecot-1.0.rc23.tar.gz 1496678
-SHA256 dbd581d999d8a952b806059a9b0d704fb0386c9a0a5f075df3ca9ca91b3d3e57 dovecot-1.0.rc23.tar.gz 1496678
-MD5 dabe564d2ef262a008622737ad84579f dovecot-sieve-1.0.tar.gz 442943
-RMD160 b56f5a7391607125184755b9bbcbe749e79e26d4 dovecot-sieve-1.0.tar.gz 442943
-SHA256 c1ce887c1c6e09d9d1b4af6825db5c50befb10c1fed742a6666a12ac9492d98a dovecot-sieve-1.0.tar.gz 442943
diff --git a/net-mail/dovecot/files/digest-dovecot-1.0_rc24 b/net-mail/dovecot/files/digest-dovecot-1.0_rc24
deleted file mode 100644
index 8cb56bb453ff..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0_rc24
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 f1a7e366dceda28138e5a902dda7f274 dovecot-1.0.rc24.tar.gz 1498585
-RMD160 4496e98216cbadd9352da4f898bdf656dfdb047e dovecot-1.0.rc24.tar.gz 1498585
-SHA256 e35d44bf7fcffbbcb5823ab45c77ea7a8c0b6dbe423eecd37430dedab5a87e08 dovecot-1.0.rc24.tar.gz 1498585
-MD5 dabe564d2ef262a008622737ad84579f dovecot-sieve-1.0.tar.gz 442943
-RMD160 b56f5a7391607125184755b9bbcbe749e79e26d4 dovecot-sieve-1.0.tar.gz 442943
-SHA256 c1ce887c1c6e09d9d1b4af6825db5c50befb10c1fed742a6666a12ac9492d98a dovecot-sieve-1.0.tar.gz 442943
diff --git a/net-mail/dovecot/files/digest-dovecot-1.0_rc25 b/net-mail/dovecot/files/digest-dovecot-1.0_rc25
deleted file mode 100644
index c46eb92cdfd8..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0_rc25
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 14e9981e9828a65526b8e683657434d4 dovecot-1.0.rc25.tar.gz 1511817
-RMD160 f5a631c310ea8958ca5244ce2ba71332e44218af dovecot-1.0.rc25.tar.gz 1511817
-SHA256 2dc307fbbcc431ae680a5d4712853203894635fa2a45e4bd4c39fe92a35b85d8 dovecot-1.0.rc25.tar.gz 1511817
-MD5 dabe564d2ef262a008622737ad84579f dovecot-sieve-1.0.tar.gz 442943
-RMD160 b56f5a7391607125184755b9bbcbe749e79e26d4 dovecot-sieve-1.0.tar.gz 442943
-SHA256 c1ce887c1c6e09d9d1b4af6825db5c50befb10c1fed742a6666a12ac9492d98a dovecot-sieve-1.0.tar.gz 442943
diff --git a/net-mail/dovecot/files/digest-dovecot-1.0_rc26 b/net-mail/dovecot/files/digest-dovecot-1.0_rc26
deleted file mode 100644
index 05a9f16427b2..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0_rc26
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 2f6fb150c60a8f9c0bad12c5fb2b1d15 dovecot-1.0.rc26.tar.gz 1515108
-RMD160 c87f8f7da138187248017f6ff067d340e2969d0e dovecot-1.0.rc26.tar.gz 1515108
-SHA256 7ddd94fb2638ec368c30ab4de94d01d040a47fccb59fb7ed1f949dbb7e2cb5be dovecot-1.0.rc26.tar.gz 1515108
-MD5 dabe564d2ef262a008622737ad84579f dovecot-sieve-1.0.tar.gz 442943
-RMD160 b56f5a7391607125184755b9bbcbe749e79e26d4 dovecot-sieve-1.0.tar.gz 442943
-SHA256 c1ce887c1c6e09d9d1b4af6825db5c50befb10c1fed742a6666a12ac9492d98a dovecot-sieve-1.0.tar.gz 442943
diff --git a/net-mail/dovecot/files/digest-dovecot-1.0_rc27 b/net-mail/dovecot/files/digest-dovecot-1.0_rc27
deleted file mode 100644
index 9608e2b82c35..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0_rc27
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 2bc18491c869e0b298ef114d07cdbb46 dovecot-1.0.rc27.tar.gz 1521452
-RMD160 b13d0ac5c6760d7646d0c5924943be0d7ce0e480 dovecot-1.0.rc27.tar.gz 1521452
-SHA256 b2846c63325b88d1e39b908cb1ee03f2a9057d37600ea5b9c3dc5b923e97d0b0 dovecot-1.0.rc27.tar.gz 1521452
-MD5 dabe564d2ef262a008622737ad84579f dovecot-sieve-1.0.tar.gz 442943
-RMD160 b56f5a7391607125184755b9bbcbe749e79e26d4 dovecot-sieve-1.0.tar.gz 442943
-SHA256 c1ce887c1c6e09d9d1b4af6825db5c50befb10c1fed742a6666a12ac9492d98a dovecot-sieve-1.0.tar.gz 442943
diff --git a/net-mail/dovecot/files/digest-dovecot-1.0_rc28 b/net-mail/dovecot/files/digest-dovecot-1.0_rc28
deleted file mode 100644
index 8914884603c4..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0_rc28
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e6fd617f3210f914815186c176796881 dovecot-1.0.rc28.tar.gz 1534090
-RMD160 7ea445c844d382115eb4fad651ff00d51dc58e9e dovecot-1.0.rc28.tar.gz 1534090
-SHA256 56dd5221812d66a2fa90437ff3cc50a03236d94f9309cffb5ce48448bd64c2a3 dovecot-1.0.rc28.tar.gz 1534090
-MD5 dabe564d2ef262a008622737ad84579f dovecot-sieve-1.0.tar.gz 442943
-RMD160 b56f5a7391607125184755b9bbcbe749e79e26d4 dovecot-sieve-1.0.tar.gz 442943
-SHA256 c1ce887c1c6e09d9d1b4af6825db5c50befb10c1fed742a6666a12ac9492d98a dovecot-sieve-1.0.tar.gz 442943
diff --git a/net-mail/dovecot/files/digest-dovecot-1.0_rc30 b/net-mail/dovecot/files/digest-dovecot-1.0_rc30
deleted file mode 100644
index 978e0fd45f3a..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0_rc30
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 59470fa98d4004e8e9036934c92eaade dovecot-1.0.rc30.tar.gz 1671456
-RMD160 2eb01aa3de5279fe16cef834309f03c6f57f337e dovecot-1.0.rc30.tar.gz 1671456
-SHA256 19f907ec58896eecedb7a4b159c695802a53a1f00850694acbac5ab92dcf7e84 dovecot-1.0.rc30.tar.gz 1671456
-MD5 dabe564d2ef262a008622737ad84579f dovecot-sieve-1.0.tar.gz 442943
-RMD160 b56f5a7391607125184755b9bbcbe749e79e26d4 dovecot-sieve-1.0.tar.gz 442943
-SHA256 c1ce887c1c6e09d9d1b4af6825db5c50befb10c1fed742a6666a12ac9492d98a dovecot-sieve-1.0.tar.gz 442943