version bump, fixes 2 minor bugs only

24 files changed, 17 insertions, 1348 deletions

diff --git a/net-mail/courier/ChangeLog b/net-mail/courier/ChangeLog
index 43eef9b60152..8708a3401c4e 100644
--- a/net-mail/courier/ChangeLog
+++ b/net-mail/courier/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-mail/courier
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/ChangeLog,v 1.46 2004/03/08 04:58:22 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/ChangeLog,v 1.47 2004/03/10 05:08:34 iggy Exp $
+
+*courier-0.45.1 (09 Mar 2004)
+
+  09 Mar 2004; Brian Jackson <iggy@gentoo.org> courier-0.44.0.ebuild,
+  courier-0.44.2.20040201.ebuild, courier-0.44.2.ebuild,
+  courier-0.45.0.ebuild, courier-0.45.1.ebuild, files/courier,
+  files/courier-authdaemond, files/courier-esmtpd, files/courier-esmtpd-msa,
+  files/courier-esmtpd-ssl, files/courier-filterd, files/courier-imapd,
+  files/courier-imapd-ssl, files/courier-ldapaliasd, files/courier-mta,
+  files/courier-pop3d, files/courier-pop3d-ssl, files/gentoo.diff.bz2:
+  version bump, fixes 2 minor bugs only
 
 *courier-0.45.0 (07 Mar 2004)
 
diff --git a/net-mail/courier/Manifest b/net-mail/courier/Manifest
index 022b14f70ca0..01d75881669e 100644
--- a/net-mail/courier/Manifest
+++ b/net-mail/courier/Manifest
@@ -1,30 +1,11 @@
-MD5 968aacf2860e8feafebae9bd08cfdce9 courier-0.44.0.ebuild 9990
-MD5 c86c37cfd33f0e5f2cfa0ffa60f4286b courier-0.44.2.20040201.ebuild 10094
-MD5 339d21e11d51b43207b08371c8dea20a courier-0.44.2.ebuild 10169
-MD5 5c47a0bb64b6d3606d8e7ed1187dc92f courier-0.45.0.ebuild 10411
-MD5 966a15185fd9d68402c0cbc1af968134 ChangeLog 7789
+MD5 8b79a4095f91cc564f497b2e24331ab8 courier-0.45.1.ebuild 10417
+MD5 4087c5dabfd3af3dc0b5e7e64c241ede ChangeLog 8343
 MD5 891fa054ac6cfcaee491ccaae9b84a85 metadata.xml 463
 MD5 52f032e570c6f5f9f69b4e4bdfa562a1 files/password.dist 247
 MD5 a546a21f960e4f921e71f614f719a2ce files/bofh 23
-MD5 4d8dd54549ec433b8f32f718a6237e34 files/courier-imapd 461
-MD5 8ca8b5ee0598cd17382e4f65c274ff5f files/courier-pop3d 461
-MD5 4158674068685d72d0aad76c6af90b77 files/courier-ldapaliasd 482
-MD5 b63309f2bf17be5cb075d672ec684328 files/courier-filterd 539
-MD5 5894752137269510abb058eae8378641 files/courier 721
-MD5 ec011cb2fe7e7aff93b9525995616576 files/courier-esmtpd 466
-MD5 aba961cc052d0c255f4e1deb65945153 files/gentoo.diff.bz2 378
-MD5 9c3376db36063d978e30807d84a32cab files/courier-imapd-ssl 481
 MD5 d8967dea60963b1c0abaccbb2c57ea64 files/apache-sqwebmail.inc 347
 MD5 d41d8cd98f00b204e9800998ecf8427e files/locallowercase 0
-MD5 69a536abf75f11f8d362901f7979a780 files/digest-courier-0.44.0 68
-MD5 0b192e51cf2e6e24ffa844e7066e6f30 files/digest-courier-0.44.2 68
-MD5 c0233acf6e4b81d94b9cc983a84f25e1 files/digest-courier-0.45.0 68
+MD5 19f16c534bd7415495e705c2cea53232 files/digest-courier-0.45.1 68
 MD5 30d04ec54ec24553969b1d8feb935a0b files/courier-init 4863
 MD5 e3a4ab031bd750b7ce2c7b85fee83d8e files/set-mime 741
-MD5 6969988ede46945517870edac1a5920b files/courier-esmtpd-msa 468
-MD5 d24325ec89578955cb86a8041ae86212 files/courier-esmtpd-ssl 486
 MD5 4eb96413bfbc91629bdf43526716cd1e files/dot_courier 26
