Cleanup.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA5880072BBB51E42

15 files changed, 24 insertions, 2241 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index cd3c120a4552..9aefe5d9df7f 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-mta/courier
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.174 2014/01/18 19:52:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.175 2014/09/03 12:47:56 hanno Exp $
+
+  03 Sep 2014; Hanno Boeck <hanno@gentoo.org> -courier-0.65.2.ebuild,
+  -courier-0.65.2-r1.ebuild, -courier-0.66.3.ebuild,
+  -courier-0.68.2.20120626.ebuild, -courier-0.69.0.ebuild,
+  -courier-0.70.ebuild, -files/bofh, -files/courier-init-r2,
+  -files/courier-init-r3, -files/dot_courier, -files/locallowercase,
+  -files/mailer.conf, -files/set-mime:
+  Cleanup.
 
   18 Jan 2014; Agostino Sarubbo <ago@gentoo.org> courier-0.71.ebuild:
   Stable for alpha, wrt bug #486504
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index f7af4e24efb0..8814871480da 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -2,45 +2,27 @@
 Hash: SHA256
 
 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 courier-init-r4 5076 SHA256 69d826eb81803db8eb69aefc94e7d5fcdc2bb4fdc029b5bad2e486b94e71fe49 SHA512 30a575991a96110bbb79e30a7cf94c9cd5c87e364fa412f605a8856163707f04886e2955cf2b5b8a6f827ae45799adb15236fe5ea3e50fd2887dd0bf9596101f WHIRLPOOL 3218e0769b7184f8f11310f17572e1892ff6587b5ee2d9a53fa22222a320c4d5781e4974a485577c3f292acb3b914bac79bb91b18a59dfc7bc8a2a48c8b5b66f
-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 SHA512 6d17fe8c1066e73aae33e214aeb206aced1bb4e59bf8e8f2a3c451ee2774fce80c7391a707a438d563673ced9b0d86565e455d711813b8c506019c84eeb3bd0f WHIRLPOOL 6828de7916643a6eddd3519066bfe4b2315122a9c99151cdcc24cc706c57add22ec1258ba02024ada9678c06e23615accc49e8ec9490cde173e69c60dd92d15f
-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
-DIST courier-0.70.tar.bz2 7063765 SHA256 99035a8132982712ecc88ccb9ca6583216d18f02b710dbf6dbea9f2ab6042a75 SHA512 c3f023014facb25ccd84aadf184b523cc2ea02fcdbb6bc4f680a3143faeb256497e638c61dd2aaf7e19a7d3e046d7ac2695464e9a9d57bc4604e4b4f3ffb1af1 WHIRLPOOL 1659aa993eb51c4de8a0b54601a8f134581794885d4bc8509e17d7858e23ffcf5c25a738d1c994b262f5ae27fd6689e9572c25429f79ecf9d4530d13b57300cd
 DIST courier-0.71.tar.bz2 7117940 SHA256 e06058ed6163bd7e706517ad183fb26faba00ff0ad649557123e5f33f265ebcd SHA512 08b02b006c978c4e1d12241d3f687a201e65afbd6a7ca49f10c77c4ddad0b1d89bb43169b1eb7cd90af30117ffa13911794da3f7dec3429c36b4bc3a9cf3cac8 WHIRLPOOL 47b1d5c4adbd1b387a2a2d412f7d55cc661b517e72bc7a29bec07c098dd5efffe91fa85c9ecae701049e0c08a7d4b1d1b777d24befe1103ad079eb9e8dd1e61c
