Punt old versions

Package-Manager: portage-2.1.3_rc8

16 files changed, 0 insertions, 1555 deletions

diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 1f77a06e8a4a..c5cc3cbf9a08 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,55 +1,19 @@
-AUX dovecot-1.0_rc31-ldap.patch 502 RMD160 b0942e7acdfd43ceb9607d0915d85c5d6e65a457 SHA1 b9c4f72d56de03c323d1aa7e18c5195d526c1e28 SHA256 3224b0c08c0f09e73e35542d5b91a251ba6c25278e148bd203bdd2256222257a
-MD5 ad1cfd518233a37539c41f1cf3a95180 files/dovecot-1.0_rc31-ldap.patch 502
-RMD160 b0942e7acdfd43ceb9607d0915d85c5d6e65a457 files/dovecot-1.0_rc31-ldap.patch 502
-SHA256 3224b0c08c0f09e73e35542d5b91a251ba6c25278e148bd203bdd2256222257a files/dovecot-1.0_rc31-ldap.patch 502
 AUX dovecot.init 878 RMD160 32906bdbf40221017c4f39a7ca0e3fa97070b9ab SHA1 f31c1476107dd4ca4919fe3e994ef6cb82f5a8c1 SHA256 1bd24e14af5536828d3e232186d5ae68d3e394da3324c660fa1e658b4ae3b413
 MD5 6d3e44da73ef66d20b42a5fad49731f0 files/dovecot.init 878
 RMD160 32906bdbf40221017c4f39a7ca0e3fa97070b9ab files/dovecot.init 878
 SHA256 1bd24e14af5536828d3e232186d5ae68d3e394da3324c660fa1e658b4ae3b413 files/dovecot.init 878
-DIST dovecot-1.0.0.tar.gz 1674299 RMD160 e750eb726fc7cf04d8dbd97604f01aa5ce4e3d19 SHA1 69054e9d3d10425bba5b13d092fa2cfeab382dce SHA256 414ef7893f6c831f9248fb4bda2e127661948820da543620f6effd6b8a008f5f
-DIST dovecot-1.0.1.tar.gz 1739087 RMD160 99fb3c7f69d7518d0fff3cc8245860c8731d1414 SHA1 2772e27ecfc4afcb37b7afbed0deb98599fe645a SHA256 463220ff14fac3807964e669082a24271a872b7de445f38325de5317037cde0d
 DIST dovecot-1.0.2.tar.gz 1768818 RMD160 0633225e510d1dd72306ff00003f065de25e09c5 SHA1 02e379f12901ca7c0385c19c268805827e68e0ec SHA256 d3335076c104eaa08dd01a02db94443790998870a433da5720a8dc79b83c6a03
 DIST dovecot-1.0.rc29.tar.gz 1670673 RMD160 b09da68a67e951bf019ab077bf17ebbfd7e729a2 SHA1 f090f6ceb22849da4fc255d21e99d303f537c237 SHA256 6b8431e8276c07e235d30c195946e9b09d1f3e12f28aea6f755b6d4c72008dd9
-DIST dovecot-1.0.rc31.tar.gz 1672213 RMD160 c4d3f1d3df231de8bea1bd2c148dbe7be154099d SHA1 cb753f8f2a8557f7481303e1428110004b36f525 SHA256 69161740558b13d388e97ab6ca4730b6ff420e51bdb9086d438b27e6119d094a
-DIST dovecot-1.0.rc32.tar.gz 1672650 RMD160 0d2acfcf5f33633d182f0a2e2c81b88321de980b SHA1 a8779ef4e98d3799ccab3890448a46b216abe638 SHA256 c7ce6b71892dad8d86c723c854397bb3ed623f04fb2766484648acff7f7ff973
 DIST dovecot-sieve-1.0.1.tar.gz 444126 RMD160 9b4a2a3be52b6dfcd3164d82a7139b8ab1a820f9 SHA1 26d0ae0550c1b2641b7cb369ade132c73fb9362e SHA256 59f16c23a73b36ff973a8388b601cc2f6408e0a6ae4f882c4adb830e72f3ac66
 DIST dovecot-sieve-1.0.tar.gz 442943 RMD160 b56f5a7391607125184755b9bbcbe749e79e26d4 SHA1 6d151c4140e0cf89e3d771fb32b5da065dbbed24 SHA256 c1ce887c1c6e09d9d1b4af6825db5c50befb10c1fed742a6666a12ac9492d98a
