cleanup

21 files changed, 17 insertions, 1848 deletions

diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index b8cc23efce5d..3cfdd92a5a9a 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,43 +1,23 @@
-MD5 f959e38175d1fd8f8e7a977a14f7265f files/gentoo-pop3d-1.7.3-r1.rc 1018
-MD5 ff6234859377e6e830592de36bc84797 files/courier-imap-2.1.1-db40vs41.patch 559
-MD5 e448df5fdbc088132766b33d27f27073 files/gentoo-imapd.rc 1006
+MD5 4a954fa34949e6fa137302342585e6a0 ChangeLog 7723
+MD5 2effbb953eeb00f2e0bb666d5992aa78 courier-imap-1.7.3-r1.ebuild 6870
+MD5 6b964abdc013cf2bb64040e8e33215ae metadata.xml 242
+MD5 db842fd63366716514573fcb947e32b2 courier-imap-2.1.2-r1.ebuild 7166
+MD5 e2b026fe60176521e97df76389366955 files/authdaemond.conf 457
+MD5 9249739b006f7f0daa345dd8ac6e6b5b files/authdaemond.rc6 977
 MD5 c5993255c6be57914cb943789f59931e files/courier-imapd-ssl.rc6 1208
 MD5 fc75e6af35eeaecec10d7276e9b61747 files/courier-imapd.rc6 953
-MD5 40deca440b71ed8d78e39968fb5a30e9 files/mkimapdcert 996
-MD5 8ec16f9f2d26e30684d8ddbd327e9556 files/gentoo-imapd-1.6.1.rc 1007
-MD5 3dd72120d20476368b64811318e0b721 files/gentoo-pop3d-ssl-1.7.3-r1.rc 1010
-MD5 a2d52d98e3f5b3241e1ed40943d5a4a8 files/gentoo-pop3d-ssl.rc 989
-MD5 4f24c08767f06ab12e572bb0236064bb files/digest-courier-imap-1.6.2-r1 72
-MD5 7f82274e3a25ba7ff6852f78d9eb2f69 files/digest-courier-imap-1.7.3-r1 72
-MD5 e2b026fe60176521e97df76389366955 files/authdaemond.conf 457
-MD5 58631496675a58dbb19ccd058088c6e1 files/gentoo-imapd-ssl-1.7.3-r1.rc 1034
-MD5 c13a4bcb06660f1e589e95709b7a3f01 files/gentoo-pop3d-ssl-1.6.1.rc 990
-MD5 24ac993caf8157415fbe8eff04bf7c68 files/gentoo-pop3d-1.6.1.rc 998
 MD5 32bc690ac270adbfe95dbbeaab37904b files/courier-pop3d-ssl.rc6 1216
-MD5 20598de15b5368fd70065b36e8b4b4d6 files/gentoo-imapd-ssl-1.6.1.rc 1014
-MD5 f287a12e157d9a3280951ab876b5159b files/digest-courier-imap-1.7.0 72
-MD5 f8379da2c3af9757896cf51719923edd files/digest-courier-imap-1.7.1 72
-MD5 517c7b900eb23152a59d3054f98431e8 files/digest-courier-imap-1.7.2 72
-MD5 7f82274e3a25ba7ff6852f78d9eb2f69 files/digest-courier-imap-1.7.3 72
-MD5 2c48420faba16395e99faa48d098414a files/digest-courier-imap-2.0.0 72
-MD5 c7fcdd240762eddd559da4a56028d167 files/digest-courier-imap-2.1.1 72
-MD5 de1f0b8685ecebe3d859167530f53e84 files/digest-courier-imap-2.1.2 72
-MD5 a949b3b821df42c3cfee300c25a53750 files/gentoo-imapd-1.7.3-r1.rc 1027
+MD5 572530bc373ee70a6f524d554b1d139c files/courier-pop3d.rc6 961
 MD5 9626da27b0e11f495ea062e6166e11d3 files/gentoo-imapd-ssl.rc 1013
+MD5 e448df5fdbc088132766b33d27f27073 files/gentoo-imapd.rc 1006
+MD5 a2d52d98e3f5b3241e1ed40943d5a4a8 files/gentoo-pop3d-ssl.rc 989
 MD5 70a999ccc2bc13e7df65b72959fa6f7d files/gentoo-pop3d.rc 997
-MD5 de1f0b8685ecebe3d859167530f53e84 files/digest-courier-imap-2.1.2-r1 72
-MD5 9249739b006f7f0daa345dd8ac6e6b5b files/authdaemond.rc6 977
-MD5 572530bc373ee70a6f524d554b1d139c files/courier-pop3d.rc6 961
+MD5 40deca440b71ed8d78e39968fb5a30e9 files/mkimapdcert 996
 MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
