gentoo resync : 14.12.2020

34 files changed, 296 insertions, 391 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index eb6030f4c2d8..8a6414910a82 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/b4/Manifest b/net-mail/b4/Manifest
index 384257f72737..4f4c778febc7 100644
--- a/net-mail/b4/Manifest
+++ b/net-mail/b4/Manifest
@@ -1,3 +1,3 @@
-DIST b4-0.5.3.tar.gz 56565 BLAKE2B 89d2f83973e942e1e56e1fc98c92c1688c2760a5b87237cc928f5bd792fb6ff10afaf02916e133ffb0ab54cf4fdc7ab6b8db239c051ae8584f64bcbcc189a99b SHA512 11bc8f57e65197d1a295fe9bc0bc642f88ef1720f890c961770891df02297cf3f4bc82cbc8428efa807ec68892363ff5aa546425ebfacac4ab646e8d615e9e87
-EBUILD b4-0.5.3.ebuild 460 BLAKE2B 718b04a4eeb87022e3286d553221e321adc8b7b08afe1fd3c50aad943666895418439c72b7e5155c2c1c7e20f09f4f60d04b856a96ed046b52fd9d2f30863b8a SHA512 79b6df9e461f7c045abc88aac2abd9bacd96c6b16f5aec8bcf9e14b73b68c536acf6103b76d3b006253290890f752da04ef505a80dee4ed27898455f227f47aa
-MISC metadata.xml 244 BLAKE2B 2ac557d4fb04230c7b4f706b52203ab6dc62d90aebc8e916561e6e3f6e41bf61bac231a0e7afe07fb18752177c6163b79fee124a171c3e8933041f4648db3a22 SHA512 da08729fbf0eceb858cadc8413dd857600ab595860ca483054e4d1422e3cacc52ce94f89d633a25c25d6b30df4a48ac7de011731418072238adb43bc8e7b3f3f
+DIST b4-0.6.1.tar.gz 63430 BLAKE2B 2bbf36dc5aa6c0bdd3ef792137b6cae5a6d4f53b8935d773d8efa7adc9d802d5f8faf49f5a31024eba706f97d5673820c415d2828bd65fca281acab0e41c8693 SHA512 2a4fcd04bbda02ef9cec843658bd9ab5df5aa3275b592c852725f343e66914f95fc7c7be4ccecd86cbbc60feb8630fb804368333ddafba11113269c81055e29e
+EBUILD b4-0.6.1.ebuild 462 BLAKE2B 4a3b56f0696f5b96fbf36aca6b7639c50f8d1649c1355fdf583dd43fdb94c81382f4bf38996cd9f96510ebeb07ce15d7bed04755930fae4c4e9ca7b981cb2283 SHA512 6bded230567f9b8b98ded24b621408bdcb304ca0266ecfec3b50639459b80c2496fd71a2ec48c77b0653650f247b9f0e788c42d868eb6caa87e4233f8b35e079
+MISC metadata.xml 315 BLAKE2B a201784cceecdb6e5beccc05f33f31bf35b4a8cebcbd439a968ffc58311e759d1622438eebbdb91719e6c25e6336d3dbc0fcc978840467a7ed688993ea694a20 SHA512 82da8cb6c4b38292564285922dff9718640cd2193ca8ceed00b516f3dc1c5cff9bb86b854a207becd2ef88c4128dfb2cd505e51dcc6241495c10cf1dfb6d0bc9
diff --git a/net-mail/b4/b4-0.5.3.ebuild b/net-mail/b4/b4-0.6.1.ebuild
index 211469b6276f..a266b07c5e73 100644
--- a/net-mail/b4/b4-0.5.3.ebuild
+++ b/net-mail/b4/b4-0.6.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/net-mail/b4/metadata.xml b/net-mail/b4/metadata.xml
index 474123637388..08f618477ce9 100644
--- a/net-mail/b4/metadata.xml
+++ b/net-mail/b4/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>zx2c4@gentoo.org</email>
-<name>Jason A. Donenfeld</name>
-</maintainer>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">b4</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index b6270ef03979..5e1ee7e4ec3f 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -1,8 +1,9 @@
-AUX dbmail-imapd.initd 1543 BLAKE2B 2c657fa6db5b0c6eeecac392a9e54474d54b605ceb510ef8e9c637f9a25b0060e9c111307cc21515bd640503021e9c59841428ba90c5745ca114031972a073bc SHA512 31b7dcb5a1af0aa5a8244371a2f81619c2191a7755340768e1aad694fde7876e4ad7040d0758dafd0a332eefd24b790a83e8ba95f13fe5d1d2e09ef7551d41cc
-AUX dbmail-lmtpd.initd 1543 BLAKE2B 1f84b793603f3c6ebe55abb073dcc53cd6d27769cb01eb2033c151686774b047da442eaddc480333a2a6ed9c8f8928cdf545a4a6b6c810aa0d3e0ece748a7621 SHA512 c79f50c56538643b3203d238cc5ef6f4c407951ff3279ba15b695479f7667be8120ded07daa55c1d01409a2921d5579ffa47cd612cba08f558bc5ba84f5809b7
-AUX dbmail-pop3d.initd 1543 BLAKE2B e33d3d5612ad4739998b8cd55b1493ea0d77d5ca29cf30f72c70b4717016db816f8a5812562a8b754eb0eb7e6487ebf911d4ed7e5d35dfe9d15e6047da3b9552 SHA512 6b1d3f10caf0afb5d5e41e95055368f11c2864204eafa94d22c93ba9f765419e69bb5e9a03d497d1e9a00d0c6a31c823be1449590331d24d6eb02d1f194a4941
-AUX dbmail-timsieved.initd 1558 BLAKE2B 79990327315d5f61262f519f9236910fc1043cca49f0f1d7e388b0156cd1909c9fc64c99154aa5d1020696e9d47dc2f634f352d1fa501c47999420bdc8118b9b SHA512 e9192c17772e208e5a57e185d970b605941dcb2472347858d2da45493084e666840dd13a4ee7c74ffce8eca975116fb8d78b0474bfe022089c859dd54a6e139e
+AUX dbmail-3.2.3-fno-common.patch 310 BLAKE2B 1166b001939b200e43b2dd048413e55bd53c9c385f93b40e95ee8306d3386eb365ee30c7ba26c853cc81ca231fd4d4551886f6760697ed40e1cdefd5617ecef3 SHA512 32f2524fdf0e6bf59bc0138d2fb62edad00c6700740fc21281de29dd3b455136bde4072ccf5017425cd417c5408498b688ee453f53166aa80eccba20382d736d
+AUX dbmail-imapd.initd 1539 BLAKE2B a05e964172d58063b2fa4addb83c38bca5859e5a092b5672026a7c2641cc5edd63eb2c3b1cad2c8b7ba2ab15e7a7b812417fdec2e01531087b0a8a32bd929b62 SHA512 d7246dd7db8a6e85298cdcd191b525fcd76b3d7526f0c3ad084628651ce54d599fed3313693c8607c79d4ab79580a0bc30f6a0f9e5b814f30d5a4bd92719719d
+AUX dbmail-lmtpd.initd 1539 BLAKE2B 6864a82613a8ad4f0cd72322d1383086ebd9f17443ea6534c655e47ce4452cf013a150f3e137df432eb380fb0eb31f05ef0ad6a8c50a076020aefa0b49a9da58 SHA512 5497841698749158c78bf1ef365aabf642370a301bb74b334972ca95d85f16c508cd88d56a41c675f9ad448bc762b5134e09a408ca9d2f40d68abeb83b1ee7d8
+AUX dbmail-pop3d.initd 1539 BLAKE2B 9b74cb310b832bf3cd37bcbb6a25969221792d7694d711e98bfdcb0c9898ce8d68974bd9c221957c7915bc73dba89ac8887961af388c88d44ae1ce17337a0551 SHA512 5968a31db02d6e48adc5ec26527e2ce8fdd0abf78754b911bcb588fa3414598ef0b4dc2ef44220049b015aaa5b0efeaf2be2ff3171562ff82e46d36e2d32d59e
+AUX dbmail-timsieved.initd 1554 BLAKE2B b082e00fc491c768fda2afce07bc30c087a7bf927f8cb16e79d60609932fa09e1052acfd39526cb7fb256c5c44cbcdbe6ac94f59f3b12330fe6e51648fa2aae7 SHA512 2340916c1f6abb0ccfbc98f0cd91a042035c0ff6751bee944e6b9227c14bb829152f22763bc87244b6718e4c3df44de6892b1961923a54eef5724ba9befbc34b
 DIST dbmail-3.2.3.tar.gz 2444227 BLAKE2B baa812fb3e925e6d896762596426208fc2ac5fcb01cb8100cfbd0464f1342f934c099ca52fd857e05fc82b97227155e9dcfc987d6c9b5c37e7daf21b167c9841 SHA512 29cc89830278f2ff28a4221fc81d4ff13cc371fbca7fb51d5376e9243234220b552cb4b6ec035c150e6cfa178435c4f36b9ce132fc02334bc6cdeb1a41c8ed85
 EBUILD dbmail-3.2.3-r1.ebuild 4680 BLAKE2B 97cf83e0334b3c9f595bdaf535b5033c2e98be7343631e3b6942d8ed83e540e77c03ca2aa60f1941ee6179dd51cf571554ec40bf9a969f28c920c2f3cf19fd34 SHA512 a6735361b215507ab298b9c7d1f701f10e90b9a6e79c5b73b7e0a4e11d630ddcd40de89d318359b0ad3cb84ebe270942290563b1b5dc87a60ede08a6da95f155
