Remove old versions. Most of these are vulnerable to security issues.

Package-Manager: portage-2.1.2.3

21 files changed, 22 insertions, 2855 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index c861f6888618..6eb387738962 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-mta/courier
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.87 2007/03/18 05:08:41 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.88 2007/04/02 17:08:14 betelgeuse Exp $
+
+  02 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> -courier-0.48.1.ebuild,
+  -courier-0.48.1-r1.ebuild, -courier-0.48.2.20050224.ebuild,
+  -courier-0.49.0.ebuild, -courier-0.49.0.20050405.ebuild,
+  -courier-0.50.0.ebuild, -courier-0.50.1.ebuild, -courier-0.50.1-r1.ebuild,
+  -courier-0.52.2.ebuild, courier-0.53.2.ebuild:
+  Remove old versions. Most of these are vulnerable to security issues.
 
   18 Mar 2007; Marius Mauch <genone@gentoo.org> courier-0.48.1.ebuild,
   courier-0.48.1-r1.ebuild, courier-0.48.2.20050224.ebuild,
@@ -212,6 +219,7 @@
   courier-0.48.2.20050130.ebuild:
   version bump, add smtp auth methods as well.
 
+*courier-0.48.2.20050130 (30 Jan 2005)
 *courier-0.48.2 (30 Jan 2005)
 
   30 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index c0d6e0da5614..72257b3865e2 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -49,96 +49,26 @@ AUX set-mime 741 RMD160 8ed45fb4a0aee168a70cdcab6d17cf1606f85cad SHA1 b8834602c7
 MD5 e3a4ab031bd750b7ce2c7b85fee83d8e files/set-mime 741
 RMD160 8ed45fb4a0aee168a70cdcab6d17cf1606f85cad files/set-mime 741
 SHA256 bf15af7c181d517a924cb82854cbce46278e6e28ffb338e2159ba89c386dc74f files/set-mime 741
-DIST courier-0.48.1.tar.bz2 5875035 RMD160 c180189958f5602b808637a4e84f233fca3c08b6 SHA1 48b1f2dac17a5cee2e2cbb58d2469e4b13144c8d SHA256 06f294ac301f8b8f097c1c1370d352e311285f7086c0b9399e3451c00ff6e311
-DIST courier-0.48.2.20050224.tar.bz2 5884272 RMD160 12f75baf99e213e166b9850ef712ac7a3926cfd3 SHA1 e3f542f330164e83427340f86ba869422cd43a3e SHA256 7b6c3679e12c1f15eba2ff02790e80f8daea8bd442091810f57bf6eb0542bc96
-DIST courier-0.49.0.20050405.tar.bz2 5877710 RMD160 3e4eaca88fdffa193479cd7af5d927c66404664f SHA1 34bbb02403c225b3906c41c3c5a69bae190672e1 SHA256 37d06275b4e5d721edd3b876a3f74111fdbe3a6c7a0829be4d4b7ba8b11be8d2
-DIST courier-0.49.0.tar.bz2 5884664 RMD160 4842fc4f28843b374c5c70a736ab6757a391abc5 SHA1 838c00f5c3be9f15174ff8b872e553859a875d7f SHA256 03dec3480fd6ce9ba40d5faf789d8981061d6c28bd5aa3bc2925fdc3d2a93a85
-DIST courier-0.50.0.tar.bz2 5913673 RMD160 5739a1f45bfed63682f3535267c6453ae8e27111 SHA1 c5da97b49d3d7e4a71981aa4dacafeb17d715391 SHA256 bd15c617b04b59391d629d0c981d56925e08a056c94734842a5dce339e25991a
-DIST courier-0.50.1.tar.bz2 5913551 RMD160 e9d1d0b1a4aa175ff129d3b1c27e1a8a28f07576 SHA1 8616c598c38dc5574e79c67fdd35d3efc0e3f327 SHA256 f7a31f297ac390aced9e52f9b02ac313ba2717322d188b8c4419ce5bad685d11
-DIST courier-0.52.2.tar.bz2 6611624 RMD160 38e59a845ba30034d03a7472d04a1b62a0e9cf9b SHA1 909b667a84498dbd79169fa4161b9fa3a4622608 SHA256 7b717f22c9fe49e0042874d5615bdd7d4adc32659d0818eb7686de3004229beb
 DIST courier-0.53.2.tar.bz2 6942557 RMD160 a6efce3a8d6572923190ea49ed6085906317ebd8 SHA1 89c6a9a57467adf8c1ac815a5ffacf47e5e694a3 SHA256 0b44e02652084ca4023646ca0cdd3d173dcbadf919e81aa012b42666b3acf726
-EBUILD courier-0.48.1-r1.ebuild 8945 RMD160 3a06da8d6270a929ecd20eef30439745a6e6d6d3 SHA1 a8cf272af7c14e1799f9ae91f9c0aa486a93e2e5 SHA256 48455c72fc870c528e818675097d8509787a1a5051e8183a1c9cdb4a420ab8b8
-MD5 6fbf4df59c354d8dd3b65e8eb7fe83f6 courier-0.48.1-r1.ebuild 8945
-RMD160 3a06da8d6270a929ecd20eef30439745a6e6d6d3 courier-0.48.1-r1.ebuild 8945
-SHA256 48455c72fc870c528e818675097d8509787a1a5051e8183a1c9cdb4a420ab8b8 courier-0.48.1-r1.ebuild 8945
-EBUILD courier-0.48.1.ebuild 8500 RMD160 35614e95de1efb6359b498c0f2696287bbdb8b01 SHA1 b3a6d50ddff4f13d056e491314e3666d9e3fbdb9 SHA256 1c5f1651f0879affb5a057e7706d7751bd253dfd88a9e657cc276c3dfca8fa68
-MD5 19aeb0efcdf8ff1c598479924c9a1324 courier-0.48.1.ebuild 8500
-RMD160 35614e95de1efb6359b498c0f2696287bbdb8b01 courier-0.48.1.ebuild 8500
-SHA256 1c5f1651f0879affb5a057e7706d7751bd253dfd88a9e657cc276c3dfca8fa68 courier-0.48.1.ebuild 8500
-EBUILD courier-0.48.2.20050224.ebuild 10460 RMD160 e13396d81a48f15d03c66786b264844d5285d05b SHA1 cead823d445981b6ecf0acbba2befdb406fb333c SHA256 82966b3157f868b88739786f124671716299418876ff2336bf3818b8027ec630
-MD5 3d5bfea25775a6f862ceb8e46a66bdb5 courier-0.48.2.20050224.ebuild 10460
-RMD160 e13396d81a48f15d03c66786b264844d5285d05b courier-0.48.2.20050224.ebuild 10460
-SHA256 82966b3157f868b88739786f124671716299418876ff2336bf3818b8027ec630 courier-0.48.2.20050224.ebuild 10460
-EBUILD courier-0.49.0.20050405.ebuild 10467 RMD160 03b4cfe40b9412d6b901306631bff5a24484d6da SHA1 218344f98b27a626c94b5e3c9a79311b66fd36bc SHA256 03ed18f134b938db8e7a1907e36c12c44363ba0195d4f9671a7d54ea54ff6f50
-MD5 d7f7d1a251a40b67f82c6a1dc581814c courier-0.49.0.20050405.ebuild 10467
-RMD160 03b4cfe40b9412d6b901306631bff5a24484d6da courier-0.49.0.20050405.ebuild 10467
-SHA256 03ed18f134b938db8e7a1907e36c12c44363ba0195d4f9671a7d54ea54ff6f50 courier-0.49.0.20050405.ebuild 10467
-EBUILD courier-0.49.0.ebuild 10458 RMD160 8da798b0e98ba8668f62060e2dbed444298d1564 SHA1 973fbc5e45387afa1dd1d36073d806fffb4f3b6f SHA256 ab383fb19d7f7c880349ca253c0c4bf68dcc32dd166081f42b72365a4404aa41
-MD5 2e0283b47eb1e09dc553fffeee00a0e9 courier-0.49.0.ebuild 10458
-RMD160 8da798b0e98ba8668f62060e2dbed444298d1564 courier-0.49.0.ebuild 10458
-SHA256 ab383fb19d7f7c880349ca253c0c4bf68dcc32dd166081f42b72365a4404aa41 courier-0.49.0.ebuild 10458
-EBUILD courier-0.50.0.ebuild 10458 RMD160 78068a87041971be8f6fef90024a50c6c3c8a671 SHA1 be7339ea4c1f25512cd0405482d8ff60b52a98c7 SHA256 5c2384d4313334c89ac15cb98eda01fbbe9f63d9554508e8c6f2161bcaf07b55
-MD5 468a021aaf2348e6bf03e71a31efeaf1 courier-0.50.0.ebuild 10458
-RMD160 78068a87041971be8f6fef90024a50c6c3c8a671 courier-0.50.0.ebuild 10458
-SHA256 5c2384d4313334c89ac15cb98eda01fbbe9f63d9554508e8c6f2161bcaf07b55 courier-0.50.0.ebuild 10458
-EBUILD courier-0.50.1-r1.ebuild 11516 RMD160 6ef28100840a61a561adb55dd95aebab5b77d2bf SHA1 b607f2c9792d053b497991680a468c69533ff4a9 SHA256 5246634530f980924bf31bc6cd12f1aee8fe29edda79a37ed98e3aa2c6660d78
-MD5 a82a084b3fbb56523844ddd7a0b81946 courier-0.50.1-r1.ebuild 11516
-RMD160 6ef28100840a61a561adb55dd95aebab5b77d2bf courier-0.50.1-r1.ebuild 11516
-SHA256 5246634530f980924bf31bc6cd12f1aee8fe29edda79a37ed98e3aa2c6660d78 courier-0.50.1-r1.ebuild 11516
-EBUILD courier-0.50.1.ebuild 11159 RMD160 ad9a70d7f2b08c89435bd2a6a8d32e4fe127fd00 SHA1 bc953df80ab7ed250a26cf747d9c613f40c71d2a SHA256 ee3968db860e4c0635900f05b4a8e555f6d3b2e98e447d7db4e6fc0d725dc16b
-MD5 b89825672c44f5c992678ded1cd8fc3d courier-0.50.1.ebuild 11159
-RMD160 ad9a70d7f2b08c89435bd2a6a8d32e4fe127fd00 courier-0.50.1.ebuild 11159
-SHA256 ee3968db860e4c0635900f05b4a8e555f6d3b2e98e447d7db4e6fc0d725dc16b courier-0.50.1.ebuild 11159
-EBUILD courier-0.52.2.ebuild 11449 RMD160 472770c1a5c69e1679ac0f2ae3dd763da21dfffa SHA1 3af62e84e5625403b629c7e28a1f6255714fddda SHA256 97a4c7438d826d2042b021f4cbfda14c6821acf3e3f3c246cb7dbf89ddf8f04f
-MD5 7f0781fa476428a7d7af8b82b43b9a4f courier-0.52.2.ebuild 11449
-RMD160 472770c1a5c69e1679ac0f2ae3dd763da21dfffa courier-0.52.2.ebuild 11449
-SHA256 97a4c7438d826d2042b021f4cbfda14c6821acf3e3f3c246cb7dbf89ddf8f04f courier-0.52.2.ebuild 11449
-EBUILD courier-0.53.2.ebuild 11836 RMD160 54609d3a25660c65be9aa1f10854f7408345caa6 SHA1 7095bc95f992f6c9ad115d59bfbbf2c1bda7d4c0 SHA256 502724db52778ee95cecdf17e0ce04de6d2b803d214e0a98ad6652d1f31306f7
-MD5 a325e1a9318321521dc135a7f16c15c2 courier-0.53.2.ebuild 11836
-RMD160 54609d3a25660c65be9aa1f10854f7408345caa6 courier-0.53.2.ebuild 11836
-SHA256 502724db52778ee95cecdf17e0ce04de6d2b803d214e0a98ad6652d1f31306f7 courier-0.53.2.ebuild 11836
-MISC ChangeLog 25224 RMD160 0375207e729f5b811aac92fce0cdeb611859c37b SHA1 c514b44d8c58fcbc46107664e27008c38e541f4d SHA256 1489c86bd108df8846090e8d8b48f88503b291986c4afbaaefa3f9de256c1bed
-MD5 2ecfca29217d10ff63d2d232d49fbd75 ChangeLog 25224
-RMD160 0375207e729f5b811aac92fce0cdeb611859c37b ChangeLog 25224
-SHA256 1489c86bd108df8846090e8d8b48f88503b291986c4afbaaefa3f9de256c1bed ChangeLog 25224
+EBUILD courier-0.53.2.ebuild 11828 RMD160 54f2d10e67c3a747581984e8031e0a5016c61ebc SHA1 4e53e38cc295cb990806f115d05c1a2297694657 SHA256 d5568e5baf13d9cd50f494403c0db404e2c6c39536ba51a9a5172e291b1ec0e9
+MD5 cc96d7fcfdfa78ccca2a021d20e62c98 courier-0.53.2.ebuild 11828
+RMD160 54f2d10e67c3a747581984e8031e0a5016c61ebc courier-0.53.2.ebuild 11828
+SHA256 d5568e5baf13d9cd50f494403c0db404e2c6c39536ba51a9a5172e291b1ec0e9 courier-0.53.2.ebuild 11828
+MISC ChangeLog 25664 RMD160 4bdecca161983477315a94ce345a4d721ae38919 SHA1 bc9b82668b35df53d6b09ae901ccd76e764ba1ce SHA256 ddf490236db37690fb862e1066aef3d99763a907ee1a8d9cb1d9ada41f658de4
+MD5 2d2b7824092fbfa003234add19b58c02 ChangeLog 25664
+RMD160 4bdecca161983477315a94ce345a4d721ae38919 ChangeLog 25664
+SHA256 ddf490236db37690fb862e1066aef3d99763a907ee1a8d9cb1d9ada41f658de4 ChangeLog 25664
 MISC metadata.xml 322 RMD160 44060011d03244f97a8cc9605f0eb0de3631a2e5 SHA1 ca88991053a2eef8c9f1603ce850eff1d145deaa SHA256 1ef3b7121e17952973a7b717155b7e892b40ef64ff22d370bf7d425521df88a0
 MD5 60cd65a0c4aa59722fb87b67f5be2db1 metadata.xml 322
 RMD160 44060011d03244f97a8cc9605f0eb0de3631a2e5 metadata.xml 322
 SHA256 1ef3b7121e17952973a7b717155b7e892b40ef64ff22d370bf7d425521df88a0 metadata.xml 322
