gentoo auto-resync : 07:08:2024 - 12:37:20

10 files changed, 7 insertions, 1264 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index ce65992f9bb3..aa8c649b55a4 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 95d179854d3e..9bdc8af3bf55 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -2,15 +2,8 @@ AUX apache-sqwebmail.inc 347 BLAKE2B e77a680065e064c300d01ec21db524f3a440623b685
 AUX courier-init-r4 4965 BLAKE2B 09f29543599abfb6dd5df058f832e979bde471be3f9d293d975fdfc28787e8622ddab797c9d51fa89207fbc1a1ee23fb82471617366bf1467d1e7f2d7d3f2bcc SHA512 ca5e12bfa4fe2166cd2c1ef8c68e3cda957fd33011971237f3f76ec9d4ec1503eb22d78ec08ed42671d8858790ea7761c272a4896c680a51691c094696fee5f9
 AUX norewrite.patch 488 BLAKE2B 663b52ff5936d5c8aa24ce2a226cd803f09a972a2f358b7f81d1711319b4fee2d7a9c4a8b498e8550b27d796939f6ba042790211592e55072bbff6b7f7172ea3 SHA512 5c2329f497951220bb1276058fe7fe2e0eba710fcad65c9ff1143827fec7c8d9745703fbebf624fecf740fb767401eeba9f0e91b09cd891622d01899578326db
 AUX password.dist 247 BLAKE2B 1803a6663c32ccc74c4dfb1d591a01d4416f9de9c4bf35c9a7ca277c2007b8c29a8899f4285c78eeb8592766457eef0caf377a344adee7a61be15bbf8b80c7de SHA512 f488b0ab1a909c9b878b9f3f3147641a9ed6d8d2ad44c67cd641934b800b18a62de2a7f5f51fdbecfbbcdd7c39c753734984cc0836c905a3b708858e1b91093d
-DIST courier-1.2.3.tar.bz2 7842828 BLAKE2B eac13d5c36279df1533af1e62e6b7b9fe0d5015f1f602a8291a2e507965a90d80167b6c443a983220de70a5f12ba6c19a1983ea12480e8cc2fe946c5524bfa6e SHA512 72e96d6fb3e91d8f41c46b45601e2ebb0ce790317ddbc6030e02b294c421ef92b6c7a6de5dc463cbad1196cb6f5efe996e34c6aa1381ddd429c3d83fc48e74e6
+DIST courier-1.3.10.tar.bz2 7898254 BLAKE2B 10558f78cd58540cacbd85fb4dadbeddd374b8832a27c546864023aeebdf9e5ca1fa4d770cdefce6bf7ed2bbaf334a893393eae79cee2b13482e75d8b157824f SHA512 266d2785ea7a8b9455b9448e3279f77d399c182ec4408b599a301f389a28dd40b7b869c8b158eb49b4416b58ce09805fad3f176796a2cf0408bb93b766081ce3
 DIST courier-1.3.5.tar.bz2 7901040 BLAKE2B 5a79d02d1d40967f98f2a1942fee6786d8e6e2ddc7dea6677a85db0480f71e4b974a671adc81c4bafd66c888c5b54012eb5684f2936f5164496699939d179fc4 SHA512 5f51383356f4a36f9c114be6aa69d694c82bb95b1a336d2948d486d582bd6559da69be93b7c20aee2ff57826ab7eeb265aa20794074456d036b22da7f280f95d