-EBUILD dovecot-1.0.0.ebuild 6262 RMD160 c57f533cd6a64db5d6d0b6a76ba70d600da0d897 SHA1 1abd939c6d03b51a1ffc42b7ae79965ce747aa2f SHA256 442fc62315b67d1f84383e3dfa1ae9647b5bbe06e129cd9acc1ded1ce4b1f93f
-MD5 a7d835c4324ebccf7aefd7cfaee8b9a7 dovecot-1.0.0.ebuild 6262
-RMD160 c57f533cd6a64db5d6d0b6a76ba70d600da0d897 dovecot-1.0.0.ebuild 6262
-SHA256 442fc62315b67d1f84383e3dfa1ae9647b5bbe06e129cd9acc1ded1ce4b1f93f dovecot-1.0.0.ebuild 6262
-EBUILD dovecot-1.0.1.ebuild 6266 RMD160 fdcd27950d1c46e56cb8f665e910185375893fbf SHA1 e5b8cf9cf32bbddd2b0c2a0b622efb40831faa11 SHA256 a45d274dfea32d236f5ebdd086bf0cf2d1df7784827d27100f175c53220acf63
-MD5 480912dfbc4395f409176dc873c326cc dovecot-1.0.1.ebuild 6266
-RMD160 fdcd27950d1c46e56cb8f665e910185375893fbf dovecot-1.0.1.ebuild 6266
-SHA256 a45d274dfea32d236f5ebdd086bf0cf2d1df7784827d27100f175c53220acf63 dovecot-1.0.1.ebuild 6266
 EBUILD dovecot-1.0.2-r1.ebuild 6270 RMD160 2c2d99e5f0934db044df4272d5d5c33c50140cb0 SHA1 5dc99814130f9a1f0b32f74dbba647ebb886707b SHA256 cb4b971336ef906f75cd63a347068e7fc318ad3e6615b954280875798eb1c846
 MD5 7897c5fbdd3885a6fe9ed538894012da dovecot-1.0.2-r1.ebuild 6270
 RMD160 2c2d99e5f0934db044df4272d5d5c33c50140cb0 dovecot-1.0.2-r1.ebuild 6270
 SHA256 cb4b971336ef906f75cd63a347068e7fc318ad3e6615b954280875798eb1c846 dovecot-1.0.2-r1.ebuild 6270
-EBUILD dovecot-1.0.2.ebuild 6266 RMD160 45db1d47d37afaafc8a25ad298eb0da9a58dc020 SHA1 38884d70d9112b34c1d7cf1e460e41390e7442ab SHA256 162dd3998b5ab03266c2b89e043850d92a503999032be20212d380f431457de5
-MD5 123635ae9e64e31d2df3a2e979710124 dovecot-1.0.2.ebuild 6266
-RMD160 45db1d47d37afaafc8a25ad298eb0da9a58dc020 dovecot-1.0.2.ebuild 6266
-SHA256 162dd3998b5ab03266c2b89e043850d92a503999032be20212d380f431457de5 dovecot-1.0.2.ebuild 6266
 EBUILD dovecot-1.0_rc29-r1.ebuild 6266 RMD160 f1f275d0821552004ed83a0f4f9cbb856b0acdf4 SHA1 327a6d22d651245816255befba667e97abbc205b SHA256 75ced0779df129d61be2f1ce400da854fb308fe6bf6a422185569b65dfe04dff
 MD5 e1f9ca63430cc339da47f65e04f06c8c dovecot-1.0_rc29-r1.ebuild 6266
 RMD160 f1f275d0821552004ed83a0f4f9cbb856b0acdf4 dovecot-1.0_rc29-r1.ebuild 6266
 SHA256 75ced0779df129d61be2f1ce400da854fb308fe6bf6a422185569b65dfe04dff dovecot-1.0_rc29-r1.ebuild 6266
