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

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

11 files changed, 9 insertions, 2424 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 9971a9959513..0a57c0a49c1a 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.244 2010/06/20 10:29:06 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.245 2010/07/14 16:00:05 darkside Exp $
+
+  14 Jul 2010; Jeremy Olexa <darkside@gentoo.org> -dovecot-1.1.7-r1.ebuild,
+  -dovecot-1.1.16.ebuild, -dovecot-1.2.6.ebuild, -dovecot-1.2.7.ebuild,
+  -dovecot-1.2.9-r1.ebuild, -dovecot-1.2.10-r1.ebuild,
+  -dovecot-1.2.11.ebuild, -dovecot-2.0_beta4.ebuild,
+  -dovecot-2.0_beta5.ebuild:
+  Remove many vulnerable versions, bug 314533 (and some stale newer ones)
 
 *dovecot-1.2.12 (20 Jun 2010)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 8b6055010d3c..d243a311a917 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -5,58 +5,29 @@ AUX dovecot-1.1.11-c08c602ca0dc.patch 1110 RMD160 dbb1908ce6959c6efe1bb43e315573
 AUX dovecot-1.2.init 1720 RMD160 0f641929fd2c58878f6d69e6ba454b9110603031 SHA1 c498c5208f0504f2eadc460d515f563f907d05ef SHA256 9c7ef516324cd5a17c5f28f6af272d8d06106420c747ff5c4da6fa14a3ac316c
 AUX dovecot.init 874 RMD160 aa899b69d42946dcf2262c38731319474e759041 SHA1 4f0a95cf6ba9e86bd9008694ea927dc97703b24d SHA256 145d68382d757110aa86f58b2567fb25648fa0ca62788e3461f2b45fc5999c80
 AUX dovecot.init-r2 1618 RMD160 5b5c88847c096282f5ab94b82db7fab5c9e42aa3 SHA1 d9f61ac897a6e377dc8cf2c6da4952a4ff7918e9 SHA256 6ad0d1fc09c41ba390e717667e4dad3838f669ef7b227e3cbdb60c499758a901
-DIST 2cb08c188b6a.tar.gz 659713 RMD160 62af3e681e6383c7dd4f7fb260ee0d621a20ffdd SHA1 114b28098fdbdd16c34e331173d580e699703b2d SHA256 73173159e1ddef016fa178ebd91bdf938597ae8c4c33bef7294f37599401fdcd
 DIST b877a1db00a5.tar.gz 666617 RMD160 021f74b27f613efdace9102028d334f378ab08a5 SHA1 e0fd744e54457692c1f9ebf5623f5c920a040b87 SHA256 69fc9beff5a637eda802b5e5a840b652a22da699e8a6b602fe93cea00d97539a
-DIST b8dbef9ec43b.tar.gz 663065 RMD160 6a071c68f972a14f783eb8b4ce85af205e5e2022 SHA1 72ce2c45c0729ef419e5e87a7a06e268290e45f9 SHA256 d2c919987d5862762a8640f107b586d064f2959cd8cd0a12d26be15fcb88e1d9
-DIST dovecot-1.1-managesieve-0.10.4.tar.gz 397332 RMD160 4da8129ead0de9d807e7311849a1b660c7f0509a SHA1 70a84beb5477738ff03024c4ce18a678b90fa1df SHA256 3a66a9dcad5b3a291cd87364fbb961725aa1473cf9c7ce7fa675ba71fe9313ae
-DIST dovecot-1.1-managesieve-0.10.6.tar.gz 395642 RMD160 a4c0b123e2a3b93805d264703426dbdf97b369da SHA1 8644426936bc85c90e3dfdc7a72645c635063149 SHA256 72f8c0fdc7da85321b75e3893c17aa540a915511b474ade5ff3c936cec10879b
 DIST dovecot-1.1-managesieve-0.10.7.tar.gz 358166 RMD160 a8ca467e4a61b916a68a8252e6c3e8adc211472c SHA1 88d7b88dfc1cb4cc4dfac4de6aa3601a5272d345 SHA256 122deb67237714601223112846604942fe70c4d52edc8142851de0be502d8c23
-DIST dovecot-1.1.16-managesieve-0.10.6.diff.gz 6172 RMD160 7d485c20b8e3b53c68255d56cc0d9bfef8007e3a SHA1 2117c988a771bef2b8c8e93b3cb2fb787abcb8da SHA256 0d71af4a23be6aa6388d6bb645a5055b6838204784da7daa75c0e95819119ae8
-DIST dovecot-1.1.16.tar.gz 2383947 RMD160 53122e86f217e33f24b52559fece5ace35689eb4 SHA1 3aa7f386559f244b3a9addad27c4845c554e545b SHA256 1204c3d008eade19cb0211039c4a0fb16d089326e0aa9102880090f23f320fc3
 DIST dovecot-1.1.19-managesieve-0.10.7.diff.gz 6317 RMD160 b739bf737c38cda7744f8de609550f6c94a8e021 SHA1 f0e8726e8b1bc57362089fa07e5bb1c44961f5ac SHA256 63d9c896a5d6e2c52a41fd533e50ef24847392fc37fc47c0bc4322eefa2e47bb
 DIST dovecot-1.1.19.tar.gz 2389194 RMD160 8fe25b5a5347792e7aa919cc285c1b8c99bab36e SHA1 ce8f8a135a2c8ef1bd0cd1ceff04018402f3cb58 SHA256 33df1d97b9241b25dfcbc78c86ba6114f16ddf14763879432a6afe4acd1bc95a
-DIST dovecot-1.1.7-managesieve-0.10.4.diff.gz 5912 RMD160 7d22cd364cb1e95eaf6525b61e93208a3aff39ba SHA1 fad08ecf9a4d5cbfc77e32268af9e11ad0a55431 SHA256 dc13a3c231c7bd29a452e16f3654c941bfc2a89c31e6b392ac76ca47cd897a76
-DIST dovecot-1.1.7.tar.gz 2325617 RMD160 e2a53de356910094f2516b33f4155ded4cf5a6dc SHA1 d8554a1e1f04a84ddf009d1599526c016b36582b SHA256 915cae7684438c6335d0472ff20ec2fe44d620aa61f404ce91fd02a27434cf9f
-DIST dovecot-1.2-managesieve-0.11.10.tar.gz 400657 RMD160 b151df06a3f4be86f0a8327390ee8356a9a713c8 SHA1 f79eef8cda5db41f6b61ec0723d60c72559980eb SHA256 502cd9df26f95e53e5dff79b4430050e50b849908a0cb12c6b19ae5410a15681
 DIST dovecot-1.2-managesieve-0.11.11.tar.gz 439239 RMD160 161d143f5a42aee929abf51b62b3b0e6e7a9f07a SHA1 53f8618a9e02f953912390a7b803eb6218bf969a SHA256 792cc06e60250e29f517afa350069af2d7001746445d3b19bbf1aef8b6dd853e
 DIST dovecot-1.2-managesieve-0.11.9.tar.gz 396242 RMD160 1b85540bb0b32e30a6f8e780b6922c4e8ce3bb23 SHA1 63f3c6cf6615586c5b4bbd2feffc9f0c774edcb7 SHA256 9aff87fae19b2fc0e11f4b78c0b1415e1141ba3930579c46cbf912e0cda652ff
 DIST dovecot-1.2-sieve-0.1.12.tar.gz 964938 RMD160 92ed585f098ebaa37bececa56bdd912d47e7f162 SHA1 cd142f051b45b58cc162222f9ccdc12e1f69c343 SHA256 dc28182fc0bedb2622a851a33a1dab4c851aaa106c14550f782a3b8abde36514
-DIST dovecot-1.2-sieve-0.1.14.tar.gz 992724 RMD160 b61c9448c876062f2b1fd3d1cf72cbc430c5a82e SHA1 2ba2b4208fa9ed341c38ec8e918b4a87e46b8367 SHA256 880ee3857150f6154ca2ee4d2a9b1fcb3a42f04184b92a62987d0af1d826a72c
 DIST dovecot-1.2-sieve-0.1.15.tar.gz 1051262 RMD160 7fd3d23d5ef93d443cdedc8512dab649b2a99694 SHA1 2827df60028639ec15422a86f48a1c9b2a78431a SHA256 edddc49237d5cb07a7938de9850b475b071e9350b2035f99a15db7a56882295c
 DIST dovecot-1.2-sieve-0.1.16.tar.gz 1049918 RMD160 1609c33226946e403bcb00d97d7df3bea74a78f5 SHA1 88ac215356bb9e3e08adc54195c99d1317fd5a67 SHA256 fbe7f49244e05ca2c8fccfd3ac199723e9dfa0fd3608dce83ceaed923ffac974
 DIST dovecot-1.2-sieve-0.1.17.tar.gz 1029070 RMD160 7b53742c7388bf27521a46b8e1121f45a764df87 SHA1 420142a8438d76e3849727c3ab4bde5a5b7fb7e4 SHA256 e02a4a1b5958bbe1c8e216f11d00166e33c31b304cbd4180de29b1a1dd5e7d0b
-DIST dovecot-1.2.10-managesieve-0.11.11.diff.gz 6415 RMD160 875011115ac4050a57f1c96725628ca531ccb61f SHA1 11ff602015221300f291001daa09965e3e199428 SHA256 ef95762d0788869435c6a8d2bf9c416770e50b0f12267897a11d1a5331ac727e
-DIST dovecot-1.2.10.tar.gz 2864295 RMD160 0b508502b7c2e9aecd274bf15f1ec5adbb1843a7 SHA1 b717de1ab63f3d521c93385cbd20c49293921079 SHA256 a5d609e9e21aa0c727be2c48db662f0a5ff0824e28167a8d7779f5ccbbaa6ad2
 DIST dovecot-1.2.11-managesieve-0.11.11.diff.gz 6454 RMD160 bfd7593b8ffa36ac6062e0ff147c9759447d6352 SHA1 f27d32144e6db35715ac9de3acd7a7d8948f3323 SHA256 fc024e9f68c6ab82f811af3155c94f1609670d85c7240dfbd34aa045e6fc8a8b
 DIST dovecot-1.2.11.tar.gz 2878057 RMD160 cb2090a21e99cfaf98d7cbfdc98adbf42df6e2cc SHA1 97e63377be3641d4c7aa5a0c6d4e2bd602d45972 SHA256 2971691d4f8307b7014ca6671f44151cb53379f80746aa4a95cdeb0b846e0474
 DIST dovecot-1.2.12-managesieve-0.11.11.diff.gz 6455 RMD160 8f55a97e9a68e53faafa78a5f725969403f1f295 SHA1 f3719fc5427c97c65416658d73ff3234eaa204c9 SHA256 ea6549ed32cb1968971ef00725b43c8154023b4ed67ae1eb272485a0cf90a64f
 DIST dovecot-1.2.12.tar.gz 2882517 RMD160 9a2ecf836607905acebee57d082b0b4c36108260 SHA1 72fedd20c00eb3763012555c3622f84286cb8e65 SHA256 1ef0c40822cf64f20af1e65b4402da75296489aba25df8b13e2386df6952c281
