From e2db47eaae00ec33f8971db44b68645c5d3b9590 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 17 Aug 2021 11:36:49 +0100
Subject: gentoo resync : 17.08.2021

---
 mail-mta/Manifest.gz                            | Bin 2379 -> 2378 bytes
 mail-mta/courier/Manifest                       |  12 +-
 mail-mta/courier/courier-1.0.13-r1.ebuild       | 312 +++++++++++++++++++++++
 mail-mta/courier/courier-1.0.13.ebuild          | 312 -----------------------
 mail-mta/courier/courier-1.0.14-r1.ebuild       | 312 +++++++++++++++++++++++
 mail-mta/courier/courier-1.0.14.ebuild          | 312 -----------------------
 mail-mta/courier/courier-1.0.17-r1.ebuild       | 312 +++++++++++++++++++++++
 mail-mta/courier/courier-1.0.17.ebuild          | 312 -----------------------
 mail-mta/courier/courier-1.0.5-r1.ebuild        | 317 ++++++++++++++++++++++++
 mail-mta/courier/courier-1.0.5.ebuild           | 317 ------------------------
 mail-mta/courier/courier-1.1.2-r1.ebuild        | 312 +++++++++++++++++++++++
 mail-mta/courier/courier-1.1.2.ebuild           | 312 -----------------------
 mail-mta/courier/courier-1.1.5-r1.ebuild        | 312 +++++++++++++++++++++++
 mail-mta/courier/courier-1.1.5.ebuild           | 312 -----------------------
 mail-mta/netqmail/Manifest                      |   2 +-
 mail-mta/netqmail/netqmail-1.06-r14.ebuild      |   4 -
 mail-mta/notqmail/Manifest                      |   4 +-
 mail-mta/notqmail/notqmail-1.08-r3.ebuild       |   6 +-
 mail-mta/notqmail/notqmail-9999.ebuild          |   8 +-
 mail-mta/postfix/Manifest                       |   4 +-
 mail-mta/postfix/postfix-3.7_pre20210807.ebuild | 286 ---------------------
 mail-mta/postfix/postfix-3.7_pre20210815.ebuild | 286 +++++++++++++++++++++
 22 files changed, 2177 insertions(+), 2189 deletions(-)
 create mode 100644 mail-mta/courier/courier-1.0.13-r1.ebuild
 delete mode 100644 mail-mta/courier/courier-1.0.13.ebuild
 create mode 100644 mail-mta/courier/courier-1.0.14-r1.ebuild
 delete mode 100644 mail-mta/courier/courier-1.0.14.ebuild
 create mode 100644 mail-mta/courier/courier-1.0.17-r1.ebuild
 delete mode 100644 mail-mta/courier/courier-1.0.17.ebuild
 create mode 100644 mail-mta/courier/courier-1.0.5-r1.ebuild
 delete mode 100644 mail-mta/courier/courier-1.0.5.ebuild
 create mode 100644 mail-mta/courier/courier-1.1.2-r1.ebuild
 delete mode 100644 mail-mta/courier/courier-1.1.2.ebuild
 create mode 100644 mail-mta/courier/courier-1.1.5-r1.ebuild
 delete mode 100644 mail-mta/courier/courier-1.1.5.ebuild
 delete mode 100644 mail-mta/postfix/postfix-3.7_pre20210807.ebuild
 create mode 100644 mail-mta/postfix/postfix-3.7_pre20210815.ebuild

(limited to 'mail-mta')

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 322ccd3de1e6..da457efe23dc 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index f84f0741cf9f..2b2bda0d6051 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -8,10 +8,10 @@ DIST courier-1.0.17.tar.bz2 7644893 BLAKE2B c31a5f9b27119b0affc7fe3b66da8d35534f
 DIST courier-1.0.5.tar.bz2 7465054 BLAKE2B 55e9ba2a85889e7210652475149f4d3e687fd63a27b44a5a16c888b2f60bb18c4156e3344792585fed2ee3d81770e79c55ce5791842c255b8701bad5d2f8af4e SHA512 99a8e98633da99abd1f6f4e24328d4655526d51dc9fc03ffcb9c1e0cce0e608dedb2ac9511829af4487ff5af4618500d6fbbee26568f2a05e3c9d3cf3b48b2a5
 DIST courier-1.1.2.tar.bz2 7652292 BLAKE2B 3d5ded14e3972532abd86bdd9d2a144dc907d6e0d1300dcc5395fcc36984bc619453e612c4c2b504fd06cdbea44ce9cd70227e5b122445704df3ba852cdc5594 SHA512 e0267acae90e792a8813b189296a599c4e27337bd5952d311cc99b068b628d4c0c6e0ae4c6ccb03fd6ada4d0a9cb362c59a7a21833177301a830fcb4c437abfd
 DIST courier-1.1.5.tar.bz2 7654159 BLAKE2B 7ad09b4b3c8ec201ea275851aec4efb34861a2881c765228b58063d26f17580fbe8ffe4e882d43b74ed048c3bf711e0eb08cb45eb1ba25ab2073a8c411a6cd4f SHA512 6b7040a73b09a4fc0ad4d93c576d7d7026aa743e5bbfe3ae14d2474dd9cffdb3419eceb14000cc0beeae40886796d9973e9f8611a7ea925cf2e0ab928904038a
