courier version bump

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

3 files changed, 341 insertions, 33 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index 515288c6ba5d..ed6b9aef62f3 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/courier
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.152 2012/06/27 15:46:18 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.153 2012/09/26 16:04:38 hanno Exp $
+
+*courier-0.69.0 (26 Sep 2012)
+
+  26 Sep 2012; Hanno Boeck <hanno@gentoo.org> +courier-0.69.0.ebuild:
+  Version bump.
 
 *courier-0.68.2.20120626 (27 Jun 2012)
 
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index afaaaee5a34c..d86f42077e21 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,39 +1,41 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX apache-sqwebmail.inc 347 RMD160 9d046149af6138320448fe7bb762b142e0eb9b94 SHA1 4996c33b74a3c9b70886f27948334e3880df8073 SHA256 3a6616dacfd49ab0c89c62d9df5662fc3c2d9e598786d781240bf5e8900afc65
-AUX bofh 23 RMD160 995b6b103c29f390c2f0230af95d4c0823423dcb SHA1 f6399bc612af33ca79921961b223cbdf394d9549 SHA256 7e42d61373770a2b14a6fdd8b5f71c598ce4767726f8f7106de00b7c34a59e8c
-AUX courier-init-r2 4877 RMD160 bc1bf99be4e032a0e52bba71801c89f9a6cd4383 SHA1 a9e8329fb0582fc0cf0341de4e054096587f2790 SHA256 d6a53142751f71f3a6287806259a640fdc1c8807003510d775b0239e8410d02a
-AUX courier-init-r3 5021 RMD160 784638049a1cb1f6844bb895e7f5520d8d70554b SHA1 4712e25dff8b3e49258e5c32e8e4fe09d45f4820 SHA256 c0847cf475d07ed5133a3ab1760e1501d3f576cad490757fa2529a75d92078ac
-AUX dot_courier 26 RMD160 cf20012379abbb63f78e1eb0f9cbaefff6d1048d SHA1 8e5e09e167035d100859b42311b6dda2842f4d67 SHA256 8c585031b4356ca1f887e0823fd9b365fff57a5f9cc32541eccfc1542d5d3763
-AUX locallowercase 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-AUX mailer.conf 197 RMD160 4229dfa9cf33b275571538211dad33da5ae84048 SHA1 caf095797e8c526dc5fec59d9d89d51f318cd28a SHA256 5a946a7c4ed42bbddf2c471e2e00898150e4bff33f4af70620cf814ab2f12b47
-AUX norewrite.patch 489 RMD160 1d0bacf702126cc4f8b9d7b07bbc6a9357b7b6e9 SHA1 007059af9ab5d89b36004e590b6a21911515f69b SHA256 526f3742fb43af93811e6e4b3210fda1c611b50ce5abdf3a57a25dfe4f5c38e4
-AUX password.dist 247 RMD160 eab211be0b1e3dbd6206f79e993b1d314a24efa3 SHA1 2cdd5bcf561f7267be6f18b731813962030af166 SHA256 46f20a84922d108d39a7c26ad3ba8915326549f46cea811e2384f55a589d38e2
-AUX set-mime 741 RMD160 8ed45fb4a0aee168a70cdcab6d17cf1606f85cad SHA1 b8834602c7304d42f3179a8dde43dcc57d0f4972 SHA256 bf15af7c181d517a924cb82854cbce46278e6e28ffb338e2159ba89c386dc74f
-DIST courier-0.65.2.tar.bz2 7152680 RMD160 6a81f74c85f9e78e6514f840598dde634fe070ce SHA1 784893216ea6c43c91606fa550cfdff13060855d SHA256 496361b8734381ba6128c7b0d5fe4c64ce7d807c01a74aae2cb5be8bb29e5ab2
-DIST courier-0.66.3.tar.bz2 6871617 RMD160 144dc6d5fc2279e50a2f9f349c9c69dd638fe7f8 SHA1 31928fc09dc4e89adae4a601d45df0a9486b7c76 SHA256 5d2f68bdcc89e6a62327b9afed1703a9d2a674f60e0996291f301e7db48d15b5
-DIST courier-0.68.2.20120626.tar.bz2 7068120 RMD160 281ca8659451777a69539145f8c855534819e9ee SHA1 40270febb4e2b99402ff6850eb5cb72bc7519f7d SHA256 b1afcd7454cf893a046b090d25e3fde568108dbe0e9df015cdf97a9a0a99ab46
-EBUILD courier-0.65.2-r1.ebuild 9222 RMD160 195dc916e26f19c3338ab602d0f39751c6ec31ad SHA1 385f0447dd63a228b25a1c063e93d43ac0318529 SHA256 5fa0dc88505d92f876439d505dfc85435ef622888d4d621fd63f307ccc3140eb
-EBUILD courier-0.65.2.ebuild 8971 RMD160 2c5857a9cf08281dd166453d89d88896c4353736 SHA1 34a85bb5f7e33212dba5705ab24502d7f4d3b8d4 SHA256 9b8940e28be0dedf863332a845bdbcbeadd00ce0de2f9c9a5271581821f4db6d
-EBUILD courier-0.66.3.ebuild 9299 RMD160 460366154442644c256d98ca95b3a135e21489f4 SHA1 35ac55c4fd363618d66f4c1d10fb2c74a5f1e369 SHA256 bc3732632f2ad5c315a41360666d95b45822a93b074b0a25b82221237b0a09a7
-EBUILD courier-0.68.2.20120626.ebuild 9308 RMD160 7b4713b9c7a5c133fcb181565acce0863ccda123 SHA1 c71b0f9c736c069e342051ff80c478105323e773 SHA256 62724314c08d28af08e9a7970fd9ed632f525dd2482029cbbebaa3da5db29ed5
-MISC ChangeLog 35994 RMD160 e852b86d2c930004b5c1ddf0419afcc91877260b SHA1 a7891d60f7dc75114de9defdfbfe14c46761c9b0 SHA256 1559f3bf9a314463cfe789e36b18ce8203005ea245a873f32213943a75984e61
-MISC metadata.xml 688 RMD160 d6ea2c5c87e6f305adfef15da4cbc91affe577af SHA1 eaa2f9fea774bdbc651a59929e2fa84f2292b335 SHA256 1cb15a4a98fc9fae0e167e7aa9f8672f3456af2320bb3f8f011ecb612eaa1557
+AUX apache-sqwebmail.inc 347 SHA256 3a6616dacfd49ab0c89c62d9df5662fc3c2d9e598786d781240bf5e8900afc65 SHA512 e3f8f4f01563184ec4afc98d61ab739d5900f7d8757638fb06ff21ca3604f8c6f708730af514f6ca662559980503dee5955ba48c5a643e473054f3eec49b89a0 WHIRLPOOL e586f1bcf82af87df2285ec142f92056fd25df515b2cdc1027d62a97a26ba8205204c192c0bf0b59fb636ca84f70baadd79ea8a60bf9cb97db34e2b66aaee8f4
+AUX bofh 23 SHA256 7e42d61373770a2b14a6fdd8b5f71c598ce4767726f8f7106de00b7c34a59e8c SHA512 83e0e1c0d64ec05c5218ded40de5177a470b9117d23c3981e7a8c334f1fdbed3070bffbdac43966749e3c30d59348ab8f29a11c8052079e2cac322990bc938e7 WHIRLPOOL 8b81629a9a2b6328957563ec09b65a05cf835b42e347af3f423b8db774be5605f7cb570340c6d78d4ab62fe0442fd9961b5b938cf41e0cfb91707bd143738314
+AUX courier-init-r2 4877 SHA256 d6a53142751f71f3a6287806259a640fdc1c8807003510d775b0239e8410d02a SHA512 ab747974aadb022cb74e0830eb1c67ed4ec916b7aaa11bb6bf431925adfccb4d1d47b598579aac8f6a0b6b0f3f643a36d514a2483fc5978f1b7fd4349850706a WHIRLPOOL ee3e51db1985199565d5b9798ff5df94d33a15aead63614e82d0f5a62813907f45d4585ca74319924d61264043591c78f2e3370684d440b7a940829b0236ce5d
+AUX courier-init-r3 5021 SHA256 c0847cf475d07ed5133a3ab1760e1501d3f576cad490757fa2529a75d92078ac SHA512 03492da0ffeb7fda542e713eb9f06e42b06a43ebaae57cb1c32e26d0e16057414d7ff33612c1ea3cf4f8660de14a1f2a4eb61d4c59f5f4aa756a3c3a3ef0aaff WHIRLPOOL 7f78b145ceeb69ef7c734b7f8d36b4728003e9297166db95e5d8d5df2bf4389f8f4e8334c60f67eb144a2a4044981770fd6fe7814f0b3ba94bf075730d369b79
+AUX dot_courier 26 SHA256 8c585031b4356ca1f887e0823fd9b365fff57a5f9cc32541eccfc1542d5d3763 SHA512 58f4f588bf2ee45dcfddcaf4a929cf910ad06ac10b4d72666b7c249537b040825c61e1e2d6df48e21130863a951d425373e3d9f50049a764e90ba546143138b9 WHIRLPOOL 594dfb62c5391cf2776979686a7c44dd64d9a39ad7bad12682fdf2b61e0d1252546b7cf6c61d84b3bdf0921bd4273e14ea4f88af1f6b592771c5e0fd9088e62f
+AUX locallowercase 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e WHIRLPOOL 19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3
+AUX mailer.conf 197 SHA256 5a946a7c4ed42bbddf2c471e2e00898150e4bff33f4af70620cf814ab2f12b47 SHA512 4d92eb43c0f163ddb2095fa34cf63928e7c401abec62e51b488e24f8210e7f0f8fa90351f2732210e45290974d860276a647e24493f7b836aead2ad1c05c2e9a WHIRLPOOL 83a2606cc73664c4801550c1d47e81349e70c557d9c3b56f1e44f295fd097fa7b4b1c17bf5cf39a94603adfb470159681c3e597924ab8be0bc76c2e0c3c29baa
+AUX norewrite.patch 489 SHA256 526f3742fb43af93811e6e4b3210fda1c611b50ce5abdf3a57a25dfe4f5c38e4 SHA512 e9e95bd5d1a78b510f6dd7e155999089f123eecfdc16d3b5005b00981a7b6d29827cdddc61035ed3c3edcf0b9907ddfbae76df6503a1a8ef26b4de43a02bfc8e WHIRLPOOL c41a0b63a2109ac33532de0830257929995383d246eb3f84674e6fcf267ce5cc0b7e8ce339926429a7212f63aa117b5de65bc870f21b0a4a545f4b3f10827323
+AUX password.dist 247 SHA256 46f20a84922d108d39a7c26ad3ba8915326549f46cea811e2384f55a589d38e2 SHA512 f488b0ab1a909c9b878b9f3f3147641a9ed6d8d2ad44c67cd641934b800b18a62de2a7f5f51fdbecfbbcdd7c39c753734984cc0836c905a3b708858e1b91093d WHIRLPOOL 98883b10ae103663d1d1205532e6c243bb462e9dc2adf1b9d6a968f9246283bbb2aabb8779ab5d8b7d052a5a3032f9d113ac74c773bf7591e81ccf086a2e51b3
+AUX set-mime 741 SHA256 bf15af7c181d517a924cb82854cbce46278e6e28ffb338e2159ba89c386dc74f SHA512 41fe4821efdd1f51d20584d4cd88b5977a969c6527f13c5aedc83bf0bb99ca27caebc02cddfc8e711472bea200163efaf2dd61ad39cee872e8b277bc7fc99d67 WHIRLPOOL 3f58bcbe163c03b3b143f0a31f45449ee2e5d547a745b3f2964cbfb5c0e966e7a7499905b897c1703306b22d357e1768a7ed7d39a348310c16dfa92d26422fc2
+DIST courier-0.65.2.tar.bz2 7152680 SHA256 496361b8734381ba6128c7b0d5fe4c64ce7d807c01a74aae2cb5be8bb29e5ab2
+DIST courier-0.66.3.tar.bz2 6871617 SHA256 5d2f68bdcc89e6a62327b9afed1703a9d2a674f60e0996291f301e7db48d15b5
+DIST courier-0.68.2.20120626.tar.bz2 7068120 SHA256 b1afcd7454cf893a046b090d25e3fde568108dbe0e9df015cdf97a9a0a99ab46
+DIST courier-0.69.0.tar.bz2 7061163 SHA256 adfd9d7ad5a8f6256286b797f242f65a0bb90bf52a6104fbcf38e51740f8ab09 SHA512 96e048015392f5673986fc086a8e7a7e8ecece1d6e08b096a05ae3f8f7feabd96e8dcf951fcb265efae773b909479a95f6aa2de88204677658c458079dec5b39 WHIRLPOOL 89fc61474ad0e382e47293b015c9216b9389013071ed0153be6c29b9aa27288b856d9087d41ae951a57f3543705144b44c6295a38d65433c16755c7b947a29f1
+EBUILD courier-0.65.2-r1.ebuild 9222 SHA256 5fa0dc88505d92f876439d505dfc85435ef622888d4d621fd63f307ccc3140eb SHA512 6057c9b9a593d38fc983d49bbd47602c0bbb3cbec001dc1b238ce8f7b948d6e34f6896f353b62d30ab33b33c746adb48101a4f0efb0ff55aa68764c2c9fb5837 WHIRLPOOL 47ff77b8f0e0d93fbee6db0bd1e70501e39e9add6488fb97f44d6c8f9ec525808012e77ac37adcfd605c3c5246e9a4cdc89a81c3fe1258243911be73bbd23b4d
+EBUILD courier-0.65.2.ebuild 8971 SHA256 9b8940e28be0dedf863332a845bdbcbeadd00ce0de2f9c9a5271581821f4db6d SHA512 5673266b15e3bd04a6c33da21d5595413fc01ee5eaefeeea1e5fe080ebe9f5af9d580da87c43ec62877de709041492a462ebf050b47fdb41c597d8330f6df276 WHIRLPOOL 8b1a023d23821760cbe2e5081b244913ec7feec9412e8dc07c234902b400010b413f3ef8d055d49babe1c25dcd017f0bd247808eab0aec3b6998e716199cc3b9
+EBUILD courier-0.66.3.ebuild 9299 SHA256 bc3732632f2ad5c315a41360666d95b45822a93b074b0a25b82221237b0a09a7 SHA512 b516a9445b720330a74fe1335fce8b775977f7cbec51576521f3811e343fb2f428c29bbf1b302776741026a01ef8d129e43d9d4af4dc0ebdc465b53f02be8d0d WHIRLPOOL 5252e37f86b3340d99ab33a6aa5cd00d47f209cb1047196afbcd414eead446e1d0a43a884ef4e068554482a55294bc8237f6eb83ebad11da78d1830e3fb6a7ab
+EBUILD courier-0.68.2.20120626.ebuild 9308 SHA256 62724314c08d28af08e9a7970fd9ed632f525dd2482029cbbebaa3da5db29ed5 SHA512 accc71a05af5b23101fc21428c3166b03d56c77250e5b9e9321cd8d80d81e79e0f0902d144a625602a9f790b0dd70ecfc8040176bc1df5353968172ec06f9330 WHIRLPOOL 91c198dd65bc84462cf36b61fdf8704e4866197510ed7749f023b1594b264754e77035989b6d231ba8f0711300b1425a9d04db05edd18ee1b03a4e7513c38b8a
+EBUILD courier-0.69.0.ebuild 9299 SHA256 b308b9d0fd4fe6b9ec607f2f0141ab23586c1eb041d316357d24bf863e99dcbf SHA512 735fa144180e32bea7cca4f2d09e52bf3b6a74cc1cb9ec35391acea5f20925e1a5cfff5ba21d7558a44d1858acc0941b87cbc698ed793da602dbfdaf21f3a7af WHIRLPOOL 82a57475dde1d40dc65bbb06e82558d75081c386e091c0c25f77c4f3860128223d85ac4669a8c77a511cb53135eb5e71245e1d2be92fab79e46f69e5e90f6f1f
+MISC ChangeLog 36112 SHA256 144eb681a770e44c59fda102b8670e372b53f1a4372190645ba03abf055d9e33 SHA512 e5b4646df1c59cead0789464b8fc170d66a96b04134f3806abfcc3cd31965c8ba749435e29391f962545bb482a3487d1601abd86a515f0d5d539a52d40ce80ea WHIRLPOOL b606c24f418e0b4ed47c907d63d715d92ddda5a3d9668b036e752682f77023b948e1ef7909fecaf9657fda5f8505944c3913b30f94a6c6b0045870c3cc93a0cb
+MISC metadata.xml 688 SHA256 1cb15a4a98fc9fae0e167e7aa9f8672f3456af2320bb3f8f011ecb612eaa1557 SHA512 07955a3efaadb572270bcaf9fab65f988d3999834fb95515003e7022707731877efbb7a749622b57b3a768db27db331a5efb3beb0637ac8e6def1d667dcc93ae WHIRLPOOL 07da4b25e2640c2ce0318e5fa2086b3f4f187e821940b7304184a0b4634e0dfe55edc7b359430c76c6617ed512ff68ad33cae150c1e34e0deb9d04484c0408aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJP6yrBAAoJEKWIAHK7tR5Csl0P/0VlPFpmJyML98UGKmihinBa
-NBT57lNBfs49U8sEKCTaQsqi+OSaddxgAsHEf011hBmlDt+Q71TqVr3ZIKUPdg01
-eX3yGPoGpUcRLnvgfFbb+dgA0Qfw39hKIM8HCp3bIxV2ocandfPss7RAoBJw2PUC
-rrQQVk96qTHOJ1cNIQgnreum8Qay99bf8vy7FwM1TKtkyIloXfNEnSA46Jf/5n50
-4sjkSZiHXX4xX+TKH5poQpxPviixPHINBIXgx/Er2ijmivvTsILipmGjTczsL1f1
-KmUVJnPkK01kLcP/xbmd19lF6sEJvKJzJ0g2leh4SEouFMSLnIcT5P/6sw9IlnEL
-b9d+VLw8vhgUwtMDiMikyplUgHXRGbYLaDPJPodD1AvU9QvGK0pySnGhnGb7euoY
-Ocoynq+LK4ESYPtoCOYTq14Xw4z5YjtHyTDpcwlL3tv1uP4HJmKPOynoYbkSz83t
-tudVC03qUlOJTkhXshBWhT+irGGfiBnNim4ovXosYL67gI3k5ck06I5eyjraejdG
-EovZR+vKBEgziTFgVWRgLLchQvASdy2CnLxl6OSOy3KMOJY7H3KxCU+DvcnsXtnO
-8w6hKEy36ZyDjkFCBn/hv8DmvNiPmyMzrnjt+s3q9Gi7HL3udsyXlHjwYXU9cuvp
-aYyHEjHO3QHaY0V3Kio5
-=5y34
+iQIcBAEBCAAGBQJQYyeZAAoJEKWIAHK7tR5C+2MP/jwS1q85EEnqmO44RJX83Uc2
+oYuWKYRWkG0m3sDz67k+xj1n8ur9ud3Jo5aFNNLsDM+Nom92nkexMNb+IANybZ85
+vSAORjZq2RMwZrrrS1KEWcQgA9fN1a9PVFN44QsLdldCQ+QFyQEqYWYNzQm4Za3a
+L/BPDlx7Rzrl5wtsA9x1g+/cN/AWZLZ31LaPsZmypau2M3K3Juja4AMG72pWXYes
+CpxoCrrUo3limSTmrSk9Fz9fDBJYkbXYCJ07a7W0Njrbi0adRThVNuyJ+69tTze+
+ZFSLQScQJU2gDEOZr6T/dSXffdTkuTnTiNpFNMwuOHoZx6SzxqskiUs3O4WhACxq
+LfeOt3+W/gun1q/tQ4M+A1/Hz1be+gMyWxdS99XESKDmoY9st1LBd2e4Jrzbandv
+eV6ov2+utsxVO8yYuFufiTK9Fqf49KN6mTPe6YUmSucnTWICES85Itu9gPuJ3pgj
+SUmPT1aik1+5qh+r55vdozNcb+sy+upE9gts3et5kwi6imaBt4gDBG1IOaLxtuyH
+DjGl/xwBw2BKGXkgJWcfSCUArWNM3cRZuo9OglVo/u7gO/gX8YPMxuLYAyc8DeBc
+jpiTrKyg/ffJ9XCTL69zNIYkjbW2X0idGbnOUtlqnT6WeOwBZpwy88GB9vd+57aj
+K02OMakLqx4L3iqc+XQ+
+=JcT4
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/courier/courier-0.69.0.ebuild b/mail-mta/courier/courier-0.69.0.ebuild
new file mode 100644
index 000000000000..d7b2139b54ba
--- /dev/null
+++ b/mail-mta/courier/courier-0.69.0.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.69.0.ebuild,v 1.1 2012/09/26 16:04:38 hanno Exp $
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/"
+SLOT="0"
+LICENSE="GPL-2"
+# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
+	fam web webmail gnutls"
+
+DEPEND="
+	>=net-libs/courier-authlib-0.61.0
+	!gnutls? ( >=dev-libs/openssl-0.9.6 )
+	gnutls? ( net-libs/gnutls )
+	>=sys-libs/gdbm-1.8.0
+	dev-libs/libpcre
+	app-misc/mime-types
+	fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
+	pam? ( virtual/pam )
+	mysql? ( virtual/mysql )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	postgres? ( dev-db/postgresql-base )
+	spell? ( app-text/aspell )
+	fam? ( virtual/fam )
+	!mail-filter/maildrop
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp
+	!mail-mta/nbsmtp
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/ssmtp
+	"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	sys-process/procps"
+
+# get rid of old style virtual/imapd - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/cyrus-imapd
+	!net-mail/uw-imap"
+
+PDEPEND="pam? ( net-mail/mailbase )
+	crypt? ( >=app-crypt/gnupg-1.0.4 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	use norewrite && epatch "${FILESDIR}/norewrite.patch"
+}
+
+src_compile() {
+	filter-flags '-fomit-frame-pointer'
+
+	local myconf
+	myconf=""
+
+	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
+
+	econf ${myconf} \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		$(use_with spell ispell) \
+		$(use_with ldap ldapaliasd) \
+		$(use_enable ldap maildroldap) \
+		$(use_with gnutls) \
+		--enable-mimetypes=/etc/mime.types \
+		--prefix=/usr \
+		--disable-root-check \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/courier \
+		--libexecdir=/usr/$(get_libdir)/courier \
+		--datadir=/usr/share/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--localstatedir=/var/lib/courier \
+		--with-piddir=/var/run/courier \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--with-paranoid-smtpext \
+		--with-db=gdbm \
+		--disable-autorenamesent \
+		--cache-file="${S}/configuring.cache" \
+		--host="${CHOST}" debug=true || die "./configure"
+	sed -e'/^install-perms-local:/a\	sed -e\"s|^|'"${D}"'|g\" -i permissions.dat' -i Makefile
+	emake || die "Compile problem"
+}
+
+etc_courier() {
+	# Import existing /etc/courier/file if it exists.
+	# Add option only if it was not already set or even commented out
+	file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
+	[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
+			cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
+	grep -q "${word}" "${D}/etc/courier/${file}" || \
+		echo "${2}" >> "${D}/etc/courier/${file}"
+}
+
+etc_courier_chg() {
+	file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
+	[ -z "${section}" ] && section="${2}"
+	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
+	sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
+}
+
+src_install() {
+	local f
+	diropts -o mail -g mail
+	keepdir /var/run/courier
+	keepdir /var/lib/courier/tmp
+	keepdir /var/lib/courier/msgs
+	make install DESTDIR="${D}" || die "install"
+	make install-configure || die "install-configure"
+
+	# Get rid of files we dont want
+	if ! use webmail ; then
+		rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
+			"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
+			"${D}/usr/share/courier/sqwebmail/" \
+			"${D}/usr/sbin/webmaild" \
+			"${D}/usr/sbin/webgpg" \
+			"${D}/etc/courier/webmail.authpam" \
+			"${D}/var/lib/courier/webmail-logincache" \
+			"${D}"/etc/courier/sqwebmaild*
+	fi
+
+	if ! use web ; then
+		rm -rf "${D}/usr/share/courier/courierwebadmin/" \
+			"${D}/etc/courier/webadmin"
+	fi
+
+	for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
+		keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
+	done
+
+	newinitd "${FILESDIR}/courier-init-r3" "courier"
+	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
+
+	cd "${D}/etc/courier"
+	if use webmail ; then
+		insinto /etc/courier
+		newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
+	fi
+
+	for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
+	if use ldap ; then
+		[ -e ldapaliasrc ] &&  ( chown root:0 ldapaliasrc ; chmod 400 ldapaliasrc )
+	else
+		rm -f ldapaliasrc
+	fi
+
+	( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
+		> "${D}/etc/courier/sizelimit"
+	etc_courier maildroprc ""
+	etc_courier esmtproutes ""
+	etc_courier backuprelay ""
+	etc_courier locallowercase ""
+	etc_courier bofh "opt BOFHBADMIME=accept"
+	etc_courier bofh "opt BOFHSPFTRUSTME=1"
+	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
+	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
+	etc_courier bofh "opt BOFHSPFFROM=all"
+	etc_courier bofh "opt BOFHSPFMAILFROM=all"
+	etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
+	etc_courier esmtpd "BOFHBADMIME=accept"
+	etc_courier esmtpd-ssl "BOFHBADMIME=accept"
+	etc_courier esmtpd-msa "BOFHBADMIME=accept"
+
+	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
+	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
+
+	# Fix for a sandbox violation on subsequential merges
+	# - ticho@gentoo.org, 2005-07-10
+	dosym /usr/share/courier/pop3d /usr/sbin/courier-pop3d
+	dosym /usr/share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
+	dosym /usr/share/courier/imapd /usr/sbin/courier-imapd
+	dosym /usr/share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
+
+	cd "${S}"
+	cp imap/README README.imap
+	use nls && cp unicode/README README.unicode
+	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
+	dodoc tcpd/README.couriertls
+	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"
+
+	if use webmail ; then
+		insinto /usr/$(get_libdir)/courier/courier
+		insopts -m 755 -o mail -g mail
+		doins "${S}/courier/webmaild"
+	fi
+
+	if use web ; then
+		insinto /etc/courier/webadmin
+		insopts -m 400 -o mail -g mail
+		doins "${FILESDIR}/password.dist"
+	fi
+
+	# avoid name collisions in /usr/sbin, make webadmin match
+	cd "${D}/usr/sbin"
+	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
+	if use web ; then
+		sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
+			-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
+			"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
+			|| ewarn "failed to fix webadmin"
+		sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
+			-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
+			"${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
+			|| ewarn "failed to fix webadmin"
+	fi
+
+	# users should be able to send mail. Could be restricted with suictl.
+	chmod u+s "${D}/usr/bin/sendmail"
+
+	dosym /usr/bin/sendmail /usr/sbin/sendmail
+}
+
+src_test() {
+	if [ `whoami` != 'root' ]; then
+		emake -j1 check || die "Make check failed."
+	else
+		einfo "make check skipped, can't run as root."
+		einfo "You can enable it with FEATURES=\"userpriv\""
+	fi
+}
+
+pkg_postinst() {
+	use fam && elog "fam daemon is needed for courier-imapd" \
+		|| ewarn "courier was built without fam support"
+}
+
+pkg_config() {
+	mailhost="$(hostname)"
+	export mailhost
+
+	domainname="$(domainname)"
+	if [ "x$domainname" = "x(none)" ] ; then
+		domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
+	fi
+	export domainname
+
+	if [ "${ROOT}" = "/" ] ; then
+		file="${ROOT}/etc/courier/locals"
+		if [ ! -f "${file}" ] ; then
+			echo "localhost" > "${file}";
+			echo "${domainname}" >> "${file}";
+		fi
+		file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
+		if [ ! -f "${file}" ] ; then
+			echo "${domainname}" > "${file}"
+			/usr/sbin/makeacceptmailfor
+		fi
+
+		file="${ROOT}/etc/courier/smtpaccess/${domainname}"
+		if [ ! -f "${file}" ]
+		then
+			netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
+			do
+				i=1
+				net=""
+				TIFS="${IFS}"
+				IFS="."
+				for o in "${netmask}"
+				do
+					if [ "${o}" == "255" ]
+					then
+						[ "_${net}" == "_" ] || net="${net}."
+						t="$(echo "${network}" | cut -d " " -f ${i})"
+						net="${net}${t}"
+					fi
+					i="$((${i} + 1))"
+				done
+				IFS="${TIFS}"
+				echo "doing configuration - relay control for the network ${net} !"
+				echo "${net}	allow,RELAYCLIENT" >> ${file}
+			done
+			/usr/sbin/makesmtpaccess
+		fi
+	fi
+
+	echo "creating cert for esmtpd-ssl:"
+	/usr/sbin/mkesmtpdcert
+	echo "creating cert for imapd-ssl:"
+	/usr/sbin/mkpop3dcert
+	echo "creating cert for pop3d-ssl:"
+	/usr/sbin/mkimapdcert
+}