-DIST dovecot-1.2.6-managesieve-0.11.9.diff.gz 6443 RMD160 43408c4090e7c384a30bacfd207453e50583271d SHA1 c2710e09c9b71ce3607e5614683de4748dac6d85 SHA256 4928fea010f3d993d2fc2bb624cf7586680f42aad2f7548f515773ed244a0164
-DIST dovecot-1.2.6.tar.gz 2668219 RMD160 e6086e1a57dd3cf75614823916b509fedfc5283d SHA1 02ede3936123252d542da90488a2d189fa39979c SHA256 b8511688a631bbf1ec35e87c685cf4252085404a931ca20e470ace2a28d4c225
 DIST dovecot-1.2.7-managesieve-0.11.9.diff.gz 6458 RMD160 32fe5f253b352063f21166596efe66684df1d251 SHA1 636976c8302fc1f45085b4bc5a6970104fe0dce7 SHA256 bce916dd22493cbc0eaf918f75da1e2bef48d5d9fc5ce0bfec8d950754af4659
-DIST dovecot-1.2.7.tar.gz 2701990 RMD160 70380ce4e2ba9cc7721bd69b578fa3633076a7d5 SHA1 418e890e7007dfe2e2ed34dae08247e0d920cb53 SHA256 4ebd51a10f4f58329f2974b9e098a777d383b01dc43927b4a6103bcbe1478ec8
 DIST dovecot-1.2.8.tar.gz 2702887 RMD160 b685d002224435f372364b7e69d550c136630cea SHA1 ded015aa8094070a7315840a9a329e97de93a85d SHA256 145c5dd8519d526c4bc2c1b4d6b5eeb09ba000f57fe5e16af1f72a73acc788c7
-DIST dovecot-1.2.9-managesieve-0.11.10.diff.gz 6456 RMD160 5e9692bf733d2100c5af7c066765c1383c43d346 SHA1 f817137163eb4b1cf9e310753f49569dde3f038b SHA256 07a292f37924332bb4ce6c27be5317afa6caa60ecac52e248110e7e1e9d434d5
-DIST dovecot-1.2.9.tar.gz 2889394 RMD160 fa17bafabdd6fab69c22d617deff368a4bc165d1 SHA1 7c1013a1bc856a4366f76ac1f40e856185695e20 SHA256 b4661e2e839ec2dde27e74c596d1157530b80c767ce42566c894553cb16a6887
-DIST dovecot-2.0.beta4.tar.gz 3315148 RMD160 cf155d09d13679b75b77849345f5369f5b3ddcd4 SHA1 9e919df0d4dac0d696e2abfc0c00aa96401f7c92 SHA256 7630510f2f2806190b419dd6c51eeca5f45d7030f1b260692bb59aa57988d14c
-DIST dovecot-2.0.beta5.tar.gz 3409443 RMD160 35c3b09f938edd79f14674744a58c2a64c3703ac SHA1 cbd9a4677f09d91db09e84ee6a07a7474847e0e2 SHA256 89077a43bd09747d41619fa0c56e50005684e80a5d92ddbf1f4f22413e09455c
 DIST dovecot-2.0.beta6.tar.gz 3464359 RMD160 eecde90aab83c97ba5352c4a9ef990aec03a7f09 SHA1 97cea30ea6c0bfd2d6d6634aded83e27d4d2ae29 SHA256 bcbd26a6bd8ac0f199f94d8581bc6a314898adae823744ffa39ea72527787b31
-DIST dovecot-sieve-1.1.5.tar.gz 468913 RMD160 825a8ec07d49527d8551cb5f3f86b638fddbafbd SHA1 672adf0a2f1627d96f97fc63fecaf024dd9f7a42 SHA256 ec1ea94311d5fb6cb5dd7e451728784afb39521a6a580f640b4d2115505a5ddf
 DIST dovecot-sieve-1.1.6.tar.gz 470071 RMD160 ed6f75dc1ffdb0ec51ecf3786aa71092851289f5 SHA1 c109ee8ab1c7ffece7940fb2e37104baf784440e SHA256 a2130a8e7d732bb341a96a96a24b4ddb66834e116573a10c17e68344fe712b36
-EBUILD dovecot-1.1.16.ebuild 8586 RMD160 d0a9203fdbdd50ddbe09573736c0decdf99f2b46 SHA1 bd002da9f845e1ee3646c297c253ec82f30c749c SHA256 4dd5ac17ed3982d1698062d5f5486a85872777bd862d5ecda64a030c487ea43e
 EBUILD dovecot-1.1.19.ebuild 8581 RMD160 4cfb649e5cd577ab715f831210d6bdf7ddb7ea05 SHA1 3217a1cef3a0cd9192c7093d4cc3403eb1bcc9ea SHA256 b0fb355d36c9fc56016bfa3c6bcca07582dc60900c13c6c8d99848c98d8dada2
-EBUILD dovecot-1.1.7-r1.ebuild 8583 RMD160 0e26b14c442c01051a62dd2b9cab8cb6fe5431eb SHA1 a269cdd496301576ac0839139280ff5c86784622 SHA256 6df5376736feb2b8b3bc7e264c228b22029f680587d713e7ee5975f3816114d7
-EBUILD dovecot-1.2.10-r1.ebuild 7754 RMD160 e72ff73862166b30e838064916ca860453177b6e SHA1 26fc64c5fad728a55972973cf275a60a1e0d7fe2 SHA256 77c6a204485ad334452287c4dba7924a25ff5f716f460812a36f7a4316154191
 EBUILD dovecot-1.2.11-r1.ebuild 8541 RMD160 f31a3cff9606f0254ba14d5bd5f60962daf99dba SHA1 874ee918a521b1995da49d9e7bb9d7d28d78fd36 SHA256 0e75be8e0338a01c54e72b507d8fe3c17ef1aa31a19ece769a5e3311897ca0ed
 EBUILD dovecot-1.2.11-r2.ebuild 8545 RMD160 791057381b7e4162d80db05672a17d293088c86c SHA1 ac09851b1488badf7d06d0a3b4c335ce7df67835 SHA256 5d3657d28e49d52a14b62b8c6f071a08bb8d2adcb43c82d8fd44abf46c2ea5ca
-EBUILD dovecot-1.2.11.ebuild 7751 RMD160 cc476b3a9bfe68f0686328f3f8392abea154f621 SHA1 ce7cffd095b48791bab4e79d4a5dd4f6ff881549 SHA256 4b6d62503b66a5a42ed9015e2faf9531aa1cae5b26b8f5133a5f0544f8d360d3
 EBUILD dovecot-1.2.12.ebuild 8543 RMD160 6eff4f84419429dda14e690fdfd24b1a78c35a7a SHA1 4954856d55e12cc0180de46c565e0c663eb7da12 SHA256 b2c92a18575cec2f1e339227629084ebcf948aee6451f05358c694195c762390
-EBUILD dovecot-1.2.6.ebuild 7452 RMD160 379f7e92e2884dd2a5519ec35e14a7836a5b65e4 SHA1 f69958768853de1bdb6bb1b17c91180bb495064f SHA256 6303f3d40a38120b2be7ed36cd8b4d295850b50bc9fbbf75aff63abf8448facf
-EBUILD dovecot-1.2.7.ebuild 7460 RMD160 27f0834d2f57a5c70c8a49d3e24fe0b5fd4957f9 SHA1 0768fad638f1064c62f16eabb08d61c3e9a54424 SHA256 b219cd33667019ef7dae6f57b5f8f56a4b76736b1a0ec164028592f52b47f82f
 EBUILD dovecot-1.2.8.ebuild 7747 RMD160 4d47f9bbac6c6756c30b9eec848748457c0f5aaf SHA1 ec7d18b4f24694343beb53859adc3bdb6144ef87 SHA256 a9917c67aa30c605d63c6966bdea227012eeae4ce281de2dfa6e6aea7dfcff9d
-EBUILD dovecot-1.2.9-r1.ebuild 7746 RMD160 1cf4f8188b63ad635cd0adb111fb9f4636ec1d04 SHA1 a465f7092fb4eef2339738adfdc40887b13d7bbe SHA256 dc9446a4f309a9d27a6a98cac7820c33517b30d7a20f520a41af826e7960a26f
-EBUILD dovecot-2.0_beta4.ebuild 9976 RMD160 de77edd5ac19941b93277068411d7beb1dc17668 SHA1 cc6e4ef99193a6d7fb7664a6402cc281edcffc2f SHA256 922f6b04ab1a04d7349add869e0fa4e8fa268168a8c1b82e310ccde2ec3f11c8
-EBUILD dovecot-2.0_beta5.ebuild 10400 RMD160 c126b8fa233e9bd74aad9211ad5fd958effa137e SHA1 365d32edf1218a77453d7fecfdcfd1218c3c6ade SHA256 7914a01e7d958aea5b170d8883ae2f8b984c7a92a9d589313140ad4cab7b47a6
 EBUILD dovecot-2.0_beta6.ebuild 8769 RMD160 6304fd5f4fcc2a3cf3a1a43e9d4e7738fe8af86c SHA1 e7d4c00304faef54181c0a2fe95495ad0f1b23cf SHA256 3783d420d1c5f1c826fa5babb1b632c38fde5652fb224b457bdefc0767cdd6fa
