remove old courier ebuild

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-git6 i686

5 files changed, 10 insertions, 747 deletions

diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 87bb09803da0..3b84f0355532 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,21 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX apache-sqwebmail.inc 347 RMD160 9d046149af6138320448fe7bb762b142e0eb9b94 SHA1 4996c33b74a3c9b70886f27948334e3880df8073 SHA256 3a6616dacfd49ab0c89c62d9df5662fc3c2d9e598786d781240bf5e8900afc65
 AUX bofh 23 RMD160 995b6b103c29f390c2f0230af95d4c0823423dcb SHA1 f6399bc612af33ca79921961b223cbdf394d9549 SHA256 7e42d61373770a2b14a6fdd8b5f71c598ce4767726f8f7106de00b7c34a59e8c
 AUX courier-0.59.0-asneeded.patch 534 RMD160 fe2f28235842220d999dc77ed22857dd99c648a2 SHA1 5ae8a8cefbbd91f2146988c9095ac0e3668c1135 SHA256 802ae0431c9d2b55cdda4602522058874765170d12f4e2fcdd064971f8d31991
 AUX courier-init 5182 RMD160 7c5d80d7fdd4e09418461a746f6642f2a276b88b SHA1 beef0a5742fe31388947e945b4646c1dbe5627f1 SHA256 4b1a030bbba852c9c2c8d50e58c43c8e97b5a1ac29a04974a1f097362929e126
 AUX courier-init-r1 5252 RMD160 2c770526b4fd2e342c904289573c4f8cb19ca6df SHA1 ac67cd4a9664b1010322b5260f84d017ee06736b SHA256 e74fc291b49dace3ffb3af1844b976255c0c7a34aa0e2d87b5c05f672db9058a
 AUX dot_courier 26 RMD160 cf20012379abbb63f78e1eb0f9cbaefff6d1048d SHA1 8e5e09e167035d100859b42311b6dda2842f4d67 SHA256 8c585031b4356ca1f887e0823fd9b365fff57a5f9cc32541eccfc1542d5d3763
-AUX fam-disable-check.patch 654 RMD160 c43ae28da398b0106efd73924a0b2c9f4490b799 SHA1 5c00b1d4180c65b1c6feed3979b60b018f874996 SHA256 775dab159b4e05141e4d8fdfa5df75967dda8a8f60e4e962208f724a497d3f54
 AUX locallowercase 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
 AUX mailer.conf 197 RMD160 4229dfa9cf33b275571538211dad33da5ae84048 SHA1 caf095797e8c526dc5fec59d9d89d51f318cd28a SHA256 5a946a7c4ed42bbddf2c471e2e00898150e4bff33f4af70620cf814ab2f12b47
 AUX norewrite.patch 489 RMD160 1d0bacf702126cc4f8b9d7b07bbc6a9357b7b6e9 SHA1 007059af9ab5d89b36004e590b6a21911515f69b SHA256 526f3742fb43af93811e6e4b3210fda1c611b50ce5abdf3a57a25dfe4f5c38e4
-AUX pam-include.patch 1534 RMD160 20456564341339c661ee20efe6b830f9df484b7e SHA1 318d1ae44e946c3809f56476ab02d0f851bc981c SHA256 2f0ea30cffdfec5d0f2ce3aece3e5ea2717ae6d04918210a0b9247a30fc15782
 AUX password.dist 247 RMD160 eab211be0b1e3dbd6206f79e993b1d314a24efa3 SHA1 2cdd5bcf561f7267be6f18b731813962030af166 SHA256 46f20a84922d108d39a7c26ad3ba8915326549f46cea811e2384f55a589d38e2
 AUX set-mime 741 RMD160 8ed45fb4a0aee168a70cdcab6d17cf1606f85cad SHA1 b8834602c7304d42f3179a8dde43dcc57d0f4972 SHA256 bf15af7c181d517a924cb82854cbce46278e6e28ffb338e2159ba89c386dc74f
