From: Roy Marples <uberlord@gentoo.org>
Date: Sun, 11 Feb 2007 11:07:58 +0000 (+0000)
Subject: Punt old versions.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=95a1c7b08788eaa2f15610994210b3612f7abb08;p=gentoo.git

Punt old versions.
Package-Manager: portage-2.1.2-r9
---

diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index a70b608b47c9..09d5592a76ba 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -2,42 +2,13 @@ AUX dovecot.init 878 RMD160 32906bdbf40221017c4f39a7ca0e3fa97070b9ab SHA1 f31c14
 MD5 6d3e44da73ef66d20b42a5fad49731f0 files/dovecot.init 878
 RMD160 32906bdbf40221017c4f39a7ca0e3fa97070b9ab files/dovecot.init 878
 SHA256 1bd24e14af5536828d3e232186d5ae68d3e394da3324c660fa1e658b4ae3b413 files/dovecot.init 878
-DIST dovecot-1.0.beta8.tar.gz 1392106 RMD160 101a7011467691ba5f4a6f48e21d6d1dc5626c16 SHA1 fedd38c29a2bc396df386636ed5d8b65ecab0ff6 SHA256 b43bb6ea5426b0d78ae260b53be035d1b5371b76a342870b2d56a6aba1ad82d2
 DIST dovecot-1.0.rc15.tar.gz 1463069 RMD160 904ef7d1f0fbfe8055f13d9036f7107f498b522e SHA1 9b618d0c1562aa64bd1e055ffa9fe5f2412514af SHA256 e1e42e5c808301c5a709d54c5949cd8c1d3c43861e4e918548ded5841865487f
-DIST dovecot-1.0.rc16.tar.gz 1512299 RMD160 651988039a20cb84f65e3e840d50d8357d9d6216 SHA1 b98095cf13364f44ee5844596652d69699f02408 SHA256 009a8065a1816d0ac6661e4a5775258a4b92d859445c21a8c6973036fa12eaed
-DIST dovecot-1.0.rc17.tar.gz 1512386 RMD160 de91fe34a837fafb5e8abbb1cc652c7ba849b210 SHA1 f1e6e3c73e2431582919fd174b2c1f64f39dce46 SHA256 fa3ea565758e2426a88ab7912c8afcc0f930bad344c3fba50133ac4513d75b4f
-DIST dovecot-1.0.rc19.tar.gz 1498105 RMD160 feb9e5927ab2c651273c9aaec1727b894a5a6e17 SHA1 c9c41ed83c775e8eecc40fe13bab135261383b82 SHA256 e8c616f7b41cbe1ee83f6c9027b34daa4c487c9919678a1fed3a66b230f59998
-DIST dovecot-1.0.rc21.tar.gz 1500380 RMD160 58193d387acde95d1bec5fcfa18d4c767c207788 SHA1 efe6c70af07b8792f16a578ee855deb31ecef4d6 SHA256 74a4c73d7500217eb239208ac2f368d223f67251eb9dce9ee0e80efa8d713f93
 DIST dovecot-1.0.rc22.tar.gz 1501122 RMD160 e0fdb65d668f5fdaedd10d4359bd2bf3e42728d2 SHA1 966d5f1e251f63f21633666e6a65402e4129fc22 SHA256 ad93b4b1376c24f60eceb790f1ab162a99d1315920a8da802c08b0b73719470f
 DIST dovecot-sieve-1.0.tar.gz 442943 RMD160 b56f5a7391607125184755b9bbcbe749e79e26d4 SHA1 6d151c4140e0cf89e3d771fb32b5da065dbbed24 SHA256 c1ce887c1c6e09d9d1b4af6825db5c50befb10c1fed742a6666a12ac9492d98a
