gentoo resync : 16.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
commit: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree: b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /net-mail
parent: b17a3ef12038de50228bade1f05502c74e135321 (diff)
60 files changed, 1100 insertions, 590 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index bf7c3d9c209e..cb95ce348678 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 0b45ddbcd484..b99776d7df26 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -5,10 +5,8 @@ AUX cyrus.confd 164 BLAKE2B dde11def651971e4b8f52bf2aa1f32db8c7ab7697eecb66a73fb
 AUX cyrus.pam-include 109 BLAKE2B f241d45aead08952c5c7cbd6a8a25ca6926ec99703b0e879de2176b1d348efaab0b6547200f10e65a18f1926dcbabe74e5d7eaa9b9a7c7039a35421671b5ada0 SHA512 4c96d5b0a675ddb83f26200a8cbd18c7b663aec39eb78f8509751425fb062e39e6d13e4d06090c6765b32e1cce609db075d725a18cbd4638a7f8ce5c858c47a4
 AUX cyrus.rc8 699 BLAKE2B b1a7cca8f7ee5a23870108550c990dad79c76a729c82efc77713939a537141df8b1ace2bfc6f3a384c28e155bece1bec480bbaf90fcd1899af854d441b518eee SHA512 9340877dd83cd4d5770c12a7f107ee697b42736a57cf304695f03f9f673c5c53b4477f20832ee4815515b2e33e8b33335b298cf5dd48015a6a581b8ab4f4f240
 AUX imapd.conf 1471 BLAKE2B 5373950ac08b630a82fc00b5bf3fed9d400e092458310b64cb669e46470527b864dd5c960bae38f10fac10ca884291ee05203f4c380db57f750fb49217ca7a96 SHA512 dd19551b6e254c5e132f28748435ee61f2df86d6503643cd4946efcfba998d7bd487818ceaab1ca320289077eddd2531f6b05a493a5b5040ee5121165c3a712f
-DIST cyrus-imapd-3.0.10.tar.gz 10766263 BLAKE2B 366a8f524849d2173b8ea836e9f239ae20295dd435594af17d4c4682e7e672bc92c9f1bb0a60d7f7dce638beb94954f20906f9454b33830d2dcabb956ebd558a SHA512 1ae153a8f181bbe020326bec2dc177b78ef3c442f94e24e89b7a719298d93701006596dd21fa1c3a40afd75f01162b03524cf793dd7438ec7192f9a13f7614d0
-DIST cyrus-imapd-3.0.11.tar.gz 10797507 BLAKE2B ac62c11e50b6d92c17056a050f3adcfdeb055930a8568873f65c14a131a04223929c00679265ab7b96a056d7642f93f484ac75b136a9d09c0fa5e0dba0e89a06 SHA512 058efc2e462729b79e431e1b5dab1addfe737aeec8b686698cd2270748275028ca5722ed3960fcd680a0393027ee1b1d7dff65872dd1d8349a3f933e81227e48
 DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc825456ff5a3d1d14ff382ca0f40252d09eb355f92c2020c0a974cc99eda9af4323a3a5b9428375288bf8892dfba35602da4e SHA512 5cd066916797efb975cdb97720f65edc72d3fe82afbd78a26aa8369d95ae4ca09c0593dd4bec5521156c64ea38af7a13065f3b35447a76267dec93feb0ac6ac6
-EBUILD cyrus-imapd-3.0.10-r1.ebuild 5982 BLAKE2B bf66be0f1d2d3ecec9f8f8becfe3f30e670a578dd2134d5286c94cfaea66e4d6dc3401ded3d62de117930f8cf82495bf720532f72335ed697187b01fc68c2a2f SHA512 176f44ce62781cd4390a22c800f64b4eb09cab36c707ada066c52a623b508b28bb5797c9fbc6cced5424ae0846edfa5991453fa162676115b1ec5da9d5773dfb
-EBUILD cyrus-imapd-3.0.11.ebuild 5986 BLAKE2B 88c0ee292037ad25157cb3a3cfcfeace9057aa945cfc57c121dfc6e068c072061a0ca8f94b439fac8dca84ebe2728a9f67b0fa8849b4ba284afa19cac00dc30a SHA512 286cb4d0d755b3ade98ce722ba4c684c7f4424a015f9d2f162fb0dfd6a31c8f2d98dff65306b449ad47730791e76b45dcb86edc44e7df9f7ca5b9525d31a4b83
-EBUILD cyrus-imapd-3.0.13.ebuild 6069 BLAKE2B 462ed74a7efd3bf986dc3f06a55034b003dc079e073aee00e7ba918952cab179c6f6e14f436b11c7ab11b0c47757dbaeef5ae232608d057704e6d13b22d5488d SHA512 9d166468ffd343788761c57ec55b1b78a923ae85949c81292532c40305e57b3a5904a03434dfd0138ed9ce2cfc3e93168455ed8dd884e5d9f78f0618a2191d16
+DIST cyrus-imapd-3.0.14.tar.gz 10865880 BLAKE2B 36f3e60d715d2eab430040964e93cb332cfc4d9097f0f863b94325eb4eb964a4030d1d0f8ddb7870a08b655e1694bbc751d5aab99af6670ab33ad6747f55f6bd SHA512 0bade56f4f7834ef51efc4081f2915bf0f98a2a555cd1b847f13a34418e4c52f2abcb4018906c144c161241433a8ff9ddc6d88499804d3fe616a05f186a3f209
+EBUILD cyrus-imapd-3.0.13.ebuild 6068 BLAKE2B f6f8e1e4ed70120380a8115820fde63a86bf1eec1472ab58b3a382eb73fd643b87668fa5bb6af48b752d8f6df91b39b3e99083a0401b71bc36fa22399f8f5fb1 SHA512 dd16ecf950d4ef61c7cee53133d8890d940a2d91d10ff32bc56ce17b9a7fb9ae0da47a40d31e1435e9ed14d26579de1a4e6945b787b712f09e2773ed9316bf74
+EBUILD cyrus-imapd-3.0.14.ebuild 6032 BLAKE2B 993cb480007f6a76a8789ece078fc162f86ba79d926b488a06d681cb84668abf52e745419bb7f7b3eb07328285d26a7ebb58b469d972baca6e87067cb52ba929 SHA512 eb934a7a3ade30240159999e210bdaf0b638a46d94c89ce25e07c09f35db686d161fd89916c817dabd24c91b0e67fa167d37be88ca8bdd56bfc186d70b86b60d
 MISC metadata.xml 688 BLAKE2B 123d6658cc5bd6f9ac3c20dcc7a06cf6300dcb83129d59e8b275d82b64c1c3ff2c315891c0ee432e6cfb445f74c78f49195e89a20616a51d70ef8bf25aeb9092 SHA512 77075e3673b25f4b4c31815f0bfa8f112e6609a36b9c57a843be5bcf9d5d1ad743e05010fbb4809960b0b74498763bc69b6abbe16e8eced683268398a7be077b
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
deleted file mode 100644
index 855c2e53448b..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic pam ssl-cert user
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/"
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
-	mysql nntp pam perl postgres replication +server sieve snmp \
-	sqlite ssl static-libs tcpd test xapian"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	sys-libs/zlib:0=
-	dev-libs/libpcre:3
-	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson
-	dev-libs/icu:0=
-	sys-libs/e2fsprogs-libs
-	afs? ( net-fs/openafs )
-	calalarm? ( dev-libs/libical:0= )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb:0= )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			sys-libs/pam
-			>=net-mail/mailbase-1
-		)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6
-		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
-		)
-	xapian? ( >=dev-libs/xapian-1.4.0:0= )
-"
-DEPEND="${CDEPEND}
-	test? ( dev-util/cunit )
-"
-
-# all blockers really needed?
-# file collision with app-arch/dump - bug 619584
-RDEPEND="${CDEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!app-arch/dump
-"
-
-REQUIRED_USE="
-	afs? ( kerberos )
-	backup? ( sqlite )
-	calalarm? ( http )
-	http? ( sqlite )
-"
-
-# https://bugs.gentoo.org/678754
-# TODO: check underlinking for other libraries
-PATCHES=( "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" )
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-	# https://bugs.gentoo.org/604466
-	append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-	default
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	# sphinx is unmaintained and dead, bug #662944
-	econf \
-		--enable-unit-tests \
-		--enable-murder \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-com_err \
-		--with-cyrus-user=cyrus \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--disable-sphinx \
-		--enable-squat \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_enable backup) \
-		$(use_enable calalarm calalarmd) \
-		$(use_with caps libcap) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with lmdb) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		$(use_enable xapian) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	mv "${D}"usr/libexec/{master,cyrusmaster} || die
-
-	insinto /etc
-	newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
-	newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
-
-	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
-		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
-		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
-		"${D}"etc/imapd.conf
-
-	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
-		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
-		"${D}"etc/cyrus.conf
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-	# same thing for http(s) as well
-	if ! use http; then
-		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc8" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-
-	echo
-	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
-	einfo "for upgrade instructions."
-	echo
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
index 349c1c1f07a3..ecad086e12b0 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
index 5f70b01ab23e..3487441622a7 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools flag-o-matic pam ssl-cert user
+EAPI=7
+inherit autotools flag-o-matic pam ssl-cert
 
 DESCRIPTION="The Cyrus IMAP Server"
 HOMEPAGE="https://www.cyrusimap.org/"
@@ -27,7 +27,7 @@ CDEPEND="
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )
 	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
 	lmdb? ( dev-db/lmdb:0= )
@@ -54,6 +54,8 @@ DEPEND="${CDEPEND}
 # all blockers really needed?
 # file collision with app-arch/dump - bug 619584
 RDEPEND="${CDEPEND}
+	acct-group/mail
+	acct-user/cyrus
 	!mail-mta/courier
 	!net-mail/bincimap
 	!net-mail/courier-imap
@@ -70,10 +72,11 @@ REQUIRED_USE="
 
 # https://bugs.gentoo.org/678754
 # TODO: check underlinking for other libraries
-PATCHES=( "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" )
+PATCHES=(
+	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+	)
 
 pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
 	# https://bugs.gentoo.org/604466
 	append-ldflags $(no-as-needed)
 }
