13 files changed, 88 insertions, 132 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 5fa99e0f4c10..e17b08196f13 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/amavis-logwatch/Manifest b/net-mail/amavis-logwatch/Manifest
index d0a6429c5ee0..a58ba45327f9 100644
--- a/net-mail/amavis-logwatch/Manifest
+++ b/net-mail/amavis-logwatch/Manifest
@@ -10,5 +10,7 @@ AUX unchecked-encrypted.patch 2022 BLAKE2B fc09850f9b4aeeccb5047086ff32add53347c
 AUX unescaped-left-brace.patch 2043 BLAKE2B 4755ef33bbb8961fc69cee4276546724f1fb5e89b92107baa4b2a5a7f1c6b0f611bb24a5184c7657496784343f3b7639dcbe41bdc70d26de4343576c30bebceb SHA512 3e2f18070a76624b260bdb11586abf79ae16f237d0e765a766ce770e35c8aab6afbda58589514b65a3afedfc9104f491c1e69e3201f764b6590b5f34cde9e745
 AUX will-bind-to-lines.patch 1077 BLAKE2B c96651f6a0b68a4b95eb571ecbe7a7002a20b765184d28ea21e32b96dcde67041bb03431674a9f51809a528f20e14e50337d2c1315a6e19f4bf5a2da5bcd11d4 SHA512 60a0844d7a6a17b7c79422e641660e20b69cf89844bcddf3356ff6a60b4c4ff2b2e90206248a5a5771e014edee2917eb47e83276a0e56aeb7f8dfd75d55190f4
 DIST amavis-logwatch-1.51.03.tgz 87304 BLAKE2B 08b49d6f67e406edee062659c6de0a2c5823286bc24db35030c2b63bc3f0a06617eecdcf0da7f1f66d8eda8f9743254aa752ada82a9963bfac76a1a467503344 SHA512 27338abf676f05ec77e3ffb65a1f9ab5274bf8de3ab65fa29d4584ed6fdeedcb85e9e95b124549afdc3fc47780540c1790fa8b273ee296fbd44378d4da450db5
+DIST amavis-logwatch-1.51.04.tar.xz 66036 BLAKE2B da2ae91db65586497e5e5bf53b94f8eab84f26ebbad26f563d14ff11960d5c3bd2e046f0a056c28c53c5ce40c6193a812abb4f93db5d7a18747c40444b954d3f SHA512 aec2f6ccc1af7744364e734e2893adc68e034bfab8c9f96bd32e74c6c947c1b39faef2d442d32e50f2578fbc4687dfd2b339856624330aef64ae6cf4e408456f
 EBUILD amavis-logwatch-1.51.03-r5.ebuild 1419 BLAKE2B 473dacf0d49b067d0a6354c7026f54c9d8d320997ef7f2abeb2b4ac6a42f992235b64b213322f2e28995a1f338b97550a617913f8d84e7542488b351fde689a5 SHA512 bc2bf187d2165207c5ac62964444dcbcc994101bce9baa50dfec1798750bfe53ba2b38c5ef1152950ab2ec4529d08a82665c76dccc4a8f1d0c20ec6c02352fcd