-EBUILD dbmail-3.2.3-r2.ebuild 4782 BLAKE2B d8f242f55ea4d9400e79d7d6c3ab3c8b91cb782b99c413c87358c53ad57edadb801fe71335ac7fbf14a7705972ae015b94ef8670f15a63ccbfa5a38f5efb95b2 SHA512 bc68b548a4ff3cfb0e10eac6da813fce88bf61a01854045797deac3e120384f3e08662fb0ade81bbe9bd70eb7b5c16d2262e84a726236dcd50f6068a4bf99717
+EBUILD dbmail-3.2.3-r3.ebuild 4002 BLAKE2B 0d922a30976d78f3d894bc5bd99a041b13fe64fdbe2a49d0f44787ec23abbbcd481524e8cfd14eff6e72c1a6926de6844d87cd0de0f047e97744c9d83e45615a SHA512 ab2fc9bd14893d0246109290c58df39174e45f5e47d9a6371b8c1ec054cfb2af2934291f1d1371f0c5b928ecfbc9b466f371c68437c48e9f75351c54b308409a
 MISC metadata.xml 570 BLAKE2B 5f2c04c5edfeba1166114d6b3d103abf9acd2bf312a359b4d25fc622b482b75b8660d2b3c48239a6cd8f87ed63bc591e9495346af944c8b853c74123ac67fb22 SHA512 b993fc2d7954a9afe0a5c53f84e3791a78c033abd64f3d279a54c34053bbe344ba4d0aa4456c9aca5ef9b2131db08698fecb717f5d7f130c501d659ec8fd59a8