-EBUILD dovecot-1.0_beta8.ebuild 4639 RMD160 3e1f5b8b75852f638cbc42e20b2ff0026863d2bd SHA1 56114bbef706eaa2fd0c963fb1243b8e4ef23e1d SHA256 4e5e3c289bae8a357a7e4a3d28e66366fd826930c267fa0886e55349c92d5ca5
-MD5 1b880922f7ce43f9760259d90da652df dovecot-1.0_beta8.ebuild 4639
-RMD160 3e1f5b8b75852f638cbc42e20b2ff0026863d2bd dovecot-1.0_beta8.ebuild 4639
-SHA256 4e5e3c289bae8a357a7e4a3d28e66366fd826930c267fa0886e55349c92d5ca5 dovecot-1.0_beta8.ebuild 4639
-EBUILD dovecot-1.0_rc15-r1.ebuild 5692 RMD160 58a16487eb02506709b1866c6d11f99bccce070d SHA1 b19324b96d1fa18d4d5af7dbb307e6af076f547a SHA256 611435d26dfd5f7ae66d2c2cc6d95a2ddd85ae72bdf734bfa1213297b0a7a43b
-MD5 233824764e858435ddaa2806f4dbcd7a dovecot-1.0_rc15-r1.ebuild 5692
-RMD160 58a16487eb02506709b1866c6d11f99bccce070d dovecot-1.0_rc15-r1.ebuild 5692
-SHA256 611435d26dfd5f7ae66d2c2cc6d95a2ddd85ae72bdf734bfa1213297b0a7a43b dovecot-1.0_rc15-r1.ebuild 5692
 EBUILD dovecot-1.0_rc15.ebuild 5318 RMD160 78a83e7c4b0016c07df28daedfd5beb0f588df85 SHA1 5cb08423188982d0befab9017e1004f7929cfc8d SHA256 347aacb737d18250e7a209678a94055d0b01c290cd778ad9607559b975665ab2
 MD5 61d0c3649db044745ecb0036357d9ee9 dovecot-1.0_rc15.ebuild 5318
 RMD160 78a83e7c4b0016c07df28daedfd5beb0f588df85 dovecot-1.0_rc15.ebuild 5318
 SHA256 347aacb737d18250e7a209678a94055d0b01c290cd778ad9607559b975665ab2 dovecot-1.0_rc15.ebuild 5318
-EBUILD dovecot-1.0_rc16.ebuild 5689 RMD160 61dbf78e03f4b6c47d0f1140a18e916744d6ddb1 SHA1 e66a4fb0527e5e99ca01ae83e1db1f2594aced84 SHA256 f4326361d84ab84b6afb4fe907b71cd55f6606ac2551050fd15b71c3dab9c187
-MD5 a596a1b95c83e1cc117c46e927131d29 dovecot-1.0_rc16.ebuild 5689
-RMD160 61dbf78e03f4b6c47d0f1140a18e916744d6ddb1 dovecot-1.0_rc16.ebuild 5689
-SHA256 f4326361d84ab84b6afb4fe907b71cd55f6606ac2551050fd15b71c3dab9c187 dovecot-1.0_rc16.ebuild 5689
-EBUILD dovecot-1.0_rc17.ebuild 6057 RMD160 393215c69a3050d4299d334f0dc5c5d7162b3630 SHA1 308682abce347745db13cab0a1a0188488533cc2 SHA256 ab0ed7789eeaaba6d1ce48a820bd556537e21f95fe9dcb82f846bd95c79c1d9c
-MD5 23be4b3c6c1002fcf31390ebea13f5e6 dovecot-1.0_rc17.ebuild 6057
-RMD160 393215c69a3050d4299d334f0dc5c5d7162b3630 dovecot-1.0_rc17.ebuild 6057
-SHA256 ab0ed7789eeaaba6d1ce48a820bd556537e21f95fe9dcb82f846bd95c79c1d9c dovecot-1.0_rc17.ebuild 6057
-EBUILD dovecot-1.0_rc19.ebuild 6055 RMD160 cc6ab771fb7c36dde3302b584177d15f4f72f1a9 SHA1 c517c69e870cf897092e8f5bf71652bb32525f81 SHA256 83aaba495bfc49b59ee970ca43af61209586ac3f934b172beacfc7384884c726
-MD5 57e11f9a88f52958c7dbbe26f571e3e5 dovecot-1.0_rc19.ebuild 6055
-RMD160 cc6ab771fb7c36dde3302b584177d15f4f72f1a9 dovecot-1.0_rc19.ebuild 6055
-SHA256 83aaba495bfc49b59ee970ca43af61209586ac3f934b172beacfc7384884c726 dovecot-1.0_rc19.ebuild 6055
-EBUILD dovecot-1.0_rc21.ebuild 6055 RMD160 49c2b4825f2646460491a4a389850134a182d785 SHA1 3865a0a07fad9616ff9bf1c41b17294b543012ec SHA256 f90429605a20b9072c04a8eebffa58ec20e7d0362a67dbe696525daa5eaf079c
-MD5 54d88c351ea4b45b4d749fcc3cc2c82d dovecot-1.0_rc21.ebuild 6055
-RMD160 49c2b4825f2646460491a4a389850134a182d785 dovecot-1.0_rc21.ebuild 6055
-SHA256 f90429605a20b9072c04a8eebffa58ec20e7d0362a67dbe696525daa5eaf079c dovecot-1.0_rc21.ebuild 6055
 EBUILD dovecot-1.0_rc22.ebuild 6055 RMD160 055261dd68c409ea45b92ed03e959798f62f5249 SHA1 45198d0b2462bf4a14ca1d50dcf4895275eefb27 SHA256 aa56105f25f9d1b255cdce0d0e6e73b12ef3d59155119de55731e14c6740fcac
 MD5 bcc05d268a43543d7d6a51877d2182a4 dovecot-1.0_rc22.ebuild 6055
 RMD160 055261dd68c409ea45b92ed03e959798f62f5249 dovecot-1.0_rc22.ebuild 6055