-DIST courier-0.53.2.tar.bz2 6942557 RMD160 a6efce3a8d6572923190ea49ed6085906317ebd8 SHA1 89c6a9a57467adf8c1ac815a5ffacf47e5e694a3 SHA256 0b44e02652084ca4023646ca0cdd3d173dcbadf919e81aa012b42666b3acf726
-DIST courier-0.55.1.tar.bz2 7019376 RMD160 43b4e5868a3e450cbc238cae0ba411011c1fa49f SHA1 a4b83a1fa018abd9d32b946b6407764ad2d98993 SHA256 caec49a2fed5c2048ea69fc290dc01402bf0dfc7852d2e1865e35ae15ce1eea6
 DIST courier-0.59.0.tar.bz2 7121762 RMD160 580e57fd9d39b62772e07dcdec653379cd21caaf SHA1 6870d2b12f1c93d5ede12f2a5c9c1107a7fb647c SHA256 e488cc920ed970c6d38496dba21359b50c6032ff4f2f91432b5d23db261578ec
-EBUILD courier-0.53.2-r1.ebuild 11566 RMD160 237d32b4d4c6b84ce1a9929d7ca5ce31129f2b65 SHA1 3b81cdd0cc5d4b334b9081ec82fb2b163f6e194e SHA256 4d06957b2fc0bef7679eecb3276904f015a77b64e1d93908231cbc5c8df21aa3
-EBUILD courier-0.55.1-r1.ebuild 11644 RMD160 d50577c399e5d2db1f9a050386ec1280fe0e2aae SHA1 6abba601082afe98912347775bc284f059756f94 SHA256 1ee3629b76807c2c6fabe3d88a9d40285276516e7df5e3718d0655ff55b0f279
 EBUILD courier-0.59.0.ebuild 10180 RMD160 0bcd931b501817ffdacfcf2684763ade3c264376 SHA1 b73c6503fe10122d24ea45082a39efd0b156ac51 SHA256 6d78cd3a0037475b12a8c7247ad2c443887de326f2ef18804bc7ee65bcb9c837
 MISC ChangeLog 29371 RMD160 bd6ae20b8bbe0bfa29af4d82aca2fc49e2a04151 SHA1 bb893235f141e2370ac5a14a45088a34b3fedcc3 SHA256 3046591ee269073c145ad8ba0f4bb7a878abccfa67fadebe877740282c80e600
 MISC metadata.xml 375 RMD160 a72f6ab68f317f66a7015eea46c4343899886700 SHA1 0ee9967bde4f09174fd901aeeb662bffbed3cd64 SHA256 54191959ccd49a757486959fb8633baa12c21a5f51a86796e20a929ac406f39b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiD2fYACgkQr2QksT29OyAJlQCfZrm9tcDtPbw5LjsqOWmYGnmF