-DIST courier-1.3.7.tar.bz2 7900951 BLAKE2B 4be8194554f27d3d8cb822c5f8451dc61afca1255cbb0c92289314a953ea2a173b3dfd59b44f1f8bbcb6ef67367420cc6f6c44327527efee01e49ecee40ae789 SHA512 ee73120cc6f7bf54480af575f3cb522e5035ba4d3e957a1799bcf064c06159c9c888f4f26334464ba088e06d6e13a96611f93123439bda12200a1a71860b8d6a
-DIST courier-1.3.8.tar.bz2 7901606 BLAKE2B 2c8da2e905fa4aa273715dd84f80b76d8f095414169b3454a9b1cacfeae6d4c89ad6db95a3ac2927b709395ac7119b1c21df1b140f5cb393e431fec10b2e60f9 SHA512 30d09e9c0ae729ed5e7f3f28ef98841db3c71fabb61017319e76a8a8cc6e77b91a6a6dc40515c645f48dcd1d9b144d2c84c78df955b50cb9a0856e4734c0a265
-DIST courier-1.3.9.tar.bz2 7900486 BLAKE2B 18fc3573b75c3ac08fd88eead16a604d0e32fd8ba5390a35baa38cf86d5f99814979e76b74345c2c29d76d92b6331f7481dab9197ba008714b4e1e31f1c7135e SHA512 9b6b503efbcbe847bfb7211954a78a820f549b5c6d13179421ca5e016f3bf85d8c03facf8a17edfc6288974e8946893f4175cd2c2084f28148a67b5eee3ac983
-EBUILD courier-1.2.3-r1.ebuild 9271 BLAKE2B b5b00c8837cbeb2539af4db461c4bba6e837fad8bbc6a3b8af558ba834da2b4eb3a459ae0a95ce0caf57b22cec5f7dd770c0b59da906ac51b0dfa8c117327a1e SHA512 ebca062d3a6821e46cda3d73f0b0c32ba5434e13295dd8a3ee816073d3f15b9dc969cf8baf847957784767e1eeda889bbb2589be0160bf3fe805267fae250707
+EBUILD courier-1.3.10.ebuild 9331 BLAKE2B a2c9d3a9ca894380c54a5081d2333ec7eb7f7a5ffd02172679efb07777ec425b99b3a9b38c2a50e76845437b42ae89d9c69cd4c658813319224e1bfac6fee6ea SHA512 cb0828d3c82f9dd0a15020f430ae5250cad9f1468d289ac4bf15bd8da981725a0776d3567106f72be159739e7ab4b7f6396eab84a63ff0e74ff680150de50789
 EBUILD courier-1.3.5.ebuild 9316 BLAKE2B a2a3327506ba45fd2d317092c598c0146d82c3f659a13bb925bf839d75a92e27a80dc74dac8b62b66b25137b155401fb6dea4cb7dca3e990c036ae2aedc90505 SHA512 3764af68a579a7264172dbc936fd4f0fb1fd4dc6a6fcb498ac6e7dfcb1f87c47c5f28877323d6394bf0fdc966ee6b8cb252cd25597e1771b93c781f059690832
-EBUILD courier-1.3.7.ebuild 9322 BLAKE2B 844b42d9fc44f7c18655b78f8a11aba5c257063b551df3f8d37deb64f4c52381b17c62af7953e537d8ff53610b82b00d6438f965afc381c3beb1788ba6656930 SHA512 ee0caf8d782cfd1aec20896ec2c847cf67970303e6458e609a9e489a2f8cd7b6e5b7365f1f2365fdbffc7f91da0eef15ba8b00cb056dbcfa9800d57f56e0b9c9
-EBUILD courier-1.3.8-r1.ebuild 9324 BLAKE2B 205c70c4e8a553f8371e1a1847e9a677216c6f4734a7d285da12b1d4b050d1c199e79e1d7fdfb8e09cae27157060f34fa3b99ef9a65de9cf20d4403f0fb53ee5 SHA512 3f64fea93078502cde75dfd601e289cccdbcecde13cbc1d382c56f5ff961f78f390203a1eb0e9a0c8442fb565656d12219659124823690af590a4d619bde6718
-EBUILD courier-1.3.8.ebuild 9322 BLAKE2B 844b42d9fc44f7c18655b78f8a11aba5c257063b551df3f8d37deb64f4c52381b17c62af7953e537d8ff53610b82b00d6438f965afc381c3beb1788ba6656930 SHA512 ee0caf8d782cfd1aec20896ec2c847cf67970303e6458e609a9e489a2f8cd7b6e5b7365f1f2365fdbffc7f91da0eef15ba8b00cb056dbcfa9800d57f56e0b9c9
-EBUILD courier-1.3.9.ebuild 9324 BLAKE2B 205c70c4e8a553f8371e1a1847e9a677216c6f4734a7d285da12b1d4b050d1c199e79e1d7fdfb8e09cae27157060f34fa3b99ef9a65de9cf20d4403f0fb53ee5 SHA512 3f64fea93078502cde75dfd601e289cccdbcecde13cbc1d382c56f5ff961f78f390203a1eb0e9a0c8442fb565656d12219659124823690af590a4d619bde6718
 MISC metadata.xml 756 BLAKE2B e3d128790b1620d9005c9a14cef1c452488fc8e465b235791cc196f431cb2ea8348aba342b0867282878d0c73392694be0db0686dc048d9345b286c3bccf1cab SHA512 c3fcd1ba4b22f91b1acf49faeee41562a7963b51d37e1593156086b79a1eb4172a12e7226b71a9aa55b5a4ef7d734351752451a2300375d061ae20481778b273