@@ -50,27 +21,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 630ceba3b8cb8ecda31605cf8682ea3c files/digest-dovecot-1.0_beta8 256
-RMD160 5c835e169f576f6c5f68d9aff62dfc34c3a9fc81 files/digest-dovecot-1.0_beta8 256
-SHA256 bdeba92a3fd4e386e383101a09a3b9ce315a5dd235e5b8008e10c2f54b74dc3d files/digest-dovecot-1.0_beta8 256
 MD5 2c27eb8bc7a2d4ac15db038e2c32f3dd files/digest-dovecot-1.0_rc15 253
 RMD160 0c75375b63a906552c7c31aabe46cf07c93492f0 files/digest-dovecot-1.0_rc15 253
 SHA256 0c0d306c2bac1ed1f287123160612db5f9c959afa54dac80c9db3794a258c197 files/digest-dovecot-1.0_rc15 253
-MD5 dfd530d267f0d2c0549038677ae6e206 files/digest-dovecot-1.0_rc15-r1 506
-RMD160 752dfdf30b526838d25c0984ba31e7db0ee78571 files/digest-dovecot-1.0_rc15-r1 506
-SHA256 2c37e8ac92eef87c3566ef0edb1fd771f8eeba68397b80e2833982c887344f61 files/digest-dovecot-1.0_rc15-r1 506
-MD5 b721359df5b54d9156b4d64a448acf92 files/digest-dovecot-1.0_rc16 506
-RMD160 786698a0555f01604a483a40d8a23947c661c5d3 files/digest-dovecot-1.0_rc16 506
-SHA256 df9107a06384a29adf8dfdd26b6a56271b2b33e75a029da4bdb4a50dbb7fbba4 files/digest-dovecot-1.0_rc16 506
-MD5 a6d71c5048fab54605eed6af708702f4 files/digest-dovecot-1.0_rc17 506
-RMD160 ff7944ce93c6cbb9edbea104dd1062984538fb6b files/digest-dovecot-1.0_rc17 506
-SHA256 a939b254d5fd784412777ec672d65cacb1011203cd08ffd4cfc6be18703f1a1d files/digest-dovecot-1.0_rc17 506
-MD5 161b41890deff42100a67fba74594460 files/digest-dovecot-1.0_rc19 506
-RMD160 37117030223d14485ac924262b0c49b591476aee files/digest-dovecot-1.0_rc19 506
-SHA256 bd1a48b9c7a49b57824ce0f4aba45759a0a12467e50cdca0310629c25645973f files/digest-dovecot-1.0_rc19 506
-MD5 385655b5094b79178c0e870aaa8912f8 files/digest-dovecot-1.0_rc21 506
-RMD160 8f4111eb8d69bb886bbefe01b5d04f60e134cb95 files/digest-dovecot-1.0_rc21 506
-SHA256 441db93240e31455dafa612c63ea4a338a4e505b0965e9d3d67cdf04f513bfe7 files/digest-dovecot-1.0_rc21 506
 MD5 b8762cd88a48fd4070cbeb8955a9b406 files/digest-dovecot-1.0_rc22 506
 RMD160 94472fc54274a8c7b753912e2bcde76aabdc56fa files/digest-dovecot-1.0_rc22 506
 SHA256 25cf39af4bb026088025f99b11429b1215802626137bd4192e41811eea6a95f8 files/digest-dovecot-1.0_rc22 506
