gentoo resync : 25.04.2020

36 files changed, 238 insertions, 133 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 1ba3ff332e97..0247604ec00d 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/automx/Manifest b/net-mail/automx/Manifest
deleted file mode 100644
index 5d7ac0fca16b..000000000000
--- a/net-mail/automx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST automx-0.10.2.tgz 410456 BLAKE2B 8ea2b84a2934d1cb6b97161906ae071e38729c5d297ace5b5874bba8d8a695fe0edf5023c3429cd9f510373286880e977f649861efefea7bdbd61e88d63420f0 SHA512 88f844d70439985dd55cc694a58bc1fe313162ba47c7675fb15143c107d76974eee043faf5715d7ba9a5918686d491f5efabe9785e90cf399492871f08b2e38d
-EBUILD automx-0.10.2-r3.ebuild 1542 BLAKE2B bee9cc4dc2539d2bc2f7cb0fa9010d6d07f57c2f481bc466c88ec9af9d1aa07eeca6fdb2b21c651e538a828dfb7e75a333d6853d70162e9d1a8709e2203de3a9 SHA512 f738234a4297527a7794e7ca418f3d664d1dd3f1f1893edaa3ee7cc8f889610777dcfed539ab83f5129b100767193c2b096997a94207c1bd4ec801cbf1b04a90
-MISC metadata.xml 538 BLAKE2B 0a90c652c721d0ebda9b6359d0325ed40c8a356b6dada77c550b7f184a3073584c2e232ebab9c8be58f13ba1d93294479528128397a459281236cb4401f5ada4 SHA512 851cb5d749750e3c8b360248d32bdf5c7c5fa626ff329e5104f0e9f8f639a42df12d36ddd93b6cb962567094fa1150666900491b8bcb906aadd427c38fa2c5f2
diff --git a/net-mail/automx/automx-0.10.2-r3.ebuild b/net-mail/automx/automx-0.10.2-r3.ebuild
deleted file mode 100644
index 6c1f32ad9c3a..000000000000
--- a/net-mail/automx/automx-0.10.2-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="A mail user agent auto configuration service"
-HOMEPAGE="http://www.automx.org"
-SRC_URI="https://github.com/sys4/${PN}/archive/v${PV}.tar.gz -> automx-${PV}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ldap memcached sql +tools"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		dev-python/m2crypto[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-		|| ( www-apache/mod_wsgi[${PYTHON_MULTI_USEDEP}] www-servers/uwsgi )
-		ldap? ( dev-python/python-ldap[${PYTHON_MULTI_USEDEP}]  )
-		memcached? ( dev-python/python-memcached[${PYTHON_MULTI_USEDEP}] )
-		sql? ( dev-python/sqlalchemy[${PYTHON_MULTI_USEDEP}] )
-	')
-	tools? ( net-dns/bind-tools net-misc/wget )
-	"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	sed -i '/py_modules=/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	DOCS=( INSTALL CREDITS CHANGES BASIC_CONFIGURATION_README )
-	HTML_DOCS=( doc/html/. )
-
-	distutils-r1_python_install_all
-
-	docinto examples
-	dodoc src/conf/*example*
-
-	doman doc/man/man5/*
-
-	if use tools; then
-		dobin src/automx-test
-		doman doc/man/man1/automx-test.1
-	fi
-
-	exeinto /usr/lib/${PN}
-	doexe src/automx_wsgi.py
-}
-
-pkg_postinst() {
-	echo
-	einfo "See /usr/share/doc/${PF}/INSTALL.bz2 for setup instructions"
-	echo
-}
diff --git a/net-mail/automx/metadata.xml b/net-mail/automx/metadata.xml
deleted file mode 100644
index cbe246cebd3a..000000000000
--- a/net-mail/automx/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>mschiff@gentoo.org</email>
-    <name>Marc Schiffbauer</name>
-  </maintainer>
-  <use>
-    <flag name="memcached">Enable memcached support</flag>
-    <flag name="sql">Enable support for SQL backends</flag>
-    <flag name="tools">Install additional automx-test tool</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">sys4/automx</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-mail/b4/Manifest b/net-mail/b4/Manifest
index a05a8f2daeaa..8b0699c27cd3 100644
--- a/net-mail/b4/Manifest
+++ b/net-mail/b4/Manifest
@@ -1,3 +1,3 @@
-DIST b4-0.3.7.tar.gz 34132 BLAKE2B 56bfdb7069d5b9fe5afa8409f106b5c0b74929a96cf322584181a37f5d396ff86ed42f7dec835980fa544ef7ebe04430b71c0e248d2b41f164996d46a872ca13 SHA512 231590b02bd8d818a60b2d5e5de2e89918fb71e7bb4de95c83cce618e5fff2f5768acb84dd485551a95dc9b4db638d580e11cc805664d9842480433f6a7858f8
-EBUILD b4-0.3.7.ebuild 460 BLAKE2B 718b04a4eeb87022e3286d553221e321adc8b7b08afe1fd3c50aad943666895418439c72b7e5155c2c1c7e20f09f4f60d04b856a96ed046b52fd9d2f30863b8a SHA512 79b6df9e461f7c045abc88aac2abd9bacd96c6b16f5aec8bcf9e14b73b68c536acf6103b76d3b006253290890f752da04ef505a80dee4ed27898455f227f47aa
+DIST b4-0.4.0.tar.gz 47904 BLAKE2B 4e5b59fab3b05b2641691e81d12a48cdf68fd9344e39df68c10c8613084807dda49f8ca08e7f60bd6bfb833054a350b9f4ee7047e45a8fe7354413d73be04a54 SHA512 7d78b8b67d9da9cec60e2e45a53520fb00746d78d5b5fb480e025b3fd98ddfa42e54c34eaafa20e88d80525a820fb5919d3ec4215846d47ec5d4558d906d6c4c
+EBUILD b4-0.4.0.ebuild 460 BLAKE2B 718b04a4eeb87022e3286d553221e321adc8b7b08afe1fd3c50aad943666895418439c72b7e5155c2c1c7e20f09f4f60d04b856a96ed046b52fd9d2f30863b8a SHA512 79b6df9e461f7c045abc88aac2abd9bacd96c6b16f5aec8bcf9e14b73b68c536acf6103b76d3b006253290890f752da04ef505a80dee4ed27898455f227f47aa
 MISC metadata.xml 244 BLAKE2B 2ac557d4fb04230c7b4f706b52203ab6dc62d90aebc8e916561e6e3f6e41bf61bac231a0e7afe07fb18752177c6163b79fee124a171c3e8933041f4648db3a22 SHA512 da08729fbf0eceb858cadc8413dd857600ab595860ca483054e4d1422e3cacc52ce94f89d633a25c25d6b30df4a48ac7de011731418072238adb43bc8e7b3f3f
diff --git a/net-mail/b4/b4-0.3.7.ebuild b/net-mail/b4/b4-0.4.0.ebuild
index 211469b6276f..211469b6276f 100644
--- a/net-mail/b4/b4-0.3.7.ebuild
+++ b/net-mail/b4/b4-0.4.0.ebuild
diff --git a/net-mail/checkpassword/Manifest b/net-mail/checkpassword/Manifest
index edf98fd98268..2bd1ccab8c7b 100644
--- a/net-mail/checkpassword/Manifest
+++ b/net-mail/checkpassword/Manifest
@@ -2,5 +2,5 @@ AUX checkpassword-0.90-errno.patch 242 BLAKE2B 6707ecdb11de768738d99f4800e22f0b7
 AUX checkpassword-0.90-exit.patch 294 BLAKE2B f53db5be00b507847a452074f923ae2b03b803b170cda09151c8496a420ad7cb12a65404fad29b1f946c8a6f9bfd039f78334c93289fa2a56c86f5707d94b9dd SHA512 18935a04c6fb273ed5e813b2e4af65ff2c65bce8c7d45e93a28fe59068ba50fd7999c7f01c50834354ce3b79968e773a99e9e402b023f01bdb7183650cb50bd5
 AUX checkpassword-0.90-headers.patch 3104 BLAKE2B 4b704b7be3580e87e75968ca4ec235c88ef63ae106068263c40eba929924d8b89792b612969acb0a64ffaa9078de6f29be5eb98da625fae9d0a1983d52fd70ba SHA512 f8e99c0da9baeb43085cdddd97322e42ca6ea56aa45059f1f7f148e9df65274d3a435f539aee3f603484cb89bc388ef52f10bce08f0442991a685d18e49584f2
 DIST checkpassword-0.90.tar.gz 15631 BLAKE2B e37f6d08c8a8d487705bd9260d2c3370798697af16f50856ede26866248bbdda2719a24077423d7c9f060053074d34b5ec47d064328f903eddce3fa262f3c559 SHA512 301d574c9f2c4c7fef6afb98818f424a43f644e456c6268234e73da898710b0f4b6797a80d240c270c5319398574349bedf6a2c9757e432f293f85ec8c01f51f
-EBUILD checkpassword-0.90-r4.ebuild 902 BLAKE2B 7907afe8604f38d56732b51221d8c1efac4b84c0969dfbae3108ce1374d94d7a34788e126ccf585594f94bc5d57559ca7c2bf9e22434bce90bcc5ed18ec1bfa0 SHA512 799ae8272eeb619059fc68a57e855830591b420775fe1591d851c063a57508d761dfbcfcb29fee8b8bd770431dad757a7fae99e73ec5ca5fa75a55eac5271c08
+EBUILD checkpassword-0.90-r4.ebuild 903 BLAKE2B 5b8b2b8dd870e44396bd8a4071dcfd36cdd255435a42b055ac6172838cc1c68118c0f543e5bfecd811c4eed1c2ee97905479060374f9cb77b35af23b7ae9de0d SHA512 7ddb1cf0e0bccaa6114d6041344e5407520ec5461ced1801225ac2973b4c3e891c8d93ddcbed47fa8b1e0e851a485c761a6695adb39b6dc360ad3848320479e5
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
index 5c66a9b552db..5020585a2677 100644
--- a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
+++ b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cr.yp.to/checkpwd/${P}.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="static"
 RESTRICT="mirror bindist"
 
diff --git a/net-mail/dot-forward/Manifest b/net-mail/dot-forward/Manifest
index 4d2872b537b3..101da73d268c 100644
--- a/net-mail/dot-forward/Manifest
+++ b/net-mail/dot-forward/Manifest
@@ -1,4 +1,4 @@
 AUX 0.71-errno.patch 242 BLAKE2B 1494fa86bb59202e9e0c85d9f81a249b767d90c8e4a2aa59dd78d7a5dbd488c599bd18bc15e3e36e4a50ea156c77614eaa4f507b968b6906699fe40f958cd295 SHA512 0576644a2820a42cac44be9ba564b5043245cdb192a50115bafc871e3306945a657440c7e74d6a83796a33b964269f60ab1b3345b65cdc5ff2342e4f2cbaf9ab
 DIST dot-forward-0.71.tar.gz 26352 BLAKE2B 9757d07adc796ad35c6426eed3c53eb87f784a1035ad6569a8130e62a04665bb9ac03c250be0e5cb22f122c7204197f736dfc748d468c980814d23bb7ad0069d SHA512 f37a30eabf3a7e7258bfbe9178218d053a5164a9698fbc34954eb8bd588fe2bbf61ffd85f5b817e3ce65d7c0efac1735b59b11faa4d425e2df4089769af94b8b
-EBUILD dot-forward-0.71-r4.ebuild 880 BLAKE2B 6ec607880e2f513be8e9cc33a9f435aaed2ae044e17afea98267a431c143bdca5e6652f6387d25051178d65bb89a9c5aed70805668fa88fd9da693b176870d58 SHA512 44bf93cb9b74811bde56f13a077917d416b9ee061c782f5938f2a4fbee9034b7334768f25b037821fb96e4f4ffed2d6131172a5d89334ee347032607934047e6
+EBUILD dot-forward-0.71-r4.ebuild 881 BLAKE2B f9b8c17251523c664db40cd8eea21ca5bdf7867bdb20bf8f4a73486dca1c530f28d271440a2c681c7fd246b96d3ee4e58e9d46bbcbb86331957042d3ff1c1ae2 SHA512 7d953f2b5aa94e94ecb8a369bb9d46e27cc8898683ee582f49ac52b8d96051ba0dac68b3200d73f8f1d1fd14be8ae1031be86808f020e2021480fdb7d4e9dfc7
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/dot-forward/dot-forward-0.71-r4.ebuild b/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
index 7749798e0210..1702c556f970 100644
--- a/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
+++ b/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 # See bug 97850
diff --git a/net-mail/mailgraph/Manifest b/net-mail/mailgraph/Manifest
index f67433a33dbf..6aa9446334d0 100644
--- a/net-mail/mailgraph/Manifest
+++ b/net-mail/mailgraph/Manifest
@@ -2,5 +2,5 @@ AUX mailgraph.confd-new 646 BLAKE2B 8c6c55b46340f2909308350c944d4f07ece13da35748
 AUX mailgraph.initd-new 984 BLAKE2B ea3a6eac4eb9694dc48f33365eb846cfbd3f9f75eedae1dd62f05ad355c6cfc8136b899e7f045440700fe3c10a478dae2eb888e876767b1fc135c3bef32c9822 SHA512 e859488178bbb3f229a86f0f61bf0537664c1f6fd0761195e0111458671d8dc69998dad206f629e0dbe9c82248186075655a522b16b969ffd1c50d8ba825d3f1
 AUX mailgraph.logrotate-new 773 BLAKE2B 392128208bb8209e93d8802f133cb7b8f3ac0a6ae4453469da1cb3152820910de6b1a4b465166da3c2976faaf06c603cdf453ec9c53aba037bfa5eef4169b46a SHA512 a8fde20eb24964a0ab7efbe5e6ce0adc02e0d91daee519f4dd70049ac2f92fb53f63322128ae8716b64fb1aa28b7a2c55a8c647028ac73aff1687ad312d20baa
 DIST mailgraph-1.14.tar.gz 22014 BLAKE2B a4d72a557bc7718576d85aed930a0037cb7d83edcba62397d6e9a51ec7967c6ffdf6d310e6bf9b881839313ed4cf1969e40eae1a923bbae45ac71b9593f1805f SHA512 3df0dae010ad166a157eb34a8b1fcf837ab42445d417855ea58937a75b74ca55c06044eefb6077a6117073c39a087bcdf5f58fe35c0e4d9c7d6b18bded7a0193
-EBUILD mailgraph-1.14-r2.ebuild 3724 BLAKE2B 58e85eb39a3a2e96b1ed53b4099c81e75524f0ae1992e5b1c04bde5aef5bb86e45a94cec41a41c488b4721147249ea950eb12d78faf5a91461d5f87d36e7ad0e SHA512 77484eaf2c63041bc780c18dd0120eaea06035c74526caba3b553f56fdb61189be6d13bfb5b3cc13ee059740f6bb9ae0cfef44f8de9cd80e7145abf9f4e6cedd
+EBUILD mailgraph-1.14-r2.ebuild 3340 BLAKE2B a21f4665d70ac4c1504c7a34b248c8a8ecacbf4743d184a6db3618ffc98ddcccaefee8ce7645a0fa9588d5d6bdbfded8813051d65059f1c5c3400814a17e703d SHA512 1aa3f3a13e8767709c4bd75a9a40e3cac6209b7e55854a80086e3ef234eb8ad65a79fecb9f3142d64610b31ead947e02d143b66da5e5e659ebe4a6ffc7a995c3
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/net-mail/mailgraph/mailgraph-1.14-r2.ebuild b/net-mail/mailgraph/mailgraph-1.14-r2.ebuild
index 732d4934e48d..9d60fa3552b1 100644
--- a/net-mail/mailgraph/mailgraph-1.14-r2.ebuild
+++ b/net-mail/mailgraph/mailgraph-1.14-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -75,19 +75,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	# Fix ownerships - previous versions installed these with
-	# root as owner
-	if [[ ${REPLACING_VERSIONS} < 1.13 ]] ; then
-		if [[ -d /var/lib/mailgraph ]] ; then
-			chown mgraph:mgraph /var/lib/mailgraph
-		fi
-		if [[ -d /var/log/mailgraph ]] ; then
-			chown mgraph:adm /var/log/mailgraph
-		fi
-		if [[ -d /var/run/mailgraph ]] ; then
-			chown mgraph:adm /var/run/mailgraph
-		fi
-	fi
 	elog "Mailgraph will run as user mgraph with group adm by default."
 	elog "This can be changed in /etc/conf.d/mailgraph if it doesn't fit."
 	elog "Remember to adjust MG_DAEMON_LOG, MG_DAEMON_PID and MG_DAEMON_RRD"
diff --git a/net-mail/mailshears/Manifest b/net-mail/mailshears/Manifest
index 5efe0e03876e..7d1603dec433 100644
--- a/net-mail/mailshears/Manifest
+++ b/net-mail/mailshears/Manifest
@@ -1,3 +1,3 @@
 DIST mailshears-0.0.3.gem 68608 BLAKE2B 9130661793dff215bf2e4d98574a5a001f48a60dd2fc66475edaf1e381eda4cbcac7687158b2103958bce4954ebe23b8a1398029be779f7c716e33ca95c500b5 SHA512 4adeaf78c610111e6b32f5d5fd090476cec228a89462d6f70f0360d4492e08c49f672051b2520a98b07958b865b28593c31f595e4283c334eb97eab1d7c3e5aa
-EBUILD mailshears-0.0.3-r1.ebuild 664 BLAKE2B 9bfe2663b753bcfa6d47b940d0dce192f686cb37dd71c11c891053435423dd9a526738d767db52490b0adfdae5007677cce5b78335665dfef8df27f0ea2f7ab5 SHA512 da8f81879a0acc81b702a0a6f9f2234340984c827cb756fa6eaa954103883eaddabc393672f12dfd97ff276b1bab13d8291bec807252561da6673debcb58f5ca
+EBUILD mailshears-0.0.3-r2.ebuild 661 BLAKE2B 3b80fd9612aaa9f3bbd21cf183f09fc89d557ae8dd06c6db1d4ede2646af8504bd71ece2f13f7adcea8cc3d5f9f4ba3691a9cc7d3f896cc860f284e10385f9eb SHA512 88f545b9bf52531d74dedc2e5c7d9475bbdfeac0d81c7ef51abfab91dc4db32a75a9a50662d38f488ff4b7fcce38431f478562c61692160c7c14bf144c4bf4bd
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/net-mail/mailshears/mailshears-0.0.3-r1.ebuild b/net-mail/mailshears/mailshears-0.0.3-r2.ebuild
index bd4f4aeb5b6e..3528190a0c78 100644
--- a/net-mail/mailshears/mailshears-0.0.3-r1.ebuild
+++ b/net-mail/mailshears/mailshears-0.0.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby24 ruby25"
 
 # The tests are dangerous and shouldn't be run by anyone!
 # They mess with your local postgres databases.
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 49553e8acff4..d95d6a9604ae 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -4,9 +4,11 @@ DIST mu-0.9.18.tar.gz 2250319 BLAKE2B 7eb83a797eccff706ac6b264a7d56feae80e40f370
 DIST mu-1.0.tar.gz 2273670 BLAKE2B a771b00159142fa4a671d07cf9de6f0f941c432ddee31f19606c260ba3dfef857a36a333f5ede4ca30be88d7b7eae28e996e15a8deebd96971b341f0f72bfbbb SHA512 49b0b86f22e9a6ace1fc3fd6e7a8a523aa9edf092b953d59f59a1ef7311c8c546a261a1a186e3285cea788be20c816c70ac08d1514f700ff97258a2012ad394d
 DIST mu-1.3.5.tar.gz 2305222 BLAKE2B ff6025cf053d7c2880855ec32953a2881ce8bc7d468082f13e45e7684dd41bd7906cbc9a619fd27bd4860bb953e4a547c3d22ea9a7fb4c645825c755ee33b5f9 SHA512 5d7eccec296affbe6e2e31d2204672f8ecac43f1a0c93673f983378fcf7ad8a050662097ec58603251eed31b499054d6c453a2a4e2c70dfdd896c430559b95c0
 DIST mu-1.3.6.tar.gz 2305653 BLAKE2B b9a556c1b374e0b72b6b0c40beba581dc3fe0e0a654a881db3a47582481ef00831e18bcd771e24b231ef843e97f14f7401ad8d041c077617b865f1fa971d1a0f SHA512 c889dc3fc1b7f1333f2adc3891f23ea8977c77ac6af532fec37c6570b4fbb2ce8dda0776568d61dedfa34f0519bb5bba89b90002503c3191a0d633ecfb9d5c87
-EBUILD mu-0.9.18-r3.ebuild 1773 BLAKE2B c11a826bcf373fa116b225a9e84505b56129e8e3ac1b12dfb8946eef21ac062a854be111f871e7a835959cfdcc7b766950fb41ce49986ba12f850f3185805453 SHA512 cef4a8ccf07a5cd1181b5ffde3e8ed7d38d37a35af49fc3b38ccacaa7df901983f2b108ba1e72789232321f723cb9d14d450b5efbba52f2a37a3f84bf9d0d358
-EBUILD mu-1.0-r1.ebuild 1776 BLAKE2B 48bdc1543bf0cca1d64e7d63e2e51d5d1b0ac87d5560314bf1548edee12b49c7d073ccf2fc813d0eefd351dd242577b291c18938c84333ba1e90f0925338de8d SHA512 1838adf12f3944ca1402106e210d1459bc19eee5fc28428a9b903e700705842bf084d00f55235ab65d6d7b952822e80df9e151264ab25419f57361fe1117fd48
-EBUILD mu-1.3.5-r1.ebuild 1960 BLAKE2B 721f6f318267d356e987f504f21ced0c96a819e70ad4abcd4b7875f06fe551895592ae403d29600089f0fa58689c5325e564508d8e357c2443b88bc44296006e SHA512 2a0c244fc44c7cc72a9713562c5ff282ca04c5791df5c4a96b5ef587b9f73968698d5ce1574bd68a8f3bbbfb8a711fb21a2b78d5579fe59f144db078a32e774f
-EBUILD mu-1.3.6-r1.ebuild 2027 BLAKE2B 6d1f1ee8e1ec3fb72eee193fe464e641662656ff62f4027be0151f781cc7126c7e49e45dedd5c66d363951a9a51170e886407b5a7b0d42dab28f87ce3baf34d5 SHA512 cd1d7d25e22ae25f2914e255b2a5404ad5bcb4effd53780bf6a774c304938d1b165a0bddc7ca3b03848f31928507bb7a785125c7d0155c76abd08d3ed5d995b7
-EBUILD mu-1.3.6-r2.ebuild 2038 BLAKE2B 2518184e5c7baa06a905db7b843dd5de5dafda4f03bd4b0279a1feb83b8b6f17f7edb04e5e2d49dd8dcf94030191cc2965fa7169e873f6a742d8102b4e30cead SHA512 b2c02b16604bc77a0fdba274b8d66f44f30d3373f6544f8ef43ba3493b42a35ac94f9a999f855df935cbfde38c97930b41146d36af22f290ace5cde2499fd515
+DIST mu-1.4.1.tar.gz 2311134 BLAKE2B 4d44032874217167d46a68b1c837fb443dc860f1eb1f698c08d3731c131e196483028b0eee8bec13bbec71eeab6df1146013beb00b31824630154e14af914c09 SHA512 9a6d20a814f0cdf7c0a04e0e4a22210a12d539d9be713be8f689f2ed3ba39eaf9da7d1969a10f47af1a201cc23e91696e379cfcbd5d6586aea5e83997ba3e043
+EBUILD mu-0.9.18-r3.ebuild 1775 BLAKE2B 87146e9495664d360ccb98a7693e24a7498200cd80c2e565d55f139a3039f7ed48dc448f2c4eb1f14242b6054ba3e696e9b76fb5b7d60d1a86c3bf576ac6e2d4 SHA512 87321aacc6dd25ce0442fe5ef161433bbb039c58b4c4424f94d893377a5f5ff7b4358ffef67162a94544452c2d49e3da6bcdd3799ac1d8ef86fc8263654c71ad
+EBUILD mu-1.0-r1.ebuild 1778 BLAKE2B 85c611bc38bb40c202d3b39fe2d8a2e0fc3ee1c1aa5a45c892d19a0c5986d7cd973f8699f5090c1754220db43c7a9dd0587862112b70cd192a75d16fdc487a8a SHA512 aa0fee0bdd2d8596cd1da4dcc11f70c0e5f73a03007777f36a0367964f8a1aae8cc7200fff1de374f8d7c3f9f8121a173ecda6f6b7f932a3a2ba5bba2c63f7a0
+EBUILD mu-1.3.5-r1.ebuild 1962 BLAKE2B 68dfb86a7ca8877c1ab359f3d82857809c2267aca5c49ef7666d86692f9d23522671cfdd454edb1217c613521ef0576a7053b6d14d64de9b2adc2c21885ea7ff SHA512 0bb512962ab230941b25ad7a962430c3a1c1cf8812405c78bed5cfbb31959aeac176a863b6014ea84acfd73dd14a539d04c2cb7de267ceaa8f41a6ba815b74cb
+EBUILD mu-1.3.6-r1.ebuild 2029 BLAKE2B 06f2f1e5c73faeef1e45e7b3331e1aa6354b092f8d9daa893871aed2d5f301373feb7832229fcd04552cf155863a1c62e74521df1d6d48bff19716a0330b62e6 SHA512 5b32ea81343b7735c48d31cd6eba23f3b865c39e3e181d7268ec17a8ae8f458e7d3bea45195fee30728b8031434ba529e9adfab8b2395c9ea06d57b4c7e56847
+EBUILD mu-1.3.6-r2.ebuild 2040 BLAKE2B 102104b3d404a8b50ee6696baae778b7b3804117882c9c73f1c83e7dcdc813c07b656f6c048c7adf99e4dbb7e4fd46e8453a8b703f811cc0440e454d9712478a SHA512 8e81d83618b663cc894fe8be870a0bb76e0f502e42c08f59a9dd7736fd0b38fda116db2b81e53b826994a63dd3c278221ba2c676b2da270ab1944d72f0b82373
+EBUILD mu-1.4.1.ebuild 1786 BLAKE2B 36766ba266400ab63b36a986f121de47802f9fb46f7fafaab41af1b40ae2cb2c0bfb34edb3cb0f75bbe1926dbdb4f0309afd64c92cb18553711c35b44b96d8aa SHA512 9e89d8989a8c90d2ab14ad99ece718fa78118cbf53563f580be9b67b50700400fb2c96b0e1995390446c5a1f62af28ad926c716a80f5beaf380311c91b123453
 MISC metadata.xml 895 BLAKE2B 2a8d3f5aa6673c03df5bcf495aded3bb07316b4833ed84ec3e2d7030f5cbab8333865da6a4bd67bc8ee69e39bc6540d4a77bd7ddf3b1b9fdd7b5a6dfb7278fe6 SHA512 e5e1e9f3084189fbdbc8fb55127b8b3eec4acd7685b0d4c9ab564644f21fcc53520b89f7ced7bb3972c13d577a030175a9665d30ba513112125409082a7ad7c0
diff --git a/net-mail/mu/mu-0.9.18-r3.ebuild b/net-mail/mu/mu-0.9.18-r3.ebuild
index e8f78f993833..17950a60e941 100644
--- a/net-mail/mu/mu-0.9.18-r3.ebuild
+++ b/net-mail/mu/mu-0.9.18-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools elisp-common
 
 DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="http://www.djcbsoftware.nl/code/mu/"
+HOMEPAGE="https://www.djcbsoftware.nl/code/mu/"
 SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
@@ -60,7 +60,7 @@ 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 "http://www.djcbsoftware.nl/code/mu/mu4e/"
+		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
 	fi
 
 	elog "If you upgrade from an older major version,"
diff --git a/net-mail/mu/mu-1.0-r1.ebuild b/net-mail/mu/mu-1.0-r1.ebuild
index 8a21040cf96c..19409d4bcc32 100644
--- a/net-mail/mu/mu-1.0-r1.ebuild
+++ b/net-mail/mu/mu-1.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools elisp-common
 
 DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="http://www.djcbsoftware.nl/code/mu/"
+HOMEPAGE="https://www.djcbsoftware.nl/code/mu/"
 SRC_URI="https://github.com/djcb/mu/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
@@ -60,7 +60,7 @@ 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 "http://www.djcbsoftware.nl/code/mu/mu4e/"
+		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
 	fi
 
 	elog "If you upgrade from an older major version,"
diff --git a/net-mail/mu/mu-1.3.5-r1.ebuild b/net-mail/mu/mu-1.3.5-r1.ebuild
index 41476616e4fa..e81f2718d2b9 100644
--- a/net-mail/mu/mu-1.3.5-r1.ebuild
+++ b/net-mail/mu/mu-1.3.5-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools elisp-common
 
 DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="http://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+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+"
@@ -69,7 +69,7 @@ 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 "http://www.djcbsoftware.nl/code/mu/mu4e/"
+		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
 	fi
 
 	elog "If you upgrade from an older major version,"
diff --git a/net-mail/mu/mu-1.3.6-r1.ebuild b/net-mail/mu/mu-1.3.6-r1.ebuild
index fdbb2fb3c2bd..bf17204edf7b 100644
--- a/net-mail/mu/mu-1.3.6-r1.ebuild
+++ b/net-mail/mu/mu-1.3.6-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools elisp-common
 
 DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="http://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+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+"
@@ -84,7 +84,7 @@ 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 "http://www.djcbsoftware.nl/code/mu/mu4e/"
+		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
 	fi
 
 	use emacs && elisp-site-regen
diff --git a/net-mail/mu/mu-1.3.6-r2.ebuild b/net-mail/mu/mu-1.3.6-r2.ebuild
index 27f87d5b69a2..c5ec06576a4c 100644
--- a/net-mail/mu/mu-1.3.6-r2.ebuild
+++ b/net-mail/mu/mu-1.3.6-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools elisp-common
 
 DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="http://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+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+"
@@ -84,7 +84,7 @@ 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 "http://www.djcbsoftware.nl/code/mu/mu4e/"
+		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
 	fi
 
 	use emacs && elisp-site-regen
diff --git a/net-mail/mu/mu-1.4.1.ebuild b/net-mail/mu/mu-1.4.1.ebuild
new file mode 100644
index 000000000000..99919703af77
--- /dev/null
+++ b/net-mail/mu/mu-1.4.1.ebuild
@@ -0,0 +1,91 @@
+# 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/postfix-logwatch/Manifest b/net-mail/postfix-logwatch/Manifest
index ead631c44908..6f2851d39371 100644
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -1,7 +1,9 @@
 AUX all-server-ports-busy-lines.patch 2510 BLAKE2B 152a38abfc0caff5aaa8bce0a0b0c9adbf259a3317503506ad73a29c85745751960e594efca1d58cf7a39f401a443034ccca1bb8d80bc8bc25fa0b8e215d6602 SHA512 01edf0e1fb6db7799618e9e03f7201470e00a71ca4a43539e6a3555c81bab5846007f140ff868fd48a436c3a7a8f0fe6de70edd285887402fd97edfec636506d
+AUX data-without-valid-rcpt.patch 1054 BLAKE2B d2990e75dcf506672372dcc50ab3a2e817ec330e8aa0021abf1c6158d14b6070860be8efadcf7b488c58245cfd7da15d1428426440663e6f1ab3fc414e24b39c SHA512 11f2b607531716e438d11cabd339622e8ca63efd5884d5ea7cfd9cd43f926762f27a7adc4eb3325f8c2895760fbb368c316ccbb119c6d57d39f4865e1b292a4f
 AUX multi-digit-enhanced-status.patch 1479 BLAKE2B b8364d035aa3662b539523ec63cf6d011ccf33d700cb45382b764342b42680621d1f1f376ecc66c1bbb7321fee1bf06f226a7e21cf7cceaad6048de526edc599 SHA512 6f732591637c5a076532b210a0b9378904609e7927ed5549c1b3e976e45a38e080ed0a754b230d04f4fd0b1904ddc75acd4c420032e23bd663276398cb35a5c7
 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
 EBUILD postfix-logwatch-1.40.03-r3.ebuild 1115 BLAKE2B 916b770926207ceed4a1359e645b2a5b98220d54e6039d6d7e0c95bab88b12f199093f0ef4ec3cb105b900ce09f56b78f9f6ec5693e57938f7e13f12a051ec66 SHA512 75bd802585e67646f40f7d1b2c2cb93e544e46aa1f6d2402783a902d82229e264975ee2ac499beb262be7d6ab28f4df911e51f629acf5ab2b44f18ae3702dac1
+EBUILD postfix-logwatch-1.40.03-r4.ebuild 1162 BLAKE2B 3bddc66b54fee3c83fd1e7140812785ce0f18364014f02f3b23684e204b490e3a333aca361c13e8e7e5b2ad9de514bc893e6b2d06fb4e923ef8ff37a4eb28686 SHA512 f9c98a6ca5e118c72db15b9bc69e4e107eee841ee76df118911bd3935be03ad6e4c002f6354ded0fe9c014e0ffdca907f0059e380ad0592621c73372a22cb2c2
 MISC metadata.xml 304 BLAKE2B 48bc40ba602d100542b0515ce426fdab3846135079ef677b11c2024c14243d0d06ecd543c0040420bddd839c2043ca0de3223cb9a02135b5c398f825beafdaa4 SHA512 6df4937b334df95e1178cd70c594d9ef08e52f5b34f4da0a129cd3586192dabe974623b13b6992021231150e8a70b7c2d68e7b65faea39113efe04f9a2244cb1
diff --git a/net-mail/postfix-logwatch/files/data-without-valid-rcpt.patch b/net-mail/postfix-logwatch/files/data-without-valid-rcpt.patch
new file mode 100644
index 000000000000..4c743a21c17a
--- /dev/null
+++ b/net-mail/postfix-logwatch/files/data-without-valid-rcpt.patch
@@ -0,0 +1,33 @@
+From 891b5ce1780e10cd94d230efacf6e8b5cb33a931 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 15 Apr 2020 08:04:02 -0400
+Subject: [PATCH 1/1] Ignore postscreen "BDAT/DATA without valid RCPT" lines.
+
+Postscreen now emits a notice when clients send BDAT or DATA
+prematurely (after postscreen rejects the recipient):
+
+  DATA without valid RCPT from [192.168.0.1]:48580
+
+These are merely informational, since the connection was rejected for
+some other reason, so this commit ignores them.
+---
+ postfix-logwatch | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/postfix-logwatch b/postfix-logwatch
+index 648ba7a..1b89ad6 100644
+--- a/postfix-logwatch
++++ b/postfix-logwatch
+@@ -4359,7 +4359,8 @@ sub postfix_postscreen {
+       $line =~ /discarding EHLO keywords: / or
+       $line =~ /: discard_mask / or
+       $line =~ /: sq=\d+ cq=\d+ event/ or
+-      $line =~ /: replacing command "/
++      $line =~ /: replacing command "/ or
++      $line =~ /^(DATA|BDAT) without valid RCPT/
+    );
+ 
+ 
+-- 
+2.24.1
+
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild
new file mode 100644
index 000000000000..e4fe1d212ae6
--- /dev/null
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A log analyzer for postfix"
+HOMEPAGE="http://logreporters.sourceforge.net/"
+SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/perl"
+
+PATCHES=(
+	"${FILESDIR}/unescaped-left-brace.patch"
+	"${FILESDIR}/redundant-argument-to-sprintf.patch"
+	"${FILESDIR}/multi-digit-enhanced-status.patch"
+	"${FILESDIR}/all-server-ports-busy-lines.patch"
+	"${FILESDIR}/data-without-valid-rcpt.patch"
+)
+
+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 ${PN}.conf-topn
+	doman ${PN}.1
+	dobin ${PN}
+	insinto /etc
+	doins ${PN}.conf
+}
diff --git a/net-mail/qmail-autoresponder/Manifest b/net-mail/qmail-autoresponder/Manifest
index 540236cf027b..39a7faf73161 100644
--- a/net-mail/qmail-autoresponder/Manifest
+++ b/net-mail/qmail-autoresponder/Manifest
@@ -1,6 +1,6 @@
 AUX qmail-autoresponder-0.97-remove-mysql.h.diff 347 BLAKE2B 9f68bfc64c126d1268630b94f309be16dc8cbc157989c5e3d93b721e4d8f809417d516750db555b99f19f25fc604da59c135855d90dd9017ad3cda6df7ba4f07 SHA512 fa1ae38b8c61c1a67c20653b4e19e48946c140496d7380f918818bc18171de36762c70fc664947a22d0fb479f224d16bb2741374e8813ac46768178e3285f7d5
 DIST qmail-autoresponder-0.97.tar.gz 28158 BLAKE2B b8659f2fd7201a8479b34a43afbbe2efff6a9a72a00167429926564a6323f385b03c3e45c420ac4cea63f52612f9da7acfeacb679f046e1f9019262a9196eb57 SHA512 02bc3afd7a13c9494913986d34c641804c731e26207d32aeff5de36fdbd872d6361872e7ab583d5df1e34fe2a7a35b621337974a2cc71a3283de22f0e6f60916
 DIST qmail-autoresponder-2.0.tar.gz 35463 BLAKE2B 1aa724dd2b0fab0ad62136ea4ef9b65fbb2f3ab567c5dc5676c2be3f52969fa9ebd0b5d0997362a47312efadd97898d56c0721f0f430b51f52cfd6357417fd40 SHA512 d1223b65453cb7c88de5b22a20a961441810e6db1d80ca976599b88cc5771602a678599354b11586e56273c02502b621cfffb610e9ff33632e4a7d7c28766ccb
-EBUILD qmail-autoresponder-0.97-r3.ebuild 1406 BLAKE2B e082b2a9e243a603dfbc6a08fc2e2a9e8fdd0cc2c514c9f7b93c1816c86e139840beb4674196b60b90d75b49aa950c51c738141797efad6b0f820bc89c726c11 SHA512 4666213d742305e2ceef434ee30bf623f2ea973a208e4991e6072a267802cd478d296cf677a8f5d20656010e356c940f967c73369ddfc26eb28c2093e7322c1e
+EBUILD qmail-autoresponder-0.97-r3.ebuild 1407 BLAKE2B 815dde9e572e6307439219800a4f2da49bd8258ae3ba1360866043b3fa0d17efead2c7e6d43d11551b23e2342478634a61173acbccc24ce92f679f6d10710c9f SHA512 915e2bfe77f87b97eb74325f1e3dccbf012bece429dfaed9a83e0285111628e4a80c2a2a2a364d4756b6e7d66b41d69693665191a06f87e7784a32fec754f352
 EBUILD qmail-autoresponder-2.0.ebuild 1017 BLAKE2B 24ae7c5046738aea9bc4064d17fc6afe52c352e6273978d61b9b3950a92a206499c62c68e0744bcf6c98f620532e1a22f7c1a9c05c1270f9ce19870fb0825f2f SHA512 9bf3f1a7d173af62eb4777e33087910ed695088066470fb88e021c6cd808411f35226129ee8984daaa6f155d0ced7c140b8e19b45b5d6bd6bf8dd2ad3544a384
 MISC metadata.xml 415 BLAKE2B ce1cf3c127835055f2555ab5488f2fb9bf9858711fb6e5be022ee924c53876f3baa97c9a71c3f5993ca71ffd9a6caa5c0a5a804a0aa326eaf3293363dfc657c4 SHA512 d0735db9241b2f5c46d4a2f8e1e2d0b2afe8baa94ec633e474a83a61f894146e1727799f9e59d6efb986c207c4cb6893a130424497db132b89ea2ea1a2ebfeef
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
index a3bfc4346de2..64b91b1aebee 100644
--- a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
+++ b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://untroubled.org/qmail-autoresponder/archive/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 hppa ~mips ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86"
 IUSE="mysql"
 
 DEPEND=">=dev-libs/bglibs-1.106
diff --git a/net-mail/qmailadmin/Manifest b/net-mail/qmailadmin/Manifest
index ec36f4942800..39482ed21c7f 100644
--- a/net-mail/qmailadmin/Manifest
+++ b/net-mail/qmailadmin/Manifest
@@ -4,5 +4,5 @@ AUX qmailadmin-1.2.9-maildir.patch 253 BLAKE2B 6da2fb45531cc88a98960b9443ca7dff8
 DIST qmailadmin-1.2.15.tar.gz 385529 BLAKE2B 2bd4f86d157c577f410e44ec8c8c7df25d654b1dbf0621e52c167067bf72ce04bc7b03230c2517e97c14bd4f5bb3354da23d9794faafc7d3d007476c7b98dfdb SHA512 0cf32916bd6ef47fce091d4a92203fb8b80e0c3349cf8af826c047ba778e7992bcb98002023219648c7aa1ab60fbb052d4726f12f44d68647e657fb3760b8347
 DIST qmailadmin-1.2.16.tar.gz 388689 BLAKE2B 713fbf862eb19940801394b85371f7249ab31528891356b226ba88b55ecd3027f0cdcd08b10a1eb1a4b93355b4bf948dae96d34dbfb3a1df3c3291fe5a8ddb8d SHA512 4afa18461d8bb91e7075f08f00f3e1ef030a01381d049e122d4c234f2b6db9884d4426e9f4c61d5257e55786228741a3b8ded1fbfb925611f536cedb9d61de91
 EBUILD qmailadmin-1.2.15-r1.ebuild 2244 BLAKE2B f9a9a4f884149126b2061040f7722acae7f3da470256746e1d6a48bb996d232c69dd24e62612198057e060a5a16d3d82faf5677257e6a1e4114c9f14b33dbbef SHA512 dd61c3ff20a341597261ce1dbe9dbf0cab6d1b2a166e4451185467d1b95c0581e2b653994b5d6b13bda68bc915fb76e26e9f66d8a6db91706b3b3a1b9bf63d2d
-EBUILD qmailadmin-1.2.16.ebuild 2663 BLAKE2B 91f82efc069931787f207f49560127e69cad63e555a05737aae3ff0381ff045d1c9b8390841afdb22b49e7507d7adf903d5459ff65a1fc0628b18155a3f651e4 SHA512 6e8f6264fce9b3cc0f5699dc23bbd94578a5abb17e1356551db09cfc45774bc51c25c1099d56e8ad90ba48eefdaf75fd85951a3dc0ddc2ce6d2e4df64fb3e75c
+EBUILD qmailadmin-1.2.16.ebuild 2669 BLAKE2B f0e32a6641a57a5b56c670d96ea8ffe65a11c0b693a605b1bc1b5d4a0eb090f60dafde5f299361f8661122fd713cb202dd867386118e63e46a58b15f01967d60 SHA512 4e9b0565bb62bc4f64c6093ab2461c1788f7a59e60364d1e1e34a9deaea8387aefb350826d1b468ad83c92718d967081eb69a6b2c4cbff8a118ce159937fbfbc
 MISC metadata.xml 383 BLAKE2B 7d5f44a77875376d051d96c84e1f33146807299931154722ee05202eb93b31fdac420707de49870fe8e7b94075a82bb70d25c1c3a11c947f4e0de41d01a9c432 SHA512 ee861bd6d5cecd32a6f5dbbacc51d13d0105c83bd9b44f63fe9ec21937b17bb6cbcf27ae202e2b31f60e7e0e79c8810f3c6e63752ee2bef6423520395efa00fa
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
index b474f7e6dbf4..66fd8ab93b3d 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
 IUSE="maildrop"
 # the RESTRICT is because the vpopmail lib directory is locked down
 # and non-root can't access them.
diff --git a/net-mail/queue-fix/Manifest b/net-mail/queue-fix/Manifest
index 33d40a4985b1..0ee00a0f6e01 100644
--- a/net-mail/queue-fix/Manifest
+++ b/net-mail/queue-fix/Manifest
@@ -2,5 +2,5 @@ AUX queue-fix-1.4-errno.patch 505 BLAKE2B 06e1e44c8ca40c0c2594020bb2cde469da1789
 AUX queue-fix-1.4-stdlib.patch 926 BLAKE2B 62e8a37e118d4fa523a2b1c8d0752c0f6d1d82a242660a4246280f3dd74df694905c30ebfe807abf0c4834a391b13a2e5234b9e237bf20987ad438872ee0edd1 SHA512 8e0e021ebab88decd36a0ba2542315e7d3a0ed4ff1d18fc9242790f67a6f2441501d16087307788351d84e64574313fe731bfea968a034551b1086d642572db8
 DIST queue-fix-1.4.tar.gz 18486 BLAKE2B 3999632fb77955782f5bd5da4ee231d68faead75daef293b7cec9da086cb2a69bd8901efba5a3726c9f6047f6ae33060674f110dc479736ba7be8fe8c4253745 SHA512 b7e0ac070a409eff156b3803cc1bb78d1c800ae685d107b872bf5b022a8645d1ca55a5c3380f6bc82e99927df8dbf586b74af587e882938b9a7678b506c600e0
 DIST queue-fix-todo.patch 3056 BLAKE2B 92dae274431dac974e632bec94a1d0b84b652db197d4c80739a3f8da92e9f7f526b59659242456d99060859a35739e4ecfbd4e16d81892acea892de57218eb57 SHA512 78d79f1eaa8492fd9a14dc4a4d2adfaa8c0429a4faec32305f83ea1f16769b8d337fe732adc8cc0c33b909a19617862c9df999f2e938a6b845e15bc49ab5bfbe
-EBUILD queue-fix-1.4-r3.ebuild 978 BLAKE2B edade61b54445d9356d90d1d032b9a962ab339f71f8ae4f5630818ed99d51414b2a0bc8e712f7c01df7febfe2f2554acbd3299c17681a6dd72f461022f684e53 SHA512 6d1c116c4dc8947ba220f70443a8027ae4ed448e4ab719c182495514a2f7c011f837e78ec1d1d5c5eb10d9a07e71442351bdd331b965b5886b1e9fabb9be98b7
+EBUILD queue-fix-1.4-r3.ebuild 979 BLAKE2B 27139bd8cd5280a905a096d8625e90b71b8bbb03288c29dd4cf240a32f3acfcb8df7541c06a081ea5375aa3ed53bd8a08b090a720d296eb4d0c608a41bd845a9 SHA512 e298e41b0242e7fa5cda5ea0942f02f7150ecead30094c25c4ed73e25d899ed89099ed1d0d16f5d6a8b123fbad91a6eb6fa67b1ad13bd3715263a337c2874374
 MISC metadata.xml 523 BLAKE2B e5f67ee8e1333e03d8d205a54afa7cefcdf11f7c4f20cac94d68789fb4d1c90a73d2bdbdccb105cbb8b3737b091a6e4a96570ff0e089983375cd13d7e53b99cd SHA512 52c248a6450ebf03064f844d77465303e851444f2eccd2fab0867dc7d97bf003611c97f8a69634366644e2dbcdb2d8bd1396474ce7a5772e4cb3d8de35590685
diff --git a/net-mail/queue-fix/queue-fix-1.4-r3.ebuild b/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
index 4b826d9dc5cd..87c0144acd47 100644
--- a/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
+++ b/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.netmeridian.com/e-huss/${P}.tar.gz
 
 LICENSE="all-rights-reserved public-domain" # includes code from qmail
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc s390 sparc x86"
 RESTRICT="mirror bindist"
 
 PDEPEND="virtual/qmail"
diff --git a/net-mail/queue-repair/Manifest b/net-mail/queue-repair/Manifest
index 9eba718a66fa..76424acbd577 100644
--- a/net-mail/queue-repair/Manifest
+++ b/net-mail/queue-repair/Manifest
@@ -1,3 +1,3 @@
 DIST queue-repair-0.9.0.tar.gz 13913 BLAKE2B 04935bdb8473bad4d785732eabe2df7bd19d8e7b7364e1be516a8f94c6aee15c6f14bd171be8585f087ba0281281285f0695bb79a90a02519aa252a5884bfd7d SHA512 b7c21de207c80c3f764eddae6e60b4d54869f2037f572f98ff4e0a1e34f55ae1feeab5162b4f0f902a5a3c9d631c687057cdfdc4f646d6843d845f31f5b7bf6f
-EBUILD queue-repair-0.9.0-r1.ebuild 711 BLAKE2B c70bb1a42944959eab3e9c4bfb60a9747536406a0e5c30f6a81e877dde6eb502eaafca614734c2e50cd91e8bef2f29f7b128db30492df652046cbc5a40681b0e SHA512 5caf8d0349ff5f94e148fb32777f4decfb07d0038b4fdfa11f5b49fb5048fe1b1fc361dc157bd41066cdd6485a8da6a51d17717febf1137c93f103ec16747e41
+EBUILD queue-repair-0.9.0-r1.ebuild 712 BLAKE2B 869ab7d7dac0a90708da400c680d206fe619d1798b0e23841922d4d8bb17cba3f8af7552dcccfce09a8c5935663c8a0e25a0d52c926f75b2f40f2bb34698dafb SHA512 ea2eae4c33583966571da8647761f80e6457f5110e1c81f3ac04f31dd4bf093977a456e5ee616c962edc0f107360d645cfc40b0795dee285a56e15cb018d5aed
 MISC metadata.xml 466 BLAKE2B 521a85c974ed87b309ccbcd648599ffa3b20602a61654b164dd2b6b0f5cca7ac97716f211c9cef797604e842d6178c4c8345b2287dff3bac7a4c07072521b1ef SHA512 aa06f7e98e2c8e84edafa0a3662a7aa937389ede576f9fde6ae4ff5994faed83aee61b6f58d4a5b2db0d126a7a7f4b23fc7b4124eb4a5368511ebfa17856b17b
diff --git a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild b/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
index 38693be8d93b..25cd37ddd1f8 100644
--- a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
+++ b/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index 54852a2534de..d7d9e6c41512 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -1,3 +1,4 @@
 DIST rss2email-3.11.tar.gz 66441 BLAKE2B 24be7c4d280e337869833f9fa492186a9f4cc208e9f6152c1d4012edb016993a37cddd991d6211888d6aa7654d66bc79d9d70f1508dae20fa39d79fffeeef55b SHA512 2efdef703a4b4774d85926f500a37689aea3a324f63a13a686a2322c9f69ac7b940c5b953f417d9259e1493b3dafde4c2e1ddb3433d085fb2400cd06001141bb
+EBUILD rss2email-3.11-r1.ebuild 673 BLAKE2B 12f6de4c368cce5d9da091cfd5598fb4a6679ed5563c23bdc7f33447e7fb85355b473999bad02153e72d2a065df43a2ca8e20df2a5fdc799b24d5548bb05a815 SHA512 6a9ed7d1bd25ca563f850afbee7bfed72c34e0b1ce1dcb0cea68dde29723bd448d3afe9c36ba4f405c0a5a69f5f33747d9784cae70e0dde09537c65d3e7174d9
 EBUILD rss2email-3.11.ebuild 760 BLAKE2B 8eb9255668f8f949cd9f8439d40f2577d11ba6b9d6ac0f476adc445fa2a3fadc0c8f34a9ab21b6112271134c744028aad1b553737252e20cf9e9c0a2708c58f9 SHA512 83212470393f2a2368c22c35bb6acf7283cfec1f6fb81834afafec649fb89db11d3b1db0496b420bc0e1d6eb89a4feae0cde960f9144b1ead6dcec18026fdd2c
 MISC metadata.xml 435 BLAKE2B 92960d2f537c61ec2639907d5d2071d06ef3b29a49a70b8cf69dc3625d358e015cfd6bed1c735713d44c780de43d75082d1df133540ef4da38f996f44bcd31dd SHA512 2b7d4a2bafc039030ae131a0c567a782488a6d5b225fe0b0b62f2ffe9852c2006ce377b5cc05407503dc01ed427a8c8be4853d5c03902708f38841df24c9fcd8
diff --git a/net-mail/rss2email/rss2email-3.11-r1.ebuild b/net-mail/rss2email/rss2email-3.11-r1.ebuild
new file mode 100644
index 000000000000..2459d85da411
--- /dev/null
+++ b/net-mail/rss2email/rss2email-3.11-r1.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="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=""
+
+RDEPEND=">=dev-python/feedparser-5.0.1[${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/smtptools/Manifest b/net-mail/smtptools/Manifest
index be807d21e231..d04c17db37f0 100644
--- a/net-mail/smtptools/Manifest
+++ b/net-mail/smtptools/Manifest
@@ -1,5 +1,5 @@
 AUX smtptools-0.2.3-autotools.patch 3951 BLAKE2B d3d60ac0ace9369e66c23487fb2ddddc455b38aa66b69919e360c51ac76eec02359230b73ee300f8bf6a93459e391a2c4bddbc704a5149857862658057994a1e SHA512 3d5984bd432dc6ca7e52a8b7e8cb52e3a77ef7c3d42343388f55d8d71251a4c13fd008c907af735b966672ccdf80e4d4e64de9a64ea6117843556577ea2ddcd2
 AUX smtptools-0.2.3-cleanups.patch 1878 BLAKE2B 6667a9f32632e87e047d87b3ea4f1836908bcfc3f4ddcc7ecc77e9fc176be3644a69a33e10ed1963bd011f254464bb3dc9b0e44e12840266ab79733ab0ff54f0 SHA512 5bd29abde5b8b80c5a1ed688baf9cc3abe9b9516228401e9395f56f8e5af4aa725774128f1571a8e501d305a8c7258122a9bcace716d8f7704f89bf3bb2b34ec
 DIST smtptools-0.2.3.tar.gz 117859 BLAKE2B ca1713dc4ec668de1491423c7463cc21fa460017744c34bf6ac5619294ca6bdcda8b78ab3fcf1b2225c3c3897b7ada89b48ab68defdae28a69543fa713362e87 SHA512 2d5f5a4fc5d25e5b652800047c7dcba62eb033919e485e42efd07be0e00062f9d89200dd0e65991a13b1366b5b28bb5c2d84d0468e71d05d1540178111b3cf2f
-EBUILD smtptools-0.2.3.ebuild 648 BLAKE2B 1e89bf0df2bf61f9f8c65d38be2af703cc4fa0e5e56c11f4093f28f3f9129c9fee8dbfae5c14d81b6644a2b096e2f550918329a0d5f29ebae72a0c4f27b99055 SHA512 fcb3fe2b0ff863d2aa970d7a33c800d913aad612185384e412a792d74fc8e12916943f6b6f92d90fcb1407fe196e0de98ab9d678986913b5f92260bdd15019d4
+EBUILD smtptools-0.2.3.ebuild 649 BLAKE2B bd56d805ec28e88e94c835e531ca848a41750af3feaec27b110b015ad4277ca4f4c45139275eecb4c153133c5005bd2178e8d50133910ff46c81e06072b8d809 SHA512 a2a6a049d54b9d06bd0d96beddb1aece85fb42e70ccb14d9ef5b80813b9c72d1a5076d36b0f0692e04949b9fd56973aac1eb70cf7d6aa7299379320c71e7ec29
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/smtptools/smtptools-0.2.3.ebuild b/net-mail/smtptools/smtptools-0.2.3.ebuild
index 8bf6c953edf5..f5f1dd9f7c5f 100644
--- a/net-mail/smtptools/smtptools-0.2.3.ebuild
+++ b/net-mail/smtptools/smtptools-0.2.3.ebuild
@@ -11,7 +11,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"
 IUSE=""
 
 RDEPEND="!net-mail/qtools"