-MD5 7d44e79e3ecb10ad411badad7a456f2b files/digest-courier-0.48.1 250
-RMD160 c052da95fd872a303c730eca47c2b05c86d67a15 files/digest-courier-0.48.1 250
-SHA256 f94830b7ab92189edeb60c6a058aeb6b863809d931803e34ce4c6ef10b736d8c files/digest-courier-0.48.1 250
-MD5 7d44e79e3ecb10ad411badad7a456f2b files/digest-courier-0.48.1-r1 250
-RMD160 c052da95fd872a303c730eca47c2b05c86d67a15 files/digest-courier-0.48.1-r1 250
-SHA256 f94830b7ab92189edeb60c6a058aeb6b863809d931803e34ce4c6ef10b736d8c files/digest-courier-0.48.1-r1 250
-MD5 cb1eb72bfecf4e5b6f815844fd5121e4 files/digest-courier-0.48.2.20050224 277
-RMD160 3f4255012ca031cbf3b7ddfeb3eb6c51c84ba1c2 files/digest-courier-0.48.2.20050224 277
-SHA256 ce923331cdec0950a3d4dfb26dc63d2da096a0cce49fc4eccc470526dd2afe84 files/digest-courier-0.48.2.20050224 277
-MD5 aeac9ccd206cd8a0dbd5f3f28201c85a files/digest-courier-0.49.0 250
-RMD160 740b4d13ffe348b82a0691c3d7a08130e1760ed0 files/digest-courier-0.49.0 250
-SHA256 478237d4732851076415ac45900a407b3e9f7eaabefcfb170bb90536b8b9314a files/digest-courier-0.49.0 250
-MD5 b3daed55b9d51f85fd8a8150fe457421 files/digest-courier-0.49.0.20050405 277
-RMD160 53c6e11cefe33184535275d008a05cda6a9eaa3b files/digest-courier-0.49.0.20050405 277
-SHA256 6664bc7f86291f3aec2bde65bf06348d5bb7117937853d4b72dc4bdd57812681 files/digest-courier-0.49.0.20050405 277
-MD5 78ef7470e257f1ebe21f95ecfbdb2d1d files/digest-courier-0.50.0 250
-RMD160 387383af55f7aec992663b61d4e50da14374541f files/digest-courier-0.50.0 250
-SHA256 0039c6dd2205c58083057a9d3d0bf03bccb28a184711b65955a62e3e0ed0bc44 files/digest-courier-0.50.0 250
-MD5 21030023984db2143c94686f8e679099 files/digest-courier-0.50.1 250
-RMD160 b967f64518aa864a9528bb67059aeff5162a1308 files/digest-courier-0.50.1 250
-SHA256 488a11665f9e3cc4b23535a817ee17349eacde8e06172dce823d166f3a13eb88 files/digest-courier-0.50.1 250
-MD5 21030023984db2143c94686f8e679099 files/digest-courier-0.50.1-r1 250
-RMD160 b967f64518aa864a9528bb67059aeff5162a1308 files/digest-courier-0.50.1-r1 250
-SHA256 488a11665f9e3cc4b23535a817ee17349eacde8e06172dce823d166f3a13eb88 files/digest-courier-0.50.1-r1 250
-MD5 d4cd73d5c2900a594128931e71bd70f2 files/digest-courier-0.52.2 250
-RMD160 5dfe41191c81bca3e7ddaa9cfca8c74c0e68313b files/digest-courier-0.52.2 250
-SHA256 573391f6b56d6110c9657041b69ef686dc5463e1a3f312442855c5230c606540 files/digest-courier-0.52.2 250
 MD5 18161922435984d1b48bfd5ef77528c7 files/digest-courier-0.53.2 250
 RMD160 105e1e4d06100267d18e5966e8b703422620d0e7 files/digest-courier-0.53.2 250
 SHA256 5536a2aa5dbdcf92f70d35abef705c52cdfb4e55dea28c3be5fcfae1b5297d41 files/digest-courier-0.53.2 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF/Mp16J2i8a8J4okRAmfIAKCGpcyqfyfHOlyKk/V7Mau8ikzRygCcCHC6