-MD5 4fb63f01bfafdead1cf2bc0f4d13d29e courier-imap-1.7.1.ebuild 5255
-MD5 db842fd63366716514573fcb947e32b2 courier-imap-2.1.2-r1.ebuild 7166
-MD5 2effbb953eeb00f2e0bb666d5992aa78 courier-imap-1.7.3-r1.ebuild 6870
-MD5 91151aafebe9d3bae6f3e63eea76d14f courier-imap-1.6.2-r1.ebuild 4805
-MD5 a2c9eba27ccf5c8879378a1fa3de621f courier-imap-1.7.3.ebuild 6856
-MD5 6c2b595798a11562c91ad8cb5c6c3f19 courier-imap-2.1.2.ebuild 6869
-MD5 18a94e511e64115e525a7713458c630a courier-imap-1.7.0.ebuild 4946
-MD5 699781252b0713781073e649c50e2972 courier-imap-1.7.2.ebuild 6686
-MD5 96591b781d81dc564d59781acc80d382 courier-imap-2.1.1.ebuild 6826
-MD5 4a954fa34949e6fa137302342585e6a0 ChangeLog 7723
-MD5 6b964abdc013cf2bb64040e8e33215ae metadata.xml 242
-MD5 d87ee21ee471a7f32cef5240c67e1e89 courier-imap-2.0.0.ebuild 6599
+MD5 7f82274e3a25ba7ff6852f78d9eb2f69 files/digest-courier-imap-1.7.3-r1 72
+MD5 a949b3b821df42c3cfee300c25a53750 files/gentoo-imapd-1.7.3-r1.rc 1027
+MD5 58631496675a58dbb19ccd058088c6e1 files/gentoo-imapd-ssl-1.7.3-r1.rc 1034
+MD5 f959e38175d1fd8f8e7a977a14f7265f files/gentoo-pop3d-1.7.3-r1.rc 1018
+MD5 3dd72120d20476368b64811318e0b721 files/gentoo-pop3d-ssl-1.7.3-r1.rc 1010
+MD5 ff6234859377e6e830592de36bc84797 files/courier-imap-2.1.1-db40vs41.patch 559
+MD5 de1f0b8685ecebe3d859167530f53e84 files/digest-courier-imap-2.1.2-r1 72
diff --git a/net-mail/courier-imap/courier-imap-1.6.2-r1.ebuild b/net-mail/courier-imap/courier-imap-1.6.2-r1.ebuild
deleted file mode 100644
index 519825b62721..000000000000
--- a/net-mail/courier-imap/courier-imap-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.6.2-r1.ebuild,v 1.5 2003/09/05 02:31:27 msterret Exp $
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-KEYWORDS="x86 ~ppc ~sparc "
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ipv6 gdbm tcltk ldap berkdb mysql pam nls postgres"
-PROVIDE="virtual/imapd"
-RDEPEND="virtual/glibc
-	>=dev-libs/openssl-0.9.6
-	pam? ( >=sys-libs/pam-0.75 )
-	berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	mysql? ( >=dev-db/mysql-3.23.36 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	tcltk? ( >=dev-tcltk/expect-5.33.0 )
-	postgres? ( >=dev-db/postgresql-7.2 )"
-DEPEND="${RDEPEND} dev-lang/perl sys-apps/procps"
-
-inherit flag-o-matic
-filter-flags -funroll-loops
-filter-flags -fomit-frame-pointer
-
-src_compile() {
-	local myconf
-	use pam || myconf="${myconf} --without-authpam"
-	use ldap || myconf="${myconf} --without-authldap"
-	use mysql || myconf="${myconf} --without-authmysql"
-	use postgres || myconf="${myconf} --without-authpostgresql"
-	use berkdb \
-		&& myconf="${myconf} --with-db=db" \
-		|| myconf="${myconf} --with-db=gdbm"
-	use ipv6 || myconf="${myconf} --without-ipv6"
-
-	if [ -f /var/vpopmail/etc/lib_deps ]; then
-		myconf="${myconf} --with-authvchkpw"
-	else
-		myconf="${myconf} --without-authvchkpw"
-	fi
-
-	if use nls && [ ! -z "$ENABLE_UNICODE" ]; then
-		myconf="${myconf} --enable-unicode"
-	elif use nls; then
-		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-	else
-		myconf="${myconf} --disable-unicode"
-	fi
-
-	myconf="${myconf} debug=true"
-
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/sbin \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier-imap \
-		--libexecdir=/usr/lib/courier-imap \
-		--localstatedir=/var/lib/courier-imap \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	# change the pem file location..
-	cp imap/imapd-ssl.dist imap/imapd-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist.old > imap/imapd-ssl.dist
-
-	cp imap/pop3d-ssl.dist imap/pop3d-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		imap/pop3d-ssl.dist.old > imap/pop3d-ssl.dist
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	dodir /var/lib/courier-imap /etc/pam.d
-	make install DESTDIR=${D} || die
-
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	for name in imapd pop3d
-	do
-		mv ${name} "courier-${name}"
-	done
-
-	# hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	cd ${D}/usr/lib/courier-imap
-	local service
-	for service in imapd pop3d
-	do
-		local type
-		for type in "" "-ssl"
-		do
-			local file
-			file="${service}${type}.rc"
-			cp ${file} ${file}.orig
-			sed -e 's/Maildir/${MAILDIR}/' \
-			    -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file}.orig > ${file}
-		done
-	done
-
-	cd ${D}/etc/courier-imap
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl authdaemonrc
-	do
-		mv ${x}.dist ${x}
-	done
-
-	insinto /etc/courier-imap
-	doins ${FILESDIR}/authdaemond.conf
-
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	for service in imapd pop3d
-	do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-	done
-
-	cd ${D}/usr/sbin
-	for x in *
-	do
-		if [ -L ${x} ]
-		then
-			rm ${x}
-		fi
-	done
-
-	cd ../share
-	mv * ../sbin
-	mv ../sbin/man .
-	cd ..
-
-	rm -f ${D}/usr/sbin/mkimapdcert ${D}/usr/sbin/mkpop3dcert
-	exeinto /usr/sbin
-		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert
-
-	exeinto /etc/init.d
-		newexe ${FILESDIR}/authdaemond.rc6 authdaemond
-		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
-		newexe ${FILESDIR}/courier-imapd-ssl.rc6 courier-imapd-ssl
-		newexe ${FILESDIR}/courier-pop3d.rc6 courier-pop3d
-		newexe ${FILESDIR}/courier-pop3d-ssl.rc6 courier-pop3d-ssl
-
-	exeinto /usr/lib/courier-imap
-		newexe ${FILESDIR}/gentoo-imapd-1.6.1.rc gentoo-imapd.rc
-		newexe ${FILESDIR}/gentoo-imapd-ssl-1.6.1.rc gentoo-imapd-ssl.rc
-		newexe ${FILESDIR}/gentoo-pop3d-1.6.1.rc gentoo-pop3d.rc
-		newexe ${FILESDIR}/gentoo-pop3d-ssl-1.6.1.rc gentoo-pop3d-ssl.rc
-
-	dodir /usr/bin
-	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake
-
-	dodoc ${S}/imap/ChangeLog
-
-}
-
-pkg_postinst() {
-	# rebuild init deps to include deps on authdaemond
-	/etc/init.d/depscan.sh
-	echo
-	einfo "Make sure to change /etc/courier-imap/authdaemond.conf if"
-	einfo "you would like to use something other than the"
-	einfo "authdaemond.plain authenticator"
-	echo
-}
diff --git a/net-mail/courier-imap/courier-imap-1.7.0.ebuild b/net-mail/courier-imap/courier-imap-1.7.0.ebuild
deleted file mode 100644
index 830a20c6afa9..000000000000
--- a/net-mail/courier-imap/courier-imap-1.7.0.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.7.0.ebuild,v 1.8 2003/09/05 02:31:27 msterret Exp $
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-KEYWORDS="x86 ~ppc ~sparc "
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ipv6 gdbm tcltk ldap berkdb mysql pam nls postgres"
-PROVIDE="virtual/imapd"
-# not compatible with >=sys-libs/db-4
-RDEPEND="virtual/glibc
-	>=dev-libs/openssl-0.9.6
-	pam? ( >=sys-libs/pam-0.75 )
-	berkdb? ( =sys-libs/db-3* )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	mysql? ( >=dev-db/mysql-3.23.36 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	tcltk? ( >=dev-tcltk/expect-5.33.0 )
-	postgres? ( >=dev-db/postgresql-7.2 )"
-DEPEND="${RDEPEND} dev-lang/perl sys-apps/procps"
-
-inherit flag-o-matic
-filter-flags -funroll-loops
-filter-flags -fomit-frame-pointer
-
-src_compile() {
-	local myconf
-	use pam || myconf="${myconf} --without-authpam"
-	use ldap || myconf="${myconf} --without-authldap"
-	use mysql || myconf="${myconf} --without-authmysql"
-	use postgres || myconf="${myconf} --without-authpostgresql"
-	use berkdb \
-		&& myconf="${myconf} --with-db=db" \
-		|| myconf="${myconf} --with-db=gdbm"
-	use ipv6 || myconf="${myconf} --without-ipv6"
-
-	VPOPMAIL_DIR=`cat /etc/passwd | grep ^vpopmail | cut -d: -f6`
-	if [ -f ${VPOPMAIL_DIR}/etc/lib_deps ]; then
-		myconf="${myconf} --with-authvchkpw"
-	else
-		myconf="${myconf} --without-authvchkpw"
-	fi
-
-	if use nls && [ ! -z "$ENABLE_UNICODE" ]; then
-		myconf="${myconf} --enable-unicode"
-	elif use nls; then
-		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-	else
-		myconf="${myconf} --disable-unicode"
-	fi
-
-	myconf="${myconf} debug=true"
-
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/sbin \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier-imap \
-		--libexecdir=/usr/lib/courier-imap \
-		--localstatedir=/var/lib/courier-imap \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	# change the pem file location..
-	cp imap/imapd-ssl.dist imap/imapd-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist.old > imap/imapd-ssl.dist
-
-	cp imap/pop3d-ssl.dist imap/pop3d-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		imap/pop3d-ssl.dist.old > imap/pop3d-ssl.dist
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	dodir /var/lib/courier-imap /etc/pam.d
-	make install DESTDIR=${D} || die
-
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	for name in imapd pop3d
-	do
-		mv ${name} "courier-${name}"
-	done
-
-	# hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	cd ${D}/usr/lib/courier-imap
-	local service
-	for service in imapd pop3d
-	do
-		local type
-		for type in "" "-ssl"
-		do
-			local file
-			file="${service}${type}.rc"
-			cp ${file} ${file}.orig
-			sed -e 's/Maildir/${MAILDIR}/' \
-			    -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file}.orig > ${file}
-		done
-	done
-
-	cd ${D}/etc/courier-imap
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl authdaemonrc
-	do
-		mv ${x}.dist ${x}
-	done
-
-	insinto /etc/courier-imap
-	doins ${FILESDIR}/authdaemond.conf
-
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	for service in imapd pop3d
-	do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-	done
-
-	cd ${D}/usr/sbin
-	for x in *
-	do
-		if [ -L ${x} ]
-		then
-			rm ${x}
-		fi
-	done
-
-	cd ../share
-	mv * ../sbin
-	mv ../sbin/man .
-	cd ..
-
-	rm -f ${D}/usr/sbin/mkimapdcert ${D}/usr/sbin/mkpop3dcert
-	exeinto /usr/sbin
-		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert
-
-	exeinto /etc/init.d
-		newexe ${FILESDIR}/authdaemond.rc6 authdaemond
-		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
-		newexe ${FILESDIR}/courier-imapd-ssl.rc6 courier-imapd-ssl
-		newexe ${FILESDIR}/courier-pop3d.rc6 courier-pop3d
-		newexe ${FILESDIR}/courier-pop3d-ssl.rc6 courier-pop3d-ssl
-
-	exeinto /usr/lib/courier-imap
-		newexe ${FILESDIR}/gentoo-imapd-1.6.1.rc gentoo-imapd.rc
-		newexe ${FILESDIR}/gentoo-imapd-ssl-1.6.1.rc gentoo-imapd-ssl.rc
-		newexe ${FILESDIR}/gentoo-pop3d-1.6.1.rc gentoo-pop3d.rc
-		newexe ${FILESDIR}/gentoo-pop3d-ssl-1.6.1.rc gentoo-pop3d-ssl.rc
-
-	dodir /usr/bin
-	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake
-
-	dodoc ${S}/imap/ChangeLog
-
-	keepdir /var/lib/courier-imap/authdaemon
-
-}
-
-pkg_postinst() {
-	# rebuild init deps to include deps on authdaemond
-	/etc/init.d/depscan.sh
-	echo
-	einfo "Make sure to change /etc/courier-imap/authdaemond.conf if"
-	einfo "you would like to use something other than the"
-	einfo "authdaemond.plain authenticator"
-	echo
-}
diff --git a/net-mail/courier-imap/courier-imap-1.7.1.ebuild b/net-mail/courier-imap/courier-imap-1.7.1.ebuild
deleted file mode 100644
index e35c098c08a7..000000000000
--- a/net-mail/courier-imap/courier-imap-1.7.1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.7.1.ebuild,v 1.4 2003/09/05 02:31:27 msterret Exp $
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-KEYWORDS="~x86 ~ppc ~sparc "
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ipv6 gdbm tcltk ldap berkdb mysql pam nls postgres"
-PROVIDE="virtual/imapd"
-# not compatible with >=sys-libs/db-4
-RDEPEND="virtual/glibc
-	>=dev-libs/openssl-0.9.6
-	pam? ( >=sys-libs/pam-0.75 )
-	berkdb? ( =sys-libs/db-3* )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	mysql? ( >=dev-db/mysql-3.23.36 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	tcltk? ( >=dev-tcltk/expect-5.33.0 )
-	postgres? ( >=dev-db/postgresql-7.2 )"
-DEPEND="${RDEPEND} dev-lang/perl sys-apps/procps >=sys-apps/sed-4"
-
-inherit flag-o-matic
-filter-flags -funroll-loops
-filter-flags -fomit-frame-pointer
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# explicitly use db3 over db4
-	if [ -n "`use berkdb`" ]; then
-		sed -i -e "s,-ldb,-ldb-3.2," configure
-		sed -i -e "s,-ldb,-ldb-3.2," bdbobj/configure
-		sed -i -e 's#s,@CFLAGS@,$CFLAGS,#s,@CFLAGS@,-I/usr/include/db3 $CFLAGS,#' bdbobj/configure
-	fi
-
-}
-
-src_compile() {
-	local myconf
-	use pam || myconf="${myconf} --without-authpam"
-	use ldap || myconf="${myconf} --without-authldap"
-	use mysql || myconf="${myconf} --without-authmysql"
-	use postgres || myconf="${myconf} --without-authpostgresql"
-	use berkdb \
-		&& myconf="${myconf} --with-db=db" \
-		|| myconf="${myconf} --with-db=gdbm"
-	use ipv6 || myconf="${myconf} --without-ipv6"
-
-	VPOPMAIL_DIR=`cat /etc/passwd | grep ^vpopmail | cut -d: -f6`
-	if [ -f ${VPOPMAIL_DIR}/etc/lib_deps ]; then
-		myconf="${myconf} --with-authvchkpw"
-	else
-		myconf="${myconf} --without-authvchkpw"
-	fi
-
-	if use nls && [ ! -z "$ENABLE_UNICODE" ]; then
-		myconf="${myconf} --enable-unicode"
-	elif use nls; then
-		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-	else
-		myconf="${myconf} --disable-unicode"
-	fi
-
-	myconf="${myconf} debug=true"
-
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/sbin \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier-imap \
-		--libexecdir=/usr/lib/courier-imap \
-		--localstatedir=/var/lib/courier-imap \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	# change the pem file location..
-	cp imap/imapd-ssl.dist imap/imapd-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist.old > imap/imapd-ssl.dist
-
-	cp imap/pop3d-ssl.dist imap/pop3d-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		imap/pop3d-ssl.dist.old > imap/pop3d-ssl.dist
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	dodir /var/lib/courier-imap /etc/pam.d
-	make install DESTDIR=${D} || die
-
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	for name in imapd pop3d
-	do
-		mv ${name} "courier-${name}"
-	done
-
-	# hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	cd ${D}/usr/lib/courier-imap
-	local service
-	for service in imapd pop3d
-	do
-		local type
-		for type in "" "-ssl"
-		do
-			local file
-			file="${service}${type}.rc"
-			cp ${file} ${file}.orig
-			sed -e 's/Maildir/${MAILDIR}/' \
-			    -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file}.orig > ${file}
-		done
-	done
-
-	cd ${D}/etc/courier-imap
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl authdaemonrc
-	do
-		mv ${x}.dist ${x}
-	done
-
-	insinto /etc/courier-imap
-	doins ${FILESDIR}/authdaemond.conf
-
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	for service in imapd pop3d
-	do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-	done
-
-	cd ${D}/usr/sbin
-	for x in *
-	do
-		if [ -L ${x} ]
-		then
-			rm ${x}
-		fi
-	done
-
-	cd ../share
-	mv * ../sbin
-	mv ../sbin/man .
-	cd ..
-
-	rm -f ${D}/usr/sbin/mkimapdcert ${D}/usr/sbin/mkpop3dcert
-	exeinto /usr/sbin
-		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert
-
-	exeinto /etc/init.d
-		newexe ${FILESDIR}/authdaemond.rc6 authdaemond
-		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
-		newexe ${FILESDIR}/courier-imapd-ssl.rc6 courier-imapd-ssl
-		newexe ${FILESDIR}/courier-pop3d.rc6 courier-pop3d
-		newexe ${FILESDIR}/courier-pop3d-ssl.rc6 courier-pop3d-ssl
-
-	exeinto /usr/lib/courier-imap
-		newexe ${FILESDIR}/gentoo-imapd-1.6.1.rc gentoo-imapd.rc
-		newexe ${FILESDIR}/gentoo-imapd-ssl-1.6.1.rc gentoo-imapd-ssl.rc
-		newexe ${FILESDIR}/gentoo-pop3d-1.6.1.rc gentoo-pop3d.rc
-		newexe ${FILESDIR}/gentoo-pop3d-ssl-1.6.1.rc gentoo-pop3d-ssl.rc
-
-	dodir /usr/bin
-	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake
-
-	dodoc ${S}/imap/ChangeLog
-
-	keepdir /var/lib/courier-imap/authdaemon
-
-}
-
-pkg_postinst() {
-	# rebuild init deps to include deps on authdaemond
-	/etc/init.d/depscan.sh
-	echo
-	einfo "Make sure to change /etc/courier-imap/authdaemond.conf if"
-	einfo "you would like to use something other than the"
-	einfo "authdaemond.plain authenticator"
-	echo
-}
diff --git a/net-mail/courier-imap/courier-imap-1.7.2.ebuild b/net-mail/courier-imap/courier-imap-1.7.2.ebuild
deleted file mode 100644
index 06b148a1025d..000000000000
--- a/net-mail/courier-imap/courier-imap-1.7.2.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.7.2.ebuild,v 1.4 2003/09/05 02:31:27 msterret Exp $
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~arm"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ipv6 gdbm ldap berkdb mysql pam nls postgres"
-PROVIDE="virtual/imapd"
-# not compatible with >=sys-libs/db-4
-RDEPEND="virtual/glibc
-	>=dev-libs/openssl-0.9.6
-	pam? ( >=sys-libs/pam-0.75 )
-	berkdb? ( =sys-libs/db-3* )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	mysql? ( >=dev-db/mysql-3.23.36 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	>=dev-tcltk/expect-5.33.0"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-lang/perl
-	sys-apps/procps"
-
-inherit flag-o-matic
-filter-flags -funroll-loops
-filter-flags -fomit-frame-pointer
-
-#sandbox breaks linking against vpopmail
-VPOPMAIL_DIR=`cat /etc/passwd | grep ^vpopmail | cut -d: -f6`
-if [ -n "${VPOPMAIL_DIR}" ]; then
-	VPOPMAIL_ERROR=
-	if [ "`has userpriv ${FEATURES}`" ]; then
-		VPOPMAIL_ERROR=1
-	fi
-fi
-
-src_unpack() {
-	[ -n "${VPOPMAIL_ERROR}" ]  && die "FEATURES=\"userpriv\" breaks the compile with vpopmail. For the moment, the only workaround is 'FEATURES=\"-userpriv -usersandbox\" emerge ${PN}'"
-
-	unpack ${A}
-	cd ${S}
-
-	# explicitly use db3 over db4
-	if [ -n "`use berkdb`" ]; then
-		sed -i -e 's,-ldb,-ldb-3.2,g' configure
-		sed -i -e 's,-ldb,-ldb-3.2,g' bdbobj/configure
-		sed -i -e 's#s,@CFLAGS@,$CFLAGS,#s,@CFLAGS@,-I/usr/include/db3 $CFLAGS,#' configure
-		sed -i -e 's#s,@CFLAGS@,$CFLAGS,#s,@CFLAGS@,-I/usr/include/db3 $CFLAGS,#' bdbobj/configure
-	fi
-
-	# Fix a bug with where the password change module is installed. Upstream bug in configure file.
-	sed -i -e 's,--with-authchangepwdir=/var/tmp/dev/null,--with-authchangepwdir=$libexecdir/authlib,' configure
-}
-
-src_compile() {
-	local myconf
-	myconf="${myconf} `use_with pam authpam`"
-	myconf="${myconf} `use_with ldap authldap`"
-	myconf="${myconf} `use_with mysql authmysql`"
-	myconf="${myconf} `use_with postgres authpostgresql`"
-	myconf="${myconf} `use_with ipv6`"
-	myconf="${myconf} "
-	use berkdb \
-		&& myconf="${myconf} --with-db=db" \
-		|| myconf="${myconf} --with-db=gdbm"
-
-	if [ -f ${VPOPMAIL_DIR}/etc/lib_deps ]; then
-		myconf="${myconf} --with-authvchkpw"
-		tmpLDFLAGS="`cat ${VPOPMAIL_DIR}/etc/lib_deps`"
-		LDFLAGS="${LDFLAGS} ${tmpLDFLAGS}"
-		CFLAGS="${CFLAGS} `cat ${VPOPMAIL_DIR}/etc/inc_deps`"
-	else
-		myconf="${myconf} --without-authvchkpw"
-	fi
-
-	if use nls && [ -z "$ENABLE_UNICODE" ]; then
-		myconf="${myconf} --enable-unicode"
-	elif use nls; then
-		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-	else
-		myconf="${myconf} --disable-unicode"
-	fi
-
-	myconf="${myconf} debug=true"
-
-	local cachefile
-	cachefile=${WORKDIR}/config.cache
-	rm -f ${cachefile}
-
-	LDFLAGS="${LDFLAGS}" econf \
-		--disable-root-check \
-		--bindir=/usr/sbin \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier-imap \
-		--libexecdir=/usr/lib/courier-imap \
-		--localstatedir=/var/lib/courier-imap \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--cache-file=${cachefile} \
-		${myconf}
-
-	# change the pem file location..
-	cp imap/imapd-ssl.dist imap/imapd-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist.old > imap/imapd-ssl.dist
-
-	cp imap/pop3d-ssl.dist imap/pop3d-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		imap/pop3d-ssl.dist.old > imap/pop3d-ssl.dist
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	dodir /var/lib/courier-imap /etc/pam.d
-	make install DESTDIR=${D} || die
-
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	for name in imapd pop3d
-	do
-		mv ${name} "courier-${name}"
-	done
-
-	# hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	cd ${D}/usr/lib/courier-imap
-	local service
-	for service in imapd pop3d
-	do
-		local type
-		for type in "" "-ssl"
-		do
-			local file
-			file="${service}${type}.rc"
-			cp ${file} ${file}.orig
-			sed -e 's/Maildir/${MAILDIR}/' \
-			    -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file}.orig > ${file}
-		done
-	done
-
-	cd ${D}/etc/courier-imap
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl authdaemonrc
-	do
-		mv ${x}.dist ${x}
-	done
-
-	insinto /etc/courier-imap
-	doins ${FILESDIR}/authdaemond.conf
-
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	for service in imapd pop3d
-	do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-		echo -e '#Put any program for ${PRERUN} here' >> ${service}
-		echo 'PRERUN='>> ${service}
-	done
-
-	cd ${D}/usr/sbin
-	for x in *
-	do
-		if [ -L ${x} ]
-		then
-			rm ${x}
-		fi
-	done
-
-	cd ../share
-	mv * ../sbin
-	mv ../sbin/man .
-	cd ..
-
-	rm -f ${D}/usr/sbin/mkimapdcert ${D}/usr/sbin/mkpop3dcert
-	exeinto /usr/sbin
-		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert
-
-	exeinto /etc/init.d
-		newexe ${FILESDIR}/authdaemond.rc6 authdaemond
-		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
-		newexe ${FILESDIR}/courier-imapd-ssl.rc6 courier-imapd-ssl
-		newexe ${FILESDIR}/courier-pop3d.rc6 courier-pop3d
-		newexe ${FILESDIR}/courier-pop3d-ssl.rc6 courier-pop3d-ssl
-
-	exeinto /usr/lib/courier-imap
-		newexe ${FILESDIR}/gentoo-imapd-1.6.1.rc gentoo-imapd.rc
-		newexe ${FILESDIR}/gentoo-imapd-ssl-1.6.1.rc gentoo-imapd-ssl.rc
-		newexe ${FILESDIR}/gentoo-pop3d-1.6.1.rc gentoo-pop3d.rc
-		newexe ${FILESDIR}/gentoo-pop3d-ssl-1.6.1.rc gentoo-pop3d-ssl.rc
-
-	local authmods
-	authmods="authsystem.passwd authcram authshadow authuserdb authpwd authtest authinfo authmksock authcustom authdaemontest"
-	use mysql && authmods="${authmods} authmysql"
-	use postgres && authmods="${authmods} authpgsql"
-	use pam && authmods="${authmods} authpam"
-	use ldap && authmods="${authmods} authldap"
-	[ -n "${VPOPMAIL_DIR}" ] && authmods="${authmods} authvchkpw"
-	exeinto /usr/lib/courier-imap/authlib
-	for i in ${authmods}; do
-		[ -f ${S}/authlib/${i} ] && doexe ${S}/authlib/${i}
-	done;
-
-	dodir /usr/bin
-	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake
-
-	dodoc ${S}/imap/ChangeLog
-
-	keepdir /var/lib/courier-imap/authdaemon
-
-}
-
-pkg_postinst() {
-	# rebuild init deps to include deps on authdaemond
-	/etc/init.d/depscan.sh
-	einfo "Make sure to change /etc/courier-imap/authdaemond.conf if"
-	einfo "you would like to use something other than the"
-	einfo "authdaemond.plain authenticator"
-}
diff --git a/net-mail/courier-imap/courier-imap-1.7.3.ebuild b/net-mail/courier-imap/courier-imap-1.7.3.ebuild
deleted file mode 100644
index 256d9c12b151..000000000000
--- a/net-mail/courier-imap/courier-imap-1.7.3.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.7.3.ebuild,v 1.7 2003/09/05 02:31:27 msterret Exp $
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~arm"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ipv6 gdbm ldap berkdb mysql pam nls postgres"
-PROVIDE="virtual/imapd"
-# not compatible with >=sys-libs/db-4
-RDEPEND="virtual/glibc
-	>=dev-libs/openssl-0.9.6
-	pam? ( >=sys-libs/pam-0.75 )
-	berkdb? ( =sys-libs/db-3* )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	mysql? ( >=dev-db/mysql-3.23.36 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	>=dev-tcltk/expect-5.33.0"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-lang/perl
-	sys-apps/procps"
-
-#userpriv breaks linking against vpopmail
-VPOPMAIL_DIR=`cat /etc/passwd | grep ^vpopmail | cut -d: -f6`
-VPOPMAIL_INSTALLED=
-VPOPMAIL_ERROR=
-[ -n "${VPOPMAIL_DIR}" ] && [ -f "${VPOPMAIL_DIR}/etc/lib_deps" ] && VPOPMAIL_INSTALLED=1
-if [ -n "${VPOPMAIL_INSTALLED}" ]; then
-	has userpriv "${FEATURES}" && VPOPMAIL_ERROR=1
-fi
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# explicitly use db3 over db4
-	if [ -n "`use berkdb`" ]; then
-		sed -i -e 's,-ldb,-ldb-3.2,g' configure
-		sed -i -e 's,-ldb,-ldb-3.2,g' bdbobj/configure
-		sed -i -e 's#s,@CFLAGS@,$CFLAGS,#s,@CFLAGS@,-I/usr/include/db3 $CFLAGS,#' configure
-		sed -i -e 's#s,@CFLAGS@,$CFLAGS,#s,@CFLAGS@,-I/usr/include/db3 $CFLAGS,#' bdbobj/configure
-	fi
-
-	# Fix a bug with where the password change module is installed. Upstream bug in configure file.
-	sed -i -e 's,--with-authchangepwdir=/var/tmp/dev/null,--with-authchangepwdir=$libexecdir/authlib,' configure
-}
-
-src_compile() {
-	[ -n "${VPOPMAIL_ERROR}" ]  && die "FEATURES=\"userpriv\" breaks the compile with vpopmail. For the moment, the only workaround is 'FEATURES=\"-userpriv -usersandbox\" emerge ${PN}'"
-
-	local myconf
-	myconf="${myconf} `use_with pam authpam`"
-	myconf="${myconf} `use_with ldap authldap`"
-	myconf="${myconf} `use_with mysql authmysql`"
-	myconf="${myconf} `use_with postgres authpostgresql`"
-	myconf="${myconf} `use_with ipv6`"
-	myconf="${myconf} "
-	use berkdb \
-		&& myconf="${myconf} --with-db=db" \
-		|| myconf="${myconf} --with-db=gdbm"
-
-	if [ -n "${VPOPMAIL_INSTALLED}" ]; then
-		myconf="${myconf} --with-authvchkpw"
-		tmpLDFLAGS="`cat ${VPOPMAIL_DIR}/etc/lib_deps`"
-		LDFLAGS="${LDFLAGS} ${tmpLDFLAGS}"
-		CFLAGS="${CFLAGS} `cat ${VPOPMAIL_DIR}/etc/inc_deps`"
-	else
-		myconf="${myconf} --without-authvchkpw"
-	fi
-
-	if use nls && [ -z "$ENABLE_UNICODE" ]; then
-		myconf="${myconf} --enable-unicode"
-	elif use nls; then
-		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-	else
-		myconf="${myconf} --disable-unicode"
-	fi
-
-	myconf="${myconf} debug=true"
-
-	local cachefile
-	cachefile=${WORKDIR}/config.cache
-	rm -f ${cachefile}
-
-	# fix for bug #21330
-	CFLAGS=`echo ${CFLAGS} | xargs`
-	CXXFLAGS=`echo ${CXXFLAGS} | xargs`
-	LDFLAGS=`echo ${LDFLAGS} | xargs`
-
-	# Do the actual build now
-	LDFLAGS="${LDFLAGS}" econf \
-		--disable-root-check \
-		--bindir=/usr/sbin \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier-imap \
-		--libexecdir=/usr/lib/courier-imap \
-		--localstatedir=/var/lib/courier-imap \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--cache-file=${cachefile} \
-		${myconf}
-
-	# change the pem file location..
-	cp imap/imapd-ssl.dist imap/imapd-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist.old > imap/imapd-ssl.dist
-
-	cp imap/pop3d-ssl.dist imap/pop3d-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		imap/pop3d-ssl.dist.old > imap/pop3d-ssl.dist
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	dodir /var/lib/courier-imap /etc/pam.d
-	make install DESTDIR=${D} || die
-
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	for name in imapd pop3d
-	do
-		mv ${name} "courier-${name}"
-	done
-
-	# hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	cd ${D}/usr/lib/courier-imap
-	local service
-	for service in imapd pop3d
-	do
-		local type
-		for type in "" "-ssl"
-		do
-			local file
-			file="${service}${type}.rc"
-			cp ${file} ${file}.orig
-			sed -e 's/Maildir/${MAILDIR}/' \
-			    -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file}.orig > ${file}
-		done
-	done
-
-	cd ${D}/etc/courier-imap
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl authdaemonrc
-	do
-		mv ${x}.dist ${x}
-	done
-
-	insinto /etc/courier-imap
-	doins ${FILESDIR}/authdaemond.conf
-
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	for service in imapd pop3d
-	do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-		echo -e '#Put any program for ${PRERUN} here' >> ${service}
-		echo 'PRERUN='>> ${service}
-	done
-
-	cd ${D}/usr/sbin
-	for x in *
-	do
-		if [ -L ${x} ]
-		then
-			rm ${x}
-		fi
-	done
-
-	cd ../share
-	mv * ../sbin
-	mv ../sbin/man .
-	cd ..
-
-	rm -f ${D}/usr/sbin/mkimapdcert ${D}/usr/sbin/mkpop3dcert
-	exeinto /usr/sbin
-		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert
-
-	exeinto /etc/init.d
-		newexe ${FILESDIR}/authdaemond.rc6 authdaemond
-		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
-		newexe ${FILESDIR}/courier-imapd-ssl.rc6 courier-imapd-ssl
-		newexe ${FILESDIR}/courier-pop3d.rc6 courier-pop3d
-		newexe ${FILESDIR}/courier-pop3d-ssl.rc6 courier-pop3d-ssl
-
-	exeinto /usr/lib/courier-imap
-		newexe ${FILESDIR}/gentoo-imapd-1.6.1.rc gentoo-imapd.rc
-		newexe ${FILESDIR}/gentoo-imapd-ssl-1.6.1.rc gentoo-imapd-ssl.rc
-		newexe ${FILESDIR}/gentoo-pop3d-1.6.1.rc gentoo-pop3d.rc
-		newexe ${FILESDIR}/gentoo-pop3d-ssl-1.6.1.rc gentoo-pop3d-ssl.rc
-
-	local authmods
-	authmods="authsystem.passwd authcram authshadow authuserdb authpwd authtest authinfo authmksock authcustom authdaemontest"
-	use mysql && authmods="${authmods} authmysql"
-	use postgres && authmods="${authmods} authpgsql"
-	use pam && authmods="${authmods} authpam"
-	use ldap && authmods="${authmods} authldap"
-	[ -n "${VPOPMAIL_INSTALLED}" ] && authmods="${authmods} authvchkpw"
-	exeinto /usr/lib/courier-imap/authlib
-	for i in ${authmods}; do
-		[ -f ${S}/authlib/${i} ] && doexe ${S}/authlib/${i}
-	done;
-
-	dodir /usr/bin
-	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake
-
-	dodoc ${S}/imap/ChangeLog
-
-	keepdir /var/lib/courier-imap/authdaemon
-
-}
-
-pkg_postinst() {
-	# rebuild init deps to include deps on authdaemond
-	/etc/init.d/depscan.sh
-	einfo "Make sure to change /etc/courier-imap/authdaemond.conf if"
-	einfo "you would like to use something other than the"
-	einfo "authdaemond.plain authenticator"
-}
diff --git a/net-mail/courier-imap/courier-imap-2.0.0.ebuild b/net-mail/courier-imap/courier-imap-2.0.0.ebuild
deleted file mode 100644
index 53628ea90cba..000000000000
--- a/net-mail/courier-imap/courier-imap-2.0.0.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-2.0.0.ebuild,v 1.2 2003/09/05 02:31:27 msterret Exp $
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~arm"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ipv6 gdbm ldap berkdb mysql pam nls postgres"
-PROVIDE="virtual/imapd"
-# not compatible with >=sys-libs/db-4
-RDEPEND="virtual/glibc
-	>=dev-libs/openssl-0.9.6
-	pam? ( >=sys-libs/pam-0.75 )
-	berkdb? ( =sys-libs/db-3* )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	mysql? ( >=dev-db/mysql-3.23.36 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	>=dev-tcltk/expect-5.33.0"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-lang/perl
-	sys-apps/procps"
-
-#userpriv breaks linking against vpopmail
-RESTRICT="nouserpriv"
-VPOPMAIL_DIR=`cat /etc/passwd | grep ^vpopmail | cut -d: -f6`
-VPOPMAIL_INSTALLED=
-[ -n "${VPOPMAIL_DIR}" ] && [ -f "${VPOPMAIL_DIR}/etc/lib_deps" ] && VPOPMAIL_INSTALLED=1
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# explicitly use db3 over db4
-	if [ -n "`use berkdb`" ]; then
-		sed -i -e 's,-ldb,-ldb-3.2,g' configure
-		sed -i -e 's,-ldb,-ldb-3.2,g' bdbobj/configure
-		sed -i -e 's#s,@CFLAGS@,$CFLAGS,#s,@CFLAGS@,-I/usr/include/db3 $CFLAGS,#' configure
-		sed -i -e 's#s,@CFLAGS@,$CFLAGS,#s,@CFLAGS@,-I/usr/include/db3 $CFLAGS,#' bdbobj/configure
-	fi
-
-	# Fix a bug with where the password change module is installed. Upstream bug in configure file.
-	sed -i -e 's,--with-authchangepwdir=/var/tmp/dev/null,--with-authchangepwdir=$libexecdir/authlib,' configure
-}
-
-src_compile() {
-
-	local myconf
-	myconf="${myconf} `use_with pam authpam`"
-	myconf="${myconf} `use_with ldap authldap`"
-	myconf="${myconf} `use_with mysql authmysql`"
-	myconf="${myconf} `use_with postgres authpostgresql`"
-	myconf="${myconf} `use_with ipv6`"
-	myconf="${myconf} "
-	use berkdb \
-		&& myconf="${myconf} --with-db=db" \
-		|| myconf="${myconf} --with-db=gdbm"
-
-	if [ -n "${VPOPMAIL_INSTALLED}" ]; then
-		myconf="${myconf} --with-authvchkpw"
-		tmpLDFLAGS="`cat ${VPOPMAIL_DIR}/etc/lib_deps`"
-		LDFLAGS="${LDFLAGS} ${tmpLDFLAGS}"
-		CFLAGS="${CFLAGS} `cat ${VPOPMAIL_DIR}/etc/inc_deps`"
-	else
-		myconf="${myconf} --without-authvchkpw"
-	fi
-
-	if use nls && [ -z "$ENABLE_UNICODE" ]; then
-		myconf="${myconf} --enable-unicode"
-	elif use nls; then
-		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-	else
-		myconf="${myconf} --disable-unicode"
-	fi
-
-	myconf="${myconf} debug=true"
-
-	local cachefile
-	cachefile=${WORKDIR}/config.cache
-	rm -f ${cachefile}
-
-	# fix for bug #21330
-	CFLAGS=`echo ${CFLAGS} | xargs`
-	CXXFLAGS=`echo ${CXXFLAGS} | xargs`
-	LDFLAGS=`echo ${LDFLAGS} | xargs`
-
-	# Do the actual build now
-	LDFLAGS="${LDFLAGS}" econf \
-		--disable-root-check \
-		--bindir=/usr/sbin \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier-imap \
-		--libexecdir=/usr/lib/courier-imap \
-		--localstatedir=/var/lib/courier-imap \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--cache-file=${cachefile} \
-		${myconf}
-
-	# change the pem file location..
-	cp imap/imapd-ssl.dist imap/imapd-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist.old > imap/imapd-ssl.dist
-
-	cp imap/pop3d-ssl.dist imap/pop3d-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		imap/pop3d-ssl.dist.old > imap/pop3d-ssl.dist
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	dodir /var/lib/courier-imap /etc/pam.d
-	make install DESTDIR=${D} || die
-
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	for name in imapd pop3d
-	do
-		mv ${name} "courier-${name}"
-	done
-
-	# hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	cd ${D}/usr/lib/courier-imap
-	local service
-	for service in imapd pop3d
-	do
-		local type
-		for type in "" "-ssl"
-		do
-			local file
-			file="${service}${type}.rc"
-			cp ${file} ${file}.orig
-			sed -e 's/Maildir/${MAILDIR}/' \
-			    -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file}.orig > ${file}
-		done
-	done
-
-	cd ${D}/etc/courier-imap
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl authdaemonrc
-	do
-		mv ${x}.dist ${x}
-	done
-
-	insinto /etc/courier-imap
-	doins ${FILESDIR}/authdaemond.conf
-
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	for service in imapd pop3d
-	do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-		echo -e '#Put any program for ${PRERUN} here' >> ${service}
-		echo 'PRERUN='>> ${service}
-	done
-
-	cd ${D}/usr/sbin
-	for x in *
-	do
-		if [ -L ${x} ]
-		then
-			rm ${x}
-		fi
-	done
-
-	cd ../share
-	mv * ../sbin
-	mv ../sbin/man .
-	cd ..
-
-	rm -f ${D}/usr/sbin/mkimapdcert ${D}/usr/sbin/mkpop3dcert
-	exeinto /usr/sbin
-		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert
-
-	exeinto /etc/init.d
-		newexe ${FILESDIR}/authdaemond.rc6 authdaemond
-		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
-		newexe ${FILESDIR}/courier-imapd-ssl.rc6 courier-imapd-ssl
-		newexe ${FILESDIR}/courier-pop3d.rc6 courier-pop3d
-		newexe ${FILESDIR}/courier-pop3d-ssl.rc6 courier-pop3d-ssl
-
-	exeinto /usr/lib/courier-imap
-		newexe ${FILESDIR}/gentoo-imapd-1.7.3-r1.rc gentoo-imapd.rc
-		newexe ${FILESDIR}/gentoo-imapd-ssl-1.7.3-r1.rc gentoo-imapd-ssl.rc
-		newexe ${FILESDIR}/gentoo-pop3d-1.7.3-r1.rc gentoo-pop3d.rc
-		newexe ${FILESDIR}/gentoo-pop3d-ssl-1.7.3-r1.rc gentoo-pop3d-ssl.rc
-
-	local authmods
-	authmods="authsystem.passwd authcram authshadow authuserdb authpwd authtest authinfo authmksock authcustom authdaemontest"
-	use mysql && authmods="${authmods} authmysql"
-	use postgres && authmods="${authmods} authpgsql"
-	use pam && authmods="${authmods} authpam"
-	use ldap && authmods="${authmods} authldap"
-	[ -n "${VPOPMAIL_INSTALLED}" ] && authmods="${authmods} authvchkpw"
-	exeinto /usr/lib/courier-imap/authlib
-	for i in ${authmods}; do
-		[ -f ${S}/authlib/${i} ] && doexe ${S}/authlib/${i}
-	done;
-
-	dodir /usr/bin
-	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake
-
-	dodoc ${S}/imap/ChangeLog
-
-	keepdir /var/lib/courier-imap/authdaemon
-
-}
-
-pkg_postinst() {
-	# rebuild init deps to include deps on authdaemond
-	/etc/init.d/depscan.sh
-	einfo "Make sure to change /etc/courier-imap/authdaemond.conf if"
-	einfo "you would like to use something other than the"
-	einfo "authdaemond.plain authenticator"
-}
diff --git a/net-mail/courier-imap/courier-imap-2.1.1.ebuild b/net-mail/courier-imap/courier-imap-2.1.1.ebuild
deleted file mode 100644
index b2f9b1c94a6d..000000000000
--- a/net-mail/courier-imap/courier-imap-2.1.1.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-2.1.1.ebuild,v 1.4 2003/09/05 02:31:27 msterret Exp $
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~arm"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gdbm ldap berkdb mysql pam nls postgres"
-PROVIDE="virtual/imapd"
-# not compatible with >=sys-libs/db-4
-RDEPEND="virtual/glibc
-	>=dev-libs/openssl-0.9.6
-	pam? ( >=sys-libs/pam-0.75 )
-	berkdb? ( =sys-libs/db-3* )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	mysql? ( >=dev-db/mysql-3.23.36 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	>=dev-tcltk/expect-5.33.0 "
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-lang/perl
-	sys-apps/procps"
-
-#userpriv breaks linking against vpopmail
-RESTRICT="nouserpriv"
-VPOPMAIL_DIR=`cat /etc/passwd | grep ^vpopmail | cut -d: -f6`
-VPOPMAIL_INSTALLED=
-[ -n "${VPOPMAIL_DIR}" ] && [ -f "${VPOPMAIL_DIR}/etc/lib_deps" ] && VPOPMAIL_INSTALLED=1
-
-src_unpack() {
-	unpack ${A}
-
-	# patch to fix db4.0 detection as db4.1
-	# bug #27517, patch needs to go upstream
-	epatch ${FILESDIR}/courier-imap-2.1.1-db40vs41.patch
-
-	cd ${S}
-	# explicitly use db3 over db4
-	if use berkdb; then
-		sed -i -e 's,-ldb,-ldb-3.2,g' configure
-		sed -i -e 's,-ldb,-ldb-3.2,g' bdbobj/configure
-		sed -i -e 's#s,@CFLAGS@,$CFLAGS,#s,@CFLAGS@,-I/usr/include/db3 $CFLAGS,#' configure
-		sed -i -e 's#s,@CFLAGS@,$CFLAGS,#s,@CFLAGS@,-I/usr/include/db3 $CFLAGS,#' bdbobj/configure
-	fi
-
-	# Fix a bug with where the password change module is installed. Upstream bug in configure file.
-	sed -i -e 's,--with-authchangepwdir=/var/tmp/dev/null,--with-authchangepwdir=$libexecdir/authlib,' configure
-}
-
-src_compile() {
-
-	local myconf
-	myconf="${myconf} `use_with pam authpam`"
-	myconf="${myconf} `use_with ldap authldap`"
-	myconf="${myconf} `use_with mysql authmysql`"
-	myconf="${myconf} `use_with postgres authpostgresql`"
-	myconf="${myconf} --with-ipv6"
-	use berkdb \
-		&& myconf="${myconf} --with-db=db" \
-		|| myconf="${myconf} --with-db=gdbm"
-
-	if [ -n "${VPOPMAIL_INSTALLED}" ]; then
-		myconf="${myconf} --with-authvchkpw"
-		tmpLDFLAGS="`cat ${VPOPMAIL_DIR}/etc/lib_deps`"
-		LDFLAGS="${LDFLAGS} ${tmpLDFLAGS}"
-		CFLAGS="${CFLAGS} `cat ${VPOPMAIL_DIR}/etc/inc_deps`"
-	else
-		myconf="${myconf} --without-authvchkpw"
-	fi
-
-	if use nls && [ -z "$ENABLE_UNICODE" ]; then
-		myconf="${myconf} --enable-unicode"
-	elif use nls; then
-		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-	else
-		myconf="${myconf} --disable-unicode"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	local cachefile
-	cachefile=${WORKDIR}/config.cache
-	rm -f ${cachefile}
-
-	# fix for bug #21330
-	CFLAGS=`echo ${CFLAGS} | xargs`
-	CXXFLAGS=`echo ${CXXFLAGS} | xargs`
-	LDFLAGS=`echo ${LDFLAGS} | xargs`
-
-	# fix for bug #27528
-	# they really should use a better way to detect redhat
-	myconf="${myconf} --without-redhat"
-
-	# Do the actual build now
-	LDFLAGS="${LDFLAGS}" econf \
-		--disable-root-check \
-		--bindir=/usr/sbin \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier-imap \
-		--libexecdir=/usr/lib/courier-imap \
-		--localstatedir=/var/lib/courier-imap \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--cache-file=${cachefile} \
-		${myconf}
-
-	# change the pem file location..
-	cp imap/imapd-ssl.dist imap/imapd-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist.old > imap/imapd-ssl.dist
-
-	cp imap/pop3d-ssl.dist imap/pop3d-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		imap/pop3d-ssl.dist.old > imap/pop3d-ssl.dist
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	dodir /var/lib/courier-imap /etc/pam.d
-	make install DESTDIR=${D} || die
-
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	for name in imapd pop3d
-	do
-		mv ${name} "courier-${name}"
-	done
-
-	# hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	cd ${D}/usr/lib/courier-imap
-	local service
-	for service in imapd pop3d
-	do
-		local type
-		for type in "" "-ssl"
-		do
-			local file
-			file="${service}${type}.rc"
-			cp ${file} ${file}.orig
-			sed -e 's/Maildir/${MAILDIR}/' \
-			    -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file}.orig > ${file}
-		done
-	done
-
-	cd ${D}/etc/courier-imap
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl authdaemonrc
-	do
-		mv ${x}.dist ${x}
-	done
-
-	insinto /etc/courier-imap
-	doins ${FILESDIR}/authdaemond.conf
-
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	for service in imapd pop3d
-	do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-		echo -e '#Put any program for ${PRERUN} here' >> ${service}
-		echo 'PRERUN='>> ${service}
-	done
-
-	cd ${D}/usr/sbin
-	for x in *
-	do
-		if [ -L ${x} ]
-		then
-			rm ${x}
-		fi
-	done
-
-	cd ../share
-	mv * ../sbin
-	mv ../sbin/man .
-	cd ..
-
-	rm -f ${D}/usr/sbin/mkimapdcert ${D}/usr/sbin/mkpop3dcert
-	exeinto /usr/sbin
-		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert
-
-	exeinto /etc/init.d
-		newexe ${FILESDIR}/authdaemond.rc6 authdaemond
-		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
-		newexe ${FILESDIR}/courier-imapd-ssl.rc6 courier-imapd-ssl
-		newexe ${FILESDIR}/courier-pop3d.rc6 courier-pop3d
-		newexe ${FILESDIR}/courier-pop3d-ssl.rc6 courier-pop3d-ssl
-
-	exeinto /usr/lib/courier-imap
-		newexe ${FILESDIR}/gentoo-imapd-1.7.3-r1.rc gentoo-imapd.rc
-		newexe ${FILESDIR}/gentoo-imapd-ssl-1.7.3-r1.rc gentoo-imapd-ssl.rc
-		newexe ${FILESDIR}/gentoo-pop3d-1.7.3-r1.rc gentoo-pop3d.rc
-		newexe ${FILESDIR}/gentoo-pop3d-ssl-1.7.3-r1.rc gentoo-pop3d-ssl.rc
-
-	local authmods
-	authmods="authsystem.passwd authcram authshadow authuserdb authpwd authtest authinfo authmksock authcustom authdaemontest"
-	use mysql && authmods="${authmods} authmysql"
-	use postgres && authmods="${authmods} authpgsql"
-	use pam && authmods="${authmods} authpam"
-	use ldap && authmods="${authmods} authldap"
-	[ -n "${VPOPMAIL_INSTALLED}" ] && authmods="${authmods} authvchkpw"
-	exeinto /usr/lib/courier-imap/authlib
-	for i in ${authmods}; do
-		[ -f ${S}/authlib/${i} ] && doexe ${S}/authlib/${i}
-	done;
-
-	dodir /usr/bin
-	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake
-
-	dodoc ${S}/imap/ChangeLog
-
-	keepdir /var/lib/courier-imap/authdaemon
-
-}
-
-pkg_postinst() {
-	# rebuild init deps to include deps on authdaemond
-	/etc/init.d/depscan.sh
-	einfo "Make sure to change /etc/courier-imap/authdaemond.conf if"
-	einfo "you would like to use something other than the"
-	einfo "authdaemond.plain authenticator"
-}
diff --git a/net-mail/courier-imap/courier-imap-2.1.2.ebuild b/net-mail/courier-imap/courier-imap-2.1.2.ebuild
deleted file mode 100644
index b0a1673930a7..000000000000
--- a/net-mail/courier-imap/courier-imap-2.1.2.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-2.1.2.ebuild,v 1.1 2003/09/26 01:44:05 robbat2 Exp $
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~arm"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gdbm ldap berkdb mysql pam nls postgres"
-PROVIDE="virtual/imapd"
-# not compatible with >=sys-libs/db-4
-RDEPEND="virtual/glibc
-	>=dev-libs/openssl-0.9.6
-	pam? ( >=sys-libs/pam-0.75 )
-	berkdb? ( =sys-libs/db-3* )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	mysql? ( >=dev-db/mysql-3.23.36 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	>=dev-tcltk/expect-5.33.0 "
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-lang/perl
-	sys-apps/procps"
-
-#userpriv breaks linking against vpopmail
-RESTRICT="nouserpriv"
-VPOPMAIL_DIR=`cat /etc/passwd | grep ^vpopmail | cut -d: -f6`
-VPOPMAIL_INSTALLED=
-[ -n "${VPOPMAIL_DIR}" ] && [ -f "${VPOPMAIL_DIR}/etc/lib_deps" ] && VPOPMAIL_INSTALLED=1
-
-src_unpack() {
-	unpack ${A}
-
-	# patch to fix db4.0 detection as db4.1
-	# bug #27517, patch needs to go upstream
-	EPATCH_OPTS="${EPATCH_OPTS} -p1 -d ${S}" \
-	epatch ${FILESDIR}/courier-imap-2.1.1-db40vs41.patch
-
-	cd ${S}
-	# explicitly use db3 over db4
-	if use berkdb; then
-		sed -i -e 's,-ldb,-ldb-3.2,g' configure
-		sed -i -e 's,-ldb,-ldb-3.2,g' bdbobj/configure
-		sed -i -e 's#s,@CFLAGS@,$CFLAGS,#s,@CFLAGS@,-I/usr/include/db3 $CFLAGS,#' configure
-		sed -i -e 's#s,@CFLAGS@,$CFLAGS,#s,@CFLAGS@,-I/usr/include/db3 $CFLAGS,#' bdbobj/configure
-	fi
-
-	# Fix a bug with where the password change module is installed. Upstream bug in configure file.
-	sed -i -e 's,--with-authchangepwdir=/var/tmp/dev/null,--with-authchangepwdir=$libexecdir/authlib,' configure
-}
-
-src_compile() {
-
-	local myconf
-	myconf="${myconf} `use_with pam authpam`"
-	myconf="${myconf} `use_with ldap authldap`"
-	myconf="${myconf} `use_with mysql authmysql`"
-	myconf="${myconf} `use_with postgres authpostgresql`"
-	myconf="${myconf} --with-ipv6"
-	use berkdb \
-		&& myconf="${myconf} --with-db=db" \
-		|| myconf="${myconf} --with-db=gdbm"
-
-	if [ -n "${VPOPMAIL_INSTALLED}" ]; then
-		myconf="${myconf} --with-authvchkpw"
-		tmpLDFLAGS="`cat ${VPOPMAIL_DIR}/etc/lib_deps`"
-		LDFLAGS="${LDFLAGS} ${tmpLDFLAGS}"
-		CFLAGS="${CFLAGS} `cat ${VPOPMAIL_DIR}/etc/inc_deps`"
-	else
-		myconf="${myconf} --without-authvchkpw"
-	fi
-
-	if use nls && [ -z "$ENABLE_UNICODE" ]; then
-		myconf="${myconf} --enable-unicode"
-	elif use nls; then
-		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-	else
-		myconf="${myconf} --disable-unicode"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	local cachefile
-	cachefile=${WORKDIR}/config.cache
-	rm -f ${cachefile}
-
-	# fix for bug #21330
-	CFLAGS=`echo ${CFLAGS} | xargs`
-	CXXFLAGS=`echo ${CXXFLAGS} | xargs`
-	LDFLAGS=`echo ${LDFLAGS} | xargs`
-
-	# fix for bug #27528
-	# they really should use a better way to detect redhat
-	myconf="${myconf} --without-redhat"
-
-	# Do the actual build now
-	LDFLAGS="${LDFLAGS}" econf \
-		--disable-root-check \
-		--bindir=/usr/sbin \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier-imap \
-		--libexecdir=/usr/lib/courier-imap \
-		--localstatedir=/var/lib/courier-imap \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
-		--cache-file=${cachefile} \
-		${myconf}
-
-	# change the pem file location..
-	cp imap/imapd-ssl.dist imap/imapd-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		imap/imapd-ssl.dist.old > imap/imapd-ssl.dist
-
-	cp imap/pop3d-ssl.dist imap/pop3d-ssl.dist.old
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		imap/pop3d-ssl.dist.old > imap/pop3d-ssl.dist
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	dodir /var/lib/courier-imap /etc/pam.d
-	make install DESTDIR=${D} || die
-
-	# avoid name collisions in /usr/sbin wrt imapd and pop3d
-	cd ${D}/usr/sbin
-	for name in imapd pop3d
-	do
-		mv ${name} "courier-${name}"
-	done
-
-	# hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	cd ${D}/usr/lib/courier-imap
-	local service
-	for service in imapd pop3d
-	do
-		local type
-		for type in "" "-ssl"
-		do
-			local file
-			file="${service}${type}.rc"
-			cp ${file} ${file}.orig
-			sed -e 's/Maildir/${MAILDIR}/' \
-			    -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				${file}.orig > ${file}
-		done
-	done
-
-	cd ${D}/etc/courier-imap
-	local x
-	for x in pop3d pop3d-ssl imapd imapd-ssl authdaemonrc
-	do
-		mv ${x}.dist ${x}
-	done
-
-	insinto /etc/courier-imap
-	doins ${FILESDIR}/authdaemond.conf
-
-	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
-	for service in imapd pop3d
-	do
-		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
-		echo 'MAILDIR=.maildir' >> ${service}
-		echo -e '#Put any program for ${PRERUN} here' >> ${service}
-		echo 'PRERUN='>> ${service}
-	done
-
-	cd ${D}/usr/sbin
-	for x in *
-	do
-		if [ -L ${x} ]
-		then
-			rm ${x}
-		fi
-	done
-
-	cd ../share
-	mv * ../sbin
-	mv ../sbin/man .
-	cd ..
-
-	rm -f ${D}/usr/sbin/mkimapdcert ${D}/usr/sbin/mkpop3dcert
-	exeinto /usr/sbin
-		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert
-
-	exeinto /etc/init.d
-		newexe ${FILESDIR}/authdaemond.rc6 authdaemond
-		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
-		newexe ${FILESDIR}/courier-imapd-ssl.rc6 courier-imapd-ssl
-		newexe ${FILESDIR}/courier-pop3d.rc6 courier-pop3d
-		newexe ${FILESDIR}/courier-pop3d-ssl.rc6 courier-pop3d-ssl
-
-	exeinto /usr/lib/courier-imap
-		newexe ${FILESDIR}/gentoo-imapd-1.7.3-r1.rc gentoo-imapd.rc
-		newexe ${FILESDIR}/gentoo-imapd-ssl-1.7.3-r1.rc gentoo-imapd-ssl.rc
-		newexe ${FILESDIR}/gentoo-pop3d-1.7.3-r1.rc gentoo-pop3d.rc
-		newexe ${FILESDIR}/gentoo-pop3d-ssl-1.7.3-r1.rc gentoo-pop3d-ssl.rc
-
-	local authmods
-	authmods="authsystem.passwd authcram authshadow authuserdb authpwd authtest authinfo authmksock authcustom authdaemontest"
-	use mysql && authmods="${authmods} authmysql"
-	use postgres && authmods="${authmods} authpgsql"
-	use pam && authmods="${authmods} authpam"
-	use ldap && authmods="${authmods} authldap"
-	[ -n "${VPOPMAIL_INSTALLED}" ] && authmods="${authmods} authvchkpw"
-	exeinto /usr/lib/courier-imap/authlib
-	for i in ${authmods}; do
-		[ -f ${S}/authlib/${i} ] && doexe ${S}/authlib/${i}
-	done;
-
-	dodir /usr/bin
-	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake
-
-	dodoc ${S}/imap/ChangeLog
-
-	keepdir /var/lib/courier-imap/authdaemon
-
-}
-
-pkg_postinst() {
-	# rebuild init deps to include deps on authdaemond
-	/etc/init.d/depscan.sh
-	einfo "Make sure to change /etc/courier-imap/authdaemond.conf if"
-	einfo "you would like to use something other than the"
-	einfo "authdaemond.plain authenticator"
-}
diff --git a/net-mail/courier-imap/files/digest-courier-imap-1.6.2-r1 b/net-mail/courier-imap/files/digest-courier-imap-1.6.2-r1
deleted file mode 100644
index 8910b66aa8bc..000000000000
--- a/net-mail/courier-imap/files/digest-courier-imap-1.6.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 63637738a7810f6f53709a3778062b95 courier-imap-1.6.2.tar.bz2 1202682
diff --git a/net-mail/courier-imap/files/digest-courier-imap-1.7.0 b/net-mail/courier-imap/files/digest-courier-imap-1.7.0
deleted file mode 100644
index 183791bde56c..000000000000
--- a/net-mail/courier-imap/files/digest-courier-imap-1.7.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f74abb58b45810cc485426bc8bad14e6 courier-imap-1.7.0.tar.bz2 1211662
diff --git a/net-mail/courier-imap/files/digest-courier-imap-1.7.1 b/net-mail/courier-imap/files/digest-courier-imap-1.7.1
deleted file mode 100644
index 87109aa7e0c7..000000000000
--- a/net-mail/courier-imap/files/digest-courier-imap-1.7.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ce3a78cabd3d69e4982907de69ecac96 courier-imap-1.7.1.tar.bz2 1217835
diff --git a/net-mail/courier-imap/files/digest-courier-imap-1.7.2 b/net-mail/courier-imap/files/digest-courier-imap-1.7.2
deleted file mode 100644
index 7eddea3aaafb..000000000000
--- a/net-mail/courier-imap/files/digest-courier-imap-1.7.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6b407d7f62636a7926ee79b6e86cbbb1 courier-imap-1.7.2.tar.bz2 1233969
diff --git a/net-mail/courier-imap/files/digest-courier-imap-1.7.3 b/net-mail/courier-imap/files/digest-courier-imap-1.7.3
deleted file mode 100644
index 62ae7d4053ec..000000000000
--- a/net-mail/courier-imap/files/digest-courier-imap-1.7.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 130ec4c5851cb43c70646618b1ee32e8 courier-imap-1.7.3.tar.bz2 1236018
diff --git a/net-mail/courier-imap/files/digest-courier-imap-2.0.0 b/net-mail/courier-imap/files/digest-courier-imap-2.0.0
deleted file mode 100644
index d4dcde3fbf0e..000000000000
--- a/net-mail/courier-imap/files/digest-courier-imap-2.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 636816de2338eac4ad66d9d406020cba courier-imap-2.0.0.tar.bz2 1270992
diff --git a/net-mail/courier-imap/files/digest-courier-imap-2.1.1 b/net-mail/courier-imap/files/digest-courier-imap-2.1.1
deleted file mode 100644
index 58272e9b4885..000000000000
--- a/net-mail/courier-imap/files/digest-courier-imap-2.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 71d9e88053351dbf7df04943189ec1cd courier-imap-2.1.1.tar.bz2 1304426
diff --git a/net-mail/courier-imap/files/digest-courier-imap-2.1.2 b/net-mail/courier-imap/files/digest-courier-imap-2.1.2
deleted file mode 100644
index 3c3d5e57a7a6..000000000000
--- a/net-mail/courier-imap/files/digest-courier-imap-2.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d77ef5d3c90fd0a70b333a44e0ead0a2 courier-imap-2.1.2.tar.bz2 1306638
diff --git a/net-mail/courier-imap/files/gentoo-imapd-1.6.1.rc b/net-mail/courier-imap/files/gentoo-imapd-1.6.1.rc
deleted file mode 100644
index d6045bc0fa8e..000000000000
--- a/net-mail/courier-imap/files/gentoo-imapd-1.6.1.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# $Id: gentoo-imapd-1.6.1.rc,v 1.2 2003/02/18 10:20:24 raker Exp $
-#
-# Copyright 1998 - 2000 Double Precision, Inc.
-# See COPYING for distribution information.
-
-prefix=/usr
-exec_prefix=/usr
-bindir=/usr/sbin
-libexecdir=/usr/lib/courier-imap
-
-source /etc/courier-imap/imapd-ssl
-source /etc/courier-imap/imapd
-
-LIBAUTHMODULES=""
-for f in `echo $AUTHMODULES`
-do
-	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
-done
-
-ulimit -d $IMAP_ULIMITD
-export IMAPDSTARTTLS
-TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL
-eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
-	sed 's/=.*//;s/^/export /;s/$/;/'`
-eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
-	sed 's/=.*//;s/^/export /;s/$/;/'`
-
-/usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
-	-stderrlogger=/usr/lib/courier-imap/courierlogger \
-	-stderrloggername=imapd \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$PIDFILE $TCPDOPTS \
-	$PORT ${exec_prefix}/sbin/imaplogin $LIBAUTHMODULES \
-		/usr/sbin/courier-imapd ${MAILDIR}
diff --git a/net-mail/courier-imap/files/gentoo-imapd-ssl-1.6.1.rc b/net-mail/courier-imap/files/gentoo-imapd-ssl-1.6.1.rc
deleted file mode 100644
index fead207063d9..000000000000
--- a/net-mail/courier-imap/files/gentoo-imapd-ssl-1.6.1.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# $Id: gentoo-imapd-ssl-1.6.1.rc,v 1.1 2002/12/25 11:27:25 raker Exp $
-#
-# Copyright 1998 - 2000 Double Precision, Inc.
-# See COPYING for distribution information.
-
-prefix=/usr
-exec_prefix=/usr
-bindir=/usr/sbin
-libexecdir=/usr/lib/courier-imap
-
-source /etc/courier-imap/imapd
-source /etc/courier-imap/imapd-ssl
-
-LIBAUTHMODULES=""
-for f in `echo $AUTHMODULES`
-do
-	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
-done
-
-ulimit -d $IMAP_ULIMITD
-export IMAP_TLS=1
-eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
-	sed 's/=.*//;s/^/export /;s/$/;/'`
-eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
-	sed 's/=.*//;s/^/export /;s/$/;/'`
-
-/usr/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
-	-stderrlogger=/usr/lib/courier-imap/courierlogger \
-	-stderrloggername=imapd-ssl \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$SSLPIDFILE $TCPDOPTS \
-	$SSLPORT $COURIERTLS -server -tcpd \
-	${exec_prefix}/sbin/imaplogin $LIBAUTHMODULES \
-		/usr/sbin/courier-imapd ${MAILDIR}
diff --git a/net-mail/courier-imap/files/gentoo-pop3d-1.6.1.rc b/net-mail/courier-imap/files/gentoo-pop3d-1.6.1.rc
deleted file mode 100644
index 95d61253dbc5..000000000000
--- a/net-mail/courier-imap/files/gentoo-pop3d-1.6.1.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# $Id: gentoo-pop3d-1.6.1.rc,v 1.2 2003/02/18 10:20:24 raker Exp $
-#
-# Copyright 1998 - 2000 Double Precision, Inc.
-# See COPYING for distribution information.
-
-prefix=/usr
-exec_prefix=/usr
-bindir=/usr/sbin
-libexecdir=/usr/lib/courier-imap
-
-source /etc/courier-imap/pop3d-ssl
-source /etc/courier-imap/pop3d
-
-LIBAUTHMODULES=""
-for f in `echo $AUTHMODULES`
-do
-	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
-done
-
-export POP3DSTARTTLS=$POP3_STARTTLS
-TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL
-eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
-	sed 's/=.*//;s/^/export /;s/$/;/'`
-eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
-	sed 's/=.*//;s/^/export /;s/$/;/'`
-
-/usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
-	-stderrlogger=/usr/lib/courier-imap/courierlogger \
-	-stderrloggername=pop3d \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$PIDFILE $TCPDOPTS \
-	$PORT ${exec_prefix}/sbin/pop3login $LIBAUTHMODULES \
-		/usr/sbin/courier-pop3d ${MAILDIR}
diff --git a/net-mail/courier-imap/files/gentoo-pop3d-ssl-1.6.1.rc b/net-mail/courier-imap/files/gentoo-pop3d-ssl-1.6.1.rc
deleted file mode 100644
index 4c86b61f551f..000000000000
--- a/net-mail/courier-imap/files/gentoo-pop3d-ssl-1.6.1.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# $Id: gentoo-pop3d-ssl-1.6.1.rc,v 1.1 2002/12/25 11:27:25 raker Exp $
-#
-# Copyright 1998 - 2000 Double Precision, Inc.
-# See COPYING for distribution information.
-
-prefix=/usr
-exec_prefix=/usr
-bindir=/usr/sbin
-libexecdir=/usr/lib/courier-imap
-
-source /etc/courier-imap/pop3d
-source /etc/courier-imap/pop3d-ssl
-
-LIBAUTHMODULES=""
-for f in `echo $AUTHMODULES`
-do
-	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
-done
-
-export POP3_TLS=1
-eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
-	sed 's/=.*//;s/^/export /;s/$/;/'`
-eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
-	sed 's/=.*//;s/^/export /;s/$/;/'`
-
-/usr/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
-	-stderrlogger=/usr/lib/courier-imap/courierlogger \
-	-stderrloggername=pop3d-ssl \
-	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-	-pid=$SSLPIDFILE $TCPDOPTS \
-	$SSLPORT $COURIERTLS -server -tcpd \
-	${exec_prefix}/sbin/pop3login $LIBAUTHMODULES \
-		/usr/sbin/courier-pop3d ${MAILDIR}