mail-mta/courier: Remove vulnerable versions

Package-Manager: portage-2.3.0_rc1

8 files changed, 0 insertions, 1271 deletions

diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 8dddcd143f04..df61c2476198 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,4 +1 @@
-DIST courier-0.71.tar.bz2 7117940 SHA256 e06058ed6163bd7e706517ad183fb26faba00ff0ad649557123e5f33f265ebcd SHA512 08b02b006c978c4e1d12241d3f687a201e65afbd6a7ca49f10c77c4ddad0b1d89bb43169b1eb7cd90af30117ffa13911794da3f7dec3429c36b4bc3a9cf3cac8 WHIRLPOOL 47b1d5c4adbd1b387a2a2d412f7d55cc661b517e72bc7a29bec07c098dd5efffe91fa85c9ecae701049e0c08a7d4b1d1b777d24befe1103ad079eb9e8dd1e61c
-DIST courier-0.74.0.tar.bz2 6952034 SHA256 13865f9e21ed8b6786323aa228892a32593918b55379fbdb4f3fbc65425b6859 SHA512 df96ca0d47d0d3f118944e865eff880b2f42959ef5f62fa48c9c9a0948c431cc6911dac2f93ed0a7a22602de123676ad6076b01055ad773966134b3b6840a847 WHIRLPOOL ef0940506341f2f709ba61698ad2d34b47e28f7d9232d8e7c1de395380e43524dc03263efcd304b690aca14b125c7249c915d062e410560421a0572978786903
-DIST courier-0.74.1.tar.bz2 6951633 SHA256 b373c2b189affa01e8c2cfe9f60e6262bbcd98afa4e927b7fbbd68f478661ae6 SHA512 bcbb2a5b80c5e240587a75c7bb61c5620c7b43dc0bf707c8be5403856a125dfd18094b244d475f7d373f035df09c5b537e440815b5cca37afe6553e23117513a WHIRLPOOL c9e83048f920744babd1268a6804a5fcda834f4c6cf6cdc456402467567b93c7e773e57c1239a72662dd1eeab4494596b309a60071a06b2779a074981f913c3b
 DIST courier-0.75.0.tar.bz2 6970339 SHA256 2571a5b938649681ee98a2dc137f088aae0fd584cca3adf2dde1d826185406cc SHA512 37e66329f157e18176d4ac8c5e814be78e80ff7dec234886bec8dce2ae5c58ac68bc18e07c739295c25fae8ec778b162bab505d85ea0998db7192d52c47e7bc6 WHIRLPOOL 8cfd184beddb48e7e6efab4917372ec331d3e08f608abc6257ed408df96e100cf28226665fe1018b24e00e4336d705417484a6d890f11a6feb84045d9f969e17