-U7IWjOKyu5l25rN4xZFtkMw=
-=iYjJ
+iD8DBQFGETiFcxLzpIGCsLQRAiRWAJ92zxW+1X820EmEKb4AfQNcYDDa5wCfSerY
+Zoa6/1sh5H4tzeuA1ao5yoQ=
+=mARL
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/courier/courier-0.48.1-r1.ebuild b/mail-mta/courier/courier-0.48.1-r1.ebuild
deleted file mode 100644
index a06e05551230..000000000000
--- a/mail-mta/courier/courier-0.48.1-r1.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.48.1-r1.ebuild,v 1.9 2007/03/18 05:08:41 genone Exp $
-
-inherit eutils
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${PV/?.??.?/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${SRC_URI}" ] && SRC_URI="http://www.courier-mta.org/beta/courier/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-S="${WORKDIR}/${P%%_pre}"
-
-SLOT="0"
-LICENSE="GPL-2"
-# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper"
-
-PROVIDE="virtual/mta
-	 virtual/mda
-	 virtual/imapd"
-
-DEPEND="virtual/libc
-	net-libs/courier-authlib
-	>=dev-libs/openssl-0.9.6
-	>=sys-libs/gdbm-1.8.0
-	|| ( app-misc/mime-types net-www/apache )
-	fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
-	pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1.3 )
-	spell? ( virtual/aspell-dict )
-	!mailwrapper? ( !virtual/mta )
-	!virtual/imapd"
-
-RDEPEND="${DEPEND}
-	virtual/fam
-	dev-lang/perl
-	sys-process/procps"
-
-PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-spf-error-handling.patch || die "epatch failed"
-	use norewrite && epatch ${FILESDIR}/norewrite.patch
-	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with spell ispell` `use_with ipv6` \
-			`use_with ldap ldapaliasd` `use_enable ldap maildropldap` \
-			`use_enable nls` `use_enable nls unicode ${ENABLE_UNICODE}`"
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-
-	[ -e /etc/apache/conf/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/apache/conf/mime.types"
-	[ -e /etc/apache2/conf/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/apache2/conf/mime.types"
-	[ -e /etc/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/mime.types"
-
-	einfo "Configuring courier: `echo ${myconf} | xargs echo`"
-	econf \
-		--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} ${myconf} 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}"
-	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
-	sed -i -e"/\#\#NAME: ${key}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-}
-
-set_maildir() {
-	local f ; local files=$*
-	origmaildir='Maildir'
-	newmaildir='.maildir'
-	for f in ${files} ; do
-		grep -q "${origmaildir}" "${f}" && \
-			elog "Changing ${origmaildir} in ${f} to ${newmaildir}"
-		sed -i -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f}
-	done
-}
-
-src_install() {
-	local f
-	dodir /etc/pam.d
-
-	einfo "Setting up maildirs in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	dodir /etc/skel
-	${S}/maildir/maildirmake ${D}/etc/skel/.maildir
-	keepdir /etc/skel/.maildir
-
-	diropts -o mail -g mail
-	dodir /var/lib/courier
-	dodir /var/run/courier
-	make install DESTDIR=${D} || die "install"
-	make install-configure || die "install-configure"
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-init courier
-
-	cd ${D}/etc/courier
-	insinto /etc/courier
-	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-	mv imapd.authpam imap.authpam ; mv pop3d.authpam pop3.authpam
-	for f in *.authpam ; do mv "${f}" "${D}/etc/pam.d/${f%%.authpam}" ; done
-	for f in *.dist ; do cp ${f} ${f%%.dist} ; done
-	[ -e ldapaliasrc ] && chown mail:root ldapaliasrc
-	set_maildir courierd imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
-
-	( [ -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"
-	etc_courier_chg esmtpd ESMTPDSTART YES
-	etc_courier_chg esmtpd-msa ESMTPDSTART YES
-	etc_courier_chg esmtpd-ssl ESMTPDSSLSTART YES
-	etc_courier_chg imapd IMAPDSTART YES
-	etc_courier_chg imapd-ssl IMAPDSSLSTART YES
-	etc_courier_chg pop3d POP3DSTART YES
-	etc_courier_chg pop3d-ssl POP3DSSLSTART YES
-
-	# 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
-	echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \
-		>> ${D}/usr/share/doc/${P}/README.htmldocs
-
-	insinto /usr/$(get_libdir)/courier/courier
-	insopts -m 755 -o mail -g mail
-	doins ${S}/courier/webmaild
-	insinto /etc/courier/webadmin
-	insopts -m 400 -o mail -g mail
-	doins ${FILESDIR}/password.dist
-
-	# 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
-	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"
-
-	if use mailwrapper ; then
-		mv ${D}/usr/bin/sendmail ${D}/usr/bin/sendmail.courier
-		rm ${D}/usr/bin/rmail
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-	else
-		dosym /usr/bin/sendmail /usr/sbin/sendmail
-	fi
-}
-
-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.48.1.ebuild b/mail-mta/courier/courier-0.48.1.ebuild
deleted file mode 100644
index a62730aa6ad1..000000000000
--- a/mail-mta/courier/courier-0.48.1.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.48.1.ebuild,v 1.8 2007/03/18 05:08:41 genone Exp $
-
-inherit eutils
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${PV/?.??.?/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${SRC_URI}" ] && SRC_URI="http://www.courier-mta.org/beta/courier/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-S="${WORKDIR}/${P%%_pre}"
-
-SLOT="0"
-LICENSE="GPL-2"
-# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
-KEYWORDS="x86 alpha amd64 hppa ia64 ~mips ppc sparc"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper"
-
-PROVIDE="virtual/mta
-	 virtual/mda
-	 virtual/imapd"
-
-DEPEND="virtual/libc
-	net-libs/courier-authlib
-	>=dev-libs/openssl-0.9.6
-	>=sys-libs/gdbm-1.8.0
-	|| ( app-misc/mime-types net-www/apache )
-	fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
-	pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1.3 )
-	spell? ( virtual/aspell-dict )
-	!mailwrapper? ( !virtual/mta )
-	!virtual/imapd"
-
-RDEPEND="${DEPEND}
-	virtual/fam
-	dev-lang/perl
-	sys-process/procps"
-
-PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use norewrite && epatch ${FILESDIR}/norewrite.patch
-	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with spell ispell` `use_with ipv6` \
-			`use_with ldap ldapaliasd` `use_enable ldap maildropldap` \
-			`use_enable nls` `use_enable nls unicode ${ENABLE_UNICODE}`"
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-
-	[ -e /etc/apache/conf/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/apache/conf/mime.types"
-	[ -e /etc/apache2/conf/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/apache2/conf/mime.types"
-	[ -e /etc/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/mime.types"
-
-	einfo "Configuring courier: `echo ${myconf} | xargs echo`"
-	econf \
-		--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} ${myconf} 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}"
-	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
-	sed -i -e"/\#\#NAME: ${key}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-}
-
-set_maildir() {
-	local f ; local files=$*
-	origmaildir='Maildir'
-	newmaildir='.maildir'
-	for f in ${files} ; do
-		grep -q "${origmaildir}" "${f}" && \
-			elog "Changing ${origmaildir} in ${f} to ${newmaildir}"
-		sed -i -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f}
-	done
-}
-
-src_install() {
-	local f
-	dodir /etc/pam.d
-
-	einfo "Setting up maildirs in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	dodir /etc/skel
-	${S}/maildir/maildirmake ${D}/etc/skel/.maildir
-	keepdir /etc/skel/.maildir
-
-	diropts -o mail -g mail
-	dodir /var/lib/courier
-	dodir /var/run/courier
-	make install DESTDIR=${D} || die "install"
-	make install-configure || die "install-configure"
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-init courier
-
-	cd ${D}/etc/courier
-	insinto /etc/courier
-	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-	mv imapd.authpam imap.authpam ; mv pop3d.authpam pop3.authpam
-	for f in *.authpam ; do mv "${f}" "${D}/etc/pam.d/${f%%.authpam}" ; done
-	for f in *.dist ; do cp ${f} ${f%%.dist} ; done
-	[ -e ldapaliasrc ] && chown mail:root ldapaliasrc
-	set_maildir courierd imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
-
-	( [ -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"
-	etc_courier_chg esmtpd ESMTPDSTART YES
-	etc_courier_chg esmtpd-msa ESMTPDSTART YES
-	etc_courier_chg esmtpd-ssl ESMTPDSSLSTART YES
-	etc_courier_chg imapd IMAPDSTART YES
-	etc_courier_chg imapd-ssl IMAPDSSLSTART YES
-	etc_courier_chg pop3d POP3DSTART YES
-	etc_courier_chg pop3d-ssl POP3DSSLSTART YES
-
-	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
-	echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \
-		>> ${D}/usr/share/doc/${P}/README.htmldocs
-
-	insinto /usr/$(get_libdir)/courier/courier
-	insopts -m 755 -o mail -g mail
-	doins ${S}/courier/webmaild
-	insinto /etc/courier/webadmin
-	insopts -m 400 -o mail -g mail
-	doins ${FILESDIR}/password.dist
-
-	# 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
-	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"
-
-	if use mailwrapper ; then
-		mv ${D}/usr/bin/sendmail ${D}/usr/bin/sendmail.courier
-		rm ${D}/usr/bin/rmail
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-	else
-		dosym /usr/bin/sendmail /usr/sbin/sendmail
-	fi
-}
-
-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.48.2.20050224.ebuild b/mail-mta/courier/courier-0.48.2.20050224.ebuild
deleted file mode 100644
index 43ebf0cefdd1..000000000000
--- a/mail-mta/courier/courier-0.48.2.20050224.ebuild
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.48.2.20050224.ebuild,v 1.8 2007/03/18 05:08:41 genone Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${PV/?.??.?/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${SRC_URI}" ] && SRC_URI="http://www.courier-mta.org/beta/courier/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-S="${WORKDIR}/${P%%_pre}"
-
-SLOT="0"
-LICENSE="GPL-2"
-# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
-KEYWORDS="~x86 ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper fam"
-
-PROVIDE="virtual/mta
-	 virtual/mda
-	 virtual/imapd"
-
-DEPEND="virtual/libc
-	net-libs/courier-authlib
-	>=dev-libs/openssl-0.9.6
-	>=sys-libs/gdbm-1.8.0
-	|| ( app-misc/mime-types net-www/apache )
-	fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
-	pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1.3 )
-	spell? ( virtual/aspell-dict )
-	fam? ( virtual/fam )
-	!mailwrapper? ( !virtual/mta )
-	!virtual/imapd"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	sys-process/procps"
-
-PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	pam? ( net-mail/mailbase )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-filter-flags '-fomit-frame-pointer'
-
-src_unpack() {
-	use fam || (
-		ewarn "File Alteration Monitor (FAM) is disabled"
-		ewarn "courier-imap will fall back to 60 second polls."
-		ewarn 'add "fam" to your USE flags to build as usual'
-		ebeep 4
-		epause 4 )
-	unpack ${A}
-	cd ${S}
-	use norewrite && epatch ${FILESDIR}/norewrite.patch
-	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with spell ispell` `use_with ipv6` \
-			`use_with ldap ldapaliasd` `use_enable ldap maildropldap` \
-			`use_enable nls` `use_enable nls unicode ${ENABLE_UNICODE}`"
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-
-	[ -e /etc/apache/conf/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/apache/conf/mime.types"
-	[ -e /etc/apache2/conf/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/apache2/conf/mime.types"
-	[ -e /etc/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/mime.types"
-
-	use fam || (
-		epatch ${FILESDIR}/fam-disable-check.patch
-		export WANT_AUTOCONF="2.5"
-		cd ${S}/maildir
-		libtoolize --copy --force
-		ebegin "Recreating maildir without fam"
-		autoconf ||  die "recreate maildir failed"
-		eend $?
-		myconf="${myconf} --without-fam"
-	)
-
-	einfo "Configuring courier: `echo ${myconf} | xargs echo`"
-
-	econf \
-		--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} ${myconf} 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}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-}
-
-set_maildir() {
-	local f ; local files=$*
-	origmaildir='Maildir'
-	newmaildir='.maildir'
-	for f in ${files} ; do
-		grep -q "${origmaildir}" "${f}" && \
-			elog "Changing ${origmaildir} in ${f} to ${newmaildir}"
-		sed -i -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f}
-	done
-}
-
-src_install() {
-	local f
-	einfo "Setting up maildirs in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	dodir /etc/skel
-	${S}/maildir/maildirmake ${D}/etc/skel/.maildir
-	keepdir /etc/skel/.maildir
-
-	diropts -o mail -g mail
-	keepdir /var/run/courier
-	make install DESTDIR=${D} || die "install"
-	make install-configure || die "install-configure"
-
-	for dir2keep in `(cd ${D} && find ./var/lib/courier -type d)` ; do
-		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
-	done
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-init courier
-	use fam || sed -i -e's|^.*need famd$||g' ${D}/etc/init.d/courier
-
-	cd ${D}/etc/courier
-	insinto /etc/courier
-	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-
-	if use pam ; then
-		dodir /etc/pam.d
-		rm imapd.authpam pop3d.authpam
-		for f in *.authpam ; do mv "${f}" "${D}/etc/pam.d/${f%%.authpam}" ; done
-	fi
-
-	for f in *.dist ; do cp ${f} ${f%%.dist} ; done
-	[ -e ldapaliasrc ] &&  ( chown root:root ldapaliasrc ; chmod 400 ldapaliasrc )
-	set_maildir courierd imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
-
-	( [ -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"
-	etc_courier_chg esmtpd ESMTPDSTART YES
-	etc_courier_chg esmtpd ESMTPAUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg esmtpd ESMTPAUTH_WEBADMIN "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg esmtpd ESMTPAUTH_TLS "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
-	etc_courier_chg esmtpd ESMTPAUTH_TLS_WEBADMIN "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
-	etc_courier_chg esmtpd-msa ESMTPDSTART YES
-	etc_courier_chg esmtpd-msa AUTH_REQUIRED 1
-	etc_courier_chg esmtpd-ssl ESMTPDSSLSTART YES
-	etc_courier_chg esmtpd-ssl AUTH_REQUIRED 1
-	etc_courier_chg imapd IMAPDSTART YES
-	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"
-	etc_courier_chg imapd-ssl IMAPDSSLSTART YES
-	etc_courier_chg pop3d POP3DSTART YES
-	etc_courier_chg pop3d POP3AUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg pop3d POP3AUTH_TLS "LOGIN PLAIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg pop3d-ssl POP3DSSLSTART YES
-
-	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
-	echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \
-		>> ${D}/usr/share/doc/${P}/README.htmldocs
-
-	insinto /usr/$(get_libdir)/courier/courier
-	insopts -m 755 -o mail -g mail
-	doins ${S}/courier/webmaild
-	insinto /etc/courier/webadmin
-	insopts -m 400 -o mail -g mail
-	doins ${FILESDIR}/password.dist
-
-	# 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
-	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"
-
-	if use mailwrapper ; then
-		mv ${D}/usr/bin/sendmail ${D}/usr/bin/sendmail.courier
-		rm ${D}/usr/bin/rmail
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-	else
-		dosym /usr/bin/sendmail /usr/sbin/sendmail
-	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.49.0.20050405.ebuild b/mail-mta/courier/courier-0.49.0.20050405.ebuild
deleted file mode 100644
index ff640edef50d..000000000000
--- a/mail-mta/courier/courier-0.49.0.20050405.ebuild
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.49.0.20050405.ebuild,v 1.5 2007/03/18 05:08:41 genone Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${PV/?.??.?/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${SRC_URI}" ] && SRC_URI="http://www.courier-mta.org/beta/courier/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-S="${WORKDIR}/${P%%_pre}"
-
-SLOT="0"
-LICENSE="GPL-2"
-# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
-KEYWORDS="~x86 ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper fam"
-
-PROVIDE="virtual/mta
-	 virtual/mda
-	 virtual/imapd"
-
-DEPEND="virtual/libc
-	>=net-libs/courier-authlib-0.55
-	>=dev-libs/openssl-0.9.6
-	>=sys-libs/gdbm-1.8.0
-	|| ( app-misc/mime-types net-www/apache )
-	fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
-	pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1.3 )
-	spell? ( virtual/aspell-dict )
-	fam? ( virtual/fam )
-	!mailwrapper? ( !virtual/mta )
-	!virtual/imapd"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	sys-process/procps"
-
-PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	pam? ( net-mail/mailbase )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-filter-flags '-fomit-frame-pointer'
-
-src_unpack() {
-	use fam || (
-		ewarn "File Alteration Monitor (FAM) is disabled"
-		ewarn "courier-imap will fall back to 60 second polls."
-		ewarn 'add "fam" to your USE flags to build as usual'
-		ebeep 4
-		epause 4 )
-	unpack ${A}
-	cd ${S}
-	use norewrite && epatch ${FILESDIR}/norewrite.patch
-	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with spell ispell` `use_with ipv6` \
-			`use_with ldap ldapaliasd` `use_enable ldap maildropldap` \
-			`use_enable nls` `use_enable nls unicode ${ENABLE_UNICODE}`"
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-
-	[ -e /etc/apache/conf/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/apache/conf/mime.types"
-	[ -e /etc/apache2/conf/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/apache2/conf/mime.types"
-	[ -e /etc/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/mime.types"
-
-	use fam || (
-		epatch ${FILESDIR}/fam-disable-check.patch
-		export WANT_AUTOCONF="2.5"
-		cd ${S}/maildir
-		libtoolize --copy --force
-		ebegin "Recreating maildir without fam"
-		autoconf ||  die "recreate maildir failed"
-		eend $?
-		myconf="${myconf} --without-fam"
-	)
-
-	einfo "Configuring courier: `echo ${myconf} | xargs echo`"
-
-	econf \
-		--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} ${myconf} 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}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-}
-
-set_maildir() {
-	local f ; local files=$*
-	origmaildir='Maildir'
-	newmaildir='.maildir'
-	for f in ${files} ; do
-		grep -q "${origmaildir}" "${f}" && \
-			elog "Changing ${origmaildir} in ${f} to ${newmaildir}"
-		sed -i -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f}
-	done
-}
-
-src_install() {
-	local f
-	einfo "Setting up maildirs in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	dodir /etc/skel
-	${S}/maildir/maildirmake ${D}/etc/skel/.maildir
-	keepdir /etc/skel/.maildir
-
-	diropts -o mail -g mail
-	keepdir /var/run/courier
-	make install DESTDIR=${D} || die "install"
-	make install-configure || die "install-configure"
-
-	for dir2keep in `(cd ${D} && find ./var/lib/courier -type d)` ; do
-		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
-	done
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-init courier
-	use fam || sed -i -e's|^.*need famd$||g' ${D}/etc/init.d/courier
-
-	cd ${D}/etc/courier
-	insinto /etc/courier
-	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-
-	if use pam ; then
-		dodir /etc/pam.d
-		rm imapd.authpam pop3d.authpam
-		for f in *.authpam ; do mv "${f}" "${D}/etc/pam.d/${f%%.authpam}" ; done
-	fi
-
-	for f in *.dist ; do cp ${f} ${f%%.dist} ; done
-	[ -e ldapaliasrc ] &&  ( chown root:root ldapaliasrc ; chmod 400 ldapaliasrc )
-	set_maildir courierd imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
-
-	( [ -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"
-	etc_courier_chg esmtpd ESMTPDSTART YES
-	etc_courier_chg esmtpd ESMTPAUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg esmtpd ESMTPAUTH_WEBADMIN "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg esmtpd ESMTPAUTH_TLS "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
-	etc_courier_chg esmtpd ESMTPAUTH_TLS_WEBADMIN "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
-	etc_courier_chg esmtpd-msa ESMTPDSTART YES
-	etc_courier_chg esmtpd-msa AUTH_REQUIRED 1
-	etc_courier_chg esmtpd-ssl ESMTPDSSLSTART YES
-	etc_courier_chg esmtpd-ssl AUTH_REQUIRED 1
-	etc_courier_chg imapd IMAPDSTART YES
-	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"
-	etc_courier_chg imapd-ssl IMAPDSSLSTART YES
-	etc_courier_chg pop3d POP3DSTART YES
-	etc_courier_chg pop3d POP3AUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg pop3d POP3AUTH_TLS "LOGIN PLAIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg pop3d-ssl POP3DSSLSTART YES
-
-	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
-	echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \
-		>> ${D}/usr/share/doc/${P}/README.htmldocs
-
-	insinto /usr/$(get_libdir)/courier/courier
-	insopts -m 755 -o mail -g mail
-	doins ${S}/courier/webmaild
-	insinto /etc/courier/webadmin
-	insopts -m 400 -o mail -g mail
-	doins ${FILESDIR}/password.dist
-
-	# 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
-	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"
-
-	if use mailwrapper ; then
-		mv ${D}/usr/bin/sendmail ${D}/usr/bin/sendmail.courier
-		rm ${D}/usr/bin/rmail
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-	else
-		dosym /usr/bin/sendmail /usr/sbin/sendmail
-	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.49.0.ebuild b/mail-mta/courier/courier-0.49.0.ebuild
deleted file mode 100644
index 4be5c8513254..000000000000
--- a/mail-mta/courier/courier-0.49.0.ebuild
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.49.0.ebuild,v 1.6 2007/03/18 05:08:41 genone Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${PV/?.??.?/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${SRC_URI}" ] && SRC_URI="http://www.courier-mta.org/beta/courier/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-S="${WORKDIR}/${P%%_pre}"
-
-SLOT="0"
-LICENSE="GPL-2"
-# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
-KEYWORDS="~x86 ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper fam"
-
-PROVIDE="virtual/mta
-	 virtual/mda
-	 virtual/imapd"
-
-DEPEND="virtual/libc
-	>=net-libs/courier-authlib-0.55
-	>=dev-libs/openssl-0.9.6
-	>=sys-libs/gdbm-1.8.0
-	|| ( app-misc/mime-types net-www/apache )
-	fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
-	pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1.3 )
-	spell? ( virtual/aspell-dict )
-	fam? ( virtual/fam )
-	!mailwrapper? ( !virtual/mta )
-	!virtual/imapd"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	sys-process/procps"
-
-PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	pam? ( net-mail/mailbase )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-filter-flags '-fomit-frame-pointer'
-
-src_unpack() {
-	use fam || (
-		ewarn "File Alteration Monitor (FAM) is disabled"
-		ewarn "courier-imap will fall back to 60 second polls."
-		ewarn 'add "fam" to your USE flags to build as usual'
-		ebeep 4
-		epause 4 )
-	unpack ${A}
-	cd ${S}
-	use norewrite && epatch ${FILESDIR}/norewrite.patch
-	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with spell ispell` `use_with ipv6` \
-			`use_with ldap ldapaliasd` `use_enable ldap maildropldap` \
-			`use_enable nls` `use_enable nls unicode ${ENABLE_UNICODE}`"
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-
-	[ -e /etc/apache/conf/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/apache/conf/mime.types"
-	[ -e /etc/apache2/conf/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/apache2/conf/mime.types"
-	[ -e /etc/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/mime.types"
-
-	use fam || (
-		epatch ${FILESDIR}/fam-disable-check.patch
-		export WANT_AUTOCONF="2.5"
-		cd ${S}/maildir
-		libtoolize --copy --force
-		ebegin "Recreating maildir without fam"
-		autoconf ||  die "recreate maildir failed"
-		eend $?
-		myconf="${myconf} --without-fam"
-	)
-
-	einfo "Configuring courier: `echo ${myconf} | xargs echo`"
-
-	econf \
-		--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} ${myconf} 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}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-}
-
-set_maildir() {
-	local f ; local files=$*
-	origmaildir='Maildir'
-	newmaildir='.maildir'
-	for f in ${files} ; do
-		grep -q "${origmaildir}" "${f}" && \
-			elog "Changing ${origmaildir} in ${f} to ${newmaildir}"
-		sed -i -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f}
-	done
-}
-
-src_install() {
-	local f
-	einfo "Setting up maildirs in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	dodir /etc/skel
-	${S}/maildir/maildirmake ${D}/etc/skel/.maildir
-	keepdir /etc/skel/.maildir
-
-	diropts -o mail -g mail
-	keepdir /var/run/courier
-	make install DESTDIR=${D} || die "install"
-	make install-configure || die "install-configure"
-
-	for dir2keep in `(cd ${D} && find ./var/lib/courier -type d)` ; do
-		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
-	done
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-init courier
-	use fam || sed -i -e's|^.*need famd$||g' ${D}/etc/init.d/courier
-
-	cd ${D}/etc/courier
-	insinto /etc/courier
-	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-
-	if use pam ; then
-		dodir /etc/pam.d
-		rm imapd.authpam pop3d.authpam
-		for f in *.authpam ; do mv "${f}" "${D}/etc/pam.d/${f%%.authpam}" ; done
-	fi
-
-	for f in *.dist ; do cp ${f} ${f%%.dist} ; done
-	[ -e ldapaliasrc ] &&  ( chown root:root ldapaliasrc ; chmod 400 ldapaliasrc )
-	set_maildir courierd imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
-
-	( [ -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"
-	etc_courier_chg esmtpd ESMTPDSTART YES
-	etc_courier_chg esmtpd ESMTPAUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg esmtpd ESMTPAUTH_WEBADMIN "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg esmtpd ESMTPAUTH_TLS "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
-	etc_courier_chg esmtpd ESMTPAUTH_TLS_WEBADMIN "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
-	etc_courier_chg esmtpd-msa ESMTPDSTART YES
-	etc_courier_chg esmtpd-msa AUTH_REQUIRED 1
-	etc_courier_chg esmtpd-ssl ESMTPDSSLSTART YES
-	etc_courier_chg esmtpd-ssl AUTH_REQUIRED 1
-	etc_courier_chg imapd IMAPDSTART YES
-	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"
-	etc_courier_chg imapd-ssl IMAPDSSLSTART YES
-	etc_courier_chg pop3d POP3DSTART YES
-	etc_courier_chg pop3d POP3AUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg pop3d POP3AUTH_TLS "LOGIN PLAIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg pop3d-ssl POP3DSSLSTART YES
-
-	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
-	echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \
-		>> ${D}/usr/share/doc/${P}/README.htmldocs
-
-	insinto /usr/$(get_libdir)/courier/courier
-	insopts -m 755 -o mail -g mail
-	doins ${S}/courier/webmaild
-	insinto /etc/courier/webadmin
-	insopts -m 400 -o mail -g mail
-	doins ${FILESDIR}/password.dist
-
-	# 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
-	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"
-
-	if use mailwrapper ; then
-		mv ${D}/usr/bin/sendmail ${D}/usr/bin/sendmail.courier
-		rm ${D}/usr/bin/rmail
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-	else
-		dosym /usr/bin/sendmail /usr/sbin/sendmail
-	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.50.0.ebuild b/mail-mta/courier/courier-0.50.0.ebuild
deleted file mode 100644
index 38cb7ae50fed..000000000000
--- a/mail-mta/courier/courier-0.50.0.ebuild
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.50.0.ebuild,v 1.4 2007/03/18 05:08:41 genone Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${PV/?.??.?/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${SRC_URI}" ] && SRC_URI="http://www.courier-mta.org/beta/courier/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-S="${WORKDIR}/${P%%_pre}"
-
-SLOT="0"
-LICENSE="GPL-2"
-# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
-KEYWORDS="~x86 ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper fam"
-
-PROVIDE="virtual/mta
-	 virtual/mda
-	 virtual/imapd"
-
-DEPEND="virtual/libc
-	>=net-libs/courier-authlib-0.55
-	>=dev-libs/openssl-0.9.6
-	>=sys-libs/gdbm-1.8.0
-	|| ( app-misc/mime-types net-www/apache )
-	fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
-	pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1.3 )
-	spell? ( virtual/aspell-dict )
-	fam? ( virtual/fam )
-	!mailwrapper? ( !virtual/mta )
-	!virtual/imapd"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	sys-process/procps"
-
-PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	pam? ( net-mail/mailbase )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-filter-flags '-fomit-frame-pointer'
-
-src_unpack() {
-	use fam || (
-		ewarn "File Alteration Monitor (FAM) is disabled"
-		ewarn "courier-imap will fall back to 60 second polls."
-		ewarn 'add "fam" to your USE flags to build as usual'
-		ebeep 4
-		epause 4 )
-	unpack ${A}
-	cd ${S}
-	use norewrite && epatch ${FILESDIR}/norewrite.patch
-	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with spell ispell` `use_with ipv6` \
-			`use_with ldap ldapaliasd` `use_enable ldap maildropldap` \
-			`use_enable nls` `use_enable nls unicode ${ENABLE_UNICODE}`"
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-
-	[ -e /etc/apache/conf/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/apache/conf/mime.types"
-	[ -e /etc/apache2/conf/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/apache2/conf/mime.types"
-	[ -e /etc/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/mime.types"
-
-	use fam || (
-		epatch ${FILESDIR}/fam-disable-check.patch
-		export WANT_AUTOCONF="2.5"
-		cd ${S}/maildir
-		libtoolize --copy --force
-		ebegin "Recreating maildir without fam"
-		autoconf ||  die "recreate maildir failed"
-		eend $?
-		myconf="${myconf} --without-fam"
-	)
-
-	einfo "Configuring courier: `echo ${myconf} | xargs echo`"
-
-	econf \
-		--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} ${myconf} 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}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-}
-
-set_maildir() {
-	local f ; local files=$*
-	origmaildir='Maildir'
-	newmaildir='.maildir'
-	for f in ${files} ; do
-		grep -q "${origmaildir}" "${f}" && \
-			elog "Changing ${origmaildir} in ${f} to ${newmaildir}"
-		sed -i -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f}
-	done
-}
-
-src_install() {
-	local f
-	einfo "Setting up maildirs in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	dodir /etc/skel
-	${S}/maildir/maildirmake ${D}/etc/skel/.maildir
-	keepdir /etc/skel/.maildir
-
-	diropts -o mail -g mail
-	keepdir /var/run/courier
-	make install DESTDIR=${D} || die "install"
-	make install-configure || die "install-configure"
-
-	for dir2keep in `(cd ${D} && find ./var/lib/courier -type d)` ; do
-		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
-	done
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-init courier
-	use fam || sed -i -e's|^.*need famd$||g' ${D}/etc/init.d/courier
-
-	cd ${D}/etc/courier
-	insinto /etc/courier
-	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-
-	if use pam ; then
-		dodir /etc/pam.d
-		rm imapd.authpam pop3d.authpam
-		for f in *.authpam ; do mv "${f}" "${D}/etc/pam.d/${f%%.authpam}" ; done
-	fi
-
-	for f in *.dist ; do cp ${f} ${f%%.dist} ; done
-	[ -e ldapaliasrc ] &&  ( chown root:root ldapaliasrc ; chmod 400 ldapaliasrc )
-	set_maildir courierd imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
-
-	( [ -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"
-	etc_courier_chg esmtpd ESMTPDSTART YES
-	etc_courier_chg esmtpd ESMTPAUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg esmtpd ESMTPAUTH_WEBADMIN "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg esmtpd ESMTPAUTH_TLS "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
-	etc_courier_chg esmtpd ESMTPAUTH_TLS_WEBADMIN "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
-	etc_courier_chg esmtpd-msa ESMTPDSTART YES
-	etc_courier_chg esmtpd-msa AUTH_REQUIRED 1
-	etc_courier_chg esmtpd-ssl ESMTPDSSLSTART YES
-	etc_courier_chg esmtpd-ssl AUTH_REQUIRED 1
-	etc_courier_chg imapd IMAPDSTART YES
-	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"
-	etc_courier_chg imapd-ssl IMAPDSSLSTART YES
-	etc_courier_chg pop3d POP3DSTART YES
-	etc_courier_chg pop3d POP3AUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg pop3d POP3AUTH_TLS "LOGIN PLAIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg pop3d-ssl POP3DSSLSTART YES
-
-	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
-	echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \
-		>> ${D}/usr/share/doc/${P}/README.htmldocs
-
-	insinto /usr/$(get_libdir)/courier/courier
-	insopts -m 755 -o mail -g mail
-	doins ${S}/courier/webmaild
-	insinto /etc/courier/webadmin
-	insopts -m 400 -o mail -g mail
-	doins ${FILESDIR}/password.dist
-
-	# 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
-	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"
-
-	if use mailwrapper ; then
-		mv ${D}/usr/bin/sendmail ${D}/usr/bin/sendmail.courier
-		rm ${D}/usr/bin/rmail
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-	else
-		dosym /usr/bin/sendmail /usr/sbin/sendmail
-	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.50.1-r1.ebuild b/mail-mta/courier/courier-0.50.1-r1.ebuild
deleted file mode 100644
index e87bfdd94536..000000000000
--- a/mail-mta/courier/courier-0.50.1-r1.ebuild
+++ /dev/null
@@ -1,332 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.50.1-r1.ebuild,v 1.5 2007/03/18 05:08:41 genone Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${PV/?.??.?/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${SRC_URI}" ] && SRC_URI="http://www.courier-mta.org/beta/courier/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-S="${WORKDIR}/${P%%_pre}"
-
-SLOT="0"
-LICENSE="GPL-2"
-# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
-#KEYWORDS="~x86 ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc"
-KEYWORDS="-*"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper fam"
-
-PROVIDE="virtual/mta
-	 virtual/mda
-	 virtual/imapd"
-
-DEPEND="virtual/libc
-	>=net-libs/courier-authlib-0.55
-	>=dev-libs/openssl-0.9.6
-	>=sys-libs/gdbm-1.8.0
-	|| ( app-misc/mime-types net-www/apache )
-	fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
-	pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1.3 )
-	spell? ( virtual/aspell-dict )
-	fam? ( virtual/fam )
-	!mailwrapper? ( !virtual/mta )
-	!virtual/imapd
-	!mail-filter/maildrop"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	sys-process/procps"
-
-PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	pam? ( net-mail/mailbase )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-filter-flags '-fomit-frame-pointer'
-
-src_unpack() {
-	use fam || (
-		ewarn "File Alteration Monitor (FAM) is disabled"
-		ewarn "courier-imap will fall back to 60 second polls."
-		ewarn 'add "fam" to your USE flags to build as usual'
-		ebeep 4
-		epause 4 )
-	unpack ${A}
-	cd ${S}
-	use norewrite && epatch ${FILESDIR}/norewrite.patch
-	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with spell ispell` `use_with ipv6` \
-			`use_with ldap ldapaliasd` `use_enable ldap maildropldap` \
-			`use_enable nls` `use_enable nls unicode ${ENABLE_UNICODE}`"
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-
-	[ -e /etc/apache/conf/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/apache/conf/mime.types"
-	[ -e /etc/apache2/conf/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/apache2/conf/mime.types"
-	[ -e /etc/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/mime.types"
-
-	use fam || (
-		epatch ${FILESDIR}/fam-disable-check.patch
-		export WANT_AUTOCONF="2.5"
-		cd ${S}/maildir
-		libtoolize --copy --force
-		ebegin "Recreating maildir without fam"
-		autoconf ||  die "recreate maildir failed"
-		eend $?
-		myconf="${myconf} --without-fam"
-	)
-
-	einfo "Configuring courier: `echo ${myconf} | xargs echo`"
-
-	econf \
-		--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} ${myconf} 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}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-}
-
-set_maildir() {
-	local f ; local files=$*
-	origmaildir='Maildir'
-	newmaildir='.maildir'
-	for f in ${files} ; do
-		grep -q "${origmaildir}" "${f}" && \
-			elog "Changing ${origmaildir} in ${f} to ${newmaildir}"
-		sed -i -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f}
-	done
-}
-
-src_install() {
-	local f
-	einfo "Setting up maildirs in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	dodir /etc/skel
-	${S}/maildir/maildirmake ${D}/etc/skel/.maildir
-	keepdir /etc/skel/.maildir
-
-	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"
-
-	for dir2keep in `(cd ${D} && find ./var/lib/courier -type d)` ; do
-		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
-	done
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-init courier
-	use fam || sed -i -e's|^.*need famd$||g' ${D}/etc/init.d/courier
-
-	cd ${D}/etc/courier
-	insinto /etc/courier
-	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-
-	if use pam ; then
-		dodir /etc/pam.d
-		rm imapd.authpam pop3d.authpam
-		for f in *.authpam ; do mv "${f}" "${D}/etc/pam.d/${f%%.authpam}" ; done
-	fi
-
-	for f in *.dist ; do cp ${f} ${f%%.dist} ; done
-	[ -e ldapaliasrc ] &&  ( chown root:0 ldapaliasrc ; chmod 400 ldapaliasrc )
-	set_maildir courierd imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
-
-	( [ -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"
-	etc_courier_chg esmtpd ESMTPDSTART YES
-	etc_courier_chg esmtpd ESMTPAUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg esmtpd ESMTPAUTH_WEBADMIN "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg esmtpd ESMTPAUTH_TLS "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
-	etc_courier_chg esmtpd ESMTPAUTH_TLS_WEBADMIN "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
-	etc_courier_chg esmtpd-msa ESMTPDSTART YES
-	etc_courier_chg esmtpd-msa AUTH_REQUIRED 1
-	etc_courier_chg esmtpd-ssl ESMTPDSSLSTART YES
-	etc_courier_chg esmtpd-ssl AUTH_REQUIRED 1
-	etc_courier_chg imapd IMAPDSTART YES
-	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"
-	etc_courier_chg imapd-ssl IMAPDSSLSTART YES
-	etc_courier_chg pop3d POP3DSTART YES
-	etc_courier_chg pop3d POP3AUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg pop3d POP3AUTH_TLS "LOGIN PLAIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg pop3d-ssl POP3DSSLSTART YES
-
-	# 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
-	echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \
-		>> ${D}/usr/share/doc/${P}/README.htmldocs
-
-	insinto /usr/$(get_libdir)/courier/courier
-	insopts -m 755 -o mail -g mail
-	doins ${S}/courier/webmaild
-	insinto /etc/courier/webadmin
-	insopts -m 400 -o mail -g mail
-	doins ${FILESDIR}/password.dist
-
-	# 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
-	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"
-
-	if use mailwrapper ; then
-		mv ${D}/usr/bin/sendmail ${D}/usr/bin/sendmail.courier
-		mv ${D}/usr/bin/rmail ${D}/usr/bin/rmail.courier
-		mv ${D}/usr/bin/mailq ${D}/usr/bin/mailq.courier
-
-		mv ${D}/usr/share/man/man1/sendmail.1 \
-			${D}/usr/share/man/man1/sendmail-courier.1
-		mv ${D}/usr/share/man/man1/mailq.1 \
-			${D}/usr/share/man/man1/mailq-courier.1
-		mv ${D}/usr/share/man/man1/rmail.1 \
-			${D}/usr/share/man/man1/rmail-courier.1
-
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-	else
-		dosym /usr/bin/sendmail /usr/sbin/sendmail
-	fi
-}
-
-pkg_postinst() {
-	use fam && elog "fam daemon is needed for courier-imapd" \
-		|| ewarn "courier was built without fam support"
-
-	# fix for bug #99334
-	elog "Courier's sendmail is not suid by default, therefore non-root users can't send"
-	elog "mail using sendmail. If you need this to work, you should set sendmail suid."
-	elog "See also: http://www.courier-mta.org/install.html#suid"
-}
-
-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.50.1.ebuild b/mail-mta/courier/courier-0.50.1.ebuild
deleted file mode 100644
index f666a8fac894..000000000000
--- a/mail-mta/courier/courier-0.50.1.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.50.1.ebuild,v 1.4 2007/03/18 05:08:41 genone Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${PV/?.??.?/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${SRC_URI}" ] && SRC_URI="http://www.courier-mta.org/beta/courier/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-S="${WORKDIR}/${P%%_pre}"
-
-SLOT="0"
-LICENSE="GPL-2"
-# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
-KEYWORDS="~x86 ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper fam"
-
-PROVIDE="virtual/mta
-	 virtual/mda
-	 virtual/imapd"
-
-DEPEND="virtual/libc
-	>=net-libs/courier-authlib-0.55
-	>=dev-libs/openssl-0.9.6
-	>=sys-libs/gdbm-1.8.0
-	|| ( app-misc/mime-types net-www/apache )
-	fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
-	pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1.3 )
-	spell? ( virtual/aspell-dict )
-	fam? ( virtual/fam )
-	!mailwrapper? ( !virtual/mta )
-	!virtual/imapd"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	sys-process/procps"
-
-PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	pam? ( net-mail/mailbase )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-filter-flags '-fomit-frame-pointer'
-
-src_unpack() {
-	use fam || (
-		ewarn "File Alteration Monitor (FAM) is disabled"
-		ewarn "courier-imap will fall back to 60 second polls."
-		ewarn 'add "fam" to your USE flags to build as usual'
-		ebeep 4
-		epause 4 )
-	unpack ${A}
-	cd ${S}
-	use norewrite && epatch ${FILESDIR}/norewrite.patch
-	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with spell ispell` `use_with ipv6` \
-			`use_with ldap ldapaliasd` `use_enable ldap maildropldap` \
-			`use_enable nls` `use_enable nls unicode ${ENABLE_UNICODE}`"
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-
-	[ -e /etc/apache/conf/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/apache/conf/mime.types"
-	[ -e /etc/apache2/conf/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/apache2/conf/mime.types"
-	[ -e /etc/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/mime.types"
-
-	use fam || (
-		epatch ${FILESDIR}/fam-disable-check.patch
-		export WANT_AUTOCONF="2.5"
-		cd ${S}/maildir
-		libtoolize --copy --force
-		ebegin "Recreating maildir without fam"
-		autoconf ||  die "recreate maildir failed"
-		eend $?
-		myconf="${myconf} --without-fam"
-	)
-
-	einfo "Configuring courier: `echo ${myconf} | xargs echo`"
-
-	econf \
-		--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} ${myconf} 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}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-}
-
-set_maildir() {
-	local f ; local files=$*
-	origmaildir='Maildir'
-	newmaildir='.maildir'
-	for f in ${files} ; do
-		grep -q "${origmaildir}" "${f}" && \
-			elog "Changing ${origmaildir} in ${f} to ${newmaildir}"
-		sed -i -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f}
-	done
-}
-
-src_install() {
-	local f
-	einfo "Setting up maildirs in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	dodir /etc/skel
-	${S}/maildir/maildirmake ${D}/etc/skel/.maildir
-	keepdir /etc/skel/.maildir
-
-	diropts -o mail -g mail
-	keepdir /var/run/courier
-	make install DESTDIR=${D} || die "install"
-	make install-configure || die "install-configure"
-
-	for dir2keep in `(cd ${D} && find ./var/lib/courier -type d)` ; do
-		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
-	done
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-init courier
-	use fam || sed -i -e's|^.*need famd$||g' ${D}/etc/init.d/courier
-
-	cd ${D}/etc/courier
-	insinto /etc/courier
-	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-
-	if use pam ; then
-		dodir /etc/pam.d
-		rm imapd.authpam pop3d.authpam
-		for f in *.authpam ; do mv "${f}" "${D}/etc/pam.d/${f%%.authpam}" ; done
-	fi
-
-	for f in *.dist ; do cp ${f} ${f%%.dist} ; done
-	[ -e ldapaliasrc ] &&  ( chown root:root ldapaliasrc ; chmod 400 ldapaliasrc )
-	set_maildir courierd imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
-
-	( [ -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"
-	etc_courier_chg esmtpd ESMTPDSTART YES
-	etc_courier_chg esmtpd ESMTPAUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg esmtpd ESMTPAUTH_WEBADMIN "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg esmtpd ESMTPAUTH_TLS "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
-	etc_courier_chg esmtpd ESMTPAUTH_TLS_WEBADMIN "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
-	etc_courier_chg esmtpd-msa ESMTPDSTART YES
-	etc_courier_chg esmtpd-msa AUTH_REQUIRED 1
-	etc_courier_chg esmtpd-ssl ESMTPDSSLSTART YES
-	etc_courier_chg esmtpd-ssl AUTH_REQUIRED 1
-	etc_courier_chg imapd IMAPDSTART YES
-	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"
-	etc_courier_chg imapd-ssl IMAPDSSLSTART YES
-	etc_courier_chg pop3d POP3DSTART YES
-	etc_courier_chg pop3d POP3AUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg pop3d POP3AUTH_TLS "LOGIN PLAIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg pop3d-ssl POP3DSSLSTART YES
-
-	# 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
-	echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \
-		>> ${D}/usr/share/doc/${P}/README.htmldocs
-
-	insinto /usr/$(get_libdir)/courier/courier
-	insopts -m 755 -o mail -g mail
-	doins ${S}/courier/webmaild
-	insinto /etc/courier/webadmin
-	insopts -m 400 -o mail -g mail
-	doins ${FILESDIR}/password.dist
-
-	# 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
-	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"
-
-	if use mailwrapper ; then
-		mv ${D}/usr/bin/sendmail ${D}/usr/bin/sendmail.courier
-		mv ${D}/usr/bin/rmail ${D}/usr/bin/rmail.courier
-		mv ${D}/usr/bin/mailq ${D}/usr/bin/mailq.courier
-
-		mv ${D}/usr/share/man/man1/sendmail.1 \
-			${D}/usr/share/man/man1/sendmail-courier.1
-		mv ${D}/usr/share/man/man1/mailq.1 \
-			${D}/usr/share/man/man1/mailq-courier.1
-		mv ${D}/usr/share/man/man1/rmail.1 \
-			${D}/usr/share/man/man1/rmail-courier.1
-
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-	else
-		dosym /usr/bin/sendmail /usr/sbin/sendmail
-	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.52.2.ebuild b/mail-mta/courier/courier-0.52.2.ebuild
deleted file mode 100644
index c2de4c9ad659..000000000000
--- a/mail-mta/courier/courier-0.52.2.ebuild
+++ /dev/null
@@ -1,332 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.52.2.ebuild,v 1.7 2007/03/18 05:08:41 genone Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${PV/?.??.?/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${SRC_URI}" ] && SRC_URI="http://www.courier-mta.org/beta/courier/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-S="${WORKDIR}/${P%%_pre}"
-
-SLOT="0"
-LICENSE="GPL-2"
-# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ppc ~sparc x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper fam"
-
-PROVIDE="virtual/mta
-	 virtual/mda
-	 virtual/imapd"
-
-DEPEND="virtual/libc
-	>=net-libs/courier-authlib-0.55
-	>=dev-libs/openssl-0.9.6
-	>=sys-libs/gdbm-1.8.0
-	dev-libs/libpcre
-	|| ( app-misc/mime-types net-www/apache )
-	fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
-	pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1.3 )
-	spell? ( virtual/aspell-dict )
-	fam? ( virtual/fam )
-	!mailwrapper? ( !virtual/mta )
-	!virtual/imapd
-	!mail-filter/maildrop"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	sys-process/procps"
-
-PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	pam? ( net-mail/mailbase )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-filter-flags '-fomit-frame-pointer'
-
-src_unpack() {
-	use fam || (
-		ewarn "File Alteration Monitor (FAM) is disabled"
-		ewarn "courier-imap will fall back to 60 second polls."
-		ewarn 'add "fam" to your USE flags to build as usual'
-		ebeep 4
-		epause 4 )
-	unpack ${A}
-	cd ${S}
-	use norewrite && epatch ${FILESDIR}/norewrite.patch
-	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with spell ispell` `use_with ipv6` \
-		`use_with ldap ldapaliasd` `use_enable ldap maildropldap`"
-
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-
-	[ -e /etc/apache/conf/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/apache/conf/mime.types"
-	[ -e /etc/apache2/conf/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/apache2/conf/mime.types"
-	[ -e /etc/mime.types ] && \
-		myconf="${myconf} --enable-mimetypes=/etc/mime.types"
-
-	use fam || (
-		epatch ${FILESDIR}/fam-disable-check.patch
-		export WANT_AUTOCONF="2.5"
-		cd ${S}/maildir
-		libtoolize --copy --force
-		ebegin "Recreating maildir without fam"
-		autoconf ||  die "recreate maildir failed"
-		eend $?
-		myconf="${myconf} --without-fam"
-	)
-
-	einfo "Configuring courier: `echo ${myconf} | xargs echo`"
-
-	econf \
-		--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} ${myconf} 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}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-}
-
-set_maildir() {
-	local f ; local files=$*
-	origmaildir='Maildir'
-	newmaildir='.maildir'
-	for f in ${files} ; do
-		grep -q "${origmaildir}" "${f}" && \
-			elog "Changing ${origmaildir} in ${f} to ${newmaildir}"
-		sed -i -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f}
-	done
-}
-
-src_install() {
-	local f
-	einfo "Setting up maildirs in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	dodir /etc/skel
-	${S}/maildir/maildirmake ${D}/etc/skel/.maildir
-	keepdir /etc/skel/.maildir
-
-	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"
-
-	for dir2keep in `(cd ${D} && find ./var/lib/courier -type d)` ; do
-		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
-	done
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/courier-init courier
-	use fam || sed -i -e's|^.*need famd$||g' ${D}/etc/init.d/courier
-
-	cd ${D}/etc/courier
-	insinto /etc/courier
-	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-
-	if use pam ; then
-		dodir /etc/pam.d
-		rm imapd.authpam pop3d.authpam
-		for f in *.authpam ; do mv "${f}" "${D}/etc/pam.d/${f%%.authpam}" ; done
-	fi
-
-	for f in *.dist ; do cp ${f} ${f%%.dist} ; done
-	[ -e ldapaliasrc ] &&  ( chown root:0 ldapaliasrc ; chmod 400 ldapaliasrc )
-	set_maildir courierd imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
-
-	( [ -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"
-	etc_courier_chg esmtpd ESMTPDSTART YES
-	etc_courier_chg esmtpd ESMTPAUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg esmtpd ESMTPAUTH_WEBADMIN "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg esmtpd ESMTPAUTH_TLS "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
-	etc_courier_chg esmtpd ESMTPAUTH_TLS_WEBADMIN "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
-	etc_courier_chg esmtpd-msa ESMTPDSTART YES
-	etc_courier_chg esmtpd-msa AUTH_REQUIRED 1
-	etc_courier_chg esmtpd-ssl ESMTPDSSLSTART YES
-	etc_courier_chg esmtpd-ssl AUTH_REQUIRED 1
-	etc_courier_chg imapd IMAPDSTART YES
-	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"
-	etc_courier_chg imapd-ssl IMAPDSSLSTART YES
-	etc_courier_chg pop3d POP3DSTART YES
-	etc_courier_chg pop3d POP3AUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg pop3d POP3AUTH_TLS "LOGIN PLAIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg pop3d-ssl POP3DSSLSTART YES
-
-	# 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
-	echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \
-		>> ${D}/usr/share/doc/${P}/README.htmldocs
-
-	insinto /usr/$(get_libdir)/courier/courier
-	insopts -m 755 -o mail -g mail
-	doins ${S}/courier/webmaild
-	insinto /etc/courier/webadmin
-	insopts -m 400 -o mail -g mail
-	doins ${FILESDIR}/password.dist
-
-	# 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
-	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"
-
-	if use mailwrapper ; then
-		mv ${D}/usr/bin/sendmail ${D}/usr/bin/sendmail.courier
-		mv ${D}/usr/bin/rmail ${D}/usr/bin/rmail.courier
-		mv ${D}/usr/bin/mailq ${D}/usr/bin/mailq.courier
-
-		mv ${D}/usr/share/man/man1/sendmail.1 \
-			${D}/usr/share/man/man1/sendmail-courier.1
-		mv ${D}/usr/share/man/man1/mailq.1 \
-			${D}/usr/share/man/man1/mailq-courier.1
-		mv ${D}/usr/share/man/man1/rmail.1 \
-			${D}/usr/share/man/man1/rmail-courier.1
-
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-	else
-		dosym /usr/bin/sendmail /usr/sbin/sendmail
-	fi
-}
-
-pkg_postinst() {
-	use fam && elog "fam daemon is needed for courier-imapd" \
-		|| ewarn "courier was built without fam support"
-
-	# fix for bug #99334
-	elog "Courier's sendmail is not suid by default, therefore non-root users can't send"
-	elog "mail using sendmail. If you need this to work, you should set sendmail suid."
-	elog "See also: http://www.courier-mta.org/install.html#suid"
-}
-
-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.53.2.ebuild b/mail-mta/courier/courier-0.53.2.ebuild
index dd750486d359..52612399c8ec 100644
--- a/mail-mta/courier/courier-0.53.2.ebuild
+++ b/mail-mta/courier/courier-0.53.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.53.2.ebuild,v 1.14 2007/03/18 05:08:41 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.53.2.ebuild,v 1.15 2007/04/02 17:08:14 betelgeuse Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -24,7 +24,7 @@ PROVIDE="virtual/mta
 	 virtual/mda
 	 virtual/imapd"
 
-DEPEND="virtual/libc
+DEPEND="
 	>=net-libs/courier-authlib-0.55
 	>=dev-libs/openssl-0.9.6
 	>=sys-libs/gdbm-1.8.0
diff --git a/mail-mta/courier/files/digest-courier-0.48.1 b/mail-mta/courier/files/digest-courier-0.48.1
deleted file mode 100644
index 0081507cb58d..000000000000
--- a/mail-mta/courier/files/digest-courier-0.48.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a8bf9c8187344fb63449c0b1abf44eb9 courier-0.48.1.tar.bz2 5875035
-RMD160 c180189958f5602b808637a4e84f233fca3c08b6 courier-0.48.1.tar.bz2 5875035
-SHA256 06f294ac301f8b8f097c1c1370d352e311285f7086c0b9399e3451c00ff6e311 courier-0.48.1.tar.bz2 5875035
diff --git a/mail-mta/courier/files/digest-courier-0.48.1-r1 b/mail-mta/courier/files/digest-courier-0.48.1-r1
deleted file mode 100644
index 0081507cb58d..000000000000
--- a/mail-mta/courier/files/digest-courier-0.48.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a8bf9c8187344fb63449c0b1abf44eb9 courier-0.48.1.tar.bz2 5875035
-RMD160 c180189958f5602b808637a4e84f233fca3c08b6 courier-0.48.1.tar.bz2 5875035
-SHA256 06f294ac301f8b8f097c1c1370d352e311285f7086c0b9399e3451c00ff6e311 courier-0.48.1.tar.bz2 5875035
diff --git a/mail-mta/courier/files/digest-courier-0.48.2.20050224 b/mail-mta/courier/files/digest-courier-0.48.2.20050224
deleted file mode 100644
index 0ef8b9c4370a..000000000000
--- a/mail-mta/courier/files/digest-courier-0.48.2.20050224
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7d4588e6fbdf80a433edef2b54be7821 courier-0.48.2.20050224.tar.bz2 5884272
-RMD160 12f75baf99e213e166b9850ef712ac7a3926cfd3 courier-0.48.2.20050224.tar.bz2 5884272
-SHA256 7b6c3679e12c1f15eba2ff02790e80f8daea8bd442091810f57bf6eb0542bc96 courier-0.48.2.20050224.tar.bz2 5884272
diff --git a/mail-mta/courier/files/digest-courier-0.49.0 b/mail-mta/courier/files/digest-courier-0.49.0
deleted file mode 100644
index c554135b261e..000000000000
--- a/mail-mta/courier/files/digest-courier-0.49.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2c0f3d3d2eab405aaf633d9e17363bae courier-0.49.0.tar.bz2 5884664
-RMD160 4842fc4f28843b374c5c70a736ab6757a391abc5 courier-0.49.0.tar.bz2 5884664
-SHA256 03dec3480fd6ce9ba40d5faf789d8981061d6c28bd5aa3bc2925fdc3d2a93a85 courier-0.49.0.tar.bz2 5884664
diff --git a/mail-mta/courier/files/digest-courier-0.49.0.20050405 b/mail-mta/courier/files/digest-courier-0.49.0.20050405
deleted file mode 100644
index 3220f56ed857..000000000000
--- a/mail-mta/courier/files/digest-courier-0.49.0.20050405
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 649907ad867dd338eafb7974b7cc70c8 courier-0.49.0.20050405.tar.bz2 5877710
-RMD160 3e4eaca88fdffa193479cd7af5d927c66404664f courier-0.49.0.20050405.tar.bz2 5877710
-SHA256 37d06275b4e5d721edd3b876a3f74111fdbe3a6c7a0829be4d4b7ba8b11be8d2 courier-0.49.0.20050405.tar.bz2 5877710
diff --git a/mail-mta/courier/files/digest-courier-0.50.0 b/mail-mta/courier/files/digest-courier-0.50.0
deleted file mode 100644
index 95f61f433786..000000000000
--- a/mail-mta/courier/files/digest-courier-0.50.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b036398ea1eb13795681ae570f8a5818 courier-0.50.0.tar.bz2 5913673
-RMD160 5739a1f45bfed63682f3535267c6453ae8e27111 courier-0.50.0.tar.bz2 5913673
-SHA256 bd15c617b04b59391d629d0c981d56925e08a056c94734842a5dce339e25991a courier-0.50.0.tar.bz2 5913673
diff --git a/mail-mta/courier/files/digest-courier-0.50.1 b/mail-mta/courier/files/digest-courier-0.50.1
deleted file mode 100644
index 46c23355a736..000000000000
--- a/mail-mta/courier/files/digest-courier-0.50.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6fb2b188bba8fbf244f2feb80ad99a70 courier-0.50.1.tar.bz2 5913551
-RMD160 e9d1d0b1a4aa175ff129d3b1c27e1a8a28f07576 courier-0.50.1.tar.bz2 5913551
-SHA256 f7a31f297ac390aced9e52f9b02ac313ba2717322d188b8c4419ce5bad685d11 courier-0.50.1.tar.bz2 5913551
diff --git a/mail-mta/courier/files/digest-courier-0.50.1-r1 b/mail-mta/courier/files/digest-courier-0.50.1-r1
deleted file mode 100644
index 46c23355a736..000000000000
--- a/mail-mta/courier/files/digest-courier-0.50.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6fb2b188bba8fbf244f2feb80ad99a70 courier-0.50.1.tar.bz2 5913551
-RMD160 e9d1d0b1a4aa175ff129d3b1c27e1a8a28f07576 courier-0.50.1.tar.bz2 5913551
-SHA256 f7a31f297ac390aced9e52f9b02ac313ba2717322d188b8c4419ce5bad685d11 courier-0.50.1.tar.bz2 5913551
diff --git a/mail-mta/courier/files/digest-courier-0.52.2 b/mail-mta/courier/files/digest-courier-0.52.2
deleted file mode 100644
index b75a77b9283c..000000000000
--- a/mail-mta/courier/files/digest-courier-0.52.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 73cda41adc5425ade94e1f9005b2218b courier-0.52.2.tar.bz2 6611624
-RMD160 38e59a845ba30034d03a7472d04a1b62a0e9cf9b courier-0.52.2.tar.bz2 6611624
-SHA256 7b717f22c9fe49e0042874d5615bdd7d4adc32659d0818eb7686de3004229beb courier-0.52.2.tar.bz2 6611624