diff --git a/net-mail/dovecot/dovecot-1.0_beta8.ebuild b/net-mail/dovecot/dovecot-1.0_beta8.ebuild
deleted file mode 100644
index 748288e829e6..000000000000
--- a/net-mail/dovecot/dovecot-1.0_beta8.ebuild
+++ /dev/null
@@ -1,157 +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_beta8.ebuild,v 1.7 2006/11/23 16:17:20 vivo Exp $
-
-inherit 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 ipv6 kerberos ldap mbox mysql pop3d pam postgres ssl vpopmail"
-
-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"
-
-#	Enable when linux-headers-2.6.13 hits portage for inotify
-#	or epoll gets more stable.
-#
-#	# Enable Linux only features
-#	if [[ ${KERNEL} == "linux" ]] ; then
-#		# epoll is too unstable
-#		# myconf="${myconf} --with-ioloop=epoll"
-#		if has_version ">=sys-kernel/linux-headers-2.6.13" ; then
-#			myconf="${myconf} --with-notify=inotify"
-#		fi
-#	fi
-
-	econf --localstatedir=/var \
-		$(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
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	mv "${D}"/etc/dovecot-example.conf "${D}"/etc/dovecot.conf
-
-	# .maildir is the Gentoo default, but we need to support mbox to
-	local mailenv="maildir:%h/.maildir"
-	if use mbox ; then
-		mailenv="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-		keepdir /var/dovecot
-		sed -i -e 's|#mail_extra_groups =|mail_extra_groups = mail|' \
-			"${D}"/etc/dovecot.conf
-	fi
-	sed -i -e \
-		"s|#default_mail_env =|default_mail_env = ${mailenv}|" \
-		"${D}"/etc/dovecot.conf
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam ; then
-		sed -i -e '/passdb pam/, /^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${D}"/etc/dovecot.conf
-	fi
-
-	# Listen on ipv6 and ipv4
-	if use ipv6 ; then
-		sed -i -e 's/^#listen = \*/listen = \[::\]/g' \
-			"${D}"/etc/dovecot.conf
-	fi
-
-	# Documentation
-	rm -rf "${D}"/usr/share/doc/dovecot
-	dodoc AUTHORS NEWS README TODO dovecot-example.conf
-	dodoc doc/*.txt doc/*.conf doc/*.cnf doc/mkcert.sh
-
-	# 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
-	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
-	fperms 0600 /etc/dovecot.conf
-}
-
-get_config_var() {
-	sed -n 's/^[[:space:]]\?base_dir[[:space:]]*="*\([^#"]\+\)"*/\1/p' \
-		/etc/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."
-
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${basedir:-/var/run/dovecot}"
-	if [[ ! -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_rc15-r1.ebuild b/net-mail/dovecot/dovecot-1.0_rc15-r1.ebuild
deleted file mode 100644
index a1fe433cd7bf..000000000000
--- a/net-mail/dovecot/dovecot-1.0_rc15-r1.ebuild
+++ /dev/null
@@ -1,194 +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-r1.ebuild,v 1.1 2006/12/05 15:05:51 uberlord Exp $
-
-inherit autotools eutils
-
-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"
-
-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
-
-	# 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
-
-	# 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() {
-	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_rc16.ebuild b/net-mail/dovecot/dovecot-1.0_rc16.ebuild
deleted file mode 100644
index e8df066a0831..000000000000
--- a/net-mail/dovecot/dovecot-1.0_rc16.ebuild
+++ /dev/null
@@ -1,194 +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_rc16.ebuild,v 1.1 2007/01/05 19:20:16 uberlord Exp $
-
-inherit autotools eutils
-
-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"
-
-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
-
-	# 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
-
-	# 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() {
-	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_rc17.ebuild b/net-mail/dovecot/dovecot-1.0_rc17.ebuild
deleted file mode 100644
index 68f4f05cc50c..000000000000
--- a/net-mail/dovecot/dovecot-1.0_rc17.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_rc17.ebuild,v 1.2 2007/01/08 14:52:05 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"
-
-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_rc19.ebuild b/net-mail/dovecot/dovecot-1.0_rc19.ebuild
deleted file mode 100644
index 5cd67ce0788f..000000000000
--- a/net-mail/dovecot/dovecot-1.0_rc19.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_rc19.ebuild,v 1.2 2007/01/30 18:47:41 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"
-
-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_rc21.ebuild b/net-mail/dovecot/dovecot-1.0_rc21.ebuild
deleted file mode 100644
index adc72e81bb99..000000000000
--- a/net-mail/dovecot/dovecot-1.0_rc21.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_rc21.ebuild,v 1.1 2007/02/02 15:51:39 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"
-
-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/files/digest-dovecot-1.0_beta8 b/net-mail/dovecot/files/digest-dovecot-1.0_beta8
deleted file mode 100644
index 32a641b1dce8..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0_beta8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6a87718a86ee1ae2334c75843dd9a7df dovecot-1.0.beta8.tar.gz 1392106
-RMD160 101a7011467691ba5f4a6f48e21d6d1dc5626c16 dovecot-1.0.beta8.tar.gz 1392106
-SHA256 b43bb6ea5426b0d78ae260b53be035d1b5371b76a342870b2d56a6aba1ad82d2 dovecot-1.0.beta8.tar.gz 1392106
diff --git a/net-mail/dovecot/files/digest-dovecot-1.0_rc15-r1 b/net-mail/dovecot/files/digest-dovecot-1.0_rc15-r1
deleted file mode 100644
index bb95af3a42de..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0_rc15-r1
+++ /dev/null
@@ -1,6 +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
-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_rc16 b/net-mail/dovecot/files/digest-dovecot-1.0_rc16
deleted file mode 100644
index 36c2b261d136..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0_rc16
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 0089b1ad8a8ba0afa4a7a0354bc63c6c dovecot-1.0.rc16.tar.gz 1512299
-RMD160 651988039a20cb84f65e3e840d50d8357d9d6216 dovecot-1.0.rc16.tar.gz 1512299
-SHA256 009a8065a1816d0ac6661e4a5775258a4b92d859445c21a8c6973036fa12eaed dovecot-1.0.rc16.tar.gz 1512299
-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_rc17 b/net-mail/dovecot/files/digest-dovecot-1.0_rc17
deleted file mode 100644
index dccc811cbd79..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0_rc17
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 881bcc7d2c8fba6d337f3e616a602bf7 dovecot-1.0.rc17.tar.gz 1512386
-RMD160 de91fe34a837fafb5e8abbb1cc652c7ba849b210 dovecot-1.0.rc17.tar.gz 1512386
-SHA256 fa3ea565758e2426a88ab7912c8afcc0f930bad344c3fba50133ac4513d75b4f dovecot-1.0.rc17.tar.gz 1512386
-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_rc19 b/net-mail/dovecot/files/digest-dovecot-1.0_rc19
deleted file mode 100644
index fbf2db06a174..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0_rc19
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 f2c1df951f3e9bd61aa51890ab158ab7 dovecot-1.0.rc19.tar.gz 1498105
-RMD160 feb9e5927ab2c651273c9aaec1727b894a5a6e17 dovecot-1.0.rc19.tar.gz 1498105
-SHA256 e8c616f7b41cbe1ee83f6c9027b34daa4c487c9919678a1fed3a66b230f59998 dovecot-1.0.rc19.tar.gz 1498105
-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_rc21 b/net-mail/dovecot/files/digest-dovecot-1.0_rc21
deleted file mode 100644
index 56627de127c9..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-1.0_rc21
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 b42be5947e641909918a863da3249951 dovecot-1.0.rc21.tar.gz 1500380
-RMD160 58193d387acde95d1bec5fcfa18d4c767c207788 dovecot-1.0.rc21.tar.gz 1500380
-SHA256 74a4c73d7500217eb239208ac2f368d223f67251eb9dce9ee0e80efa8d713f93 dovecot-1.0.rc21.tar.gz 1500380
-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