diff --git a/mail-mta/courier/courier-1.2.3-r1.ebuild b/mail-mta/courier/courier-1.2.3-r1.ebuild
deleted file mode 100644
index 68833fd82401..000000000000
--- a/mail-mta/courier/courier-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-HOMEPAGE="https://www.courier-mta.org/"
-SRC_URI="https://downloads.sourceforge.net/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.72.0
-	>=net-libs/courier-unicode-2.2.6:=
-	net-dns/libidn2:=
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		dev-libs/openssl:0=
-	)
-	>=sys-libs/gdbm-1.8.0:=
-	dev-libs/libpcre2
-	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/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!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/courier-imap
-	!net-mail/cyrus-imapd"
-
-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"
-}
-
-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
-	local 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() {
-	local 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 DESTDIR="${D}" || 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
-		# Disable valgrind checks
-		echo '#!/bin/sh' > libs/imap/testsuitevalgrind
-		echo '#!/bin/sh' > libs/maildir/testsuitevalgrind
-		sed -i -e 's:VALGRIND=:#VALGRIND=:g' libs/maildrop/Makefile*
-		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 [[ -z "${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.3.9.ebuild b/mail-mta/courier/courier-1.3.10.ebuild
index 078cce65251a..a1a8e7c241d4 100644
--- a/mail-mta/courier/courier-1.3.9.ebuild
+++ b/mail-mta/courier/courier-1.3.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
 	fam web webmail gnutls split-usr"
 
diff --git a/mail-mta/courier/courier-1.3.7.ebuild b/mail-mta/courier/courier-1.3.7.ebuild
deleted file mode 100644
index 5fae659b2d8e..000000000000
--- a/mail-mta/courier/courier-1.3.7.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-HOMEPAGE="https://www.courier-mta.org/"
-SRC_URI="https://downloads.sourceforge.net/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 split-usr"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.72.1
-	>=net-libs/courier-unicode-2.3.0:=
-	net-dns/libidn2:=
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		dev-libs/openssl:0=
-	)
-	>=sys-libs/gdbm-1.8.0:=
-	dev-libs/libpcre2
-	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/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!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/courier-imap
-	!net-mail/cyrus-imapd"
-
-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"
-}
-
-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
-	local 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() {
-	local 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 DESTDIR="${D}" || 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"
-
-	if use split-usr; then
-		dosym ../bin/sendmail /usr/sbin/sendmail
-	fi
-}
-
-src_test() {
-	if [ `whoami` != 'root' ]; then
-		# Disable valgrind checks
-		echo '#!/bin/sh' > libs/imap/testsuitevalgrind
-		echo '#!/bin/sh' > libs/maildir/testsuitevalgrind
-		sed -i -e 's:VALGRIND=:exit 0 #VALGRIND=:g' libs/maildrop/Makefile*
-		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 [[ -z "${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.3.8-r1.ebuild b/mail-mta/courier/courier-1.3.8-r1.ebuild
deleted file mode 100644
index 078cce65251a..000000000000
--- a/mail-mta/courier/courier-1.3.8-r1.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-HOMEPAGE="https://www.courier-mta.org/"
-SRC_URI="https://downloads.sourceforge.net/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 split-usr"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.72.1
-	>=net-libs/courier-unicode-2.3.0:=
-	net-dns/libidn2:=
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		dev-libs/openssl:0=
-	)
-	>=sys-libs/gdbm-1.8.0:=
-	dev-libs/libpcre2
-	app-misc/mime-types
-	dev-lang/perl:=
-	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/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/sendmail
-	!mail-mta/ssmtp[mta]
-	!mail-mta/opensmtpd
-	!net-mail/dot-forward
-	!sys-apps/ucspi-tcp
-	"
-
-RDEPEND="${DEPEND}
-	sys-process/procps"
-
-# get rid of old style virtual/imapd - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!net-mail/courier-imap
-	!net-mail/cyrus-imapd"
-
-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"
-}
-
-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
-	local 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() {
-	local 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 DESTDIR="${D}" || 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"
-
-	if use split-usr; then
-		dosym ../bin/sendmail /usr/sbin/sendmail
-	fi
-}
-
-src_test() {
-	if [ `whoami` != 'root' ]; then
-		# Disable valgrind checks
-		echo '#!/bin/sh' > libs/imap/testsuitevalgrind
-		echo '#!/bin/sh' > libs/maildir/testsuitevalgrind
-		sed -i -e 's:VALGRIND=:exit 0 #VALGRIND=:g' libs/maildrop/Makefile*
-		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 [[ -z "${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.3.8.ebuild b/mail-mta/courier/courier-1.3.8.ebuild
deleted file mode 100644
index 5fae659b2d8e..000000000000
--- a/mail-mta/courier/courier-1.3.8.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-HOMEPAGE="https://www.courier-mta.org/"
-SRC_URI="https://downloads.sourceforge.net/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 split-usr"
-
-DEPEND="
-	>=net-libs/courier-authlib-0.72.1
-	>=net-libs/courier-unicode-2.3.0:=
-	net-dns/libidn2:=
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		dev-libs/openssl:0=
-	)
-	>=sys-libs/gdbm-1.8.0:=
-	dev-libs/libpcre2
-	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/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!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/courier-imap
-	!net-mail/cyrus-imapd"
-
-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"
-}
-
-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
-	local 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() {
-	local 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 DESTDIR="${D}" || 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"
-
-	if use split-usr; then
-		dosym ../bin/sendmail /usr/sbin/sendmail
-	fi
-}
-
-src_test() {
-	if [ `whoami` != 'root' ]; then
-		# Disable valgrind checks
-		echo '#!/bin/sh' > libs/imap/testsuitevalgrind
-		echo '#!/bin/sh' > libs/maildir/testsuitevalgrind
-		sed -i -e 's:VALGRIND=:exit 0 #VALGRIND=:g' libs/maildrop/Makefile*
-		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 [[ -z "${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/postfix/Manifest b/mail-mta/postfix/Manifest
index 9cfd26abdd4b..82a00b4a38c1 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -2,12 +2,12 @@ AUX postfix.rc6.2.7 2107 BLAKE2B 4ea7006a381b76d5926a7d1794ab45e30d4829a17acfa0f
 AUX postfix.service 709 BLAKE2B 83fec03e622e3eb1e4b66021b94972b63ace3e368dbf6148aa4fc7832652ba3d452c074e51d19e99b78286c8f84e48557940dcef4656c766f5ff9c4b8078049c SHA512 cb6d04e28d19ccb3c0b33058bae033baaa2976d4d75adc1b28f9aaff928dd1da77292dd16c7f0ca2d68af0a3aa6d74c74db0d550eb95516ae041ebdb9493e32a
 AUX smtp.pass 29 BLAKE2B 589915bd2856fa64e22caa12fca54ef342eb07606de38d3879c13ac395413c84de6c3b733c83cc0625a4433167efcc7d504b2f87fa26c05b2facde9c3d103021 SHA512 a8a940099a77ea0547004daf5392a6efc0cd643f10072803d65e37763012464ad25b1b925ae9e32bffb3c3e8a5d4b2d3bb5619a174d58fdc4ea5d4090db0d365
 AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e6b4983ab26e88ede2f0604737c78144c03e182f66005062f1d49e10443d1ddb9757461d1f SHA512 a48e2bd173c4443dd2c389f6973a541dbcba4223b52b42b409a68d934a7fc82a98d4027267befcd5db6ec628cce6a9dffdf044e6fbd774b6e748f07f4106db47
-DIST postfix-3.10-20240622.tar.gz 4960285 BLAKE2B ef1795961fcde54ebc0b4e26c58d1a8dd968242a80e6cf062d3f02934b40314344a61895e8e2d68ab17160b71763a7d7adaf3153851e4d5d3fa33772c9d5da43 SHA512 e4edfcbba9a1458349919affd9ff5b215d87831d730f03b41723cd8b4ad8df0117d89b43e25fb58b12abd42bc145a6ca5d2e25ce291a15144f6111e67b4cfd58
+DIST postfix-3.10-20240724.tar.gz 4961309 BLAKE2B 866f253f1279b03c0c149a817940685b096973bbc2075f6f7cb4d0f7b117392efc78c8f68b208987796614dad38b7f0cabee2a9fd34e16145041fbac1df36c90 SHA512 380834d6df035e06153de41d10a6d0c77954715c07bb0f2dd777aa799166e47964d82121e1f621c69ff449f23f75144c756df14853c40b047cbee13c227fac77
 DIST postfix-3.8.5.tar.gz 4871284 BLAKE2B 0de999c47a4130eb3418ec60b23c10be405b9bc4b2a6022671f9dc4713256d2b81d3b43f01d89e02d2593f87109dcde366b0265eb0cb13cb3118d0e60e36b48b SHA512 26005da5750e7af742f4fc7596ae8320467176e069546c3487418c663b54f56734b4a6541665b8d72d94df2e0fd4f68a2bcc44c50a6d950334d5a5fb2293dff4
 DIST postfix-3.8.6.tar.gz 4873054 BLAKE2B eda349dbf7fe45636fbd68991dba9f099a41dd402f7d58eb71ae881b5889889e5fd29e42e2492ab2af4d7febae1922cb3513b740b21e97f12deb44b5927a3c3d SHA512 2b227bb6b57e4cf2d727a23762b161f2328959faa4683d63b35543701c3e954be552537eaa14a899c65ec4856d9f91b0398337088a6e2b48c0446fd406be8de4
 DIST postfix-3.9.0.tar.gz 4953133 BLAKE2B e07a525d9cbea43d3ed11f3d672452cf94f88ca7bbaf3c3254bf5be4ef675a1797a5fff2444c0db60c6eb53e43734a388a91faed72bb2fb4e3e5a353535602b0 SHA512 46faaf529a6d2edc5ea747ee0d73a028f7061a923da0ea4b1e1828d935b15f5782d83f7a8472e7c74b45ea0e96666c871efd352934bead28a88ddd3561ade324
-EBUILD postfix-3.10_pre20240622.ebuild 8411 BLAKE2B bde0cd29c70ae795fe8696726ae5c67716f68fa6e1e5d838c684034496d60a33abf012a66f01bd3772ddc41cc0c3523e2892846817c34f4be28327320e1de020 SHA512 c2237053b348f57a7ef84981dd5cf0dbd6864d4ad19e83802d7b311601775bf355ef880f5bbc9a11599fd49b4e50c6cec3f59ed6098080354f8588817a12f404
+EBUILD postfix-3.10_pre20240724.ebuild 8411 BLAKE2B bde0cd29c70ae795fe8696726ae5c67716f68fa6e1e5d838c684034496d60a33abf012a66f01bd3772ddc41cc0c3523e2892846817c34f4be28327320e1de020 SHA512 c2237053b348f57a7ef84981dd5cf0dbd6864d4ad19e83802d7b311601775bf355ef880f5bbc9a11599fd49b4e50c6cec3f59ed6098080354f8588817a12f404
 EBUILD postfix-3.8.5.ebuild 8361 BLAKE2B b82838527efcecd8d3342646d8ee2e71dc6afc19269db4dffe787e489d28569c51dc3c39bf955578c962f701c8ad7ad88602440421f8278720b2e8442465da74 SHA512 28e8aeca4d63c549a1550347c880c337c2ba72a399b26cc295d4ac82ec5efcad7cc362349d3fc6d3d37a3b77bfcb9dc4b58f919f598186778aa4f2e39a2bae67
 EBUILD postfix-3.8.6.ebuild 8367 BLAKE2B 516c2e76bd01f99a1c70d9bf3e286e41b4fc20245e4689f3f3df614919a55858b5ec9d2f0802f763c9d476afd2c2ed7537cc1c07a1b52f35cda65b3f804672cc SHA512 87ad08edd945f52bbd2b21767973cb3ee1e9aabfd561f78d852816af703dcedd675d0f165fb77dc4d6fa4b2436b8f04d155f0e83a9dbc9fcada02aac5ea186c5
-EBUILD postfix-3.9.0.ebuild 8404 BLAKE2B 422889825c1d920d5461359a3c52aa672984902b92384641233e1401709b3826cc84392cb6fe87c7eae693e5c7ebc53d097b1b02d607156e53b02263212c826c SHA512 6a1fc0e39f8d2ac7b5465b523fee27104981ff02a4e5880584bf6ddbabf4341630df805f2838d05dd0f406b98913e87cc509f6ed4b09c08a99fd488764eab365
+EBUILD postfix-3.9.0.ebuild 8403 BLAKE2B cf5b748fbbc0ae0f91621f93c87e3579f024c9afd6b6245e04e277f0c1560d4411e866f24097bcf5945ea4e6cd33e1ad7b0d7225e52d9254c8177b0b0be95268 SHA512 7cbd8ff573be4d66005667affe05de34eff85712c32257480afc3440b462e5635a758995ef35258a449e8842c3709f7406269ebeb0b47b0b7679075bc786c701
 MISC metadata.xml 952 BLAKE2B 53d30be39de0878119f60168ad40d4eb1328b7887ef87f34f7d641a6201fb1567c50558e4f87fc160928461461e5850022863ea21217c57184f782d82a5e3340 SHA512 60feaf7daa0360bc5a76b166a0b32afd74bb6922370cb8f200d1eb2e791ff3837f64d0211b622924b4425fe05ac2133806aa86dd8f0c9976b385362b1a8cb730
diff --git a/mail-mta/postfix/postfix-3.10_pre20240622.ebuild b/mail-mta/postfix/postfix-3.10_pre20240724.ebuild
index 5956c9b9539b..5956c9b9539b 100644
--- a/mail-mta/postfix/postfix-3.10_pre20240622.ebuild
+++ b/mail-mta/postfix/postfix-3.10_pre20240724.ebuild
diff --git a/mail-mta/postfix/postfix-3.9.0.ebuild b/mail-mta/postfix/postfix-3.9.0.ebuild
index 98582d6f54f1..a56a1525293e 100644
--- a/mail-mta/postfix/postfix-3.9.0.ebuild
+++ b/mail-mta/postfix/postfix-3.9.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_SRC}"
 
 LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mongodb mysql nis pam postgres sasl selinux sqlite ssl"