-MISC ChangeLog 39353 RMD160 b3eb1e3c163c28347ac0f5f503cf192c29368bb7 SHA1 255a28e9533a82b222c591a21c115ea1a8fb70bd SHA256 80755ec1b29e9e16f4d149b63466cb0ff5a895d27a0030fb454dadd9fab717a0
+MISC ChangeLog 39714 RMD160 f87978279d13569b9adc528385f4868db919f84c SHA1 3db41b7e0b202840352e2e8ae22838608bea8daf SHA256 5e3337d2959158dd6d5bcde28b3e58932fb7a7d0f4f96a4040f7caebc9d41af1
 MISC metadata.xml 805 RMD160 5463fdc136060ba785d5d1394774f7bb6c76bdb5 SHA1 a309cf7dcbd283d70f7d418ca1a198400023dabe SHA256 f4edba91969b56d55fed13f18f0f49b81325377e1786a3d129feeb8de6086ee2
diff --git a/net-mail/dovecot/dovecot-1.1.16.ebuild b/net-mail/dovecot/dovecot-1.1.16.ebuild
deleted file mode 100644
index ef5135bcdfc5..000000000000
--- a/net-mail/dovecot/dovecot-1.1.16.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.1.16.ebuild,v 1.2 2010/06/17 20:52:06 patrick Exp $
-
-inherit autotools eutils ssl-cert versionator
-
-MY_P="${P/_/.}"
-MY_PV12=$(get_version_component_range 1-2 ${PV})
-S="${WORKDIR}/${MY_P}"
-SIEVE="dovecot-sieve-1.1.6"
-SIEVE_S="${WORKDIR}/${SIEVE}"
-MANAGESIEVE_PATCH="managesieve-0.10.6"
-MANAGESIEVE="managesieve-0.10.6"
-MANAGESIEVE_S="${WORKDIR}/${PN}-${MY_PV12}-${MANAGESIEVE}"
-
-SRC_URI="http://dovecot.org/releases/${MY_PV12}/${MY_P}.tar.gz
-sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )
-managesieve? ( http://www.rename-it.nl/${PN}/${MY_PV12}/${MY_P}-${MANAGESIEVE_PATCH}.diff.gz
-http://www.rename-it.nl/${PN}/${MY_PV12}/${PN}-${MY_PV12}-${MANAGESIEVE}.tar.gz )"
-
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-
-IUSE="berkdb debug doc ipv6 kerberos ldap managesieve mbox mysql pop3d pam postgres sieve sqlite3 ssl suid vpopmail"
-
-# Developer documentation, controlled by the doc USE flag
-DEVDOCS="auth-protocol index multiaccess securecoding"
-
-DEPEND=">=sys-apps/sed-4
-	sys-libs/libcap
-	berkdb? ( >=sys-libs/db-4.2 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl )
-	postgres? ( dev-db/postgresql-base )
-	mysql? ( virtual/mysql )
-	sqlite3? ( =dev-db/sqlite-3* )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	if use managesieve; then
-		epatch "${WORKDIR}"/${MY_P}-${MANAGESIEVE_PATCH}.diff
-		eautoreconf
-	fi
-}
-
-pkg_setup() {
-	if ! use sieve && use managesieve; then
-		eerror "managesieve USE flag selected but sieve USE flag unselected"
-		die "USE flag problem"
-	fi
-	# Add user and group for login process (same as for fedora/redhat)
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-}
-
-src_compile() {
-	local myconf=
-	use ssl && myconf="${myconf} --with-ssl=openssl" \
-		|| myconf="${myconf} --without-ssl"
-	econf \
-		--localstatedir=/var \
-		--sysconfdir=/etc/dovecot \
-		--enable-header-install \
-		--with-ioloop=best \
-		--with-poll=best \
-		$(use_with berkdb db) \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with mysql) \
-		$(use_with pam) \
-		$(use_with pop3d) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite3 sqlite) \
-		$(use_with vpopmail) \
-		${myconf} \
-		|| die "configure failed"
-	emake || die "make failed"
-
-	if use sieve; then
-		einfo "Building sieve"
-		cd "${SIEVE_S}"
-		econf --with-dovecot="${S}" || die "configure failed (sieve)"
-		emake || die "make failed (sieve)"
-	fi
-
-	if use managesieve; then
-		einfo "Building managesieve"
-		cd "${MANAGESIEVE_S}"
-		econf --with-dovecot="${S}" --with-dovecot-sieve="${SIEVE_S}" \
-			|| die "configure failed (managesieve)"
-		emake || die "make failed (managesieve)"
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-	use suid && fperms u+s /usr/libexec/dovecot/deliver
-
-	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
-
-	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
-
-	# Documentation
-	rm -rf "${D}"/usr/share/doc/dovecot
-	dodoc AUTHORS NEWS README TODO dovecot-example.conf
-	use managesieve && newdoc ${MANAGESIEVE_S}/README README.managesieve
-	if use doc; then
-		dodoc doc/*.txt
-	else
-		local x= n=
-		for x in doc/*.txt; do
-			n=$(basename "${x}" .txt)
-			[[ " ${DEVDOCS} " != *" ${n} "* ]] && dodoc "${x}"
-		done
-	fi
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${D}/etc/dovecot/dovecot.conf"
-	mv "${D}"/etc/dovecot/dovecot-example.conf "${D}"/etc/dovecot/dovecot.conf
-
-	# .maildir is the Gentoo default, but we need to support mbox to
-	local mail_location="maildir:~/.maildir"
-	if use mbox; then
-		mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-		keepdir /var/dovecot
-		sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' "${conf}"
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" "${conf}" \
-		|| die "failed to update mail location settings in dovecot.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/passdb pam/, /^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${conf}" || die "failed to update PAM settings in dovecot.conf"
-		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/managesieve
-	fi
-
-	# Listen on ipv6 and ipv4
-	if use ipv6; then
-		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's,^#ssl_cert_file =.*,ssl_cert_file = /etc/ssl/dovecot/server.pem,' \
-			-e 's,^#ssl_key_file =.*,ssl_key_file = /etc/ssl/dovecot/server.key,' \
-			"${conf}" || die "failed to update SSL settings in dovecot.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		cp doc/dovecot-sql-example.conf "${D}"/etc/dovecot/dovecot-sql.conf
-		fperms 600 /etc/dovecot/dovecot-sql.conf
-		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}" \
-			|| die "failed to update SQL settings in dovecot-sql.conf"
-		dodoc doc/dovecot-sql-example.conf
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		cp doc/dovecot-ldap-example.conf "${D}"/etc/dovecot/dovecot-ldap.conf
-		fperms 600 /etc/dovecot/dovecot-ldap.conf
-		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}" \
-			|| die "failed to update LDAP settings in dovecot-ldap.conf"
-		dodoc doc/dovecot-ldap-example.conf
-	fi
-
-	# Install sieve plugin
-	if use sieve; then
-		make -C "${SIEVE_S}" DESTDIR="${D}" install \
-			|| die "make install failed (sieve)"
-	fi
-
-	# Install managesieve
-	if use managesieve; then
-		make -C "${MANAGESIEVE_S}" DESTDIR="${D}" install \
-			|| die "make install failed (managesieve)"
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:0 /var/run/dovecot
-	fperms 0755 /var/run/dovecot
-	keepdir /var/run/dovecot/login
-	fowners root:dovecot /var/run/dovecot/login
-	fperms 0750 /var/run/dovecot/login
-}
-
-get_config_var() {
-	local varname=${1}
-	if [[ -z ${varname} ]]; then
-		die "${FUNCNAME}: variable name missing"
-	fi
-	sed -n 's/^[[:space:]]\?'"${varname}"'[[:space:]]*="*\([^#"]\+\)"*/\1/p' \
-		"${ROOT}"/etc/dovecot/dovecot.conf
-}
-
-pkg_postinst() {
-	elog "The Dovecot configuration has vastly changed since 0.99."
-	elog "You are encouraged to start afresh with a new configuration file."
-	elog "see http://wiki.dovecot.org/ for configuration examples."
-
-	if [[ -e "${ROOT}"/etc/dovecot.conf ]]; then
-		echo
-		ewarn "The Dovecot configuration now resides in ${ROOT}/etc/dovecot"
-	fi
-
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${base_dir:-/var/run/dovecot}"
-	if use ssl; then
-		# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-			-e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
-			einfo "Creating SSL certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-			chown dovecot:mail "${ROOT}"/etc/ssl/dovecot/server.{key,pem}
-		fi
-		if [[ ! -e "${ROOT}${base_dir}/login/ssl-parameters.dat" ]]; then
-			echo
-			elog "Dovecot requires DH SSL Parameters if you use SSL connections"
-			elog "These take some time to make, and dovecot will create them before"
-			elog "it allows any SSL connections."
-			elog "You can create them now before starting dovecot like so"
-			elog "   emerge --config =${PF}"
-		fi
-	fi
-
-	if grep -q '^ssl_key_password' "${ROOT}"/etc/dovecot/dovecot.conf; then
-		echo
-		ewarn "*** ATTENTION ATTENTION ATTENTION ATTENTION ATTENTION ***"
-		ewarn
-		ewarn "You have set ssl_key_password in dovecot.conf!"
-		ewarn "You are URGED to read the advice in the current"
-		ewarn "dovecot-example.conf regarding sensible handling"
-		ewarn "of that password, as it might be readable by any"
-		ewarn "user on your system who can access that file!"
-		ewarn
-		ewarn "*** ATTENTION ATTENTION ATTENTION ATTENTION ATTENTION ***"
-		echo
-	fi
-}
-
-pkg_config() {
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${base_dir:-/var/run/dovecot}"
-
-	if use ssl; then
-		einfo "Regenerating SSL parameters. This will take some time."
-		"${ROOT}"/usr/libexec/dovecot/ssl-build-param "${base_dir}/login/ssl-parameters.dat"
-	fi
-}
diff --git a/net-mail/dovecot/dovecot-1.1.7-r1.ebuild b/net-mail/dovecot/dovecot-1.1.7-r1.ebuild
deleted file mode 100644
index ab458a3e9141..000000000000
--- a/net-mail/dovecot/dovecot-1.1.7-r1.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.1.7-r1.ebuild,v 1.5 2010/06/17 20:52:06 patrick Exp $
-
-inherit autotools eutils ssl-cert versionator
-
-MY_P="${P/_/.}"
-MY_PV12=$(get_version_component_range 1-2 ${PV})
-S="${WORKDIR}/${MY_P}"
-SIEVE="dovecot-sieve-1.1.5"
-SIEVE_S="${WORKDIR}/${SIEVE}"
-MANAGESIEVE_PATCH="managesieve-0.10.4"
-MANAGESIEVE="managesieve-0.10.4"
-MANAGESIEVE_S="${WORKDIR}/${PN}-${MY_PV12}-${MANAGESIEVE}"
-
-SRC_URI="http://dovecot.org/releases/${MY_PV12}/${MY_P}.tar.gz
-sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )
-managesieve? ( http://www.rename-it.nl/${PN}/${MY_PV12}/${MY_P}-${MANAGESIEVE_PATCH}.diff.gz
-http://www.rename-it.nl/${PN}/${MY_PV12}/${PN}-${MY_PV12}-${MANAGESIEVE}.tar.gz )"
-
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd"
-
-IUSE="berkdb debug doc ipv6 kerberos ldap managesieve mbox mysql pop3d pam postgres sieve sqlite3 ssl suid vpopmail"
-
-# Developer documentation, controlled by the doc USE flag
-DEVDOCS="auth-protocol index multiaccess securecoding"
-
-DEPEND=">=sys-apps/sed-4
-	sys-libs/libcap
-	berkdb? ( >=sys-libs/db-4.2 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl )
-	postgres? ( dev-db/postgresql-base )
-	mysql? ( virtual/mysql )
-	sqlite3? ( =dev-db/sqlite-3* )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	if use managesieve; then
-		epatch "${WORKDIR}"/${MY_P}-${MANAGESIEVE_PATCH}.diff
-		eautoreconf
-	fi
-}
-
-pkg_setup() {
-	if ! use sieve && use managesieve; then
-		eerror "managesieve USE flag selected but sieve USE flag unselected"
-		die "USE flag problem"
-	fi
-	# Add user and group for login process (same as for fedora/redhat)
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-}
-
-src_compile() {
-	local myconf=
-	use ssl && myconf="${myconf} --with-ssl=openssl" \
-		|| myconf="${myconf} --without-ssl"
-	econf \
-		--localstatedir=/var \
-		--sysconfdir=/etc/dovecot \
-		--enable-header-install \
-		--with-ioloop=best \
-		--with-poll=best \
-		$(use_with berkdb db) \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with mysql) \
-		$(use_with pam) \
-		$(use_with pop3d) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite3 sqlite) \
-		$(use_with vpopmail) \
-		${myconf} \
-		|| die "configure failed"
-	emake || die "make failed"
-
-	if use sieve; then
-		einfo "Building sieve"
-		cd "${SIEVE_S}"
-		econf --with-dovecot="${S}" || die "configure failed (sieve)"
-		emake || die "make failed (sieve)"
-	fi
-
-	if use managesieve; then
-		einfo "Building managesieve"
-		cd "${MANAGESIEVE_S}"
-		econf --with-dovecot="${S}" --with-dovecot-sieve="${SIEVE_S}" \
-			|| die "configure failed (managesieve)"
-		emake || die "make failed (managesieve)"
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-	use suid && fperms u+s /usr/libexec/dovecot/deliver
-
-	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
-
-	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
-
-	# Documentation
-	rm -rf "${D}"/usr/share/doc/dovecot
-	dodoc AUTHORS NEWS README TODO dovecot-example.conf
-	use managesieve && newdoc ${MANAGESIEVE_S}/README README.managesieve
-	if use doc; then
-		dodoc doc/*.txt
-	else
-		local x= n=
-		for x in doc/*.txt; do
-			n=$(basename "${x}" .txt)
-			[[ " ${DEVDOCS} " != *" ${n} "* ]] && dodoc "${x}"
-		done
-	fi
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${D}/etc/dovecot/dovecot.conf"
-	mv "${D}"/etc/dovecot/dovecot-example.conf "${D}"/etc/dovecot/dovecot.conf
-
-	# .maildir is the Gentoo default, but we need to support mbox to
-	local mail_location="maildir:~/.maildir"
-	if use mbox; then
-		mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-		keepdir /var/dovecot
-		sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' "${conf}"
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" "${conf}" \
-		|| die "failed to update mail location settings in dovecot.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/passdb pam/, /^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${conf}" || die "failed to update PAM settings in dovecot.conf"
-		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/managesieve
-	fi
-
-	# Listen on ipv6 and ipv4
-	if use ipv6; then
-		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's,^#ssl_cert_file =.*,ssl_cert_file = /etc/ssl/dovecot/server.pem,' \
-			-e 's,^#ssl_key_file =.*,ssl_key_file = /etc/ssl/dovecot/server.key,' \
-			"${conf}" || die "failed to update SSL settings in dovecot.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		cp doc/dovecot-sql-example.conf "${D}"/etc/dovecot/dovecot-sql.conf
-		fperms 600 /etc/dovecot/dovecot-sql.conf
-		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}" \
-			|| die "failed to update SQL settings in dovecot-sql.conf"
-		dodoc doc/dovecot-sql-example.conf
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		cp doc/dovecot-ldap-example.conf "${D}"/etc/dovecot/dovecot-ldap.conf
-		fperms 600 /etc/dovecot/dovecot-ldap.conf
-		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}" \
-			|| die "failed to update LDAP settings in dovecot-ldap.conf"
-		dodoc doc/dovecot-ldap-example.conf
-	fi
-
-	# Install sieve plugin
-	if use sieve; then
-		make -C "${SIEVE_S}" DESTDIR="${D}" install \
-			|| die "make install failed (sieve)"
-	fi
-
-	# Install managesieve
-	if use managesieve; then
-		make -C "${MANAGESIEVE_S}" DESTDIR="${D}" install \
-			|| die "make install failed (managesieve)"
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:0 /var/run/dovecot
-	fperms 0755 /var/run/dovecot
-	keepdir /var/run/dovecot/login
-	fowners root:dovecot /var/run/dovecot/login
-	fperms 0750 /var/run/dovecot/login
-}
-
-get_config_var() {
-	local varname=${1}
-	if [[ -z ${varname} ]]; then
-		die "${FUNCNAME}: variable name missing"
-	fi
-	sed -n 's/^[[:space:]]\?'"${varname}"'[[:space:]]*="*\([^#"]\+\)"*/\1/p' \
-		"${ROOT}"/etc/dovecot/dovecot.conf
-}
-
-pkg_postinst() {
-	elog "The Dovecot configuration has vastly changed since 0.99."
-	elog "You are encouraged to start afresh with a new configuration file."
-	elog "see http://wiki.dovecot.org/ for configuration examples."
-
-	if [[ -e "${ROOT}"/etc/dovecot.conf ]]; then
-		echo
-		ewarn "The Dovecot configuration now resides in ${ROOT}/etc/dovecot"
-	fi
-
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${base_dir:-/var/run/dovecot}"
-	if use ssl; then
-		# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-			-e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
-			einfo "Creating SSL certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-			chown dovecot:mail "${ROOT}"/etc/ssl/dovecot/server.{key,pem}
-		fi
-		if [[ ! -e "${ROOT}${base_dir}/login/ssl-parameters.dat" ]]; then
-			echo
-			elog "Dovecot requires DH SSL Parameters if you use SSL connections"
-			elog "These take some time to make, and dovecot will create them before"
-			elog "it allows any SSL connections."
-			elog "You can create them now before starting dovecot like so"
-			elog "   emerge --config =${PF}"
-		fi
-	fi
-
-	if grep -q '^ssl_key_password' "${ROOT}"/etc/dovecot/dovecot.conf; then
-		echo
-		ewarn "*** ATTENTION ATTENTION ATTENTION ATTENTION ATTENTION ***"
-		ewarn
-		ewarn "You have set ssl_key_password in dovecot.conf!"
-		ewarn "You are URGED to read the advice in the current"
-		ewarn "dovecot-example.conf regarding sensible handling"
-		ewarn "of that password, as it might be readable by any"
-		ewarn "user on your system who can access that file!"
-		ewarn
-		ewarn "*** ATTENTION ATTENTION ATTENTION ATTENTION ATTENTION ***"
-		echo
-	fi
-}
-
-pkg_config() {
-	local base_dir="$(get_config_var base_dir)"
-	base_dir="${base_dir:-/var/run/dovecot}"
-
-	if use ssl; then
-		einfo "Regenerating SSL parameters. This will take some time."
-		"${ROOT}"/usr/libexec/dovecot/ssl-build-param "${base_dir}/login/ssl-parameters.dat"
-	fi
-}
diff --git a/net-mail/dovecot/dovecot-1.2.10-r1.ebuild b/net-mail/dovecot/dovecot-1.2.10-r1.ebuild
deleted file mode 100644
index b9f435b580db..000000000000
--- a/net-mail/dovecot/dovecot-1.2.10-r1.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.2.10-r1.ebuild,v 1.4 2010/06/17 20:52:06 patrick Exp $
-
-EAPI="2"
-
-inherit eutils versionator
-
-major_minor="$( get_version_component_range 1-2 )"
-sieve_version="0.1.15"
-managesieve_version="0.11.11"
-SRC_URI="http://dovecot.org/releases/${major_minor}/${P}.tar.gz
-	sieve? ( http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-sieve-${sieve_version}.tar.gz )
-	managesieve? (
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-1.2.10-managesieve-${managesieve_version}.diff.gz
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-managesieve-${managesieve_version}.tar.gz
-	)"
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1" # MIT too?
-KEYWORDS="~alpha ~amd64 ~arm ~sparc ~x86"
-
-IUSE="berkdb bzip2 caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve mbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
-
-DEPEND="berkdb? ( sys-libs/db )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		eerror "managesieve USE flag selected but sieve USE flag unselected"
-		die "USE flag problem"
-	fi
-
-	if use dbox && ! use maildir; then
-		eerror "dbox USE flag needs maildir USE flag enabled"
-		die "USE flag problem"
-	fi
-
-	# Add user and group for login process (same as for fedora/redhat)
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	use managesieve && epatch "${WORKDIR}"/dovecot-1.2.10-managesieve-${managesieve_version}.diff
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in cydir dbox maildir mbox; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	econf \
-		--sysconfdir=/etc/dovecot \
-		--localstatedir=/var \
-		--with-moduledir="/usr/$( get_libdir )/dovecot" \
-		$( use_with berkdb db ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with ssl ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_with ldap) \
-		--with-storages="${storages}" \
-		--with-pic \
-		--enable-header-install \
-		${conf}
-
-	if use sieve; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config || die "emake dovecot-config failed"
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		econf --with-dovecot="${S}"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			econf --with-dovecot="${S}" --with-dovecot-sieve="../dovecot-${major_minor}-sieve-${sieve_version}"
-		fi
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-		fi
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# insecure:
-	#use suid && fperms u+s /usr/libexec/dovecot/deliver
-	#better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail /usr/libexec/dovecot/deliver
-		fperms 4750 /usr/libexec/dovecot/deliver
-	fi
-
-	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
-
-	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
-
-	rm -rf "${D}"/usr/share/doc/dovecot
-
-	if use ssl; then
-		sed -i -e 's,^CERTDIR=.*,CERTDIR=\$SSLDIR/dovecot,' \
-			-e 's,^KEYDIR=.*,KEYDIR=\$SSLDIR/dovecot,' \
-			-e 's,^CERTFILE=.*,CERTFILE=\$CERTDIR/server.pem,' \
-			-e 's,^KEYFILE=.*,KEYFILE=\$KEYDIR/server.key,' \
-			doc/mkcert.sh || die "failed to update SSL settings in mkcert.sh"
-	fi
-
-	dodoc AUTHORS NEWS README TODO dovecot-example.conf || die "basic dodoc failed"
-	dodoc doc/* || die "dodoc doc/ failed"
-	docinto wiki
-	dodoc doc/wiki/* || die "dodoc doc/wiki/ failed"
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${D}/etc/dovecot/dovecot.conf"
-	mv "${D}"/etc/dovecot/dovecot-example.conf "${D}"/etc/dovecot/dovecot.conf
-
-	# .maildir is the Gentoo default, but we need to support mbox to
-	local mail_location="maildir:~/.maildir"
-	if use mbox; then
-		mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-		keepdir /var/dovecot
-		sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' "${conf}"
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" "${conf}" \
-		|| die "failed to update mail location settings in dovecot.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/passdb pam/, /^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${conf}" || die "failed to update PAM settings in dovecot.conf"
-		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/managesieve
-	fi
-
-	# Listen on ipv6 and ipv4
-	if use ipv6; then
-		sed -i -e 's/^#listen = \*/listen = \*, \[::\]/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's,^#ssl_cert_file =.*,ssl_cert_file = /etc/ssl/dovecot/server.pem,' \
-			-e 's,^#ssl_key_file =.*,ssl_key_file = /etc/ssl/dovecot/server.key,' \
-			"${conf}" || die "failed to update SSL settings in dovecot.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		cp doc/dovecot-sql-example.conf "${D}"/etc/dovecot/dovecot-sql.conf
-		fperms 600 /etc/dovecot/dovecot-sql.conf
-		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}" \
-			|| die "failed to update SQL settings in dovecot-sql.conf"
-		dodoc doc/dovecot-sql-example.conf
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		cp doc/dovecot-ldap-example.conf "${D}"/etc/dovecot/dovecot-ldap.conf
-		fperms 600 /etc/dovecot/dovecot-ldap.conf
-		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}" \
-			|| die "failed to update LDAP settings in dovecot-ldap.conf"
-		dodoc doc/dovecot-ldap-example.conf
-	fi
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake DESTDIR="${D}" install || die "make install failed (sieve)"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake DESTDIR="${D}" install || die "make install failed (managesieve)"
-		fi
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:root /var/run/dovecot
-	fperms 0755 /var/run/dovecot
-	keepdir /var/run/dovecot/login
-	fowners root:dovecot /var/run/dovecot/login
-	fperms 0750 /var/run/dovecot/login
-
-	ewarn "If you are upgrading from Dovecot 1.1, read "
-	ewarn " http://wiki.dovecot.org/Upgrading/1.2"
-	if use sieve; then
-		ewarn " http://wiki.dovecot.org/LDA/Sieve/Dovecot#Migration_from_CMUSieve"
-		ewarn " In particular, do not forget to change cmusieve to sieve"
-	fi
-}
diff --git a/net-mail/dovecot/dovecot-1.2.11.ebuild b/net-mail/dovecot/dovecot-1.2.11.ebuild
deleted file mode 100644
index a9e0cb627f54..000000000000
--- a/net-mail/dovecot/dovecot-1.2.11.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.2.11.ebuild,v 1.2 2010/06/17 20:52:06 patrick Exp $
-
-EAPI="2"
-
-inherit eutils versionator
-
-major_minor="$( get_version_component_range 1-2 )"
-sieve_version="0.1.15"
-managesieve_version="0.11.11"
-SRC_URI="http://dovecot.org/releases/${major_minor}/${P}.tar.gz
-	sieve? ( http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-sieve-${sieve_version}.tar.gz )
-	managesieve? (
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-1.2.10-managesieve-${managesieve_version}.diff.gz
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-managesieve-${managesieve_version}.tar.gz
-	)"
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1" # MIT too?
-KEYWORDS="~alpha ~amd64 ~arm ~sparc ~x86"
-
-IUSE="berkdb bzip2 caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve mbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
-
-DEPEND="berkdb? ( sys-libs/db )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		eerror "managesieve USE flag selected but sieve USE flag unselected"
-		die "USE flag problem"
-	fi
-
-	if use dbox && ! use maildir; then
-		eerror "dbox USE flag needs maildir USE flag enabled"
-		die "USE flag problem"
-	fi
-
-	# Add user and group for login process (same as for fedora/redhat)
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	use managesieve && epatch "${WORKDIR}"/dovecot-1.2.10-managesieve-${managesieve_version}.diff
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in cydir dbox maildir mbox; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	econf \
-		--sysconfdir=/etc/dovecot \
-		--localstatedir=/var \
-		--with-moduledir="/usr/$( get_libdir )/dovecot" \
-		$( use_with berkdb db ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with ssl ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_with ldap) \
-		--with-storages="${storages}" \
-		--with-pic \
-		--enable-header-install \
-		${conf}
-
-	if use sieve; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config || die "emake dovecot-config failed"
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		econf --with-dovecot="${S}"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			econf --with-dovecot="${S}" --with-dovecot-sieve="../dovecot-${major_minor}-sieve-${sieve_version}"
-		fi
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-		fi
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# insecure:
-	#use suid && fperms u+s /usr/libexec/dovecot/deliver
-	#better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail /usr/libexec/dovecot/deliver
-		fperms 4750 /usr/libexec/dovecot/deliver
-	fi
-
-	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
-
-	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
-
-	rm -rf "${D}"/usr/share/doc/dovecot
-
-	if use ssl; then
-		sed -i -e 's,^CERTDIR=.*,CERTDIR=\$SSLDIR/dovecot,' \
-			-e 's,^KEYDIR=.*,KEYDIR=\$SSLDIR/dovecot,' \
-			-e 's,^CERTFILE=.*,CERTFILE=\$CERTDIR/server.pem,' \
-			-e 's,^KEYFILE=.*,KEYFILE=\$KEYDIR/server.key,' \
-			doc/mkcert.sh || die "failed to update SSL settings in mkcert.sh"
-	fi
-
-	dodoc AUTHORS NEWS README TODO dovecot-example.conf || die "basic dodoc failed"
-	dodoc doc/* || die "dodoc doc/ failed"
-	docinto wiki
-	dodoc doc/wiki/* || die "dodoc doc/wiki/ failed"
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${D}/etc/dovecot/dovecot.conf"
-	mv "${D}"/etc/dovecot/dovecot-example.conf "${D}"/etc/dovecot/dovecot.conf
-
-	# .maildir is the Gentoo default, but we need to support mbox to
-	local mail_location="maildir:~/.maildir"
-	if use mbox; then
-		mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-		keepdir /var/dovecot
-		sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' "${conf}"
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" "${conf}" \
-		|| die "failed to update mail location settings in dovecot.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/passdb pam/, /^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${conf}" || die "failed to update PAM settings in dovecot.conf"
-		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/managesieve
-	fi
-
-	# Listen on ipv6 and ipv4
-	if use ipv6; then
-		sed -i -e 's/^#listen = \*/listen = \*, \[::\]/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's,^#ssl_cert_file =.*,ssl_cert_file = /etc/ssl/dovecot/server.pem,' \
-			-e 's,^#ssl_key_file =.*,ssl_key_file = /etc/ssl/dovecot/server.key,' \
-			"${conf}" || die "failed to update SSL settings in dovecot.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		cp doc/dovecot-sql-example.conf "${D}"/etc/dovecot/dovecot-sql.conf
-		fperms 600 /etc/dovecot/dovecot-sql.conf
-		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}" \
-			|| die "failed to update SQL settings in dovecot-sql.conf"
-		dodoc doc/dovecot-sql-example.conf
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		cp doc/dovecot-ldap-example.conf "${D}"/etc/dovecot/dovecot-ldap.conf
-		fperms 600 /etc/dovecot/dovecot-ldap.conf
-		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}" \
-			|| die "failed to update LDAP settings in dovecot-ldap.conf"
-		dodoc doc/dovecot-ldap-example.conf
-	fi
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake DESTDIR="${D}" install || die "make install failed (sieve)"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake DESTDIR="${D}" install || die "make install failed (managesieve)"
-		fi
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:root /var/run/dovecot
-	fperms 0755 /var/run/dovecot
-	keepdir /var/run/dovecot/login
-	fowners root:dovecot /var/run/dovecot/login
-	fperms 0750 /var/run/dovecot/login
-
-	ewarn "If you are upgrading from Dovecot 1.1, read "
-	ewarn " http://wiki.dovecot.org/Upgrading/1.2"
-	if use sieve; then
-		ewarn " http://wiki.dovecot.org/LDA/Sieve/Dovecot#Migration_from_CMUSieve"
-		ewarn " In particular, do not forget to change cmusieve to sieve"
-	fi
-}
diff --git a/net-mail/dovecot/dovecot-1.2.6.ebuild b/net-mail/dovecot/dovecot-1.2.6.ebuild
deleted file mode 100644
index 6c382bd4328b..000000000000
--- a/net-mail/dovecot/dovecot-1.2.6.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.2.6.ebuild,v 1.7 2010/06/17 20:52:06 patrick Exp $
-
-EAPI="2"
-
-inherit eutils versionator
-
-major_minor="$( get_version_component_range 1-2 )"
-sieve_version="0.1.12"
-managesieve_version="0.11.9"
-SRC_URI="http://dovecot.org/releases/${major_minor}/${P}.tar.gz
-	sieve? ( http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-sieve-${sieve_version}.tar.gz )
-	managesieve? (
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${PV}-managesieve-${managesieve_version}.diff.gz
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-managesieve-${managesieve_version}.tar.gz
-	)"
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1" # MIT too?
-KEYWORDS="~alpha amd64 ~sparc x86"
-
-IUSE="berkdb bzip2 caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve mbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
-
-DEPEND="berkdb? ( sys-libs/db )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		eerror "managesieve USE flag selected but sieve USE flag unselected"
-		die "USE flag problem"
-	fi
-
-	if use dbox && ! use maildir; then
-		eerror "dbox USE flag needs maildir USE flag enabled"
-		die "USE flag problem"
-	fi
-
-	# Add user and group for login process (same as for fedora/redhat)
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	use managesieve && epatch "${WORKDIR}"/dovecot-${PV}-managesieve-${managesieve_version}.diff
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in cydir dbox maildir mbox; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	econf \
-		--sysconfdir=/etc/dovecot \
-		--localstatedir=/var \
-		--with-moduledir="/usr/$( get_libdir )/dovecot" \
-		$( use_with berkdb db ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with ssl ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_with ldap) \
-		--with-storages="${storages}" \
-		--with-pic \
-		--enable-header-install \
-		${conf}
-
-	if use sieve; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config || die "emake dovecot-config failed"
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		econf --with-dovecot="${S}"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			econf --with-dovecot="${S}" --with-dovecot-sieve="../dovecot-${major_minor}-sieve-${sieve_version}"
-		fi
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-		fi
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# insecure:
-	#use suid && fperms u+s /usr/libexec/dovecot/deliver
-	#better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail /usr/libexec/dovecot/deliver
-		fperms 4750 /usr/libexec/dovecot/deliver
-	fi
-
-	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
-
-	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
-
-	rm -rf "${D}"/usr/share/doc/dovecot
-
-	if use doc; then
-		dodoc AUTHORS NEWS README TODO dovecot-example.conf || die "basic dodoc failed"
-		dodoc doc/* || die "dodoc doc/ failed"
-		docinto wiki
-		dodoc doc/wiki/* || die "dodoc doc/wiki/ failed"
-
-	fi
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${D}/etc/dovecot/dovecot.conf"
-	mv "${D}"/etc/dovecot/dovecot-example.conf "${D}"/etc/dovecot/dovecot.conf
-
-	# .maildir is the Gentoo default, but we need to support mbox to
-	local mail_location="maildir:~/.maildir"
-	if use mbox; then
-		mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-		keepdir /var/dovecot
-		sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' "${conf}"
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" "${conf}" \
-		|| die "failed to update mail location settings in dovecot.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/passdb pam/, /^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${conf}" || die "failed to update PAM settings in dovecot.conf"
-		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-	fi
-
-	# Listen on ipv6 and ipv4
-	if use ipv6; then
-		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's,^#ssl_cert_file =.*,ssl_cert_file = /etc/ssl/dovecot/server.pem,' \
-			-e 's,^#ssl_key_file =.*,ssl_key_file = /etc/ssl/dovecot/server.key,' \
-			"${conf}" || die "failed to update SSL settings in dovecot.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		cp doc/dovecot-sql-example.conf "${D}"/etc/dovecot/dovecot-sql.conf
-		fperms 600 /etc/dovecot/dovecot-sql.conf
-		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}" \
-			|| die "failed to update SQL settings in dovecot-sql.conf"
-		dodoc doc/dovecot-sql-example.conf
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		cp doc/dovecot-ldap-example.conf "${D}"/etc/dovecot/dovecot-ldap.conf
-		fperms 600 /etc/dovecot/dovecot-ldap.conf
-		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}" \
-			|| die "failed to update LDAP settings in dovecot-ldap.conf"
-		dodoc doc/dovecot-ldap-example.conf
-	fi
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake DESTDIR="${D}" install || die "make install failed (sieve)"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake DESTDIR="${D}" install || die "make install failed (managesieve)"
-		fi
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:root /var/run/dovecot
-	fperms 0755 /var/run/dovecot
-	keepdir /var/run/dovecot/login
-	fowners root:dovecot /var/run/dovecot/login
-	fperms 0750 /var/run/dovecot/login
-
-	ewarn "If you are upgrading from Dovecot 1.1, read "
-	ewarn " http://wiki.dovecot.org/Upgrading/1.2"
-	if use sieve; then
-		ewarn " http://wiki.dovecot.org/LDA/Sieve/Dovecot#Migration_from_CMUSieve"
-		ewarn " In particular, do not forget to change cmusieve to sieve"
-	fi
-}
diff --git a/net-mail/dovecot/dovecot-1.2.7.ebuild b/net-mail/dovecot/dovecot-1.2.7.ebuild
deleted file mode 100644
index 1a202016a0fc..000000000000
--- a/net-mail/dovecot/dovecot-1.2.7.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.2.7.ebuild,v 1.3 2010/06/17 20:52:06 patrick Exp $
-
-EAPI="2"
-
-inherit eutils versionator
-
-major_minor="$( get_version_component_range 1-2 )"
-sieve_version="0.1.12"
-managesieve_version="0.11.9"
-SRC_URI="http://dovecot.org/releases/${major_minor}/${P}.tar.gz
-	sieve? ( http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-sieve-${sieve_version}.tar.gz )
-	managesieve? (
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${PV}-managesieve-${managesieve_version}.diff.gz
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-managesieve-${managesieve_version}.tar.gz
-	)"
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1" # MIT too?
-KEYWORDS="~alpha ~amd64 ~sparc ~x86"
-
-IUSE="berkdb bzip2 caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve mbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
-
-DEPEND="berkdb? ( sys-libs/db )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		eerror "managesieve USE flag selected but sieve USE flag unselected"
-		die "USE flag problem"
-	fi
-
-	if use dbox && ! use maildir; then
-		eerror "dbox USE flag needs maildir USE flag enabled"
-		die "USE flag problem"
-	fi
-
-	# Add user and group for login process (same as for fedora/redhat)
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	use managesieve && epatch "${WORKDIR}"/dovecot-${PV}-managesieve-${managesieve_version}.diff
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in cydir dbox maildir mbox; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	econf \
-		--sysconfdir=/etc/dovecot \
-		--localstatedir=/var \
-		--with-moduledir="/usr/$( get_libdir )/dovecot" \
-		$( use_with berkdb db ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with ssl ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_with ldap) \
-		--with-storages="${storages}" \
-		--with-pic \
-		--enable-header-install \
-		${conf}
-
-	if use sieve; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config || die "emake dovecot-config failed"
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		econf --with-dovecot="${S}"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			econf --with-dovecot="${S}" --with-dovecot-sieve="../dovecot-${major_minor}-sieve-${sieve_version}"
-		fi
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-		fi
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# insecure:
-	#use suid && fperms u+s /usr/libexec/dovecot/deliver
-	#better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail /usr/libexec/dovecot/deliver
-		fperms 4750 /usr/libexec/dovecot/deliver
-	fi
-
-	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
-
-	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
-
-	rm -rf "${D}"/usr/share/doc/dovecot
-
-	if use doc; then
-		dodoc AUTHORS NEWS README TODO dovecot-example.conf || die "basic dodoc failed"
-		dodoc doc/* || die "dodoc doc/ failed"
-		docinto wiki
-		dodoc doc/wiki/* || die "dodoc doc/wiki/ failed"
-
-	fi
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${D}/etc/dovecot/dovecot.conf"
-	mv "${D}"/etc/dovecot/dovecot-example.conf "${D}"/etc/dovecot/dovecot.conf
-
-	# .maildir is the Gentoo default, but we need to support mbox to
-	local mail_location="maildir:~/.maildir"
-	if use mbox; then
-		mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-		keepdir /var/dovecot
-		sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' "${conf}"
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" "${conf}" \
-		|| die "failed to update mail location settings in dovecot.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/passdb pam/, /^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${conf}" || die "failed to update PAM settings in dovecot.conf"
-		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/managesieve
-	fi
-
-	# Listen on ipv6 and ipv4
-	if use ipv6; then
-		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's,^#ssl_cert_file =.*,ssl_cert_file = /etc/ssl/dovecot/server.pem,' \
-			-e 's,^#ssl_key_file =.*,ssl_key_file = /etc/ssl/dovecot/server.key,' \
-			"${conf}" || die "failed to update SSL settings in dovecot.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		cp doc/dovecot-sql-example.conf "${D}"/etc/dovecot/dovecot-sql.conf
-		fperms 600 /etc/dovecot/dovecot-sql.conf
-		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}" \
-			|| die "failed to update SQL settings in dovecot-sql.conf"
-		dodoc doc/dovecot-sql-example.conf
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		cp doc/dovecot-ldap-example.conf "${D}"/etc/dovecot/dovecot-ldap.conf
-		fperms 600 /etc/dovecot/dovecot-ldap.conf
-		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}" \
-			|| die "failed to update LDAP settings in dovecot-ldap.conf"
-		dodoc doc/dovecot-ldap-example.conf
-	fi
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake DESTDIR="${D}" install || die "make install failed (sieve)"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake DESTDIR="${D}" install || die "make install failed (managesieve)"
-		fi
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:root /var/run/dovecot
-	fperms 0755 /var/run/dovecot
-	keepdir /var/run/dovecot/login
-	fowners root:dovecot /var/run/dovecot/login
-	fperms 0750 /var/run/dovecot/login
-
-	ewarn "If you are upgrading from Dovecot 1.1, read "
-	ewarn " http://wiki.dovecot.org/Upgrading/1.2"
-	if use sieve; then
-		ewarn " http://wiki.dovecot.org/LDA/Sieve/Dovecot#Migration_from_CMUSieve"
-		ewarn " In particular, do not forget to change cmusieve to sieve"
-	fi
-}
diff --git a/net-mail/dovecot/dovecot-1.2.9-r1.ebuild b/net-mail/dovecot/dovecot-1.2.9-r1.ebuild
deleted file mode 100644
index 62d15ca019bf..000000000000
--- a/net-mail/dovecot/dovecot-1.2.9-r1.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.2.9-r1.ebuild,v 1.2 2010/06/17 20:52:06 patrick Exp $
-
-EAPI="2"
-
-inherit eutils versionator
-
-major_minor="$( get_version_component_range 1-2 )"
-sieve_version="0.1.14"
-managesieve_version="0.11.10"
-SRC_URI="http://dovecot.org/releases/${major_minor}/${P}.tar.gz
-	sieve? ( http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-sieve-${sieve_version}.tar.gz )
-	managesieve? (
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-1.2.9-managesieve-${managesieve_version}.diff.gz
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-managesieve-${managesieve_version}.tar.gz
-	)"
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1" # MIT too?
-KEYWORDS="~alpha ~amd64 ~sparc ~x86"
-
-IUSE="berkdb bzip2 caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve mbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
-
-DEPEND="berkdb? ( sys-libs/db )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		eerror "managesieve USE flag selected but sieve USE flag unselected"
-		die "USE flag problem"
-	fi
-
-	if use dbox && ! use maildir; then
-		eerror "dbox USE flag needs maildir USE flag enabled"
-		die "USE flag problem"
-	fi
-
-	# Add user and group for login process (same as for fedora/redhat)
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	use managesieve && epatch "${WORKDIR}"/dovecot-1.2.7-managesieve-${managesieve_version}.diff
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in cydir dbox maildir mbox; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	econf \
-		--sysconfdir=/etc/dovecot \
-		--localstatedir=/var \
-		--with-moduledir="/usr/$( get_libdir )/dovecot" \
-		$( use_with berkdb db ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with ssl ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_with ldap) \
-		--with-storages="${storages}" \
-		--with-pic \
-		--enable-header-install \
-		${conf}
-
-	if use sieve; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config || die "emake dovecot-config failed"
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		econf --with-dovecot="${S}"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			econf --with-dovecot="${S}" --with-dovecot-sieve="../dovecot-${major_minor}-sieve-${sieve_version}"
-		fi
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-		fi
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# insecure:
-	#use suid && fperms u+s /usr/libexec/dovecot/deliver
-	#better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail /usr/libexec/dovecot/deliver
-		fperms 4750 /usr/libexec/dovecot/deliver
-	fi
-
-	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
-
-	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
-
-	rm -rf "${D}"/usr/share/doc/dovecot
-
-	if use ssl; then
-		sed -i -e 's,^CERTDIR=.*,CERTDIR=\$SSLDIR/dovecot,' \
-			-e 's,^KEYDIR=.*,KEYDIR=\$SSLDIR/dovecot,' \
-			-e 's,^CERTFILE=.*,CERTFILE=\$CERTDIR/server.pem,' \
-			-e 's,^KEYFILE=.*,KEYFILE=\$KEYDIR/server.key,' \
-			doc/mkcert.sh || die "failed to update SSL settings in mkcert.sh"
-	fi
-
-	dodoc AUTHORS NEWS README TODO dovecot-example.conf || die "basic dodoc failed"
-	dodoc doc/* || die "dodoc doc/ failed"
-	docinto wiki
-	dodoc doc/wiki/* || die "dodoc doc/wiki/ failed"
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${D}/etc/dovecot/dovecot.conf"
-	mv "${D}"/etc/dovecot/dovecot-example.conf "${D}"/etc/dovecot/dovecot.conf
-
-	# .maildir is the Gentoo default, but we need to support mbox to
-	local mail_location="maildir:~/.maildir"
-	if use mbox; then
-		mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-		keepdir /var/dovecot
-		sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' "${conf}"
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" "${conf}" \
-		|| die "failed to update mail location settings in dovecot.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/passdb pam/, /^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${conf}" || die "failed to update PAM settings in dovecot.conf"
-		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/managesieve
-	fi
-
-	# Listen on ipv6 and ipv4
-	if use ipv6; then
-		sed -i -e 's/^#listen = \*/listen = \*, \[::\]/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's,^#ssl_cert_file =.*,ssl_cert_file = /etc/ssl/dovecot/server.pem,' \
-			-e 's,^#ssl_key_file =.*,ssl_key_file = /etc/ssl/dovecot/server.key,' \
-			"${conf}" || die "failed to update SSL settings in dovecot.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		cp doc/dovecot-sql-example.conf "${D}"/etc/dovecot/dovecot-sql.conf
-		fperms 600 /etc/dovecot/dovecot-sql.conf
-		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}" \
-			|| die "failed to update SQL settings in dovecot-sql.conf"
-		dodoc doc/dovecot-sql-example.conf
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		cp doc/dovecot-ldap-example.conf "${D}"/etc/dovecot/dovecot-ldap.conf
-		fperms 600 /etc/dovecot/dovecot-ldap.conf
-		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}" \
-			|| die "failed to update LDAP settings in dovecot-ldap.conf"
-		dodoc doc/dovecot-ldap-example.conf
-	fi
-
-	if use sieve; then
-		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake DESTDIR="${D}" install || die "make install failed (sieve)"
-
-		if use managesieve; then
-			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake DESTDIR="${D}" install || die "make install failed (managesieve)"
-		fi
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:root /var/run/dovecot
-	fperms 0755 /var/run/dovecot
-	keepdir /var/run/dovecot/login
-	fowners root:dovecot /var/run/dovecot/login
-	fperms 0750 /var/run/dovecot/login
-
-	ewarn "If you are upgrading from Dovecot 1.1, read "
-	ewarn " http://wiki.dovecot.org/Upgrading/1.2"
-	if use sieve; then
-		ewarn " http://wiki.dovecot.org/LDA/Sieve/Dovecot#Migration_from_CMUSieve"
-		ewarn " In particular, do not forget to change cmusieve to sieve"
-	fi
-}
diff --git a/net-mail/dovecot/dovecot-2.0_beta4.ebuild b/net-mail/dovecot/dovecot-2.0_beta4.ebuild
deleted file mode 100644
index 82b34aaa174c..000000000000
--- a/net-mail/dovecot/dovecot-2.0_beta4.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0_beta4.ebuild,v 1.3 2010/06/17 20:52:06 patrick Exp $
-
-EAPI="2"
-
-inherit eutils versionator ssl-cert
-
-MY_P="${P/_/.}"
-major_minor="$( get_version_component_range 1-2 )"
-sieve_snapshot="2cb08c188b6a"
-SRC_URI="http://dovecot.org/releases/${major_minor}/beta/${MY_P}.tar.gz
-	sieve? (
-	http://hg.rename-it.nl/dovecot-2.0-pigeonhole/archive/${sieve_snapshot}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1" # MIT too?
-KEYWORDS="~alpha ~amd64 ~arm ~sparc ~x86"
-
-IUSE="berkdb bzip2 caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve mbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
-
-DEPEND="berkdb? ( sys-libs/db )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		eerror "managesieve USE flag selected but sieve USE flag unselected"
-		die "USE flag problem"
-	fi
-
-	if use dbox && ! use maildir; then
-		eerror "dbox USE flag needs maildir USE flag enabled"
-		die "USE flag problem"
-	fi
-
-	# Add user and group for login process (same as for fedora/redhat)
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in cydir dbox maildir mbox; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	cd ${MY_P}
-	econf \
-		--localstatedir=/var \
-		--with-moduledir="/usr/$( get_libdir )/dovecot" \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with ssl ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		--with-storages="${storages}" \
-		--with-pic \
-		--enable-header-install \
-		${conf}
-
-	if use sieve; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config || die "emake dovecot-config failed"
-
-		# snapshot. should not be necessary for 2.0
-		cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
-		./autogen.sh || die "autogen failed"
-
-		econf \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	cd "${MY_P}"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-	if use sieve; then
-		cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make sieve failed"
-	fi
-}
-
-src_install () {
-	cd "${MY_P}"
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${D}"/usr/libexec/dovecot/deliver
-		fperms 4750 "${D}"/usr/libexec/dovecot/deliver
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
-
-	rm -rf "${D}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO || die "basic dodoc failed"
-	rm -f doc/Makefile*
-	dodoc doc/* || die "dodoc doc failed"
-	docinto example-config
-	dodoc doc/example-config/* || die "dodoc example failed"
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/* || die "dodoc conf.d failed"
-	docinto wiki
-	dodoc doc/wiki/* || die "dodoc wiki failed"
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${D}/etc/dovecot/dovecot.conf"
-	local confd="${D}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	sed -i -e "s:/usr/share/doc/dovecot/:/usr/share/doc/${PF}/:" \
-	"${confd}/../README" || die "sed failed"
-
-	# .maildir is the Gentoo default, but we need to support mbox too
-	local mail_location="maildir:~/.maildir"
-	if use mbox; then
-		mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-		keepdir /var/dovecot
-		sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
-		"${confd}/mail.conf" || die "sed failed"
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/mail.conf" \
-		|| die "failed to update mail location settings in mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in dovecot.conf"
-		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/managesieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/auth.conf" \
-			|| die "failed to update PAM settings in auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/ssl.conf" || die "failed to update SSL settings in ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/auth.conf" || die "failed to update SQL settings in \
-			auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/auth.conf" \
-			|| die "failed to update ldap settings in auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/auth.conf" \
-			|| die "failed to update vpopmail settings in auth.conf"
-	fi
-
-	if use sieve; then
-		cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
-		emake DESTDIR="${D}" install || die "make install failed (sieve)"
-		sed -i -e \
-			's/^#mail_plugins =/mail_plugins = sieve/' "${confd}/mail.conf" \
-			|| die "failed to update sieve settings in mail.conf"
-		rm -rf "${D}"/usr/share/doc/dovecot
-		dodoc doc/*.txt
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/example-config/conf.d
-		doins doc/example-config/conf.d/*.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:root /var/run/dovecot
-	fperms 0755 /var/run/dovecot
-	keepdir /var/run/dovecot/login
-	fowners root:dovecot /var/run/dovecot/login
-	fperms 0750 /var/run/dovecot/login
-
-}
-
-pkg_preinst() {
-
-	has_version =${CATEGORY}/${PN}-0*
-	dovecot_upgrade_from_0_x=$?
-
-	has_version =${CATEGORY}/${PN}-1*
-	dovecot_upgrade_from_1_x=$?
-
-	if [[ $dovecot_upgrade_from_0_x = 0 ]] ; then
-		einfo
-		elog "There are a lot of changes in configuration files.  Please read"
-		elog "http://wiki.dovecot.org/Upgrading and edit the conf files"
-		elog "in ${ROOT}etc/dovecot"
-		einfo
-	elif [[ $dovecot_upgrade_from_1_x = 0 ]] ; then
-		# might want to automate upgrade from 1.x when 2.0 is out
-		einfo
-		elog "There are a lot of changes in configuration files.  You should"
-		#elog "run \"emerge --config =${CATEGORY}/${PF}\" or"
-		elog "check the conf files in ${ROOT}etc/dovecot"
-		einfo
-	fi
-
-}
-
-pkg_postinst() {
-
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	if use mysql || use postgres || use sqlite ; then
-		if [[ $dovecot_upgrade_from_0_x = 0 || $dovecot_upgrade_from_1_x = 0 ]];
-		then
-			einfo
-			elog "Please edit ${ROOT}etc/dovecot/dovecot-sql.conf.ext"
-			elog "before starting dovecot"
-		fi
-	fi
-
-	if use ldap ; then
-		if [[ $dovecot_upgrade_from_0_x = 0 || $dovecot_upgrade_from_1_x = 0 ]];
-		then
-			einfo
-			elog "Please edit ${ROOT}etc/dovecot/dovecot-ldap.conf.ext"
-			elog "before starting dovecot"
-		fi
-	fi
-
-}
-
-pkg_config() {
-
-	# return for now
-	return
-
-	if [[ -x "${ROOT}"usr/sbin/dovecot ]] ; then
-		if [[ ! -e "${ROOT}"etc/dovecot/dovecot.conf ]] ;  then
-			eerror "Hmm, cannot find dovecot.conf.  Please edit"
-			eerror "conf files by hand"
-			die
-		else
-			if [[ $dovecot_upgrade_from_1_x = 0 ]] ; then
-				cp "${ROOT}"etc/dovecot/dovecot.conf \
-				"${ROOT}"etc/dovecot/dovecot.conf.old || die "cp failed"
-				if "$(${ROOT}usr/sbin/dovecot -n -c ${ROOT}etc/dovecot/dovecot.conf)";
-				then
-					einfo
-					elog "Old config file is saved as \
-					${ROOT}etc/dovecot/dovecot.conf.old"
-					elog "Please review the new conf files before starting dovecot"
-				fi
-			else
-				eerror "Cannot convert old configuration file."
-				eerror "Please check your conf files in	${ROOT}etc/dovecot"
-				die
-			fi
-		fi
-	else
-		eerror "Cannot find dovecot binary.  You might want to check that"
-		eerror "${CATEGORY}/${PN} was installed successfully."
-		die
-	fi
-
-}
diff --git a/net-mail/dovecot/dovecot-2.0_beta5.ebuild b/net-mail/dovecot/dovecot-2.0_beta5.ebuild
deleted file mode 100644
index 7f6d8611d997..000000000000
--- a/net-mail/dovecot/dovecot-2.0_beta5.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0_beta5.ebuild,v 1.2 2010/06/17 20:52:06 patrick Exp $
-
-EAPI="2"
-
-inherit eutils versionator ssl-cert
-
-MY_P="${P/_/.}"
-major_minor="$( get_version_component_range 1-2 )"
-sieve_snapshot="b8dbef9ec43b"
-SRC_URI="http://dovecot.org/releases/${major_minor}/beta/${MY_P}.tar.gz
-	sieve? (
-	http://hg.rename-it.nl/dovecot-2.0-pigeonhole/archive/${sieve_snapshot}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1" # MIT too?
-KEYWORDS="~alpha ~amd64 ~arm ~sparc ~x86"
-
-IUSE="berkdb bzip2 caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve mbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
-
-DEPEND="berkdb? ( sys-libs/db )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		eerror "managesieve USE flag selected but sieve USE flag unselected"
-		die "USE flag problem"
-	fi
-
-	if use dbox && ! use maildir; then
-		eerror "dbox USE flag needs maildir USE flag enabled"
-		die "USE flag problem"
-	fi
-
-	# Add user and group for login process (same as for fedora/redhat)
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in cydir dbox maildir mbox; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	cd ${MY_P}
-	econf \
-		--localstatedir=/var \
-		--with-moduledir="/usr/$( get_libdir )/dovecot" \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with ssl ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		--with-storages="${storages}" \
-		--with-pic \
-		--disable-rpath \
-		${conf}
-
-	if use sieve; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config || die "emake dovecot-config failed"
-
-		# snapshot. should not be necessary for 2.0 release
-		cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
-		./autogen.sh || die "autogen failed"
-
-		econf \
-			--localstatedir=/var \
-			--enable-shared \
-			--with-pic \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	cd "${MY_P}"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
-
-	if use sieve; then
-		cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make sieve failed"
-	fi
-}
-
-src_install () {
-	cd "${MY_P}"
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${D}"/usr/libexec/dovecot/deliver
-		fperms 4750 "${D}"/usr/libexec/dovecot/deliver
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
-
-	rm -rf "${D}"/usr/share/doc/dovecot
-	rm -rf "${D}"/usr/share/aclocal
-
-	dodoc AUTHORS NEWS README TODO || die "basic dodoc failed"
-	rm -f doc/Makefile*
-	dodoc doc/* || die "dodoc doc failed"
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext} || die "dodoc example failed"
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext} || die "dodoc conf.d failed"
-	docinto wiki
-	dodoc doc/wiki/* || die "dodoc wiki failed"
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${D}/etc/dovecot/dovecot.conf"
-	local confd="${D}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	sed -i -e "s:/usr/share/doc/dovecot/:/usr/share/doc/${PF}/:" \
-	"${confd}/../README" || die "sed failed"
-
-	# .maildir is the Gentoo default, but we need to support mbox too
-	local mail_location="maildir:~/.maildir"
-	if use mbox; then
-		mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-		keepdir /var/dovecot
-		sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
-		"${confd}/10-mail.conf" || die "sed failed"
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/managesieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve; then
-		cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
-		emake DESTDIR="${D}" install || die "make install failed (sieve)"
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins =/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${D}"/usr/share/doc/dovecot
-		dodoc doc/*.txt
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-	fi
-
-}
-
-pkg_preinst() {
-
-	has_version =${CATEGORY}/${PN}-0*
-	dovecot_upgrade_from_0_x=$?
-
-	has_version =${CATEGORY}/${PN}-1*
-	dovecot_upgrade_from_1_x=$?
-
-	if [[ $dovecot_upgrade_from_0_x = 0 ]] ; then
-		einfo
-		elog "There are a lot of changes in configuration files.  Please read"
-		elog "http://wiki.dovecot.org/Upgrading and edit the conf files"
-		elog "in ${ROOT}etc/dovecot"
-		einfo
-	elif [[ $dovecot_upgrade_from_1_x = 0 ]] ; then
-		# might want to automate upgrade from 1.x when 2.0 is out
-		einfo
-		elog "There are a lot of changes in configuration files in dovecot-2.0."
-		#elog "run \"emerge --config =${CATEGORY}/${PF}\" or"
-		elog "Please check the conf files in ${ROOT}etc/dovecot"
-		elog "You can run dovecot -n -c ${ROOT}etc/dovecot/dovecot.conf before"
-		elog "running etc-update or dispatch-conf to get an idea about"
-		elog "what needs to be changed."
-		ewarn "Do not {re}start dovecot without checking your conf files"
-		ewarn "and making the necessary changes."
-		einfo
-	fi
-
-}
-
-pkg_postinst() {
-
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	if use mysql || use postgres || use sqlite ; then
-		if [[ $dovecot_upgrade_from_0_x = 0 || $dovecot_upgrade_from_1_x = 0 ]];
-		then
-			einfo
-			elog "Please edit ${ROOT}etc/dovecot/dovecot-sql.conf.ext"
-			elog "before starting dovecot"
-		fi
-	fi
-
-	if use ldap ; then
-		if [[ $dovecot_upgrade_from_0_x = 0 || $dovecot_upgrade_from_1_x = 0 ]];
-		then
-			einfo
-			elog "Please edit ${ROOT}etc/dovecot/dovecot-ldap.conf.ext"
-			elog "before starting dovecot"
-		fi
-	fi
-
-}
-
-pkg_config() {
-
-	# return for now
-	return
-
-	if [[ -x "${ROOT}"usr/sbin/dovecot ]] ; then
-		if [[ ! -e "${ROOT}"etc/dovecot/dovecot.conf ]] ;  then
-			eerror "Hmm, cannot find dovecot.conf.  Please edit"
-			eerror "conf files by hand"
-			die
-		else
-			if [[ $dovecot_upgrade_from_1_x = 0 ]] ; then
-				cp "${ROOT}"etc/dovecot/dovecot.conf \
-				"${ROOT}"etc/dovecot/dovecot.conf.old || die "cp failed"
-				if "$(${ROOT}usr/sbin/dovecot -n -c ${ROOT}etc/dovecot/dovecot.conf)";
-				then
-					einfo
-					elog "Old config file is saved as \
-					${ROOT}etc/dovecot/dovecot.conf.old"
-					elog "Please review the new conf files before starting dovecot"
-				fi
-			else
-				eerror "Cannot convert old configuration file."
-				eerror "Please check your conf files in	${ROOT}etc/dovecot"
-				die
-			fi
-		fi
-	else
-		eerror "Cannot find dovecot binary.  You might want to check that"
-		eerror "${CATEGORY}/${PN} was installed successfully."
-		die
-	fi
-
-}