-EBUILD courier-0.65.2-r1.ebuild 9227 SHA256 0d55b5c68f774d38ea2be5126b64c64234f75bc7dd9f5dae685ad8efec414d03 SHA512 05c19a85418fdfbeb2bb853467365cc456400b898e7a3cf600bffa1fda39e285301175f1ce234acbc3e4a39ab4b4dfe75bc855a98a6969369ceef0141b9b03db WHIRLPOOL c9f1fc73c11b63f2eec572f8ecd6b02a8a75ce7da52f025c626b5294a78518e9c06c8c163272038fedcf7da592b1c517f0f5c6e8a13635e95a8b108a1a6b747a
-EBUILD courier-0.65.2.ebuild 8972 SHA256 b109e01bc7ce28e7bd367892b44b2f47ae2174f096ab39440d1fb6add431758d SHA512 5143951c55bd9d00c4875f1df391756227f0448dceba0b569e260e05232b42ef2127b91b73b0bf6b1c62cc73b0d944be2bbf5822ac8bea5b428fb606824ef1c2 WHIRLPOOL 20e66a09d8366fd29804f8acafa1d58b77059df8be3eff99b734d72553616afa048a76bde7728e84e751b56ab4a35f796009dfa257351e95284bc08fa11f106b
-EBUILD courier-0.66.3.ebuild 9302 SHA256 4349408d2866d7c87fcacbcb2f5e29df0e5e1e6605e14b2ba9b7393ee0a2d03b SHA512 41652d38cea3c0fe93bbc738dc3f773f97b92c0d83dc1c74aec595971509eabe9835cc789b11bf6be01c42cc26d320c6ee380308fb480664596ba58d0afc86ab WHIRLPOOL 3dec0ded39ea5fd3df56cdef161819e5210d9f80672d4281b3944da22ca5ab05e23c3e55e9fd8f28fc39e51fed5714f357d4a43c8d6c6594159ea3c4a9eafba8
-EBUILD courier-0.68.2.20120626.ebuild 9311 SHA256 d4b138c8a0a543c55dd4fa9bbcf45374d01b36da98c6128e8b2fbd8582accd9d SHA512 29b72e631d0ed8be0089be70d53191d419bfa8e72c3a72ae0f5f5a2e035e740513da386349b3d058b67d6d0df0d2aef500d7cb3e4c676bb3ce2248a76a62ddd1 WHIRLPOOL 0c37f2535e2916b1b482c31b6576f3430e8842e2b78b469e2d0a2b923d59ce9a770164f770d55ccbc3cfd7d944a4eccf343cbf0e829c9ea44dd520d3669e7cae
-EBUILD courier-0.69.0.ebuild 9342 SHA256 def4695de54d198fffb7bff0fe1f824f8929e8ea4406c29536b352898f9e1a2b SHA512 62b00600e35355e6c5cfec56928fc1d54c5a9d5169011be833352a0c3f4f913935586b20b4e0c4f24d7dffaf30e14d540f63c9bc7f24384199c5b44fc523fcf0 WHIRLPOOL 2f58b67eb7dd13177a3ae8297704701d1426dad10f49308ee5fc6b2b88ac0ca60d971165f9bfbde73254ae49a23182185a36b685130f83118f665b736229c1e1
-EBUILD courier-0.70.ebuild 9318 SHA256 577624b663de619ddafcbcec1109e33fe9971cee3ffe26b333fe565e611cd4d1 SHA512 d96c0d7bff64bce7ddfb9ea9ab7e76fb1092db012732de354f289e37b59e3933bfcb29f75ac1458d104453e5560ce193e5802a91a4cc6572b5449c7ef812e591 WHIRLPOOL 958f21f36042c36ebe5ede20c7372beb4ac6031a0f60bbc98412a3e81052731bd9c94e15f3f3c3d71eab35cb1d3c30ef57e9f46d245982870da016912a9d7943
 EBUILD courier-0.71.ebuild 9309 SHA256 6fca18898ab7bbc8828ca0701951210e02537054f788258a6e15d0c81ebe847d SHA512 36e645242c59cbb076a189bd8f7ab67d312bf7fd32ec85284929dc89564211b66168e41037478f8d3129af91eae42113f8bbe229da311c19f2fe61cd9e4177fb WHIRLPOOL 1f6e5edf61c0c95ded7f51ffb532e7e7d4ddba85e0b4726b98fe971af6bc2c54b48ceed302a33dc2aaa25710a936a5a99231b5d2880de5794d4793e18631d5ea
