[gentoo-commits] repo/gentoo:master commit in: net-mail/dovecot/

[Eray Aslan]

commit:     82ef0434c0fd4fc22bfdbf481cf1658b90c1d245
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 14:32:59 2017 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 14:32:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82ef0434

net-mail/dovecot: remove vulnerable versions

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-mail/dovecot/Manifest                 |  12 --
 net-mail/dovecot/dovecot-2.2.19-r1.ebuild | 308 ------------------------------
 net-mail/dovecot/dovecot-2.2.21-r1.ebuild | 308 ------------------------------
 net-mail/dovecot/dovecot-2.2.21-r2.ebuild | 308 ------------------------------
 net-mail/dovecot/dovecot-2.2.21.ebuild    | 308 ------------------------------
 net-mail/dovecot/dovecot-2.2.22.ebuild    | 308 ------------------------------
 net-mail/dovecot/dovecot-2.2.23.ebuild    | 308 ------------------------------
 net-mail/dovecot/dovecot-2.2.24.ebuild    | 308 ------------------------------
 net-mail/dovecot/dovecot-2.2.25.ebuild    | 308 ------------------------------
 net-mail/dovecot/dovecot-2.2.26.0.ebuild  | 308 ------------------------------
 10 files changed, 2784 deletions(-)

diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index e1aab0a..f2785f5 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,16 +1,4 @@
-DIST dovecot-2.2-pigeonhole-0.4.10.tar.gz 1605634 SHA256 
e9dfe7160fd3b465d6d5068f219122626ef790cce507e290cd09852c7d90726f SHA512 
3e864727fc2bd346a7212135a3dd8759f9a5c27abd938c4d6b805c784c5c2c5aa401dd49cfa90951348a00202b85f91d86a2fa17ccab9a983a6faf2d0add48e8
 WHIRLPOOL 
d97cb3111a8de17bcaf3c2cba63063bd45cee7578f826a14441d4568154bcd3520f4d43354411247c8a4ed168c01181718689cb94cb6ae9a15cfb705d7c9c2fd
-DIST dovecot-2.2-pigeonhole-0.4.11.tar.gz 1660922 SHA256 
5168b4ac4e173b563dd71f4024452da5a578aa8d5d047d98903489ab4d84ad72 SHA512 
c01b23e90431da8c57f8e384d52bee0a608ce5de5a2e8cc304ab482b17473d637126704d549fbd3bc1ffffdeb41eff94e2587d1e6707a9249c15fff65631814d
 WHIRLPOOL 
d901c2b9e4fa2d7b59d77fae42beb42e51d12999a937979aed6b6b705238d2a3d8fad4243f3bee7bbe954e4c033861d9d5f731a9793899d211842627e71009a0
-DIST dovecot-2.2-pigeonhole-0.4.12.tar.gz 1681327 SHA256 
98a2fd79b0d9effd08c0caf04d483b1caa5e4503dae811e6d436948557bfb702 SHA512 
68b2bcc8bd2a8c039ff116a441ff8795917b280f89ad60819638d5903010611bbd5966567d0d33ae305f9ae4db9f6756b2a72ccd8305124cfe846d64bbdd08c5
 WHIRLPOOL 
7e5bca584219ed2c9dbfe7056c137ced7a1a56cfa7eb6940fa882d3683ef67ec103e9cf5788f0869175c5d4bf4804fb979951836f70755d4752af441d50afbbc
-DIST dovecot-2.2-pigeonhole-0.4.13.tar.gz 1706253 SHA256 
7fd187b8393a5048b302f90ad84adc7bf6e73bf79fd8d22a1c1aaa71f836a910 SHA512 
4e25a406b888fd8cbc9a4f4f7a7364f10ab47e932550970cede34c964d50a6fe697c4b6d61cc83846b97901368ac63d1e22aa4d1d2002f24540766c5fbbebbf5
 WHIRLPOOL 
4669079c5f6c727b2436b86c506984dc17a07851a3d95a8a9b00e30c1bf48da7438cc6376d710676258b7898b6fac4b9c38eee7f13c67933321e327ccf25e14b
-DIST dovecot-2.2-pigeonhole-0.4.14.tar.gz 1752101 SHA256 
dff30a636c1516158f3e159c669a254569c9dabaa6ecfa3669379101ea5b3300 SHA512 
97e72a3046a5975d416e49a900a9d801224c6de944aea4fd80b0e9c571af68d4e11c4a152ab6048abd9867a31eb4d8e3e648165489fb4a2b57a9a2929760247e
 WHIRLPOOL 
2456faed24117f8fcb93f924617462756c8eac0312e450e2671e6a11cfed2a52fdc8d23954c28399b46632b1959f1eb733825a43042895d4da2bf9d81b7f60d5
-DIST dovecot-2.2-pigeonhole-0.4.15.tar.gz 1755980 SHA256 
c99ace6ead310c6c3b639922da618f90d846307da4fe252d994e5e51bf8a3de3 SHA512 
bd590a95029801251ff3c76b38b6ddfc25446b82937217dc4ea421075c7b651ae0356b088403d5ad9bb87bc86817d727faccaf4e2500bfd46a242d331fc252f5
 WHIRLPOOL 
6dd3371a82a35b540a0db5dc0af286c05b5a56e9ae24ad24b7cf7c6aa46e86958645283281ef1f2dd0db6d8e8b2b3ccd34ec70e592f6b50bcda40e04ef9f6e76
 DIST dovecot-2.2-pigeonhole-0.4.16.tar.gz 1713634 SHA256 
8f0b98f18062d6e241eef74ebe16cc167cd246361cbe6657d94f0ecc5d7d3234 SHA512 
5f59fb35dbe638f8ddd19c0fd0f3fbd6fec1fa238f3781b94c50a8f7ce72a53ac1381a6f8ad9bcc90df1edfa2b263a6dfba88521578e55ce4b3d840bed022b79
 WHIRLPOOL 
5e037d1e271b9c12a111966306c30536035126e9ba1213697804614d8a3d38996b117b37a744cb5b97873e136bddf110177c501d46c5ce0ffd2110932b911f00
 DIST dovecot-2.2-pigeonhole-0.4.9.tar.gz 1577127 SHA256 
82892f876d26008a076973dfddf1cffaf5a0451825fd44e06287e94b89078649 SHA512 
9e7a18b43d59ed955b142d16696ca221822a547ea59ac70c1bb374eedb28b6ed99ea49f34ead1f9a16ded4573605e410a5cc8e038e1bdf5f943a65588b5d3af2
 WHIRLPOOL 
be309436b43af82a7cb8eff205e1638b2c59751927fdab187e6fde72330e4abd99878cbfa94ca50440ec8de1f9b569bf334d426891ddc73d5f647ee2040c193f
 DIST dovecot-2.2.19.tar.gz 5256627 SHA256 
759e1e3f9d907cdaabad1f5fbacc793ca191d234c084bec3bba42966952a4e9f SHA512 
1b9d605a6a5862ade9d1ca634a9e0171b7c212ab025fc2059051c3795470685b66516fa9fbe5ad91d84388268ea15795f2dcd70ffdf81736ce4d80fd284835e9
 WHIRLPOOL 
30dbe70bfeef10dbe414ebf3f091041ad66926a8748cd401ecaf9ed5c7602939e86943d98bfb839f32c0aa1d0081ab71adacf23bb4adba34e828ee296e9a7278
-DIST dovecot-2.2.21.tar.gz 4985686 SHA256 
7ab7139e59e1f0353bf9c24251f13c893cf1a6ef4bcc47e2d44de437108d0b20 SHA512 
0d246d44e0c908ea40d324982fb279b19424ddcb642e51796078f600fc5bf530898d2fa387fcfd971d43758cff22590e5ea6918c31e9f4a63f13a8c525a23d9b
 WHIRLPOOL 
242026e876a12b9ecd50a76849cb16161f625791bc9d1a54270f38f24e66bc31b6ddf90acf119af2bd4c94e392c875a0c29be08b84a5f25d080a7e1b13d52175
-DIST dovecot-2.2.22.tar.gz 5318023 SHA256 
c7a9db3c4ae9d9b4da920d2c82669700a0d407934501b405f37f89cc0b706ec7 SHA512 
ea02ae491e90c0b9de7c7320901c8f7235193303fb194805564582d30e630002f21f7195e5c5b99ff3ea1fadf95ddd43c2f7bb4d24067e0e5f40a66e9eb90012
 WHIRLPOOL 
c03ac91b79e7bb2f42027a3da653d4a4fac857d52e50f8439ec25e80ff4ba716e64c8b7015b6bf70e099aa9afdfe775748920ab4a5865051cbf48da588e2f9a2
-DIST dovecot-2.2.23.tar.gz 5291365 SHA256 
5d834be43fe8f6f61d9b0fb139bf1db2a4da313aeebd7bf09e4bf6bcb1c9e441 SHA512 
704d86dcef8b217a54db1d1ae3c1e0d6303827fedd7150aec83e805512cd1c5befc88da44660e7a40765ad6800c14d399f8c7621e84125a7732d68fee7f18d82
 WHIRLPOOL 
eda6fb007ac07f70a6120d74deae80248f87fffe33ffae49f636b6506c4e8097ad6e4818e5f88446362d8fcd89ea3b8dcc58a2c67eb12d0a556bca3021e51153
-DIST dovecot-2.2.24.tar.gz 5345872 SHA256 
71c86891ea8deb5703d3dbbc3ea31ce2cbf7638f1aa395d9e8794d3ff7aebeb7 SHA512 
90d98996e75353ae631c1e2da2520cc340928f427276c757316714892d7b281745284bf4cb30459eecdb9c96b7d9450eb6801e002e6acafc8669deb2b5e65a81
 WHIRLPOOL 
ba071f8759df50082a40231dd8e883d001ff280f962ddbb4bc894447ac1215b79403d702feb3327e9f9a8d68c1227e0649c823f86916531f30c2c5c084cc5029
-DIST dovecot-2.2.25.tar.gz 5576235 SHA256 
d8d9f32c846397f7c22749a84c5cf6f59c55ff7ded3dc9f07749a255182f9667 SHA512 
b38d815a727723dbeccf844be4bf05509fc4808ac1a25ba482da7ca25f30c5c57107b6064791326b39aa80bd45b61043266b451ee33ece3521bdbffca57fdecf
 WHIRLPOOL 
0017a53628ee7138bcbf10270239d8bfc4abf09d69b7c98006e266319d40d9d5223a922a694c275ebc4188314f05caae9e5f0a475d35d516aa5e5a2dd5a6838c
-DIST dovecot-2.2.26.0.tar.gz 5687576 SHA256 
f692a1f39de36cd15f6681f7fee5fba2ef3e72b529acbee02b23422e16926f05 SHA512 
7b4c170efd964eabbd9a0166164e53b7964b90fc245bab1c3328bf199c4880288c89811dcfd9833f899057921eefb4451c561f3b3d725df9ea346df8fde82a3d
 WHIRLPOOL 
a55359e7cd38987dd062c430ddbd93d1ea15ad3cb33f73fd95fb9c02e2664f791827c085f5cf3f9258ca7cc22c920899d15d51e4175ecdff4fdc4a86c7bc5844
 DIST dovecot-2.2.27.tar.gz 5794668 SHA256 
897f92a87cda4b27b243f8149ce0ba7b7e71a2be8fb7994eb0a025e54cde18e9 SHA512 
faab441bb2afa1e6de3e6ec6207c92a333773941bbc10c4761483ef6ccc193d3a4983de1acc73325122c22b197ea25c1e54886cccfb6b060ede90936a69b71f2
 WHIRLPOOL 
dd17a079118a300a56b26c48c152e44267f69a2138af066944a207ca5851c4b430a40c8553a794061321b67b2e5d7f721ba897b7a17826651c884db72e6d4424