@@ -129,6 +132,7 @@ src_configure() {
 		$(use_with clamav) \
 		$(use_enable nntp) \
 		$(use_enable http) \
+		$(use_with http nghttp2) \
 		$(use_enable replication) \
 		$(use_enable kerberos gssapi) \
 		$(use_with ldap) \
@@ -155,20 +159,20 @@ src_install() {
 	cp -r contrib tools "${D}/usr/share/doc/${PF}"
 	rm -f doc/text/Makefile*
 
-	mv "${D}"usr/libexec/{master,cyrusmaster} || die
+	mv "${D}"/usr/libexec/{master,cyrusmaster} || die
 
 	insinto /etc
-	newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
-	newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+	newins "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${D}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
 
 	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
 		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
 		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
-		"${D}"etc/imapd.conf
+		"${D}"/etc/imapd.conf
 
 	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
 		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
-		"${D}"etc/cyrus.conf
+		"${D}"/etc/cyrus.conf
 
 	# turn off sieve if not installed
 	if ! use sieve; then
@@ -212,9 +216,9 @@ pkg_preinst() {
 pkg_postinst() {
 	# do not install server.{key,pem) if they exist
 	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
 			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
 		fi
 	fi
 
diff --git a/net-mail/django-mailman3/Manifest b/net-mail/django-mailman3/Manifest
new file mode 100644
index 000000000000..7291e3fff24b
--- /dev/null
+++ b/net-mail/django-mailman3/Manifest
@@ -0,0 +1,3 @@
+DIST django-mailman3-1.3.4.tar.gz 390310 BLAKE2B 0f28e5191ddfec8196824362ffb6b406f8bbcc64e85f93ded37317502673140693c48c60a34713a90cd6651839edaa788f9f73ec8a1836a1597854316ffd3481 SHA512 0b28636caec452efeda2b1b44f1d5ad44740ab0c3ea7b03d7d2e6bf420b1a788d5858e5c827824ef6baf2a463232ec53f404d3de0c22cf6ee17065236f7fcd91
+EBUILD django-mailman3-1.3.4.ebuild 659 BLAKE2B dbcee3757a33dea7d35f3b29dc35f963fbb04cc35d8e769598677e21ad0117409e1e85407c9378834fb42791a73d7f603c85a0ff6644f84937c4b81d59cc727d SHA512 d33ef2aaed88682f37bb237111333bbbf837286ae935fb54df9d93224ebc20e68e3c93f75c252be05ec50646110493300945c71b2911908a70d1abf0c34eb1ad
+MISC metadata.xml 294 BLAKE2B db0ad1bae5464f96474c73f66142b247ded80896b8b5c308b6308768103fa7b18b08c8ef6b9617bbd36693c502da76a1fc11799b4596169709e27418141ec606 SHA512 c29c7fd0c77118c68d0ac8b07445b6b84de33864236d1b618c9dd2e67126a44603da4b9c4e7c41d024bce2037cec051180489e0cf75c31971c29215c7599d37d
diff --git a/net-mail/django-mailman3/django-mailman3-1.3.4.ebuild b/net-mail/django-mailman3/django-mailman3-1.3.4.ebuild
new file mode 100644
index 000000000000..26934af93d6b
--- /dev/null
+++ b/net-mail/django-mailman3/django-mailman3-1.3.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django-based interfaces interacting with Mailman 3"
+HOMEPAGE="https://www.list.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]
+	net-mail/mailmanclient[${PYTHON_USEDEP}]
+	dev-python/django-allauth[${PYTHON_USEDEP}]
+	dev-python/django-gravatar2[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+
+DOCS=( README.rst )
diff --git a/net-mail/django-mailman3/metadata.xml b/net-mail/django-mailman3/metadata.xml
new file mode 100644
index 000000000000..78294879d023
--- /dev/null
+++ b/net-mail/django-mailman3/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hanno@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-mailman3</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 4f173998405c..b934ff564bcf 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,3 +1,5 @@
+AUX dovecot-2.3.11.3-apop-fix.patch 2226 BLAKE2B 47971fc29ff3add43ca7ee253c4e1579dd22e603c6692f592c605a742330df80309ee06f8bb811e64de03392e0dee19efe1964229f61209b9f48fb0dd557b7d2 SHA512 6ebc10a6e0ca9f4790cbe57a9e9283838c5fbe124e9be305fcd16e472a5edea97a055700613fb6a1a43fe139537da80a603493f250b34f2179f969da2a09f2cc
+AUX dovecot-unwind-generic.patch 645 BLAKE2B 6598abbd2819f7109d4caacbce5123b8810b93b623956561a12a749cbc582667caa160eac62305067db6037f820c8e1a8bd8a22da09a454afcb9e21209cc5fd3 SHA512 6ede0edd5bd6d1123ff1567886898eee5795baa549c610ba8a3567c0f8fee27d69028aaf8b6067c2f37b915a07e165aa0d6a2d5fb8314deffd61a187b18de4ae
 AUX dovecot-userdb-passwd-fix.patch 500 BLAKE2B 133e7b13cf3dd1515db5694945abd2d00ecd89c4a766ea873099ebbdd450700e70b80696ba58b21cc4f7160fa3becde6453c9334d41cdad426e3f59bd9e5491e SHA512 18a26eed0c793b0ccee828dc5eafc6448dda94d705597b19c3333f21944e838b677af2884f5fb65eb2f6dc79158ad8b3143b24d3788d841038de6dd24885fc0d
 AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed288c787dc81f8902e770f7774c54eba90de49e9634eb93873046a043bd7825cfb65bab5b2ea9ce108 SHA512 982f9897e4a0a5a3957bb12785961c9cde72a2c941f55efdb23e9a26cec19efe89e3be4effe79522c297ea2b258d201db78c19b6e3f9cd5e68d3736c2a0f0063
 DIST dovecot-2.2-pigeonhole-0.4.24.2.tar.gz 1833284 BLAKE2B bee45fd129aee3d5126bd48b27829e7e266a5c1043411b6b23655bbf32e2f684763b82bff476a954bf7f0c7aae4e038c0892be70776726c7b324e409a8f89d78 SHA512 a51de88bcbac83ced7d314a560bd44f119dd80bf58f350da522501f072c0a4c02ff8c11152e2b858f14bb8ca9a9b665960cbe37a0c8ef4600b430e65ddbf3bf4
@@ -10,6 +12,7 @@ DIST dovecot-2.3.11.3.tar.gz 7353412 BLAKE2B 0067989b35fe29c0d23f6ca25712a87fa69
 DIST dovecot-2.3.7.2.tar.gz 7076231 BLAKE2B 2cb93aa594db722489063b490469dfe284b1f997b64c9a699b506ccbd04e8e7c2d503ddc12a2598958dfca88560c19487801a728f386b8fea5f637a75b83812e SHA512 172f7f0edb884259e4c050607510aee67a35c3a20b7dd147e7c8a25a04921c18f7d6b5c85af2c69ae8c4d53791550970e471b033dbfae94253e331053b6a317d
 EBUILD dovecot-2.2.36.4.ebuild 8605 BLAKE2B b649cd8db3cc6ed5fe93a6013a16e7f99a121e35d684fdfa9fc74aec1487f571fb1f59f4433ad89a6bdcd33de0d916b111226a33bdacc084383580c881d98551 SHA512 811bd1cb2ebec984f98d02a975c7774e0449e1b87c26840107d2e93c79ba69f0c8714d2db5c63513233893c0230080d2fd002962aa6b536f12f6ba6d36f7b5a9
 EBUILD dovecot-2.3.10.1.ebuild 8629 BLAKE2B 4d664f1ff75b846a2be7dcca52b7189efac3c6f95e40a0af935dd16f857c51db53aa72023e94b4ae86a5bf892475fd4259dc5085ea41a5053b702ced5b2725cd SHA512 d783676c087faaa047de828eb6a38f21a4512e81cea4a1dcb03d4e852518cb520cfa66d88540a63c3805fdc1144f4895d8a4db8269c3bbf93691bcea080dcbec
-EBUILD dovecot-2.3.11.3.ebuild 8632 BLAKE2B a7a0663a23eff59b6532bbb9b3af4e24aef39448784e90e6f92739aff6c47143de45f3416f7aa5e061e3489ee5141c9d6385bfac1df02890e121db4b81ce55d9 SHA512 d94485bd763eb04045419f15cd93efadb3b149fe90938256a66947d8b4f486c4f4f54d21f08998291d2e7e3ab9b1fb8cb2a1ca6fd6a1010e40dc3d0c4f301140
+EBUILD dovecot-2.3.11.3-r1.ebuild 8830 BLAKE2B becfd7b5ea04d99bca605ab6a45a5a009cc43bb4d8bf0a1c86a4686ef8026ce39a609ca80e5d88bcf8cd301caa28d4d899f25e2bde02b183d95a9a1b1717debb SHA512 61e9918c800bc1c074cfddca4e71859f24dc57905f6ebac7dece8e5fe7b6aabebdf691b0126b9aed4c868ee74e2ee4e7a36c042e97ef7f032d6da1f2a24f8f2d
+EBUILD dovecot-2.3.11.3.ebuild 8677 BLAKE2B 048d0c34b3a8de6484ce8976f80fb6b84e9f0d4654ba3df8a037ac7cb99e5d03ef19b40aecde74285fe2c5a5d457baa2d31ca91e4f1b4ea4f91dc5c4602b5e35 SHA512 098d6e592eadd1401c99a74ba68756857c50363bee2b6f940a4c4f22500d61cc882bcae324d74606b5239592463d98d5371e72115c72339114f529c55300efad
 EBUILD dovecot-2.3.7.2.ebuild 8717 BLAKE2B 2aef6fffe859d0965f3e809739cdec16165fc4935cda3eae6ea89dce803366ac7fb0ad0dd1a95b3a4ee040a2be61cb44e58e61fb44feb47d0ef9e3496febe30e SHA512 3412f9224528f4872777d580e352e8cd679b7d1a9f88a20594e56358cd026f74343b624205e8ea0972ead3b3c9157a8061ddc7c3181c183fb6caf1d1c2f2f515
-MISC metadata.xml 877 BLAKE2B 07dfbe6709d8abfe8a75bfce0ae605ba84519571bf4f85b572b0e7fe90846622dd74786c92c5da7c3829efd97075a94869eaa9b98542e0656a88a52c630c90d8 SHA512 95d9463fca2b5705778aba2ca0b175ed1e72a1e1d49f6ec52932b64dd976c9e06d59bd7c165ca76d75a1dad22888838076aaf73bbcf0a1d52a77e64eca7098f5
+MISC metadata.xml 998 BLAKE2B c65428e9f0019e942fc1d634d53c2a85c7f8a699e34cf9c49ae09bfe9ce8a54fd368512f7a4d74f6a10baff949a9fe8021e1e0c009f8315b100fb5736efd34ae SHA512 f285f0928dc0915c8e8cebb966de84f5564be9f7dd3baa7c0cccb3343da75507003aeadf80fe34ffb4b69dd9208997a80fdb47c20bfd65fdc60c43423a00813c
diff --git a/net-mail/dovecot/dovecot-2.3.11.3-r1.ebuild b/net-mail/dovecot/dovecot-2.3.11.3-r1.ebuild
new file mode 100644
index 000000000000..8e907759746f
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.11.3-r1.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# do not add a ssl USE flag.  ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit autotools ssl-cert systemd toolchain-funcs
+
+MY_P="${P/_/.}"
+#MY_S="${PN}-ce-${PV}"
+major_minor="$(ver_cut 1-2)"
+sieve_version="0.5.11"
+if [[ ${PV} == *_rc* ]] ; then
+	rc_dir="rc/"
+else
+	rc_dir=""
+fi
+SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+	sieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="https://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="argon2? ( dev-libs/libsodium )
+	bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lua? ( dev-lang/lua:* )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	lzma? ( app-arch/xz-utils )
+	lz4? ( app-arch/lz4 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+	rpc? ( net-libs/libtirpc net-libs/rpcsvc-proto )
+	selinux? ( sec-policy/selinux-dovecot )
+	solr? ( net-misc/curl dev-libs/expat )
+	sqlite? ( dev-db/sqlite:* )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	suid? ( acct-group/mail )
+	tcpd? ( sys-apps/tcp-wrappers )
+	textcat? ( app-text/libexttextcat )
+	unwind? ( sys-libs/libunwind )
+	vpopmail? ( net-mail/vpopmail )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+	virtual/libiconv
+	dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+	acct-group/dovecot
+	acct-group/dovenull
+	acct-user/dovecot
+	acct-user/dovenull
+	net-mail/mailbase"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-apop-fix.patch
+	"${FILESDIR}/${PN}"-unwind-generic.patch
+	)
+
+pkg_setup() {
+	if use managesieve && ! use sieve; then
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
+	fi
+}
+
+src_prepare() {
+	default
+	# bug 657108
+	#elibtoolize
+	eautoreconf
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no econf \
+		--with-rundir="${EPREFIX}/run/dovecot" \
+		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--disable-rpath \
+		--without-libbsd \
+		--with-icu \
+		--with-ssl \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$( use_with argon2 sodium ) \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with lua ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with lz4 ) \
+		$( use_with lzma ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with tcpd libwrap ) \
+		$( use_with textcat ) \
+		$( use_with unwind libunwind ) \
+		$( use_with vpopmail ) \
+		$( use_with zlib ) \
+		$( use_with zstd ) \
+		$( use_enable static-libs static ) \
+		${conf}
+
+	if use sieve || use managesieve ; then
+		# The sieve plugin needs this file to be build to determine the plugin
+		# directory and the list of libraries to link to.
+		emake dovecot-config
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		econf \
+			$( use_enable static-libs static ) \
+			--localstatedir="${EPREFIX}/var" \
+			--enable-shared \
+			--with-dovecot="${S}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	fi
+}
+
+src_test() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default
+	fi
+}
+
+src_install() {
+	default
+
+	# insecure:
+	# use suid && fperms u+s /usr/libexec/dovecot/deliver
+	# better:
+	if use suid;then
+		einfo "Changing perms to allow deliver to be suided"
+		fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+
+	dodoc AUTHORS NEWS README TODO
+	dodoc doc/*.{txt,cnf,xml,sh}
+	docinto example-config
+	dodoc doc/example-config/*.{conf,ext}
+	docinto example-config/conf.d
+	dodoc doc/example-config/conf.d/*.{conf,ext}
+	docinto wiki
+	dodoc doc/wiki/*
+	doman doc/man/*.{1,7}
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${ED}/etc/dovecot/dovecot.conf"
+	local confd="${ED}/etc/dovecot/conf.d"
+
+	insinto /etc/dovecot
+	doins doc/example-config/*.{conf,ext}
+	insinto /etc/dovecot/conf.d
+	doins doc/example-config/conf.d/*.{conf,ext}
+	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	rm -f "${confd}/../README"
+
+	# .maildir is the Gentoo default
+	local mail_location="maildir:~/.maildir"
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" \
+		"${confd}/10-mail.conf" \
+		|| die "failed to update mail location settings in 10-mail.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${confd}/auth-system.conf.ext" \
+			|| die "failed to update PAM settings in auth-system.conf.ext"
+		# mailbase does not provide a sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
+		sed -i -e \
+			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update PAM settings in 10-auth.conf"
+	fi
+
+	# Disable ipv6 if necessary
+	if ! use ipv6; then
+		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	fi
+
+	# Update ssl cert locations
+	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+		|| die "ssl conf failed"
+	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		sed -i -e \
+			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
+			10-auth.conf"
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		sed -i -e \
+			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update ldap settings in 10-auth.conf"
+	fi
+
+	if use vpopmail; then
+		sed -i -e \
+			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update vpopmail settings in 10-auth.conf"
+	fi
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake DESTDIR="${ED}" install
+		sed -i -e \
+			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+			|| die "failed to update sieve settings in 15-lda.conf"
+		rm -rf "${ED}"/usr/share/doc/dovecot
+		docinto example-config/conf.d
+		dodoc doc/example-config/conf.d/*.conf
+		insinto /etc/dovecot/conf.d
+		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+		docinto sieve/rfc
+		dodoc doc/rfc/*.txt
+		docinto sieve/devel
+		dodoc doc/devel/DESIGN
+		docinto plugins
+		dodoc doc/plugins/*.txt
+		docinto extensions
+		dodoc doc/extensions/*.txt
+		docinto locations
+		dodoc doc/locations/*.txt
+		doman doc/man/*.{1,7}
+	fi
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+	# Let's not make a new certificate if we already have one
+	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
+		einfo "Creating SSL	certificate"
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+		install_cert /etc/ssl/dovecot/server
+	fi
+
+	elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes."
+}
diff --git a/net-mail/dovecot/dovecot-2.3.11.3.ebuild b/net-mail/dovecot/dovecot-2.3.11.3.ebuild
index 1141fb82f34c..eb5ee4009c4e 100644
--- a/net-mail/dovecot/dovecot-2.3.11.3.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.11.3.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
@@ -69,6 +69,8 @@ RDEPEND="${DEPEND}
 	acct-user/dovenull
 	net-mail/mailbase"
 
+PATCHES=( "${FILESDIR}"/${P}-apop-fix.patch )
+
 pkg_setup() {
 	if use managesieve && ! use sieve; then
 		ewarn "managesieve USE flag selected but sieve USE flag unselected"
diff --git a/net-mail/dovecot/files/dovecot-2.3.11.3-apop-fix.patch b/net-mail/dovecot/files/dovecot-2.3.11.3-apop-fix.patch
new file mode 100644
index 000000000000..667b4829f1c0
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-2.3.11.3-apop-fix.patch
@@ -0,0 +1,60 @@
+From 3c5917d1abee8f4af43b5016ddb897154912eb8d Mon Sep 17 00:00:00 2001
+From: Aki Tuomi <aki.tu...@open-xchange.com>
+Date: Thu, 13 Aug 2020 19:13:49 +0300
+Subject: [PATCH 2/2] auth: test-mech - Fix type mismatch
+
+---
+ src/auth/test-mech.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/auth/test-mech.c b/src/auth/test-mech.c
+index 0a030a2be0..0a22ff46d0 100644
+--- a/src/auth/test-mech.c
++++ b/src/auth/test-mech.c
+@@ -192,7 +192,7 @@ static void test_mech_handle_challenge(struct auth_request *request,
+ }
+ 
+ static inline const unsigned char *
+-test_mech_construct_apop_challenge(unsigned int connect_uid, unsigned long *len_r)
++test_mech_construct_apop_challenge(unsigned int connect_uid, size_t *len_r)
+ {
+ 	string_t *apop_challenge = t_str_new(128);
+ 
+@@ -323,7 +323,7 @@ static void test_mechs(void)
+ 		struct test_case *test_case = &tests[running_test];
+ 		const struct mech_module *mech = test_case->mech;
+ 		struct auth_request *request;
+-		const char *testname = t_strdup_printf("auth mech %s %d/%lu",
++		const char *testname = t_strdup_printf("auth mech %s %d/%zu",
+ 						       mech->mech_name,
+ 						       running_test+1,
+ 						       N_ELEMENTS(tests));
+-- 
+2.11.0
+
+From 47ebfeef07d0908ba6b66344b0f630a21b81bcab Mon Sep 17 00:00:00 2001
+From: Aki Tuomi <aki.tu...@open-xchange.com>
+Date: Thu, 13 Aug 2020 19:13:04 +0300
+Subject: [PATCH 1/2] auth: test-mech - Fix APOP challenge format
+
+---
+ src/auth/test-mech.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/auth/test-mech.c b/src/auth/test-mech.c
+index cf05370035..0a030a2be0 100644
+--- a/src/auth/test-mech.c
++++ b/src/auth/test-mech.c
+@@ -196,8 +196,8 @@ test_mech_construct_apop_challenge(unsigned int connect_uid, unsigned long *len_
+ {
+ 	string_t *apop_challenge = t_str_new(128);
+ 
+-	str_printfa(apop_challenge,"<%lx.%u.%"PRIdTIME_T"", (unsigned long) getpid(),
+-		    connect_uid, process_start_time+10);
++	str_printfa(apop_challenge,"<%lx.%lx.%"PRIxTIME_T".", (unsigned long)getpid(),
++		    (unsigned long)connect_uid, process_start_time+10);
+ 	str_append_data(apop_challenge, "\0testuser\0responseoflen16-", 26);
+ 	*len_r = apop_challenge->used;
+ 	return apop_challenge->data;
+-- 
+2.11.0
diff --git a/net-mail/dovecot/files/dovecot-unwind-generic.patch b/net-mail/dovecot/files/dovecot-unwind-generic.patch
new file mode 100644
index 000000000000..f7bc8d94ff23
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-unwind-generic.patch
@@ -0,0 +1,15 @@
+Bug 728336
+--- a/m4/want_unwind.m4
++++ b/m4/want_unwind.m4
+@@ -4,9 +4,9 @@
+     PKG_CHECK_EXISTS([libunwind], [
+       PKG_CHECK_MODULES([LIBUNWIND], [libunwind],[
+         dnl see if there is target-specific library
+-        AC_CHECK_LIB([unwind-${build_cpu}], [_U${build_cpu}_init_local],[
++        PKG_CHECK_MODULES([LIBUNWIND_GENERIC], [libunwind-generic],[
+           have_libunwind=yes
+-          LIBUNWIND_LIBS="$LIBUNWIND_LIBS -lunwind-${build_cpu}"
++          LIBUNWIND_LIBS="$LIBUNWIND_LIBS $LIBUNWIND_GENERIC_LIBS"
+           AC_DEFINE([HAVE_LIBUNWIND],,[Define this if you have libunwind])
+         ],[
+            have_libunwind=no
diff --git a/net-mail/dovecot/metadata.xml b/net-mail/dovecot/metadata.xml
index b28b2502b030..098cd7dac462 100644
--- a/net-mail/dovecot/metadata.xml
+++ b/net-mail/dovecot/metadata.xml
@@ -12,7 +12,9 @@
     <flag name="vpopmail">Add vpopmail support</flag>
     <flag name="lucene">Add lucene full text search (FTS) support using <pkg>dev-cpp/clucene</pkg></flag>
     <flag name="lzma">Add support for lzma (de)compression</flag>
+    <flag name="rpc">Add support for NFS quotas</flag>
     <flag name="solr">Add solr full text search (FTS) support</flag>
     <flag name="textcat">Add libtextcat language guessing support for full text search (FTS)</flag>
+    <flag name="zstd">Add support for zstd (de)compression</flag>
   </use>
 </pkgmetadata>
diff --git a/net-mail/email/Manifest b/net-mail/email/Manifest
index 45a0cb97443c..ab9b3750492c 100644
--- a/net-mail/email/Manifest
+++ b/net-mail/email/Manifest
@@ -1,5 +1,4 @@
 AUX email-3.1.3-fno-common.patch 560 BLAKE2B c592ea54a13089e65cb6fd6bdcb80438f8a0f7f8734149b0b8f58649a94eb17f5cb4e87f96131e2d03ad8dc057a5c4f1bab71b64d071ec0ea565622d4d5ca834 SHA512 34bee203fa588e6ba785c331208086448b39c4bb4725b04166a165980e8b5b4c1e5d0bb87a59b540a7df0f0a3b88dd0427e715c736ef443bcb40eb3a3495f6d9
 DIST email-3.1.3.tar.bz2 178396 BLAKE2B 645d1fd3f0585ce6cbe2e0f2354989f07b39c83c8d21789a94d27a9e9820ea02ec1b213080018c560c7c79ef6f8fa2b636df4f40c9bc5390321d438cf64c448e SHA512 3fc1a8aa653a519261614e54b3215b89e41273207aa63f64572c8820093922a820ecad5e939b0eadf8d4c0587be83ffcb239bb31fd959b96dcf566157420f33b
-EBUILD email-3.1.3-r1.ebuild 446 BLAKE2B 902f3d748da96149c357a6bd710d45d717f49f55a09e9525971a53ee3b8fe7825c4dafcae5eabd68df93cb550cb9dfa16033ca7b5f0a1090881e5615b6cba24b SHA512 7f338c82575e37c5d4aab4ae443d830e5e73e4811b9370bc14acafecba556d78909029fbd7f266371b6afc0822e38d3f76749c3eafbd6fd83f5d159e56f6127c
-EBUILD email-3.1.3.ebuild 556 BLAKE2B eab248d080b827b2526f6d0284310b0f66e2f3cdc24be511efb387b4b5e3a95d47d2360037115108f9810706d9c29153c0f73c2e27e68325b36578dc37810eb7 SHA512 c7c11d031d578bf3b5423cf1125ccb469515ecbb8be3b10afcd93f7741a864d535a546be6ec0c2ced2c9fd672a9985e10dd95b00140969210e576d24e74be5ce
-MISC metadata.xml 259 BLAKE2B 340db8ab484f8fe7b7a74af660d7ef8f4d99d98b2feaaa02836808ef6da6176f6c15ea5525a097b8556d434a4c8d6a6c49d97a1deb1376edac3220b4d9a07208 SHA512 be960a9ee308ff2013fbd23ae68a484a273afb04a49490859d0bd5f01e21d176937386bb2704b6dba5599ae3c71f5c91c995a46dbb162b0925c41a025567ed81
+EBUILD email-3.1.3-r1.ebuild 445 BLAKE2B 66cd52cbdc035c1ec0799101608644a016d7e1cedeb174e2d68a29b703fd217d3d4dc00c39110725069b5d4640ecff9483b44470a9856dad29973f02f86303a1 SHA512 8856483d91623993e302bb1001db1613696f60da16eae49d69f56c1fba13205052e12b54217f6e8f4c2a45fd6e8f1141eadd7612d17c8cdceaa49e4f0a013a90
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/net-mail/email/email-3.1.3-r1.ebuild b/net-mail/email/email-3.1.3-r1.ebuild
index 3f20f43dd79d..03b751178f8d 100644
--- a/net-mail/email/email-3.1.3-r1.ebuild
+++ b/net-mail/email/email-3.1.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.cleancode.org/downloads/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 x86"
+KEYWORDS="~alpha amd64 x86"
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.3-fno-common.patch
 )
diff --git a/net-mail/email/email-3.1.3.ebuild b/net-mail/email/email-3.1.3.ebuild
deleted file mode 100644
index f66f7d5ea1eb..000000000000
--- a/net-mail/email/email-3.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Advanced CLI tool for sending email"
-HOMEPAGE="http://www.cleancode.org/projects/email"
-SRC_URI="http://www.cleancode.org/downloads/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 x86"
-IUSE=""
-
-src_prepare() {
-	sed -i -e "s:/doc/email-\${version}:/share/doc:" configure || die
-	sed -i -e "s:DIVIDER = '---':DIVIDER = '-- ':" email.conf || die
-}
-
-src_install() {
-	default
-	doman email.1
-	dodoc README TODO
-}
diff --git a/net-mail/email/metadata.xml b/net-mail/email/metadata.xml
index 9fe279795832..1b2becffa26c 100644
--- a/net-mail/email/metadata.xml
+++ b/net-mail/email/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <longdescription lang="en">
-    Advanced CLI tool for sending mail.
-  </longdescription>
 </pkgmetadata>
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 58e517970266..c73f26645d94 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -4,6 +4,10 @@ AUX fetchmail.confd 297 BLAKE2B 00f9a55be3b6351dc7b97758f3403feab9d1025bb2b0398a
 AUX fetchmail.initd 993 BLAKE2B 76fb355805afc0b62f350f02dc0b0d6ac83659d2e15a49309192de313fa38b61e32db0bb9e5148c3d56bae61ca5e714f8d9576e0f95997d45a44d51f56c8235c SHA512 06091152111059425e86207e968ad5819eb67cd2dd264855e7b77a163b95591abc29befe4b3eb8bf2d2af105efb5006bb048f3db4ef3f8f4fafbb78767f69ebb
 AUX fetchmail.service 204 BLAKE2B 4683577d0da4929b068bd2f49516838644ac399e6ab27fb6ff9f3d5f1d8357302e11e6fc4d22d8944d504bdbb600e87b853e039601b8cca9763e1ca465573508 SHA512 088d7ff2c473d4b514cc5349ba6f10bb7f29ace1141d152db082c801a9dd0e6144a2dd350e27e97f633aaf286c2daa5253e52b5c410737c44f3fd9b5b57bab75
 AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3792d20eecded0ef42f15ddd768470a9dd541a66a495e954632e9b12ba3c0cfb446c4e2832eb9d3993f8c3 SHA512 4f8208a286f2868a466e69919b7c9d965da099b44675105689bcc52b0d16acc8d46e77f6b9a72968e82a6cf900e20d07a9a7373fe26a1ba9c925edf6663180ed
+DIST fetchmail-6.4.11.tar.xz 1302708 BLAKE2B 660f05c54ea9772de2dd3e584d0d2ff9addfdb7927396330a829f85995a7a2cd818c37762f704030ab73aba6750b62862dc79ad4617d45e948e8a96474fe8258 SHA512 aa7961490e34bffffb571bbc67eccec4bdef046da0a959cb2522e511074c275dbf4d797f9d8d019d7f464baae7ca19194cafeef65b5bc258dbf970d58f2dfd16
+DIST fetchmail-6.4.12.tar.xz 1303532 BLAKE2B d37c020b07b342ef4ba95a4b7f017217515e26ec06512350fea2bd58aa4d848a4865d98b1f9440ead544d9c377221f31f97f02499b7799ffa56c1e7dae7b73cf SHA512 277c324bab528a036f2896909b63baaa68d986b79baa24e2ee5cd8ca1d86082d4cd41ca371114fc8ae150eb0f97af50fd5238e88485ad5c701699b69964fe256
 DIST fetchmail-6.4.8.tar.xz 1282300 BLAKE2B 31b7f9fa31edff534210a2a0764cc6dec461968071a8aa29b1d1e9915ff6b8d2949b128f97d72fafe6d431b06d4e5c6b38d4a3cdba06736bdf8ec1879a991798 SHA512 c1052389baafa3a48186733133130bf69b87c8dda8faa00e82f5947037845b95d3271c8183df729728a351888175174ca11eb18f9adb8b3515860cba95ab8987
+EBUILD fetchmail-6.4.11.ebuild 2519 BLAKE2B d693548f12d13da5218deb137abe401690011e563d5a43914f323163a81fe5a75ed6c39fa57bf9544695688e60ac5430444251b3a71173b6e5352f0348c9cbb5 SHA512 13b7bdad5c1d1219c8dcf176181a59a180cdbbaaee0248cc6b3625cf6e07b226319ce6844e6e647673b43b9fafe3b962e71b81c1373e6f96d832cb8caab88e3f
+EBUILD fetchmail-6.4.12.ebuild 2519 BLAKE2B d693548f12d13da5218deb137abe401690011e563d5a43914f323163a81fe5a75ed6c39fa57bf9544695688e60ac5430444251b3a71173b6e5352f0348c9cbb5 SHA512 13b7bdad5c1d1219c8dcf176181a59a180cdbbaaee0248cc6b3625cf6e07b226319ce6844e6e647673b43b9fafe3b962e71b81c1373e6f96d832cb8caab88e3f
 EBUILD fetchmail-6.4.8.ebuild 2511 BLAKE2B ebc8a846792c69dc12b7d8030efbd68994d41e1cab51ec8ef5007ec5b8f036f09ac12a69b5c02efb06fa2eb71e5d24655d844661b50737bb4cad5d8322acf9ec SHA512 03e1eb61afe94c73b103f3a56e016f28eb8ed719c44e2f75cf11d81acec5c911a2485d99a74de8bb6c37710f0e6be0daf55b8a675f98a330d02dceea21b0cea8
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.11.ebuild b/net-mail/fetchmail/fetchmail-6.4.11.ebuild
new file mode 100644
index 000000000000..9b96312d1c6c
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.4.11.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="tk"
+
+inherit python-single-r1 systemd toolchain-funcs autotools
+
+DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
+HOMEPAGE="https://www.fetchmail.info/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="ssl nls kerberos tk socks libressl"
+REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="acct-user/fetchmail
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.1.1:= )
+		libressl?  ( dev-libs/libressl:= )
+	)
+	kerberos? (
+		virtual/krb5
+		!libressl? ( >=dev-libs/openssl-1.0.2:= )
+		libressl?  ( dev-libs/libressl:= )
+	)
+	nls? ( virtual/libintl )
+	!elibc_glibc? ( sys-libs/e2fsprogs-libs )
+	socks? ( net-proxy/dante )
+	tk? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/flex
+	nls? ( sys-devel/gettext )"
+
+DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO"
+HTML_DOCS="*.html"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.3.26-python-optional.patch
+)
+S=${WORKDIR}/${P/_/.}
+
+pkg_setup() {
+	use tk && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# don't compile during src_install
+	use tk && : > "${S}"/py-compile
+	eautoreconf
+}
+
+src_configure() {
+	use tk || export PYTHON=:
+
+	econf \
+		--enable-RPA \
+		--enable-NTLM \
+		--enable-SDPS \
+		$(use_enable nls) \
+		$(use_with ssl ssl "${EPREFIX}/usr") \
+		$(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos kerberos5) \
+		--without-hesiod \
+		$(use_with socks)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/fetchmail.initd fetchmail
+	newconfd "${FILESDIR}"/fetchmail.confd fetchmail
+
+	systemd_dounit  "${FILESDIR}"/${PN}.service
+	systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service"
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
+
+	docinto contrib
+	local f
+	for f in contrib/* ; do
+		[ -f "${f}" ] && dodoc "${f}"
+	done
+
+	use tk && python_optimize
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Please see /etc/conf.d/fetchmail if you want to adjust"
+		elog "the polling delay used by the fetchmail init script."
+	fi
+}
diff --git a/net-mail/fetchmail/fetchmail-6.4.12.ebuild b/net-mail/fetchmail/fetchmail-6.4.12.ebuild
new file mode 100644
index 000000000000..9b96312d1c6c
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.4.12.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="tk"
+
+inherit python-single-r1 systemd toolchain-funcs autotools
+
+DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
+HOMEPAGE="https://www.fetchmail.info/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="ssl nls kerberos tk socks libressl"
+REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="acct-user/fetchmail
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.1.1:= )
+		libressl?  ( dev-libs/libressl:= )
+	)
+	kerberos? (
+		virtual/krb5
+		!libressl? ( >=dev-libs/openssl-1.0.2:= )
+		libressl?  ( dev-libs/libressl:= )
+	)
+	nls? ( virtual/libintl )
+	!elibc_glibc? ( sys-libs/e2fsprogs-libs )
+	socks? ( net-proxy/dante )
+	tk? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/flex
+	nls? ( sys-devel/gettext )"
+
+DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO"
+HTML_DOCS="*.html"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.3.26-python-optional.patch
+)
+S=${WORKDIR}/${P/_/.}
+
+pkg_setup() {
+	use tk && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# don't compile during src_install
+	use tk && : > "${S}"/py-compile
+	eautoreconf
+}
+
+src_configure() {
+	use tk || export PYTHON=:
+
+	econf \
+		--enable-RPA \
+		--enable-NTLM \
+		--enable-SDPS \
+		$(use_enable nls) \
+		$(use_with ssl ssl "${EPREFIX}/usr") \
+		$(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos kerberos5) \
+		--without-hesiod \
+		$(use_with socks)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/fetchmail.initd fetchmail
+	newconfd "${FILESDIR}"/fetchmail.confd fetchmail
+
+	systemd_dounit  "${FILESDIR}"/${PN}.service
+	systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service"
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
+
+	docinto contrib
+	local f
+	for f in contrib/* ; do
+		[ -f "${f}" ] && dodoc "${f}"
+	done
+
+	use tk && python_optimize
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Please see /etc/conf.d/fetchmail if you want to adjust"
+		elog "the polling delay used by the fetchmail init script."
+	fi
+}
diff --git a/net-mail/maildirtree/Manifest b/net-mail/maildirtree/Manifest
index 210522416ec3..4c70df32d587 100644
--- a/net-mail/maildirtree/Manifest
+++ b/net-mail/maildirtree/Manifest
@@ -1,4 +1,4 @@
 AUX maildirtree-0.6-ldflags.patch 554 BLAKE2B 7024bd5632de675fc2de91a9c53b709ae3f77395f35ee844b335a74750ee89ff169cba846084a850c487cf660d009cfe36c6012d1b70f4a7e3d626e9882c4b53 SHA512 7969cdf5887e5030c516ee07de057b33a974df912b457833618925a0c00bffe393de2df80fb67858710690d0ddbc877fe59a2a323b61008a5005b189304e3acc
 DIST maildirtree-0.6.tar.gz 52569 BLAKE2B d2505fe66378ca43c83df7bdef6b8afeb38671cb87ba3797c3ac96cdb6ad0d9b6b59e4fd69fba51e402d3c3318383ef3ad516c51c5c585142ea1ba5c0e5270f1 SHA512 13a897b416308b4da7f6e4cb0a93e201fd873b8c490d77ca4186a373fe101837a2b7ba70706775c2ccd717f4b513ba24efe56a94f3c1075f6c0db5729cec9f2f
 EBUILD maildirtree-0.6-r1.ebuild 527 BLAKE2B 8f540719da35337858c3fe951f8be473d8d016ebeb052ef364a0b24ea2f3426b426bc92b6f750ec97798e6229336f7987579f8a94089d51abcbf31aced3a1280 SHA512 ef1d8d4647f689ea831234411d3af6c06c05b1975cdc1fd5289bd18017c9694ff3b456a70ed7d37b819222d7ad1d0425c9ff7b3242d6ed227e1e8ac9026a08ac
-MISC metadata.xml 273 BLAKE2B c6f6adb4442cc20e9f3d34fe2541e57bd6d78a96bb1b060bc4237326b45bd30530078b7cadfe8baf02ddd11ba7c38828a5ee600bd3b532451f23545c7e1f01ac SHA512 062655344558b9693c6c856b8be5cc98b0dbe57cb829171f6607225dbf3ff36ed8ecad6fb3fabce5a18fe83a124f99a451668efcb5287802e8fec5b717accff3
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/maildirtree/metadata.xml b/net-mail/maildirtree/metadata.xml
index 0289f9756d4a..7a38bb900964 100644
--- a/net-mail/maildirtree/metadata.xml
+++ b/net-mail/maildirtree/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		A utility that prints trees of Courier-style Maildirs.
-	</longdescription>
 </pkgmetadata>
diff --git a/net-mail/mailmanclient/Manifest b/net-mail/mailmanclient/Manifest
new file mode 100644
index 000000000000..9643d0f8464c
--- /dev/null
+++ b/net-mail/mailmanclient/Manifest
@@ -0,0 +1,3 @@
+DIST mailmanclient-3.3.1.tar.gz 78807 BLAKE2B 04542069b3a7a4b0069363f09c21ce321350fe25e57a86e5ac9ac9ec5329777acfdd1ccf62354d9df86f615f37328a8c9700811e05823ec39a648c4477b9321e SHA512 bb23d47b4c5c9f4881298330f530624c7af243e9e583f8c20cac2de77fc4a789dae729e8daa96b6a6bbe775ac549d0fc118773697b7a156fb74e4365a18683b7
+EBUILD mailmanclient-3.3.1.ebuild 490 BLAKE2B 22c9afb3acafeb4965dece41186e502e3608368337403dca45fac99241af54bcceb54137329c2abb8c3bde049c49eccaadac76bee34d76ed85b42db956b2bb57 SHA512 e3c783f7281fbb8f9daced21c98ac8bc965cf614b5f33eb3946aeb26f13d91759f7a34b5da60dbdae92bdb5964d18f1b2b0cca5af4b7fed6178e2be3f1d58f80
+MISC metadata.xml 292 BLAKE2B cf9e6f2964cc8e3c9b3ebe027a86601f2a88487a629ba52408ec50c967995f021e8536f9ad213dfd1654e3120173eb6cc759ea05d203191168037efaf4fa6810 SHA512 af725f19a885cb1a859ba86466390bb0621be1692f4a35ae6d7f572880f724006da6b0e5346dc00e5c07aa89a865dcecd17e85f4494fc7bb49c2c5a865aa3219
diff --git a/net-mail/mailmanclient/mailmanclient-3.3.1.ebuild b/net-mail/mailmanclient/mailmanclient-3.3.1.ebuild
new file mode 100644
index 000000000000..33eaccae0f09
--- /dev/null
+++ b/net-mail/mailmanclient/mailmanclient-3.3.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the GNU Mailman 3 REST API"
+HOMEPAGE="https://www.list.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+
+DOCS=( README.rst )
diff --git a/net-mail/mailmanclient/metadata.xml b/net-mail/mailmanclient/metadata.xml
new file mode 100644
index 000000000000..dc16487bb15c
--- /dev/null
+++ b/net-mail/mailmanclient/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hanno@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">mailmanclient</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/mboxgrep/Manifest b/net-mail/mboxgrep/Manifest
index 62f88af5a4a4..bbe161822836 100644
--- a/net-mail/mboxgrep/Manifest
+++ b/net-mail/mboxgrep/Manifest
@@ -2,6 +2,5 @@ AUX mboxgrep-0.7.9-_DEFAULT_SOURCE.patch 402 BLAKE2B d517138fd5b6a50846886705f06
 AUX mboxgrep-0.7.9-fno-common.patch 301 BLAKE2B f509ad202b6f82afe7d4ef71686198a382fd34bf94ce01753f7db6caaf1a1a1af8ca63682a329de3afc16885a4e0676eddd886227869fda4971cd383ffef783d SHA512 8208a760372f94562ed118e0a7b65a0d7c58291aba5898bd4b951acfddf001f076fea4cf3cae253fba298481e4d684645eca5772bdd71606228d0d06c2c68441
 AUX mboxgrep-0.7.9-ldflags.patch 1212 BLAKE2B 30c7cc0f233d207838b5a24d189f4c442f98f2c3150e99dc202c4438f46f2ebea034e03c60e7f29d6c4bcd055be30b9aafdda37fe404ae44d552d2df631e91de SHA512 9aab0c978b1085cbbb915bd883f7c2b4808b9d5458b2fdbb8bfbeaeab709c9b5f0563c864904253bc0fc84e7e000e4587b755491601e3eabd30154a44d5dfacd
 DIST mboxgrep-0.7.9.tar.gz 76067 BLAKE2B e808f71c730fcf7edcefadcc579ede559a90db1f1a335fcf08a2002903cdaeac36080235450b6bc802b7cb100afd37a831fe6c57b40711aa70334633891d4330 SHA512 d7e768a0ad11bc3df8619f2a888d2943c68ef72dd036c2fe58268686efb50cb1f62ba379571b6cd6efa8493c5ea0d7c09a29520eae6c68f66d9453710eeeba11
-EBUILD mboxgrep-0.7.9-r1.ebuild 561 BLAKE2B d3e18ee1d573f6d9187d1897c0d28c4d4a9b31217a4f0c3baa723a250482c2b371fda8c01d95c13c22feec8796d3dcedf919046f831d68efb30d4b826ef53b53 SHA512 ebbb369bcd0974941e37c657b1d3e943e10436538bd35b5058f4ee9a6b0f7653851be962675e89da9f7258664f6aacb3cbfac718615dcfc616a4d508d821c4ca
-EBUILD mboxgrep-0.7.9-r2.ebuild 769 BLAKE2B ee4caf15c4bd95c572d2d618d5c17689ece9ff4d366664f5c3957ba4134a92a0a84791c5d7a5bd55412db04ad9c70b7bd2544b6f27715ed2283e6d6f0c60ca58 SHA512 cc93b883c9c0da0bda4aa7c59ff364c58d008de6f5efa17a793f82ee3a595ec95fba8648c1644e8c6f0d8be1c4b5b543dd7e28d9f85ccaa64114ab79497a20d9
+EBUILD mboxgrep-0.7.9-r2.ebuild 768 BLAKE2B 1091cdfd5dd49267c64c267a6bb82e56084251bd598c4b5a56a1e4788c9dc3837dfcd0dd0ef1f083fb05d3068aff61e60c09f396d4b35aa51dc5fbeb87d6b55d SHA512 bdd19dadf470d1173dc7f08db13f57b82b5a30c6a68595d04cfe3b0e0aa626ebb26fb891aa9fbf97eca56cbb9875f416601250eef23ff181f7343728f7ca02f9
 MISC metadata.xml 337 BLAKE2B 278e5cc4a7081de0b6f8cbbba8f25d762014c869676683b41dcd74a1fb9ec8bdf73d412652dc867117204ce9d509a6a79f496aa22e69a65f234e4323f8059a14 SHA512 ab0f3ce2bfd3a959ef8132b4ad3b578cc71e3714002ec7433ff68084926176792eca1b319062878fbe984487514324d228b3d75065ae13747e1b22f1aa898d72
diff --git a/net-mail/mboxgrep/mboxgrep-0.7.9-r1.ebuild b/net-mail/mboxgrep/mboxgrep-0.7.9-r1.ebuild
deleted file mode 100644
index a2e8ff7afb6e..000000000000
--- a/net-mail/mboxgrep/mboxgrep-0.7.9-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Grep for mbox files"
-SRC_URI="mirror://sourceforge/mboxgrep/${P}.tar.gz"
-HOMEPAGE="http://mboxgrep.sf.net"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-}
-
-src_install() {
-	emake \
-		prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man \
-		infodir="${D}"/usr/share/info \
-		install
-	dodoc ChangeLog NEWS TODO README
-}
diff --git a/net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild b/net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild
index d6c2dee2ae4c..9a838372805a 100644
--- a/net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild
+++ b/net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://datatipp.se/mboxgrep/"
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE="dmalloc"
 
 RDEPEND="
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index e87bbed84912..26bd3aadc24e 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,10 +1,8 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
-DIST mu-1.4.1.tar.gz 2311134 BLAKE2B 4d44032874217167d46a68b1c837fb443dc860f1eb1f698c08d3731c131e196483028b0eee8bec13bbec71eeab6df1146013beb00b31824630154e14af914c09 SHA512 9a6d20a814f0cdf7c0a04e0e4a22210a12d539d9be713be8f689f2ed3ba39eaf9da7d1969a10f47af1a201cc23e91696e379cfcbd5d6586aea5e83997ba3e043
 DIST mu-1.4.10.tar.gz 2309459 BLAKE2B 38aa09e1efd788f1ed0d490dfba04bf4f3fccf1eb40d22d2d205934ab6d71ec8739d1baa019ba4c9a0593a0d9487533a46048f71be042178bd33bde6130cbb80 SHA512 59c06e1a0bc893c7dcf5e758dad15be80667be8bb914e97f16158709ebfd50ca29b3a27934bc2df29cc378ce17a3778c5c44738703aa77f5bde21050abb6eb0c
 DIST mu-1.4.12.tar.gz 2309385 BLAKE2B 4f1b7c520a38e5f17471c2a9dc814decc019a4afce89d642ecbaee988752bc20a7f525809a6d911cbc46dadbbeb5db126f7d01465e3dc18ffb099ad1159d3839 SHA512 7e376a58fed80ed1110ad342e3578a427779d4fd715990ce5b87d50b6c2488774b47f9b151dca80bb8723eee8db99699f97df975d199dae0d75576f5c2ebc35a
-DIST mu-1.4.4.tar.gz 2311600 BLAKE2B 1953dc9e63fe013af2821a58fde0222d3d7b61266807bb95345aff7c6e3f988fa6589bcca79612bd64296f50e2b4feda62cc3f4aa4d731f3f4cebe4e3a21cceb SHA512 db317706956304df9e0c6d53ce9b2bf444f5fc66903deb8ac13c8d771ada016d009e3b10d8bf76cfeda1d712fa3e23bed70362334231cccfc072bc181c6660e5
-EBUILD mu-1.4.1.ebuild 1784 BLAKE2B 27466207a50c1f175b56d6ff17f775fa644b884074d9914e32ae81c7f1887a1e140225a5f2d8875dc5cd18db7563ce58577082d00ad039c54d25207e76499e17 SHA512 e1aad3af510eb9be475b0e983048d63fd0ad007cfe178265daada05be7bd32edc70c9be8a4b097a5a26bf5a2ad0c970565cd33350cd77534ba4320750cfa8018
+DIST mu-1.4.13.tar.gz 2309545 BLAKE2B 9a83e86ab73e325617694f01877a11a93a5bd701cedc776640563f0a5e61946064e201d3f5da2110e1f9583dde9a73e401dd2f018161380435f48f132b2df103 SHA512 0f8e7f75332257e8cfdecf2c27bc23c83420387e40ecf92089232af6c545700a6c4925665b39fc236cacf8b26fa4b81df71775cdbe04c340fe3455c54c0d1bbc
 EBUILD mu-1.4.10.ebuild 1784 BLAKE2B 27466207a50c1f175b56d6ff17f775fa644b884074d9914e32ae81c7f1887a1e140225a5f2d8875dc5cd18db7563ce58577082d00ad039c54d25207e76499e17 SHA512 e1aad3af510eb9be475b0e983048d63fd0ad007cfe178265daada05be7bd32edc70c9be8a4b097a5a26bf5a2ad0c970565cd33350cd77534ba4320750cfa8018
 EBUILD mu-1.4.12.ebuild 1786 BLAKE2B 36766ba266400ab63b36a986f121de47802f9fb46f7fafaab41af1b40ae2cb2c0bfb34edb3cb0f75bbe1926dbdb4f0309afd64c92cb18553711c35b44b96d8aa SHA512 9e89d8989a8c90d2ab14ad99ece718fa78118cbf53563f580be9b67b50700400fb2c96b0e1995390446c5a1f62af28ad926c716a80f5beaf380311c91b123453
-EBUILD mu-1.4.4.ebuild 1786 BLAKE2B 36766ba266400ab63b36a986f121de47802f9fb46f7fafaab41af1b40ae2cb2c0bfb34edb3cb0f75bbe1926dbdb4f0309afd64c92cb18553711c35b44b96d8aa SHA512 9e89d8989a8c90d2ab14ad99ece718fa78118cbf53563f580be9b67b50700400fb2c96b0e1995390446c5a1f62af28ad926c716a80f5beaf380311c91b123453
+EBUILD mu-1.4.13.ebuild 1753 BLAKE2B f50edadcca0becdf808e69c218253b636139d0cbbaf6de7fe685660abf24284ac5980b7ecbb3447ce953ab0f68fad2777cfbe04d55c6dbfddd509e215d3eddaf SHA512 a9b216c20bf568653376b2d0cd73d3c67f8eef59c196e884b3e5b1a4cfeb2a28edcb46259bb8ba802862f59ec1b3997d1fcd5382cfe747fbb067a050280195e2
 MISC metadata.xml 895 BLAKE2B 2a8d3f5aa6673c03df5bcf495aded3bb07316b4833ed84ec3e2d7030f5cbab8333865da6a4bd67bc8ee69e39bc6540d4a77bd7ddf3b1b9fdd7b5a6dfb7278fe6 SHA512 e5e1e9f3084189fbdbc8fb55127b8b3eec4acd7685b0d4c9ab564644f21fcc53520b89f7ced7bb3972c13d577a030175a9665d30ba513112125409082a7ad7c0
diff --git a/net-mail/mu/mu-1.4.1.ebuild b/net-mail/mu/mu-1.4.1.ebuild
deleted file mode 100644
index fe038e53b674..000000000000
--- a/net-mail/mu/mu-1.4.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="emacs guile mug"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4
-	emacs? ( >=app-editors/emacs-24.4:* )
-	guile? ( >=dev-scheme/guile-2.2 )
-	mug? (
-		net-libs/webkit-gtk:4
-		x11-libs/gtk+:3
-	)"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable emacs mu4e)
-		$(use_enable mug gtk)
-		$(use_enable mug webkit)
-		$(use_enable guile)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	dobin mu/mu
-	dodoc AUTHORS HACKING NEWS NEWS.org TODO README ChangeLog
-	if use emacs; then
-		elisp-install ${PN} mu4e/*.el mu4e/*.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		doinfo mu4e/mu4e.info
-	fi
-
-	doman man/mu-*.*
-
-	if use guile; then
-		  doinfo guile/mu-guile.info
-	fi
-
-	if use mug; then
-		  dobin toys/mug/mug
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-pkg_preinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "After upgrading from an old major version, you should"
-		elog "rebuild your mail index."
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-	fi
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-1.4.4.ebuild b/net-mail/mu/mu-1.4.13.ebuild
index 99919703af77..0dfc0d7be4e0 100644
--- a/net-mail/mu/mu-1.4.4.ebuild
+++ b/net-mail/mu/mu-1.4.13.ebuild
@@ -15,14 +15,14 @@ KEYWORDS="~amd64 ~x86"
 IUSE="emacs guile mug"
 
 DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4
+	dev-libs/glib:2=
+	dev-libs/gmime:3.0=
+	>=dev-libs/xapian-1.4:=
 	emacs? ( >=app-editors/emacs-24.4:* )
-	guile? ( >=dev-scheme/guile-2.2 )
+	guile? ( >=dev-scheme/guile-2.2:* )
 	mug? (
-		net-libs/webkit-gtk:4
-		x11-libs/gtk+:3
+		net-libs/webkit-gtk:4=
+		x11-libs/gtk+:3=
 	)"
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
@@ -65,10 +65,6 @@ src_install() {
 	fi
 }
 
-src_test() {
-	emake check
-}
-
 pkg_preinst() {
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
 		elog "After upgrading from an old major version, you should"
@@ -81,9 +77,9 @@ pkg_postinst() {
 		einfo "To use mu4e you need to configure it in your .emacs file"
 		einfo "See the manual for more information:"
 		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-	fi
 
-	use emacs && elisp-site-regen
+		elisp-site-regen
+	fi
 }
 
 pkg_postrm() {
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 809879cb974f..5f6449401217 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -3,6 +3,8 @@ AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.29.3.tar.xz 660536 BLAKE2B bd5d62eba06102acbc0615cd97ac9ff5578c1f68d50b24a79ea9fb1ea77850d84e0713fb648cb04e74a61ac3321ea5ef82db714786adf38ea10d00c5846decff SHA512 b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65
 DIST notmuch-0.30.tar.xz 711904 BLAKE2B fb1523f3939b78797e448e804fc52c4fe1e4e8ff87b346917488d3911027b9ccb67b9fddf611f0e960fd1e158463cbe005e038f31bb54549e2a922926dd512bd SHA512 a5c812eb141c293c61b5483eafd31d3e3ab19b2c84429a1558986c415d30ead4afa79db64b2672e9549a40f5eb4c69e54ea5ccccbeeaeb9c783051c3f965a65e
+DIST notmuch-0.31.tar.xz 713144 BLAKE2B 91b0a01543e438e6ccb40a01ad0a100a5c6ae15fe832bb29367d4bc288dae5a915f89a743ecee814041caf53430e2593cb4b5f69faaec396ad6dacfe8cc67d2f SHA512 928acc07b9dbed4275e7d39d94202bea7685e9d433a7bf4c07e40e191ed4fe8cf15ac04c18792e46f4605ffac548b942998005d8176a58ad76c82d4085a408e5
 EBUILD notmuch-0.29.3-r2.ebuild 5062 BLAKE2B cdf68691f7dbc729d6c95dc974a3fb3b747a33d0b80338fc9b0474a970b78674628c242ce14af83b4d57eee1cba1f3c3d343dfcfffe2d8d0ee628f78b94f8767 SHA512 d76b455c44244eb1775604b0510f96c30aea175492ea4982d9a5b93d8601834a120286f29b8e41c6e694209a09be72727848e24bf5b8b3723729c2458095cc08
-EBUILD notmuch-0.30-r1.ebuild 4345 BLAKE2B fdbb795db2d7e23bb3d299a023501e3b727229903b92d5ce6ff99d26a27f11bb25db5246044a90e62b2cab24a07afbdb7855092ca0bb425a14c99bd4193db505 SHA512 8de4b89d348f83edf1803e2d5781ba632bc20e9b3db28ef5aff6f756e8fc58c1bbe954a1f0de8ae23a1901104d40b265a9124d9e9d29894f150581971b2a7b1e
+EBUILD notmuch-0.30-r1.ebuild 4344 BLAKE2B 7d7e6d4c1d043d1d1d3b35a5332670a741f42d84287c99aa60e95dd355f3cbf23fd6f38eafdd0aa6d96dababbade1382565263ca411bf129673e3471aaa4280b SHA512 598f7cd99b432aa7414bc89e7b865cf638c6d075b0bf304f8c94a03e67f34bf8e454dd18d431250c941f0353171bb6f990be3d482b87bddc7f48ada25b4c692c
+EBUILD notmuch-0.31.ebuild 4460 BLAKE2B 21bea26e7e287937cd45a553abb14cb40420b2bb93886165533f6808d4734e594bd0184fb4b8dd6230b2264dc09f80dd89eeea70f678e7a56981e11f743c1121 SHA512 e12a5c8403c7f7e0ce32a1f002a4e6153b01df9436a517f692b18860a919aac83787a59ae6a00820b2d6fae7661a14a4f822d16b79c2e037f539afddfba04f62
 MISC metadata.xml 1229 BLAKE2B 7a7bc05dd0bd1fbfca066e1041d56068c3e8dfd45359be606d0e7703876c831f0b0a39b0dcea4b44f3ec034a16c906bb1ad703143e244c95487d94d9bf9331b4 SHA512 d100677a61010239386889afd5c0f3444c77f5b42309738668c89409bec8f81f2856eb2e5d00d9d495b94a4111df7209f4cc84b830ef346e57c686e5ccbea24e
diff --git a/net-mail/notmuch/notmuch-0.30-r1.ebuild b/net-mail/notmuch/notmuch-0.30-r1.ebuild
index 87312c1e943d..35f5ab16a29e 100644
--- a/net-mail/notmuch/notmuch-0.30-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.30-r1.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc64 x86"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/net-mail/notmuch/notmuch-0.31.ebuild b/net-mail/notmuch/notmuch-0.31.ebuild
new file mode 100644
index 000000000000..dc44f4976cc8
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.31.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit bash-completion-r1 distutils-r1 elisp-common eutils flag-o-matic \
+	pax-utils toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+"
+COMMON_DEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	dev-libs/xapian:=
+	sys-libs/talloc
+	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/cffi
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+		app-misc/dtach
+		sys-devel/gdb
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
+	)
+	valgrind? ( dev-util/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+	crypt? ( app-crypt/gnupg )
+	mutt? (
+		dev-perl/File-Which
+		dev-perl/Mail-Box
+		dev-perl/MailTools
+		dev-perl/String-ShellQuote
+		dev-perl/Term-ReadLine-Gnu
+		virtual/perl-Digest-SHA
+		virtual/perl-File-Path
+		virtual/perl-Getopt-Long
+		virtual/perl-Pod-Parser
+	)
+	nmbug? ( dev-vcs/git )
+"
+
+DOCS=( AUTHORS NEWS README )
+SITEFILE="50${PN}-gentoo.el"
+
+bindings() {
+	local rc=0
+	if use python; then
+		# CFFI based bindings (recommended)
+		pushd bindings/python-cffi || die
+		${@}
+		rc=${?}
+		popd || die
+
+		# Old deprecated bindings, #736204. These are known to cause
+		# memory loss and other issues. Avoid if at all possible.
+		pushd bindings/python || die
+		${@}
+		rc=${?}
+		popd || die
+	fi
+	return ${rc}
+}
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	local _deps=""
+	default
+
+	# Python bindings
+	bindings distutils-r1_src_prepare
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# Override dependencies for 'install' target
+	use doc && _deps="install-info"
+	sed -e "s/^install:.\+/install: all ${_deps}/" -i Makefile.local || die
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# Non-autoconf configure
+		append-ldflags -lnsl -lsocket
+	fi
+}
+
+src_configure() {
+	python_setup # For sphinx
+	local _args=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	tc-export CC CXX
+	econf "${_args[@]}"
+}
+
+src_compile() {
+	python_setup # For sphinx
+	V=1 default
+	bindings distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt || die
+		emake notmuch-mutt.1
+		popd || die
+	fi
+}
+
+src_test() {
+	pax-mark -m notmuch
+	LD_LIBRARY_PATH="${WORKDIR}/${P}/lib" V=1 default
+	pax-mark -ze notmuch
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use nmbug; then
+		dobin devel/nmbug/nmbug
+		dobin devel/nmbug/notmuch-report
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt || die
+		dobin notmuch-mutt
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		dodoc README-mutt
+		popd || die
+	fi
+
+	DOCS="" bindings distutils-r1_src_install
+}
+
+pkg_preinst() {
+	local _rcfile="/etc/mutt/notmuch-mutt.rc"
+	if use mutt && ! [[ -e ${ROOT}${_rcfile} ]]; then
+		elog "To enable notmuch support in mutt, add the following line"
+		elog "to your mutt config file:"
+		elog ""
+		elog "  source ${_rcfile}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/pfqueue/Manifest b/net-mail/pfqueue/Manifest
index a3242b84f4e6..bae1370bf744 100644
--- a/net-mail/pfqueue/Manifest
+++ b/net-mail/pfqueue/Manifest
@@ -1,4 +1,4 @@
 AUX pfqueue-0.5.6-tinfo.patch 249 BLAKE2B 6228a39564ab9e4ace005b3d5239b2fa54f63c1d5945c302ba11ecdff1d0cb153465125be1ca512cab269e162ff783d61134d4d599df4ea87f9c9803698fe3ee SHA512 ac0f652a16ee74250e92f29280a178bd7794ac7a9f4192b9558482d078cbdc8b4b75d668ac63ff8bd8c0f4bfd191d32e3d9a2af0c3dc420d191c8c79bde4bd2f
 DIST pfqueue-0.5.6.tar.gz 298870 BLAKE2B cee47396f4bad72d8a54716de3fcdc5b41fbef5ddabb88394144d743ba7fba52cc39c5930eec72ece01ceb62a343f0f742ac19eca4ec4e7a11feb8d95f9a3e95 SHA512 1bb622bba6d72ff98ee862d794854debcebabeff24cb6f06cecb06513f453cbb09f0cb8e5fa4c26bfde03aadbc5e803692279427021ccda10749a6c5a326bfb9
 EBUILD pfqueue-0.5.6.ebuild 676 BLAKE2B ca6866a66f8d1fa422605f1d7785cd2e1c55f8207aa9aee66df0ce2e36139a70343c9c3964b799ff3627a01e31b43fa07aa8251933d597b33d8997ec74e1f695 SHA512 5b61bb88447310403285e21ebe70029e9cc90f010176d93002b870e4f41ed2d42bd9fb03b44c3720413f35d53c71aa4fa7d522607f0b4542ae20989d87c3f04f
-MISC metadata.xml 345 BLAKE2B db09fd3e556ee07e20ef32efc579a807fe3102e48d838dea84b96acbd9f680369894a305fa31099ee4942ae953ce3d0e43bf599814f680a94bb33ad0c647c274 SHA512 9d35ac5bcaee2e4334ac0c4e2e8e7d4151a5c49931878fdb867e7b3c1bbc95bf4a34d8c993510bfe276cc0cb38c14f35110fa895ccbb5a5b4cae869d8aaeaeb7
+MISC metadata.xml 244 BLAKE2B d83ecdf559556aedd43daa105a8c83c04d6e44751a9538f9b4a1516545887e7af141a7f7ce54587fddcc97a14a81ee7ce391a5bdeeb258054c7198e6f5e8599b SHA512 eee38e9f5671506c5e9377595bbbd67389cf3fb004feb0d42ee2147062260c90447ed18e03d2547df5587e45a733b2e75ca931cb5fa644c6c109dcb15f5f1a05
diff --git a/net-mail/pfqueue/metadata.xml b/net-mail/pfqueue/metadata.xml
index 77d20874de65..bf0d9cdf1276 100644
--- a/net-mail/pfqueue/metadata.xml
+++ b/net-mail/pfqueue/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		A ncurses-based tool for handling postfix queues.
-	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">pfqueue</remote-id>
 	</upstream>
diff --git a/net-mail/pop-before-smtp/Manifest b/net-mail/pop-before-smtp/Manifest
index f121a80ba14d..6906b3a7656a 100644
--- a/net-mail/pop-before-smtp/Manifest
+++ b/net-mail/pop-before-smtp/Manifest
@@ -1,4 +1,4 @@
 AUX pop-before-smtp.init 613 BLAKE2B 3afc3d71e3c21b8f9d6d9066883f90b0b0f2bd0a9bf3934e77a86370872a33cd38ecf3eb0c424e6d7aa81ceaa6cea15348537f7f74da36d50bd0e237dbfcac16 SHA512 5018ab8d4acf4bd58c635f029c32ee691462836da37b75afd7e26873b0f0e94969a18cdbd77e69aeb7aa32e5ab08b2c3b644939799e3601367ab0380423516ca
 DIST pop-before-smtp-1.42.tar.gz 40612 BLAKE2B 44e43be5abf9f1b98ae553f3f782747e5b26a54d03fcaef33b60d05fc757439c6b7c7e00fa972a76bfe0fa4dc7e86751b7f3edd946c209b1fd00a8502ceb22b2 SHA512 54556509dcd51025519deb1253e0860c23e2862061992781c79606af00d6db493a5b3b1ca505f609f6a157918b19e959568dc138cc926f8886bec54cf9b404ea
-EBUILD pop-before-smtp-1.42.ebuild 972 BLAKE2B c811c34ca173de1d4dedbe4a3b767993f69709e9c4f978d71f9a819c7b6086289c539b50ba9de6882dfb27ef26eec237810994aa70a4fff604967423464a2acf SHA512 9d6801d41b5ae5f13600c284430d4f064a8a8bf25ac5a84f564765ae845e288525306afea1b16c45480f7c20dbe16397a3fd24eab83a9d38839e53b6ee07da02
+EBUILD pop-before-smtp-1.42.ebuild 962 BLAKE2B 58c0f0d562f0c353aca872fd7a2b03e5cd198c9950c3be1bbf4f19d47b14e22f4374405aaca646b4e47d921cfae0179cb2c1aa5c0a4ae1916cfc78ba20b1cb15 SHA512 747b4f2b67709e52200940ac0fe72a6aba10f5ef7953b8212b5eda27c5e42b31dfbed384023ac947940c227146d6722151f228102b7e4416de5f7568ab109e56
 MISC metadata.xml 245 BLAKE2B 3d5de245eda58e732472f2263b8c5fc684e0e08a02785faab3a1000330ba68645ba430d94078b6389416f9c68762281cdc13df617f5ad6f0e6a76723d321834c SHA512 c1ef9f4751b9cc88c5a98477014b5ebb726572a0efc21dfd3e03c9c7d7b895adcc10e4f07025d45e92e86122be408de589128248c866fe26bd8b458810aa0d94
diff --git a/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild b/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild
index 4c233e12778f..0bcf260b4cc6 100644
--- a/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild
+++ b/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 
-DESCRIPTION="a simple daemon to allow email relay control based on successful POP or IMAP logins"
+DESCRIPTION="Simple daemon to controll email relay based on successful POP or IMAP logins"
 HOMEPAGE="http://popbsmtp.sourceforge.net"
 SRC_URI="mirror://sourceforge/popbsmtp/${P}.tar.gz"
 
diff --git a/net-mail/popa3d/Manifest b/net-mail/popa3d/Manifest
index a493a37c7049..c5bb6a3ba7e7 100644
--- a/net-mail/popa3d/Manifest
+++ b/net-mail/popa3d/Manifest
@@ -3,4 +3,4 @@ DIST popa3d-0.5.9-maildir-2.diff.gz 3227 BLAKE2B 09cffef1280cd038c1953c0b14dc7b7
 DIST popa3d-0.6.3-vname-2.diff.gz 947 BLAKE2B 1a64b8de2cbda4757a670aee61e4665bd394f4128763119feacacbdc4921c7a0c128050b3f15f369c4fdea68cc4c595ab1eb48e729a119e1078d4cfd6f874092 SHA512 eba7df6d03d2745272505b62053d0db56ea326a716e43a9133257465f78fc5030cb09b48d79e86f6a982f7d8e9d18ee64aadf261e60a4f0a56357a4a2517a30a
 DIST popa3d-1.0.2.tar.gz 32848 BLAKE2B 1f0af2f1f12ec255f3f42eb54087f7c4859beee49d55cae60f32b4f5a58a0062c7cd5eae3690d778f3d7f7bea6678fe937b4864a2a7586c12837edf19df57fdf SHA512 e577297b4dafb4091110886a5db07184707475651a8ee3b6369f4cab5676852d7286a3729da46fff9161bc3cd46bdc0d032205dc5609bfb38be69eaeab068906
 EBUILD popa3d-1.0.2-r1.ebuild 4983 BLAKE2B b3ea49f848ca15431a95b310d90abe748da6f515c100ce80446eda738c20b936634b9bee77a04d297b5e88b8958db1052764689bd5dfa82f3a6506365ae84ad8 SHA512 30f4c2f68b089612ab014a9904c7e26a055496b7b4443b92c55fc442601a20ca0553662d3dd81c334afeb4eb485b3fa64e41d361b053d2ad511db768af58ba11
-MISC metadata.xml 239 BLAKE2B b8712a639b5f9e4930e561ad2a617e565a1545f1b1b5425e69ba50b1e0175b5fa57b1aa73105a4dd078b5ea6c004dcc4c957f0059a916d06f5c8fe3e58b27c6f SHA512 bd8159d0c8ebc2a64c436fd818bb145da92a22daafd11876898af61a4395781c8442e3ee96d21a970f17b629763a121518c36baf822d67b70383b11f43ef3395
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/popa3d/metadata.xml b/net-mail/popa3d/metadata.xml
index 9ff037388114..7a38bb900964 100644
--- a/net-mail/popa3d/metadata.xml
+++ b/net-mail/popa3d/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription>
-		security oriented POP3 server.
-	</longdescription>
 </pkgmetadata>
diff --git a/net-mail/postorius/Manifest b/net-mail/postorius/Manifest
new file mode 100644
index 000000000000..39be57d9aac5
--- /dev/null
+++ b/net-mail/postorius/Manifest
@@ -0,0 +1,3 @@
+DIST postorius-1.3.3.tar.gz 2704738 BLAKE2B 0ae5a7b3ace1ad7f64eae53156592d0c76a09e358d08edfe1b506717e87df67c669bfab356c203e28c03006f46461a67b4c7222e0e305100e15511a93e3e6a59 SHA512 31d6d6d0dbbe8a57251c81cf8f7d8b80d17dd4aab9f31be684fef26637a4ba81a196d4ab63e7389bd4173a60778a00c83ee440c24f83a1f60b094ccab8cf345a
+EBUILD postorius-1.3.3.ebuild 807 BLAKE2B 18f91ae2c668dd3f207f11ac7aa96234efb7e4299c75396d229f35fb1d697bf90f533e91e2c3633d69736898260b5c2c66df5fa0ea962e278465dac11e1910ba SHA512 969922b2a043a6e5c84a1e9acb90f1903d851b692e9d060308f87a4a0c9789dfc7a6d09203d86d84a70b48210cfe4255b36ab68396a024b6f9021498f9ff681a
+MISC metadata.xml 288 BLAKE2B ccd36623ab7e8680c09c1ceb301dff81486fe5518f1876f954fb6a7d1dc2c0895f2cacc9c03dfb8589c30ccf6f72709aa0f6b896f7e25484776d5516826d08cd SHA512 aff84107e735cf6358a9ed57600b2016c605e50f9e83c8af38fcc193bb911e9b89fc281da2ce06a9e1268d1500448c164e24d6aa5991a3b4e165fd393c1cd1f8
diff --git a/net-mail/postorius/metadata.xml b/net-mail/postorius/metadata.xml
new file mode 100644
index 000000000000..557e7cfbec08
--- /dev/null
+++ b/net-mail/postorius/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hanno@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">postorius</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-mail/postorius/postorius-1.3.3.ebuild b/net-mail/postorius/postorius-1.3.3.ebuild
new file mode 100644
index 000000000000..047a837da928
--- /dev/null
+++ b/net-mail/postorius/postorius-1.3.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A web user interface for GNU Mailman 3"
+HOMEPAGE="https://www.list.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="net-mail/django-mailman3[${PYTHON_USEDEP}]
+	dev-python/django[${PYTHON_USEDEP}]
+	net-mail/mailmanclient[${PYTHON_USEDEP}]
+	dev-python/readme_renderer[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/vcrpy[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/isort[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( README.rst )
diff --git a/net-mail/queue-repair/Manifest b/net-mail/queue-repair/Manifest
index 76424acbd577..354e8f47eb5c 100644
--- a/net-mail/queue-repair/Manifest
+++ b/net-mail/queue-repair/Manifest
@@ -1,3 +1,4 @@
 DIST queue-repair-0.9.0.tar.gz 13913 BLAKE2B 04935bdb8473bad4d785732eabe2df7bd19d8e7b7364e1be516a8f94c6aee15c6f14bd171be8585f087ba0281281285f0695bb79a90a02519aa252a5884bfd7d SHA512 b7c21de207c80c3f764eddae6e60b4d54869f2037f572f98ff4e0a1e34f55ae1feeab5162b4f0f902a5a3c9d631c687057cdfdc4f646d6843d845f31f5b7bf6f
 EBUILD queue-repair-0.9.0-r1.ebuild 712 BLAKE2B 869ab7d7dac0a90708da400c680d206fe619d1798b0e23841922d4d8bb17cba3f8af7552dcccfce09a8c5935663c8a0e25a0d52c926f75b2f40f2bb34698dafb SHA512 ea2eae4c33583966571da8647761f80e6457f5110e1c81f3ac04f31dd4bf093977a456e5ee616c962edc0f107360d645cfc40b0795dee285a56e15cb018d5aed
-MISC metadata.xml 466 BLAKE2B 521a85c974ed87b309ccbcd648599ffa3b20602a61654b164dd2b6b0f5cca7ac97716f211c9cef797604e842d6178c4c8345b2287dff3bac7a4c07072521b1ef SHA512 aa06f7e98e2c8e84edafa0a3662a7aa937389ede576f9fde6ae4ff5994faed83aee61b6f58d4a5b2db0d126a7a7f4b23fc7b4124eb4a5368511ebfa17856b17b
+EBUILD queue-repair-0.9.0-r2.ebuild 824 BLAKE2B 703bae7f00c410e2381d48f9435bc6b828513a75875a72ec666b8a597f1111c423ad965a37a6438a05c9a27aa6442fc564b24aebe05edbb0d189d179391093fd SHA512 e72593fb8b5eb51e7645f0e36e09544e2b8739c27cf53acdb5ebe04d858e9dcd05be990f7c243d10ac4d331a54e536be5c8c0733ae2c84e46568932cfefe9ecd
+MISC metadata.xml 490 BLAKE2B 8ec4d8e23a4956f5679a0b5291b03262a4474f3d0d97a5fc3286189f5623c75d859ce8103708dfe3ed1e4e3721165a764b121364f06121289aff047cd60db281 SHA512 bf57215deceddaa74691029e05f52940c0bd1d9262c865980c35786f487d08351e24287c50685ef85514a1e7cc7cb68d527259b369a34d6d06bf8fd4474285b1
diff --git a/net-mail/queue-repair/metadata.xml b/net-mail/queue-repair/metadata.xml
index 148b1e2765b0..f966cd555df5 100644
--- a/net-mail/queue-repair/metadata.xml
+++ b/net-mail/queue-repair/metadata.xml
@@ -8,4 +8,5 @@
 		value, convert big-todo queues to non-big-todo and vice versa, and repair a
 		corrupted queue.
 	</longdescription>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild b/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild
new file mode 100644
index 000000000000..a67868c14c27
--- /dev/null
+++ b/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-single-r1
+
+DESCRIPTION="A toolkit for dealing with the qmail queue directory structure"
+HOMEPAGE="http://pyropus.ca/software/queue-repair/"
+SRC_URI="http://pyropus.ca/software/queue-repair/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test" # no tests
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+DOCS=( BLURB TODO CHANGELOG )
+
+src_prepare() {
+	eapply_user
+
+	2to3 -n -w --no-diffs queue_repair.py || die
+}
+
+src_install() {
+	python_newscript queue_repair.py queue-repair.py
+	dosym queue-repair.py /usr/bin/queue-repair
+	einstalldocs
+}
diff --git a/net-mail/ripmime/Manifest b/net-mail/ripmime/Manifest
index 9f8366b7ac86..fec64d23f185 100644
--- a/net-mail/ripmime/Manifest
+++ b/net-mail/ripmime/Manifest
@@ -1,5 +1,5 @@
-AUX ripmime-1.4.0.9-buffer-overflow.patch 595 BLAKE2B 48d9b98e62ae27ad929d7b3d0a0905d568c83683d4789852fd41f561ade9e365d16b7c55492ea53808ebf59304e44c71c61e54121ffee535d5be3c5ebb30ae4e SHA512 1ee8fd284ddfd1dcd77351f08e0c25a8605529c57ce6109cb9afefd37a5c9e410c6f639d4dbd529b975e50430aca5bfd2fec030bb0f5c805453d7e4af0885055
-AUX ripmime-1.4.0.9-makefile.patch 2162 BLAKE2B 9167e9103d28f0dc8f182c61d5fadd1dfa23ad6375cf57bed2971cbef5165c8a480776572995a045f40ca997c6548f41d62e1b2ba7989eddad09869f7351dbdd SHA512 3b4935a57aebc581f907610852b465f64ebaef11317823c45b0cd5501ac1b19fb7c86565850565d88cb77ca68cf764e597f7c80080e1d8887983e03430e081e0
+AUX ripmime-1.4.0.9-buffer-overflow.patch 562 BLAKE2B 31f00e0d4da02eef3bfea294cb125cb0199b9ae536346c24a8bb203122a279957d10e2086f24902631e44e8fb5487308e7e0f2eb10f0284ab866a358c11fd75b SHA512 e3f6abc11d4c6d5dc426cfe70a04b0fde2f04c3f7259402f1cbe7995204ad62725f29627fe888d1a0989dcb6b19df15640cbed83ca9386d6504cc72023a766c2
+AUX ripmime-1.4.0.9-makefile.patch 2129 BLAKE2B c492852a9c8e66fc7b33e1a40a9ebd51b74a2e7d400e4bb6f60c2494aec4fc7df8c2a946075d11d0102f5d87583462c7a02a60b3d67092f7468a86aa38652dc3 SHA512 45cf86e952d6e2fc14d729d57a0848e42cc1484af824f94e1b54de5a2dc616522eee2ea20e4aa1e7f79405c5ccd1d36fd574e77288b82e3ce637956f2ca92f97
 DIST ripmime-1.4.0.10.tar.gz 172155 BLAKE2B 83e7500a8cc48d29d31515487968dfd7a2b1768b12f296e11ac5e55420dc765498859608328618dcd0295f3a9901a06a189ad8ae24c6a6c20e604d48a3dd29ea SHA512 1c2d2180d60a56c70046e95a29925e39d3f76da98cc2fa153b6fc3a8eb0fc5ec5f45524e9f5ae8706a955366a752d25a0a2f560f1d75de3f2733ec31befb83d3
-EBUILD ripmime-1.4.0.10.ebuild 1077 BLAKE2B 1a9bdf8bd8647457a2bf514cafe9fbef88dc1c3abe09b77b466633d9cb348d58d3b38b7e3de2db2d65cb2ee418ffd449add07b029ccad91abd14065341921b5d SHA512 12b3923d72cd64fcf6b34fcc917196172eca4a111ae6d8578177670f19dc62eb60a94708f1c8109150c7a3d12680902f57d02ce7d205c45a4046dd3f7d6058eb
+EBUILD ripmime-1.4.0.10-r1.ebuild 883 BLAKE2B ec97e9ea5adfd43159daf5446759d2f46f4056ea390be8bce1de31a37b06f0018f72fc21045ed6775d24b4a58a36d7101c9e1193c5393a37c5ecc929b60f0353 SHA512 ca6d45189e81451160f16921a7916ba9788d1d3a0877c3e615ba8d6fbcc448ec4a6577f60d67eded04a803520e7f937261b0eb54a73c2041a735a50bfb2e68df
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/ripmime/files/ripmime-1.4.0.9-buffer-overflow.patch b/net-mail/ripmime/files/ripmime-1.4.0.9-buffer-overflow.patch
index 418a204101e9..3b9cd7a60cba 100644
--- a/net-mail/ripmime/files/ripmime-1.4.0.9-buffer-overflow.patch
+++ b/net-mail/ripmime/files/ripmime-1.4.0.9-buffer-overflow.patch
@@ -1,5 +1,5 @@
---- ripmime-1.4.0.9/MIME_headers.c.orig	2010-11-07 12:38:52.994063648 -0800
-+++ ripmime-1.4.0.9/MIME_headers.c	2010-11-07 12:39:06.395161970 -0800
+--- a/MIME_headers.c	2010-11-07 12:38:52.994063648 -0800
++++ b/MIME_headers.c	2010-11-07 12:39:06.395161970 -0800
 @@ -2239,7 +2239,7 @@
  		{
  			if (MIMEH_DNORMAL) LOGGER_log("%s:%d:MIME_parse_contentlocation:DEBUG: filename = %s\n", FL, p);
diff --git a/net-mail/ripmime/files/ripmime-1.4.0.9-makefile.patch b/net-mail/ripmime/files/ripmime-1.4.0.9-makefile.patch
index 856319bf63b7..088e6fa5523d 100644
--- a/net-mail/ripmime/files/ripmime-1.4.0.9-makefile.patch
+++ b/net-mail/ripmime/files/ripmime-1.4.0.9-makefile.patch
@@ -1,5 +1,5 @@
---- ripmime-1.4.0.9.orig/Makefile	2008-11-06 19:33:33.000000000 -0800
-+++ ripmime-1.4.0.9/Makefile	2010-11-07 12:53:03.898947384 -0800
+--- a/Makefile	2008-11-06 19:33:33.000000000 -0800
++++ b/Makefile	2010-11-07 12:53:03.898947384 -0800
 @@ -42,22 +42,22 @@
  	./generate-buildcodes.sh
  
diff --git a/net-mail/ripmime/ripmime-1.4.0.10.ebuild b/net-mail/ripmime/ripmime-1.4.0.10-r1.ebuild
index 36bdac2eeef9..b1ab63c6d983 100644
--- a/net-mail/ripmime/ripmime-1.4.0.10.ebuild
+++ b/net-mail/ripmime/ripmime-1.4.0.10-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="extract attachment files out of a MIME-encoded email pack"
 HOMEPAGE="http://pldaniels.com/ripmime/"
@@ -12,18 +12,18 @@ SRC_URI="http://www.pldaniels.com/ripmime/${P}.tar.gz"
 LICENSE="Sendmail"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE="static-libs"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4.0.9-makefile.patch \
-		"${FILESDIR}"/${PN}-1.4.0.9-buffer-overflow.patch
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.0.9-makefile.patch"
+	"${FILESDIR}/${PN}-1.4.0.9-buffer-overflow.patch"
+)
 
 src_compile() {
-	local maketargets="default solib"
-	use static-libs && maketargets="${maketargets} libripmime.a"
-
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)" CFLAGS="${CFLAGS}" ${maketargets}
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		CFLAGS="${CFLAGS}" \
+		default solib
 }
 
 src_install() {
@@ -37,8 +37,4 @@ src_install() {
 	dolib.so libripmime.so.1.4.0
 	dosym libripmime.so.1.4.0 /usr/$(get_libdir)/libripmime.so
 	dosym libripmime.so.1.4.0 /usr/$(get_libdir)/libripmime.so.1
-
-	if use static-libs ; then
-		dolib.a libripmime.a
-	fi
 }
diff --git a/net-mail/ripole/Manifest b/net-mail/ripole/Manifest
index de8a2f7a8774..58ad6e27a2c3 100644
--- a/net-mail/ripole/Manifest
+++ b/net-mail/ripole/Manifest
@@ -1,4 +1,4 @@
 AUX ripole-0.2.0-ldflags.patch 495 BLAKE2B 28c2a580563fd4de93199d8242b5f3673f9bc81247be65ce4a7136e28a3204dbd48553cdc6de4c7ef7f13c4332120dbb415320616e4b34656b5340d976714ea6 SHA512 749d9a864c1cbc4c28e6a8b8dfd69fddb72e4bd0150a143bd4398e4757edc8326c6c2c7da4d0ce3e17a212636b3894726a6488d8b03618b3d0641faff390d1d3
 DIST ripole-0.2.2.tar.gz 30629 BLAKE2B 63ff7c0d086861d8aa9c1fea7e69086874b90e3181898e36338cb3913e90c6ed7e6f222ff985d92386535a222e44e8a324658f0b4bd51de508f92a82f37f5eb1 SHA512 de3a4fe511e11d4ed8b5589aaf102c60c59c8a3cbbd1d988955b89d597ac7a5992f63a7ac36d8aad3916fa9f6311c5a0260136d534973fdf1b4a5fa5296b6b92
-EBUILD ripole-0.2.2.ebuild 592 BLAKE2B 192db81496d03db1dc141b7180517edf4f039c839e239f3de274e5f5c615d6af142c601dc58206102eb56c7c60f5faec2f6bc569300a54bb7defc077109f3549 SHA512 de3169ace39c1389ee17c31d554dd5a3ad607c7e2e5bb7177181245047af31f43a5c1cea7136887a5f3681516e88d49c1762d68d96558d4a6fe780e7c0432c3b
+EBUILD ripole-0.2.2.ebuild 561 BLAKE2B 05f8c0ca648fd239ccdc2a7c33fb46294c944a2a10732cbf34af08587385dffd330edf9b83540349583bf02b5754ba6d677c1f763bbe752c9578c1fcfd8fcd66 SHA512 1c6e9a4fc133606feb71e5227e68f650f6e148538115f78e6b82250354b441e48c80266f8e15180ab2e96019bfc7777c3e32f6e6ebf9f2efb7cc2c9e3deafb3c
 MISC metadata.xml 325 BLAKE2B edce91179b4c014b34923d673bd254b4e46e04362e7873b61660e69143cfaab7f5894ebf10858dc2028d3b8d866ead42411f90db2b11b5e4f6906a1cc806189a SHA512 fddd77a4694de0ec2c881c393854557ec48e5f6603c795f93467f700750386563c297302fbfaba72d4980b68fa1c5c0f000c292b9e59ac0463dcb079bbd3c035
diff --git a/net-mail/ripole/ripole-0.2.2.ebuild b/net-mail/ripole/ripole-0.2.2.ebuild
index b2830570efa9..43f2b111e819 100644
--- a/net-mail/ripole/ripole-0.2.2.ebuild
+++ b/net-mail/ripole/ripole-0.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Program/library to pull out attachment from OLE2 data files"
 HOMEPAGE="http://www.pldaniels.com/ripole/"
@@ -12,11 +12,10 @@ SRC_URI="http://www.pldaniels.com/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.2.0-ldflags.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.0-ldflags.patch
+)
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
diff --git a/net-mail/serialmail/Manifest b/net-mail/serialmail/Manifest
index 026ac60ce460..14e91c50721d 100644
--- a/net-mail/serialmail/Manifest
+++ b/net-mail/serialmail/Manifest
@@ -2,4 +2,5 @@ AUX serialmail-0.75-implicit.patch 965 BLAKE2B 1e0d173dba771330c8eb9993b3a442816
 DIST serialmail-0.75-patch.tar.bz2 7702 BLAKE2B a1593c15dc086d78ee6b605197d616da8a50d67e9a7fe79fe1f4aa5b9664b16bd3eb9dcea79902fbe4fbe7020d74870d72c2dcdd3c1dad18506b54f0f0ea5357 SHA512 da1eb9a9a834fe5a9db4233d1a7e09657f5a2903f3356ebd6922f03c7f4833d96b4b9ecfb3412733dcdd3b384e503b25fd2564d0f93c639a7a9409872dc52c25
 DIST serialmail-0.75.tar.gz 55079 BLAKE2B 9ab05731069819be14d3b7cd56b2ab4bd2e87fec7867f4243d8180fd42eeb7b95b255c48ea8dfe06918b8cba772b228c7594ddef6c56d3bcb80d0ea19da4935e SHA512 f0c7f14330b44f12f8e5f3590416d707bb2daaca84db8fcd236ae05855269005a726d946269c0cbb25f51238fba350420e0e3a1d57f0ab227c447fafcae497dc
 EBUILD serialmail-0.75-r4.ebuild 1266 BLAKE2B 81a70cead5573b817728c7483dd7e27b84367cf6c4041d26b90f37f8b955dfe0cf1300b1f1cde9fe69a57f0bc5fb36087739b19428f91a0d755535374bff9b98 SHA512 479c3380acdcabd58e1c5a06e9404f876e087acfaebf9cb3a52d1f3245f7806bf7337ab1b1aac7c20496916cfec5475a263810fe7e349a7fa3e09977ab166ab7
+EBUILD serialmail-0.75-r5.ebuild 1210 BLAKE2B c1bb75f96a99ce070a7dc9e088d0cb5a2fde12fe0807c3f0db7351c9e5d51be64aaf6fade8c4e3a8e807a29c0b89feaad9db590052772c3b52e95c4716f5ce94 SHA512 1fecd6cc02cb974f6330c928f3b87741e879262492569fcda9c3f65c809e77a316db134b267c57c0d7242fe0e9fb95e562d78936adeb7ab25922d3860af816d3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/serialmail/serialmail-0.75-r5.ebuild b/net-mail/serialmail/serialmail-0.75-r5.ebuild
new file mode 100644
index 000000000000..dff981e6190b
--- /dev/null
+++ b/net-mail/serialmail/serialmail-0.75-r5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A serialmail is a collection of tools for passing mail across serial links"
+HOMEPAGE="http://cr.yp.to/serialmail.html"
+SRC_URI="http://cr.yp.to/software/${P}.tar.gz
+	mirror://gentoo/${P}-patch.tar.bz2"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static"
+RESTRICT="mirror bindist"
+
+BDEPEND="sys-apps/groff"
+DEPEND=">=sys-apps/ucspi-tcp-0.88"
+RDEPEND="
+	${DEPEND}
+	virtual/daemontools
+"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-gentoo.patch
+	"${WORKDIR}"/${P}-smtpauth.patch
+	"${WORKDIR}"/${P}-smtpauth_comp.patch
+	"${FILESDIR}"/${P}-implicit.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i "s|@CFLAGS@|${CFLAGS}|" conf-cc || die
+	use static && LDFLAGS="${LDFLAGS} -static"
+	sed -i "s|@LDFLAGS@|${LDFLAGS}|" conf-ld || die
+}
+
+src_compile() {
+	sed -i -e '/(man|doc)/d' hier.c || die
+	emake it man
+}
+
+src_install() {
+	dobin serialsmtp serialqmtp maildirsmtp maildirserial maildirqmtp
+
+	dodoc AUTOTURN CHANGES FROMISP SYSDEPS THANKS TOISP \
+		BLURB FILES INSTALL README TARGETS TODO VERSION
+
+	doman maildirqmtp.1 maildirserial.1 maildirsmtp.1 \
+		serialqmtp.1 serialsmtp.1
+}
diff --git a/net-mail/smtptools/Manifest b/net-mail/smtptools/Manifest
index 0419af5fc811..fa12350cc2fc 100644
--- a/net-mail/smtptools/Manifest
+++ b/net-mail/smtptools/Manifest
@@ -2,6 +2,5 @@ AUX smtptools-0.2.3-autotools.patch 3951 BLAKE2B d3d60ac0ace9369e66c23487fb2dddd
 AUX smtptools-0.2.3-cleanups.patch 1830 BLAKE2B 7d634aa4e21572cdbc0f4e94e18ad0fe45010e331d9b121e8454faa696285a60ca97c5dc74567eb4afd88e4444f4da318f75c02b70d4f5c9ba6b2d2664b68fcd SHA512 55db66e01d6a252e4c9c265de2c14e40a92b5eb33421d05879823a6fc1e37e1b80951bf84087739f39e32850873371461a604584e465576b6f3b269b2ff83085
 AUX smtptools-0.2.3-fno-common.patch 651 BLAKE2B bfdceebddf4b6631d53e94b5e90522412de5dacfbcc006624a53bbc4f1c2f32437f93f928a88440dae4c884b28ef249f2eadbd4dbda2018ff73c07635acf4fcd SHA512 d9cfb1abd62f6dd3f57b3288e1adc18cdbedb6c296c7516535b406ff52393ea177afd5d22480b5be013d18497c670e0569d9ee1476298f58824a33d99f251d42
 DIST smtptools-0.2.3.tar.gz 117859 BLAKE2B ca1713dc4ec668de1491423c7463cc21fa460017744c34bf6ac5619294ca6bdcda8b78ab3fcf1b2225c3c3897b7ada89b48ab68defdae28a69543fa713362e87 SHA512 2d5f5a4fc5d25e5b652800047c7dcba62eb033919e485e42efd07be0e00062f9d89200dd0e65991a13b1366b5b28bb5c2d84d0468e71d05d1540178111b3cf2f
-EBUILD smtptools-0.2.3-r1.ebuild 669 BLAKE2B 4bd0a7ad2c6c32ec53b531f88a15644bf496dace37b55007bffba168fce7a6ac1bfb218c886762c9743826f7c2d6164c33fc73232979a52f1dc93b8a283bae1c SHA512 ce7b23964aa1481207d4e06bad9921ff8c8f8f2c299fb0ff84791ce1be60a44afb8207c3262eac45bb74949d7b0fcaf7443ff12cf82757e52a4f322b242617a7
-EBUILD smtptools-0.2.3.ebuild 650 BLAKE2B 54308618cd0518e3039862c431be13d048ee8cc44724d84c5486c988ea45f4990e7b7d843361f555f403df05ef22ca24032d78bfc85a4b9aef975c2ea147725a SHA512 d203f71608ab6dc8d7d6539d9355d3d237f1d235b31eb65df5ff8693ab33233a6c274bbe0649f6d783a35168fa97f096f3091b53979766ac343d7141896b928e
+EBUILD smtptools-0.2.3-r1.ebuild 664 BLAKE2B 5cf2f15f1c93a62d2683715ef7360e44c56f2a6907a07d6c38f239974b5dae4cced62b51989247c9e49bdd8c4cd442430ee2a4877ae9666a91835b3b5bec8235 SHA512 5788d2a130f5daa94fcc4d5e5429140937c91c6b8ba4bcf6bf44a2905fd8ef70797564a5452c6e907653adb82d3672ad700c49bd92c4749dc77836b5cb7ae9c7
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/smtptools/smtptools-0.2.3-r1.ebuild b/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
index 38e8de1024d9..ddcb822d258a 100644
--- a/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
+++ b/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.ohse.de/uwe/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 x86"
 
 RDEPEND="!net-mail/qtools"
 PATCHES=(
diff --git a/net-mail/smtptools/smtptools-0.2.3.ebuild b/net-mail/smtptools/smtptools-0.2.3.ebuild
deleted file mode 100644
index b0c9e6eebac5..000000000000
--- a/net-mail/smtptools/smtptools-0.2.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils autotools
-
-DESCRIPTION="A collection of tools to send or receive mails with SMTP"
-HOMEPAGE="https://www.ohse.de/uwe/software/smtptools.html"
-SRC_URI="ftp://ftp.ohse.de/uwe/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 x86"
-IUSE=""
-
-RDEPEND="!net-mail/qtools"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	mv configure.{in,ac} || die
-	rm acconfig.h || die
-	epatch "${FILESDIR}"/${P}-cleanups.patch
-	eautoreconf
-}
diff --git a/net-mail/tpop3d/Manifest b/net-mail/tpop3d/Manifest
index 607646b2b34d..740e2418d71e 100644
--- a/net-mail/tpop3d/Manifest
+++ b/net-mail/tpop3d/Manifest
@@ -2,5 +2,4 @@ AUX tpop3d-1.5.4-gold.patch 730 BLAKE2B e3f30e0aae7ca80c3834dbe63216bff73de20981
 AUX tpop3d-1.5.4.init 607 BLAKE2B 8cc947bb35566f09236a5a6c06f6b1b8938d51f9dfe0ef3230507a5a6885bdee8eac11a3e90cdee52b24219cade824c45b15e5777a154a28b78167eaef6decce SHA512 004d2e5ca802ad7681c3f6392728602f54c13c6072d38b147be469e5f9ef09916f7c6c57af944c845e4b504f46fe4893323d5a125b7dc4bdfc2d479a5ee696e9
 DIST tpop3d-1.5.5.tar.gz 285027 BLAKE2B e8cc76040757a5c8931ee34b27a57c52889f3533b71a53c7a2fe589823129ce5972f2ddfa9ecdb46d7a04ac77e8d735c02b07cf7e8192135e4ebea6c392b38ab SHA512 918a057c62d7518613daa6335d8fd5a2553d278dc4d6adbcf5ba3caa3ba561587f1d9e18f564690383e91f3ee2e5120af919d2799b69e93bfe3a3b8ea4f5d7e6
 EBUILD tpop3d-1.5.5-r1.ebuild 2903 BLAKE2B cbbaca6d70dfaa5901a5816b3b1df861e0351aae6d4162936c3ddede25f5c846e50685c2f4e806851ed3c2d8ec3623898d70e6a224ee462a49063b80ae9acbe0 SHA512 3d7eae7439692f4b8f39aa335787bd6fd078e4e898a5053a86edf018e6286fd532fbd2c75358a4776dd1b2d7217fcba5e74e212f62a02b86d859a4c38df67f46
-EBUILD tpop3d-1.5.5.ebuild 2853 BLAKE2B 32a4478cf782de6f24548c56bdb089f7ea5db555b94042223d88b7b10d169022118b7b262f75fa23950782d721c4ce57f4c695ede9812e97b573e88e1fc03e20 SHA512 1424ce654a8b0b3bf8fc38857bcb8488be370473260d64d5ac0a224cab153be7d033b8c55c8525af02600a322e6fb13504101127a8a93fd1cc267e88ef05a6a2
 MISC metadata.xml 560 BLAKE2B f0fabe58e865bfe72fc237eca7cba05badd40682b5a03e420a00c96460106743c10d700082522f379828be1000fd1302863ad7f975ace5786c8f312fb5c6053c SHA512 892cc588c2be8dce623ed1844a7680339ce36fdee74e16b99436925b2defec116b164926f3a000db186ca25a079f90352d73795561a6c361e0c65c8c22c92eaf
diff --git a/net-mail/tpop3d/tpop3d-1.5.5.ebuild b/net-mail/tpop3d/tpop3d-1.5.5.ebuild
deleted file mode 100644
index 5f58acad3914..000000000000
--- a/net-mail/tpop3d/tpop3d-1.5.5.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="An extensible POP3 server with vmail-sql/MySQL support"
-HOMEPAGE="https://savannah.nongnu.org/projects/tpop3d/"
-SRC_URI="mirror://nongnu/tpop3d/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="authexternal debug flatfile gdbm ldap maildir mbox mysql offensive
-	pam passwd perl postgres +sha1 shadow ssl tcpd"
-
-RDEPEND="sha1?		( >=dev-libs/openssl-0.9.6 )
-	ssl?		( >=dev-libs/openssl-0.9.6 )
-	ldap? 		( >=net-nds/openldap-2.0.7 )
-	mysql?  	( virtual/mysql )
-	postgres?	( dev-db/postgresql[server] )
-	perl?		( >=dev-lang/perl-5.6.1 )
-	pam? 		( sys-libs/pam
-				  >=net-mail/mailbase-0.00-r8 )
-	tcpd?		( >=sys-apps/tcp-wrappers-7.6 )"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.5.4-gold.patch"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-	local noauth=0
-
-	# Various authentication methods
-	use authexternal && myconf="${myconf} --enable-auth-other"
-	use flatfile	&& myconf="${myconf} --enable-auth-flatfile"
-	use gdbm		&& myconf="${myconf} --enable-auth-gdbm"
-	use ldap		&& myconf="${myconf} --enable-auth-ldap"
-	use mysql		&& myconf="${myconf} --enable-auth-mysql"
-	use pam			|| myconf="${myconf} --disable-auth-pam"
-	use passwd		&& myconf="${myconf} --enable-auth-passwd"
-	use perl		&& myconf="${myconf} --enable-auth-perl"
-	use postgres	&& myconf="${myconf} --enable-auth-pgsql"
-	use shadow		&& myconf="${myconf} --enable-auth-passwd --enable-shadow-passwords"
-
-	use authexternal || use flatfile || use gdbm || use ldap || use mysql ||
-		use	pam || use passwd || use perl || use postgres || use shadow ||
-		noauth=1
-
-	if [[ ${noauth} -eq 1 ]]; then
-		ewarn "None of tpop3d's authentication mechanism USE flags are set."
-		ewarn "As a result tpop3d will be built with /etc/passwd authentication only."
-		myconf="${myconf} --enable-auth-passwd"
-	fi
-
-	# Other optional features
-	use debug		&& myconf="${myconf} --enable-backtrace"
-	use maildir		&& myconf="${myconf} --enable-mbox-maildir"
-	use mbox		|| myconf="${myconf} --disable-mbox-bsd"
-	use offensive	|| myconf="${myconf} --disable-snide-comments"
-	use sha1		|| myconf="${myconf} --disable-sha1-passwords"
-	use ssl			&& myconf="${myconf} --enable-tls"
-	use tcpd		&& myconf="${myconf} --enable-tcp-wrappers"
-
-	econf ${myconf}
-
-	# Causes crash with "stack smashing attack" on connect, because of bug in
-	# SSP (bug #115285)
-	filter-flags -fstack-protector
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodir /etc/tpop3d
-
-	if use pam ; then
-		dodir /etc/pam.d
-		dosym /etc/pam.d/pop3 /etc/pam.d/tpop3d
-	fi
-
-	newinitd "${FILESDIR}/${PN}-1.5.4.init" tpop3d
-}
-
-pkg_postinst() {
-	elog "Read the tpop3d.conf manpage"
-	elog "Please create /etc/tpop3d/tpop3d.conf to fit your configuration"
-}
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
commit	9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree	b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /net-mail
parent	b17a3ef12038de50228bade1f05502c74e135321 (diff)