+O+4AnRBjdpop7m16JczGSsFQ2QMdlBZn
+=wFBq
+-----END PGP SIGNATURE-----
diff --git a/mail-mta/courier/courier-0.53.2-r1.ebuild b/mail-mta/courier/courier-0.53.2-r1.ebuild
deleted file mode 100644
index 4ac46fe62ace..000000000000
--- a/mail-mta/courier/courier-0.53.2-r1.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.53.2-r1.ebuild,v 1.11 2008/07/16 16:32:11 chtekk Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${PV/?.??.?/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${SRC_URI}" ] && SRC_URI="http://www.courier-mta.org/beta/courier/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-S="${WORKDIR}/${P%%_pre}"
-
-SLOT="0"
-LICENSE="GPL-2"
-# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper fam"
-
-PROVIDE="virtual/mta
-	 virtual/mda
-	 virtual/imapd"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.55
-	>=dev-libs/openssl-0.9.6
-	>=sys-libs/gdbm-1.8.0
-	dev-libs/libpcre
-	app-misc/mime-types
-	fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
-	pam? ( virtual/pam )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( virtual/postgresql-base )
-	spell? ( virtual/aspell-dict )
-	fam? ( virtual/fam )
-	!mailwrapper? ( !virtual/mta )
-	!virtual/imapd
-	!mail-filter/maildrop"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	sys-process/procps"
-
-PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	pam? ( net-mail/mailbase )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-filter-flags '-fomit-frame-pointer'
-
-src_unpack() {
-	use fam || (
-		ewarn "File Alteration Monitor (FAM) is disabled"
-		ewarn "courier-imap will fall back to 60 second polls."
-		ewarn 'add "fam" to your USE flags to build as usual'
-		ebeep 4
-		epause 4 )
-	unpack ${A}
-	cd ${S}
-	use norewrite && epatch ${FILESDIR}/norewrite.patch
-	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-
-	epatch "${FILESDIR}/pam-include.patch"
-
-	# disable link to fam.
-	epatch ${FILESDIR}/fam-disable-check.patch
-	cd ${S}/maildir
-	eautoreconf
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with ipv6` \
-		`use_with ldap ldapaliasd` `use_enable ldap maildropldap`"
-
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-	use spell || myconf="${myconf} --without-ispell"
-
-	myconf="${myconf} --enable-mimetypes=/etc/mime.types"
-
-	myconf="${myconf} $(use_with fam)"
-
-	einfo "Configuring courier: `echo ${myconf} | xargs echo`"
-
-	econf \
-		--prefix=/usr \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--datadir=/usr/share/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--localstatedir=/var/lib/courier \
-		--with-piddir=/var/run/courier \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--with-paranoid-smtpext \
-		--with-db=gdbm \
-		--disable-autorenamesent \
-		--cache-file=${S}/configuring.cache \
-		--host=${CHOST} ${myconf} debug=true || die "./configure"
-	sed -e'/^install-perms-local:/a\	sed -e\"s|^|'${D}'|g\" -i permissions.dat' -i Makefile
-	emake || die "Compile problem"
-}
-
-etc_courier() {
-	# Import existing /etc/courier/file if it exists.
-	# Add option only if it was not already set or even commented out
-	file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
-	[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
-			cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
-	grep -q "${word}" "${D}/etc/courier/${file}" || \
-		echo "${2}" >> "${D}/etc/courier/${file}"
-}
-
-etc_courier_chg() {
-	file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
-	[ -z "${section}" ] && section="${2}"
-	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
-	sed -i -e"/\#\#NAME: ${section}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-}
-
-set_maildir() {
-	local f ; local files=$*
-	origmaildir='Maildir'
-	newmaildir='.maildir'
-	for f in ${files} ; do
-		grep -q "${origmaildir}" "${f}" && \
-			elog "Changing ${origmaildir} in ${f} to ${newmaildir}"
-		sed -i -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f}
-	done
-}
-
-src_install() {
-	local f
-	einfo "Setting up maildirs in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	dodir /etc/skel
-	${S}/maildir/maildirmake ${D}/etc/skel/.maildir
-	keepdir /etc/skel/.maildir
-
-	diropts -o mail -g mail
-	keepdir /var/run/courier
-	keepdir /var/lib/courier/tmp
-	keepdir /var/lib/courier/msgs
-	make install DESTDIR=${D} || die "install"
-	make install-configure || die "install-configure"
-
-	for dir2keep in `(cd ${D} && find ./var/lib/courier -type d)` ; do
-		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
-	done
-
-	newinitd ${FILESDIR}/courier-init-r1 courier
-	use fam || sed -i -e's|^.*use famd$||g' ${D}/etc/init.d/courier
-
-	cd ${D}/etc/courier
-	insinto /etc/courier
-	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-
-	if use pam ; then
-		dodir /etc/pam.d
-		rm imapd.authpam pop3d.authpam
-		for f in *.authpam ; do mv "${f}" "${D}/etc/pam.d/${f%%.authpam}" ; done
-	fi
-
-	for f in *.dist ; do cp ${f} ${f%%.dist} ; done
-	[ -e ldapaliasrc ] &&  ( chown root:0 ldapaliasrc ; chmod 400 ldapaliasrc )
-	set_maildir courierd imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
-
-	( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
-		> ${D}/etc/courier/sizelimit
-	etc_courier maildroprc ""
-	etc_courier esmtproutes ""
-	etc_courier backuprelay ""
-	etc_courier locallowercase ""
-	etc_courier bofh "opt BOFHBADMIME=accept"
-	etc_courier bofh "opt BOFHSPFTRUSTME=1"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
-	etc_courier bofh "opt BOFHSPFFROM=all"
-	etc_courier bofh "opt BOFHSPFMAILFROM=all"
-	etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
-	etc_courier esmtpd "BOFHBADMIME=accept"
-	etc_courier esmtpd-ssl "BOFHBADMIME=accept"
-	etc_courier esmtpd-msa "BOFHBADMIME=accept"
-	etc_courier_chg esmtpd ESMTPDSTART YES
-	etc_courier_chg esmtpd ESMTPAUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg esmtpd ESMTPAUTH_WEBADMIN "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg esmtpd ESMTPAUTH_TLS "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
-	etc_courier_chg esmtpd ESMTPAUTH_TLS_WEBADMIN "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
-	etc_courier_chg esmtpd-msa ESMTPDSTART YES
-	etc_courier_chg esmtpd-msa AUTH_REQUIRED 1
-	etc_courier_chg esmtpd-ssl ESMTPDSSLSTART YES
-	etc_courier_chg esmtpd-ssl AUTH_REQUIRED 1
-	etc_courier_chg imapd IMAPDSTART YES
-	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
-	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
-	etc_courier_chg imapd-ssl IMAPDSSLSTART YES
-	etc_courier_chg pop3d POP3DSTART YES
-	etc_courier_chg pop3d POP3AUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg pop3d POP3AUTH_TLS "LOGIN PLAIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg pop3d-ssl POP3DSSLSTART YES
-
-	# Fix for a sandbox violation on subsequential merges
-	# - ticho@gentoo.org, 2005-07-10
-	rm ${D}/usr/sbin/{pop3d,imapd}{,-ssl}
-	dosym /usr/share/courier/pop3d /usr/sbin/courier-pop3d
-	dosym /usr/share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
-	dosym /usr/share/courier/imapd /usr/sbin/courier-imapd
-	dosym /usr/share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
-
-	cd ${S}
-	cp imap/README README.imap
-	use nls && cp unicode/README README.unicode
-	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
-	dodoc tcpd/README.couriertls
-	echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \
-		>> ${D}/usr/share/doc/${P}/README.htmldocs
-
-	insinto /usr/$(get_libdir)/courier/courier
-	insopts -m 755 -o mail -g mail
-	doins ${S}/courier/webmaild
-	insinto /etc/courier/webadmin
-	insopts -m 400 -o mail -g mail
-	doins ${FILESDIR}/password.dist
-
-	# avoid name collisions in /usr/sbin, make webadmin match
-	cd ${D}/usr/sbin
-	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv ${f} courier-${f} ; done
-	sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
-		-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
-		${D}/usr/share/courier/courierwebadmin/admin-40imap.pl \
-		|| ewarn "failed to fix webadmin"
-	sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
-		-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
-		${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl \
-		|| ewarn "failed to fix webadmin"
-
-	if use mailwrapper ; then
-		mv ${D}/usr/bin/sendmail ${D}/usr/bin/sendmail.courier
-		mv ${D}/usr/bin/rmail ${D}/usr/bin/rmail.courier
-		mv ${D}/usr/bin/mailq ${D}/usr/bin/mailq.courier
-
-		mv ${D}/usr/share/man/man1/sendmail.1 \
-			${D}/usr/share/man/man1/sendmail-courier.1
-		mv ${D}/usr/share/man/man1/mailq.1 \
-			${D}/usr/share/man/man1/mailq-courier.1
-		mv ${D}/usr/share/man/man1/rmail.1 \
-			${D}/usr/share/man/man1/rmail-courier.1
-
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-	else
-		dosym /usr/bin/sendmail /usr/sbin/sendmail
-	fi
-}
-
-src_test() {
-	addpredict /
-	vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	if hasq userpriv ${FEATURES} ; then
-		if ! emake -j1 check; then
-			hasq test ${FEATURES} && die "Make check failed. See above for details."
-			hasq test ${FEATURES} || eerror "Make check failed. See above for details."
-		fi
-	else
-		hasq test ${FEATURES} && eerror "Make check needs FEATURES="userpriv" to work."
-	fi
-	SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
-}
-
-pkg_postinst() {
-	use fam && elog "fam daemon is needed for courier-imapd" \
-		|| ewarn "courier was built without fam support"
-
-	# fix for bug #99334
-	elog "Courier's sendmail is not suid by default, therefore non-root users can't send"
-	elog "mail using sendmail. If you need this to work, you should set sendmail suid."
-	elog "See also: http://www.courier-mta.org/install.html#suid"
-}
-
-pkg_config() {
-	mailhost=`hostname`
-	export mailhost
-
-	domainname=`domainname`
-	if [ "x$domainname" = "x(none)" ] ; then
-		domainname=`echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/"`
-	fi
-	export domainname
-
-	if [ ${ROOT} = "/" ] ; then
-		file=${ROOT}/etc/courier/locals
-		if [ ! -f ${file} ] ; then
-			echo "localhost" > ${file};
-			echo ${domainname} >> ${file};
-		fi
-		file=${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}
-		if [ ! -f ${file} ] ; then
-			echo ${domainname} > ${file}
-			/usr/sbin/makeacceptmailfor
-		fi
-
-		file=${ROOT}/etc/courier/smtpaccess/${domainname}
-		if [ ! -f ${file} ]
-		then
-			netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
-			do
-				i=1
-				net=""
-				TIFS=${IFS}
-				IFS="."
-				for o in ${netmask}
-				do
-					if [ ${o} == "255" ]
-					then
-						[ "_${net}" == "_" ] || net="${net}."
-						t=`echo ${network} | cut -d " " -f ${i}`
-						net="${net}${t}"
-					fi
-					i=$((${i} + 1))
-				done
-				IFS=${TIFS}
-				echo "doing configuration - relay control for the network ${net} !"
-				echo "${net}	allow,RELAYCLIENT" >> ${file}
-			done
-			/usr/sbin/makesmtpaccess
-		fi
-	fi
-
-	echo "creating cert for esmtpd-ssl:"
-	/usr/sbin/mkesmtpdcert
-	echo "creating cert for imapd-ssl:"
-	/usr/sbin/mkpop3dcert
-	echo "creating cert for pop3d-ssl:"
-	/usr/sbin/mkimapdcert
-}
diff --git a/mail-mta/courier/courier-0.55.1-r1.ebuild b/mail-mta/courier/courier-0.55.1-r1.ebuild
deleted file mode 100644
index 015647f93e2e..000000000000
--- a/mail-mta/courier/courier-0.55.1-r1.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.55.1-r1.ebuild,v 1.7 2008/07/16 16:32:11 chtekk Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${PV/?.??.?/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${SRC_URI}" ] && SRC_URI="http://www.courier-mta.org/beta/courier/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-S="${WORKDIR}/${P%%_pre}"
-
-SLOT="0"
-LICENSE="GPL-2"
-# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper fam"
-
-PROVIDE="virtual/mta
-	 virtual/mda
-	 virtual/imapd"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.59
-	>=dev-libs/openssl-0.9.6
-	>=sys-libs/gdbm-1.8.0
-	dev-libs/libpcre
-	app-misc/mime-types
-	fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
-	pam? ( virtual/pam )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( virtual/postgresql-base )
-	spell? ( virtual/aspell-dict )
-	fam? ( virtual/fam )
-	!mailwrapper? ( !virtual/mta )
-	!virtual/imapd
-	!mail-filter/maildrop"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	sys-process/procps"
-
-PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	pam? ( net-mail/mailbase )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-filter-flags '-fomit-frame-pointer'
-
-src_unpack() {
-	use fam || (
-		ewarn "File Alteration Monitor (FAM) is disabled"
-		ewarn "courier-imap will fall back to 60 second polls."
-		ewarn 'add "fam" to your USE flags to build as usual'
-		ebeep 4
-		epause 4 )
-	unpack ${A}
-	cd "${S}"
-	use norewrite && epatch "${FILESDIR}/norewrite.patch"
-	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-
-	epatch "${FILESDIR}/pam-include.patch"
-
-	# disable link to fam.
-	epatch "${FILESDIR}/fam-disable-check.patch"
-	cd "${S}/maildir"
-	eautoreconf
-}
-
-src_compile() {
-	local myconf
-	myconf="`use_with ipv6` \
-		`use_with ldap ldapaliasd` `use_enable ldap maildropldap`"
-
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-	use spell || myconf="${myconf} --without-ispell"
-
-	myconf="${myconf} --enable-mimetypes=/etc/mime.types"
-
-	myconf="${myconf} $(use_with fam)"
-
-	einfo "Configuring courier: `echo ${myconf} | xargs echo`"
-
-	econf \
-		--prefix=/usr \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--datadir=/usr/share/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--localstatedir=/var/lib/courier \
-		--with-piddir=/var/run/courier \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--with-paranoid-smtpext \
-		--with-db=gdbm \
-		--disable-autorenamesent \
-		--cache-file="${S}/configuring.cache" \
-		--host=${CHOST} ${myconf} debug=true || die "./configure"
-	sed -e'/^install-perms-local:/a\	sed -e\"s|^|'${D}'|g\" -i permissions.dat' -i Makefile
-	emake || die "Compile problem"
-}
-
-etc_courier() {
-	# Import existing /etc/courier/file if it exists.
-	# Add option only if it was not already set or even commented out
-	file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
-	[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
-			cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
-	grep -q "${word}" "${D}/etc/courier/${file}" || \
-		echo "${2}" >> "${D}/etc/courier/${file}"
-}
-
-etc_courier_chg() {
-	file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
-	[ -z "${section}" ] && section="${2}"
-	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
-	sed -i -e"/\#\#NAME: ${section}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-}
-
-set_maildir() {
-	local f ; local files=$*
-	origmaildir='Maildir'
-	newmaildir='.maildir'
-	for f in ${files} ; do
-		grep -q "${origmaildir}" "${f}" && \
-			elog "Changing ${origmaildir} in ${f} to ${newmaildir}"
-		sed -i -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f}
-	done
-}
-
-src_install() {
-	local f
-	einfo "Setting up maildirs in the account skeleton ..."
-	diropts -m 755 -o root -g root
-	dodir /etc/skel
-	"${S}/maildir/maildirmake" "${D}/etc/skel/.maildir"
-	keepdir /etc/skel/.maildir
-
-	diropts -o mail -g mail
-	keepdir /var/run/courier
-	keepdir /var/lib/courier/tmp
-	keepdir /var/lib/courier/msgs
-	make install DESTDIR="${D}" || die "install"
-	make install-configure || die "install-configure"
-
-	for dir2keep in `(cd "${D}" && find ./var/lib/courier -type d)` ; do
-		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
-	done
-
-	newinitd "${FILESDIR}/courier-init-r1" courier
-	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
-
-	cd "${D}/etc/courier"
-	insinto /etc/courier
-	newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
-
-	if use pam ; then
-		dodir /etc/pam.d
-		rm imapd.authpam pop3d.authpam
-		for f in *.authpam ; do mv "${f}" "${D}/etc/pam.d/${f%%.authpam}" ; done
-	fi
-
-	for f in *.dist ; do cp ${f} ${f%%.dist} ; done
-	[ -e ldapaliasrc ] &&  ( chown root:0 ldapaliasrc ; chmod 400 ldapaliasrc )
-	set_maildir courierd imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
-
-	( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
-		> "${D}/etc/courier/sizelimit"
-	etc_courier maildroprc ""
-	etc_courier esmtproutes ""
-	etc_courier backuprelay ""
-	etc_courier locallowercase ""
-	etc_courier bofh "opt BOFHBADMIME=accept"
-	etc_courier bofh "opt BOFHSPFTRUSTME=1"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
-	etc_courier bofh "opt BOFHSPFFROM=all"
-	etc_courier bofh "opt BOFHSPFMAILFROM=all"
-	etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
-	etc_courier esmtpd "BOFHBADMIME=accept"
-	etc_courier esmtpd-ssl "BOFHBADMIME=accept"
-	etc_courier esmtpd-msa "BOFHBADMIME=accept"
-	etc_courier_chg esmtpd ESMTPDSTART YES
-	etc_courier_chg esmtpd ESMTPAUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg esmtpd ESMTPAUTH_WEBADMIN "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg esmtpd ESMTPAUTH_TLS "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
-	etc_courier_chg esmtpd ESMTPAUTH_TLS_WEBADMIN "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
-	etc_courier_chg esmtpd-msa ESMTPDSTART YES
-	etc_courier_chg esmtpd-msa AUTH_REQUIRED 1
-	etc_courier_chg esmtpd-ssl ESMTPDSSLSTART YES
-	etc_courier_chg esmtpd-ssl AUTH_REQUIRED 1
-	etc_courier_chg imapd IMAPDSTART YES
-	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
-	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
-	etc_courier_chg imapd-ssl IMAPDSSLSTART YES
-	etc_courier_chg pop3d POP3DSTART YES
-	etc_courier_chg pop3d POP3AUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg pop3d POP3AUTH_TLS "LOGIN PLAIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-	etc_courier_chg pop3d-ssl POP3DSSLSTART YES
-
-	# Fix for a sandbox violation on subsequential merges
-	# - ticho@gentoo.org, 2005-07-10
-	rm "${D}"/usr/sbin/{pop3d,imapd}{,-ssl}
-	dosym /usr/share/courier/pop3d /usr/sbin/courier-pop3d
-	dosym /usr/share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
-	dosym /usr/share/courier/imapd /usr/sbin/courier-imapd
-	dosym /usr/share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
-
-	cd "${S}"
-	cp imap/README README.imap
-	use nls && cp unicode/README README.unicode
-	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
-	dodoc tcpd/README.couriertls
-	echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \
-		>> "${D}/usr/share/doc/${P}/README.htmldocs"
-
-	insinto /usr/$(get_libdir)/courier/courier
-	insopts -m 755 -o mail -g mail
-	doins "${S}/courier/webmaild"
-	insinto /etc/courier/webadmin
-	insopts -m 400 -o mail -g mail
-	doins "${FILESDIR}/password.dist"
-
-	# avoid name collisions in /usr/sbin, make webadmin match
-	cd "${D}/usr/sbin"
-	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv ${f} courier-${f} ; done
-	sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
-		-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
-		"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
-		|| ewarn "failed to fix webadmin"
-	sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
-		-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
-		"${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
-		|| ewarn "failed to fix webadmin"
-
-	if use mailwrapper ; then
-		mv "${D}/usr/bin/sendmail" "${D}/usr/bin/sendmail.courier"
-		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.courier"
-		mv "${D}/usr/bin/mailq" "${D}/usr/bin/mailq.courier"
-
-		mv "${D}/usr/share/man/man1/sendmail.1" \
-			"${D}/usr/share/man/man1/sendmail-courier.1"
-		mv "${D}/usr/share/man/man1/mailq.1" \
-			"${D}/usr/share/man/man1/mailq-courier.1"
-		mv "${D}/usr/share/man/man1/rmail.1" \
-			"${D}/usr/share/man/man1/rmail-courier.1"
-
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-	else
-		dosym /usr/bin/sendmail /usr/sbin/sendmail
-	fi
-}
-
-src_test() {
-	addpredict /
-	vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	if hasq userpriv ${FEATURES} ; then
-		if ! emake -j1 check; then
-			hasq test ${FEATURES} && die "Make check failed. See above for details."
-			hasq test ${FEATURES} || eerror "Make check failed. See above for details."
-		fi
-	else
-		hasq test ${FEATURES} && eerror "Make check needs FEATURES="userpriv" to work."
-	fi
-	SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
-}
-
-pkg_postinst() {
-	use fam && elog "fam daemon is needed for courier-imapd" \
-		|| ewarn "courier was built without fam support"
-
-	# fix for bug #99334
-	elog "Courier's sendmail is not suid by default, therefore non-root users can't send"
-	elog "mail using sendmail. If you need this to work, you should set sendmail suid."
-	elog "See also: http://www.courier-mta.org/install.html#suid"
-}
-
-pkg_config() {
-	mailhost=`hostname`
-	export mailhost
-
-	domainname=`domainname`
-	if [ "x$domainname" = "x(none)" ] ; then
-		domainname=`echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/"`
-	fi
-	export domainname
-
-	if [ "${ROOT}" = "/" ] ; then
-		file=${ROOT}/etc/courier/locals
-		if [ ! -f ${file} ] ; then
-			echo "localhost" > ${file};
-			echo ${domainname} >> ${file};
-		fi
-		file=${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}
-		if [ ! -f ${file} ] ; then
-			echo ${domainname} > ${file}
-			/usr/sbin/makeacceptmailfor
-		fi
-
-		file=${ROOT}/etc/courier/smtpaccess/${domainname}
-		if [ ! -f ${file} ]
-		then
-			netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
-			do
-				i=1
-				net=""
-				TIFS=${IFS}
-				IFS="."
-				for o in ${netmask}
-				do
-					if [ ${o} == "255" ]
-					then
-						[ "_${net}" == "_" ] || net="${net}."
-						t=`echo ${network} | cut -d " " -f ${i}`
-						net="${net}${t}"
-					fi
-					i=$((${i} + 1))
-				done
-				IFS=${TIFS}
-				echo "doing configuration - relay control for the network ${net} !"
-				echo "${net}	allow,RELAYCLIENT" >> ${file}
-			done
-			/usr/sbin/makesmtpaccess
-		fi
-	fi
-
-	echo "creating cert for esmtpd-ssl:"
-	/usr/sbin/mkesmtpdcert
-	echo "creating cert for imapd-ssl:"
-	/usr/sbin/mkpop3dcert
-	echo "creating cert for pop3d-ssl:"
-	/usr/sbin/mkimapdcert
-}
diff --git a/mail-mta/courier/files/fam-disable-check.patch b/mail-mta/courier/files/fam-disable-check.patch
deleted file mode 100644
index 7019d02a6af5..000000000000
--- a/mail-mta/courier/files/fam-disable-check.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- courier-imap-3.0.7-orig/maildir/configure.in	2004-06-08 15:44:23.000000000 -0700
-+++ courier-imap-3.0.7/maildir/configure.in	2004-08-14 15:28:20.525714876 -0700
-@@ -60,6 +60,12 @@
- dnl Checks for library functions.
- AC_CHECK_HEADER(fam.h, :, :)
- AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes)
-+AC_ARG_WITH(fam, [  --with-fam              Compile with FAM support],
-+       fam="$withval",
-+       fam="no")
-+
-+if test "$fam" != "no"
-+then
- AC_CHECK_LIB(fam, FAMOpen,  [
- 			LIBFAM=-lfam
- 			AC_DEFINE_UNQUOTED(HAVE_FAM,1,
-@@ -74,6 +80,7 @@
- AC_MSG_ERROR([[FAM development libraries not found.]]) ]
- 					)
- 		  ])
-+fi
- 
- AC_SUBST(LIBFAM)
- 
diff --git a/mail-mta/courier/files/pam-include.patch b/mail-mta/courier/files/pam-include.patch
deleted file mode 100644
index a56cac6c39d4..000000000000
--- a/mail-mta/courier/files/pam-include.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- courier-0.53.2/webmail/sqwebmail-system-auth.pamconf	2007/05/10 05:49:26	1.1
-+++ courier-0.53.2/webmail/sqwebmail-system-auth.pamconf	2007/05/13 18:19:03
-@@ -5,10 +5,10 @@
- # Copyright 1998-2001 Double Precision, Inc.  See COPYING for
- # distribution information.
- #
--# This is a sample authpam configuration file that uses pam_stack
--# (circa linux-pam 0.72).
-+# This is a sample authpam configuration file that uses include statements
-+# (circa linux-pam 0.78).
- 
- auth       required     pam_nologin.so
--auth       required     pam_stack.so service=system-auth
--account    required     pam_stack.so service=system-auth
--session    required     pam_stack.so service=system-auth
-+auth       include	system-auth
-+account    include	system-auth
-+session    include	system-auth
---- courier-0.53.2/imap/system-auth.authpam	2007/05/13 19:03:10	1.1
-+++ courier-0.53.2/imap/system-auth.authpam	2007/05/13 19:04:03
-@@ -5,10 +5,10 @@
- # Copyright 1998-2001 Double Precision, Inc.  See COPYING for
- # distribution information.
- #
--# This is a sample authpam configuration file that uses pam_stack
--# (circa linux-pam 0.72).
-+# This is a sample authpam configuration file that uses include statements
-+# (circa linux-pam 0.78).
- 
- auth       required     pam_nologin.so
--auth       required     pam_stack.so service=system-auth
--account    required     pam_stack.so service=system-auth
--session    required     pam_stack.so service=system-auth
-+auth       include	system-auth
-+account    include	system-auth
-+session    include	system-auth