-EBUILD dovecot-1.0_rc29.ebuild 6260 RMD160 3520000f27089826b1ed5c25372a60063e3bdc45 SHA1 d86fd100f7b8098e4446fb8cff8a53da5efb559c SHA256 72beb4436be4620f4c238cf89b5b847e87c497811bce35dded03526100aee21b
-MD5 83f15ea60f3620e03f96ad3bb2ff1d06 dovecot-1.0_rc29.ebuild 6260
-RMD160 3520000f27089826b1ed5c25372a60063e3bdc45 dovecot-1.0_rc29.ebuild 6260
-SHA256 72beb4436be4620f4c238cf89b5b847e87c497811bce35dded03526100aee21b dovecot-1.0_rc29.ebuild 6260
-EBUILD dovecot-1.0_rc31-r1.ebuild 6349 RMD160 ec9b6300a7960e17cbe59493f87fc019bde57705 SHA1 242e332641ab723aff3bc3186b7a2949673e8854 SHA256 0f5fa30a9b66caed49f3a5f22aade89733b6ab951121146b041f55f82fd80efc
-MD5 19a4cb887f5bcd52c7e5739e82904e9a dovecot-1.0_rc31-r1.ebuild 6349
-RMD160 ec9b6300a7960e17cbe59493f87fc019bde57705 dovecot-1.0_rc31-r1.ebuild 6349
-SHA256 0f5fa30a9b66caed49f3a5f22aade89733b6ab951121146b041f55f82fd80efc dovecot-1.0_rc31-r1.ebuild 6349
-EBUILD dovecot-1.0_rc31.ebuild 6265 RMD160 e831e5f222e6168efe76afc54e9c54b9f50dc837 SHA1 48237ce9d996a1f0ab6e1c4602e53665cecbabd3 SHA256 71d89fa0da28182e73353fc1dcd55b9cda982f24fad7fb18cc976acf95afa784
-MD5 9afa5f952ac063dbaf0ebe0ca404e2da dovecot-1.0_rc31.ebuild 6265
-RMD160 e831e5f222e6168efe76afc54e9c54b9f50dc837 dovecot-1.0_rc31.ebuild 6265
-SHA256 71d89fa0da28182e73353fc1dcd55b9cda982f24fad7fb18cc976acf95afa784 dovecot-1.0_rc31.ebuild 6265
-EBUILD dovecot-1.0_rc32.ebuild 6265 RMD160 8338307640e25eb3e254d1525a07e0a788ac5573 SHA1 1a39e1632673950e73bf7577a3f7ced59c7460c8 SHA256 e207589652837a5eda42dd60f5c366696935e61c3724d61fe550aef8483e0190
-MD5 e0cfab6ff8dc16d7a0e3e13e01c6fad2 dovecot-1.0_rc32.ebuild 6265
-RMD160 8338307640e25eb3e254d1525a07e0a788ac5573 dovecot-1.0_rc32.ebuild 6265
-SHA256 e207589652837a5eda42dd60f5c366696935e61c3724d61fe550aef8483e0190 dovecot-1.0_rc32.ebuild 6265
 MISC ChangeLog 18449 RMD160 e9b99e3d999039150f84b268d77d3b575924bcb2 SHA1 18aceea03fcfa958450d7f29d23f3b777f741221 SHA256 c118ab931f6a515dbcdedb185b2ddc7cbe3088bfab918ad5c1b2887091c1c986
 MD5 8c55417b24b267501854ba1fa79a1362 ChangeLog 18449
 RMD160 e9b99e3d999039150f84b268d77d3b575924bcb2 ChangeLog 18449
@@ -58,30 +22,9 @@ MISC metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 SHA1 57de8
 MD5 b6ff89c08602229bdd234da83a89df77 metadata.xml 252
 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 metadata.xml 252
 SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66 metadata.xml 252