diff --git a/net-mail/dbmail/dbmail-3.2.3-r2.ebuild b/net-mail/dbmail/dbmail-3.2.3-r2.ebuild
deleted file mode 100644
index 2875f819a206..000000000000
--- a/net-mail/dbmail/dbmail-3.2.3-r2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd versionator user
-
-DESCRIPTION="Fast and scalable sql based email services"
-HOMEPAGE="http://www.dbmail.org/"
-SRC_URI="http://www.dbmail.org/download/$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap libressl sieve ssl static"
-
-DEPEND="dev-db/libzdb
-	sieve? ( >=mail-filter/libsieve-2.2.1 )
-	ldap? ( >=net-nds/openldap-2.3.33 )
-	app-text/asciidoc
-	app-text/xmlto
-	app-crypt/mhash
-	sys-libs/zlib
-	dev-libs/gmime:2.6
-	>=dev-libs/glib-2.16
-	dev-libs/libevent
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup dbmail
-	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
-}
-
-src_configure() {
-	econf \
-		--enable-manpages \
-		--enable-systemd \
-		--sysconfdir=/etc/dbmail \
-		$(use_enable static) \
-		$(use_with sieve) \
-		$(use_with ldap auth-ldap)
-}
-
-src_install() {
-	emake DESTDIR="${D}" SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
-
-	DOCS=( AUTHORS README.md INSTALL THANKS UPGRADING )
-	einstalldocs
-
-	docompress -x /usr/share/doc/${PF}/sql
-	dodoc -r sql
-	dodoc -r test-scripts
-	dodoc -r contrib
-	## TODO: install other contrib stuff
-
-	sed -i -e "s:nobody:dbmail:" dbmail.conf || die
-	sed -i -e "s:nogroup:dbmail:" dbmail.conf || die
-	sed -i -e "s:/var/run:/run/dbmail:" dbmail.conf || die
-
-	insinto /etc/dbmail
-	newins dbmail.conf dbmail.conf.dist
-
-	# change config path to our default and use the conf.d and init.d files from the contrib dir
-	sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail || die
-	#sed -i -e "s:exit 0:return 1:" contrib/startup-scripts/gentoo/init.d-dbmail || die
-	#sed -i -e "s:/var/run:/var/run/dbmail:" contrib/startup-scripts/gentoo/init.d-dbmail || die
-	#newconfd contrib/startup-scripts/gentoo/conf.d-dbmail dbmail
-	#newinitd contrib/startup-scripts/gentoo/init.d-dbmail dbmail
-	# use custom init scripts until updated in upstream contrib
-	newinitd "${FILESDIR}/dbmail-imapd.initd" dbmail-imapd
-	newinitd "${FILESDIR}/dbmail-lmtpd.initd" dbmail-lmtpd
-	newinitd "${FILESDIR}/dbmail-pop3d.initd" dbmail-pop3d
-	newinitd "${FILESDIR}/dbmail-timsieved.initd" dbmail-timsieved
-	sed -i -e "s:/var/run:/run:" "${D}"/etc/init.d/dbmail-* || die
-
-	dobin contrib/mailbox2dbmail/mailbox2dbmail
-	doman contrib/mailbox2dbmail/mailbox2dbmail.1
-
-	# ldap schema
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/dbmail.schema"
-	fi
-
-	keepdir /var/lib/dbmail
-	fperms 750 /var/lib/dbmail
-	fowners dbmail:dbmail /var/lib/dbmail
-	# create this through init-scripts instead of at install time (bug #455002)
-	#keepdir /run/dbmail
-	#fowners dbmail:dbmail /run/dbmail
-}
-
-pkg_postinst() {
-	elog "Please read the INSTALL file in /usr/share/doc/${PF}/"
-	elog "for remaining instructions on setting up dbmail users and "
-	elog "for finishing configuration to connect to your MTA and "
-	elog "to connect to your db."
-	echo
-	elog "DBMail requires either SQLite, PostgreSQL or MySQL."
-	elog "Database schemes can be found in /usr/share/doc/${PF}/"
-	elog "You will also want to follow the installation instructions"
-	elog "on setting up the maintenance program to delete old messages."
-	elog "Don't forget to edit /etc/dbmail/dbmail.conf as well."
-	echo
-	elog "For regular maintenance, add this to crontab:"
-	elog "0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1"
-	echo
-	elog "Please make sure to run etc-update."
-	elog "If you get an error message about plugins not found"
-	elog "please add the library_directory configuration switch to"
-	elog "dbmail.conf and set it to the correct path"
-	elog "(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)"
-	elog "A sample can be found in dbmail.conf.dist after etc-update."
-	echo
-	elog "We are now using the init script from upstream."
-	elog "Please edit /etc/conf.d/dbmail to set which services to start"
-	elog "and delete /etc/init.d/dbmail-* when you are done. (don't"
-	elog "forget to rc-update del dbmail-* first)"
-	echo
-	elog "Changed pid directory to /run/dbmail (see"
-	elog "http://www.dbmail.org/mantis/view.php?id=949 for details)"
-	echo
-	ewarn "The database config has changed to support libzdb db URI"
-	ewarn "Please check the documentation (or Bug #479664)"
-	echo
-	ewarn "The database schema has changed since 3.0.x make sure"
-	ewarn "to run the migration script"
-	echo
-	ewarn "Please be aware, that the single init-script for all services"
-	ewarn "has been replaced with seperate init scripts for the individual services."
-	ewarn "Make sure to add dbmail-(imapd|lmtpd|pop3d|timsieved) using rc-update"
-	ewarn "and remove dbmail if you want to take advantage of this change."
-	echo
-}
diff --git a/net-mail/dbmail/dbmail-3.2.3-r3.ebuild b/net-mail/dbmail/dbmail-3.2.3-r3.ebuild
new file mode 100644
index 000000000000..39d811d7e7c9
--- /dev/null
+++ b/net-mail/dbmail/dbmail-3.2.3-r3.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1 systemd
+
+DESCRIPTION="Fast and scalable sql based email services"
+HOMEPAGE="https://www.dbmail.org/"
+SRC_URI="https://github.com/dbmail/dbmail/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap libressl sieve ssl"
+
+RDEPEND="
+	acct-group/dbmail
+	acct-user/dbmail
+	app-text/asciidoc
+	app-crypt/mhash
+	app-text/xmlto
+	dev-db/libzdb
+	>=dev-libs/glib-2.16
+	dev-libs/gmime:2.6
+	dev-libs/libevent
+	sys-libs/zlib
+	ldap? ( >=net-nds/openldap-2.3.33 )
+	sieve? ( >=mail-filter/libsieve-2.2.1 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+DOC_CONTENTS="Please read the INSTALL file in /usr/share/doc/${PF}/
+for remaining instructions on setting up dbmail users and
+for finishing configuration to connect to your MTA and
+to connect to your db.
+DBMail requires either SQLite, PostgreSQL or MySQL.
+Database schemes can be found in /usr/share/doc/${PF}/
+You will also want to follow the installation instructions
+on setting up the maintenance program to delete old messages.
+Don't forget to edit /etc/dbmail/dbmail.conf as well.
+For regular maintenance, add this to crontab:
+0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1
+Please make sure to run etc-update.
+If you get an error message about plugins not found
+please add the library_directory configuration switch to
+dbmail.conf and set it to the correct path
+(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)
+A sample can be found in dbmail.conf.dist after etc-update.
+We are now using the init script from upstream.
+Please edit /etc/conf.d/dbmail to set which services to start
+and delete /etc/init.d/dbmail-* when you are done. (don't
+forget to rc-update del dbmail-* first)
+Changed pid directory to /run/dbmail (see
+http://www.dbmail.org/mantis/view.php?id=949 for details)
+The database config has changed to support libzdb db URI
+Please check the documentation (or Bug #479664)
+The database schema has changed since 3.0.x make sure
+to run the migration script
+Please be aware, that the single init-script for all services
+has been replaced with seperate init scripts for the individual services.
+Make sure to add dbmail-(imapd|lmtpd|pop3d|timsieved) using rc-update
+and remove dbmail if you want to take advantage of this change."
+
+src_prepare() {
+	default
+
+	# change config path to our default and use the conf.d and init.d files from the contrib dir
+	sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail || die
+
+	sed -i \
+		-e "s:nobody:dbmail:" \
+		-e "s:nogroup:dbmail:" \
+		-e "s:/var/run:/run/dbmail:" \
+		dbmail.conf || die
+}
+
+src_configure() {
+	econf \
+		--enable-manpages \
+		--enable-systemd \
+		--sysconfdir=/etc/dbmail \
+		--disable-static \
+		$(use_with sieve) \
+		$(use_with ldap auth-ldap)
+}
+
+src_install() {
+	emake DESTDIR="${D}" SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
+	einstalldocs
+	dodoc UPGRADING
+
+	docompress -x /usr/share/doc/${PF}/sql
+	dodoc -r sql
+	dodoc -r test-scripts
+	dodoc -r contrib
+
+	insinto /etc/dbmail
+	newins dbmail.conf dbmail.conf.dist
+
+	# use custom init scripts until updated in upstream contrib
+	newinitd "${FILESDIR}/dbmail-imapd.initd" dbmail-imapd
+	newinitd "${FILESDIR}/dbmail-lmtpd.initd" dbmail-lmtpd
+	newinitd "${FILESDIR}/dbmail-pop3d.initd" dbmail-pop3d
+	newinitd "${FILESDIR}/dbmail-timsieved.initd" dbmail-timsieved
+
+	dobin contrib/mailbox2dbmail/mailbox2dbmail
+	doman contrib/mailbox2dbmail/mailbox2dbmail.1
+
+	# ldap schema
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins dbmail.schema
+	fi
+
+	keepdir /var/lib/dbmail
+	fperms 750 /var/lib/dbmail
+	fowners dbmail:dbmail /var/lib/dbmail
+
+	readme.gentoo_create_doc
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-mail/dbmail/files/dbmail-3.2.3-fno-common.patch b/net-mail/dbmail/files/dbmail-3.2.3-fno-common.patch
new file mode 100644
index 000000000000..3a6948bc0e39
--- /dev/null
+++ b/net-mail/dbmail/files/dbmail-3.2.3-fno-common.patch
@@ -0,0 +1,14 @@
+Taken from: https://github.com/dbmail/dbmail/pull/64
+Author: Chris Mayo <aklhfex@gmail.com>
+
+--- a/src/dm_tls.c
++++ b/src/dm_tls.c
+@@ -31,7 +31,7 @@
+ #define THIS_MODULE "tls"
+ 
+ 
+-SSL_CTX *tls_context;
++extern SSL_CTX *tls_context;
+ 
+ /* Create the initial SSL context structure */
+ SSL_CTX *tls_init(void) {
diff --git a/net-mail/dbmail/files/dbmail-imapd.initd b/net-mail/dbmail/files/dbmail-imapd.initd
index 9914f6a58bf3..f2e16dff1706 100644
--- a/net-mail/dbmail/files/dbmail-imapd.initd
+++ b/net-mail/dbmail/files/dbmail-imapd.initd
@@ -8,7 +8,7 @@
 PROGRAM=dbmail-imapd
 
 BIN_DIR=/usr/sbin
-PID_DIR=/var/run/dbmail
+PID_DIR=/run/dbmail
 PID=pid
 
 # Where is the dbmail.conf file located?
diff --git a/net-mail/dbmail/files/dbmail-lmtpd.initd b/net-mail/dbmail/files/dbmail-lmtpd.initd
index 68e41c34e247..7062098fb7b7 100644
--- a/net-mail/dbmail/files/dbmail-lmtpd.initd
+++ b/net-mail/dbmail/files/dbmail-lmtpd.initd
@@ -8,7 +8,7 @@
 PROGRAM=dbmail-lmtpd
 
 BIN_DIR=/usr/sbin
-PID_DIR=/var/run/dbmail
+PID_DIR=/run/dbmail
 PID=pid
 
 # Where is the dbmail.conf file located?
diff --git a/net-mail/dbmail/files/dbmail-pop3d.initd b/net-mail/dbmail/files/dbmail-pop3d.initd
index 6629a9a610af..156c030be37b 100644
--- a/net-mail/dbmail/files/dbmail-pop3d.initd
+++ b/net-mail/dbmail/files/dbmail-pop3d.initd
@@ -8,7 +8,7 @@
 PROGRAM=dbmail-pop3d
 
 BIN_DIR=/usr/sbin
-PID_DIR=/var/run/dbmail
+PID_DIR=/run/dbmail
 PID=pid
 
 # Where is the dbmail.conf file located?
diff --git a/net-mail/dbmail/files/dbmail-timsieved.initd b/net-mail/dbmail/files/dbmail-timsieved.initd
index fdd809c5485c..c5402bdf876e 100644
--- a/net-mail/dbmail/files/dbmail-timsieved.initd
+++ b/net-mail/dbmail/files/dbmail-timsieved.initd
@@ -8,7 +8,7 @@
 PROGRAM=dbmail-timsieved
 
 BIN_DIR=/usr/sbin
-PID_DIR=/var/run/dbmail
+PID_DIR=/run/dbmail
 PID=pid
 
 # Where is the dbmail.conf file located?
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index b29af1f3140f..3f65eb6c3b1f 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -15,6 +15,6 @@ EBUILD dovecot-2.2.36.4.ebuild 8605 BLAKE2B b649cd8db3cc6ed5fe93a6013a16e7f99a12
 EBUILD dovecot-2.3.10.1.ebuild 8629 BLAKE2B 4d664f1ff75b846a2be7dcca52b7189efac3c6f95e40a0af935dd16f857c51db53aa72023e94b4ae86a5bf892475fd4259dc5085ea41a5053b702ced5b2725cd SHA512 d783676c087faaa047de828eb6a38f21a4512e81cea4a1dcb03d4e852518cb520cfa66d88540a63c3805fdc1144f4895d8a4db8269c3bbf93691bcea080dcbec
 EBUILD dovecot-2.3.11.3-r1.ebuild 8837 BLAKE2B 668d4a31360b252a60ebf808038bdf9c20c67d069098d2aa698a96479e40ffd5f9355fc5c720896d196d9cb4821881caef2cacc341dd9df147bb67bad8c76eaa SHA512 021460cdab894122d2ff9265cb2e909518a362295ae77bb04735d0e995464f9feec7695651055ca78c6716c890f50a976b057e9c7745d3d90740af8efeb550de
 EBUILD dovecot-2.3.11.3-r2.ebuild 8882 BLAKE2B 11c3702ab1c2fd8f885ab69c177b03b6ca997aa10b0360b94b9f84e99b195eeb28d27f2dc323b151eda418d7e8c3244100fdfc83521ef0f071530201a584594a SHA512 061968137d1af8c8a1c42c0af82352fac8633896a324488931f12c93c1cc754eb550e819244b348263c15f5b1d4e7645cc55bacc7a57b2ba856d056c8c3920c8
-EBUILD dovecot-2.3.11.3.ebuild 8676 BLAKE2B 3ec42d4194a1db2e6090f223af7d9859c85cb134e31dfad5ed53a8d420594c95b4a57634e88ffbfd057a07c346677134dcb980d3bfda253c5cb1a07e5c7638be SHA512 cc1019fbd851ca8a2e27f9ee9d4004730af8b6eea64c00ee99fa816cd5229e8f523cc6f61ba52ebaf0f684d07d1076cbb497e5720c6b9108c00128803f07e8ab
+EBUILD dovecot-2.3.11.3.ebuild 8675 BLAKE2B 87492e78db3585858250f39a426e68eed7cd56086e13872e7e676b1071eaae3b435d84a56ae086196ee6916883197932b8055de58a548c36d26237b43852c9d2 SHA512 1e3b8a3e9441194c4bad143d47515d5bcc9b48fe8643fcdf57739b2405055ae8413560993549585a9a08b30a09e958d218821e6e7199546f612205e112fef3a1
 EBUILD dovecot-2.3.7.2.ebuild 8717 BLAKE2B 2aef6fffe859d0965f3e809739cdec16165fc4935cda3eae6ea89dce803366ac7fb0ad0dd1a95b3a4ee040a2be61cb44e58e61fb44feb47d0ef9e3496febe30e SHA512 3412f9224528f4872777d580e352e8cd679b7d1a9f88a20594e56358cd026f74343b624205e8ea0972ead3b3c9157a8061ddc7c3181c183fb6caf1d1c2f2f515
 MISC metadata.xml 998 BLAKE2B c65428e9f0019e942fc1d634d53c2a85c7f8a699e34cf9c49ae09bfe9ce8a54fd368512f7a4d74f6a10baff949a9fe8021e1e0c009f8315b100fb5736efd34ae SHA512 f285f0928dc0915c8e8cebb966de84f5564be9f7dd3baa7c0cccb3343da75507003aeadf80fe34ffb4b69dd9208997a80fdb47c20bfd65fdc60c43423a00813c
diff --git a/net-mail/dovecot/dovecot-2.3.11.3.ebuild b/net-mail/dovecot/dovecot-2.3.11.3.ebuild
index 323999c6259f..92349c006ef1 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"
diff --git a/net-mail/fdm/Manifest b/net-mail/fdm/Manifest
index 94f5ed3a2e60..b9f03df539aa 100644
--- a/net-mail/fdm/Manifest
+++ b/net-mail/fdm/Manifest
@@ -1,5 +1,3 @@
-DIST fdm-1.9.tar.gz 299916 BLAKE2B 0c9bb9514a4d36fb1168be73fe745aa136cea75e0ebde28ab181be7d4b7e093c0bec775222e8a333e14baa90871739fa095a89bf8d1f16a86dee03b6d01021aa SHA512 e7e5c8aae8be3e82ff6015d2d87fd9d0dad4fe24796b4f30d6874f761e2df6900c8940d39de28bb2db6ee3ea3faf494c57149037657d986a3b54db3a6a601ca7
 DIST fdm-2.0.tar.gz 313596 BLAKE2B 8b323f4a8953a46773a4e5a1214444dc97db4346f50990fcfb4c9d79ae40bbb73b61e3bf41bc95b76e44f6bed7b398cb210d58901823752e92ca7b83189cbc7e SHA512 14e923202d17083ceb3b91b3a442d7e512c37f3d29535f22d8c0c4e1d57c97acc5d5465d643ed0cf437b3945ef777a6e38da3117219c2d54dcec88ecab1e10d9
-EBUILD fdm-1.9.ebuild 920 BLAKE2B 70d8d1f0438dda55671ddba7b17b868d63f89c573d5a8ceb0cf00f8d04253358089b05d29ff7eb7d2e27b431f0c413b007657ef2c2c642d9da829909a761c63a SHA512 d6cb2804a8df302ddc87c3ab84a7f0154d6eee144ebba10ce72a7a427aeebc487132dee472f8496270bf5b13623b66e3dc4a9fd7059817f9549851b2033c15b4
-EBUILD fdm-2.0.ebuild 842 BLAKE2B 53fbab79656bed53fc503d9d23f32fcc6effd5ab536c1066b79441e5b51169ad2ea58fdcb2872d19d1e9ed525091516c2b5983154a090e9798b44422ded5d770 SHA512 e8cb0f3eac3cb420945ee6243704c783c381e8bdf220e7e2b9f164ca055507960e3472d5a2eaf855635106363e6c5a93791383175e1264b1ca339d8513f36e2a
-MISC metadata.xml 395 BLAKE2B d62bae2c039a663b01a2ddaa4a025766c05032c2484eb0638dcf2dff888464fd7e582449a0ae1f53da2e2eced93bda7772e68c89e192bec17b9332ebe3878666 SHA512 08b8b693f7b5750b721c81181cbebc031bcd50fbf2b45706e2e78597f35c567267fa4e924d97f1df9969603d2be74a7e269769d957c1ac121dae772021b00bfe
+EBUILD fdm-2.0.ebuild 841 BLAKE2B 90dae6ba8dcfa5a2f9552fd90ce1b94f0816f743a2290afe00381554e34f4dd1c53d1ea5927e9699a82c3fb73751cdf8a83bcad20e28f2675f9b84abfd554921 SHA512 3f94f2ac469eb96c0d14b2568adb5a121aeed43c93bc2ba620803e167a533376cc5d05465e3cab54227f5f39a2d1d40739febe061e0843cb9a2ea4a180c4aa1f
+MISC metadata.xml 295 BLAKE2B 258b3dde768bd93f75108c451644287a850dd28a867429953e65ce650dd9911982f6c47672d6fe75d67f572d28f6d6e3d15393f7e88f9beff7917dea30f53ca4 SHA512 702eb19cdd97836f450877ec4fb366447b32b5eb4c181930c0960b1d5c2638ba1a0c995cb599fa272fd31c80b5ecba93ba4b713d9e913103d5509ba2959f8eb6
diff --git a/net-mail/fdm/fdm-1.9.ebuild b/net-mail/fdm/fdm-1.9.ebuild
deleted file mode 100644
index 7aeec5891373..000000000000
--- a/net-mail/fdm/fdm-1.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs user
-
-DESCRIPTION="fetch, filter and deliver mail"
-HOMEPAGE="https://github.com/nicm/fdm"
-SRC_URI="https://github.com/nicm/fdm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="courierauth examples libressl pcre"
-
-DEPEND="!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/tdb
-	courierauth? ( net-libs/courier-authlib )
-	pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewuser _fdm
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		COURIER=$(use courierauth && echo 1) \
-		PCRE=$(use pcre && echo 1)
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man install
-	dodoc CHANGES README TODO MANUAL
-	if use examples ; then
-		docinto examples
-		dodoc examples/*
-	fi
-}
diff --git a/net-mail/fdm/fdm-2.0.ebuild b/net-mail/fdm/fdm-2.0.ebuild
index 90719cb03337..c74527c128e3 100644
--- a/net-mail/fdm/fdm-2.0.ebuild
+++ b/net-mail/fdm/fdm-2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nicm/fdm/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="examples libressl pcre"
 
 DEPEND="!libressl? ( dev-libs/openssl:0= )
diff --git a/net-mail/fdm/metadata.xml b/net-mail/fdm/metadata.xml
index dae07138c6d0..61a735f7ec60 100644
--- a/net-mail/fdm/metadata.xml
+++ b/net-mail/fdm/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <use>
-    <flag name="courierauth">Add support for Courier authentication library</flag>
-  </use>
   <upstream>
     <remote-id type="sourceforge">fdm</remote-id>
     <remote-id type="github">nicm/fdm</remote-id>
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 59e847922b39..ffe747e35243 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -7,10 +7,12 @@ AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3
 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.13.tar.xz 1308248 BLAKE2B 5efe641d3fc19ed5232fbf959dd09e049e6c5b7419b4bf6fbacb2a24e29916d5dd6209cc7e792e733f59482b4c4aa2983a6d5abe6176dc5a82152b0660042cf4 SHA512 fd55a2a199ec83a863780934481df5ec562f0184adef738d37798aaad7b4eb15dfe0075436907784cc1b87f5c89bdf36a9a4df20f60786f6a185d04ab78ee9a4
+DIST fetchmail-6.4.14.tar.xz 1309352 BLAKE2B d763f4a2fc036ef9c611829fbe5ec9eeed730429c746738203f852d8812609ad91fe179f8c43db1ad819a5430d3bc0a3c9348ab97cef312889cafb05b76a7d5b SHA512 a0295094462abfd6ddeef32772c591f1ec87765f76e116e0bb17af1215c61be965bf1e9f10864fed53b4c072b240a40d43fe51f4287f0ed138795a630be2a276
 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-r1.ebuild 2521 BLAKE2B 499bad8f4cb55b68e999e43fee86262f3a118b5bc9e2c5c712e0ea5610633d5919e8c10413d388ad425b30c5f02942e53a0b91bae36ca06ea8a6ed6d91e89da7 SHA512 27613ef04f854991f6187b7ca4172b926873270ebf47295210dafe712c97ed1b35496587140e2bee6e9b31b6e25cdae2e4de487016c70fda08960f2e7cffe67a
 EBUILD fetchmail-6.4.12.ebuild 2519 BLAKE2B d693548f12d13da5218deb137abe401690011e563d5a43914f323163a81fe5a75ed6c39fa57bf9544695688e60ac5430444251b3a71173b6e5352f0348c9cbb5 SHA512 13b7bdad5c1d1219c8dcf176181a59a180cdbbaaee0248cc6b3625cf6e07b226319ce6844e6e647673b43b9fafe3b962e71b81c1373e6f96d832cb8caab88e3f
 EBUILD fetchmail-6.4.13.ebuild 2521 BLAKE2B 499bad8f4cb55b68e999e43fee86262f3a118b5bc9e2c5c712e0ea5610633d5919e8c10413d388ad425b30c5f02942e53a0b91bae36ca06ea8a6ed6d91e89da7 SHA512 27613ef04f854991f6187b7ca4172b926873270ebf47295210dafe712c97ed1b35496587140e2bee6e9b31b6e25cdae2e4de487016c70fda08960f2e7cffe67a
+EBUILD fetchmail-6.4.14.ebuild 2521 BLAKE2B 499bad8f4cb55b68e999e43fee86262f3a118b5bc9e2c5c712e0ea5610633d5919e8c10413d388ad425b30c5f02942e53a0b91bae36ca06ea8a6ed6d91e89da7 SHA512 27613ef04f854991f6187b7ca4172b926873270ebf47295210dafe712c97ed1b35496587140e2bee6e9b31b6e25cdae2e4de487016c70fda08960f2e7cffe67a
 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.14.ebuild b/net-mail/fetchmail/fetchmail-6.4.14.ebuild
new file mode 100644
index 000000000000..157b8118f72b
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.4.14.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,9} )
+PYTHON_REQ_USE="tk"
+
+inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs
+
+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"
+	dotmpfiles "${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/imapsync/Manifest b/net-mail/imapsync/Manifest
index 8857c44af6f3..e546d430702f 100644
--- a/net-mail/imapsync/Manifest
+++ b/net-mail/imapsync/Manifest
@@ -3,5 +3,5 @@ DIST imapsync-1.836.tar.gz 1741595 BLAKE2B 6502105147cf2f7d13c0af997cab05e3d65a7
 DIST imapsync-1.882.tar.gz 1557501 BLAKE2B 92f37d0c6c64569016a15d71d1b95ca08e4a8bb2402a5151f1429260fb37db47ebfc273e2bb73b06ba77974100780924fa3f256565fcd3e77cbff4c7bbf7b56e SHA512 3953cb29b210c283be3fe72f1e1537594415bd5457b469b801625d6c857b982d2b2b3da9528dd1e6ccc6831c022ce495f7a5eaaea04d228bca374f185344f455
 EBUILD imapsync-1.592-r1.ebuild 756 BLAKE2B fd235050e9336afebd5c73044791cfafb258455cd022e627cf8611707244684ede95f0ebc28a27432cc7760f1256b4f79067b828f672678d13a09d04aff59f54 SHA512 e04c4ce91b7e9e44356ab9672848dfae3e5150c3a7d5d6be1441fa9691d664c62b3fac655f782b52964ef46c64cd306b57fd48c5ebb182168db1d05ff1cb3300
 EBUILD imapsync-1.836.ebuild 921 BLAKE2B 4bdff06ddc043c38875613b673683f2d97b7d25055fb199e22463ca2feb2bad7bed7debaca1102c8141d0169a14033c2d5265748ebcefbd31138ad49e39fa295 SHA512 6e4c5c4bccc4810b379639edf16db43c997d1239a9ba8eb77f29a0ace593f40909039103bf9d0ef3adeda8064b708b05fca4c303b70a394ff0423723b755d481
-EBUILD imapsync-1.882.ebuild 1945 BLAKE2B b1b5dc037a11376e203b421623e93925f35c4e810c09e17ad61af609ed2a1870a172907c702e2234fe8ff48d4c3847570abd3c8e73a35371fadc306142c8d573 SHA512 46c87f17102d085b24b1b39da5ca3576c7c256db6610971745308d951ebd75a69d8c086ff5e68d9afd86b0c06b322a3126a8744ae3c6224e6220d0483883d379
+EBUILD imapsync-1.882.ebuild 1943 BLAKE2B 1cb4a84337796c267b8b22f80cccf6fc72e8b487b0ab2c78924079f798779ab6450b1a5cd0cae53efca6c6d9202cc2210a40b02d92b286f4e4b1c1674743a136 SHA512 1839ea2d5a271c7253a91cb1f97b9e55d1f66c8269496af747fabbb01685acf270d998e2f527d31c859c0c9456c8d01ec92861eca6b5bd4cd18bb1ac32691af1
 MISC metadata.xml 249 BLAKE2B 0bccb43703238e66606acc0f395e496ed36dc25e319354565dd990baa7ef595a42aa7f931d50b65e9cd77ee72103b8c0210c68fadd54ff8ff6bfaeff60850a9f SHA512 a5b4caa063a5e6f2d954e30608a5051b567fe1e869e1662282d6d12813105152833fb824043f7501d9fdc628cf2ad88c53c90c48798f27f8240e541956f63dce
diff --git a/net-mail/imapsync/imapsync-1.882.ebuild b/net-mail/imapsync/imapsync-1.882.ebuild
index fd46531dcda1..9fef3c968f72 100644
--- a/net-mail/imapsync/imapsync-1.882.ebuild
+++ b/net-mail/imapsync/imapsync-1.882.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 # ppc dropped pending keywording of:
 # dev-perl/App-cpanminus
 # dev-perl/Data-Uniqid
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 9fe1f93e7b12..07e033bc42b2 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -4,5 +4,5 @@ DIST mu-1.4.12.tar.gz 2309385 BLAKE2B 4f1b7c520a38e5f17471c2a9dc814decc019a4afce
 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.13.ebuild 1763 BLAKE2B f15857a2ce4f44f3eb48b9b29255c7b5d67887355700cf62dd6610897dbe097c2b947ca417c1d62df4d0b88d6cee3124716316e602011dcf78df3f6347112eb1 SHA512 da1e8d73bdb564da83abb29fbdb77ae7264f9e71c33b069fe33e3b4d8f578dbd91fdbaf9129e8e67925e87e7619830adefab1f686cd4355f2275567f1251afb9
+EBUILD mu-1.4.13.ebuild 1774 BLAKE2B d4f32fe1efff5bec341b413caadc6841f85a1892fae4d428ece9cac413ddca7c4b3d05bb68dec532f328b4c0a16fc12ca6f6c0cf430b8a351be64dcef16ed361 SHA512 2c6a3d5ae29ff7d46954b32b30d0d7f0760e6f648e80b5ca1c1f8eaa16be54e92105ceeb8ccaac1169b54b8e9e2225b67dded9a7e39829257277d95f2696b24a
 MISC metadata.xml 895 BLAKE2B 2a8d3f5aa6673c03df5bcf495aded3bb07316b4833ed84ec3e2d7030f5cbab8333865da6a4bd67bc8ee69e39bc6540d4a77bd7ddf3b1b9fdd7b5a6dfb7278fe6 SHA512 e5e1e9f3084189fbdbc8fb55127b8b3eec4acd7685b0d4c9ab564644f21fcc53520b89f7ced7bb3972c13d577a030175a9665d30ba513112125409082a7ad7c0
diff --git a/net-mail/mu/mu-1.4.13.ebuild b/net-mail/mu/mu-1.4.13.ebuild
index dfabecbea9d1..6f3c1afeebe6 100644
--- a/net-mail/mu/mu-1.4.13.ebuild
+++ b/net-mail/mu/mu-1.4.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 IUSE="emacs guile mug"
 
 DEPEND="
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index a976c89930ca..43a370a82051 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -8,6 +8,6 @@ DIST notmuch-0.31.tar.xz 713144 BLAKE2B 91b0a01543e438e6ccb40a01ad0a100a5c6ae15f
 EBUILD notmuch-0.29.3-r2.ebuild 5062 BLAKE2B cdf68691f7dbc729d6c95dc974a3fb3b747a33d0b80338fc9b0474a970b78674628c242ce14af83b4d57eee1cba1f3c3d343dfcfffe2d8d0ee628f78b94f8767 SHA512 d76b455c44244eb1775604b0510f96c30aea175492ea4982d9a5b93d8601834a120286f29b8e41c6e694209a09be72727848e24bf5b8b3723729c2458095cc08
 EBUILD notmuch-0.30-r1.ebuild 4343 BLAKE2B f53eff50b205bffdb6016118997a5b5176a88ca704999e2b4f3bef4f107a79e7e89e68010fc35bd756aa8cbbe168f73700eba9b33ec8f1ce32a676b1b592e5da SHA512 bde0d770ca18d3c55c79be0b4e6fb360f61bf0f404397448fb311c1cf107b07b5f9633643a04a0e6615acd61934635845d1a2a47283795e3fd69c050939858b1
 EBUILD notmuch-0.31-r2.ebuild 6375 BLAKE2B 936a7e27bc21361d9692a36dd029d4ccbc28997dd4fda3c72c5ba5b79021be102a39efd6b5d95b4aa59fd008b2d07b5cbfaaef72b4ae31e08febc6b1c396a061 SHA512 6fd4ef53415e8c24b8fdc5ff8bffb548960f12c4b4cbdb001da1bb322604f05d059fd05ed7a90787f9209f1d9e61101ee7af5405b3be133b9efb29efc2ec14e0
-EBUILD notmuch-0.31.2.ebuild 6338 BLAKE2B c46bab536f2feefeb2c2f0baa5305f36b5d24314fb648fdbfa0cc4af6a0f19eab9cf9819c0657a9a48dc00fcbe754313b0f9cb52171e6ac4c13b56fda892117c SHA512 dd3a224b075d0403c693753289113e5f854efa7538095d5c24371c90083fda17efce7c96b6b8358d599c91478da3b61bf9c3456421c42c029280b9031b890d4a
+EBUILD notmuch-0.31.2.ebuild 6349 BLAKE2B fbb52800618b2f5771224803ae2bec343550aa0117ad6fb208e8805a7e605383eabf1229db8807fa26042214a7e82ad15a33aa001898a2dcb58bc013856fd39b SHA512 2365a6466da920adeed601a70c745dd9cc3562472a85768be50caf9d5f087f572d1e4ad0e659432a5e72af8fdf86d22ae9c28c03337e9341a4651d1fb5bf72ae
 EBUILD notmuch-0.31.ebuild 4460 BLAKE2B 21bea26e7e287937cd45a553abb14cb40420b2bb93886165533f6808d4734e594bd0184fb4b8dd6230b2264dc09f80dd89eeea70f678e7a56981e11f743c1121 SHA512 e12a5c8403c7f7e0ce32a1f002a4e6153b01df9436a517f692b18860a919aac83787a59ae6a00820b2d6fae7661a14a4f822d16b79c2e037f539afddfba04f62
 MISC metadata.xml 1288 BLAKE2B cc1d703a011971c9d6c89237847c84caeb83d1a6b62d95ee9cb1b0138919ea24cce578d7f55cdb749b448d6f2c9c77895285127d9c509532b5b58c66db2528a1 SHA512 68066c76c92534adb837ade1aa93a6e58f2d1b288e9cb75753af2c9dc1feac145be1976163b535f4bd5671f73f0dc93f204fe74ede74c10f081bba1d3be3d1dd
diff --git a/net-mail/notmuch/notmuch-0.31.2.ebuild b/net-mail/notmuch/notmuch-0.31.2.ebuild
index 750021265833..26c459bf4d05 100644
--- a/net-mail/notmuch/notmuch-0.31.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.2.ebuild
@@ -18,7 +18,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 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
 REQUIRED_USE="
 	apidoc? ( doc )
 	nmbug? ( python )
diff --git a/net-mail/onionrouter/Manifest b/net-mail/onionrouter/Manifest
index 899ed9081e11..760e0e591464 100644
--- a/net-mail/onionrouter/Manifest
+++ b/net-mail/onionrouter/Manifest
@@ -2,4 +2,4 @@ AUX onionrouter.service 462 BLAKE2B 83f048d1111167fd99ff2a3bfd791ac8435c01f9a262
 DIST onionrouter-0.6.1.tar.gz 26584 BLAKE2B e1d722ba4e7ec617e39fda54299cd71d9d47bbd34fd44a19ffef8f2349f9b238251b47d01c369223393a9d7f2e0a05c5d8b7dc9f991c7d386ba800086b8cc226 SHA512 5d08e7a7310e69e29eaba2098a62cef4b5044c207f4a78b4cfebfd2a9d18bd812b485793ff7395186d4949ad9604b4e82dc0e9b1200abf03108466bf531a6d15
 EBUILD onionrouter-0.6.1.ebuild 1162 BLAKE2B 14195482f1a67442979a5cc7daa6f513b3a3deb2a3801d6664f464793b28a04f64f991cfde7fe2405fd28e484f81814fb0ed742070028cf61e4a4f3a74287a6e SHA512 01b96089281280ef29c27f0a40d52ccb6f07dc707741e0b041b50533a3f636254bf6ba04e2b62f7404d9c2ab88377b3f428cb587ffd40bb0a783ec8af5534cab
 EBUILD onionrouter-9999.ebuild 1162 BLAKE2B 14195482f1a67442979a5cc7daa6f513b3a3deb2a3801d6664f464793b28a04f64f991cfde7fe2405fd28e484f81814fb0ed742070028cf61e4a4f3a74287a6e SHA512 01b96089281280ef29c27f0a40d52ccb6f07dc707741e0b041b50533a3f636254bf6ba04e2b62f7404d9c2ab88377b3f428cb587ffd40bb0a783ec8af5534cab
-MISC metadata.xml 248 BLAKE2B 3f65c2f88989989e697a91f6cdd53f41417682b0fdd13820473e04af6cbe434120f2e29e7b08edb18b860b50caf9131f8a69f396e64b85ba10901498cbf2587d SHA512 4784715e9b0407de4537918eb1f7879ab399491e47aa5256dc444fbf13a939a44a591e6f1775992576c082d9e5d0dadce8a968a70fa0f05ca4b17b6aea3e4ac3
+MISC metadata.xml 383 BLAKE2B cc80762b15d262a801d3086e5c9a486e2a0b74fa3a93027a7003b8ac955c8e11cff1936b2c547351a14b7581189d7b1e12c1ab02d7a54e584bf43cc961c78158 SHA512 6b0e60548de9a7aca0ce9207581d567a7cd7c761e75ca16f61288f66031e2b388320da7034af2b985dd585b0b110afbdb98f40b3d149c73bd3906f74cf5489a7
diff --git a/net-mail/onionrouter/metadata.xml b/net-mail/onionrouter/metadata.xml
index fbb8d54dbc4d..9f241814ad72 100644
--- a/net-mail/onionrouter/metadata.xml
+++ b/net-mail/onionrouter/metadata.xml
@@ -5,4 +5,8 @@
 		<email>candrews@gentoo.org</email>
 		<name>Craig Andrews</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">onionrouter</remote-id>
+		<remote-id type="github">ehloonion/onionrouter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index cbaf3f27a90b..9d1c5bf5236e 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -2,7 +2,6 @@ DIST rss2email-3.11.tar.gz 66441 BLAKE2B 24be7c4d280e337869833f9fa492186a9f4cc20
 DIST rss2email-3.12.1.tar.gz 73942 BLAKE2B be522ec88b4bbc7831713681dbd157b27c0c410bd6a960d80c72169ed2931346b83fc74f7ded663b13ea92f0dd1f5720647208f425bb4de32081579f6c5e3c51 SHA512 8b62a149172cf13c9b03841191f3b214cd1bc2c071f75150a76dacee3edf8a21e0a083a46eba8fabea695cb5077eb84aa4262a709e4aae1e15facee4bbecd1d6
 DIST rss2email-3.12.2.tar.gz 74096 BLAKE2B 5b7d6808d5741795de805e49bb955694a39a087e1dd64820303243227bf4b12ff9ee9354008c4f6cce415a8a8f84266266f8a677d6fed4eefa69713e5f664de9 SHA512 4df498cebd74bb25ffa2caa5aa851ccb106b0fa1b98113c5643cdd3ed8f9a73d266a649df521b8237740ea491ba086a65df0ba60c28a60a3d63360b8280a3888
 EBUILD rss2email-3.11-r1.ebuild 666 BLAKE2B a38fc2dc7182cb7c9e5b97f971d4cb88d89a8fd5adb0687c4229a5a7dda4588e398886de21d115594411817c3d92bf6ebddaa55180d24dea0f905abd433918fd SHA512 8fe6db64a3cd3ddb2169690277ec317cf3ed8ab60237bbb671760b408f1fabcb83d831f986c22ed8bcbae972029c10caa1f5d2aed4b9c48cdc587a47a3544dc0
-EBUILD rss2email-3.11.ebuild 755 BLAKE2B 817ea1f2e4a551d709951a269114cd1be122af38f35de07e0e1a1d94581430b4c236fc5be58f085fd13ff9850b5aa5ffc08d83321dd75eb372d729c987070e48 SHA512 2a69931b3803c53dd16060ea04534ca57b37a4da07d6c59071fb4ce48caf4ffd4f9438c1ea1a6f4a3d66e34d28980a87af15a109cda135bff936972c14694307
 EBUILD rss2email-3.12.1.ebuild 668 BLAKE2B 3ec18a77a6e2f57d6e815e6686338131fd240e240b4192ac162d6c862aea9d0baccbed42f29236841bf76746c91f7df5af71a7606b981cbcd6d6c085f9bc528e SHA512 ead1bbbba4c49e17ff3d58565c8999c2057790a585a3939a0ad6b100acb824554a0f52268fa9e2cb09293b6b26f49e179c8d3d79022b56e6895555253d1f29c1
-EBUILD rss2email-3.12.2.ebuild 668 BLAKE2B 3ec18a77a6e2f57d6e815e6686338131fd240e240b4192ac162d6c862aea9d0baccbed42f29236841bf76746c91f7df5af71a7606b981cbcd6d6c085f9bc528e SHA512 ead1bbbba4c49e17ff3d58565c8999c2057790a585a3939a0ad6b100acb824554a0f52268fa9e2cb09293b6b26f49e179c8d3d79022b56e6895555253d1f29c1
+EBUILD rss2email-3.12.2.ebuild 666 BLAKE2B 7d3fcdf43282a0a4414ad25803832c84772317124315d319fbb8a14023918124a367545bf1726b3947bce3ed88beffde4e432de6b6cb6b023f990ff41d426703 SHA512 cf4ed8a443faae5504893b6410e6c3d8384204940799010b75e1d7094b85db5be991c35a465e6c71763ffc84de0109c94d1ac231058d9e908c79ab7d73734fcc
 MISC metadata.xml 435 BLAKE2B 92960d2f537c61ec2639907d5d2071d06ef3b29a49a70b8cf69dc3625d358e015cfd6bed1c735713d44c780de43d75082d1df133540ef4da38f996f44bcd31dd SHA512 2b7d4a2bafc039030ae131a0c567a782488a6d5b225fe0b0b62f2ffe9852c2006ce377b5cc05407503dc01ed427a8c8be4853d5c03902708f38841df24c9fcd8
diff --git a/net-mail/rss2email/rss2email-3.11.ebuild b/net-mail/rss2email/rss2email-3.11.ebuild
deleted file mode 100644
index 48a91c06a6cc..000000000000
--- a/net-mail/rss2email/rss2email-3.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Support for 3.7 needs support from dependencies, first
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A python script that converts RSS/Atom newsfeeds to email"
-HOMEPAGE="https://github.com/rss2email/rss2email"
-SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="<dev-python/feedparser-6[${PYTHON_USEDEP}]
-	>=dev-python/html2text-3.01[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	distutils-r1_src_install
-	doman r2e.1
-}
diff --git a/net-mail/rss2email/rss2email-3.12.2.ebuild b/net-mail/rss2email/rss2email-3.12.2.ebuild
index 0d679cf6d547..fe48fe281661 100644
--- a/net-mail/rss2email/rss2email-3.12.2.ebuild
+++ b/net-mail/rss2email/rss2email-3.12.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="<dev-python/feedparser-6[${PYTHON_USEDEP}]
diff --git a/net-mail/swaks/Manifest b/net-mail/swaks/Manifest
index 56012b0fba92..b25a126a1caa 100644
--- a/net-mail/swaks/Manifest
+++ b/net-mail/swaks/Manifest
@@ -1,6 +1,3 @@
-AUX swaks-perl-5.18.patch 2139 BLAKE2B 03501cda36503a966a1d1d50b94b054d2aaa1584566a64a7e393e4d81fd0f8e456734e0b787723e7aec5caa55b08ab264da897b7bb8ead351250c7402e73e361 SHA512 f5d507e2b2812776f4a35e66a3ace3a9edb3d3c50fc7734304d48a278aa7c3fe725f363d14c61442d11a07e8266bab8ce486c4c9eaae2c5ec7e93484c5ffcb53
-DIST swaks-20190914.0.tar.gz 120803 BLAKE2B 68731c22fbff5ece5c9589c3767afd6aa4fc781df8c6124a0f57d48a3dff8def31ccae1b043e78f7c066194cfe480a0edeb16e43fcd5e1b1aa75b05e65a2367e SHA512 3167435a73e7729d090cba2431d5828895c25154c36d92e0ebecd5c4e2430ca596d62bb3e6eb3b65eadabd52c8331fe3bb8a492cce3ad247fa113c0af9c67339
 DIST swaks-20201014.0.tar.gz 110953 BLAKE2B 8dd2c681c6c1e66b76bda71f0bc8b88e658565b28c29ae9f02e5c27500619598e5817a442aa82c48fd90be80cd2dc54eda8390ad3d1cb2e00163cc07a526f463 SHA512 8a4e8dc810a9c5943afdbc4db7130e110c42e211d6927ce1cdbab6f81fa49c31490e6c3668ec3cea79580c07b281ce30901b3b4a71325951167158cc9d70d9cc
-EBUILD swaks-20190914.0.ebuild 893 BLAKE2B 40594f87773d93f89871ab6b23342877e8e5dcf53b497a024499e8222315c2b5cf55b63de7e6e2549a7369ff9df694057f33f34a2a1e99f2c33699c587118dde SHA512 8836c89d2cfb902ce75ebd9d95681b73729e43ed83eb9763227a0f082430383b8d265e346943c341558669b1741d3f7964a11aa056221ec1e93cd612ec04d540
 EBUILD swaks-20201014.0.ebuild 1093 BLAKE2B 6cab8f15bd25d724724dc17995402054fc339828506904ddfb530ffb28d133c40fddc8cc0cbc03f01fab81267338a299da4ee1e76685246f505a5d2c5455a749 SHA512 4b3f55db68d265f035ade639e91714ffc43a11f9a9a7c120fb7cba6088fe5730f3c7a9fd024d536e023234c791c741b611a7d4aa8380c13a2d77e83977d6409a
 MISC metadata.xml 540 BLAKE2B a3271dc0ad82899ef2945c3d42eb2030f08f47d7ae8633d89fe03edfe6b26f36eee4c7da193730360a7e54fae8d1c853cd24012024f33a96debe34330877737e SHA512 a0275812c2941b91adb18befe36ffe5e87a2d4dad904b3c7988e88f0b9252105d4bd35a18259c0c777a5f533632e1d2bbeb28298b0c97e69ddcc902e4919167c
diff --git a/net-mail/swaks/files/swaks-perl-5.18.patch b/net-mail/swaks/files/swaks-perl-5.18.patch
deleted file mode 100644
index 3fd89341474e..000000000000
--- a/net-mail/swaks/files/swaks-perl-5.18.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- swaks-20130209.0.orig/doc/ref.pod	2014-04-02 19:30:12.742814178 +0300
-+++ swaks-20130209.0.orig/doc/ref.pod	2014-04-02 19:31:49.135105112 +0300
-@@ -824,83 +824,83 @@ 
- 
- =over 4
- 
--=item 0
-+=item C<0>
- 
- no errors occurred
- 
--=item 1
-+=item C<1>
- 
- error parsing command line options
- 
--=item 2
-+=item C<2>
- 
- error connecting to remote server
- 
--=item 3
-+=item C<3>
- 
- unknown connection type
- 
--=item 4
-+=item C<4>
- 
- while running with connection type of "pipe", fatal problem writing to or reading from the child process
- 
--=item 5
-+=item C<5>
- 
- while running with connection type of "pipe", child process died unexpectedly.  This can mean that the program specified with --pipe doesn't exist.
- 
--=item 6
-+=item C<6>
- 
- Connection closed unexpectedly.  If the close is detected in response to the 'QUIT' swaks sends following an unexpected response, the error code for that unexpected response is used instead.  For instance, if a mail server returns a 550 response to a MAIL FROM: and then immediately closes the connection, swaks detects that the connection is closed, but uses the more specific exit code 23 to detail the nature of the failure.  If instead the server return a 250 code and then immediately closes the connection, swaks will use the exit code 6 because there is not a more specific exit code.
- 
--=item 10
-+=item C<10>
- 
- error in prerequisites (needed module not available)
- 
--=item 21
-+=item C<21>
- 
- error reading initial banner from server
- 
--=item 22
-+=item C<22>
- 
- error in HELO transaction
- 
--=item 23
-+=item C<23>
- 
- error in MAIL transaction
- 
--=item 24
-+=item C<24>
- 
- no RCPTs accepted
- 
--=item 25
-+=item C<25>
- 
- server returned error to DATA request
- 
--=item 26
-+=item C<26>
- 
- server did not accept mail following data
- 
--=item 27
-+=item C<27>
- 
- server returned error after normal-session quit request
- 
--=item 28
-+=item C<28>
- 
- error in AUTH transaction
- 
--=item 29
-+=item C<29>
- 
- error in TLS transaction
- 
--=item 32
-+=item C<32>
- 
- error in EHLO following TLS negotiation
- 
--=item 33
-+=item C<33>
- 
- error in XCLIENT transaction
- 
--=item 34
-+=item C<34>
- 
- error in EHLO following XCLIENT
- 
diff --git a/net-mail/swaks/swaks-20190914.0.ebuild b/net-mail/swaks/swaks-20190914.0.ebuild
deleted file mode 100644
index 13065ec2350a..000000000000
--- a/net-mail/swaks/swaks-20190914.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Swiss Army Knife SMTP; Command line SMTP testing, including TLS and AUTH"
-HOMEPAGE="https://www.jetmore.org/john/code/swaks"
-SRC_URI="https://www.jetmore.org/john/code/swaks/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="ssl"
-
-DEPEND=">=dev-lang/perl-5.8.8"
-
-RDEPEND="${DEPEND}
-		>=dev-perl/Net-DNS-0.65
-		ssl? ( >=dev-perl/Net-SSLeay-1.35 )
-		>=virtual/perl-MIME-Base64-3.07
-		>=virtual/perl-Digest-MD5-2.39
-		>=virtual/perl-Time-HiRes-1.97
-		>=virtual/perl-Time-Local-1.19
-		>=dev-perl/Authen-NTLM-1.02
-		>=dev-perl/Authen-DigestMD5-0.04
-		virtual/perl-Digest-SHA"
-
-src_compile() {
-	/usr/bin/pod2man -s 1 doc/ref.pod swaks.1 || die "man page compulation failed"
-}
-
-src_install() {
-	dobin swaks
-	doman swaks.1
-	dodoc README.txt doc/*.txt
-}