-MD5 f09c83519b337b7d9be0f04a70f1679e files/courier-pop3d-ssl 481
-MD5 b7f6a4e94f89d09acffc72555277043b files/digest-courier-0.44.2.20040201 77
-MD5 c02de408ecf7bdd12569c61eca732e65 files/courier-mta 457
-MD5 5dd03eb2b099ecf757feef2c7d36dfd2 files/courier-authdaemond 481
diff --git a/net-mail/courier/courier-0.44.0.ebuild b/net-mail/courier/courier-0.44.0.ebuild
deleted file mode 100644
index 0cd7f293ed71..000000000000
--- a/net-mail/courier/courier-0.44.0.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /home/cvsroot/gentoo-x86/net-mail/courier/courier-0.41.0.ebuild
-
-inherit flag-o-matic eutils
-
-filter-flags -fomit-frame-pointer
-filter-flags -funroll-loops
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 -ppc -sparc ~ia64 -amd64"
-IUSE="tcltk postgres ldap mysql pam nls tcltk ipv6 spell fax crypt"
-
-PROVIDE="virtual/mta
-	 virtual/imapd"
-
-RDEPEND="virtual/glibc
-	>=dev-libs/openssl-0.9.6
-	>=sys-libs/gdbm-1.8.0
-	crypt? ( >=app-crypt/gnupg-1.0.4 )
-	fax? (	>=media-libs/netpbm-9.12
-		virtual/ghostscript
-		>=net-dialup/mgetty-1.1.28 )
-	pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( >=dev-db/mysql-3.23.36 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1.3 )
-	spell? ( virtual/aspell-dict )
-	!virtual/imapd"
-
-	# Removed these from RDEP until the tcltk situation is clarified.
-	# They are only necessary for non-virtual users to be able to change
-	# passwords via webmail. Hopefully not a highly used feature.
-	#>=dev-tcltk/expect-5.33.0
-	#tcltk? ( >=dev-tcltk/expect-5.33.0 )
-
-DEPEND="${RDEPEND}
-	app-admin/fam
-	dev-lang/perl
-	sys-apps/procps"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	epatch ${FILESDIR}/gentoo.diff.bz2
-}
-
-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 ipv6 || myconf="${myconf} --without-ipv6"
-	use spell \
-		&& myconf="${myconf} --with-ispell" \
-		|| myconf="${myconf} --without-ispell"
-
-	if [ -f /var/vpopmail/etc/lib_deps ]; then
-		myconf="${myconf} --with-authvchkpw"
-	else
-		myconf="${myconf} --without-authvchkpw"
-	fi
-
-	#
-	# 1. If nls is enabled and ENABLE_UNICODE is not empty...
-	#    enable the specified unicode sets
-	# 2. If nls is enabled and no unicode sets are specified,
-	#    enable them all
-	# 3. If nls is disabled, disable unicode sets
-	#
-	if use nls && [ ! -z "$ENABLE_UNICODE" ]; then
-		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-	elif use nls; then
-		myconf="${myconf} --enable-unicode"
-	else
-		myconf="${myconf} --disable-unicode"
-	fi
-
-	myconf="${myconf} debug=true"
-
-	./configure \
-		--prefix=/usr \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier \
-		--libexecdir=/usr/lib/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 \
-		--disable-autorenamesent \
-		--with-db=gdbm \
-		--enable-mimetypes=/etc/apache/conf/mime.types \
-		--enable-workarounds-for-imap-client-bugs \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	emake || die "Compile problem"
-}
-
-chg_cfg() {
-	file=${1}
-	key=${2}
-	value=${3}
-
-	echo "changing ${file}: ${key} to ${value}"
-	sed -e "/\#\#NAME: ${key}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file} > ${file}.tmp && chmod --reference ${file} ${file}.tmp && mv ${file}.tmp ${file}
-	rm -f ${f}.tmp 1>/dev/null 2>&1
-}
-
-set_mime() {
-	local files=$*
-
-	chk_badmime='##NAME: BOFHBADMIME:0'
-	pos_badmime='##NAME: NOADDMSGID:0'
-	ins_badmime='\
-##NAME: BOFHBADMIME:0\
-#\
-# set BOFHBADMIME\
-#   to \"reject\" to return mail with invalid MIME header\
-#   to \"wrap\" to wrap mail with invalid MIME header in an attachmant\
-#   to \"accept\" to pass mail with invalid MIME header untouched\
-\
-BOFHBADMIME=accept\
-'
-
-	local f
-	for f in ${files}
-	do
-		if ! grep -q "${chk_badmime}" ${f}
-		then
-			echo "adding parameter ${chk_badmime} to ${f}"
-			sed -e"/${pos_badmime}/ i ${ins_badmime}" ${f} > ${f}.tmp && chmod --reference ${f} ${f}.tmp && mv -f ${f}.tmp ${f}
-			rm -f ${f}.tmp 1>/dev/null 2>&1
-		fi
-	done
-}
-
-set_maildir() {
-	local files=$*
-
-	origmaildir='Maildir'
-	newmaildir='.maildir'
-
-	local f
-	for f in ${files}
-	do
-		echo "changing ${origmaildir} in ${f} to ${newmaildir}"
-		sed -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f} > ${f}.tmp && chmod --reference ${f} ${f}.tmp && mv -f ${f}.tmp ${f}
-		rm -f ${f}.tmp 1> /dev/null 2>&1
-	done
-}
-
-src_install() {
-	dodir /var/lib/courier
-	dodir /etc/pam.d
-	make install DESTDIR=${D} || die
-	# fix bug #15873 bad owner on /var/run/courier
-	diropts -o mail -g mail
-	keepdir /var/run/courier
-	# make install creates a ton of dirs that we want to keep
-	# and we don't want to run keepdir 900 times
-	#find ${D} -type d -exec touch {}/.keep \;
-	for dir2keep in `(cd ${D} && find . -type d)` ; do
-		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
-	done
-
-	local f
-	cd ${D}/etc/courier
-	mv imapd.authpam imap.authpam
-	mv pop3d.authpam pop3.authpam
-	for f in *.authpam
-	do
-		cp "${f}" "${D}/etc/pam.d/${f%%.authpam}"
-	done
-
-	exeinto /etc/init.d
-	# we install the new single init script as courier
-	newexe ${FILESDIR}/courier-init courier
-	# and install the old main init script as courier-old if the old one
-	# is installed which it will be now, but for the future...
-	`grep DAEMONLIST /etc/init.d/courier >&/dev/null` && \
-		newexe ${FILESDIR}/courier courier-old
-	# the rest of them don't need to be installed
-
-	einfo "Setting up maildirs by default in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	insinto /etc/skel
-	${D}/usr/bin/maildirmake ${D}/etc/skel/.maildir
-	# we're going to try this out for a while -20031107
-	#newins ${FILESDIR}/dot_courier .courier
-	#fperms 644 /etc/skel/.courier
-	${D}/usr/bin/maildirmake ${D}/var/spool/mail/.maildir
-	insinto /etc/courier
-	newins ${FILESDIR}/bofh bofh
-	newins ${FILESDIR}/locallowercase locallowercase
-	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-	echo 0 > ${D}/etc/courier/sizelimit
-
-	cd ${S}
-	dodoc AUTHORS BENCHMARKS ChangeLog* NEWS README TODO
-	dodoc authlib/README.authmysql.myownquery authlib/README.ldap courier/doc/*.txt
-	echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \
-		>>${D}/usr/share/doc/${P}/README.htmldocs
-
-	# See bug #10574
-	# file which describes the webadmin password file
-	insinto /etc/courier/webadmin
-	insopts -m 400 -o mail -g mail
-	doins ${FILESDIR}/password.dist
-
-	# fixes bug #25028 courier doesn't symlink sendmail to /usr/sbin
-	dosym /usr/bin/sendmail /usr/sbin/sendmail
-}
-
-pkg_preinst() {
-	# avoid name collisions in /usr/sbin
-	local y
-	cd ${D}/usr/share/courier
-	set_maildir imapd imapd-ssl pop3d pop3d-ssl
-
-	cd ${D}/usr/sbin
-	for y in imapd imapd-ssl pop3d pop3d-ssl
-	do
-		mv ${y} courier-${y}
-	done
-
-	cd ${D}/etc/courier
-	for y in *.dist
-	do
-		cp ${y} ${y%%.dist}
-	done
-	touch esmtproutes
-	touch backuprelay
-	touch maildroprc
-	chown mail:root ldapaliasrc
-	chg_cfg imapd-ssl COURIERTLS /usr/bin/couriertls
-	chg_cfg authdaemonrc authmodulelist authpam
-	chg_cfg authdaemonrc version authdaemond.plain
-	set_mime esmtpd esmtpd-ssl esmtpd-msa
-	set_maildir courierd
-}
-
-pkg_postinst() {
-	cd ${S}
-	make install-configure
-
-	# fixes bug #15873 for upgrades, should be able to yank this sometime in
-	# the future
-	chown --recursive mail:mail ${ROOT}/var/run/courier
-
-	# need to do this for new installs to be able to start courier
-	# without having to run rc-update ...
-	# NOTE: not needed with new portages, but I'll leave it for a while for
-	# old portages
-	/etc/init.d/depscan.sh
-
-	einfo "The following command will setup courier for you system:"
-	einfo "ebuild /var/db/pkg/${CATEGORY}/${PN}-${PV}/${PN}-${PV}.ebuild config"
-	echo
-	einfo "To enable webmail/webadmin, run the following commands:"
-	einfo "$ echo \"Include /etc/courier/apache-sqwebmail.inc\" >> /etc/apache*/conf/apache.conf"
-	einfo "$ chmod a+rx /usr/lib/courier/courier/webmail"
-	einfo "Then visit: http(s)://localhost/courier/webmail"
-	echo
-	einfo "imap behavior has changed, you may need to have you imap clients logoff"
-	einfo "and back on again"
-	echo
-	echo
-	ewarn "The init scripts for courier have changed."
-	ewarn "There is now one init script (/etc/init.d/courier). The rest"
-	ewarn "are obsolete. You can remove /etc/init.d/courier-*. You also"
-	ewarn "need to edit the following files in /etc/courier to enable"
-	ewarn "the different services:"
-	ewarn "imapd"
-	ewarn "imapd-ssl"
-	ewarn "pop3d"
-	ewarn "pop3d-ssl"
-	ewarn "esmtpd"
-	ewarn "esmtpd-msa"
-	ewarn "esmtpd-ssl"
-	ewarn "hint: look for a line at the bottom of the file that looks like so"
-	ewarn "ESMTPDSTART=NO"
-	ewarn "and change it to YES for the services that you use"
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 1
-}
-
-pkg_config() {
-	mailhost=`hostname`
-	export mailhost
-
-	domainname=`echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/"`
-	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/net-mail/courier/courier-0.44.2.20040201.ebuild b/net-mail/courier/courier-0.44.2.20040201.ebuild
deleted file mode 100644
index 76d7ee82e0d3..000000000000
--- a/net-mail/courier/courier-0.44.2.20040201.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /home/cvsroot/gentoo-x86/net-mail/courier/courier-0.41.0.ebuild
-
-#inherit flag-o-matic eutils
-
-#filter-flags -fomit-frame-pointer
-#filter-flags -funroll-loops
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-SRC_URI="http://www.courier-mta.org/beta/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt"
-
-PROVIDE="virtual/mta
-	 virtual/imapd"
-
-DEPEND="virtual/glibc
-	>=dev-libs/openssl-0.9.6
-	>=sys-libs/gdbm-1.8.0
-	>=dev-tcltk/expect-5.33.0
-	crypt? ( >=app-crypt/gnupg-1.0.4 )
-	fax? (	>=media-libs/netpbm-9.12
-		virtual/ghostscript
-		>=net-dialup/mgetty-1.1.28 )
-	pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( >=dev-db/mysql-3.23.36 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1.3 )
-	spell? ( virtual/aspell-dict )
-	!virtual/imapd"
-
-RDEPEND="${DEPEND}
-	app-admin/fam
-	dev-lang/perl
-	sys-apps/procps"
-
-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 ipv6 || myconf="${myconf} --without-ipv6"
-	use spell \
-		&& myconf="${myconf} --with-ispell" \
-		|| myconf="${myconf} --without-ispell"
-
-	if [ -f /var/vpopmail/etc/lib_deps ]; then
-		myconf="${myconf} --with-authvchkpw"
-	else
-		myconf="${myconf} --without-authvchkpw"
-	fi
-
-	#
-	# 1. If nls is enabled and ENABLE_UNICODE is not empty...
-	#    enable the specified unicode sets
-	# 2. If nls is enabled and no unicode sets are specified,
-	#    enable them all
-	# 3. If nls is disabled, disable unicode sets
-	#
-	if use nls && [ ! -z "$ENABLE_UNICODE" ]; then
-		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-	elif use nls; then
-		myconf="${myconf} --enable-unicode"
-	else
-		myconf="${myconf} --disable-unicode"
-	fi
-
-	myconf="${myconf} debug=true"
-
-	./configure \
-		--prefix=/usr \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier \
-		--libexecdir=/usr/lib/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 \
-		--disable-autorenamesent \
-		--with-db=gdbm \
-		--enable-mimetypes=/etc/apache/conf/mime.types \
-		--enable-workarounds-for-imap-client-bugs \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	emake || die "Compile problem"
-}
-
-chg_cfg() {
-	file=${1}
-	key=${2}
-	value=${3}
-
-	echo "changing ${file}: ${key} to ${value}"
-	sed -e "/\#\#NAME: ${key}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file} > ${file}.tmp && chmod --reference ${file} ${file}.tmp && mv ${file}.tmp ${file}
-	rm -f ${f}.tmp 1>/dev/null 2>&1
-}
-
-set_mime() {
-	local files=$*
-
-	chk_badmime='##NAME: BOFHBADMIME:0'
-	pos_badmime='##NAME: NOADDMSGID:0'
-	ins_badmime='\
-##NAME: BOFHBADMIME:0\
-#\
-# set BOFHBADMIME\
-#   to \"reject\" to return mail with invalid MIME header\
-#   to \"wrap\" to wrap mail with invalid MIME header in an attachmant\
-#   to \"accept\" to pass mail with invalid MIME header untouched\
-\
-BOFHBADMIME=accept\
-'
-
-	local f
-	for f in ${files}
-	do
-		if ! grep -q "${chk_badmime}" ${f}
-		then
-			echo "adding parameter ${chk_badmime} to ${f}"
-			sed -e"/${pos_badmime}/ i ${ins_badmime}" ${f} > ${f}.tmp && chmod --reference ${f} ${f}.tmp && mv -f ${f}.tmp ${f}
-			rm -f ${f}.tmp 1>/dev/null 2>&1
-		fi
-	done
-}
-
-set_maildir() {
-	local files=$*
-
-	origmaildir='Maildir'
-	newmaildir='.maildir'
-
-	local f
-	for f in ${files}
-	do
-		echo "changing ${origmaildir} in ${f} to ${newmaildir}"
-		sed -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f} > ${f}.tmp && chmod --reference ${f} ${f}.tmp && mv -f ${f}.tmp ${f}
-		rm -f ${f}.tmp 1> /dev/null 2>&1
-	done
-}
-
-src_install() {
-	dodir /var/lib/courier
-	dodir /etc/pam.d
-	make install DESTDIR=${D} || die
-	# fix bug #15873 bad owner on /var/run/courier
-	diropts -o mail -g mail
-	for dir2keep in `(cd ${D} && find . -type d)` ; do
-		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
-	done
-
-	local f
-	cd ${D}/etc/courier
-	mv imapd.authpam imap.authpam
-	mv pop3d.authpam pop3.authpam
-	for f in *.authpam
-	do
-		cp "${f}" "${D}/etc/pam.d/${f%%.authpam}"
-	done
-
-	exeinto /etc/init.d
-	# we install the new single init script as courier
-	newexe ${FILESDIR}/courier-init courier
-	# and install the old main init script as courier-old if the old one
-	# is installed which it will be now, but for the future...
-	`grep DAEMONLIST /etc/init.d/courier >&/dev/null` && \
-		newexe ${FILESDIR}/courier courier-old
-	# the rest of them don't need to be installed
-
-	einfo "Setting up maildirs by default in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	keepdir /etc/skel
-	${D}/usr/bin/maildirmake ${D}/etc/skel/.maildir
-	# we're going to try this out for a while -20031107
-	#newins ${FILESDIR}/dot_courier .courier
-	#fperms 644 /etc/skel/.courier
-	keepdir /var/spool/mail
-	${D}/usr/bin/maildirmake ${D}/var/spool/mail/.maildir
-	insinto /etc/courier
-	newins ${FILESDIR}/bofh bofh
-	newins ${FILESDIR}/locallowercase locallowercase
-	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-	echo 0 > ${D}/etc/courier/sizelimit
-
-	cd ${S}
-	dodoc AUTHORS BENCHMARKS ChangeLog* NEWS README TODO
-	dodoc authlib/README.authmysql.myownquery authlib/README.ldap courier/doc/*.txt
-	echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \
-		>>${D}/usr/share/doc/${P}/README.htmldocs
-
-	# See bug #10574
-	# file which describes the webadmin password file
-	insinto /etc/courier/webadmin
-	insopts -m 400 -o mail -g mail
-	doins ${FILESDIR}/password.dist
-
-	# fixes bug #25028 courier doesn't symlink sendmail to /usr/sbin
-	dosym /usr/bin/sendmail /usr/sbin/sendmail
-
-	echo "MAILDIR=\$HOME/.maildir" >> ${D}/etc/courier/courierd
-
-	# we change the names of the binaries, but webadmin is still looking
-	# for the old names
-	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"
-
-}
-
-pkg_preinst() {
-	# avoid name collisions in /usr/sbin
-	local y
-	cd ${D}/usr/share/courier
-	set_maildir imapd imapd-ssl pop3d pop3d-ssl
-
-	cd ${D}/usr/sbin
-	for y in imapd imapd-ssl pop3d pop3d-ssl
-	do
-		mv ${y} courier-${y}
-	done
-
-	cd ${D}/etc/courier
-	for y in *.dist
-	do
-		cp ${y} ${y%%.dist}
-	done
-	touch esmtproutes
-	touch backuprelay
-	touch maildroprc
-	chown mail:root ldapaliasrc
-	chg_cfg imapd-ssl COURIERTLS /usr/bin/couriertls
-	chg_cfg authdaemonrc authmodulelist authpam
-	chg_cfg authdaemonrc version authdaemond.plain
-	set_mime esmtpd esmtpd-ssl esmtpd-msa
-	set_maildir courierd
-}
-
-pkg_postinst() {
-	cd ${S}
-	make install-configure
-
-	# fixes bug #15873 for upgrades, should be able to yank this sometime in
-	# the future
-	chown --recursive mail:mail ${ROOT}/var/run/courier
-
-	# need to do this for new installs to be able to start courier
-	# without having to run rc-update ...
-	# NOTE: not needed with new portages, but I'll leave it for a while for
-	# old portages
-	/etc/init.d/depscan.sh
-
-	einfo "The following command will setup courier for your system:"
-	einfo "ebuild /var/db/pkg/${CATEGORY}/${PN}-${PV}/${PN}-${PV}.ebuild config"
-	echo
-	einfo "To enable webmail/webadmin, run the following commands:"
-	einfo "$ echo \"Include /etc/courier/apache-sqwebmail.inc\" >> /etc/apache*/conf/apache.conf"
-	einfo "$ chmod a+rx /usr/lib/courier/courier/webmail"
-	einfo "Then visit: http(s)://localhost/courier/webmail"
-	echo
-	einfo "imap behavior has changed, you may need to have your imap clients logoff"
-	einfo "and back on again"
-	echo
-	echo
-	ewarn "The init scripts for courier have changed."
-	ewarn "There is now one init script (/etc/init.d/courier). The rest"
-	ewarn "are obsolete. You can remove /etc/init.d/courier-*. You also"
-	ewarn "need to edit the following files in /etc/courier to enable"
-	ewarn "the different services:"
-	ewarn "imapd"
-	ewarn "imapd-ssl"
-	ewarn "pop3d"
-	ewarn "pop3d-ssl"
-	ewarn "esmtpd"
-	ewarn "esmtpd-msa"
-	ewarn "esmtpd-ssl"
-	ewarn "hint: look for a line at the bottom of the file that looks like so"
-	ewarn "ESMTPDSTART=NO"
-	ewarn "and change it to YES for the services that you use"
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 1
-}
-
-pkg_config() {
-	mailhost=`hostname`
-	export mailhost
-
-	domainname=`echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/"`
-	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/net-mail/courier/courier-0.44.2.ebuild b/net-mail/courier/courier-0.44.2.ebuild
deleted file mode 100644
index 595ccfb968b3..000000000000
--- a/net-mail/courier/courier-0.44.2.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /home/cvsroot/gentoo-x86/net-mail/courier/courier-0.41.0.ebuild
-
-inherit flag-o-matic eutils
-
-filter-flags -fomit-frame-pointer
-filter-flags -funroll-loops
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 -ppc -sparc -amd64 ~ia64 ~alpha"
-IUSE="tcltk postgres ldap mysql pam nls tcltk ipv6 spell fax crypt"
-
-PROVIDE="virtual/mta
-	 virtual/imapd"
-
-RDEPEND="virtual/glibc
-	>=dev-libs/openssl-0.9.6
-	>=sys-libs/gdbm-1.8.0
-	crypt? ( >=app-crypt/gnupg-1.0.4 )
-	fax? (	>=media-libs/netpbm-9.12
-		virtual/ghostscript
-		>=net-dialup/mgetty-1.1.28 )
-	pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( >=dev-db/mysql-3.23.36 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1.3 )
-	spell? ( virtual/aspell-dict )
-	!virtual/imapd"
-
-	# Removed these from RDEP until the tcltk situation is clarified.
-	# They are only necessary for non-virtual users to be able to change
-	# passwords via webmail. Hopefully not a highly used feature.
-	#>=dev-tcltk/expect-5.33.0
-	#tcltk? ( >=dev-tcltk/expect-5.33.0 )
-
-DEPEND="${RDEPEND}
-	app-admin/fam
-	dev-lang/perl
-	sys-apps/procps"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	epatch ${FILESDIR}/gentoo.diff.bz2
-
-	# this is needed for borkeness of configure script
-	sed -i -e s:rootcheck\=\"yes\":rootcheck\=\"no\": \
-		-e s:rootcheck\=\"\$withval\":rootcheck\=\"no\": \
-		configure
-
-}
-
-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 ipv6 || myconf="${myconf} --without-ipv6"
-	use spell \
-		&& myconf="${myconf} --with-ispell" \
-		|| myconf="${myconf} --without-ispell"
-
-	if [ -f /var/vpopmail/etc/lib_deps ]; then
-		myconf="${myconf} --with-authvchkpw"
-	else
-		myconf="${myconf} --without-authvchkpw"
-	fi
-
-	#
-	# 1. If nls is enabled and ENABLE_UNICODE is not empty...
-	#    enable the specified unicode sets
-	# 2. If nls is enabled and no unicode sets are specified,
-	#    enable them all
-	# 3. If nls is disabled, disable unicode sets
-	#
-	if use nls && [ ! -z "$ENABLE_UNICODE" ]; then
-		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
-	elif use nls; then
-		myconf="${myconf} --enable-unicode"
-	else
-		myconf="${myconf} --disable-unicode"
-	fi
-
-	myconf="${myconf} debug=true"
-
-	./configure \
-		--prefix=/usr \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier \
-		--libexecdir=/usr/lib/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 \
-		--disable-autorenamesent \
-		--with-db=gdbm \
-		--enable-mimetypes=/etc/apache/conf/mime.types \
-		--enable-workarounds-for-imap-client-bugs \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	emake || die "Compile problem"
-}
-
-chg_cfg() {
-	file=${1}
-	key=${2}
-	value=${3}
-
-	echo "changing ${file}: ${key} to ${value}"
-	sed -e "/\#\#NAME: ${key}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file} > ${file}.tmp && chmod --reference ${file} ${file}.tmp && mv ${file}.tmp ${file}
-	rm -f ${f}.tmp 1>/dev/null 2>&1
-}
-
-set_mime() {
-	local files=$*
-
-	chk_badmime='##NAME: BOFHBADMIME:0'
-	pos_badmime='##NAME: NOADDMSGID:0'
-	ins_badmime='\
-##NAME: BOFHBADMIME:0\
-#\
-# set BOFHBADMIME\
-#   to \"reject\" to return mail with invalid MIME header\
-#   to \"wrap\" to wrap mail with invalid MIME header in an attachmant\
-#   to \"accept\" to pass mail with invalid MIME header untouched\
-\
-BOFHBADMIME=accept\
-'
-
-	local f
-	for f in ${files}
-	do
-		if ! grep -q "${chk_badmime}" ${f}
-		then
-			echo "adding parameter ${chk_badmime} to ${f}"
-			sed -e"/${pos_badmime}/ i ${ins_badmime}" ${f} > ${f}.tmp && chmod --reference ${f} ${f}.tmp && mv -f ${f}.tmp ${f}
-			rm -f ${f}.tmp 1>/dev/null 2>&1
-		fi
-	done
-}
-
-set_maildir() {
-	local files=$*
-
-	origmaildir='Maildir'
-	newmaildir='.maildir'
-
-	local f
-	for f in ${files}
-	do
-		echo "changing ${origmaildir} in ${f} to ${newmaildir}"
-		sed -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f} > ${f}.tmp && chmod --reference ${f} ${f}.tmp && mv -f ${f}.tmp ${f}
-		rm -f ${f}.tmp 1> /dev/null 2>&1
-	done
-}
-
-src_install() {
-	dodir /var/lib/courier
-	dodir /etc/pam.d
-	make install DESTDIR=${D} || die
-	# fix bug #15873 bad owner on /var/run/courier
-	diropts -o mail -g mail
-	keepdir /var/run/courier
-	# make install creates a ton of dirs that we want to keep
-	# and we don't want to run keepdir 900 times
-	#find ${D} -type d -exec touch {}/.keep \;
-	for dir2keep in `(cd ${D} && find . -type d)` ; do
-		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
-	done
-
-	local f
-	cd ${D}/etc/courier
-	mv imapd.authpam imap.authpam
-	mv pop3d.authpam pop3.authpam
-	for f in *.authpam
-	do
-		cp "${f}" "${D}/etc/pam.d/${f%%.authpam}"
-	done
-
-	exeinto /etc/init.d
-	# we install the new single init script as courier
-	newexe ${FILESDIR}/courier-init courier
-	# and install the old main init script as courier-old if the old one
-	# is installed which it will be now, but for the future...
-	`grep DAEMONLIST /etc/init.d/courier >&/dev/null` && \
-		newexe ${FILESDIR}/courier courier-old
-	# the rest of them don't need to be installed
-
-	einfo "Setting up maildirs by default in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	insinto /etc/skel
-	${D}/usr/bin/maildirmake ${D}/etc/skel/.maildir
-	# we're going to try this out for a while -20031107
-	#newins ${FILESDIR}/dot_courier .courier
-	#fperms 644 /etc/skel/.courier
-	${D}/usr/bin/maildirmake ${D}/var/spool/mail/.maildir
-	insinto /etc/courier
-	newins ${FILESDIR}/bofh bofh
-	newins ${FILESDIR}/locallowercase locallowercase
-	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-	echo 0 > ${D}/etc/courier/sizelimit
-
-	cd ${S}
-	dodoc AUTHORS BENCHMARKS ChangeLog* NEWS README TODO
-	dodoc authlib/README.authmysql.myownquery authlib/README.ldap courier/doc/*.txt
-	echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \
-		>>${D}/usr/share/doc/${P}/README.htmldocs
-
-	# See bug #10574
-	# file which describes the webadmin password file
-	insinto /etc/courier/webadmin
-	insopts -m 400 -o mail -g mail
-	doins ${FILESDIR}/password.dist
-
-	# fixes bug #25028 courier doesn't symlink sendmail to /usr/sbin
-	dosym /usr/bin/sendmail /usr/sbin/sendmail
-}
-
-pkg_preinst() {
-	# avoid name collisions in /usr/sbin
-	local y
-	cd ${D}/usr/share/courier
-	set_maildir imapd imapd-ssl pop3d pop3d-ssl
-
-	cd ${D}/usr/sbin
-	for y in imapd imapd-ssl pop3d pop3d-ssl
-	do
-		mv ${y} courier-${y}
-	done
-
-	cd ${D}/etc/courier
-	for y in *.dist
-	do
-		cp ${y} ${y%%.dist}
-	done
-	touch esmtproutes
-	touch backuprelay
-	touch maildroprc
-	chown mail:root ldapaliasrc
-	chg_cfg imapd-ssl COURIERTLS /usr/bin/couriertls
-	chg_cfg authdaemonrc authmodulelist authpam
-	chg_cfg authdaemonrc version authdaemond.plain
-	set_mime esmtpd esmtpd-ssl esmtpd-msa
-	set_maildir courierd
-}
-
-pkg_postinst() {
-	cd ${S}
-	make install-configure
-
-	# fixes bug #15873 for upgrades, should be able to yank this sometime in
-	# the future
-	chown --recursive mail:mail ${ROOT}/var/run/courier
-
-	# need to do this for new installs to be able to start courier
-	# without having to run rc-update ...
-	# NOTE: not needed with new portages, but I'll leave it for a while for
-	# old portages
-	/etc/init.d/depscan.sh
-
-	einfo "The following command will setup courier for you system:"
-	einfo "ebuild /var/db/pkg/${CATEGORY}/${PN}-${PV}/${PN}-${PV}.ebuild config"
-	echo
-	einfo "To enable webmail/webadmin, run the following commands:"
-	einfo "$ echo \"Include /etc/courier/apache-sqwebmail.inc\" >> /etc/apache*/conf/apache.conf"
-	einfo "$ chmod a+rx /usr/lib/courier/courier/webmail"
-	einfo "Then visit: http(s)://localhost/courier/webmail"
-	echo
-	einfo "imap behavior has changed, you may need to have you imap clients logoff"
-	einfo "and back on again"
-	echo
-	echo
-	ewarn "The init scripts for courier have changed."
-	ewarn "There is now one init script (/etc/init.d/courier). The rest"
-	ewarn "are obsolete. You can remove /etc/init.d/courier-*. You also"
-	ewarn "need to edit the following files in /etc/courier to enable"
-	ewarn "the different services:"
-	ewarn "imapd"
-	ewarn "imapd-ssl"
-	ewarn "pop3d"
-	ewarn "pop3d-ssl"
-	ewarn "esmtpd"
-	ewarn "esmtpd-msa"
-	ewarn "esmtpd-ssl"
-	ewarn "hint: look for a line at the bottom of the file that looks like so"
-	ewarn "ESMTPDSTART=NO"
-	ewarn "and change it to YES for the services that you use"
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 1
-}
-
-pkg_config() {
-	mailhost=`hostname`
-	export mailhost
-
-	domainname=`echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/"`
-	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/net-mail/courier/courier-0.45.0.ebuild b/net-mail/courier/courier-0.45.1.ebuild
index dd4d8df516b9..2aee306a0a39 100644
--- a/net-mail/courier/courier-0.45.0.ebuild
+++ b/net-mail/courier/courier-0.45.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.courier-mta.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~alpha"
 IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt"
 
 PROVIDE="virtual/mta
diff --git a/net-mail/courier/files/courier b/net-mail/courier/files/courier
deleted file mode 100644
index fe31e46d95b0..000000000000
--- a/net-mail/courier/files/courier
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/files/courier,v 1.5 2004/03/06 03:15:17 vapier Exp $
-
-DAEMONLIST="courier-authdaemond courier-filterd courier-mta courier-esmtpd courier-esmtpd-ssl courier-imapd courier-imapd-ssl courier-pop3d courier-pop3d-ssl"
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting Courier MTA"
-	for d in $DAEMONLIST
-	do
-		[ -f /mnt/.init.d/started/$d ] || /etc/init.d/$d start || true
-	done
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Courier MTA"
-	for d in $DAEMONLIST
-	do
-		[ -f /mnt/.init.d/started/$d ] && /etc/init.d/$d stop || true
-	done
-	eend $?
-}
diff --git a/net-mail/courier/files/courier-authdaemond b/net-mail/courier/files/courier-authdaemond
deleted file mode 100644
index 4c06c8effd0a..000000000000
--- a/net-mail/courier/files/courier-authdaemond
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/files/courier-authdaemond,v 1.4 2004/03/06 03:15:17 vapier Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting courier authdaemon"
-	/usr/lib/courier/authlib/authdaemond start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier authdaemon"
-	/usr/lib/courier/authlib/authdaemond stop
-	eend $?
-}
diff --git a/net-mail/courier/files/courier-esmtpd b/net-mail/courier/files/courier-esmtpd
deleted file mode 100644
index 79a9ffbf7908..000000000000
--- a/net-mail/courier/files/courier-esmtpd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/files/courier-esmtpd,v 1.4 2004/03/06 03:15:17 vapier Exp $
-
-depend() {
-	need net courier-authdaemond
-}
-
-start() {
-	ebegin "Starting courier esmtpd"
-	/usr/share/courier/esmtpd start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier esmtpd"
-	/usr/share/courier/esmtpd stop
-	eend $?
-}
diff --git a/net-mail/courier/files/courier-esmtpd-msa b/net-mail/courier/files/courier-esmtpd-msa
deleted file mode 100644
index 80fbfc58b416..000000000000
--- a/net-mail/courier/files/courier-esmtpd-msa
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/files/courier-esmtpd-msa,v 1.4 2004/03/06 03:15:17 vapier Exp $
-
-depend() {
-	need net courier-authdaemond
-}
-
-start() {
-	ebegin "Starting courier esmtpd-msa"
-	/usr/sbin/esmtpd-msa start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier esmtpd-msa"
-	/usr/sbin/esmtpd-msa stop
-	eend $?
-}
diff --git a/net-mail/courier/files/courier-esmtpd-ssl b/net-mail/courier/files/courier-esmtpd-ssl
deleted file mode 100644
index 51019731cfe9..000000000000
--- a/net-mail/courier/files/courier-esmtpd-ssl
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/files/courier-esmtpd-ssl,v 1.4 2004/03/06 03:15:17 vapier Exp $
-
-depend() {
-	need net courier-authdaemond
-}
-
-start() {
-	ebegin "Starting courier esmtpd-ssl"
-	/usr/share/courier/esmtpd-ssl start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier esmtpd-ssl"
-	/usr/share/courier/esmtpd-ssl stop
-	eend $?
-}
diff --git a/net-mail/courier/files/courier-filterd b/net-mail/courier/files/courier-filterd
deleted file mode 100644
index b4755e51aacb..000000000000
--- a/net-mail/courier/files/courier-filterd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/files/courier-filterd,v 1.3 2004/03/06 03:15:17 vapier Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting courier filterd"
-	/usr/sbin/courierfilter start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier filterd"
-	/usr/sbin/courierfilter stop
-	eend $?
-}
-
-restart() {
-	ebegin "Restarting courier filterd"
-	/usr/sbin/courierfilter restart
-	eend $?
-}
diff --git a/net-mail/courier/files/courier-imapd b/net-mail/courier/files/courier-imapd
deleted file mode 100644
index b831ddea8827..000000000000
--- a/net-mail/courier/files/courier-imapd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/files/courier-imapd,v 1.4 2004/03/06 03:15:17 vapier Exp $
-
-depend() {
-	need net courier-authdaemond
-}
-
-start() {
-	ebegin "Starting courier imapd"
-	/usr/share/courier/imapd start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier imapd"
-	/usr/share/courier/imapd stop
-	eend $?
-}
diff --git a/net-mail/courier/files/courier-imapd-ssl b/net-mail/courier/files/courier-imapd-ssl
deleted file mode 100644
index e3658267fcf2..000000000000
--- a/net-mail/courier/files/courier-imapd-ssl
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/files/courier-imapd-ssl,v 1.4 2004/03/06 03:15:17 vapier Exp $
-
-depend() {
-	need net courier-authdaemond
-}
-
-start() {
-	ebegin "Starting courier imapd-ssl"
-	/usr/share/courier/imapd-ssl start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier imapd-ssl"
-	/usr/share/courier/imapd-ssl stop
-	eend $?
-}
diff --git a/net-mail/courier/files/courier-ldapaliasd b/net-mail/courier/files/courier-ldapaliasd
deleted file mode 100644
index cec8cae78084..000000000000
--- a/net-mail/courier/files/courier-ldapaliasd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/files/courier-ldapaliasd,v 1.3 2004/03/06 03:15:17 vapier Exp $
-
-depend() {
-	need net courier-authdaemond
-}
-
-start() {
-	ebegin "Starting courier ldapaliasd"
-	/usr/sbin/courierldapaliasd start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier ldapaliasd"
-	/usr/sbin/courierldapaliasd stop
-	eend $?
-}
diff --git a/net-mail/courier/files/courier-mta b/net-mail/courier/files/courier-mta
deleted file mode 100644
index ee40567c0527..000000000000
--- a/net-mail/courier/files/courier-mta
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/files/courier-mta,v 1.5 2004/03/06 03:15:17 vapier Exp $
-
-depend() {
-	need net courier-authdaemond courier-filterd
-}
-
-start() {
-	ebegin "Starting courier mta"
-	/usr/sbin/courier start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier mta"
-	/usr/sbin/courier stop
-	eend $?
-}
diff --git a/net-mail/courier/files/courier-pop3d b/net-mail/courier/files/courier-pop3d
deleted file mode 100644
index 9525839def7f..000000000000
--- a/net-mail/courier/files/courier-pop3d
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/files/courier-pop3d,v 1.4 2004/03/06 03:15:17 vapier Exp $
-
-depend() {
-	need net courier-authdaemond
-}
-
-start() {
-	ebegin "Starting courier pop3d"
-	/usr/share/courier/pop3d start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier pop3d"
-	/usr/share/courier/pop3d stop
-	eend $?
-}
diff --git a/net-mail/courier/files/courier-pop3d-ssl b/net-mail/courier/files/courier-pop3d-ssl
deleted file mode 100644
index 970f17637084..000000000000
--- a/net-mail/courier/files/courier-pop3d-ssl
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/files/courier-pop3d-ssl,v 1.4 2004/03/06 03:15:17 vapier Exp $
-
-depend() {
-	need net courier-authdaemond
-}
-
-start() {
-	ebegin "Starting courier pop3d-ssl"
-	/usr/share/courier/pop3d-ssl start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping courier pop3d-ssl"
-	/usr/share/courier/pop3d-ssl stop
-	eend $?
-}
diff --git a/net-mail/courier/files/digest-courier-0.44.0 b/net-mail/courier/files/digest-courier-0.44.0
deleted file mode 100644
index 557500b857a3..000000000000
--- a/net-mail/courier/files/digest-courier-0.44.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 acf6721a56f94791adf4fd7f56ba3e38 courier-0.44.0.tar.bz2 3503637
diff --git a/net-mail/courier/files/digest-courier-0.44.2 b/net-mail/courier/files/digest-courier-0.44.2
deleted file mode 100644
index 8969c1cd4eeb..000000000000
--- a/net-mail/courier/files/digest-courier-0.44.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8c607c70a692d8f8ccb769a3f96d2f28 courier-0.44.2.tar.bz2 4001993
diff --git a/net-mail/courier/files/digest-courier-0.44.2.20040201 b/net-mail/courier/files/digest-courier-0.44.2.20040201
deleted file mode 100644
index e5001163075d..000000000000
--- a/net-mail/courier/files/digest-courier-0.44.2.20040201
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f203eafd9ad6a3663db03b9b719ecd1f courier-0.44.2.20040201.tar.bz2 4149928
diff --git a/net-mail/courier/files/digest-courier-0.45.0 b/net-mail/courier/files/digest-courier-0.45.0
deleted file mode 100644
index 1967d073999d..000000000000
--- a/net-mail/courier/files/digest-courier-0.45.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e823505ecb139680836ce14072446951 courier-0.45.0.tar.bz2 4317047
diff --git a/net-mail/courier/files/digest-courier-0.45.1 b/net-mail/courier/files/digest-courier-0.45.1
new file mode 100644
index 000000000000..84c37f3a85e9
--- /dev/null
+++ b/net-mail/courier/files/digest-courier-0.45.1
@@ -0,0 +1 @@
+MD5 449b03a7d61e2174ad7dc65e4ddf57c6 courier-0.45.1.tar.bz2 4315822
diff --git a/net-mail/courier/files/gentoo.diff.bz2 b/net-mail/courier/files/gentoo.diff.bz2
deleted file mode 100644
index f470e6f11aca..000000000000
--- a/net-mail/courier/files/gentoo.diff.bz2
+++ /dev/null