-EBUILD courier-1.0.13.ebuild 9224 BLAKE2B 5208e68e759506bc292dbb588c9dfeaaa1f461b69e3c41758e6c91373fdf12f6897b49f0edbd2a3eb085fef1f7996eb68458295a0595e0628fc3d0fb86b50657 SHA512 3cc51f382bcc84f75c12bcb7c76742f8a2546f3c7dd56c20fc87b56e2c60b2715f29cebac5e998497fdc086bfe361b5e96d2dbcb09db9d5b6aa5d8bad8986375
-EBUILD courier-1.0.14.ebuild 9218 BLAKE2B 44fabea536a2b64fa88047a074cbbf30c04c071182c6551f3fa969deb875b000fb764810204d1f73dfe8c6d6edca77e2b04d933ac3d038f40102d0a538d6ed42 SHA512 4644d80a601ce95d8b0127353ae24f4434d7701c3da1916640f5e878354e11f6982544e9d3e70d0c40ed470a15d244c76b7e436e723c51ae702f43fe3ddd93f2
-EBUILD courier-1.0.17.ebuild 9226 BLAKE2B 6bc83cef3ea12abe29323d742022584ce7b8024a29eebe8c1e1a280d47d88f89da2bb000203a9146d54b7c52aa11480b8e7116de63152c8f3238059784b9f886 SHA512 9f6d36c6019a16d59c6825de7991cf22afe38e288b02884f33488738ce289a10fdbba9a493fc7a2a790fdbcc7ea9340b2fdedeb52b8ebda37e0ecfb08f0e23d7
-EBUILD courier-1.0.5.ebuild 9443 BLAKE2B 4db42a5ec6807d65df7e5f552fd9fa4723fd55ffc3e48cb10928e455194c09dfdbce92d61caa988db66e18209bfda36d06f4fe641d96ccf1e9b9f37b17d444d8 SHA512 f19f078f7f7567285cf2cfbd86b16e38532f0b51519283b642f0acac30b2b7c4a49322792d7359adabee73d55fa5368a286d1402df44c4019c91c9cb248cb2ff
-EBUILD courier-1.1.2.ebuild 9233 BLAKE2B da6ab9db691a408a4f5aebbaa4134100fccfe8fea11b7e690625f182c5720e5ca5ad98e64ed99e1aa175dd3d1f957d1aec61f61778b4de533657ce7d1d701ce9 SHA512 34254604b8859573c96c04f365cc145b6d5816dd63ca0e2e5847794f7014544f87880b33318c2a8bfdfafebdf88c466584a1385a1f2acf399ff1f7706d128f55
-EBUILD courier-1.1.5.ebuild 9227 BLAKE2B 31c11a26b4ffe178188103ecb20804d263a4caa9913e802b644f8233aa590a06245f67ef2f1c833b2c46079dd3aa7af620d94aa5587e0da004180c53baec3b0c SHA512 1d8faa10604ad31cff09f8a5eaa4faead410cfe5d12db4de2cd90ad5d486fd2ba5a028ebf0c8ebe019458d1e73bfcdc2620bd030111f9e53f61dc02a6c7e7fc0
+EBUILD courier-1.0.13-r1.ebuild 9228 BLAKE2B a617084d65ab98825648f83980fc9945a83f64e750640fb260ca73389d03df8c8f1a105f6b3666b07771fed22bb633af2a1aa073c1a4dbf881ec0221e9677f72 SHA512 854803815d64b702c1b38c8a8408830fe9fa1c2b90856d1b51b9790f19199d3ad49b9605bb07264b17370a5bbc2726719af923237c7c2034da661cd93b7a056f
+EBUILD courier-1.0.14-r1.ebuild 9222 BLAKE2B d2fcf292acfeb50718219b224b950a0e7780400b19eb89e3d7dffbc4226dd11cc7896cf42bed08945b0b1896317dfc0417fa2214577af8dbd02044d4435ce9aa SHA512 0f18bfbea962ca2a88b9f155c561b9e8948d4970ff661fba874a7ad1445b5d900bdf7da8ada324255bbcb5090746b95a08fd4a15e4edcd3c47d023a83d0c73bf
+EBUILD courier-1.0.17-r1.ebuild 9230 BLAKE2B 703d33dff91f0a0d296eaee8e8698978d39c605fa954987665cdb09d8eaf567b65c7b01d0878d02f14cb32b1a166395aee9283346b5545f79279274a769eec47 SHA512 c39bf3f6c47797eaa768a3e7deeee84306021e277913f906f9ddc3273b8fcf9dd6ec57cf7c93a3b1e3ce74e9c45a9bf7dd8411f160e4866255050e0ced2301e0
+EBUILD courier-1.0.5-r1.ebuild 9447 BLAKE2B 53ba4507d5f9e664cdf1b3fb0ab6628ff0dd7726d4c59fc623d400457ec7b3a7c6ee554ebe33a9f6f0d1e06cb06be16324c3fc2fa488e9a886fec05e752d22a8 SHA512 057d8141801296e5fcad4798167683eac9e9c79cb9ea217f34063bdc538536bf43b94c5170f0c735f399c101bf487d1cbcc0510a635ee34e63d29e684518d419
+EBUILD courier-1.1.2-r1.ebuild 9237 BLAKE2B 0fe69e31e88fe46342544dee1af0b9d67bad261429907076a21e88b896a25b54c6fe9762dda4af25b88575de4686bed3db324eae0726d8ced84163e63547d042 SHA512 a3e955183c1084173aa2d3b2202d7ca91204bda65cbfec5078936e86decbad274df4824e78cfb2ba1ac7207acdd2f3699b7395987ef4a21e82cf187c2af77324
+EBUILD courier-1.1.5-r1.ebuild 9231 BLAKE2B d5a6bc8aeac399d82955a02fd47195bb59f67da071ed9c310cbcb339bfb9d25ba08c65e573f6bed37e759b3588699725739b66451e12fede34b79223ec81b1f6 SHA512 e07df08b2ad30bf7a786050cf4bd3a1d996e09d1bbbf1e45c79789ac3bf3c4e15935dc92c36374f53634c459f4956d6cc4937c47bd553d607d0628feb2c0696a
 MISC metadata.xml 755 BLAKE2B 8ec0dd31ad59193d95585ab88f0bac6ced87132444a4136b2c2f80458a11f5296c42283574c3b56c26a31dad25fff530ebbfbf1ef467a1b824d11afe93a6da31 SHA512 de15af05e98deba4d3b297b4301439d892c3ba0d8af30ca459fcac72bf0179de87bf11260b8bfdb3827dd1f0e5123d68817766ffe037cece9c30adb3e8bd8b06