diff --git a/net-mail/dovecot/dovecot-2.2.19-r1.ebuild 
b/net-mail/dovecot/dovecot-2.2.19-r1.ebuild
deleted file mode 100644
index 8a1fbd4..00000000
--- a/net-mail/dovecot/dovecot-2.2.19-r1.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.9"
-if [[ ${PV} == *_rc* ]] ; then
-       rc_dir="rc/"
-else
-       rc_dir=""
-fi
-SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-       sieve? (
-       
http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       )
-       managesieve? (
-       
http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       ) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/";
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve 
solr +ssl static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} 
${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-       caps? ( sys-libs/libcap )
-       kerberos? ( virtual/krb5 )
-       ldap? ( net-nds/openldap )
-       lucene? ( >=dev-cpp/clucene-2.3 )
-       lzma? ( app-arch/xz-utils )
-       lz4? ( app-arch/lz4 )
-       mysql? ( virtual/mysql )
-       pam? ( virtual/pam )
-       postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-       selinux? ( sec-policy/selinux-dovecot )
-       solr? ( net-misc/curl dev-libs/expat )
-       sqlite? ( dev-db/sqlite:* )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0 )
-               libressl? ( dev-libs/libressl )
-       )
-       tcpd? ( sys-apps/tcp-wrappers )
-       textcat? ( app-text/libexttextcat )
-       vpopmail? ( net-mail/vpopmail )
-       zlib? ( sys-libs/zlib )
-       virtual/libiconv
-       dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-       net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-       if use managesieve && ! use sieve; then
-               ewarn "managesieve USE flag selected but sieve USE flag 
unselected"
-               ewarn "sieve USE flag will be turned on"
-       fi
-       # default internal user
-       enewgroup dovecot 97
-       enewuser dovecot 97 -1 /dev/null dovecot
-       # default login user
-       enewuser dovenull -1 -1 /dev/null
-       # add "mail" group for suid'ing. Better security isolation.
-       if use suid; then
-               enewgroup mail
-       fi
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-10-ssl.patch"
-       epatch_user
-}
-
-src_configure() {
-       local conf=""
-
-       if use postgres || use mysql || use sqlite; then
-               conf="${conf} --with-sql"
-       fi
-
-       local storages=""
-       for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-               use ${storage} && storages="${storage} ${storages}"
-       done
-       [ "${storages}" ] || storages="maildir"
-
-       # turn valgrind tests off. Bug #340791
-       VALGRIND=no econf \
-               --localstatedir="${EPREFIX}/var" \
-               --runstatedir="${EPREFIX}/run" \
-               --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-               --without-stemmer \
-               --with-storages="${storages}" \
-               --disable-rpath \
-               --with-icu \
-               $( systemd_with_unitdir ) \
-               $( use_with bzip2 bzlib ) \
-               $( use_with caps libcap ) \
-               $( use_with kerberos gssapi ) \
-               $( use_with ldap ) \
-               $( use_with lucene ) \
-               $( use_with lz4 ) \
-               $( use_with lzma ) \
-               $( use_with mysql ) \
-               $( use_with pam ) \
-               $( use_with postgres pgsql ) \
-               $( use_with sqlite ) \
-               $( use_with solr ) \
-               $( use_with ssl ) \
-               $( use_with tcpd libwrap ) \
-               $( use_with textcat ) \
-               $( use_with vpopmail ) \
-               $( use_with zlib ) \
-               $( use_enable static-libs static ) \
-               ${conf}
-
-       if use sieve || use managesieve ; then
-               # The sieve plugin needs this file to be build to determine the 
plugin
-               # directory and the list of libraries to link to.
-               emake dovecot-config
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               econf \
-                       $( use_enable static-libs static ) \
-                       --localstatedir="${EPREFIX}/var" \
-                       --enable-shared \
-                       --with-dovecot="../${MY_P}" \
-                       $( use_with managesieve )
-       fi
-}
-
-src_compile() {
-       default
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-       fi
-}
-
-src_test() {
-       default
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               default
-       fi
-}
-
-src_install () {
-       default
-
-       # insecure:
-       # use suid && fperms u+s /usr/libexec/dovecot/deliver
-       # better:
-       if use suid;then
-               einfo "Changing perms to allow deliver to be suided"
-               fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-               fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-       fi
-
-       newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-       rm -rf "${ED}"/usr/share/doc/dovecot
-
-       dodoc AUTHORS NEWS README TODO
-       dodoc doc/*.{txt,cnf,xml,sh}
-       docinto example-config
-       dodoc doc/example-config/*.{conf,ext}
-       docinto example-config/conf.d
-       dodoc doc/example-config/conf.d/*.{conf,ext}
-       docinto wiki
-       dodoc doc/wiki/*
-       doman doc/man/*.{1,7}
-
-       # Create the dovecot.conf file from the dovecot-example.conf file that
-       # the dovecot folks nicely left for us....
-       local conf="${ED}/etc/dovecot/dovecot.conf"
-       local confd="${ED}/etc/dovecot/conf.d"
-
-       insinto /etc/dovecot
-       doins doc/example-config/*.{conf,ext}
-       insinto /etc/dovecot/conf.d
-       doins doc/example-config/conf.d/*.{conf,ext}
-       fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-       rm -f "${confd}/../README"
-
-       # .maildir is the Gentoo default
-       local mail_location="maildir:~/.maildir"
-       if ! use maildir; then
-               if use mbox; then
-                       
mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-                       keepdir /var/dovecot
-                       sed -i -e 's|#mail_privileged_group 
=|mail_privileged_group = mail|' \
-                       "${confd}/10-mail.conf" || die "sed failed"
-               elif use mdbox ; then
-                       mail_location="mdbox:~/.mdbox"
-               elif use sdbox ; then
-                       mail_location="sdbox:~/.sdbox"
-               fi
-       fi
-       sed -i -e \
-               "s|#mail_location =|mail_location = ${mail_location}|" \
-               "${confd}/10-mail.conf" \
-               || die "failed to update mail location settings in 10-mail.conf"
-
-       # We're using pam files (imap and pop3) provided by mailbase
-       if use pam; then
-               sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = 
"\*"|' \
-                       "${confd}/auth-system.conf.ext" \
-                       || die "failed to update PAM settings in 
auth-system.conf.ext"
-               # mailbase does not provide a sieve pam file
-               use managesieve && dosym imap /etc/pam.d/sieve
-               sed -i -e \
-                       's/#!include auth-system.conf.ext/!include 
auth-system.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update PAM settings in 10-auth.conf"
-       fi
-
-       # Disable ipv6 if necessary
-       if ! use ipv6; then
-               sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-                       || die "failed to update listen settings in 
dovecot.conf"
-       fi
-
-       # Update ssl cert locations
-       if use ssl; then
-               sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-               || die "ssl conf failed"
-               sed -i -e 's:^ssl_cert =.*:ssl_cert = 
</etc/ssl/dovecot/server.pem:' \
-                       -e 's:^ssl_key =.*:ssl_key = 
</etc/ssl/dovecot/server.key:' \
-                       "${confd}/10-ssl.conf" || die "failed to update SSL 
settings in 10-ssl.conf"
-       fi
-
-       # Install SQL configuration
-       if use mysql || use postgres; then
-               sed -i -e \
-                       's/#!include auth-sql.conf.ext/!include 
auth-sql.conf.ext/' \
-                       "${confd}/10-auth.conf" || die "failed to update SQL 
settings in \
-                       10-auth.conf"
-       fi
-
-       # Install LDAP configuration
-       if use ldap; then
-               sed -i -e \
-                       's/#!include auth-ldap.conf.ext/!include 
auth-ldap.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update ldap settings in 10-auth.conf"
-       fi
-
-       if use vpopmail; then
-               sed -i -e \
-                       's/#!include auth-vpopmail.conf.ext/!include 
auth-vpopmail.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update vpopmail settings in 
10-auth.conf"
-       fi
-
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake DESTDIR="${ED}" install
-               sed -i -e \
-                       's/^[[:space:]]*#mail_plugins = 
$mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-                       || die "failed to update sieve settings in 15-lda.conf"
-               rm -rf "${ED}"/usr/share/doc/dovecot
-               docinto example-config/conf.d
-               dodoc doc/example-config/conf.d/*.conf
-               insinto /etc/dovecot/conf.d
-               doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-               use managesieve && doins 
doc/example-config/conf.d/20-managesieve.conf
-               docinto sieve/rfc
-               dodoc doc/rfc/*.txt
-               docinto sieve/devel
-               dodoc doc/devel/DESIGN
-               docinto plugins
-               dodoc doc/plugins/*.txt
-               docinto extensions
-               dodoc doc/extensions/*.txt
-               docinto locations
-               dodoc doc/locations/*.txt
-               doman doc/man/*.{1,7}
-       fi
-
-       use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-       if use ssl; then
-       # Let's not make a new certificate if we already have one
-               if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-               -e "${ROOT}"/etc/ssl/dovecot/server.key ]];     then
-                       einfo "Creating SSL     certificate"
-                       SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP 
Server}"
-                       install_cert /etc/ssl/dovecot/server
-               fi
-       fi
-
-       elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade 
notes."
-}

diff --git a/net-mail/dovecot/dovecot-2.2.21-r1.ebuild 
b/net-mail/dovecot/dovecot-2.2.21-r1.ebuild
deleted file mode 100644
index 7efe7e2..00000000
--- a/net-mail/dovecot/dovecot-2.2.21-r1.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.11"
-if [[ ${PV} == *_rc* ]] ; then
-       rc_dir="rc/"
-else
-       rc_dir=""
-fi
-SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-       sieve? (
-       
http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       )
-       managesieve? (
-       
http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       ) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/";
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve 
solr +ssl static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} 
${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-       caps? ( sys-libs/libcap )
-       kerberos? ( virtual/krb5 )
-       ldap? ( net-nds/openldap )
-       lucene? ( >=dev-cpp/clucene-2.3 )
-       lzma? ( app-arch/xz-utils )
-       lz4? ( app-arch/lz4 )
-       mysql? ( virtual/mysql )
-       pam? ( virtual/pam )
-       postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-       selinux? ( sec-policy/selinux-dovecot )
-       solr? ( net-misc/curl dev-libs/expat )
-       sqlite? ( dev-db/sqlite:* )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0 )
-               libressl? ( dev-libs/libressl )
-       )
-       tcpd? ( sys-apps/tcp-wrappers )
-       textcat? ( app-text/libexttextcat )
-       vpopmail? ( net-mail/vpopmail )
-       zlib? ( sys-libs/zlib )
-       virtual/libiconv
-       dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-       net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-       if use managesieve && ! use sieve; then
-               ewarn "managesieve USE flag selected but sieve USE flag 
unselected"
-               ewarn "sieve USE flag will be turned on"
-       fi
-       # default internal user
-       enewgroup dovecot 97
-       enewuser dovecot 97 -1 /dev/null dovecot
-       # default login user
-       enewuser dovenull -1 -1 /dev/null
-       # add "mail" group for suid'ing. Better security isolation.
-       if use suid; then
-               enewgroup mail
-       fi
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-10-ssl.patch"
-       epatch_user
-}
-
-src_configure() {
-       local conf=""
-
-       if use postgres || use mysql || use sqlite; then
-               conf="${conf} --with-sql"
-       fi
-
-       local storages=""
-       for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-               use ${storage} && storages="${storage} ${storages}"
-       done
-       [ "${storages}" ] || storages="maildir"
-
-       # turn valgrind tests off. Bug #340791
-       VALGRIND=no econf \
-               --localstatedir="${EPREFIX}/var" \
-               --runstatedir="${EPREFIX}/run" \
-               --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-               --without-stemmer \
-               --with-storages="${storages}" \
-               --disable-rpath \
-               --with-icu \
-               $( systemd_with_unitdir ) \
-               $( use_with bzip2 bzlib ) \
-               $( use_with caps libcap ) \
-               $( use_with kerberos gssapi ) \
-               $( use_with ldap ) \
-               $( use_with lucene ) \
-               $( use_with lz4 ) \
-               $( use_with lzma ) \
-               $( use_with mysql ) \
-               $( use_with pam ) \
-               $( use_with postgres pgsql ) \
-               $( use_with sqlite ) \
-               $( use_with solr ) \
-               $( use_with ssl ) \
-               $( use_with tcpd libwrap ) \
-               $( use_with textcat ) \
-               $( use_with vpopmail ) \
-               $( use_with zlib ) \
-               $( use_enable static-libs static ) \
-               ${conf}
-
-       if use sieve || use managesieve ; then
-               # The sieve plugin needs this file to be build to determine the 
plugin
-               # directory and the list of libraries to link to.
-               emake dovecot-config
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               econf \
-                       $( use_enable static-libs static ) \
-                       --localstatedir="${EPREFIX}/var" \
-                       --enable-shared \
-                       --with-dovecot="../${MY_P}" \
-                       $( use_with managesieve )
-       fi
-}
-
-src_compile() {
-       default
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-       fi
-}
-
-src_test() {
-       default
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               default
-       fi
-}
-
-src_install () {
-       default
-
-       # insecure:
-       # use suid && fperms u+s /usr/libexec/dovecot/deliver
-       # better:
-       if use suid;then
-               einfo "Changing perms to allow deliver to be suided"
-               fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-               fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-       fi
-
-       newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-       rm -rf "${ED}"/usr/share/doc/dovecot
-
-       dodoc AUTHORS NEWS README TODO
-       dodoc doc/*.{txt,cnf,xml,sh}
-       docinto example-config
-       dodoc doc/example-config/*.{conf,ext}
-       docinto example-config/conf.d
-       dodoc doc/example-config/conf.d/*.{conf,ext}
-       docinto wiki
-       dodoc doc/wiki/*
-       doman doc/man/*.{1,7}
-
-       # Create the dovecot.conf file from the dovecot-example.conf file that
-       # the dovecot folks nicely left for us....
-       local conf="${ED}/etc/dovecot/dovecot.conf"
-       local confd="${ED}/etc/dovecot/conf.d"
-
-       insinto /etc/dovecot
-       doins doc/example-config/*.{conf,ext}
-       insinto /etc/dovecot/conf.d
-       doins doc/example-config/conf.d/*.{conf,ext}
-       fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-       rm -f "${confd}/../README"
-
-       # .maildir is the Gentoo default
-       local mail_location="maildir:~/.maildir"
-       if ! use maildir; then
-               if use mbox; then
-                       
mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-                       keepdir /var/dovecot
-                       sed -i -e 's|#mail_privileged_group 
=|mail_privileged_group = mail|' \
-                       "${confd}/10-mail.conf" || die "sed failed"
-               elif use mdbox ; then
-                       mail_location="mdbox:~/.mdbox"
-               elif use sdbox ; then
-                       mail_location="sdbox:~/.sdbox"
-               fi
-       fi
-       sed -i -e \
-               "s|#mail_location =|mail_location = ${mail_location}|" \
-               "${confd}/10-mail.conf" \
-               || die "failed to update mail location settings in 10-mail.conf"
-
-       # We're using pam files (imap and pop3) provided by mailbase
-       if use pam; then
-               sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = 
"\*"|' \
-                       "${confd}/auth-system.conf.ext" \
-                       || die "failed to update PAM settings in 
auth-system.conf.ext"
-               # mailbase does not provide a sieve pam file
-               use managesieve && dosym imap /etc/pam.d/sieve
-               sed -i -e \
-                       's/#!include auth-system.conf.ext/!include 
auth-system.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update PAM settings in 10-auth.conf"
-       fi
-
-       # Disable ipv6 if necessary
-       if ! use ipv6; then
-               sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-                       || die "failed to update listen settings in 
dovecot.conf"
-       fi
-
-       # Update ssl cert locations
-       if use ssl; then
-               sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-               || die "ssl conf failed"
-               sed -i -e 's:^ssl_cert =.*:ssl_cert = 
</etc/ssl/dovecot/server.pem:' \
-                       -e 's:^ssl_key =.*:ssl_key = 
</etc/ssl/dovecot/server.key:' \
-                       "${confd}/10-ssl.conf" || die "failed to update SSL 
settings in 10-ssl.conf"
-       fi
-
-       # Install SQL configuration
-       if use mysql || use postgres; then
-               sed -i -e \
-                       's/#!include auth-sql.conf.ext/!include 
auth-sql.conf.ext/' \
-                       "${confd}/10-auth.conf" || die "failed to update SQL 
settings in \
-                       10-auth.conf"
-       fi
-
-       # Install LDAP configuration
-       if use ldap; then
-               sed -i -e \
-                       's/#!include auth-ldap.conf.ext/!include 
auth-ldap.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update ldap settings in 10-auth.conf"
-       fi
-
-       if use vpopmail; then
-               sed -i -e \
-                       's/#!include auth-vpopmail.conf.ext/!include 
auth-vpopmail.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update vpopmail settings in 
10-auth.conf"
-       fi
-
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake DESTDIR="${ED}" install
-               sed -i -e \
-                       's/^[[:space:]]*#mail_plugins = 
$mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-                       || die "failed to update sieve settings in 15-lda.conf"
-               rm -rf "${ED}"/usr/share/doc/dovecot
-               docinto example-config/conf.d
-               dodoc doc/example-config/conf.d/*.conf
-               insinto /etc/dovecot/conf.d
-               doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-               use managesieve && doins 
doc/example-config/conf.d/20-managesieve.conf
-               docinto sieve/rfc
-               dodoc doc/rfc/*.txt
-               docinto sieve/devel
-               dodoc doc/devel/DESIGN
-               docinto plugins
-               dodoc doc/plugins/*.txt
-               docinto extensions
-               dodoc doc/extensions/*.txt
-               docinto locations
-               dodoc doc/locations/*.txt
-               doman doc/man/*.{1,7}
-       fi
-
-       use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-       if use ssl; then
-       # Let's not make a new certificate if we already have one
-               if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-               -e "${ROOT}"/etc/ssl/dovecot/server.key ]];     then
-                       einfo "Creating SSL     certificate"
-                       SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP 
Server}"
-                       install_cert /etc/ssl/dovecot/server
-               fi
-       fi
-
-       elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade 
notes."
-}

diff --git a/net-mail/dovecot/dovecot-2.2.21-r2.ebuild 
b/net-mail/dovecot/dovecot-2.2.21-r2.ebuild
deleted file mode 100644
index 873ae7d..00000000
--- a/net-mail/dovecot/dovecot-2.2.21-r2.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.12"
-if [[ ${PV} == *_rc* ]] ; then
-       rc_dir="rc/"
-else
-       rc_dir=""
-fi
-SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-       sieve? (
-       
http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       )
-       managesieve? (
-       
http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       ) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/";
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve 
solr +ssl static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} 
${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-       caps? ( sys-libs/libcap )
-       kerberos? ( virtual/krb5 )
-       ldap? ( net-nds/openldap )
-       lucene? ( >=dev-cpp/clucene-2.3 )
-       lzma? ( app-arch/xz-utils )
-       lz4? ( app-arch/lz4 )
-       mysql? ( virtual/mysql )
-       pam? ( virtual/pam )
-       postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-       selinux? ( sec-policy/selinux-dovecot )
-       solr? ( net-misc/curl dev-libs/expat )
-       sqlite? ( dev-db/sqlite:* )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0 )
-               libressl? ( dev-libs/libressl )
-       )
-       tcpd? ( sys-apps/tcp-wrappers )
-       textcat? ( app-text/libexttextcat )
-       vpopmail? ( net-mail/vpopmail )
-       zlib? ( sys-libs/zlib )
-       virtual/libiconv
-       dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-       net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-       if use managesieve && ! use sieve; then
-               ewarn "managesieve USE flag selected but sieve USE flag 
unselected"
-               ewarn "sieve USE flag will be turned on"
-       fi
-       # default internal user
-       enewgroup dovecot 97
-       enewuser dovecot 97 -1 /dev/null dovecot
-       # default login user
-       enewuser dovenull -1 -1 /dev/null
-       # add "mail" group for suid'ing. Better security isolation.
-       if use suid; then
-               enewgroup mail
-       fi
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-10-ssl.patch"
-       epatch_user
-}
-
-src_configure() {
-       local conf=""
-
-       if use postgres || use mysql || use sqlite; then
-               conf="${conf} --with-sql"
-       fi
-
-       local storages=""
-       for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-               use ${storage} && storages="${storage} ${storages}"
-       done
-       [ "${storages}" ] || storages="maildir"
-
-       # turn valgrind tests off. Bug #340791
-       VALGRIND=no econf \
-               --localstatedir="${EPREFIX}/var" \
-               --runstatedir="${EPREFIX}/run" \
-               --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-               --without-stemmer \
-               --with-storages="${storages}" \
-               --disable-rpath \
-               --with-icu \
-               $( systemd_with_unitdir ) \
-               $( use_with bzip2 bzlib ) \
-               $( use_with caps libcap ) \
-               $( use_with kerberos gssapi ) \
-               $( use_with ldap ) \
-               $( use_with lucene ) \
-               $( use_with lz4 ) \
-               $( use_with lzma ) \
-               $( use_with mysql ) \
-               $( use_with pam ) \
-               $( use_with postgres pgsql ) \
-               $( use_with sqlite ) \
-               $( use_with solr ) \
-               $( use_with ssl ) \
-               $( use_with tcpd libwrap ) \
-               $( use_with textcat ) \
-               $( use_with vpopmail ) \
-               $( use_with zlib ) \
-               $( use_enable static-libs static ) \
-               ${conf}
-
-       if use sieve || use managesieve ; then
-               # The sieve plugin needs this file to be build to determine the 
plugin
-               # directory and the list of libraries to link to.
-               emake dovecot-config
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               econf \
-                       $( use_enable static-libs static ) \
-                       --localstatedir="${EPREFIX}/var" \
-                       --enable-shared \
-                       --with-dovecot="../${MY_P}" \
-                       $( use_with managesieve )
-       fi
-}
-
-src_compile() {
-       default
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-       fi
-}
-
-src_test() {
-       default
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               default
-       fi
-}
-
-src_install () {
-       default
-
-       # insecure:
-       # use suid && fperms u+s /usr/libexec/dovecot/deliver
-       # better:
-       if use suid;then
-               einfo "Changing perms to allow deliver to be suided"
-               fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-               fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-       fi
-
-       newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-       rm -rf "${ED}"/usr/share/doc/dovecot
-
-       dodoc AUTHORS NEWS README TODO
-       dodoc doc/*.{txt,cnf,xml,sh}
-       docinto example-config
-       dodoc doc/example-config/*.{conf,ext}
-       docinto example-config/conf.d
-       dodoc doc/example-config/conf.d/*.{conf,ext}
-       docinto wiki
-       dodoc doc/wiki/*
-       doman doc/man/*.{1,7}
-
-       # Create the dovecot.conf file from the dovecot-example.conf file that
-       # the dovecot folks nicely left for us....
-       local conf="${ED}/etc/dovecot/dovecot.conf"
-       local confd="${ED}/etc/dovecot/conf.d"
-
-       insinto /etc/dovecot
-       doins doc/example-config/*.{conf,ext}
-       insinto /etc/dovecot/conf.d
-       doins doc/example-config/conf.d/*.{conf,ext}
-       fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-       rm -f "${confd}/../README"
-
-       # .maildir is the Gentoo default
-       local mail_location="maildir:~/.maildir"
-       if ! use maildir; then
-               if use mbox; then
-                       
mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-                       keepdir /var/dovecot
-                       sed -i -e 's|#mail_privileged_group 
=|mail_privileged_group = mail|' \
-                       "${confd}/10-mail.conf" || die "sed failed"
-               elif use mdbox ; then
-                       mail_location="mdbox:~/.mdbox"
-               elif use sdbox ; then
-                       mail_location="sdbox:~/.sdbox"
-               fi
-       fi
-       sed -i -e \
-               "s|#mail_location =|mail_location = ${mail_location}|" \
-               "${confd}/10-mail.conf" \
-               || die "failed to update mail location settings in 10-mail.conf"
-
-       # We're using pam files (imap and pop3) provided by mailbase
-       if use pam; then
-               sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = 
"\*"|' \
-                       "${confd}/auth-system.conf.ext" \
-                       || die "failed to update PAM settings in 
auth-system.conf.ext"
-               # mailbase does not provide a sieve pam file
-               use managesieve && dosym imap /etc/pam.d/sieve
-               sed -i -e \
-                       's/#!include auth-system.conf.ext/!include 
auth-system.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update PAM settings in 10-auth.conf"
-       fi
-
-       # Disable ipv6 if necessary
-       if ! use ipv6; then
-               sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-                       || die "failed to update listen settings in 
dovecot.conf"
-       fi
-
-       # Update ssl cert locations
-       if use ssl; then
-               sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-               || die "ssl conf failed"
-               sed -i -e 's:^ssl_cert =.*:ssl_cert = 
</etc/ssl/dovecot/server.pem:' \
-                       -e 's:^ssl_key =.*:ssl_key = 
</etc/ssl/dovecot/server.key:' \
-                       "${confd}/10-ssl.conf" || die "failed to update SSL 
settings in 10-ssl.conf"
-       fi
-
-       # Install SQL configuration
-       if use mysql || use postgres; then
-               sed -i -e \
-                       's/#!include auth-sql.conf.ext/!include 
auth-sql.conf.ext/' \
-                       "${confd}/10-auth.conf" || die "failed to update SQL 
settings in \
-                       10-auth.conf"
-       fi
-
-       # Install LDAP configuration
-       if use ldap; then
-               sed -i -e \
-                       's/#!include auth-ldap.conf.ext/!include 
auth-ldap.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update ldap settings in 10-auth.conf"
-       fi
-
-       if use vpopmail; then
-               sed -i -e \
-                       's/#!include auth-vpopmail.conf.ext/!include 
auth-vpopmail.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update vpopmail settings in 
10-auth.conf"
-       fi
-
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake DESTDIR="${ED}" install
-               sed -i -e \
-                       's/^[[:space:]]*#mail_plugins = 
$mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-                       || die "failed to update sieve settings in 15-lda.conf"
-               rm -rf "${ED}"/usr/share/doc/dovecot
-               docinto example-config/conf.d
-               dodoc doc/example-config/conf.d/*.conf
-               insinto /etc/dovecot/conf.d
-               doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-               use managesieve && doins 
doc/example-config/conf.d/20-managesieve.conf
-               docinto sieve/rfc
-               dodoc doc/rfc/*.txt
-               docinto sieve/devel
-               dodoc doc/devel/DESIGN
-               docinto plugins
-               dodoc doc/plugins/*.txt
-               docinto extensions
-               dodoc doc/extensions/*.txt
-               docinto locations
-               dodoc doc/locations/*.txt
-               doman doc/man/*.{1,7}
-       fi
-
-       use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-       if use ssl; then
-       # Let's not make a new certificate if we already have one
-               if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-               -e "${ROOT}"/etc/ssl/dovecot/server.key ]];     then
-                       einfo "Creating SSL     certificate"
-                       SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP 
Server}"
-                       install_cert /etc/ssl/dovecot/server
-               fi
-       fi
-
-       elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade 
notes."
-}

diff --git a/net-mail/dovecot/dovecot-2.2.21.ebuild 
b/net-mail/dovecot/dovecot-2.2.21.ebuild
deleted file mode 100644
index baa628b..00000000
--- a/net-mail/dovecot/dovecot-2.2.21.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.10"
-if [[ ${PV} == *_rc* ]] ; then
-       rc_dir="rc/"
-else
-       rc_dir=""
-fi
-SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-       sieve? (
-       
http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       )
-       managesieve? (
-       
http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       ) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/";
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve 
solr +ssl static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} 
${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-       caps? ( sys-libs/libcap )
-       kerberos? ( virtual/krb5 )
-       ldap? ( net-nds/openldap )
-       lucene? ( >=dev-cpp/clucene-2.3 )
-       lzma? ( app-arch/xz-utils )
-       lz4? ( app-arch/lz4 )
-       mysql? ( virtual/mysql )
-       pam? ( virtual/pam )
-       postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-       selinux? ( sec-policy/selinux-dovecot )
-       solr? ( net-misc/curl dev-libs/expat )
-       sqlite? ( dev-db/sqlite:* )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0 )
-               libressl? ( dev-libs/libressl )
-       )
-       tcpd? ( sys-apps/tcp-wrappers )
-       textcat? ( app-text/libexttextcat )
-       vpopmail? ( net-mail/vpopmail )
-       zlib? ( sys-libs/zlib )
-       virtual/libiconv
-       dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-       net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-       if use managesieve && ! use sieve; then
-               ewarn "managesieve USE flag selected but sieve USE flag 
unselected"
-               ewarn "sieve USE flag will be turned on"
-       fi
-       # default internal user
-       enewgroup dovecot 97
-       enewuser dovecot 97 -1 /dev/null dovecot
-       # default login user
-       enewuser dovenull -1 -1 /dev/null
-       # add "mail" group for suid'ing. Better security isolation.
-       if use suid; then
-               enewgroup mail
-       fi
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-10-ssl.patch"
-       epatch_user
-}
-
-src_configure() {
-       local conf=""
-
-       if use postgres || use mysql || use sqlite; then
-               conf="${conf} --with-sql"
-       fi
-
-       local storages=""
-       for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-               use ${storage} && storages="${storage} ${storages}"
-       done
-       [ "${storages}" ] || storages="maildir"
-
-       # turn valgrind tests off. Bug #340791
-       VALGRIND=no econf \
-               --localstatedir="${EPREFIX}/var" \
-               --runstatedir="${EPREFIX}/run" \
-               --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-               --without-stemmer \
-               --with-storages="${storages}" \
-               --disable-rpath \
-               --with-icu \
-               $( systemd_with_unitdir ) \
-               $( use_with bzip2 bzlib ) \
-               $( use_with caps libcap ) \
-               $( use_with kerberos gssapi ) \
-               $( use_with ldap ) \
-               $( use_with lucene ) \
-               $( use_with lz4 ) \
-               $( use_with lzma ) \
-               $( use_with mysql ) \
-               $( use_with pam ) \
-               $( use_with postgres pgsql ) \
-               $( use_with sqlite ) \
-               $( use_with solr ) \
-               $( use_with ssl ) \
-               $( use_with tcpd libwrap ) \
-               $( use_with textcat ) \
-               $( use_with vpopmail ) \
-               $( use_with zlib ) \
-               $( use_enable static-libs static ) \
-               ${conf}
-
-       if use sieve || use managesieve ; then
-               # The sieve plugin needs this file to be build to determine the 
plugin
-               # directory and the list of libraries to link to.
-               emake dovecot-config
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               econf \
-                       $( use_enable static-libs static ) \
-                       --localstatedir="${EPREFIX}/var" \
-                       --enable-shared \
-                       --with-dovecot="../${MY_P}" \
-                       $( use_with managesieve )
-       fi
-}
-
-src_compile() {
-       default
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-       fi
-}
-
-src_test() {
-       default
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               default
-       fi
-}
-
-src_install () {
-       default
-
-       # insecure:
-       # use suid && fperms u+s /usr/libexec/dovecot/deliver
-       # better:
-       if use suid;then
-               einfo "Changing perms to allow deliver to be suided"
-               fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-               fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-       fi
-
-       newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-       rm -rf "${ED}"/usr/share/doc/dovecot
-
-       dodoc AUTHORS NEWS README TODO
-       dodoc doc/*.{txt,cnf,xml,sh}
-       docinto example-config
-       dodoc doc/example-config/*.{conf,ext}
-       docinto example-config/conf.d
-       dodoc doc/example-config/conf.d/*.{conf,ext}
-       docinto wiki
-       dodoc doc/wiki/*
-       doman doc/man/*.{1,7}
-
-       # Create the dovecot.conf file from the dovecot-example.conf file that
-       # the dovecot folks nicely left for us....
-       local conf="${ED}/etc/dovecot/dovecot.conf"
-       local confd="${ED}/etc/dovecot/conf.d"
-
-       insinto /etc/dovecot
-       doins doc/example-config/*.{conf,ext}
-       insinto /etc/dovecot/conf.d
-       doins doc/example-config/conf.d/*.{conf,ext}
-       fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-       rm -f "${confd}/../README"
-
-       # .maildir is the Gentoo default
-       local mail_location="maildir:~/.maildir"
-       if ! use maildir; then
-               if use mbox; then
-                       
mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-                       keepdir /var/dovecot
-                       sed -i -e 's|#mail_privileged_group 
=|mail_privileged_group = mail|' \
-                       "${confd}/10-mail.conf" || die "sed failed"
-               elif use mdbox ; then
-                       mail_location="mdbox:~/.mdbox"
-               elif use sdbox ; then
-                       mail_location="sdbox:~/.sdbox"
-               fi
-       fi
-       sed -i -e \
-               "s|#mail_location =|mail_location = ${mail_location}|" \
-               "${confd}/10-mail.conf" \
-               || die "failed to update mail location settings in 10-mail.conf"
-
-       # We're using pam files (imap and pop3) provided by mailbase
-       if use pam; then
-               sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = 
"\*"|' \
-                       "${confd}/auth-system.conf.ext" \
-                       || die "failed to update PAM settings in 
auth-system.conf.ext"
-               # mailbase does not provide a sieve pam file
-               use managesieve && dosym imap /etc/pam.d/sieve
-               sed -i -e \
-                       's/#!include auth-system.conf.ext/!include 
auth-system.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update PAM settings in 10-auth.conf"
-       fi
-
-       # Disable ipv6 if necessary
-       if ! use ipv6; then
-               sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-                       || die "failed to update listen settings in 
dovecot.conf"
-       fi
-
-       # Update ssl cert locations
-       if use ssl; then
-               sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-               || die "ssl conf failed"
-               sed -i -e 's:^ssl_cert =.*:ssl_cert = 
</etc/ssl/dovecot/server.pem:' \
-                       -e 's:^ssl_key =.*:ssl_key = 
</etc/ssl/dovecot/server.key:' \
-                       "${confd}/10-ssl.conf" || die "failed to update SSL 
settings in 10-ssl.conf"
-       fi
-
-       # Install SQL configuration
-       if use mysql || use postgres; then
-               sed -i -e \
-                       's/#!include auth-sql.conf.ext/!include 
auth-sql.conf.ext/' \
-                       "${confd}/10-auth.conf" || die "failed to update SQL 
settings in \
-                       10-auth.conf"
-       fi
-
-       # Install LDAP configuration
-       if use ldap; then
-               sed -i -e \
-                       's/#!include auth-ldap.conf.ext/!include 
auth-ldap.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update ldap settings in 10-auth.conf"
-       fi
-
-       if use vpopmail; then
-               sed -i -e \
-                       's/#!include auth-vpopmail.conf.ext/!include 
auth-vpopmail.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update vpopmail settings in 
10-auth.conf"
-       fi
-
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake DESTDIR="${ED}" install
-               sed -i -e \
-                       's/^[[:space:]]*#mail_plugins = 
$mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-                       || die "failed to update sieve settings in 15-lda.conf"
-               rm -rf "${ED}"/usr/share/doc/dovecot
-               docinto example-config/conf.d
-               dodoc doc/example-config/conf.d/*.conf
-               insinto /etc/dovecot/conf.d
-               doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-               use managesieve && doins 
doc/example-config/conf.d/20-managesieve.conf
-               docinto sieve/rfc
-               dodoc doc/rfc/*.txt
-               docinto sieve/devel
-               dodoc doc/devel/DESIGN
-               docinto plugins
-               dodoc doc/plugins/*.txt
-               docinto extensions
-               dodoc doc/extensions/*.txt
-               docinto locations
-               dodoc doc/locations/*.txt
-               doman doc/man/*.{1,7}
-       fi
-
-       use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-       if use ssl; then
-       # Let's not make a new certificate if we already have one
-               if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-               -e "${ROOT}"/etc/ssl/dovecot/server.key ]];     then
-                       einfo "Creating SSL     certificate"
-                       SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP 
Server}"
-                       install_cert /etc/ssl/dovecot/server
-               fi
-       fi
-
-       elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade 
notes."
-}

diff --git a/net-mail/dovecot/dovecot-2.2.22.ebuild 
b/net-mail/dovecot/dovecot-2.2.22.ebuild
deleted file mode 100644
index 3563854..00000000
--- a/net-mail/dovecot/dovecot-2.2.22.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.13"
-if [[ ${PV} == *_rc* ]] ; then
-       rc_dir="rc/"
-else
-       rc_dir=""
-fi
-SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-       sieve? (
-       
http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       )
-       managesieve? (
-       
http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       ) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/";
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve 
solr +ssl static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} 
${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-       caps? ( sys-libs/libcap )
-       kerberos? ( virtual/krb5 )
-       ldap? ( net-nds/openldap )
-       lucene? ( >=dev-cpp/clucene-2.3 )
-       lzma? ( app-arch/xz-utils )
-       lz4? ( app-arch/lz4 )
-       mysql? ( virtual/mysql )
-       pam? ( virtual/pam )
-       postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-       selinux? ( sec-policy/selinux-dovecot )
-       solr? ( net-misc/curl dev-libs/expat )
-       sqlite? ( dev-db/sqlite:* )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0 )
-               libressl? ( dev-libs/libressl )
-       )
-       tcpd? ( sys-apps/tcp-wrappers )
-       textcat? ( app-text/libexttextcat )
-       vpopmail? ( net-mail/vpopmail )
-       zlib? ( sys-libs/zlib )
-       virtual/libiconv
-       dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-       net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-       if use managesieve && ! use sieve; then
-               ewarn "managesieve USE flag selected but sieve USE flag 
unselected"
-               ewarn "sieve USE flag will be turned on"
-       fi
-       # default internal user
-       enewgroup dovecot 97
-       enewuser dovecot 97 -1 /dev/null dovecot
-       # default login user
-       enewuser dovenull -1 -1 /dev/null
-       # add "mail" group for suid'ing. Better security isolation.
-       if use suid; then
-               enewgroup mail
-       fi
-}
-
-src_prepare() {
-       eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
-       eapply_user
-}
-
-src_configure() {
-       local conf=""
-
-       if use postgres || use mysql || use sqlite; then
-               conf="${conf} --with-sql"
-       fi
-
-       local storages=""
-       for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-               use ${storage} && storages="${storage} ${storages}"
-       done
-       [ "${storages}" ] || storages="maildir"
-
-       # turn valgrind tests off. Bug #340791
-       VALGRIND=no econf \
-               --localstatedir="${EPREFIX}/var" \
-               --runstatedir="${EPREFIX}/run" \
-               --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-               --without-stemmer \
-               --with-storages="${storages}" \
-               --disable-rpath \
-               --with-icu \
-               --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-               $( use_with bzip2 bzlib ) \
-               $( use_with caps libcap ) \
-               $( use_with kerberos gssapi ) \
-               $( use_with ldap ) \
-               $( use_with lucene ) \
-               $( use_with lz4 ) \
-               $( use_with lzma ) \
-               $( use_with mysql ) \
-               $( use_with pam ) \
-               $( use_with postgres pgsql ) \
-               $( use_with sqlite ) \
-               $( use_with solr ) \
-               $( use_with ssl ) \
-               $( use_with tcpd libwrap ) \
-               $( use_with textcat ) \
-               $( use_with vpopmail ) \
-               $( use_with zlib ) \
-               $( use_enable static-libs static ) \
-               ${conf}
-
-       if use sieve || use managesieve ; then
-               # The sieve plugin needs this file to be build to determine the 
plugin
-               # directory and the list of libraries to link to.
-               emake dovecot-config
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               econf \
-                       $( use_enable static-libs static ) \
-                       --localstatedir="${EPREFIX}/var" \
-                       --enable-shared \
-                       --with-dovecot="../${MY_P}" \
-                       $( use_with managesieve )
-       fi
-}
-
-src_compile() {
-       default
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-       fi
-}
-
-src_test() {
-       default
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               default
-       fi
-}
-
-src_install () {
-       default
-
-       # insecure:
-       # use suid && fperms u+s /usr/libexec/dovecot/deliver
-       # better:
-       if use suid;then
-               einfo "Changing perms to allow deliver to be suided"
-               fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-               fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-       fi
-
-       newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-       rm -rf "${ED}"/usr/share/doc/dovecot
-
-       dodoc AUTHORS NEWS README TODO
-       dodoc doc/*.{txt,cnf,xml,sh}
-       docinto example-config
-       dodoc doc/example-config/*.{conf,ext}
-       docinto example-config/conf.d
-       dodoc doc/example-config/conf.d/*.{conf,ext}
-       docinto wiki
-       dodoc doc/wiki/*
-       doman doc/man/*.{1,7}
-
-       # Create the dovecot.conf file from the dovecot-example.conf file that
-       # the dovecot folks nicely left for us....
-       local conf="${ED}/etc/dovecot/dovecot.conf"
-       local confd="${ED}/etc/dovecot/conf.d"
-
-       insinto /etc/dovecot
-       doins doc/example-config/*.{conf,ext}
-       insinto /etc/dovecot/conf.d
-       doins doc/example-config/conf.d/*.{conf,ext}
-       fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-       rm -f "${confd}/../README"
-
-       # .maildir is the Gentoo default
-       local mail_location="maildir:~/.maildir"
-       if ! use maildir; then
-               if use mbox; then
-                       
mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-                       keepdir /var/dovecot
-                       sed -i -e 's|#mail_privileged_group 
=|mail_privileged_group = mail|' \
-                       "${confd}/10-mail.conf" || die "sed failed"
-               elif use mdbox ; then
-                       mail_location="mdbox:~/.mdbox"
-               elif use sdbox ; then
-                       mail_location="sdbox:~/.sdbox"
-               fi
-       fi
-       sed -i -e \
-               "s|#mail_location =|mail_location = ${mail_location}|" \
-               "${confd}/10-mail.conf" \
-               || die "failed to update mail location settings in 10-mail.conf"
-
-       # We're using pam files (imap and pop3) provided by mailbase
-       if use pam; then
-               sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = 
"\*"|' \
-                       "${confd}/auth-system.conf.ext" \
-                       || die "failed to update PAM settings in 
auth-system.conf.ext"
-               # mailbase does not provide a sieve pam file
-               use managesieve && dosym imap /etc/pam.d/sieve
-               sed -i -e \
-                       's/#!include auth-system.conf.ext/!include 
auth-system.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update PAM settings in 10-auth.conf"
-       fi
-
-       # Disable ipv6 if necessary
-       if ! use ipv6; then
-               sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-                       || die "failed to update listen settings in 
dovecot.conf"
-       fi
-
-       # Update ssl cert locations
-       if use ssl; then
-               sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-               || die "ssl conf failed"
-               sed -i -e 's:^ssl_cert =.*:ssl_cert = 
</etc/ssl/dovecot/server.pem:' \
-                       -e 's:^ssl_key =.*:ssl_key = 
</etc/ssl/dovecot/server.key:' \
-                       "${confd}/10-ssl.conf" || die "failed to update SSL 
settings in 10-ssl.conf"
-       fi
-
-       # Install SQL configuration
-       if use mysql || use postgres; then
-               sed -i -e \
-                       's/#!include auth-sql.conf.ext/!include 
auth-sql.conf.ext/' \
-                       "${confd}/10-auth.conf" || die "failed to update SQL 
settings in \
-                       10-auth.conf"
-       fi
-
-       # Install LDAP configuration
-       if use ldap; then
-               sed -i -e \
-                       's/#!include auth-ldap.conf.ext/!include 
auth-ldap.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update ldap settings in 10-auth.conf"
-       fi
-
-       if use vpopmail; then
-               sed -i -e \
-                       's/#!include auth-vpopmail.conf.ext/!include 
auth-vpopmail.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update vpopmail settings in 
10-auth.conf"
-       fi
-
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake DESTDIR="${ED}" install
-               sed -i -e \
-                       's/^[[:space:]]*#mail_plugins = 
$mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-                       || die "failed to update sieve settings in 15-lda.conf"
-               rm -rf "${ED}"/usr/share/doc/dovecot
-               docinto example-config/conf.d
-               dodoc doc/example-config/conf.d/*.conf
-               insinto /etc/dovecot/conf.d
-               doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-               use managesieve && doins 
doc/example-config/conf.d/20-managesieve.conf
-               docinto sieve/rfc
-               dodoc doc/rfc/*.txt
-               docinto sieve/devel
-               dodoc doc/devel/DESIGN
-               docinto plugins
-               dodoc doc/plugins/*.txt
-               docinto extensions
-               dodoc doc/extensions/*.txt
-               docinto locations
-               dodoc doc/locations/*.txt
-               doman doc/man/*.{1,7}
-       fi
-
-       use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-       if use ssl; then
-       # Let's not make a new certificate if we already have one
-               if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-               -e "${ROOT}"/etc/ssl/dovecot/server.key ]];     then
-                       einfo "Creating SSL     certificate"
-                       SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP 
Server}"
-                       install_cert /etc/ssl/dovecot/server
-               fi
-       fi
-
-       elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade 
notes."
-}

diff --git a/net-mail/dovecot/dovecot-2.2.23.ebuild 
b/net-mail/dovecot/dovecot-2.2.23.ebuild
deleted file mode 100644
index 3563854..00000000
--- a/net-mail/dovecot/dovecot-2.2.23.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.13"
-if [[ ${PV} == *_rc* ]] ; then
-       rc_dir="rc/"
-else
-       rc_dir=""
-fi
-SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-       sieve? (
-       
http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       )
-       managesieve? (
-       
http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       ) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/";
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve 
solr +ssl static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} 
${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-       caps? ( sys-libs/libcap )
-       kerberos? ( virtual/krb5 )
-       ldap? ( net-nds/openldap )
-       lucene? ( >=dev-cpp/clucene-2.3 )
-       lzma? ( app-arch/xz-utils )
-       lz4? ( app-arch/lz4 )
-       mysql? ( virtual/mysql )
-       pam? ( virtual/pam )
-       postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-       selinux? ( sec-policy/selinux-dovecot )
-       solr? ( net-misc/curl dev-libs/expat )
-       sqlite? ( dev-db/sqlite:* )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0 )
-               libressl? ( dev-libs/libressl )
-       )
-       tcpd? ( sys-apps/tcp-wrappers )
-       textcat? ( app-text/libexttextcat )
-       vpopmail? ( net-mail/vpopmail )
-       zlib? ( sys-libs/zlib )
-       virtual/libiconv
-       dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-       net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-       if use managesieve && ! use sieve; then
-               ewarn "managesieve USE flag selected but sieve USE flag 
unselected"
-               ewarn "sieve USE flag will be turned on"
-       fi
-       # default internal user
-       enewgroup dovecot 97
-       enewuser dovecot 97 -1 /dev/null dovecot
-       # default login user
-       enewuser dovenull -1 -1 /dev/null
-       # add "mail" group for suid'ing. Better security isolation.
-       if use suid; then
-               enewgroup mail
-       fi
-}
-
-src_prepare() {
-       eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
-       eapply_user
-}
-
-src_configure() {
-       local conf=""
-
-       if use postgres || use mysql || use sqlite; then
-               conf="${conf} --with-sql"
-       fi
-
-       local storages=""
-       for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-               use ${storage} && storages="${storage} ${storages}"
-       done
-       [ "${storages}" ] || storages="maildir"
-
-       # turn valgrind tests off. Bug #340791
-       VALGRIND=no econf \
-               --localstatedir="${EPREFIX}/var" \
-               --runstatedir="${EPREFIX}/run" \
-               --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-               --without-stemmer \
-               --with-storages="${storages}" \
-               --disable-rpath \
-               --with-icu \
-               --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-               $( use_with bzip2 bzlib ) \
-               $( use_with caps libcap ) \
-               $( use_with kerberos gssapi ) \
-               $( use_with ldap ) \
-               $( use_with lucene ) \
-               $( use_with lz4 ) \
-               $( use_with lzma ) \
-               $( use_with mysql ) \
-               $( use_with pam ) \
-               $( use_with postgres pgsql ) \
-               $( use_with sqlite ) \
-               $( use_with solr ) \
-               $( use_with ssl ) \
-               $( use_with tcpd libwrap ) \
-               $( use_with textcat ) \
-               $( use_with vpopmail ) \
-               $( use_with zlib ) \
-               $( use_enable static-libs static ) \
-               ${conf}
-
-       if use sieve || use managesieve ; then
-               # The sieve plugin needs this file to be build to determine the 
plugin
-               # directory and the list of libraries to link to.
-               emake dovecot-config
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               econf \
-                       $( use_enable static-libs static ) \
-                       --localstatedir="${EPREFIX}/var" \
-                       --enable-shared \
-                       --with-dovecot="../${MY_P}" \
-                       $( use_with managesieve )
-       fi
-}
-
-src_compile() {
-       default
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-       fi
-}
-
-src_test() {
-       default
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               default
-       fi
-}
-
-src_install () {
-       default
-
-       # insecure:
-       # use suid && fperms u+s /usr/libexec/dovecot/deliver
-       # better:
-       if use suid;then
-               einfo "Changing perms to allow deliver to be suided"
-               fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-               fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-       fi
-
-       newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-       rm -rf "${ED}"/usr/share/doc/dovecot
-
-       dodoc AUTHORS NEWS README TODO
-       dodoc doc/*.{txt,cnf,xml,sh}
-       docinto example-config
-       dodoc doc/example-config/*.{conf,ext}
-       docinto example-config/conf.d
-       dodoc doc/example-config/conf.d/*.{conf,ext}
-       docinto wiki
-       dodoc doc/wiki/*
-       doman doc/man/*.{1,7}
-
-       # Create the dovecot.conf file from the dovecot-example.conf file that
-       # the dovecot folks nicely left for us....
-       local conf="${ED}/etc/dovecot/dovecot.conf"
-       local confd="${ED}/etc/dovecot/conf.d"
-
-       insinto /etc/dovecot
-       doins doc/example-config/*.{conf,ext}
-       insinto /etc/dovecot/conf.d
-       doins doc/example-config/conf.d/*.{conf,ext}
-       fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-       rm -f "${confd}/../README"
-
-       # .maildir is the Gentoo default
-       local mail_location="maildir:~/.maildir"
-       if ! use maildir; then
-               if use mbox; then
-                       
mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-                       keepdir /var/dovecot
-                       sed -i -e 's|#mail_privileged_group 
=|mail_privileged_group = mail|' \
-                       "${confd}/10-mail.conf" || die "sed failed"
-               elif use mdbox ; then
-                       mail_location="mdbox:~/.mdbox"
-               elif use sdbox ; then
-                       mail_location="sdbox:~/.sdbox"
-               fi
-       fi
-       sed -i -e \
-               "s|#mail_location =|mail_location = ${mail_location}|" \
-               "${confd}/10-mail.conf" \
-               || die "failed to update mail location settings in 10-mail.conf"
-
-       # We're using pam files (imap and pop3) provided by mailbase
-       if use pam; then
-               sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = 
"\*"|' \
-                       "${confd}/auth-system.conf.ext" \
-                       || die "failed to update PAM settings in 
auth-system.conf.ext"
-               # mailbase does not provide a sieve pam file
-               use managesieve && dosym imap /etc/pam.d/sieve
-               sed -i -e \
-                       's/#!include auth-system.conf.ext/!include 
auth-system.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update PAM settings in 10-auth.conf"
-       fi
-
-       # Disable ipv6 if necessary
-       if ! use ipv6; then
-               sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-                       || die "failed to update listen settings in 
dovecot.conf"
-       fi
-
-       # Update ssl cert locations
-       if use ssl; then
-               sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-               || die "ssl conf failed"
-               sed -i -e 's:^ssl_cert =.*:ssl_cert = 
</etc/ssl/dovecot/server.pem:' \
-                       -e 's:^ssl_key =.*:ssl_key = 
</etc/ssl/dovecot/server.key:' \
-                       "${confd}/10-ssl.conf" || die "failed to update SSL 
settings in 10-ssl.conf"
-       fi
-
-       # Install SQL configuration
-       if use mysql || use postgres; then
-               sed -i -e \
-                       's/#!include auth-sql.conf.ext/!include 
auth-sql.conf.ext/' \
-                       "${confd}/10-auth.conf" || die "failed to update SQL 
settings in \
-                       10-auth.conf"
-       fi
-
-       # Install LDAP configuration
-       if use ldap; then
-               sed -i -e \
-                       's/#!include auth-ldap.conf.ext/!include 
auth-ldap.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update ldap settings in 10-auth.conf"
-       fi
-
-       if use vpopmail; then
-               sed -i -e \
-                       's/#!include auth-vpopmail.conf.ext/!include 
auth-vpopmail.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update vpopmail settings in 
10-auth.conf"
-       fi
-
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake DESTDIR="${ED}" install
-               sed -i -e \
-                       's/^[[:space:]]*#mail_plugins = 
$mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-                       || die "failed to update sieve settings in 15-lda.conf"
-               rm -rf "${ED}"/usr/share/doc/dovecot
-               docinto example-config/conf.d
-               dodoc doc/example-config/conf.d/*.conf
-               insinto /etc/dovecot/conf.d
-               doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-               use managesieve && doins 
doc/example-config/conf.d/20-managesieve.conf
-               docinto sieve/rfc
-               dodoc doc/rfc/*.txt
-               docinto sieve/devel
-               dodoc doc/devel/DESIGN
-               docinto plugins
-               dodoc doc/plugins/*.txt
-               docinto extensions
-               dodoc doc/extensions/*.txt
-               docinto locations
-               dodoc doc/locations/*.txt
-               doman doc/man/*.{1,7}
-       fi
-
-       use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-       if use ssl; then
-       # Let's not make a new certificate if we already have one
-               if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-               -e "${ROOT}"/etc/ssl/dovecot/server.key ]];     then
-                       einfo "Creating SSL     certificate"
-                       SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP 
Server}"
-                       install_cert /etc/ssl/dovecot/server
-               fi
-       fi
-
-       elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade 
notes."
-}

diff --git a/net-mail/dovecot/dovecot-2.2.24.ebuild 
b/net-mail/dovecot/dovecot-2.2.24.ebuild
deleted file mode 100644
index 86c3d68..00000000
--- a/net-mail/dovecot/dovecot-2.2.24.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.14"
-if [[ ${PV} == *_rc* ]] ; then
-       rc_dir="rc/"
-else
-       rc_dir=""
-fi
-SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-       sieve? (
-       
http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       )
-       managesieve? (
-       
http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       ) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/";
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve 
solr +ssl static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} 
${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-       caps? ( sys-libs/libcap )
-       kerberos? ( virtual/krb5 )
-       ldap? ( net-nds/openldap )
-       lucene? ( >=dev-cpp/clucene-2.3 )
-       lzma? ( app-arch/xz-utils )
-       lz4? ( app-arch/lz4 )
-       mysql? ( virtual/mysql )
-       pam? ( virtual/pam )
-       postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-       selinux? ( sec-policy/selinux-dovecot )
-       solr? ( net-misc/curl dev-libs/expat )
-       sqlite? ( dev-db/sqlite:* )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0 )
-               libressl? ( dev-libs/libressl )
-       )
-       tcpd? ( sys-apps/tcp-wrappers )
-       textcat? ( app-text/libexttextcat )
-       vpopmail? ( net-mail/vpopmail )
-       zlib? ( sys-libs/zlib )
-       virtual/libiconv
-       dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-       net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-       if use managesieve && ! use sieve; then
-               ewarn "managesieve USE flag selected but sieve USE flag 
unselected"
-               ewarn "sieve USE flag will be turned on"
-       fi
-       # default internal user
-       enewgroup dovecot 97
-       enewuser dovecot 97 -1 /dev/null dovecot
-       # default login user
-       enewuser dovenull -1 -1 /dev/null
-       # add "mail" group for suid'ing. Better security isolation.
-       if use suid; then
-               enewgroup mail
-       fi
-}
-
-src_prepare() {
-       eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
-       eapply_user
-}
-
-src_configure() {
-       local conf=""
-
-       if use postgres || use mysql || use sqlite; then
-               conf="${conf} --with-sql"
-       fi
-
-       local storages=""
-       for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-               use ${storage} && storages="${storage} ${storages}"
-       done
-       [ "${storages}" ] || storages="maildir"
-
-       # turn valgrind tests off. Bug #340791
-       VALGRIND=no econf \
-               --localstatedir="${EPREFIX}/var" \
-               --runstatedir="${EPREFIX}/run" \
-               --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-               --without-stemmer \
-               --with-storages="${storages}" \
-               --disable-rpath \
-               --with-icu \
-               --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-               $( use_with bzip2 bzlib ) \
-               $( use_with caps libcap ) \
-               $( use_with kerberos gssapi ) \
-               $( use_with ldap ) \
-               $( use_with lucene ) \
-               $( use_with lz4 ) \
-               $( use_with lzma ) \
-               $( use_with mysql ) \
-               $( use_with pam ) \
-               $( use_with postgres pgsql ) \
-               $( use_with sqlite ) \
-               $( use_with solr ) \
-               $( use_with ssl ) \
-               $( use_with tcpd libwrap ) \
-               $( use_with textcat ) \
-               $( use_with vpopmail ) \
-               $( use_with zlib ) \
-               $( use_enable static-libs static ) \
-               ${conf}
-
-       if use sieve || use managesieve ; then
-               # The sieve plugin needs this file to be build to determine the 
plugin
-               # directory and the list of libraries to link to.
-               emake dovecot-config
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               econf \
-                       $( use_enable static-libs static ) \
-                       --localstatedir="${EPREFIX}/var" \
-                       --enable-shared \
-                       --with-dovecot="../${MY_P}" \
-                       $( use_with managesieve )
-       fi
-}
-
-src_compile() {
-       default
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-       fi
-}
-
-src_test() {
-       default
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               default
-       fi
-}
-
-src_install () {
-       default
-
-       # insecure:
-       # use suid && fperms u+s /usr/libexec/dovecot/deliver
-       # better:
-       if use suid;then
-               einfo "Changing perms to allow deliver to be suided"
-               fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-               fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-       fi
-
-       newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-       rm -rf "${ED}"/usr/share/doc/dovecot
-
-       dodoc AUTHORS NEWS README TODO
-       dodoc doc/*.{txt,cnf,xml,sh}
-       docinto example-config
-       dodoc doc/example-config/*.{conf,ext}
-       docinto example-config/conf.d
-       dodoc doc/example-config/conf.d/*.{conf,ext}
-       docinto wiki
-       dodoc doc/wiki/*
-       doman doc/man/*.{1,7}
-
-       # Create the dovecot.conf file from the dovecot-example.conf file that
-       # the dovecot folks nicely left for us....
-       local conf="${ED}/etc/dovecot/dovecot.conf"
-       local confd="${ED}/etc/dovecot/conf.d"
-
-       insinto /etc/dovecot
-       doins doc/example-config/*.{conf,ext}
-       insinto /etc/dovecot/conf.d
-       doins doc/example-config/conf.d/*.{conf,ext}
-       fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-       rm -f "${confd}/../README"
-
-       # .maildir is the Gentoo default
-       local mail_location="maildir:~/.maildir"
-       if ! use maildir; then
-               if use mbox; then
-                       
mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-                       keepdir /var/dovecot
-                       sed -i -e 's|#mail_privileged_group 
=|mail_privileged_group = mail|' \
-                       "${confd}/10-mail.conf" || die "sed failed"
-               elif use mdbox ; then
-                       mail_location="mdbox:~/.mdbox"
-               elif use sdbox ; then
-                       mail_location="sdbox:~/.sdbox"
-               fi
-       fi
-       sed -i -e \
-               "s|#mail_location =|mail_location = ${mail_location}|" \
-               "${confd}/10-mail.conf" \
-               || die "failed to update mail location settings in 10-mail.conf"
-
-       # We're using pam files (imap and pop3) provided by mailbase
-       if use pam; then
-               sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = 
"\*"|' \
-                       "${confd}/auth-system.conf.ext" \
-                       || die "failed to update PAM settings in 
auth-system.conf.ext"
-               # mailbase does not provide a sieve pam file
-               use managesieve && dosym imap /etc/pam.d/sieve
-               sed -i -e \
-                       's/#!include auth-system.conf.ext/!include 
auth-system.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update PAM settings in 10-auth.conf"
-       fi
-
-       # Disable ipv6 if necessary
-       if ! use ipv6; then
-               sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-                       || die "failed to update listen settings in 
dovecot.conf"
-       fi
-
-       # Update ssl cert locations
-       if use ssl; then
-               sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-               || die "ssl conf failed"
-               sed -i -e 's:^ssl_cert =.*:ssl_cert = 
</etc/ssl/dovecot/server.pem:' \
-                       -e 's:^ssl_key =.*:ssl_key = 
</etc/ssl/dovecot/server.key:' \
-                       "${confd}/10-ssl.conf" || die "failed to update SSL 
settings in 10-ssl.conf"
-       fi
-
-       # Install SQL configuration
-       if use mysql || use postgres; then
-               sed -i -e \
-                       's/#!include auth-sql.conf.ext/!include 
auth-sql.conf.ext/' \
-                       "${confd}/10-auth.conf" || die "failed to update SQL 
settings in \
-                       10-auth.conf"
-       fi
-
-       # Install LDAP configuration
-       if use ldap; then
-               sed -i -e \
-                       's/#!include auth-ldap.conf.ext/!include 
auth-ldap.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update ldap settings in 10-auth.conf"
-       fi
-
-       if use vpopmail; then
-               sed -i -e \
-                       's/#!include auth-vpopmail.conf.ext/!include 
auth-vpopmail.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update vpopmail settings in 
10-auth.conf"
-       fi
-
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake DESTDIR="${ED}" install
-               sed -i -e \
-                       's/^[[:space:]]*#mail_plugins = 
$mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-                       || die "failed to update sieve settings in 15-lda.conf"
-               rm -rf "${ED}"/usr/share/doc/dovecot
-               docinto example-config/conf.d
-               dodoc doc/example-config/conf.d/*.conf
-               insinto /etc/dovecot/conf.d
-               doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-               use managesieve && doins 
doc/example-config/conf.d/20-managesieve.conf
-               docinto sieve/rfc
-               dodoc doc/rfc/*.txt
-               docinto sieve/devel
-               dodoc doc/devel/DESIGN
-               docinto plugins
-               dodoc doc/plugins/*.txt
-               docinto extensions
-               dodoc doc/extensions/*.txt
-               docinto locations
-               dodoc doc/locations/*.txt
-               doman doc/man/*.{1,7}
-       fi
-
-       use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-       if use ssl; then
-       # Let's not make a new certificate if we already have one
-               if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-               -e "${ROOT}"/etc/ssl/dovecot/server.key ]];     then
-                       einfo "Creating SSL     certificate"
-                       SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP 
Server}"
-                       install_cert /etc/ssl/dovecot/server
-               fi
-       fi
-
-       elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade 
notes."
-}

diff --git a/net-mail/dovecot/dovecot-2.2.25.ebuild 
b/net-mail/dovecot/dovecot-2.2.25.ebuild
deleted file mode 100644
index 55aa84e..00000000
--- a/net-mail/dovecot/dovecot-2.2.25.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.15"
-if [[ ${PV} == *_rc* ]] ; then
-       rc_dir="rc/"
-else
-       rc_dir=""
-fi
-SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-       sieve? (
-       
http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       )
-       managesieve? (
-       
http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       ) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/";
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="alpha ~amd64 arm hppa ~ppc ppc64 ~s390 ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve 
solr +ssl static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} 
${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-       caps? ( sys-libs/libcap )
-       kerberos? ( virtual/krb5 )
-       ldap? ( net-nds/openldap )
-       lucene? ( >=dev-cpp/clucene-2.3 )
-       lzma? ( app-arch/xz-utils )
-       lz4? ( app-arch/lz4 )
-       mysql? ( virtual/mysql )
-       pam? ( virtual/pam )
-       postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-       selinux? ( sec-policy/selinux-dovecot )
-       solr? ( net-misc/curl dev-libs/expat )
-       sqlite? ( dev-db/sqlite:* )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0 )
-               libressl? ( dev-libs/libressl )
-       )
-       tcpd? ( sys-apps/tcp-wrappers )
-       textcat? ( app-text/libexttextcat )
-       vpopmail? ( net-mail/vpopmail )
-       zlib? ( sys-libs/zlib )
-       virtual/libiconv
-       dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-       net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-       if use managesieve && ! use sieve; then
-               ewarn "managesieve USE flag selected but sieve USE flag 
unselected"
-               ewarn "sieve USE flag will be turned on"
-       fi
-       # default internal user
-       enewgroup dovecot 97
-       enewuser dovecot 97 -1 /dev/null dovecot
-       # default login user
-       enewuser dovenull -1 -1 /dev/null
-       # add "mail" group for suid'ing. Better security isolation.
-       if use suid; then
-               enewgroup mail
-       fi
-}
-
-src_prepare() {
-       eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
-       eapply_user
-}
-
-src_configure() {
-       local conf=""
-
-       if use postgres || use mysql || use sqlite; then
-               conf="${conf} --with-sql"
-       fi
-
-       local storages=""
-       for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-               use ${storage} && storages="${storage} ${storages}"
-       done
-       [ "${storages}" ] || storages="maildir"
-
-       # turn valgrind tests off. Bug #340791
-       VALGRIND=no econf \
-               --localstatedir="${EPREFIX}/var" \
-               --runstatedir="${EPREFIX}/run" \
-               --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-               --without-stemmer \
-               --with-storages="${storages}" \
-               --disable-rpath \
-               --with-icu \
-               --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-               $( use_with bzip2 bzlib ) \
-               $( use_with caps libcap ) \
-               $( use_with kerberos gssapi ) \
-               $( use_with ldap ) \
-               $( use_with lucene ) \
-               $( use_with lz4 ) \
-               $( use_with lzma ) \
-               $( use_with mysql ) \
-               $( use_with pam ) \
-               $( use_with postgres pgsql ) \
-               $( use_with sqlite ) \
-               $( use_with solr ) \
-               $( use_with ssl ) \
-               $( use_with tcpd libwrap ) \
-               $( use_with textcat ) \
-               $( use_with vpopmail ) \
-               $( use_with zlib ) \
-               $( use_enable static-libs static ) \
-               ${conf}
-
-       if use sieve || use managesieve ; then
-               # The sieve plugin needs this file to be build to determine the 
plugin
-               # directory and the list of libraries to link to.
-               emake dovecot-config
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               econf \
-                       $( use_enable static-libs static ) \
-                       --localstatedir="${EPREFIX}/var" \
-                       --enable-shared \
-                       --with-dovecot="../${MY_P}" \
-                       $( use_with managesieve )
-       fi
-}
-
-src_compile() {
-       default
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-       fi
-}
-
-src_test() {
-       default
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               default
-       fi
-}
-
-src_install () {
-       default
-
-       # insecure:
-       # use suid && fperms u+s /usr/libexec/dovecot/deliver
-       # better:
-       if use suid;then
-               einfo "Changing perms to allow deliver to be suided"
-               fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-               fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-       fi
-
-       newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-       rm -rf "${ED}"/usr/share/doc/dovecot
-
-       dodoc AUTHORS NEWS README TODO
-       dodoc doc/*.{txt,cnf,xml,sh}
-       docinto example-config
-       dodoc doc/example-config/*.{conf,ext}
-       docinto example-config/conf.d
-       dodoc doc/example-config/conf.d/*.{conf,ext}
-       docinto wiki
-       dodoc doc/wiki/*
-       doman doc/man/*.{1,7}
-
-       # Create the dovecot.conf file from the dovecot-example.conf file that
-       # the dovecot folks nicely left for us....
-       local conf="${ED}/etc/dovecot/dovecot.conf"
-       local confd="${ED}/etc/dovecot/conf.d"
-
-       insinto /etc/dovecot
-       doins doc/example-config/*.{conf,ext}
-       insinto /etc/dovecot/conf.d
-       doins doc/example-config/conf.d/*.{conf,ext}
-       fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-       rm -f "${confd}/../README"
-
-       # .maildir is the Gentoo default
-       local mail_location="maildir:~/.maildir"
-       if ! use maildir; then
-               if use mbox; then
-                       
mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-                       keepdir /var/dovecot
-                       sed -i -e 's|#mail_privileged_group 
=|mail_privileged_group = mail|' \
-                       "${confd}/10-mail.conf" || die "sed failed"
-               elif use mdbox ; then
-                       mail_location="mdbox:~/.mdbox"
-               elif use sdbox ; then
-                       mail_location="sdbox:~/.sdbox"
-               fi
-       fi
-       sed -i -e \
-               "s|#mail_location =|mail_location = ${mail_location}|" \
-               "${confd}/10-mail.conf" \
-               || die "failed to update mail location settings in 10-mail.conf"
-
-       # We're using pam files (imap and pop3) provided by mailbase
-       if use pam; then
-               sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = 
"\*"|' \
-                       "${confd}/auth-system.conf.ext" \
-                       || die "failed to update PAM settings in 
auth-system.conf.ext"
-               # mailbase does not provide a sieve pam file
-               use managesieve && dosym imap /etc/pam.d/sieve
-               sed -i -e \
-                       's/#!include auth-system.conf.ext/!include 
auth-system.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update PAM settings in 10-auth.conf"
-       fi
-
-       # Disable ipv6 if necessary
-       if ! use ipv6; then
-               sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-                       || die "failed to update listen settings in 
dovecot.conf"
-       fi
-
-       # Update ssl cert locations
-       if use ssl; then
-               sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-               || die "ssl conf failed"
-               sed -i -e 's:^ssl_cert =.*:ssl_cert = 
</etc/ssl/dovecot/server.pem:' \
-                       -e 's:^ssl_key =.*:ssl_key = 
</etc/ssl/dovecot/server.key:' \
-                       "${confd}/10-ssl.conf" || die "failed to update SSL 
settings in 10-ssl.conf"
-       fi
-
-       # Install SQL configuration
-       if use mysql || use postgres; then
-               sed -i -e \
-                       's/#!include auth-sql.conf.ext/!include 
auth-sql.conf.ext/' \
-                       "${confd}/10-auth.conf" || die "failed to update SQL 
settings in \
-                       10-auth.conf"
-       fi
-
-       # Install LDAP configuration
-       if use ldap; then
-               sed -i -e \
-                       's/#!include auth-ldap.conf.ext/!include 
auth-ldap.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update ldap settings in 10-auth.conf"
-       fi
-
-       if use vpopmail; then
-               sed -i -e \
-                       's/#!include auth-vpopmail.conf.ext/!include 
auth-vpopmail.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update vpopmail settings in 
10-auth.conf"
-       fi
-
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake DESTDIR="${ED}" install
-               sed -i -e \
-                       's/^[[:space:]]*#mail_plugins = 
$mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-                       || die "failed to update sieve settings in 15-lda.conf"
-               rm -rf "${ED}"/usr/share/doc/dovecot
-               docinto example-config/conf.d
-               dodoc doc/example-config/conf.d/*.conf
-               insinto /etc/dovecot/conf.d
-               doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-               use managesieve && doins 
doc/example-config/conf.d/20-managesieve.conf
-               docinto sieve/rfc
-               dodoc doc/rfc/*.txt
-               docinto sieve/devel
-               dodoc doc/devel/DESIGN
-               docinto plugins
-               dodoc doc/plugins/*.txt
-               docinto extensions
-               dodoc doc/extensions/*.txt
-               docinto locations
-               dodoc doc/locations/*.txt
-               doman doc/man/*.{1,7}
-       fi
-
-       use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-       if use ssl; then
-       # Let's not make a new certificate if we already have one
-               if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-               -e "${ROOT}"/etc/ssl/dovecot/server.key ]];     then
-                       einfo "Creating SSL     certificate"
-                       SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP 
Server}"
-                       install_cert /etc/ssl/dovecot/server
-               fi
-       fi
-
-       elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade 
notes."
-}

diff --git a/net-mail/dovecot/dovecot-2.2.26.0.ebuild 
b/net-mail/dovecot/dovecot-2.2.26.0.ebuild
deleted file mode 100644
index 01daedb..00000000
--- a/net-mail/dovecot/dovecot-2.2.26.0.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.16"
-if [[ ${PV} == *_rc* ]] ; then
-       rc_dir="rc/"
-else
-       rc_dir=""
-fi
-SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-       sieve? (
-       
http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       )
-       managesieve? (
-       
http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       ) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/";
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve 
solr +ssl static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} 
${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-       caps? ( sys-libs/libcap )
-       kerberos? ( virtual/krb5 )
-       ldap? ( net-nds/openldap )
-       lucene? ( >=dev-cpp/clucene-2.3 )
-       lzma? ( app-arch/xz-utils )
-       lz4? ( app-arch/lz4 )
-       mysql? ( virtual/mysql )
-       pam? ( virtual/pam )
-       postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-       selinux? ( sec-policy/selinux-dovecot )
-       solr? ( net-misc/curl dev-libs/expat )
-       sqlite? ( dev-db/sqlite:* )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0 )
-               libressl? ( dev-libs/libressl )
-       )
-       tcpd? ( sys-apps/tcp-wrappers )
-       textcat? ( app-text/libexttextcat )
-       vpopmail? ( net-mail/vpopmail )
-       zlib? ( sys-libs/zlib )
-       virtual/libiconv
-       dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-       net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-       if use managesieve && ! use sieve; then
-               ewarn "managesieve USE flag selected but sieve USE flag 
unselected"
-               ewarn "sieve USE flag will be turned on"
-       fi
-       # default internal user
-       enewgroup dovecot 97
-       enewuser dovecot 97 -1 /dev/null dovecot
-       # default login user
-       enewuser dovenull -1 -1 /dev/null
-       # add "mail" group for suid'ing. Better security isolation.
-       if use suid; then
-               enewgroup mail
-       fi
-}
-
-src_prepare() {
-       eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
-       eapply_user
-}
-
-src_configure() {
-       local conf=""
-
-       if use postgres || use mysql || use sqlite; then
-               conf="${conf} --with-sql"
-       fi
-
-       local storages=""
-       for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-               use ${storage} && storages="${storage} ${storages}"
-       done
-       [ "${storages}" ] || storages="maildir"
-
-       # turn valgrind tests off. Bug #340791
-       VALGRIND=no econf \
-               --localstatedir="${EPREFIX}/var" \
-               --runstatedir="${EPREFIX}/run" \
-               --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-               --without-stemmer \
-               --with-storages="${storages}" \
-               --disable-rpath \
-               --with-icu \
-               --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-               $( use_with bzip2 bzlib ) \
-               $( use_with caps libcap ) \
-               $( use_with kerberos gssapi ) \
-               $( use_with ldap ) \
-               $( use_with lucene ) \
-               $( use_with lz4 ) \
-               $( use_with lzma ) \
-               $( use_with mysql ) \
-               $( use_with pam ) \
-               $( use_with postgres pgsql ) \
-               $( use_with sqlite ) \
-               $( use_with solr ) \
-               $( use_with ssl ) \
-               $( use_with tcpd libwrap ) \
-               $( use_with textcat ) \
-               $( use_with vpopmail ) \
-               $( use_with zlib ) \
-               $( use_enable static-libs static ) \
-               ${conf}
-
-       if use sieve || use managesieve ; then
-               # The sieve plugin needs this file to be build to determine the 
plugin
-               # directory and the list of libraries to link to.
-               emake dovecot-config
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               econf \
-                       $( use_enable static-libs static ) \
-                       --localstatedir="${EPREFIX}/var" \
-                       --enable-shared \
-                       --with-dovecot="../${MY_P}" \
-                       $( use_with managesieve )
-       fi
-}
-
-src_compile() {
-       default
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-       fi
-}
-
-src_test() {
-       default
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               default
-       fi
-}
-
-src_install () {
-       default
-
-       # insecure:
-       # use suid && fperms u+s /usr/libexec/dovecot/deliver
-       # better:
-       if use suid;then
-               einfo "Changing perms to allow deliver to be suided"
-               fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-               fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-       fi
-
-       newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-       rm -rf "${ED}"/usr/share/doc/dovecot
-
-       dodoc AUTHORS NEWS README TODO
-       dodoc doc/*.{txt,cnf,xml,sh}
-       docinto example-config
-       dodoc doc/example-config/*.{conf,ext}
-       docinto example-config/conf.d
-       dodoc doc/example-config/conf.d/*.{conf,ext}
-       docinto wiki
-       dodoc doc/wiki/*
-       doman doc/man/*.{1,7}
-
-       # Create the dovecot.conf file from the dovecot-example.conf file that
-       # the dovecot folks nicely left for us....
-       local conf="${ED}/etc/dovecot/dovecot.conf"
-       local confd="${ED}/etc/dovecot/conf.d"
-
-       insinto /etc/dovecot
-       doins doc/example-config/*.{conf,ext}
-       insinto /etc/dovecot/conf.d
-       doins doc/example-config/conf.d/*.{conf,ext}
-       fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-       rm -f "${confd}/../README"
-
-       # .maildir is the Gentoo default
-       local mail_location="maildir:~/.maildir"
-       if ! use maildir; then
-               if use mbox; then
-                       
mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-                       keepdir /var/dovecot
-                       sed -i -e 's|#mail_privileged_group 
=|mail_privileged_group = mail|' \
-                       "${confd}/10-mail.conf" || die "sed failed"
-               elif use mdbox ; then
-                       mail_location="mdbox:~/.mdbox"
-               elif use sdbox ; then
-                       mail_location="sdbox:~/.sdbox"
-               fi
-       fi
-       sed -i -e \
-               "s|#mail_location =|mail_location = ${mail_location}|" \
-               "${confd}/10-mail.conf" \
-               || die "failed to update mail location settings in 10-mail.conf"
-
-       # We're using pam files (imap and pop3) provided by mailbase
-       if use pam; then
-               sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = 
"\*"|' \
-                       "${confd}/auth-system.conf.ext" \
-                       || die "failed to update PAM settings in 
auth-system.conf.ext"
-               # mailbase does not provide a sieve pam file
-               use managesieve && dosym imap /etc/pam.d/sieve
-               sed -i -e \
-                       's/#!include auth-system.conf.ext/!include 
auth-system.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update PAM settings in 10-auth.conf"
-       fi
-
-       # Disable ipv6 if necessary
-       if ! use ipv6; then
-               sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-                       || die "failed to update listen settings in 
dovecot.conf"
-       fi
-
-       # Update ssl cert locations
-       if use ssl; then
-               sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-               || die "ssl conf failed"
-               sed -i -e 's:^ssl_cert =.*:ssl_cert = 
</etc/ssl/dovecot/server.pem:' \
-                       -e 's:^ssl_key =.*:ssl_key = 
</etc/ssl/dovecot/server.key:' \
-                       "${confd}/10-ssl.conf" || die "failed to update SSL 
settings in 10-ssl.conf"
-       fi
-
-       # Install SQL configuration
-       if use mysql || use postgres; then
-               sed -i -e \
-                       's/#!include auth-sql.conf.ext/!include 
auth-sql.conf.ext/' \
-                       "${confd}/10-auth.conf" || die "failed to update SQL 
settings in \
-                       10-auth.conf"
-       fi
-
-       # Install LDAP configuration
-       if use ldap; then
-               sed -i -e \
-                       's/#!include auth-ldap.conf.ext/!include 
auth-ldap.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update ldap settings in 10-auth.conf"
-       fi
-
-       if use vpopmail; then
-               sed -i -e \
-                       's/#!include auth-vpopmail.conf.ext/!include 
auth-vpopmail.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update vpopmail settings in 
10-auth.conf"
-       fi
-
-       if use sieve || use managesieve ; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake DESTDIR="${ED}" install
-               sed -i -e \
-                       's/^[[:space:]]*#mail_plugins = 
$mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-                       || die "failed to update sieve settings in 15-lda.conf"
-               rm -rf "${ED}"/usr/share/doc/dovecot
-               docinto example-config/conf.d
-               dodoc doc/example-config/conf.d/*.conf
-               insinto /etc/dovecot/conf.d
-               doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-               use managesieve && doins 
doc/example-config/conf.d/20-managesieve.conf
-               docinto sieve/rfc
-               dodoc doc/rfc/*.txt
-               docinto sieve/devel
-               dodoc doc/devel/DESIGN
-               docinto plugins
-               dodoc doc/plugins/*.txt
-               docinto extensions
-               dodoc doc/extensions/*.txt
-               docinto locations
-               dodoc doc/locations/*.txt
-               doman doc/man/*.{1,7}
-       fi
-
-       use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-       if use ssl; then
-       # Let's not make a new certificate if we already have one
-               if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-               -e "${ROOT}"/etc/ssl/dovecot/server.key ]];     then
-                       einfo "Creating SSL     certificate"
-                       SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP 
Server}"
-                       install_cert /etc/ssl/dovecot/server
-               fi
-       fi
-
-       elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade 
notes."
-}