-MD5 88a242bc0bdea4861b8f1aabbfe7a692 files/digest-dovecot-1.0.0 497
-RMD160 639845301ec57ad7b92fdd5fdd0fd187fd0fe99b files/digest-dovecot-1.0.0 497
-SHA256 9d209d2f7604ff73c65eae7a327f41b7509b2369cc8ef611466725f9a1d1b4fa files/digest-dovecot-1.0.0 497
-MD5 84deaed3f14727debd9bbebcdd5f777b files/digest-dovecot-1.0.1 503
-RMD160 3996197b789f8c460b387a202c93807d9bab63a8 files/digest-dovecot-1.0.1 503
-SHA256 2c6d813899c6e70a20b1f4d07f037fb5fce58b6fd6f9c5e0a89317a9958965a3 files/digest-dovecot-1.0.1 503
-MD5 2b7efa49fbc4b2ff6922cd9a64173f18 files/digest-dovecot-1.0.2 503
-RMD160 37a061aeb6505a1999cf1141c3c429422efc6a85 files/digest-dovecot-1.0.2 503
-SHA256 11877723c01b280ffc0fa88fef3a86cb3bbe657f7023428184770fe79fb47509 files/digest-dovecot-1.0.2 503
 MD5 2b7efa49fbc4b2ff6922cd9a64173f18 files/digest-dovecot-1.0.2-r1 503
 RMD160 37a061aeb6505a1999cf1141c3c429422efc6a85 files/digest-dovecot-1.0.2-r1 503
 SHA256 11877723c01b280ffc0fa88fef3a86cb3bbe657f7023428184770fe79fb47509 files/digest-dovecot-1.0.2-r1 503
-MD5 3a2a6879891be58fc76cb6ec2fae1b5b files/digest-dovecot-1.0_rc29 506
-RMD160 10b492542da124a42a5ed44384e3bddb1f3a5885 files/digest-dovecot-1.0_rc29 506
-SHA256 e105494181591e87387643dd71988f2fb78c143a18d6826139693bb18e8aa438 files/digest-dovecot-1.0_rc29 506
 MD5 3a2a6879891be58fc76cb6ec2fae1b5b files/digest-dovecot-1.0_rc29-r1 506
 RMD160 10b492542da124a42a5ed44384e3bddb1f3a5885 files/digest-dovecot-1.0_rc29-r1 506
 SHA256 e105494181591e87387643dd71988f2fb78c143a18d6826139693bb18e8aa438 files/digest-dovecot-1.0_rc29-r1 506