-MISC metadata.xml 296 BLAKE2B 3c33a1b9c58306354a087f04e040a9c1e8cbeb17635a1f64f206de2ce47a226068adad992598588e4d1d916ce5eef5c39b6f3ec95ec92ea6807f6e4186522d71 SHA512 ba96de61eeaec557c21ba83c0701d6b83f0e25752a4b949a2562e3eb4a0ceef44d0029d5a5bf5fed5ff7d9add59b8d40cfeac7a57ec566a48d23dca3c327e720
+EBUILD amavis-logwatch-1.51.04.ebuild 930 BLAKE2B e382e23df0018aa557838f4dc19eb56af29068012b71bc0277aa4649aa37ee2e55cc2b904e5c9b9bcf3f7e640f19dfcdcfef03fa193c2db56e5c30622c059e29 SHA512 dbcbeedc6410db6bf7ca764a22eebe045cb53b1cd1059601c941ca780074058923a5da6545a5c2c85d0a662864160de52d81e3c73189d52cb1e680e59f922d35
+MISC metadata.xml 218 BLAKE2B b55d5b84a56be6911406973def7dcc385581e50dbcd1c4a7cad56fb8e5e6ec2c7ddc153d0fead807dc1cc8336c32a3ad2e414ebed9c4dd295050acd456a6885d SHA512 e143c766598413b2b305475039473345bf7e007d6cb4934dd205384c0a3df9451e780a4294c56126103a883bb904d9a02e06c082176b19a4e388020438d71bcd
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
new file mode 100644
index 000000000000..3369b162db4f
--- /dev/null
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A log analyzer for amavisd-new"
+HOMEPAGE="http://michael.orlitzky.com/code/amavis-logwatch.xhtml"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/perl"
+
+src_prepare() {
+	default
+	# Replace the default config file location with ours.
+	local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
+	local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
+	sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
+		|| die 'failed to update the default config location'
+}
+
+src_compile() {
+	# The default make target just outputs instructions. We don't want
+	# the user to see these, so we avoid the default emake.
+	:
+}
+
+src_install() {
+	dodoc Bugs Changes README
+	doman ${PN}.1
+	dobin ${PN}
+	insinto /etc
+	doins ${PN}.conf
+}
diff --git a/net-mail/amavis-logwatch/metadata.xml b/net-mail/amavis-logwatch/metadata.xml
index 04df72792f2a..a0128bcd9ef0 100644
--- a/net-mail/amavis-logwatch/metadata.xml
+++ b/net-mail/amavis-logwatch/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mjo@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">logreporters</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 05559fa55be1..d6927d0919d0 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -4,10 +4,8 @@ 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.19.tar.xz 1316672 BLAKE2B 679d2c49698dd368d32439a8276412e3f32c0a0f6f0e7607bc323c0294c987307469451b4b085fe521f2d5dd4869d59b4841762b6a57b3c654b992e9de8ba87c SHA512 b10f0ac5b3b22f8b1d86367990fc96ea5c49dc21c873890c732c254c34503bd6ab9348c5ef88b99ba0f83f065fa9f9aead55de9721b0f296efa14eac0311daaf
 DIST fetchmail-6.4.20.tar.xz 1317204 BLAKE2B 85137bdae2fda05cba6e9bee9056bb9a1ef09b96199dc5f991da9aa5c2073f1c8cbf3fae43999a79de338a95e9d28e474035200758b65ffa9fa18b5a905c1279 SHA512 5b170f51a74b6596020282f5cbb34bf0a9ea8c5b089fd8c6c72df6c7742e16bcd5931d62181d56265779f9c3431c4ddf795a03deee09c5552a3aa0601282bd17
-DIST fetchmail-7.0.0-alpha8.tar.xz 1212256 BLAKE2B 1b123921a696e60b9c42ea30a379bc6cf46bb66dd630f50e1f10ceac5066932da9538295954be451c4665e1186b7281523bbae83fb4cdb7ad2d1b7b408a3a38f SHA512 fdb20b6a4723f718958e8c800d5a996ff0bb8d9ffe485e8f8429f28953a5a691fd8439c29cb4fbbae338d64c1e9cd1f5f9ed6d89261d0ca582f6345cacb696fe
-EBUILD fetchmail-6.4.19.ebuild 2411 BLAKE2B 434eb903a6d3664f5ab4aaa98d49e444fec57f732fac15a901d0fc3092514f9efc38f1e216c5a697f75c7a9fddff4e99dbc513780e933b04719cc955d945892a SHA512 721e3a879e4f8d0396665b146ffd7a321bdb091c449706bf1e2759b2b4f1d10e05abf71da640495718c387c92bd1c5404a511aca12307520115a285b4a55cb0f
+DIST fetchmail-7.0.0-alpha9.tar.xz 1213244 BLAKE2B 895fe178993cc34500e276bef5ebe9a4fd81fea522d39fd271433320afc46faa9657d8b85b2d28cd5dbc6d3dbbb233d5eb27d3e26205f5406de9f750c50d7f1b SHA512 7ac1c26edfd2a0d69ba3c1e9f47d96aa48f1cdc10060ff928f952e43141651896f5c5190c41064075fb5c5837516f63d6ff3e7fb0cdc7d389c44b6e39db01d8f
 EBUILD fetchmail-6.4.20.ebuild 2411 BLAKE2B 434eb903a6d3664f5ab4aaa98d49e444fec57f732fac15a901d0fc3092514f9efc38f1e216c5a697f75c7a9fddff4e99dbc513780e933b04719cc955d945892a SHA512 721e3a879e4f8d0396665b146ffd7a321bdb091c449706bf1e2759b2b4f1d10e05abf71da640495718c387c92bd1c5404a511aca12307520115a285b4a55cb0f