diff --git a/mail-mta/courier/courier-1.0.13-r1.ebuild b/mail-mta/courier/courier-1.0.13-r1.ebuild
new file mode 100644
index 000000000000..703b73416dbe
--- /dev/null
+++ b/mail-mta/courier/courier-1.0.13-r1.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+HOMEPAGE="https://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
+	fam web webmail gnutls"
+
+DEPEND="
+	>=net-libs/courier-authlib-0.70.0
+	>=net-libs/courier-unicode-2.1:=
+	net-dns/libidn:=
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		dev-libs/openssl:0=
+	)
+	>=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? ( sys-libs/pam )
+	mysql? ( dev-db/mysql-connector-c )
+	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[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/ssmtp[mta]
+	!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_prepare() {
+	use norewrite && eapply "${FILESDIR}/norewrite.patch"
+	default
+}
+
+src_configure() {
+	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) \
+		--with-notice=unicode \
+		--enable-mimetypes=/etc/mime.types \
+		--prefix=/usr \
+		--disable-root-check \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/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
+}
+
+src_compile() {
+	default
+}
+
+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:mail ldapaliasrc ; chmod 640 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 ../share/courier/pop3d /usr/sbin/courier-pop3d
+	dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
+	dosym ../share/courier/imapd /usr/sbin/courier-imapd
+	dosym ../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 ../bin/sendmail /usr/sbin/sendmail
+}
+
+src_test() {
+	if [ `whoami` != 'root' ]; then
+		emake -j1 check
+	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-1.0.13.ebuild b/mail-mta/courier/courier-1.0.13.ebuild
deleted file mode 100644
index dbbd6de31479..000000000000
--- a/mail-mta/courier/courier-1.0.13.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-HOMEPAGE="https://www.courier-mta.org/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
-	fam web webmail gnutls"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.70.0
-	>=net-libs/courier-unicode-2.1
-	net-dns/libidn:=
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		dev-libs/openssl:0=
-	)
-	>=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? ( sys-libs/pam )
-	mysql? ( dev-db/mysql-connector-c )
-	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[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp[mta]
-	!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_prepare() {
-	use norewrite && eapply "${FILESDIR}/norewrite.patch"
-	default
-}
-
-src_configure() {
-	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) \
-		--with-notice=unicode \
-		--enable-mimetypes=/etc/mime.types \
-		--prefix=/usr \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/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
-}
-
-src_compile() {
-	default
-}
-
-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:mail ldapaliasrc ; chmod 640 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 ../share/courier/pop3d /usr/sbin/courier-pop3d
-	dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
-	dosym ../share/courier/imapd /usr/sbin/courier-imapd
-	dosym ../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 ../bin/sendmail /usr/sbin/sendmail
-}
-
-src_test() {
-	if [ `whoami` != 'root' ]; then
-		emake -j1 check
-	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-1.0.14-r1.ebuild b/mail-mta/courier/courier-1.0.14-r1.ebuild
new file mode 100644
index 000000000000..da8ad168359a
--- /dev/null
+++ b/mail-mta/courier/courier-1.0.14-r1.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+HOMEPAGE="https://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
+	fam web webmail gnutls"
+
+DEPEND="
+	>=net-libs/courier-authlib-0.70.0
+	>=net-libs/courier-unicode-2.1:=
+	net-dns/libidn:=
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		dev-libs/openssl:0=
+	)
+	>=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? ( sys-libs/pam )
+	mysql? ( dev-db/mysql-connector-c )
+	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[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/ssmtp[mta]
+	!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_prepare() {
+	use norewrite && eapply "${FILESDIR}/norewrite.patch"
+	default
+}
+
+src_configure() {
+	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) \
+		--with-notice=unicode \
+		--enable-mimetypes=/etc/mime.types \
+		--prefix=/usr \
+		--disable-root-check \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/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
+}
+
+src_compile() {
+	default
+}
+
+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:mail ldapaliasrc ; chmod 640 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 ../share/courier/pop3d /usr/sbin/courier-pop3d
+	dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
+	dosym ../share/courier/imapd /usr/sbin/courier-imapd
+	dosym ../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 ../bin/sendmail /usr/sbin/sendmail
+}
+
+src_test() {
+	if [ `whoami` != 'root' ]; then
+		emake -j1 check
+	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-1.0.14.ebuild b/mail-mta/courier/courier-1.0.14.ebuild
deleted file mode 100644
index 5c392591b5d9..000000000000
--- a/mail-mta/courier/courier-1.0.14.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-HOMEPAGE="https://www.courier-mta.org/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
-	fam web webmail gnutls"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.70.0
-	>=net-libs/courier-unicode-2.1
-	net-dns/libidn:=
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		dev-libs/openssl:0=
-	)
-	>=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? ( sys-libs/pam )
-	mysql? ( dev-db/mysql-connector-c )
-	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[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp[mta]
-	!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_prepare() {
-	use norewrite && eapply "${FILESDIR}/norewrite.patch"
-	default
-}
-
-src_configure() {
-	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) \
-		--with-notice=unicode \
-		--enable-mimetypes=/etc/mime.types \
-		--prefix=/usr \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/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
-}
-
-src_compile() {
-	default
-}
-
-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:mail ldapaliasrc ; chmod 640 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 ../share/courier/pop3d /usr/sbin/courier-pop3d
-	dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
-	dosym ../share/courier/imapd /usr/sbin/courier-imapd
-	dosym ../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 ../bin/sendmail /usr/sbin/sendmail
-}
-
-src_test() {
-	if [ `whoami` != 'root' ]; then
-		emake -j1 check
-	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-1.0.17-r1.ebuild b/mail-mta/courier/courier-1.0.17-r1.ebuild
new file mode 100644
index 000000000000..60d4849c3086
--- /dev/null
+++ b/mail-mta/courier/courier-1.0.17-r1.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+HOMEPAGE="https://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
+	fam web webmail gnutls"
+
+DEPEND="
+	>=net-libs/courier-authlib-0.71.1
+	>=net-libs/courier-unicode-2.1.2:=
+	net-dns/libidn:=
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		dev-libs/openssl:0=
+	)
+	>=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? ( sys-libs/pam )
+	mysql? ( dev-db/mysql-connector-c )
+	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[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/ssmtp[mta]
+	!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_prepare() {
+	use norewrite && eapply "${FILESDIR}/norewrite.patch"
+	default
+}
+
+src_configure() {
+	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) \
+		--with-notice=unicode \
+		--enable-mimetypes=/etc/mime.types \
+		--prefix=/usr \
+		--disable-root-check \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/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
+}
+
+src_compile() {
+	default
+}
+
+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:mail ldapaliasrc ; chmod 640 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 ../share/courier/pop3d /usr/sbin/courier-pop3d
+	dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
+	dosym ../share/courier/imapd /usr/sbin/courier-imapd
+	dosym ../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 ../bin/sendmail /usr/sbin/sendmail
+}
+
+src_test() {
+	if [ `whoami` != 'root' ]; then
+		emake -j1 check
+	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-1.0.17.ebuild b/mail-mta/courier/courier-1.0.17.ebuild
deleted file mode 100644
index 54b43c46eafd..000000000000
--- a/mail-mta/courier/courier-1.0.17.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-HOMEPAGE="https://www.courier-mta.org/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
-	fam web webmail gnutls"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.71.1
-	>=net-libs/courier-unicode-2.1.2
-	net-dns/libidn:=
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		dev-libs/openssl:0=
-	)
-	>=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? ( sys-libs/pam )
-	mysql? ( dev-db/mysql-connector-c )
-	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[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp[mta]
-	!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_prepare() {
-	use norewrite && eapply "${FILESDIR}/norewrite.patch"
-	default
-}
-
-src_configure() {
-	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) \
-		--with-notice=unicode \
-		--enable-mimetypes=/etc/mime.types \
-		--prefix=/usr \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/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
-}
-
-src_compile() {
-	default
-}
-
-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:mail ldapaliasrc ; chmod 640 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 ../share/courier/pop3d /usr/sbin/courier-pop3d
-	dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
-	dosym ../share/courier/imapd /usr/sbin/courier-imapd
-	dosym ../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 ../bin/sendmail /usr/sbin/sendmail
-}
-
-src_test() {
-	if [ `whoami` != 'root' ]; then
-		emake -j1 check
-	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-1.0.5-r1.ebuild b/mail-mta/courier/courier-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..4165ee960928
--- /dev/null
+++ b/mail-mta/courier/courier-1.0.5-r1.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+HOMEPAGE="http://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
+	fam web webmail gnutls"
+
+DEPEND="
+	>=net-libs/courier-authlib-0.69.0-r1
+	>=net-libs/courier-unicode-2.1:=
+	net-dns/libidn:=
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		dev-libs/openssl:0=
+	)
+	>=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? ( sys-libs/pam )
+	mysql? ( dev-db/mysql-connector-c )
+	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[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/ssmtp[mta]
+	!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_prepare() {
+	use norewrite && eapply "${FILESDIR}/norewrite.patch"
+	default
+}
+
+src_configure() {
+	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) \
+		--with-notice=unicode \
+		--enable-mimetypes=/etc/mime.types \
+		--prefix=/usr \
+		--disable-root-check \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/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
+}
+
+src_compile() {
+	default
+}
+
+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:mail ldapaliasrc ; chmod 640 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 ../share/courier/pop3d /usr/sbin/courier-pop3d
+	dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
+	dosym ../share/courier/imapd /usr/sbin/courier-imapd
+	dosym ../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 ../bin/sendmail /usr/sbin/sendmail
+}
+
+src_test() {
+	if [ `whoami` != 'root' ]; then
+		emake -j1 check
+	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"
+
+	ewarn "If you are updating from pre-1.0 courier versions to"
+	ewarn "1.x versions you may need to update your maildir's"
+	ewarn "to the new Unicode format, see also:"
+	ewarn "https://www.courier-mta.org/maildirmake.html"
+}
+
+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-1.0.5.ebuild b/mail-mta/courier/courier-1.0.5.ebuild
deleted file mode 100644
index d72ae7ccd03b..000000000000
--- a/mail-mta/courier/courier-1.0.5.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-HOMEPAGE="http://www.courier-mta.org/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
-	fam web webmail gnutls"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.69.0-r1
-	>=net-libs/courier-unicode-2.1
-	net-dns/libidn:=
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		dev-libs/openssl:0=
-	)
-	>=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? ( sys-libs/pam )
-	mysql? ( dev-db/mysql-connector-c )
-	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[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp[mta]
-	!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_prepare() {
-	use norewrite && eapply "${FILESDIR}/norewrite.patch"
-	default
-}
-
-src_configure() {
-	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) \
-		--with-notice=unicode \
-		--enable-mimetypes=/etc/mime.types \
-		--prefix=/usr \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/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
-}
-
-src_compile() {
-	default
-}
-
-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:mail ldapaliasrc ; chmod 640 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 ../share/courier/pop3d /usr/sbin/courier-pop3d
-	dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
-	dosym ../share/courier/imapd /usr/sbin/courier-imapd
-	dosym ../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 ../bin/sendmail /usr/sbin/sendmail
-}
-
-src_test() {
-	if [ `whoami` != 'root' ]; then
-		emake -j1 check
-	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"
-
-	ewarn "If you are updating from pre-1.0 courier versions to"
-	ewarn "1.x versions you may need to update your maildir's"
-	ewarn "to the new Unicode format, see also:"
-	ewarn "https://www.courier-mta.org/maildirmake.html"
-}
-
-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-1.1.2-r1.ebuild b/mail-mta/courier/courier-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..e8148ace0707
--- /dev/null
+++ b/mail-mta/courier/courier-1.1.2-r1.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+HOMEPAGE="https://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
+	fam web webmail gnutls"
+
+DEPEND="
+	>=net-libs/courier-authlib-0.71.2
+	>=net-libs/courier-unicode-2.2.3:=
+	net-dns/libidn:=
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		dev-libs/openssl:0=
+	)
+	>=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? ( sys-libs/pam )
+	mysql? ( dev-db/mysql-connector-c )
+	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[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/ssmtp[mta]
+	!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_prepare() {
+	use norewrite && eapply "${FILESDIR}/norewrite.patch"
+	default
+}
+
+src_configure() {
+	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) \
+		--with-notice=unicode \
+		--enable-mimetypes=/etc/mime.types \
+		--prefix=/usr \
+		--disable-root-check \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/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
+}
+
+src_compile() {
+	default
+}
+
+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:mail ldapaliasrc ; chmod 640 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 ../share/courier/pop3d /usr/sbin/courier-pop3d
+	dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
+	dosym ../share/courier/imapd /usr/sbin/courier-imapd
+	dosym ../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 ../bin/sendmail /usr/sbin/sendmail
+}
+
+src_test() {
+	if [ `whoami` != 'root' ]; then
+		emake -j1 check
+	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-1.1.2.ebuild b/mail-mta/courier/courier-1.1.2.ebuild
deleted file mode 100644
index a1f75472c9bf..000000000000
--- a/mail-mta/courier/courier-1.1.2.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-HOMEPAGE="https://www.courier-mta.org/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
-	fam web webmail gnutls"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.71.2
-	>=net-libs/courier-unicode-2.2.3
-	net-dns/libidn:=
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		dev-libs/openssl:0=
-	)
-	>=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? ( sys-libs/pam )
-	mysql? ( dev-db/mysql-connector-c )
-	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[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp[mta]
-	!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_prepare() {
-	use norewrite && eapply "${FILESDIR}/norewrite.patch"
-	default
-}
-
-src_configure() {
-	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) \
-		--with-notice=unicode \
-		--enable-mimetypes=/etc/mime.types \
-		--prefix=/usr \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/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
-}
-
-src_compile() {
-	default
-}
-
-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:mail ldapaliasrc ; chmod 640 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 ../share/courier/pop3d /usr/sbin/courier-pop3d
-	dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
-	dosym ../share/courier/imapd /usr/sbin/courier-imapd
-	dosym ../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 ../bin/sendmail /usr/sbin/sendmail
-}
-
-src_test() {
-	if [ `whoami` != 'root' ]; then
-		emake -j1 check
-	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-1.1.5-r1.ebuild b/mail-mta/courier/courier-1.1.5-r1.ebuild
new file mode 100644
index 000000000000..06af7948ca32
--- /dev/null
+++ b/mail-mta/courier/courier-1.1.5-r1.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+HOMEPAGE="https://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
+	fam web webmail gnutls"
+
+DEPEND="
+	>=net-libs/courier-authlib-0.71.3
+	>=net-libs/courier-unicode-2.2.3:=
+	net-dns/libidn:=
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		dev-libs/openssl:0=
+	)
+	>=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? ( sys-libs/pam )
+	mysql? ( dev-db/mysql-connector-c )
+	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[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/ssmtp[mta]
+	!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_prepare() {
+	use norewrite && eapply "${FILESDIR}/norewrite.patch"
+	default
+}
+
+src_configure() {
+	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) \
+		--with-notice=unicode \
+		--enable-mimetypes=/etc/mime.types \
+		--prefix=/usr \
+		--disable-root-check \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/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
+}
+
+src_compile() {
+	default
+}
+
+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:mail ldapaliasrc ; chmod 640 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 ../share/courier/pop3d /usr/sbin/courier-pop3d
+	dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
+	dosym ../share/courier/imapd /usr/sbin/courier-imapd
+	dosym ../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 ../bin/sendmail /usr/sbin/sendmail
+}
+
+src_test() {
+	if [ `whoami` != 'root' ]; then
+		emake -j1 check
+	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-1.1.5.ebuild b/mail-mta/courier/courier-1.1.5.ebuild
deleted file mode 100644
index e48f1ce4a040..000000000000
--- a/mail-mta/courier/courier-1.1.5.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-HOMEPAGE="https://www.courier-mta.org/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
-	fam web webmail gnutls"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.71.3
-	>=net-libs/courier-unicode-2.2.3
-	net-dns/libidn:=
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		dev-libs/openssl:0=
-	)
-	>=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? ( sys-libs/pam )
-	mysql? ( dev-db/mysql-connector-c )
-	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[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp[mta]
-	!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_prepare() {
-	use norewrite && eapply "${FILESDIR}/norewrite.patch"
-	default
-}
-
-src_configure() {
-	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) \
-		--with-notice=unicode \
-		--enable-mimetypes=/etc/mime.types \
-		--prefix=/usr \
-		--disable-root-check \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/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
-}
-
-src_compile() {
-	default
-}
-
-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:mail ldapaliasrc ; chmod 640 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 ../share/courier/pop3d /usr/sbin/courier-pop3d
-	dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
-	dosym ../share/courier/imapd /usr/sbin/courier-imapd
-	dosym ../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 ../bin/sendmail /usr/sbin/sendmail
-}
-
-src_test() {
-	if [ `whoami` != 'root' ]; then
-		emake -j1 check
-	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/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 64dfa1eb8b15..296b79c90738 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -17,5 +17,5 @@ DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a8
 DIST qmail-smtputf8.patch 6693 BLAKE2B 1b9cd78e63ab9f2f8ca9f49c49406f603efb31d323bb4423aaa8b970c2c26a7e76496a449a98501765dc1a5e6659d9bfd49a6dafbdba14db9a9594e1d1c9b94f SHA512 8cafdf1a4f1fd41e6b11ee2abddac5c3da4a1d2ab17b5d3847433875a91f867a26eb358ae8c41791f1e77758e5a2c311134a286d888ccd23fbede6d9f0b475c4
 DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3e790774d502c28ebd495f9d7523ecebfd37abd333e347151647364d08d3ccc25099c82748bf7b7ea84bb18977 SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf
 DIST vu555316.patch 617 BLAKE2B fa98c360cb199fc4367c668d605399cc53ab2d26668f5ed6bbf0c26449fdf584f71fd415d80ba7babb6593dc842ec342aba4f7357ae838e6556d43f1dc76b6d9 SHA512 5d7810360e5eaa8e8ee141fe92c765d9458aa12198a8d0ac702e0630e08d060ad4a1d33690d434f20f5aff79eb200cd8173bebc334c411e340c0198b5d8d1a65
-EBUILD netqmail-1.06-r14.ebuild 4345 BLAKE2B 48056ad52ebc8021ea61f73478e57f2a2212627d7597a9506ef7c042e4ef355cc3602732d466bee8f2dcb9e9f92384b9358f12c4a08ff9b6b2b2cf58172c6ff9 SHA512 f8ff24912bf0492a901d19aeb87e6d8a172c6b5af0dba2af452ffeb9d70f398aab147c8afceb208e256258d6c1299767d9ab8b1b318c02d678f82eac6c76b504
+EBUILD netqmail-1.06-r14.ebuild 4304 BLAKE2B 3f76458c2a06a2cc8a8d65403a68a0e765e8cabc922f7809f8c70fcd09bd59e7a43410df96948fcc4d0b4926613e396d43be376386685a6a114c6a1f5207bd6d SHA512 89a0da991e4e28c6ef9b21e0ee5c61167a21e42edb080377a9b55fa7ffe5f7ac7a58dc45f7f71de81a6b873dc5a2d29f7e993546967893ea9e448f0d7134ec00
 MISC metadata.xml 750 BLAKE2B 57f6e3a507f543a4491fc7b0340050a35bb86efcf987d1bed48b9937fed56a225ff3e5e577a97038b2c21257e321f2fbf1c65f69ccb009c67891f9fcecaf357a SHA512 e973a7170cb17b6b322dd2c63e4bf56a90b6331cbcc7183a647b862e7d0392882773f9171b840f0dbdeb9a411fb72fdf4c000481fcf5d670003c3136327a1fac
diff --git a/mail-mta/netqmail/netqmail-1.06-r14.ebuild b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
index aef1ed5b4dd2..e1f204048728 100644
--- a/mail-mta/netqmail/netqmail-1.06-r14.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
@@ -173,10 +173,6 @@ pkg_postinst() {
 	elog
 }
 
-pkg_preinst() {
-	qmail_tcprules_fixup
-}
-
 pkg_config() {
 	# avoid some weird locale problems
 	export LC_ALL=C
diff --git a/mail-mta/notqmail/Manifest b/mail-mta/notqmail/Manifest
index db7922c130f3..2932910ac19b 100644
--- a/mail-mta/notqmail/Manifest
+++ b/mail-mta/notqmail/Manifest
@@ -6,6 +6,6 @@ DIST notqmail-1.08-tls-20200107.patch 50123 BLAKE2B 94bbab86bd089c6ac032bfabc300
 DIST notqmail-1.08-tls-spp.patch 64223 BLAKE2B d2337017dacd41d975a9ebd4650cce58425c3c6e1ebfaaaf29a222a532cfd246fec16f52997e85eb921ad376235eb69a8580ba8df493bf760f3d8237311411c0 SHA512 012cdc62c2361737fb984e750a28bd06f357aefd9fa8d909e2e380e65fc5ae3a2cbef3f592eb60455ad858385dbf8e8b50a2f6358a9ffa3f885aa76250a336a0
 DIST notqmail-1.08.tar.xz 179500 BLAKE2B 6c774037b257849aea65e7761a6f6c9918079faa490c0ed027d73a8b32de5d5907a54a59162b9b68479229c4b92a23fe28cd2f334123cfe674a94502b90a3635 SHA512 c18d09e28c2e580522eea144e5344e814811108b12f3272b4cf10ad58d9d3d8e666616dcfea2f369e226b68db4fe8cf67cbae994b242d36e9e07c289a0539394
 DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a84dda9edbe33b506d0c2b6e711364e2426d9e393453a54485f0286d4668f99cf6b9acabf10a5dc59b0a SHA512 b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354
-EBUILD notqmail-1.08-r3.ebuild 4411 BLAKE2B eb096ec4d942d90120615c1d8385c9149f7409815696f574487e7bc0225000483db4e5170e3f578a8e28d2a272de0e27357292c9106520a2770661ec7a1b1498 SHA512 64dfbec09a2b8c9bae743641b75c689431ad10e756633067b2398767580de801cabd7dd4ec164b0665eca9233e581992ee9cf64231ac747defbb6999a78ab437
-EBUILD notqmail-9999.ebuild 4266 BLAKE2B fbbba305aff99486f322e1ff9944a05a07c8e07dd97204d770c5b7e531484c34080c2db6f28213d09c0e7a7d381341533b7394b9693c46c6372e89007ebb2ea7 SHA512 447e96d61e77c3c684483988d3aad1846e3dc818790a8715d127cc4a4fbcc119495eb52ecd5cc3cda34230b4fc2f9b6806b818b625aa1c44ea1ae1753d424ece
+EBUILD notqmail-1.08-r3.ebuild 4345 BLAKE2B 3acf5aa25d847b394dd95c71184099cf293d45ba94f3cdea265b8a6061ca1eacf3dea520735e93ebfd1ba2f0b80026b43e5cac349655d01a27bbb498fad6b3c5 SHA512 9c69b88ce22a52bb3ee2a566d096515f1893110fad00cd2566c20441056c18e2a98270527ece512c79a6b570df255ba836228c8aea3aa4b576d9680694ae0b82
+EBUILD notqmail-9999.ebuild 4200 BLAKE2B 1767f0d643eba378498ef256e20a1030a78bec0e8c610f44317eccdfd32c2da33700b5285074541e0677ab7a514ebd7b2e9ef68e1b3212a350b37fbc3145e1e7 SHA512 cee482b43bd22f77ae2f1a958eba78bdf1f88ab96961c526ad8fb98da0df958800a5b80d1e4bf3efd754f6d841b11a22b91db6377d8ead1f472b427960fa9b02
 MISC metadata.xml 807 BLAKE2B 3bbc2374094c3bcfab161787b20321ab8dac7e861c758f4803507d6063b3441c382ce8dd3447c6e939181d32d06547bf91c47d4928a1e5ce8a76eca6c7db496c SHA512 e0619acfcebadc9b2d1ff7c47767426528c74d157072a489b61f8cc61c549671544744c6fd74c4531c2bed04974157fd12010c5ef6b28380d11723446549084b
diff --git a/mail-mta/notqmail/notqmail-1.08-r3.ebuild b/mail-mta/notqmail/notqmail-1.08-r3.ebuild
index 2e22ea16b1dd..6afc55ac3bde 100644
--- a/mail-mta/notqmail/notqmail-1.08-r3.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r3.ebuild
@@ -23,7 +23,7 @@ else
 	SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz"
 fi
 
-DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
+DESCRIPTION="Collaborative open-source successor to qmail"
 HOMEPAGE="
 	https://notqmail.org
 	https://cr.yp.to/qmail.html
@@ -173,10 +173,6 @@ pkg_postinst() {
 	elog
 }
 
-pkg_preinst() {
-	qmail_tcprules_fixup
-}
-
 pkg_config() {
 	# avoid some weird locale problems
 	export LC_ALL=C
diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index 9c68b334dbf5..224aaed06285 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 GENQMAIL_PV=20200817
 QMAIL_SPP_PV=0.42
@@ -21,7 +21,7 @@ else
 	SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz"
 fi
 
-DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
+DESCRIPTION="Collaborative open-source successor to qmail"
 HOMEPAGE="
 	https://notqmail.org
 	https://cr.yp.to/qmail.html
@@ -168,10 +168,6 @@ pkg_postinst() {
 	elog
 }
 
-pkg_preinst() {
-	qmail_tcprules_fixup
-}
-
 pkg_config() {
 	# avoid some weird locale problems
 	export LC_ALL=C
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 21a545aed4e0..5dedacfbbdf1 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -5,9 +5,9 @@ AUX smtp.pass 29 BLAKE2B 589915bd2856fa64e22caa12fca54ef342eb07606de38d3879c13ac
 AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e6b4983ab26e88ede2f0604737c78144c03e182f66005062f1d49e10443d1ddb9757461d1f SHA512 a48e2bd173c4443dd2c389f6973a541dbcba4223b52b42b409a68d934a7fc82a98d4027267befcd5db6ec628cce6a9dffdf044e6fbd774b6e748f07f4106db47
 DIST postfix-3.6.1.tar.gz 4748754 BLAKE2B c64d8f4c12cd7cb39bd15c371c20db4aa61b39120b6c078eda7c48c94d65e181b51ac8f74f3231791fc3ad6c0d04f74975f50776f984ffa9b9f8a4c5c99cbade SHA512 6f83a6aa55bd442fe005b35c7470483ff5ba6781121f783b07ef454580354fc5c85d0d5106936810d6bef0f5592937f0863eec3b82e138caac7694e2a3bb7bc3
 DIST postfix-3.6.2.tar.gz 4749530 BLAKE2B 349f3eb2995fe72c89e374a2f95cbb09d4a4f5a5c896e340a2a166ffcb2c498ba514022a59a17d2731807f6dadc03f804a3d4b16127dd2d6addb825558b7ffd6 SHA512 464ce9ec77e637ede91123472a0383b2bfda52102f9e9852c7191016d4fda2e14f302f2db9793887c182688c2a14dde6eeda728523196a627a8028f99555a4d9
-DIST postfix-3.7-20210807.tar.gz 4760021 BLAKE2B 351c52657aefbd70d0b24cbf867d85f3cf2939bd85e245a0f71ea6e5db7bd7e7603c026a5bc479215a3484a26857b9171714d5ab4d9a890a40e77b3acd6ba898 SHA512 4a5b283c4be44358313c4193d44ed3268c08c5268e42d12cdc0dd0882f260b9a4f1a4c783d00e281ba9c5857da7489ab26d18398f7a33aa2c98893d0b2ec1e7e
+DIST postfix-3.7-20210815.tar.gz 4756174 BLAKE2B a699ba9b58927e0cbab0f47331f295a41f2aeb27ea62d8ba10ba18ebcefc6f8868dbcca6a3c1893400547e4b40b6af2013f7eeda38fce11fe4e7c9a69f1c922e SHA512 e5dc03dad32bba501c819e1ed53e501119c138b21fcf2ed895014dd4c99d7830c8c3363ae6dddb30c5e232dd1ad1ea57e0dac756585868b0c956ac52fb06818e
 EBUILD postfix-3.6.1.ebuild 7978 BLAKE2B 66c865d94f250d4ef3ae2c3dc24a0fb184f85cc67cb5e461c8bf46178415b649e80c6b936dd6e85e02adab33e7ef2b6a5e451500dea66967b97f32f0bd17d107 SHA512 368f073d877c9d49e4b38f5c603b30e99c23505c2bce1262b0152a03dfb4bfafeb2d43dc6cdc67e2c4cd4ac4559ebaec61df21d674eba026c27a38c386d14ff0
 EBUILD postfix-3.6.2-r1.ebuild 7968 BLAKE2B b275a53bea871cf3d7a4a124fd169114bebcf93e544fb4729211fa9f5ce83f65d91daf5ac2da08f1bb36060a0e0550072bf0afa7081be0ca6ed0dcfbf82fdfdf SHA512 55ed05197c60227868980d6fc6bd75092483dd11fbffedc2bf82da59389f641a8df89ffc320b137b44d05780c8048884e2ecc571b569de2354e7d573e37a6340
 EBUILD postfix-3.6.2.ebuild 7917 BLAKE2B 58ccfe215e40993ce6dcc20646a3083d2e4ec8c7e6575b65facf3060a15d4ea7184e2ae6130336099ad908b8283eef8947c0fc4db5532801f77c930082b8b5b5 SHA512 aabb59f03bef2d4a8e917c102da12f510b33dd148fa25cd8306c06bb7bd9aafef0d1b41f8e87f768b4927b33c6ebe82290cf3293bd0e0a32739489dab1a8b10d
-EBUILD postfix-3.7_pre20210807.ebuild 7917 BLAKE2B 504cae64c2c323d844e355600f1d5daee40524a940b54d2a4d28e3a870a0d3628be5cbb1cb1c471544764cc1db4ab49378bc54feb1f9c84214aca1c3a0b28ed1 SHA512 f0011add1c12ae383a03ac9f3989509cbc86aa820680151854e0f783ec387fc571345a0f1a2b78966838bfbdb2f225584d5ee3303bbc33f84729053fd08b25f7
+EBUILD postfix-3.7_pre20210815.ebuild 7925 BLAKE2B 21e1d85a0404946a7829e7991ba6172c452b36cda8aee27df48ed3ccda5394f9d0748d59583ecee39e04bde206c078841e09797e6e3fa54a173486b99980f451 SHA512 7f1161f3e773e5202946af10b138d9e1829c9383c042a26b47d68e02e6c43cbeaae5d8198430b2a5a3319f535a672ddf294431db0ca82e7d16f85b3734b14cf7
 MISC metadata.xml 866 BLAKE2B 341527ecb22f2ec1bb1125c0c9bc9191935ef6f64a7dcf5c3320f7a245b8480eadca539359cb62af1f89ea9091074d621e88c1b2ba2437d1e367cff3c7856b8f SHA512 3f1dd670329e7752770de72e4df9e984e17346a3ff6ff01a9f16fd251f4dde67f59a4178b253ba1fb76c16c2bcd9ae390e15db97de1d3f550581408710a85a84
diff --git a/mail-mta/postfix/postfix-3.7_pre20210807.ebuild b/mail-mta/postfix/postfix-3.7_pre20210807.ebuild
deleted file mode 100644
index 7badc66a67e8..000000000000
--- a/mail-mta/postfix/postfix-3.7_pre20210807.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit pam systemd toolchain-funcs
-
-MY_PV="${PV/_pre/-}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
-
-LICENSE="|| ( IBM EPL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
-
-DEPEND="
-	acct-group/postfix
-	acct-group/postdrop
-	acct-user/postfix
-	>=dev-libs/libpcre-3.4
-	dev-lang/perl
-	berkdb? ( >=sys-libs/db-3.2:* )
-	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
-	eai? ( dev-libs/icu:= )
-	ldap? ( net-nds/openldap )
-	ldap-bind? ( net-nds/openldap[sasl] )
-	lmdb? ( >=dev-db/lmdb-0.9.11 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nis? ( net-libs/libnsl )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:* )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-1.1.1:0= )
-	"
-
-RDEPEND="${DEPEND}
-	memcached? ( net-misc/memcached )
-	net-mail/mailbase
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!mail-mta/ssmtp[mta]
-	selinux? ( sec-policy/selinux-postfix )"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-src_prepare() {
-	default
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-}
-
-src_configure() {
-	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
-	do
-		local AUXLIBS_${name}=""
-	done
-
-	# Make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
-	AUXLIBS_PCRE="$(pcre-config --libs)"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	if use ldap; then
-		mycc="${mycc} -DHAS_LDAP"
-		AUXLIBS_LDAP="-lldap -llber"
-	fi
-
-	if use mysql; then
-		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
-		AUXLIBS_MYSQL="$(mysql_config --libs)"
-	fi
-
-	if use postgres; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
-	fi
-
-	if use sqlite; then
-		mycc="${mycc} -DHAS_SQLITE"
-		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
-	fi
-
-	if use ssl; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use lmdb; then
-		mycc="${mycc} -DHAS_LMDB"
-		AUXLIBS_LMDB="-llmdb -lpthread"
-	fi
-
-	if ! use eai; then
-		mycc="${mycc} -DNO_EAI"
-	fi
-
-	# broken. and "in other words, not supported" by upstream.
-	# Use inet_protocols setting in main.cf
-	#if ! use ipv6; then
-	#	mycc="${mycc} -DNO_IPV6"
-	#fi
-
-	if use sasl; then
-		if use dovecot-sasl; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		if use ldap-bind; then
-			mycc="${mycc} -DUSE_LDAP_SASL"
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		mycc="${mycc} -DNO_NIS"
-	fi
-
-	if ! use berkdb; then
-		mycc="${mycc} -DNO_DB"
-		if use cdb; then
-			# change default hash format from Berkeley DB to cdb
-			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
-		fi
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			AUXLIBS_CDB="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
-			done
-		fi
-	fi
-
-	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
-	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
-	emake makefiles shared=yes dynamicmaps=no pie=yes \
-		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
-		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
-		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
-		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
-		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install() {
-	LD_LIBRARY_PATH="${S}/lib" \
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/etc/postfix" \
-		manpage_directory="/usr/share/man" \
-		command_directory="/usr/sbin" \
-		mailq_path="/usr/bin/mailq" \
-		newaliases_path="/usr/bin/newaliases" \
-		sendmail_path="/usr/sbin/sendmail" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade
-	rm -Rf "${D}"/var
-	keepdir /var/spool/postfix
-
-	# Install rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# Provide another link for legacy FSH
-	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
-
-	# Install qshape, posttls-finger, collate and tlstype
-	dobin auxiliary/qshape/qshape.pl
-	doman man/man1/qshape.1
-	dobin bin/posttls-finger
-	doman man/man1/posttls-finger.1
-	dobin auxiliary/collate/collate.pl
-	newdoc auxiliary/collate/README README.collate
-	dobin auxiliary/collate/tlstype.pl
-	dodoc auxiliary/collate/README.tlstype
-
-	# Performance tuning tools and their manuals
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# Set proper permissions on required files/directories
-	keepdir /var/lib/postfix
-	fowners -R postfix:postfix /var/lib/postfix
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02755 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	keepdir /etc/postfix/postfix-files.d
-	if use mbox; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	LD_LIBRARY_PATH="${S}/lib" \
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
-	# do not start mysql/postgres unnecessarily - bug #359913
-	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
-	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-	# postfix set-permissions expects uncompressed man files
-	docompress -x /usr/share/man
-
-	if use pam; then
-		pamd_mimic_system smtp auth account
-	fi
-
-	if use sasl; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# header files
-	insinto /usr/include/postfix
-	doins include/*.h
-
-	if has_version mail-mta/postfix; then
-		# let the sysadmin decide when to change the compatibility_level
-		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
-	fi
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	if [[ ! -e /etc/mail/aliases.db ]] ; then
-		ewarn
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-		ewarn
-	fi
-
-	# check and fix file permissions
-	"${EROOT}"/usr/sbin/postfix set-permissions
-
-	# configure tls
-	if use ssl ; then
-		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
-			elog "To configure client side TLS settings:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-client
-		fi
-		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
-			elog "To configure server side TLS settings:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-server
-		fi
-	fi
-}
diff --git a/mail-mta/postfix/postfix-3.7_pre20210815.ebuild b/mail-mta/postfix/postfix-3.7_pre20210815.ebuild
new file mode 100644
index 000000000000..02153fbc289f
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.7_pre20210815.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit pam systemd toolchain-funcs
+
+MY_PV="${PV/_pre/-}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="|| ( IBM EPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND="
+	acct-group/postfix
+	acct-group/postdrop
+	acct-user/postfix
+	>=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nis? ( net-libs/libnsl )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	"
+
+RDEPEND="${DEPEND}
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!mail-mta/ssmtp[mta]
+	selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+src_prepare() {
+	default
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install() {
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape, posttls-finger, collate and tlstype
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+	dobin auxiliary/collate/collate.pl
+	newdoc auxiliary/collate/README README.collate
+	dobin auxiliary/collate/tlstype.pl
+	dodoc auxiliary/collate/README.tlstype
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue,log}
+	fperms 02755 /usr/sbin/post{drop,queue,log}
+
+	keepdir /etc/postfix
+	keepdir /etc/postfix/postfix-files.d
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+	# postfix set-permissions expects uncompressed man files
+	docompress -x /usr/share/man
+
+	if use pam; then
+		pamd_mimic_system smtp auth account
+	fi
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+
+	# check and fix file permissions
+	"${EROOT}"/usr/sbin/postfix set-permissions
+
+	# configure tls
+	if use ssl ; then
+		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+			elog "To configure client side TLS settings:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+			elog "To configure server side TLS settings:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
-- 
cgit v1.2.3