-MD5 e846f87a9516661b9f6b23ba58608d08 files/digest-dovecot-1.0_rc31 506
-RMD160 f7710198d350bf5da2e241adec708b2c9ac3c4e6 files/digest-dovecot-1.0_rc31 506
-SHA256 cb93de608a72203adb454f274c996d804e4ce0f035b04d02f40c88398d4b8ad0 files/digest-dovecot-1.0_rc31 506
-MD5 e846f87a9516661b9f6b23ba58608d08 files/digest-dovecot-1.0_rc31-r1 506
-RMD160 f7710198d350bf5da2e241adec708b2c9ac3c4e6 files/digest-dovecot-1.0_rc31-r1 506
-SHA256 cb93de608a72203adb454f274c996d804e4ce0f035b04d02f40c88398d4b8ad0 files/digest-dovecot-1.0_rc31-r1 506
-MD5 2a381aaa8c20d05cfebfb40883231e85 files/digest-dovecot-1.0_rc32 506
-RMD160 0a295b8431e2942af57b6ea2b40cb649bfb4261d files/digest-dovecot-1.0_rc32 506
-SHA256 65eb459595be4caa6162cd4828d0111578904f0e9903eb4c82eed0be7b0a7637 files/digest-dovecot-1.0_rc32 506
diff --git a/net-mail/dovecot/dovecot-1.0.0.ebuild b/net-mail/dovecot/dovecot-1.0.0.ebuild
deleted file mode 100644
index aa41ab433f67..000000000000
--- a/net-mail/dovecot/dovecot-1.0.0.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.0.ebuild,v 1.2 2007/06/12 12:17:55 genone 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
-
-	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
-		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
-		elog
-		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
-}
-
-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.1.ebuild b/net-mail/dovecot/dovecot-1.0.1.ebuild
deleted file mode 100644
index 43c3d72e42bb..000000000000
--- a/net-mail/dovecot/dovecot-1.0.1.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.1.ebuild,v 1.2 2007/06/28 10:48:20 uberlord Exp $
-
-inherit autotools eutils ssl-cert
-
-MY_P="${P/_/.}"
-S="${WORKDIR}/${MY_P}"
-SIEVE="dovecot-sieve-1.0.1"
-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
-
-	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
-		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
-		elog
-		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
-}
-
-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.2.ebuild b/net-mail/dovecot/dovecot-1.0.2.ebuild
deleted file mode 100644
index 3808c167cbfb..000000000000
--- a/net-mail/dovecot/dovecot-1.0.2.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.2.ebuild,v 1.1 2007/07/15 19:17:07 uberlord Exp $
-
-inherit autotools eutils ssl-cert
-
-MY_P="${P/_/.}"
-S="${WORKDIR}/${MY_P}"
-SIEVE="dovecot-sieve-1.0.1"
-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
-
-	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
-		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
-		elog
-		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
-}
-
-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_rc29.ebuild b/net-mail/dovecot/dovecot-1.0_rc29.ebuild
deleted file mode 100644
index 012dc0efeb29..000000000000
--- a/net-mail/dovecot/dovecot-1.0_rc29.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_rc29.ebuild,v 1.7 2007/06/12 12:17:55 genone 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
-
-	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
-		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
-		elog
-		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
-}
-
-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_rc31-r1.ebuild b/net-mail/dovecot/dovecot-1.0_rc31-r1.ebuild
deleted file mode 100644
index 8603be2b1c32..000000000000
--- a/net-mail/dovecot/dovecot-1.0_rc31-r1.ebuild
+++ /dev/null
@@ -1,212 +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_rc31-r1.ebuild,v 1.2 2007/06/12 12:17:55 genone 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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-ldap.patch
-}
-
-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
-
-	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
-		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
-		elog
-		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
-}
-
-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_rc31.ebuild b/net-mail/dovecot/dovecot-1.0_rc31.ebuild
deleted file mode 100644
index 04618f9f14da..000000000000
--- a/net-mail/dovecot/dovecot-1.0_rc31.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_rc31.ebuild,v 1.2 2007/06/12 12:17:55 genone 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
-
-	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
-		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
-		elog
-		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
-}
-
-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_rc32.ebuild b/net-mail/dovecot/dovecot-1.0_rc32.ebuild
deleted file mode 100644
index c5bdae713568..000000000000
--- a/net-mail/dovecot/dovecot-1.0_rc32.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_rc32.ebuild,v 1.2 2007/06/12 12:17:55 genone 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
-
-	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
-		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
-		elog
-		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
-}
-
-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.0 b/net-mail/dovecot/files/digest-dovecot-1.0.0
deleted file mode 100644
index bbcf178c2e18..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0.0
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 65ccc71e66c495c536d8fb8a7ae39bb3 dovecot-1.0.0.tar.gz 1674299
-RMD160 e750eb726fc7cf04d8dbd97604f01aa5ce4e3d19 dovecot-1.0.0.tar.gz 1674299
-SHA256 414ef7893f6c831f9248fb4bda2e127661948820da543620f6effd6b8a008f5f dovecot-1.0.0.tar.gz 1674299
-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.1 b/net-mail/dovecot/files/digest-dovecot-1.0.1
deleted file mode 100644
index 851a4d1dca28..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 0878f744382417fce09d83f5b1c14030 dovecot-1.0.1.tar.gz 1739087
-RMD160 99fb3c7f69d7518d0fff3cc8245860c8731d1414 dovecot-1.0.1.tar.gz 1739087
-SHA256 463220ff14fac3807964e669082a24271a872b7de445f38325de5317037cde0d dovecot-1.0.1.tar.gz 1739087
-MD5 b070d2177009bb555cd7e25c710047d5 dovecot-sieve-1.0.1.tar.gz 444126
-RMD160 9b4a2a3be52b6dfcd3164d82a7139b8ab1a820f9 dovecot-sieve-1.0.1.tar.gz 444126
-SHA256 59f16c23a73b36ff973a8388b601cc2f6408e0a6ae4f882c4adb830e72f3ac66 dovecot-sieve-1.0.1.tar.gz 444126
diff --git a/net-mail/dovecot/files/digest-dovecot-1.0.2 b/net-mail/dovecot/files/digest-dovecot-1.0.2
deleted file mode 100644
index f7f5c8205b0e..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0.2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 769f0dd2750e7de521de3396999a09e5 dovecot-1.0.2.tar.gz 1768818
-RMD160 0633225e510d1dd72306ff00003f065de25e09c5 dovecot-1.0.2.tar.gz 1768818
-SHA256 d3335076c104eaa08dd01a02db94443790998870a433da5720a8dc79b83c6a03 dovecot-1.0.2.tar.gz 1768818
-MD5 b070d2177009bb555cd7e25c710047d5 dovecot-sieve-1.0.1.tar.gz 444126
-RMD160 9b4a2a3be52b6dfcd3164d82a7139b8ab1a820f9 dovecot-sieve-1.0.1.tar.gz 444126
-SHA256 59f16c23a73b36ff973a8388b601cc2f6408e0a6ae4f882c4adb830e72f3ac66 dovecot-sieve-1.0.1.tar.gz 444126
diff --git a/net-mail/dovecot/files/digest-dovecot-1.0_rc29 b/net-mail/dovecot/files/digest-dovecot-1.0_rc29
deleted file mode 100644
index b6e35ba585b9..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0_rc29
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 4b5ab65d59474c8e783ad6bd496fff22 dovecot-1.0.rc29.tar.gz 1670673
-RMD160 b09da68a67e951bf019ab077bf17ebbfd7e729a2 dovecot-1.0.rc29.tar.gz 1670673
-SHA256 6b8431e8276c07e235d30c195946e9b09d1f3e12f28aea6f755b6d4c72008dd9 dovecot-1.0.rc29.tar.gz 1670673
-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_rc31 b/net-mail/dovecot/files/digest-dovecot-1.0_rc31
deleted file mode 100644
index 8938b85ddd51..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0_rc31
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 246b74f72bc710b3348307955de29292 dovecot-1.0.rc31.tar.gz 1672213
-RMD160 c4d3f1d3df231de8bea1bd2c148dbe7be154099d dovecot-1.0.rc31.tar.gz 1672213
-SHA256 69161740558b13d388e97ab6ca4730b6ff420e51bdb9086d438b27e6119d094a dovecot-1.0.rc31.tar.gz 1672213
-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_rc31-r1 b/net-mail/dovecot/files/digest-dovecot-1.0_rc31-r1
deleted file mode 100644
index 8938b85ddd51..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0_rc31-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 246b74f72bc710b3348307955de29292 dovecot-1.0.rc31.tar.gz 1672213
-RMD160 c4d3f1d3df231de8bea1bd2c148dbe7be154099d dovecot-1.0.rc31.tar.gz 1672213
-SHA256 69161740558b13d388e97ab6ca4730b6ff420e51bdb9086d438b27e6119d094a dovecot-1.0.rc31.tar.gz 1672213
-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_rc32 b/net-mail/dovecot/files/digest-dovecot-1.0_rc32
deleted file mode 100644
index 4baa9c16969f..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0_rc32
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e74f9ff5d1349c0ee8cfafffbe5d45c7 dovecot-1.0.rc32.tar.gz 1672650
-RMD160 0d2acfcf5f33633d182f0a2e2c81b88321de980b dovecot-1.0.rc32.tar.gz 1672650
-SHA256 c7ce6b71892dad8d86c723c854397bb3ed623f04fb2766484648acff7f7ff973 dovecot-1.0.rc32.tar.gz 1672650
-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/dovecot-1.0_rc31-ldap.patch b/net-mail/dovecot/files/dovecot-1.0_rc31-ldap.patch
deleted file mode 100644
index f3eb41a161e0..000000000000
--- a/net-mail/dovecot/files/dovecot-1.0_rc31-ldap.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur dovecot-1.0.rc29/src/auth/db-ldap.h dovecot-1.0.rc29/src/auth/db-ldap.h
---- dovecot-1.0.rc29/src/auth/db-ldap.h	2007-01-19 15:15:13.000000000 +0000
-+++ dovecot-1.0.rc29/src/auth/db-ldap.h	2007-04-12 09:29:06.000000000 +0100
-@@ -1,6 +1,10 @@
- #ifndef __DB_LDAP_H
- #define __DB_LDAP_H
- 
-+/* Functions like ldap_bind have been deprecated in openldap 2.3
-+ * This define enables them until the code here can be refactored */
-+#define LDAP_DEPRECATED 1
-+
- #include <ldap.h>
- 
- struct auth_request;