-EBUILD fetchmail-7.0.0_alpha8.ebuild 2531 BLAKE2B 51172611a85f880f5b31414471182fbbec13207d30c3a1e7101a62ba56e87d3931fb9aa0e1999ef6caaa736126d16c56df0d8e82cab4231f9fdb74fee9dc3892 SHA512 a82d93629559170b406adddfbed04f93f5a856c92fb409254717c86bb284664c240fc69cb07cd5288afa09e41211b129f38be772045877c67fc8e787875207f2
+EBUILD fetchmail-7.0.0_alpha9.ebuild 2531 BLAKE2B 51172611a85f880f5b31414471182fbbec13207d30c3a1e7101a62ba56e87d3931fb9aa0e1999ef6caaa736126d16c56df0d8e82cab4231f9fdb74fee9dc3892 SHA512 a82d93629559170b406adddfbed04f93f5a856c92fb409254717c86bb284664c240fc69cb07cd5288afa09e41211b129f38be772045877c67fc8e787875207f2
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.19.ebuild b/net-mail/fetchmail/fetchmail-6.4.19.ebuild
deleted file mode 100644
index e2ab38dd186c..000000000000
--- a/net-mail/fetchmail/fetchmail-6.4.19.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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 ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="ssl nls kerberos tk socks"
-REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="acct-user/fetchmail
-	ssl? (
-		>=dev-libs/openssl-1.1.1:=
-	)
-	kerberos? (
-		virtual/krb5
-		>=dev-libs/openssl-1.0.2:=
-	)
-	nls? ( virtual/libintl )
-	!elibc_glibc? ( sys-libs/e2fsprogs-libs )
-	socks? ( net-proxy/dante )
-	tk? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_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() {
-	tmpfiles_process ${PN}.conf
-
-	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-7.0.0_alpha8.ebuild b/net-mail/fetchmail/fetchmail-7.0.0_alpha9.ebuild
index 80f96706c304..80f96706c304 100644
--- a/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild
+++ b/net-mail/fetchmail/fetchmail-7.0.0_alpha9.ebuild
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 9ebf1480cb63..e69189e9f1e1 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -8,6 +8,7 @@ AUX mailutils-3.5-add-include.patch 275 BLAKE2B 2502fb3226bc63ae98d018392fa1107b
 AUX mailutils.rc 258 BLAKE2B 3dc68190e11c8bf5016b0fe8b22c61f79ba7de96a1f230f7d0743ba23fa903cb9f99fac94a7363c7d80b7bbaf76e2d4de848e7ac726642fb23c56caf43a46568 SHA512 691bcc81fd355d8f2776e72006c149996273579e099f24970ff0c5dd6bdf65cd64e31597f8b3d8e0a900a91c3325b8d2a1a96682a9b3ff53acd41218fe8721fe
 AUX pop3d.initd 563 BLAKE2B fd09d7a7499c888eddfb812644102f979c2423e9b1a9f0077655b6ae4c1eb4214f685ef7843e74a808e52ee988cc3fbefa278754db824256a4972c83fc0ada31 SHA512 7847c29a03f21df82d36c077ccb38329457a332cccdfba24bee3b1c9a8170fc71c07ee674408f069693953dd1bf44b8b8f782dcc35d6b16e62f70b2b32ce018f
 DIST mailutils-3.12.tar.xz 3134484 BLAKE2B eac7934e9332482adffa3d4b1574d89a65949644ca8dd14e507e9c5f268d485b97f4d61deadf34b2ddcae1b91deee93372e9ebd53c88a0c0092346a0d83fd67e SHA512 a7d681bc7a763b7f09b704c8a536ea1c2444c52ca736eca321ca72fd32e2e62c0e14687ba79654d9162d45189d0621b1c75c639b81e04a79bbf3b3c09b9cebd2
-EBUILD mailutils-3.12-r2.ebuild 3691 BLAKE2B d2dfeab68b8c1165d6cfee0c9333e99c42499fd9e43475f45fd44338926a1810fdbfa0283f72471148b625b3538605b484618c18e935a109e92064cb15d3b8b3 SHA512 40b34e364f380074a48647e6d897f6f7841dadc3ca7c1723289b11bdabf98f1757b6e990bf4b510b1322dcc943bdaf703ca0e6d5703a4445314c70801671147c
-EBUILD mailutils-3.12-r3.ebuild 3704 BLAKE2B c42084fe3f0993a5e1d4c2dff6086eaa919b2a36fdfc69ea25ba87d6cf883acfbc0ca3b5f250b77c8848bc304a4b4fd7d4ad800ab14213ecf62006d928abb445 SHA512 03aeac5de0343ae0d354e45055188259739a6969f2b76f8b473917d14210f8e96c151e0c7cc2f3db8c062279316ee506b4ec094a44d0da51ff8a15cac6cae659
+DIST mailutils-3.13.tar.xz 3152892 BLAKE2B cd7d9ce0391d85482581eeb52f60fcc175647d21e433a4dacee3547aa4dcd710331ad780b6706c242d1a7501ec7fc50ff0c25f9b5f4ceeed84893c637ca366c1 SHA512 fd0b23aa535c6446af1ae633d68d41d1aa243d489b2623d346f6a0d6b543c43ab6c2b9bb1449d664abacbcd3ec3a0a5e7a0a5d56d2762e8a961544c77ccc592a
+EBUILD mailutils-3.12-r3.ebuild 3703 BLAKE2B e017a2c4b8a2cdfa4a9d93ac16f08a7521f0db1682183adec4a40b258e4af48a320227d4a4114b9bca4b3b41105b06969f0d134326f900cc23fcc99fbe15635f SHA512 b74bd2faaff78dddb92669524ff5a322f4e92006aa429c283e47f7ed5617f7226ce438594d6fa2c9c4f7b8bed73b9271ad6181ce9870cdffa4a628d4ea183c60
+EBUILD mailutils-3.13.ebuild 3585 BLAKE2B 15f56ac88d90c4d266b9ebc6158499c26411056379f93eb50a745aee560ad99ea377a3e12e484717f40766db15780c4b5f8483c09540c0e8e07daa824205aa27 SHA512 fc935ce433e9091198824d10f60ff0b8a8760f98400657fd96019ccb9bd547b9ccaa8805f91bb16a96930202b5ce123ca19901de1270c5d16016fc95899c764b
 MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/mailutils-3.12-r3.ebuild b/net-mail/mailutils/mailutils-3.12-r3.ebuild
index b8efb6324f39..2f5b062735ba 100644
--- a/net-mail/mailutils/mailutils-3.12-r3.ebuild
+++ b/net-mail/mailutils/mailutils-3.12-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
 	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
 	tokyocabinet"
diff --git a/net-mail/mailutils/mailutils-3.12-r2.ebuild b/net-mail/mailutils/mailutils-3.13.ebuild
index 7abe9fabe3e0..823273c3589a 100644
--- a/net-mail/mailutils/mailutils-3.12-r2.ebuild
+++ b/net-mail/mailutils/mailutils-3.13.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
 
@@ -12,15 +12,14 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
 IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
 	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
 	tokyocabinet"
 
-RDEPEND="!mail-client/nmh
+RDEPEND="
 	!mail-filter/libsieve
 	!mail-client/mailx
-	!mail-client/nail
 	sys-libs/ncurses:=
 	sys-libs/readline:=
 	dev-libs/libltdl:0
@@ -43,7 +42,8 @@ RDEPEND="!mail-client/nmh
 	servers? ( virtual/libiconv dev-libs/libunistring:= )
 	ssl? ( net-libs/gnutls:= )
 	tcpd? ( sys-apps/tcp-wrappers )
-	tokyocabinet? ( dev-db/tokyocabinet )"
+	tokyocabinet? ( dev-db/tokyocabinet )
+	"
 
 DEPEND="${RDEPEND}"
 
@@ -55,8 +55,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.5-add-include.patch
-	"${FILESDIR}"/${P}-misssing-endif.patch
-	"${FILESDIR}"/${P}-fix-big-endians.patch
 )
 
 pkg_setup() {
diff --git a/net-mail/postfix-logwatch/Manifest b/net-mail/postfix-logwatch/Manifest
index fa6e618f12d8..ceac90fd5fbe 100644
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -4,5 +4,7 @@ AUX multi-digit-enhanced-status.patch 1479 BLAKE2B b8364d035aa3662b539523ec63cf6
 AUX redundant-argument-to-sprintf.patch 1744 BLAKE2B d251a7e894dd4ebe09d61984a55ad2e7a0771310a88042da952c6e7d13b98952648e2da995e32cac92818e26d2df2e0d83f08a16fed093cfb07fe81187f5aaf6 SHA512 31e35603cee7c51ffe126ba0caeadbbca564694439101d92293d2163d3b674be552ac3e781d4b10fab11435d072bf3bb540e3070bd3a839dd6297fff02cf5b04
 AUX unescaped-left-brace.patch 1277 BLAKE2B 3dc055f3321b958cbe35e0e51336c64e41b4e71e4221ea025c6b4c86eff8af710652ab2f97bde52944ec17ba047039319356b338b10af6594dc50167811535df SHA512 dcfdb1fc7793fcf8a1e41fd890023c901bccff5c241601f99a5aef398fe35c1eae82d786064e189ef2113aad9d2081a67d8451d9c58ceefc78192e22ac5d3033
 DIST postfix-logwatch-1.40.03.tgz 107065 BLAKE2B 153f83c3414d2773ec528260369a564624aacc6de5627ee1da77d1eea89b276fb014c045785bc8ae1fbf7e6da2279a0d309ab171ff55d1087d3379466570c5ea SHA512 7059f409cabb3cb638885342ab876e1c85c87530c3544bf04c54a56707695acdc5cbb706e3f192ef5608c9a00706e4d7be3cc7b32286460719d7b497e44b3341
+DIST postfix-logwatch-1.40.04.tar.xz 78996 BLAKE2B fea2a08a7bc776cf0106a60bc0f86730c562d6c893629a1028183150a246803bda8ada6a5ec7e264685fe40016b82ce4140031af7e508ac4b1d9a34e552b865d SHA512 194917fe4d05e9808893da0c175859e932d5e48956d1dda96129dd5de7f9ee23131ae1831b558c8c2d32d03ffda80aa95cfd5048543b7766a0486a71efa6c19b
 EBUILD postfix-logwatch-1.40.03-r4.ebuild 1160 BLAKE2B 9c269a1abd9c561a8f514ac99e991d57344286705b91cbfa53b464a4267e024442ab324b4973c5962e27bec8da601feb6bf550969bae4fb030d05651642a0e6e SHA512 5c9d736880a06bd66c2ea75827d75610b826392e95573c7b75a654cd613afada7aadcc6bcfa8d0cfe365ade3c5ae7e9944c6c7bb304c4bce657a897220336cfe
-MISC metadata.xml 304 BLAKE2B 48bc40ba602d100542b0515ce426fdab3846135079ef677b11c2024c14243d0d06ecd543c0040420bddd839c2043ca0de3223cb9a02135b5c398f825beafdaa4 SHA512 6df4937b334df95e1178cd70c594d9ef08e52f5b34f4da0a129cd3586192dabe974623b13b6992021231150e8a70b7c2d68e7b65faea39113efe04f9a2244cb1
+EBUILD postfix-logwatch-1.40.04.ebuild 796 BLAKE2B cc8aab5fd6c69efb2c31d14559a48539fcae3cede5659f53f79001d554d55c955b39993fe4dfd69aea7e8c0842e53687a7a285825282a6ae871d05c22cf34b47 SHA512 ea8dbfd64225f7aed6847b46641aff571ed171237845c693b9976d554482043877260f06e8954d7437f6648dbaa0d487ba024f44559536d2fcd17212121816bf
+MISC metadata.xml 218 BLAKE2B b55d5b84a56be6911406973def7dcc385581e50dbcd1c4a7cad56fb8e5e6ec2c7ddc153d0fead807dc1cc8336c32a3ad2e414ebed9c4dd295050acd456a6885d SHA512 e143c766598413b2b305475039473345bf7e007d6cb4934dd205384c0a3df9451e780a4294c56126103a883bb904d9a02e06c082176b19a4e388020438d71bcd
diff --git a/net-mail/postfix-logwatch/metadata.xml b/net-mail/postfix-logwatch/metadata.xml
index c2f0518836b4..a0128bcd9ef0 100644
--- a/net-mail/postfix-logwatch/metadata.xml
+++ b/net-mail/postfix-logwatch/metadata.xml
@@ -4,7 +4,4 @@
   <maintainer type="person">
     <email>mjo@gentoo.org</email>
   </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">logreporters</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild
new file mode 100644
index 000000000000..bab89768c04c
--- /dev/null
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A log analyzer for postfix"
+HOMEPAGE="http://michael.orlitzky.com/code/postfix-logwatch.xhtml"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/perl"
+
+src_prepare() {
+	default
+	# Replace the default config file location with ours.
+	local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
+	local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
+	sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
+		|| die 'failed to update the default config location'
+}
+
+src_install() {
+	dodoc Bugs Changes README ${PN}.conf-topn
+	doman ${PN}.1
+	dobin ${PN}
+	insinto /etc
+	doins ${PN}.conf
+}