diff --git a/mail-mta/courier/courier-0.71.ebuild b/mail-mta/courier/courier-0.71.ebuild
deleted file mode 100644
index c7252417266b..000000000000
--- a/mail-mta/courier/courier-0.71.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-SLOT="0"
-LICENSE="GPL-2"
-# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
-	fam web webmail gnutls"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.61.0
-	!gnutls? ( >=dev-libs/openssl-0.9.6 )
-	gnutls? ( net-libs/gnutls )
-	>=sys-libs/gdbm-1.8.0
-	dev-libs/libpcre
-	app-misc/mime-types
-	fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
-	pam? ( virtual/pam )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( dev-db/postgresql )
-	spell? ( app-text/aspell )
-	fam? ( virtual/fam )
-	!mail-filter/maildrop
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp
-	!mail-mta/opensmtpd
-	!net-mail/dot-forward
-	!sys-apps/ucspi-tcp
-	"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	sys-process/procps"
-
-# get rid of old style virtual/imapd - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/cyrus-imapd
-	!net-mail/uw-imap"
-
-PDEPEND="pam? ( net-mail/mailbase )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use norewrite && epatch "${FILESDIR}/norewrite.patch"
-}
-
-src_compile() {
-	filter-flags '-fomit-frame-pointer'
-
-	local myconf
-	myconf=""
-
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-
-	econf ${myconf} \
-		$(use_with fam) \
-		$(use_with ipv6) \
-		$(use_with spell ispell) \
-		$(use_with ldap ldapaliasd) \
-		$(use_enable ldap maildroldap) \
-		$(use_with gnutls) \
-		--enable-mimetypes=/etc/mime.types \
-		--prefix=/usr \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--datadir=/usr/share/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--localstatedir=/var/lib/courier \
-		--with-piddir=/var/run/courier \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--with-paranoid-smtpext \
-		--with-db=gdbm \
-		--disable-autorenamesent \
-		--cache-file="${S}/configuring.cache" \
-		--host="${CHOST}" debug=true || die "./configure"
-	sed -e'/^install-perms-local:/a\	sed -e\"s|^|'"${D}"'|g\" -i permissions.dat' -i Makefile
-	emake || die "Compile problem"
-}
-
-etc_courier() {
-	# Import existing /etc/courier/file if it exists.
-	# Add option only if it was not already set or even commented out
-	file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
-	[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
-			cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
-	grep -q "${word}" "${D}/etc/courier/${file}" || \
-		echo "${2}" >> "${D}/etc/courier/${file}"
-}
-
-etc_courier_chg() {
-	file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
-	[ -z "${section}" ] && section="${2}"
-	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
-	sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-}
-
-src_install() {
-	local f
-	diropts -o mail -g mail
-	keepdir /var/lib/courier/tmp
-	keepdir /var/lib/courier/msgs
-	make install DESTDIR="${D}" || die "install"
-	make install-configure || die "install-configure"
-
-	# Get rid of files we dont want
-	if ! use webmail ; then
-		rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
-			"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
-			"${D}/usr/share/courier/sqwebmail/" \
-			"${D}/usr/sbin/webmaild" \
-			"${D}/usr/sbin/webgpg" \
-			"${D}/etc/courier/webmail.authpam" \
-			"${D}/var/lib/courier/webmail-logincache" \
-			"${D}"/etc/courier/sqwebmaild*
-	fi
-
-	if ! use web ; then
-		rm -rf "${D}/usr/share/courier/courierwebadmin/" \
-			"${D}/etc/courier/webadmin"
-	fi
-
-	for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
-		keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
-	done
-
-	newinitd "${FILESDIR}/courier-init-r4" "courier"
-	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
-
-	cd "${D}/etc/courier"
-	if use webmail ; then
-		insinto /etc/courier
-		newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
-	fi
-
-	for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
-	if use ldap ; then
-		[ -e ldapaliasrc ] &&  ( chown root:0 ldapaliasrc ; chmod 400 ldapaliasrc )
-	else
-		rm -f ldapaliasrc
-	fi
-
-	( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
-		> "${D}/etc/courier/sizelimit"
-	etc_courier maildroprc ""
-	etc_courier esmtproutes ""
-	etc_courier backuprelay ""
-	etc_courier locallowercase ""
-	etc_courier bofh "opt BOFHBADMIME=accept"
-	etc_courier bofh "opt BOFHSPFTRUSTME=1"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
-	etc_courier bofh "opt BOFHSPFFROM=all"
-	etc_courier bofh "opt BOFHSPFMAILFROM=all"
-	etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
-	etc_courier esmtpd "BOFHBADMIME=accept"
-	etc_courier esmtpd-ssl "BOFHBADMIME=accept"
-	etc_courier esmtpd-msa "BOFHBADMIME=accept"
-
-	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
-	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
-
-	# Fix for a sandbox violation on subsequential merges
-	# - ticho@gentoo.org, 2005-07-10
-	dosym /usr/share/courier/pop3d /usr/sbin/courier-pop3d
-	dosym /usr/share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
-	dosym /usr/share/courier/imapd /usr/sbin/courier-imapd
-	dosym /usr/share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
-
-	cd "${S}"
-	cp imap/README README.imap
-	use nls && cp unicode/README README.unicode
-	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
-	dodoc tcpd/README.couriertls
-	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"
-
-	if use webmail ; then
-		insinto /usr/$(get_libdir)/courier/courier
-		insopts -m 755 -o mail -g mail
-		doins "${S}/courier/webmaild"
-	fi
-
-	if use web ; then
-		insinto /etc/courier/webadmin
-		insopts -m 400 -o mail -g mail
-		doins "${FILESDIR}/password.dist"
-	fi
-
-	# avoid name collisions in /usr/sbin, make webadmin match
-	cd "${D}/usr/sbin"
-	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
-	if use web ; then
-		sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
-			-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
-			"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
-			|| ewarn "failed to fix webadmin"
-		sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
-			-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
-			"${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
-			|| ewarn "failed to fix webadmin"
-	fi
-
-	# users should be able to send mail. Could be restricted with suictl.
-	chmod u+s "${D}/usr/bin/sendmail"
-
-	dosym /usr/bin/sendmail /usr/sbin/sendmail
-}
-
-src_test() {
-	if [ `whoami` != 'root' ]; then
-		emake -j1 check || die "Make check failed."
-	else
-		einfo "make check skipped, can't run as root."
-		einfo "You can enable it with FEATURES=\"userpriv\""
-	fi
-}
-
-pkg_postinst() {
-	use fam && elog "fam daemon is needed for courier-imapd" \
-		|| ewarn "courier was built without fam support"
-}
-
-pkg_config() {
-	mailhost="$(hostname)"
-	export mailhost
-
-	domainname="$(domainname)"
-	if [ "x$domainname" = "x(none)" ] ; then
-		domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
-	fi
-	export domainname
-
-	if [ "${ROOT}" = "/" ] ; then
-		file="${ROOT}/etc/courier/locals"
-		if [ ! -f "${file}" ] ; then
-			echo "localhost" > "${file}";
-			echo "${domainname}" >> "${file}";
-		fi
-		file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
-		if [ ! -f "${file}" ] ; then
-			echo "${domainname}" > "${file}"
-			/usr/sbin/makeacceptmailfor
-		fi
-
-		file="${ROOT}/etc/courier/smtpaccess/${domainname}"
-		if [ ! -f "${file}" ]
-		then
-			netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
-			do
-				i=1
-				net=""
-				TIFS="${IFS}"
-				IFS="."
-				for o in "${netmask}"
-				do
-					if [ "${o}" == "255" ]
-					then
-						[ "_${net}" == "_" ] || net="${net}."
-						t="$(echo "${network}" | cut -d " " -f ${i})"
-						net="${net}${t}"
-					fi
-					i="$((${i} + 1))"
-				done
-				IFS="${TIFS}"
-				echo "doing configuration - relay control for the network ${net} !"
-				echo "${net}	allow,RELAYCLIENT" >> ${file}
-			done
-			/usr/sbin/makesmtpaccess
-		fi
-	fi
-
-	echo "creating cert for esmtpd-ssl:"
-	/usr/sbin/mkesmtpdcert
-	echo "creating cert for imapd-ssl:"
-	/usr/sbin/mkpop3dcert
-	echo "creating cert for pop3d-ssl:"
-	/usr/sbin/mkimapdcert
-}
diff --git a/mail-mta/courier/courier-0.74.0.ebuild b/mail-mta/courier/courier-0.74.0.ebuild
deleted file mode 100644
index b02cb8fd85ae..000000000000
--- a/mail-mta/courier/courier-0.74.0.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-SLOT="0"
-LICENSE="GPL-2"
-# not in keywords due to missing dependencies:
-# ~arm ~s390 ~ppc64 ~alpha ~hppa ~ia64 ~ppc ~sparc ~x86
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
-	fam web webmail gnutls"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.66.1
-	net-libs/courier-unicode
-	!gnutls? ( >=dev-libs/openssl-0.9.6 )
-	gnutls? ( net-libs/gnutls )
-	>=sys-libs/gdbm-1.8.0
-	dev-libs/libpcre
-	app-misc/mime-types
-	fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
-	pam? ( virtual/pam )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( dev-db/postgresql )
-	spell? ( app-text/aspell )
-	fam? ( virtual/fam )
-	!mail-filter/maildrop
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp
-	!mail-mta/opensmtpd
-	!net-mail/dot-forward
-	!sys-apps/ucspi-tcp
-	"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	sys-process/procps"
-
-# get rid of old style virtual/imapd - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/cyrus-imapd
-	!net-mail/uw-imap"
-
-PDEPEND="pam? ( net-mail/mailbase )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use norewrite && epatch "${FILESDIR}/norewrite.patch"
-	epatch "${FILESDIR}/courier-0.74.0-fix-linking.diff"
-}
-
-src_compile() {
-	filter-flags '-fomit-frame-pointer'
-
-	local myconf
-	myconf=""
-
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-
-	econf ${myconf} \
-		$(use_with fam) \
-		$(use_with ipv6) \
-		$(use_with spell ispell) \
-		$(use_with ldap ldapaliasd) \
-		$(use_enable ldap maildroldap) \
-		$(use_with gnutls) \
-		--enable-mimetypes=/etc/mime.types \
-		--prefix=/usr \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--datadir=/usr/share/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--localstatedir=/var/lib/courier \
-		--with-piddir=/var/run/courier \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--with-paranoid-smtpext \
-		--with-db=gdbm \
-		--disable-autorenamesent \
-		--cache-file="${S}/configuring.cache" \
-		--host="${CHOST}" debug=true || die "./configure"
-	sed -e'/^install-perms-local:/a\	sed -e\"s|^|'"${D}"'|g\" -i permissions.dat' -i Makefile
-	emake || die "Compile problem"
-}
-
-etc_courier() {
-	# Import existing /etc/courier/file if it exists.
-	# Add option only if it was not already set or even commented out
-	file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
-	[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
-			cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
-	grep -q "${word}" "${D}/etc/courier/${file}" || \
-		echo "${2}" >> "${D}/etc/courier/${file}"
-}
-
-etc_courier_chg() {
-	file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
-	[ -z "${section}" ] && section="${2}"
-	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
-	sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-}
-
-src_install() {
-	local f
-	diropts -o mail -g mail
-	keepdir /var/lib/courier/tmp
-	keepdir /var/lib/courier/msgs
-	make install DESTDIR="${D}" || die "install"
-	make install-configure || die "install-configure"
-
-	# Get rid of files we dont want
-	if ! use webmail ; then
-		rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
-			"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
-			"${D}/usr/share/courier/sqwebmail/" \
-			"${D}/usr/sbin/webmaild" \
-			"${D}/usr/sbin/webgpg" \
-			"${D}/etc/courier/webmail.authpam" \
-			"${D}/var/lib/courier/webmail-logincache" \
-			"${D}"/etc/courier/sqwebmaild*
-	fi
-
-	if ! use web ; then
-		rm -rf "${D}/usr/share/courier/courierwebadmin/" \
-			"${D}/etc/courier/webadmin"
-	fi
-
-	for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
-		keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
-	done
-
-	newinitd "${FILESDIR}/courier-init-r4" "courier"
-	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
-
-	cd "${D}/etc/courier"
-	if use webmail ; then
-		insinto /etc/courier
-		newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
-	fi
-
-	for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
-	if use ldap ; then
-		[ -e ldapaliasrc ] &&  ( chown root:0 ldapaliasrc ; chmod 400 ldapaliasrc )
-	else
-		rm -f ldapaliasrc
-	fi
-
-	( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
-		> "${D}/etc/courier/sizelimit"
-	etc_courier maildroprc ""
-	etc_courier esmtproutes ""
-	etc_courier backuprelay ""
-	etc_courier locallowercase ""
-	etc_courier bofh "opt BOFHBADMIME=accept"
-	etc_courier bofh "opt BOFHSPFTRUSTME=1"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
-	etc_courier bofh "opt BOFHSPFFROM=all"
-	etc_courier bofh "opt BOFHSPFMAILFROM=all"
-	etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
-	etc_courier esmtpd "BOFHBADMIME=accept"
-	etc_courier esmtpd-ssl "BOFHBADMIME=accept"
-	etc_courier esmtpd-msa "BOFHBADMIME=accept"
-
-	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
-	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
-
-	# Fix for a sandbox violation on subsequential merges
-	# - ticho@gentoo.org, 2005-07-10
-	dosym /usr/share/courier/pop3d /usr/sbin/courier-pop3d
-	dosym /usr/share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
-	dosym /usr/share/courier/imapd /usr/sbin/courier-imapd
-	dosym /usr/share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
-
-	cd "${S}"
-	cp imap/README README.imap
-	use nls && cp unicode/README README.unicode
-	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
-	dodoc tcpd/README.couriertls
-	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"
-
-	if use webmail ; then
-		insinto /usr/$(get_libdir)/courier/courier
-		insopts -m 755 -o mail -g mail
-		doins "${S}/courier/webmaild"
-	fi
-
-	if use web ; then
-		insinto /etc/courier/webadmin
-		insopts -m 400 -o mail -g mail
-		doins "${FILESDIR}/password.dist"
-	fi
-
-	# avoid name collisions in /usr/sbin, make webadmin match
-	cd "${D}/usr/sbin"
-	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
-	if use web ; then
-		sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
-			-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
-			"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
-			|| ewarn "failed to fix webadmin"
-		sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
-			-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
-			"${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
-			|| ewarn "failed to fix webadmin"
-	fi
-
-	# users should be able to send mail. Could be restricted with suictl.
-	chmod u+s "${D}/usr/bin/sendmail"
-
-	dosym /usr/bin/sendmail /usr/sbin/sendmail
-}
-
-src_test() {
-	if [ `whoami` != 'root' ]; then
-		emake -j1 check || die "Make check failed."
-	else
-		einfo "make check skipped, can't run as root."
-		einfo "You can enable it with FEATURES=\"userpriv\""
-	fi
-}
-
-pkg_postinst() {
-	use fam && elog "fam daemon is needed for courier-imapd" \
-		|| ewarn "courier was built without fam support"
-}
-
-pkg_config() {
-	mailhost="$(hostname)"
-	export mailhost
-
-	domainname="$(domainname)"
-	if [ "x$domainname" = "x(none)" ] ; then
-		domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
-	fi
-	export domainname
-
-	if [ "${ROOT}" = "/" ] ; then
-		file="${ROOT}/etc/courier/locals"
-		if [ ! -f "${file}" ] ; then
-			echo "localhost" > "${file}";
-			echo "${domainname}" >> "${file}";
-		fi
-		file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
-		if [ ! -f "${file}" ] ; then
-			echo "${domainname}" > "${file}"
-			/usr/sbin/makeacceptmailfor
-		fi
-
-		file="${ROOT}/etc/courier/smtpaccess/${domainname}"
-		if [ ! -f "${file}" ]
-		then
-			netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
-			do
-				i=1
-				net=""
-				TIFS="${IFS}"
-				IFS="."
-				for o in "${netmask}"
-				do
-					if [ "${o}" == "255" ]
-					then
-						[ "_${net}" == "_" ] || net="${net}."
-						t="$(echo "${network}" | cut -d " " -f ${i})"
-						net="${net}${t}"
-					fi
-					i="$((${i} + 1))"
-				done
-				IFS="${TIFS}"
-				echo "doing configuration - relay control for the network ${net} !"
-				echo "${net}	allow,RELAYCLIENT" >> ${file}
-			done
-			/usr/sbin/makesmtpaccess
-		fi
-	fi
-
-	echo "creating cert for esmtpd-ssl:"
-	/usr/sbin/mkesmtpdcert
-	echo "creating cert for imapd-ssl:"
-	/usr/sbin/mkpop3dcert
-	echo "creating cert for pop3d-ssl:"
-	/usr/sbin/mkimapdcert
-}
diff --git a/mail-mta/courier/courier-0.74.1-r1.ebuild b/mail-mta/courier/courier-0.74.1-r1.ebuild
deleted file mode 100644
index 1488c60ff827..000000000000
--- a/mail-mta/courier/courier-0.74.1-r1.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-SLOT="0"
-LICENSE="GPL-2"
-# not in keywords due to missing dependencies:
-# ~arm ~s390 ~ppc64 ~alpha ~hppa ~ia64 ~ppc ~sparc ~x86
-KEYWORDS="amd64 ~arm hppa ppc ~x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
-	fam web webmail gnutls"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.66.1
-	net-libs/courier-unicode
-	!gnutls? ( >=dev-libs/openssl-0.9.6 )
-	gnutls? ( net-libs/gnutls )
-	>=sys-libs/gdbm-1.8.0
-	dev-libs/libpcre
-	app-misc/mime-types
-	fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
-	pam? ( virtual/pam )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( dev-db/postgresql )
-	spell? ( app-text/aspell )
-	fam? ( virtual/fam )
-	!mail-filter/maildrop
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp
-	!mail-mta/opensmtpd
-	!net-mail/dot-forward
-	!sys-apps/ucspi-tcp
-	"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	sys-process/procps"
-
-# get rid of old style virtual/imapd - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/cyrus-imapd
-	!net-mail/uw-imap"
-
-PDEPEND="pam? ( net-mail/mailbase )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/courier-0.74.1-fix-testsuite.diff"
-	epatch "${FILESDIR}/courier-0.74.1-fix-implicit-declaration-warning.diff"
-	use norewrite && epatch "${FILESDIR}/norewrite.patch"
-}
-
-src_compile() {
-	filter-flags '-fomit-frame-pointer'
-
-	local myconf
-	myconf=""
-
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-
-	econf ${myconf} \
-		$(use_with fam) \
-		$(use_with ipv6) \
-		$(use_with spell ispell) \
-		$(use_with ldap ldapaliasd) \
-		$(use_enable ldap maildroldap) \
-		$(use_with gnutls) \
-		--enable-mimetypes=/etc/mime.types \
-		--prefix=/usr \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--datadir=/usr/share/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--localstatedir=/var/lib/courier \
-		--with-piddir=/var/run/courier \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--with-paranoid-smtpext \
-		--with-db=gdbm \
-		--disable-autorenamesent \
-		--cache-file="${S}/configuring.cache" \
-		--host="${CHOST}" debug=true || die "./configure"
-	sed -e'/^install-perms-local:/a\	sed -e\"s|^|'"${D}"'|g\" -i permissions.dat' -i Makefile
-	emake || die "Compile problem"
-}
-
-etc_courier() {
-	# Import existing /etc/courier/file if it exists.
-	# Add option only if it was not already set or even commented out
-	file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
-	[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
-			cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
-	grep -q "${word}" "${D}/etc/courier/${file}" || \
-		echo "${2}" >> "${D}/etc/courier/${file}"
-}
-
-etc_courier_chg() {
-	file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
-	[ -z "${section}" ] && section="${2}"
-	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
-	sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-}
-
-src_install() {
-	local f
-	diropts -o mail -g mail
-	keepdir /var/lib/courier/tmp
-	keepdir /var/lib/courier/msgs
-	make install DESTDIR="${D}" || die "install"
-	make install-configure || die "install-configure"
-
-	# init script takes care of this
-	rm -rf "${D}/var/run"
-
-	# Get rid of files we dont want
-	if ! use webmail ; then
-		rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
-			"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
-			"${D}/usr/share/courier/sqwebmail/" \
-			"${D}/usr/sbin/webmaild" \
-			"${D}/usr/sbin/webgpg" \
-			"${D}/etc/courier/webmail.authpam" \
-			"${D}/var/lib/courier/webmail-logincache" \
-			"${D}"/etc/courier/sqwebmaild*
-	fi
-
-	if ! use web ; then
-		rm -rf "${D}/usr/share/courier/courierwebadmin/" \
-			"${D}/etc/courier/webadmin"
-	fi
-
-	for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
-		keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
-	done
-
-	newinitd "${FILESDIR}/courier-init-r4" "courier"
-	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
-
-	cd "${D}/etc/courier"
-	if use webmail ; then
-		insinto /etc/courier
-		newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
-	fi
-
-	for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
-	if use ldap ; then
-		[ -e ldapaliasrc ] &&  ( chown root:0 ldapaliasrc ; chmod 400 ldapaliasrc )
-	else
-		rm -f ldapaliasrc
-	fi
-
-	( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
-		> "${D}/etc/courier/sizelimit"
-	etc_courier maildroprc ""
-	etc_courier esmtproutes ""
-	etc_courier backuprelay ""
-	etc_courier locallowercase ""
-	etc_courier bofh "opt BOFHBADMIME=accept"
-	etc_courier bofh "opt BOFHSPFTRUSTME=1"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
-	etc_courier bofh "opt BOFHSPFFROM=all"
-	etc_courier bofh "opt BOFHSPFMAILFROM=all"
-	etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
-	etc_courier esmtpd "BOFHBADMIME=accept"
-	etc_courier esmtpd-ssl "BOFHBADMIME=accept"
-	etc_courier esmtpd-msa "BOFHBADMIME=accept"
-
-	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
-	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
-
-	# Fix for a sandbox violation on subsequential merges
-	# - ticho@gentoo.org, 2005-07-10
-	dosym /usr/share/courier/pop3d /usr/sbin/courier-pop3d
-	dosym /usr/share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
-	dosym /usr/share/courier/imapd /usr/sbin/courier-imapd
-	dosym /usr/share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
-
-	cd "${S}"
-	cp imap/README README.imap
-	use nls && cp unicode/README README.unicode
-	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
-	dodoc libs/tcpd/README.couriertls
-	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"
-
-	if use webmail ; then
-		insinto /usr/$(get_libdir)/courier/courier
-		insopts -m 755 -o mail -g mail
-		doins "${S}/courier/webmaild"
-	fi
-
-	if use web ; then
-		insinto /etc/courier/webadmin
-		insopts -m 400 -o mail -g mail
-		doins "${FILESDIR}/password.dist"
-	fi
-
-	# avoid name collisions in /usr/sbin, make webadmin match
-	cd "${D}/usr/sbin"
-	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
-	if use web ; then
-		sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
-			-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
-			"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
-			|| ewarn "failed to fix webadmin"
-		sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
-			-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
-			"${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
-			|| ewarn "failed to fix webadmin"
-	fi
-
-	# users should be able to send mail. Could be restricted with suictl.
-	chmod u+s "${D}/usr/bin/sendmail"
-
-	dosym /usr/bin/sendmail /usr/sbin/sendmail
-}
-
-src_test() {
-	if [ `whoami` != 'root' ]; then
-		emake -j1 check || die "Make check failed."
-	else
-		einfo "make check skipped, can't run as root."
-		einfo "You can enable it with FEATURES=\"userpriv\""
-	fi
-}
-
-pkg_postinst() {
-	use fam && elog "fam daemon is needed for courier-imapd" \
-		|| ewarn "courier was built without fam support"
-}
-
-pkg_config() {
-	mailhost="$(hostname)"
-	export mailhost
-
-	domainname="$(domainname)"
-	if [ "x$domainname" = "x(none)" ] ; then
-		domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
-	fi
-	export domainname
-
-	if [ "${ROOT}" = "/" ] ; then
-		file="${ROOT}/etc/courier/locals"
-		if [ ! -f "${file}" ] ; then
-			echo "localhost" > "${file}";
-			echo "${domainname}" >> "${file}";
-		fi
-		file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
-		if [ ! -f "${file}" ] ; then
-			echo "${domainname}" > "${file}"
-			/usr/sbin/makeacceptmailfor
-		fi
-
-		file="${ROOT}/etc/courier/smtpaccess/${domainname}"
-		if [ ! -f "${file}" ]
-		then
-			netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
-			do
-				i=1
-				net=""
-				TIFS="${IFS}"
-				IFS="."
-				for o in "${netmask}"
-				do
-					if [ "${o}" == "255" ]
-					then
-						[ "_${net}" == "_" ] || net="${net}."
-						t="$(echo "${network}" | cut -d " " -f ${i})"
-						net="${net}${t}"
-					fi
-					i="$((${i} + 1))"
-				done
-				IFS="${TIFS}"
-				echo "doing configuration - relay control for the network ${net} !"
-				echo "${net}	allow,RELAYCLIENT" >> ${file}
-			done
-			/usr/sbin/makesmtpaccess
-		fi
-	fi
-
-	echo "creating cert for esmtpd-ssl:"
-	/usr/sbin/mkesmtpdcert
-	echo "creating cert for imapd-ssl:"
-	/usr/sbin/mkpop3dcert
-	echo "creating cert for pop3d-ssl:"
-	/usr/sbin/mkimapdcert
-}
diff --git a/mail-mta/courier/courier-0.74.1.ebuild b/mail-mta/courier/courier-0.74.1.ebuild
deleted file mode 100644
index dfc607b8fbaf..000000000000
--- a/mail-mta/courier/courier-0.74.1.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-SLOT="0"
-LICENSE="GPL-2"
-# not in keywords due to missing dependencies:
-# ~arm ~s390 ~ppc64 ~alpha ~hppa ~ia64 ~ppc ~sparc ~x86
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
-	fam web webmail gnutls"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.66.1
-	net-libs/courier-unicode
-	!gnutls? ( >=dev-libs/openssl-0.9.6 )
-	gnutls? ( net-libs/gnutls )
-	>=sys-libs/gdbm-1.8.0
-	dev-libs/libpcre
-	app-misc/mime-types
-	fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
-	pam? ( virtual/pam )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( dev-db/postgresql )
-	spell? ( app-text/aspell )
-	fam? ( virtual/fam )
-	!mail-filter/maildrop
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp
-	!mail-mta/opensmtpd
-	!net-mail/dot-forward
-	!sys-apps/ucspi-tcp
-	"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	sys-process/procps"
-
-# get rid of old style virtual/imapd - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/cyrus-imapd
-	!net-mail/uw-imap"
-
-PDEPEND="pam? ( net-mail/mailbase )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use norewrite && epatch "${FILESDIR}/norewrite.patch"
-}
-
-src_compile() {
-	filter-flags '-fomit-frame-pointer'
-
-	local myconf
-	myconf=""
-
-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-
-	econf ${myconf} \
-		$(use_with fam) \
-		$(use_with ipv6) \
-		$(use_with spell ispell) \
-		$(use_with ldap ldapaliasd) \
-		$(use_enable ldap maildroldap) \
-		$(use_with gnutls) \
-		--enable-mimetypes=/etc/mime.types \
-		--prefix=/usr \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/courier \
-		--libexecdir=/usr/$(get_libdir)/courier \
-		--datadir=/usr/share/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--localstatedir=/var/lib/courier \
-		--with-piddir=/var/run/courier \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--with-paranoid-smtpext \
-		--with-db=gdbm \
-		--disable-autorenamesent \
-		--cache-file="${S}/configuring.cache" \
-		--host="${CHOST}" debug=true || die "./configure"
-	sed -e'/^install-perms-local:/a\	sed -e\"s|^|'"${D}"'|g\" -i permissions.dat' -i Makefile
-	emake || die "Compile problem"
-}
-
-etc_courier() {
-	# Import existing /etc/courier/file if it exists.
-	# Add option only if it was not already set or even commented out
-	file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
-	[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
-			cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
-	grep -q "${word}" "${D}/etc/courier/${file}" || \
-		echo "${2}" >> "${D}/etc/courier/${file}"
-}
-
-etc_courier_chg() {
-	file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
-	[ -z "${section}" ] && section="${2}"
-	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
-	sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-}
-
-src_install() {
-	local f
-	diropts -o mail -g mail
-	keepdir /var/lib/courier/tmp
-	keepdir /var/lib/courier/msgs
-	make install DESTDIR="${D}" || die "install"
-	make install-configure || die "install-configure"
-
-	# Get rid of files we dont want
-	if ! use webmail ; then
-		rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
-			"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
-			"${D}/usr/share/courier/sqwebmail/" \
-			"${D}/usr/sbin/webmaild" \
-			"${D}/usr/sbin/webgpg" \
-			"${D}/etc/courier/webmail.authpam" \
-			"${D}/var/lib/courier/webmail-logincache" \
-			"${D}"/etc/courier/sqwebmaild*
-	fi
-
-	if ! use web ; then
-		rm -rf "${D}/usr/share/courier/courierwebadmin/" \
-			"${D}/etc/courier/webadmin"
-	fi
-
-	for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
-		keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
-	done
-
-	newinitd "${FILESDIR}/courier-init-r4" "courier"
-	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
-
-	cd "${D}/etc/courier"
-	if use webmail ; then
-		insinto /etc/courier
-		newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
-	fi
-
-	for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
-	if use ldap ; then
-		[ -e ldapaliasrc ] &&  ( chown root:0 ldapaliasrc ; chmod 400 ldapaliasrc )
-	else
-		rm -f ldapaliasrc
-	fi
-
-	( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
-		> "${D}/etc/courier/sizelimit"
-	etc_courier maildroprc ""
-	etc_courier esmtproutes ""
-	etc_courier backuprelay ""
-	etc_courier locallowercase ""
-	etc_courier bofh "opt BOFHBADMIME=accept"
-	etc_courier bofh "opt BOFHSPFTRUSTME=1"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
-	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
-	etc_courier bofh "opt BOFHSPFFROM=all"
-	etc_courier bofh "opt BOFHSPFMAILFROM=all"
-	etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
-	etc_courier esmtpd "BOFHBADMIME=accept"
-	etc_courier esmtpd-ssl "BOFHBADMIME=accept"
-	etc_courier esmtpd-msa "BOFHBADMIME=accept"
-
-	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
-	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
-
-	# Fix for a sandbox violation on subsequential merges
-	# - ticho@gentoo.org, 2005-07-10
-	dosym /usr/share/courier/pop3d /usr/sbin/courier-pop3d
-	dosym /usr/share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
-	dosym /usr/share/courier/imapd /usr/sbin/courier-imapd
-	dosym /usr/share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
-
-	cd "${S}"
-	cp imap/README README.imap
-	use nls && cp unicode/README README.unicode
-	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
-	dodoc tcpd/README.couriertls
-	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"
-
-	if use webmail ; then
-		insinto /usr/$(get_libdir)/courier/courier
-		insopts -m 755 -o mail -g mail
-		doins "${S}/courier/webmaild"
-	fi
-
-	if use web ; then
-		insinto /etc/courier/webadmin
-		insopts -m 400 -o mail -g mail
-		doins "${FILESDIR}/password.dist"
-	fi
-
-	# avoid name collisions in /usr/sbin, make webadmin match
-	cd "${D}/usr/sbin"
-	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
-	if use web ; then
-		sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
-			-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
-			"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
-			|| ewarn "failed to fix webadmin"
-		sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
-			-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
-			"${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
-			|| ewarn "failed to fix webadmin"
-	fi
-
-	# users should be able to send mail. Could be restricted with suictl.
-	chmod u+s "${D}/usr/bin/sendmail"
-
-	dosym /usr/bin/sendmail /usr/sbin/sendmail
-}
-
-src_test() {
-	if [ `whoami` != 'root' ]; then
-		emake -j1 check || die "Make check failed."
-	else
-		einfo "make check skipped, can't run as root."
-		einfo "You can enable it with FEATURES=\"userpriv\""
-	fi
-}
-
-pkg_postinst() {
-	use fam && elog "fam daemon is needed for courier-imapd" \
-		|| ewarn "courier was built without fam support"
-}
-
-pkg_config() {
-	mailhost="$(hostname)"
-	export mailhost
-
-	domainname="$(domainname)"
-	if [ "x$domainname" = "x(none)" ] ; then
-		domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
-	fi
-	export domainname
-
-	if [ "${ROOT}" = "/" ] ; then
-		file="${ROOT}/etc/courier/locals"
-		if [ ! -f "${file}" ] ; then
-			echo "localhost" > "${file}";
-			echo "${domainname}" >> "${file}";
-		fi
-		file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
-		if [ ! -f "${file}" ] ; then
-			echo "${domainname}" > "${file}"
-			/usr/sbin/makeacceptmailfor
-		fi
-
-		file="${ROOT}/etc/courier/smtpaccess/${domainname}"
-		if [ ! -f "${file}" ]
-		then
-			netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
-			do
-				i=1
-				net=""
-				TIFS="${IFS}"
-				IFS="."
-				for o in "${netmask}"
-				do
-					if [ "${o}" == "255" ]
-					then
-						[ "_${net}" == "_" ] || net="${net}."
-						t="$(echo "${network}" | cut -d " " -f ${i})"
-						net="${net}${t}"
-					fi
-					i="$((${i} + 1))"
-				done
-				IFS="${TIFS}"
-				echo "doing configuration - relay control for the network ${net} !"
-				echo "${net}	allow,RELAYCLIENT" >> ${file}
-			done
-			/usr/sbin/makesmtpaccess
-		fi
-	fi
-
-	echo "creating cert for esmtpd-ssl:"
-	/usr/sbin/mkesmtpdcert
-	echo "creating cert for imapd-ssl:"
-	/usr/sbin/mkpop3dcert
-	echo "creating cert for pop3d-ssl:"
-	/usr/sbin/mkimapdcert
-}
diff --git a/mail-mta/courier/files/courier-0.74.0-fix-linking.diff b/mail-mta/courier/files/courier-0.74.0-fix-linking.diff
deleted file mode 100644
index f9d10d02c432..000000000000
--- a/mail-mta/courier/files/courier-0.74.0-fix-linking.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur courier-0.74.0/libs/gpglib/Makefile.am courier-0.74.0-1/libs/gpglib/Makefile.am
---- courier-0.74.0/libs/gpglib/Makefile.am	2014-12-04 03:31:09.000000000 +0100
-+++ courier-0.74.0-1/libs/gpglib/Makefile.am	2014-12-14 02:18:25.599274395 +0100
-@@ -18,7 +18,7 @@
- 
- testgpg_SOURCES=testgpg.c
- testgpg_DEPENDENCIES=libgpg.la ../numlib/libnumlib.la
--testgpg_LDADD= -lunicode $(testgpg_DEPENDENCIES)
-+testgpg_LDADD= $(testgpg_DEPENDENCIES) -lunicode
- testgpg_LDFLAGS=-static
- 
- mimegpg_SOURCES=mimegpg.c
-diff -Naur courier-0.74.0/libs/gpglib/Makefile.in courier-0.74.0-1/libs/gpglib/Makefile.in
---- courier-0.74.0/libs/gpglib/Makefile.in	2014-12-13 15:26:42.000000000 +0100
-+++ courier-0.74.0-1/libs/gpglib/Makefile.in	2014-12-14 02:18:35.512275143 +0100
-@@ -335,7 +335,7 @@
- 
- testgpg_SOURCES = testgpg.c
- testgpg_DEPENDENCIES = libgpg.la ../numlib/libnumlib.la
--testgpg_LDADD = -lunicode $(testgpg_DEPENDENCIES)
-+testgpg_LDADD = $(testgpg_DEPENDENCIES) -lunicode
- testgpg_LDFLAGS = -static
- mimegpg_SOURCES = mimegpg.c
- mimegpg_LDADD = libgpg.la ../rfc2045/librfc2045.la ../rfc822/librfc822.la \
diff --git a/mail-mta/courier/files/courier-0.74.1-fix-implicit-declaration-warning.diff b/mail-mta/courier/files/courier-0.74.1-fix-implicit-declaration-warning.diff
deleted file mode 100644
index e21da955d17c..000000000000
--- a/mail-mta/courier/files/courier-0.74.1-fix-implicit-declaration-warning.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- courier-0.74.1/libs/rfc1035/testlookup.c	2014-11-04 13:15:00.000000000 +0100
-+++ courier-0.74.1-1/libs/rfc1035/testlookup.c	2015-02-16 13:36:14.455760592 +0100
-@@ -41,6 +41,9 @@
- 
- extern char rfc1035_spf_gettxt(const char *current_domain,
- 			       char *buf);
-+extern char rfc1035_spf_gettxt_n(const char *current_domain,
-+			  char **buf);
-+
- 
- static void spflookup(const char *current_domain)
- {
diff --git a/mail-mta/courier/files/courier-0.74.1-fix-testsuite.diff b/mail-mta/courier/files/courier-0.74.1-fix-testsuite.diff
deleted file mode 100644
index b19bf2fc6fca..000000000000
--- a/mail-mta/courier/files/courier-0.74.1-fix-testsuite.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- courier-0.74.1-plain/libs/maildrop/testsuite2	2013-08-30 02:36:07.000000000 +0200
-+++ courier-0.74.1/libs/maildrop/testsuite2	2015-02-16 13:22:37.455698929 +0100
-@@ -232,7 +232,8 @@
- 
- for f in testsuite?.filter
- do
--    echo 'xfilter "cat"' >t
-+    echo "SHELL=/bin/sh" > t
-+    echo 'xfilter "cat"' >>t
-     cat $f >>t
-     chmod 600 t
-     mv -f t $f