-MISC ChangeLog 38836 SHA256 51c17b6285fa535a9b0c410c02458116128cc3bf5bd7646f47645e62c0e409a2 SHA512 2c1e97f6651a5cc8f25c8e92c09f996156642f92da464b8d065be22977ded87bd815d3f57ccfd150dc07d92b619435a5dd683d9d93c0b5245179e9f317a1f67c WHIRLPOOL 891647e471e8baae09672502c6c3788b79367937dde2a6451a447c109d5545e3af7a765a54bc92a7eeffb7679cefb25080ed2fa9cc7f6895b5beb85535c2b3d0
+MISC ChangeLog 39201 SHA256 632dbb9e02403d50fe4eb31fcc16d6daaf0e9b19494706c7a57b778554e4e48b SHA512 4d6c07badd37e225d1dec6c743718b3b86cd80312ed071930fd8470f71ced9d8e9d36ad63e71c9b6d89a8cd4e9d0a89d2ffdbd23666eb8ff77b994d1b0c7142a WHIRLPOOL 5bbddc80cc0ede489b33c1f36978411fa636712b19b1f6a82950153eea6520e89bfa99bad67c010fc90573ad78b64a6572837ce63320ecfcdee5169b7027f863
 MISC metadata.xml 688 SHA256 1cb15a4a98fc9fae0e167e7aa9f8672f3456af2320bb3f8f011ecb612eaa1557 SHA512 07955a3efaadb572270bcaf9fab65f988d3999834fb95515003e7022707731877efbb7a749622b57b3a768db27db331a5efb3beb0637ac8e6def1d667dcc93ae WHIRLPOOL 07da4b25e2640c2ce0318e5fa2086b3f4f187e821940b7304184a0b4634e0dfe55edc7b359430c76c6617ed512ff68ad33cae150c1e34e0deb9d04484c0408aa
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJS2tt0AAoJELp701BxlEWfbk0P/j3bk+M7+Oy/BzkRW8pQ9p7b
-ZUMYa52TZIT6S5RkfyXcVEZtFmwu0mqaQKE2mDJ5dxvaqnA/Pgh5o474u5TiEG8l
-y7SknJG8mrqAM0ng8PTjoC5gky2S+T48W50hsbNe+h0Cq99oRA44lzuzabcClWWW
-6hWo/+UsV5e6jcTiNDybLVAG1ZARg8VrVZyjZYfe88aWMb8NlGnms+CQW6AowSeP
-PruIwjAQYiWdrrqBkuKu7Fo+SjL79lFqs+eSVzIUxIiPSaJJ1i5IB8kvU4ivRJZ6
-OblrQ1IdCffAuAL5ikxAXSVygGGCBrkIwBsmooRB0oZDDgDzdBTuFZEtPH/CXXiK
-iVsLgQ7fTwkH0zIaQ3H48z7b8rFgQpQt9UulfIu7mBtB13TCu8TCFSrsiGavnYjQ
-zgJn/HLG9v7TpGUAOYHvn8eiYBmn3PufbfdSG0gVw2C4IaWooWC0FHlVs3ucWlA4
-ndR++Uwie9QS9L0SzBsQw2arkmaSJwtV2WcViubYTXRiSlWziCote0+3Q0hErs+/
-MpxC+D8sh/sh5JymLjARPN+bMjRDVlhOfzlnhvwovAa0PXrvPJphjI/cNyyO9Ync
-15PQH56hyC0DnnA3z3btDZ5IhI6cT9hpzeQElbAZK1CegQlfxk3I2fL9HFoNobYq
-fnIIbWJPsDFnnUO68zj0
-=BJCy
+iQIcBAEBCAAGBQJUBw31AAoJEKWIAHK7tR5C+AwQAIlHuWvJ+IcNgS+6I/7qVgS/
+TTBbXCFJXg9zGhnMY1fN1OyY71/RoCs7ka2vVbdrO3JRSEcJacX1b3Nel7baxyTm
+1F+TriuMLJL9aQd6O6oyxk0UJC/BCyCctGtjt4eR4uoYEEZIBvP4HXcFL49nVIT/
+eh/CKimrY4MZUPezkkWczvKnGVPs5+q825SmlQx9l47TAqVw2SjE8XAEx0yrJiUM
+78zENDmQPlbTgiPBgNEmYddwuHHthvlOp8aL7iy7eHIwKdvxpECTo7jLIx3XjsaB
+q0ksz2nIo4ReW2sWxRoexbRmL83qKSJGID55YlZtjhsf9ppR4WZ0baBKyrENP1RX
+L68kqF4WfN8Fp7vmx/SEoUPucmVWQ8HbP9J+Ukhqnp8AYn0potCJfPQ/GrsPimJG
+RbZTHzqblB2kO9q/fK3j5zp14THeiRCIcbEusRjNgxo5V57CHX9OoSOneqQfEDzr
+VBgEwJ1KV9awU8xKKXJoa5qJ16UEvPbIlwT7LpMBZx0EueMbnTNzhkjOGmrNr9at
+F+CTJhoPYVq/OQftBDtsgr9hPKjPFdPMvLeIvbcEHW0cgWyNLpTau6WgaVZMY5eW
+pR5Czj7VeLHmU6kjsUnQGylXVPoIag+YduZbHoG/Fspb5XH7kpTIbr4wCn7SCgWM
+1ByrviZLz7QpXf8Yg/fJ
+=p967
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/courier/courier-0.65.2-r1.ebuild b/mail-mta/courier/courier-0.65.2-r1.ebuild
deleted file mode 100644
index dbd4586bcff1..000000000000
--- a/mail-mta/courier/courier-0.65.2-r1.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.65.2-r1.ebuild,v 1.16 2013/02/28 17:48:11 zx2c4 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"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.61.0
-	>=dev-libs/openssl-0.9.6
-	>=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/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp
-	!mail-mta/opensmtpd
-	"
-
-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) \
-		--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
-}
diff --git a/mail-mta/courier/courier-0.65.2.ebuild b/mail-mta/courier/courier-0.65.2.ebuild
deleted file mode 100644
index c3ac0d6786f1..000000000000
--- a/mail-mta/courier/courier-0.65.2.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.65.2.ebuild,v 1.9 2013/02/28 17:48:11 zx2c4 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"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.61.0
-	>=dev-libs/openssl-0.9.6
-	>=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/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp
-	!mail-mta/opensmtpd
-	"
-
-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) \
-		--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
-		cd "${D}"
-		cat "${FILESDIR}/webmail_files" | xargs rm -rf
-	fi
-
-	if ! use web ; then
-		cd "${D}"
-		cat "${FILESDIR}/webadmin_files" | xargs rm -rf
-	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-r2" "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
-	rm "${D}"/usr/sbin/{pop3d,imapd}{,-ssl}
-	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/${P}/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
-}
diff --git a/mail-mta/courier/courier-0.66.3.ebuild b/mail-mta/courier/courier-0.66.3.ebuild
deleted file mode 100644
index a6ff756bdf6e..000000000000
--- a/mail-mta/courier/courier-0.66.3.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.66.3.ebuild,v 1.3 2013/02/28 17:48:11 zx2c4 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/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp
-	!mail-mta/opensmtpd
-	"
-
-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
-}
diff --git a/mail-mta/courier/courier-0.68.2.20120626.ebuild b/mail-mta/courier/courier-0.68.2.20120626.ebuild
deleted file mode 100644
index 867d3b6a72e0..000000000000
--- a/mail-mta/courier/courier-0.68.2.20120626.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.68.2.20120626.ebuild,v 1.3 2013/02/28 17:48:11 zx2c4 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/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp
-	!mail-mta/opensmtpd
-	"
-
-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
-}
diff --git a/mail-mta/courier/courier-0.69.0.ebuild b/mail-mta/courier/courier-0.69.0.ebuild
deleted file mode 100644
index d5aa4f79c501..000000000000
--- a/mail-mta/courier/courier-0.69.0.ebuild
+++ /dev/null
@@ -1,303 +0,0 @@
-# Copyright 1999-2013 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.10 2013/06/15 22:29:38 vincent 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/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp
-	!mail-mta/opensmtpd
-	!net-mail/dot-forward
-	!sys-apps/ucspi-tcp
-	"
-
-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
-}
diff --git a/mail-mta/courier/courier-0.70.ebuild b/mail-mta/courier/courier-0.70.ebuild
deleted file mode 100644
index a9c5ff6d4f46..000000000000
--- a/mail-mta/courier/courier-0.70.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.70.ebuild,v 1.2 2013/09/19 10:59:55 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/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp
-	!mail-mta/opensmtpd
-	!net-mail/dot-forward
-	!sys-apps/ucspi-tcp
-	"
-
-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/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-r4" "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
-}
diff --git a/mail-mta/courier/files/bofh b/mail-mta/courier/files/bofh
deleted file mode 100644
index f2e1fad47285..000000000000
--- a/mail-mta/courier/files/bofh
+++ /dev/null
@@ -1 +0,0 @@
-opt BOFHBADMIME=accept
diff --git a/mail-mta/courier/files/courier-init-r2 b/mail-mta/courier/files/courier-init-r2
deleted file mode 100644
index e19add295133..000000000000
--- a/mail-mta/courier/files/courier-init-r2
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/sbin/runscript
-# Portions Copyright 2003 Gentoo Linux
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/files/courier-init-r2,v 1.1 2008/11/20 13:26:32 hanno Exp $
-#
-# script originally from Courier distfile original name = courier.sysvinit
-# adapted for Gentoo by Brian Jackson
-#
-# TODO
-# should we update all the .dat/.pem files when the source/config files are 
-#	newer than the .dat/.pem files?
-
-prefix="/usr"
-exec_prefix="/usr/bin"
-sysconfdir="/etc/courier"
-sbindir="/usr/sbin"
-libexecdir="/usr/lib/courier"
-datadir="/usr/share/courier"
-
-depend() {
-	need net
-	[ -d /etc/courier/authlib ] && need courier-authlib
-	grep -q "^IMAPDSTART=.*[Yy].*" /etc/courier/imapd && use famd
-	grep -q "^IMAPDSSLSTART=.*[Yy].*" /etc/courier/imapd-ssl && use famd
-}
-
-checkconfig() {
-
-	[ -f ${sysconfdir}/pop3d-ssl ] && . ${sysconfdir}/pop3d-ssl
-
-	# If we do not have a certificate, make one up.
-	[ ! -f "${datadir}/pop3d.pem" ] && \
-	ebegin " generating-POP3-SSL-certificate..." && "${sbindir}/mkpop3dcert"
-
-	[ -f ${sysconfdir}/imapd-ssl ] && . ${sysconfdir}/imapd-ssl
-
-	# If we do not have a certificate, make one up.
-	[ ! -f ${datadir}/imapd.pem ] && \
-	ebegin " generating-IMAP-SSL-certificate..." && "${sbindir}/mkimapdcert"
-
-	[ -f ${sysconfdir}/esmtpd-ssl ] && . ${sysconfdir}/esmtpd-ssl
-
-	# If we do not have a certificate, make one up.
-	[ ! -f ${datadir}/esmtpd.pem ] && \
-	ebegin " generating-ESMTP-SSL-certificate..." && "${sbindir}/mkesmtpdcert"
-
-	# First time after install create aliases.dat and smtpaccess.dat
-
-	[ -f ${sysconfdir}/aliases.dat ] || ${sbindir}/makealiases
-
-	[ -f ${sysconfdir}/${ACCESSFILE}.dat ] || ${sbindir}/makesmtpaccess
-
-	[ -f ${sysconfdir}/${ACCESSFILE}.dat ] || ${sbindir}/makesmtpaccess-msa
-}
-
-start() {
-	# Start daemons.
-	ebegin "Starting Courier mail server:"
-
-	checkconfig || return 1
-
-	ebegin " Starting courierfilterd"
-	${sbindir}/courierfilter start
-
-	[ ! -d /etc/courier/authlib ] && [ -x ${libexecdir}/authlib/authdaemond ] && \
-	${libexecdir}/authlib/authdaemond start && ebegin " Starting authdaemond"
-
-	[ -x ${sbindir}/webmaild ] && \
-	  ${sbindir}/webmaild start && ebegin " Starting webmaild" 
-
-	[ -x ${sbindir}/courierldapaliasd ] && \
-	${sbindir}/courierldapaliasd start && ebegin " Starting courierldapaliasd"
-
-	ebegin " Starting courierd"
-	${sbindir}/courier start
-
-	# start esmtpd if so written
-	[ -f ${sysconfdir}/esmtpd ] && source ${sysconfdir}/esmtpd
-	case x$ESMTPDSTART in
-	x[yY]*)
-		ebegin " Starting esmtpd"
-		${sbindir}/esmtpd start
-		;;
-	esac
-
-	# start esmtpd-msa if so written
-	[ -f ${sysconfdir}/esmtpd-msa ] && source ${sysconfdir}/esmtpd-msa
-	case x$ESMTPDSTART in
-	x[yY]*)
-		ebegin " Starting esmtpd-msa"
-		${sbindir}/esmtpd-msa start
-		;;
-	esac
-
-	# start esmtpd-ssl if so written
-	[ -f ${sysconfdir}/esmtpd-ssl ] && source ${sysconfdir}/esmtpd-ssl
-	case x$ESMTPDSSLSTART in
-	x[yY]*)
-		ebegin " Starting esmtpd-ssl"
-		${sbindir}/esmtpd-ssl start
-		;;
-	esac
-
-	# start pop3d if so written
-	[ -f ${sysconfdir}/pop3d ] && source ${sysconfdir}/pop3d
-	case x$POP3DSTART in
-	x[yY]*)
-		ebegin " courier-pop3d"
-		${sbindir}/courier-pop3d start
-		;;
-	esac
-
-	# start pop3d-ssl if so written
-	[ -f ${sysconfdir}/pop3d-ssl ] && source ${sysconfdir}/pop3d-ssl
-	case x$POP3DSSLSTART in
-	x[yY]*)
-		ebegin " courier-pop3d-ssl"
-		${sbindir}/courier-pop3d-ssl start
-		;;
-	esac
-
-	[ -f ${sysconfdir}/imapd ] && source ${sysconfdir}/imapd
-	case x$IMAPDSTART in
-	x[yY]*)
-		ebegin " courier-imapd"
-		${sbindir}/courier-imapd start
-		;;
-	esac
-
-	[ -f ${sysconfdir}/imapd-ssl ] && source ${sysconfdir}/imapd-ssl
-	case x$IMAPDSSLSTART in
-	x[yY]*)
-		ebegin " courier-imapd-ssl"
-		${sbindir}/courier-imapd-ssl start
-		;;
-	esac
-
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Courier mail server:"
-
-	ebegin " Stopping courier-esmtpd"
-	${sbindir}/esmtpd stop
-
-	ebegin " Stopping courier-esmtpd-msa"
-	${sbindir}/esmtpd-msa stop
-
-	ebegin " Stopping courier-esmtpd-ssl"
-	${sbindir}/esmtpd-ssl stop
-
-	[ -x ${sbindir}/courier-pop3d ] && \
-		ebegin " Stopping courier-pop3d" && ${sbindir}/courier-pop3d stop
-
-	[ -x ${sbindir}/courier-pop3d-ssl ] && \
-		ebegin " Stopping courier-pop3d-ssl" && ${sbindir}/courier-pop3d-ssl stop
-
-	[ -x ${sbindir}/courier-imapd ] && \
-		ebegin " Stopping courier-imapd" && ${sbindir}/courier-imapd stop
-
-
-	[ -x ${sbindir}/courier-imapd-ssl ] && \
-		ebegin " Stopping courier-imapd-ssl" && ${sbindir}/courier-imapd-ssl stop
-
-	ebegin " Stopping courierd"
-	${sbindir}/courier stop
-
-	[ -x ${sbindir}/courierldapaliasd ] && \
-	( ${sbindir}/courierldapaliasd stop ; ebegin " Stopping courierldapaliasd" )
-
-	[ -x ${sbindir}/webmaild ] && \
-	  ( ${sbindir}/webmaild stop ; ebegin " Stopping webmaild" )
-
-	[ ! -d /etc/courier/authlib ] && [ -x ${libexecdir}/authlib/authdaemond ] && \
-	( ${libexecdir}/authlib/authdaemond stop ; ebegin " Stopping authdaemond" )
-
-	${sbindir}/courierfilter stop
-	ebegin " Stopping courierfilterd"
-
-	eend $?
-}
diff --git a/mail-mta/courier/files/courier-init-r3 b/mail-mta/courier/files/courier-init-r3
deleted file mode 100644
index 86a213227cd5..000000000000
--- a/mail-mta/courier/files/courier-init-r3
+++ /dev/null
@@ -1,189 +0,0 @@
-#!/sbin/runscript
-# Portions Copyright 2003 Gentoo Linux
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/files/courier-init-r3,v 1.1 2011/01/23 22:32:46 hanno Exp $
-#
-# script originally from Courier distfile original name = courier.sysvinit
-# adapted for Gentoo by Brian Jackson
-#
-# TODO
-# should we update all the .dat/.pem files when the source/config files are 
-#	newer than the .dat/.pem files?
-
-prefix="/usr"
-exec_prefix="/usr/bin"
-sysconfdir="/etc/courier"
-sbindir="/usr/sbin"
-libexecdir="/usr/lib/courier"
-datadir="/usr/share/courier"
-
-depend() {
-	need net
-	[ -d /etc/courier/authlib ] && need courier-authlib
-	grep -q "^IMAPDSTART=.*[Yy].*" /etc/courier/imapd && use famd
-	grep -q "^IMAPDSSLSTART=.*[Yy].*" /etc/courier/imapd-ssl && use famd
-}
-
-checkconfig() {
-
-	[ -f ${sysconfdir}/pop3d-ssl ] && . ${sysconfdir}/pop3d-ssl
-
-	# If we do not have a certificate, make one up.
-	[ ! -f "${datadir}/pop3d.pem" ] && \
-	ebegin " generating-POP3-SSL-certificate..." && "${sbindir}/mkpop3dcert"
-
-	[ -f ${sysconfdir}/imapd-ssl ] && . ${sysconfdir}/imapd-ssl
-
-	# If we do not have a certificate, make one up.
-	[ ! -f ${datadir}/imapd.pem ] && \
-	ebegin " generating-IMAP-SSL-certificate..." && "${sbindir}/mkimapdcert"
-
-	[ -f ${sysconfdir}/esmtpd-ssl ] && . ${sysconfdir}/esmtpd-ssl
-
-	# If we do not have a certificate, make one up.
-	[ ! -f ${datadir}/esmtpd.pem ] && \
-	ebegin " generating-ESMTP-SSL-certificate..." && "${sbindir}/mkesmtpdcert"
-
-	# First time after install create aliases.dat and smtpaccess.dat
-
-	[ -f ${sysconfdir}/aliases.dat ] || ${sbindir}/makealiases
-
-	[ -f ${sysconfdir}/${ACCESSFILE}.dat ] || ${sbindir}/makesmtpaccess
-
-	[ -f ${sysconfdir}/${ACCESSFILE}.dat ] || ${sbindir}/makesmtpaccess-msa
-}
-
-start() {
-	# Start daemons.
-	ebegin "Starting Courier mail server:"
-
-	checkconfig || return 1
-
-	ebegin " Starting courierfilterd"
-	${sbindir}/courierfilter start
-
-	[ ! -d /etc/courier/authlib ] && [ -x ${libexecdir}/authlib/authdaemond ] && \
-	${libexecdir}/authlib/authdaemond start && ebegin " Starting authdaemond"
-
-	[ -x ${sbindir}/webmaild ] && \
-	  ${sbindir}/webmaild start && ebegin " Starting webmaild" 
-
-	[ -x ${sbindir}/courierldapaliasd ] && \
-	${sbindir}/courierldapaliasd start && ebegin " Starting courierldapaliasd"
-
-	ebegin " Starting courierd"
-	${sbindir}/courier start
-
-	savepath="$PATH"
-	# start esmtpd if so written
-	[ -f ${sysconfdir}/esmtpd ] && source ${sysconfdir}/esmtpd
-	PATH="$savepath"
-	case x$ESMTPDSTART in
-	x[yY]*)
-		ebegin " Starting esmtpd"
-		${sbindir}/esmtpd start
-		;;
-	esac
-
-	# start esmtpd-msa if so written
-	[ -f ${sysconfdir}/esmtpd-msa ] && source ${sysconfdir}/esmtpd-msa
-	PATH="$savepath"
-	case x$ESMTPDSTART in
-	x[yY]*)
-		ebegin " Starting esmtpd-msa"
-		${sbindir}/esmtpd-msa start
-		;;
-	esac
-
-	# start esmtpd-ssl if so written
-	[ -f ${sysconfdir}/esmtpd-ssl ] && source ${sysconfdir}/esmtpd-ssl
-	PATH="$savepath"
-	case x$ESMTPDSSLSTART in
-	x[yY]*)
-		ebegin " Starting esmtpd-ssl"
-		${sbindir}/esmtpd-ssl start
-		;;
-	esac
-
-	# start pop3d if so written
-	[ -f ${sysconfdir}/pop3d ] && source ${sysconfdir}/pop3d
-	PATH="$savepath"
-	case x$POP3DSTART in
-	x[yY]*)
-		ebegin " courier-pop3d"
-		${sbindir}/courier-pop3d start
-		;;
-	esac
-
-	# start pop3d-ssl if so written
-	[ -f ${sysconfdir}/pop3d-ssl ] && source ${sysconfdir}/pop3d-ssl
-	PATH="$savepath"
-	case x$POP3DSSLSTART in
-	x[yY]*)
-		ebegin " courier-pop3d-ssl"
-		${sbindir}/courier-pop3d-ssl start
-		;;
-	esac
-
-	[ -f ${sysconfdir}/imapd ] && source ${sysconfdir}/imapd
-	PATH="$savepath"
-	case x$IMAPDSTART in
-	x[yY]*)
-		ebegin " courier-imapd"
-		${sbindir}/courier-imapd start
-		;;
-	esac
-
-	[ -f ${sysconfdir}/imapd-ssl ] && source ${sysconfdir}/imapd-ssl
-	PATH="$savepath"
-	case x$IMAPDSSLSTART in
-	x[yY]*)
-		ebegin " courier-imapd-ssl"
-		${sbindir}/courier-imapd-ssl start
-		;;
-	esac
-
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Courier mail server:"
-
-	ebegin " Stopping courier-esmtpd"
-	${sbindir}/esmtpd stop
-
-	ebegin " Stopping courier-esmtpd-msa"
-	${sbindir}/esmtpd-msa stop
-
-	ebegin " Stopping courier-esmtpd-ssl"
-	${sbindir}/esmtpd-ssl stop
-
-	[ -x ${sbindir}/courier-pop3d ] && \
-		ebegin " Stopping courier-pop3d" && ${sbindir}/courier-pop3d stop
-
-	[ -x ${sbindir}/courier-pop3d-ssl ] && \
-		ebegin " Stopping courier-pop3d-ssl" && ${sbindir}/courier-pop3d-ssl stop
-
-	[ -x ${sbindir}/courier-imapd ] && \
-		ebegin " Stopping courier-imapd" && ${sbindir}/courier-imapd stop
-
-
-	[ -x ${sbindir}/courier-imapd-ssl ] && \
-		ebegin " Stopping courier-imapd-ssl" && ${sbindir}/courier-imapd-ssl stop
-
-	ebegin " Stopping courierd"
-	${sbindir}/courier stop
-
-	[ -x ${sbindir}/courierldapaliasd ] && \
-	( ${sbindir}/courierldapaliasd stop ; ebegin " Stopping courierldapaliasd" )
-
-	[ -x ${sbindir}/webmaild ] && \
-	  ( ${sbindir}/webmaild stop ; ebegin " Stopping webmaild" )
-
-	[ ! -d /etc/courier/authlib ] && [ -x ${libexecdir}/authlib/authdaemond ] && \
-	( ${libexecdir}/authlib/authdaemond stop ; ebegin " Stopping authdaemond" )
-
-	${sbindir}/courierfilter stop
-	ebegin " Stopping courierfilterd"
-
-	eend $?
-}
diff --git a/mail-mta/courier/files/dot_courier b/mail-mta/courier/files/dot_courier
deleted file mode 100644
index eea7731a2cc6..000000000000
--- a/mail-mta/courier/files/dot_courier
+++ /dev/null
@@ -1,2 +0,0 @@
-|| dotforward
-./.maildir/
diff --git a/mail-mta/courier/files/locallowercase b/mail-mta/courier/files/locallowercase
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/mail-mta/courier/files/locallowercase
+++ /dev/null
diff --git a/mail-mta/courier/files/mailer.conf b/mail-mta/courier/files/mailer.conf
deleted file mode 100644
index a97cbf6ce63e..000000000000
--- a/mail-mta/courier/files/mailer.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Execute the "real" sendmail program, named /usr/sbin/sendmail
-#
-sendmail	/usr/bin/sendmail.courier
-send-mail	/usr/bin/sendmail.courier
-mailq		/usr/bin/mailq.courier
-rmail		/usr/bin/rmail.courier
diff --git a/mail-mta/courier/files/set-mime b/mail-mta/courier/files/set-mime
deleted file mode 100644
index 840ce7b9cd1b..000000000000
--- a/mail-mta/courier/files/set-mime
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# this has to be called with a list of configuration files to apply the
-# changes
-# example: ./set-mime /etc/courier/esmtpd /etc/courier/esmtpd-ssl
-
-files=$*
-
-chk_badmime='##NAME: BOFHBADMIME:0'
-pos_badmime='##NAME: NOADDMSGID:0'
-ins_badmime='\
-##NAME: BOFHBADMIME:0\
-#\
-# set BOFHBADMIME\
-#   to \"reject\" to return mail with invalid MIME header\
-#   to \"wrap\" to wrap mail with invalid MIME header in an attachmant\
-#   to \"accept\" to pass mail with invalid MIME header untouched\
-\
-BOFHBADMIME=accept\
-'
-
-for f in ${files}
-do
-	if ! grep -q "${chk_badmime}" "${f}"
-	then
-		echo "adding parameter ${chk_badmime} to ${f}"
-		cat ${f} | sed -e"/${pos_badmime}/ i ${ins_badmime}" > "${f}.tmp" && mv -f "${f}.tmp" "${f}"
-	fi
-done