gentoo resync : 31.12.2018

31 files changed, 434 insertions, 145 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index f0a63e2da1ef..9748060f19a2 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 54eddf68188e..2a1174a3ba98 100644
--- a/net-mail/amavis-logwatch/Manifest
+++ b/net-mail/amavis-logwatch/Manifest
@@ -1,9 +1,14 @@
+AUX SANITIZED-NULL-bytes-messages.patch 1266 BLAKE2B e0bc9f068071c1adeb22c3f2c4b63a735f1af950bbde7f6f21909e66db36efb4914c86081839cd1e61af345006b9d31c80a2e40ccc456008ed3f4cd6c2971db9 SHA512 fa8cbd9e12a22e0a57c66cfd3a93f653780bc26c0bf15967fc423b34627567f976fbdae46c7e0a42afcbe328c9224e63c204b566f30da03b734aa206828d8413
 AUX file-libmagic-errors.patch 1330 BLAKE2B b21498826fb131bd1fd106c38eefdad35ace6465a026a624ce060d88ced90bee896ec28dac89bd678073911a35e8ee0bce88ee9d223df6186559481ed8a1d407 SHA512 8b2603ef414bd54fc2007bccfe6d12083c95f1f4fd81bdbd0bea4c45e6be57d6f1fd7851587ac95c0be740366f536e04512a2ea5220bf7fdb7e3a6317b0ae177
+AUX ignore-all-sd_notify-lines.patch 1251 BLAKE2B f855f68c90665679f4856bf8d521d26f38991b2f8065b8e25dc0ed141296438badf16aada1d16baeefcb597837d9673592f4b57686615d71fcdf29315f131a93 SHA512 6b575173856e97c551739ca6b90717af52788a65c5deaf8dde3128e3c14c949d7325b2bbe42c5c7ce82f0e873abb7f0559cb14f69d9fb88e0dcab61e165d247f
 AUX ignore-amavis-startup-notifications.patch 939 BLAKE2B ca89982945ab6256fb196f7c96bbd5dbdb655097394a1644fa893a58fc607ccc9a008f093357a66723e96b961caa726bbb5f412efa6004cd0ba073ff0c31afab SHA512 34f23c5ebf9676407cb4c16a6f273e7086de3f90587dd5ab2ecb1f20c035e3940fb3318a696f0d5e8901dad2908ef4d14b4489fcae822c83e4b9470d5d20f869
 AUX ignore-utf8smtp-lines.patch 1141 BLAKE2B c31c8928001ddebfd3542175f618ca0f0d5e92b28f697f6511785677bfc99111ca63827782b09bf23a325e98267856515a90d6bc2a8a22f517875a803794939e SHA512 4de215ca12ce744b0a9e22bd0e56702101b2ae122b342402eea1272b0e893ffe2f9bab2261eb626f5f9f7eb55ba0c527391d629f7dc2ce0faa3834d9c065f461
+AUX no-pid_file-configured.patch 1142 BLAKE2B 9c59e5d3612763a7c42161d93cd61c71081201f954f92c567c39795de176cbad494b2a9302e8db7286f9df488173c2a330745a60236f3ba7e63a6ac0cb80eb4b SHA512 d22fb6d55d36fc14fd5eaf7f2545bbde7150ff243bda3f925b807068fa5a6c22c0eb1096be775044cf912f9187fbfaa64aa3c52e6649e7c8d8bced3c0739a3b8
 AUX redundant-argument-to-sprintf.patch 1738 BLAKE2B 94c16b535dc20044ddac72af4a1b728d66702584ff9c93cec95c0881cfc6d13579202596753545e90e50666df3097dcdf68205352c72d0a59e6c54dc34f16d64 SHA512 51953b22000ee685e954967de3e8edd223400d1e9a5dab056258bbe3cad6795838aa1e20328b1f06dcc9de9e0900e1b87358b09b5845e1bdfb24119e94ab8db9
 AUX unchecked-encrypted.patch 2022 BLAKE2B fc09850f9b4aeeccb5047086ff32add53347c27e932733d7765c85a49f6b48f65f64ca06070bc71216e636da4b24a4b6f2842753d681bbec878643bb9a69fada SHA512 6fc07898123012d2755851fa9a4ab026174fb82f1a85361ddc95f407c0f4ac9b1e8979215c1264c21775f997dff343f209676b6055728a52590b37d8e7e2f4ba
 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
 EBUILD amavis-logwatch-1.51.03-r3.ebuild 1191 BLAKE2B 24340243fd70ec8be31da53dead0e5de83faf88bbb2644bf17c063ee03e605cd009f7990bdd8479798c1959f1c58243de345bf52cf5007ba507f65aee0f3ff07 SHA512 f6d22402f6b81587d8d98696f345bbda89b3e4c1b312e2713affda611a1b4faec324aea02deec07f6ee65e447a7a5c17f2d5a8376c0ce6fb1009a4e75baabe15
+EBUILD amavis-logwatch-1.51.03-r4.ebuild 1373 BLAKE2B c8366b674e0213538d61cdc2945e6ae9c3e4da9aa7a6040854581b0c54d0c4aabbf6b34dc44d1fe79ed11008cb8edf39d05d981015f3badf506e74cc46dd0658 SHA512 47bfa415b0f1d7a175457ae848ec98b9d32bed94017b4f69b6cd3e9c1fff3ec39790e38eef0e22319f2250832146381dcc9817267c65e28b5781a7a842a7e668
 MISC metadata.xml 296 BLAKE2B 3c33a1b9c58306354a087f04e040a9c1e8cbeb17635a1f64f206de2ce47a226068adad992598588e4d1d916ce5eef5c39b6f3ec95ec92ea6807f6e4186522d71 SHA512 ba96de61eeaec557c21ba83c0701d6b83f0e25752a4b949a2562e3eb4a0ceef44d0029d5a5bf5fed5ff7d9add59b8d40cfeac7a57ec566a48d23dca3c327e720
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r4.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r4.ebuild
new file mode 100644
index 000000000000..db425aabba89
--- /dev/null
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A log analyzer for amavisd-new"
+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}/ignore-amavis-startup-notifications.patch"
+	"${FILESDIR}/ignore-utf8smtp-lines.patch"
+	"${FILESDIR}/unchecked-encrypted.patch"
+	"${FILESDIR}/file-libmagic-errors.patch"
+	"${FILESDIR}/ignore-all-sd_notify-lines.patch"
+	"${FILESDIR}/no-pid_file-configured.patch"
+	"${FILESDIR}/will-bind-to-lines.patch"
+	"${FILESDIR}/SANITIZED-NULL-bytes-messages.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
+	doman ${PN}.1
+	dobin ${PN}
+	insinto /etc
+	doins ${PN}.conf
+}
diff --git a/net-mail/amavis-logwatch/files/SANITIZED-NULL-bytes-messages.patch b/net-mail/amavis-logwatch/files/SANITIZED-NULL-bytes-messages.patch
new file mode 100644
index 000000000000..0cc27f0bd226
--- /dev/null
+++ b/net-mail/amavis-logwatch/files/SANITIZED-NULL-bytes-messages.patch
@@ -0,0 +1,34 @@
+From 6d985d29d8be2b70ee7e4048a7ae95e2b4013f17 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Fri, 28 Dec 2018 10:01:56 -0500
+Subject: [PATCH 4/4] Ignore "SANITIZED ... NULL byte(s)" messages.
+
+Newer versions of the amavisd daemon sanitize NULL bytes within the
+body of a message for the benefit of Cyrus IMAP. When it does this,
+the number of bytes sanitized is logged. This is an informational
+message only as far as I can tell, so it's been added to the list of
+messages to ignore.
+---
+ amavis-logwatch | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/amavis-logwatch b/amavis-logwatch
+index 250a6ba..044c94d 100644
+--- a/amavis-logwatch
++++ b/amavis-logwatch
+@@ -2052,6 +2052,12 @@ sub create_ignore_list() {
+    # describe what is being sent to the systemd notification socket,
+    # if one exists.
+    push @ignore_list_final, qr/^sd_notify( \(no socket\))?:/;
++
++   # In amavisd-new-2.11.0-rc1 and later, amavis will replace any null
++   # bytes that it finds in the body of a message with a "modified
++   # UTF-8" encoded null. The number of times it does this is then
++   # logged with the following message.
++   push @ignore_list_final, qr/^smtp forwarding: SANITIZED (\d+) NULL byte\(s\)/;
+ }
+ 
+ # Notes:
+-- 
+2.19.2
+
diff --git a/net-mail/amavis-logwatch/files/ignore-all-sd_notify-lines.patch b/net-mail/amavis-logwatch/files/ignore-all-sd_notify-lines.patch
new file mode 100644
index 000000000000..f3ce1d1091af
--- /dev/null
+++ b/net-mail/amavis-logwatch/files/ignore-all-sd_notify-lines.patch
@@ -0,0 +1,33 @@
+From 653f988ba163c74f3ebdb6e53f57db9d8e569b1f Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Fri, 28 Dec 2018 09:23:52 -0500
+Subject: [PATCH 1/4] Ignore all "sd_notify" lines.
+
+Lines beginning with either "sd_notify:" or "sd_notify (no socket):"
+contain information about what is being sent to the systemd
+notification socket, if one exists. One such line was already being
+ignored, but we don't want any of them. So, the existing
+@ignore_list_final entry was expanded to encompass all such messages.
+---
+ amavis-logwatch | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/amavis-logwatch b/amavis-logwatch
+index ac93cbc..ffb502b 100644
+--- a/amavis-logwatch
++++ b/amavis-logwatch
+@@ -2047,7 +2047,10 @@ sub create_ignore_list() {
+    push @ignore_list_final, qr/\bRUSAGE\b/;
+    push @ignore_list_final, qr/: Sending .* to UNIX socket/;
+ 
+-   push @ignore_list_final, qr/sd_notify \(no socket\): STATUS=Starting child process\(es\), ready for work./
++   # Lines beginning with "sd_notify:" or "sd_notify (no socket):"
++   # describe what is being sent to the systemd notification socket,
++   # if one exists.
++   push @ignore_list_final, qr/^sd_notify( \(no socket\))?:/;
+ }
+ 
+ # Notes:
+-- 
+2.19.2
+
diff --git a/net-mail/amavis-logwatch/files/no-pid_file-configured.patch b/net-mail/amavis-logwatch/files/no-pid_file-configured.patch
new file mode 100644
index 000000000000..5f23955366e3
--- /dev/null
+++ b/net-mail/amavis-logwatch/files/no-pid_file-configured.patch
@@ -0,0 +1,27 @@
+From a93ee5d433308d2cac76ac9502e34c953ff96337 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Fri, 28 Dec 2018 09:33:07 -0500
+Subject: [PATCH 2/4] Ignore "no $pid_file configured, not checking it" lines.
+
+When no PID file is configured (for example, when amavisd is running
+in the foreground), this message is logged. We already ignore the
+other types of PID file notifications, so ignore this one too.
+---
+ amavis-logwatch | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/amavis-logwatch b/amavis-logwatch
+index ffb502b..6d06793 100644
+--- a/amavis-logwatch
++++ b/amavis-logwatch
+@@ -1958,6 +1958,7 @@ sub create_ignore_list() {
+    push @ignore_list_final, qr/^fish_out_ip_from_received: /;
+    push @ignore_list_final, qr/^Waiting for the process \S+ to terminate/;
+    push @ignore_list_final, qr/^Valid PID file \(younger than sys uptime/;
++   push @ignore_list_final, qr/^no \$pid_file configured, not checking it/;
+    push @ignore_list_final, qr/^Sending SIG\S+ to amavisd/;
+    push @ignore_list_final, qr/^Can't send SIG\S+ to process/;
+    push @ignore_list_final, qr/^killing process/;
+-- 
+2.19.2
+
diff --git a/net-mail/amavis-logwatch/files/will-bind-to-lines.patch b/net-mail/amavis-logwatch/files/will-bind-to-lines.patch
new file mode 100644
index 000000000000..464a85b1c56d
--- /dev/null
+++ b/net-mail/amavis-logwatch/files/will-bind-to-lines.patch
@@ -0,0 +1,29 @@
+From e53948a6909e98b63c63c97749c7d0eb534fa274 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Fri, 28 Dec 2018 09:40:36 -0500
+Subject: [PATCH 3/4] Ignore "will bind to" lines in addition to "bind to"
+ lines.
+
+In amavisd-new-2.11.0-rc1, the informational "bind to..." messages
+were changed to say "will bind to..." instead. This commit updates the
+@ignore_list_final regular expression to match both forms.
+---
+ amavis-logwatch | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/amavis-logwatch b/amavis-logwatch
+index 6d06793..250a6ba 100644
+--- a/amavis-logwatch
++++ b/amavis-logwatch
+@@ -2029,7 +2029,7 @@ sub create_ignore_list() {
+    push @ignore_list_final, qr/^address modified \(/;
+    push @ignore_list_final, qr/^Request: AM\.PDP /;
+    push @ignore_list_final, qr/^DSPAM result: /;
+-   push @ignore_list_final, qr/^bind to \//;
++   push @ignore_list_final, qr/^(will )?bind to \//;
+    push @ignore_list_final, qr/^ZMQ enabled: /;
+ 
+    push @ignore_list_final, qr/^Inserting header field: X-Amavis-Hold: /;
+-- 
+2.19.2
+
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 7e5e48242984..67c399e5c71d 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -20,6 +20,6 @@ AUX mkimapdcert 996 BLAKE2B 76a8bbe16f182a32fc47acc5410c20e545c117cda1af40b94d71
 AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d191168c58336206099e0eb3aafd3e50238d83391478bdede627156718bd613741efc34b1dc978984 SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078
 DIST courier-imap-4.17.3.tar.bz2 3202534 BLAKE2B c42eb369bdcb65e7f904b3bd7b018e2785e48fddcc1690374ba254ce17a76b3191c301a81626f0fe44587f4f4b9e4f34edc06e8e8098c509b2c76e3830db2563 SHA512 3166cc703cdc09a71d33257671a662d95cfdb8977bc3b19e0218a4d25eb99a1a108d2868a6eb593106e6538aadf684f11ff0426cd58d522e3ca4b2988f0a88f1
 DIST courier-imap-4.18.2.tar.bz2 3205230 BLAKE2B dd52c55698ac4307a52ef76ed6ca54d4289e00aacff487609cfe01bce351e180561b4bec4904e2701a0c05916bbac2e301409530ccbdcd08474b50be4c1365e3 SHA512 821f0151012f1a357faf705d938d8498a939cc994957398c0d5e2b7a619eabe202549f174e625161545ba6a94b753072458e9f0edc30cbb2443b15405740347e
-EBUILD courier-imap-4.17.3.ebuild 6786 BLAKE2B d962cad6e6b87a421d119d9cd38a5174506105021e1201513d3f8ff17512baf586ff9d27dc80024e9abc5f32b6e1b6effc601a12bc74cee1edcf41ba41353dd6 SHA512 b1e8998dc673f5531751bf58e629596c31c31fe93320f2fdb59c7c3ce6519f110093c4e419dbbc8047705b897ae24635c1472a01cdba1544e6dfa2d213e28d2e
-EBUILD courier-imap-4.18.2.ebuild 6857 BLAKE2B bca5cd6d8df1872c2b2ae789b585d2b1fd29d4c65dc1b0091b506c482f8ce29f492fcfe6a93d04e23e5879076252bb305ee59f2c6f1c1b876ef09570837f4e10 SHA512 9ef62d539a49e8c6ae329a92e45cde7d4f9b678c828762445ab4ab4b9c167e5e5462e6fa6da528564633ff302018192fbf8b64e932fcd95880e3fa2e2cbd38f3
+EBUILD courier-imap-4.17.3.ebuild 6792 BLAKE2B 8135460008a95e65488ecec7ac374f05296632f6020ae63b3e54bff18cf1672f5e97c8533cfc1562b61c45fcacf210bde89a0324dd5ba23c191067a7b3957528 SHA512 ff63c782dec41c20ef41d8fdae3b60669be6df9c932edd9efba96689750e955225cb1473e126a1202c89c5256b8873b031e1e556e746aa508392790a7bab63eb
+EBUILD courier-imap-4.18.2.ebuild 6863 BLAKE2B 73ac4204b5c4c2b4a0ba674a7d3b1bfbbc43ed1aba162618572573f9b5fd7eb060e82e9d2e7aaf275f282c32cad077b0d3dd519946ff4802eeaeebd79e61ff8d SHA512 903a4996d1e4043a59f535b7e77f443bdbe0565f04e51a7c877dbface1c6a5013afe1dcc86e43067015d4d1974da39a752373539942596165933f572d809d4e8
 MISC metadata.xml 382 BLAKE2B e8299d24ed437cceeb508779d1915b7d2e54ed50a12e9959ff7ba6aca31a226817a01e9b0c778dd72047c345e5ce359f97e6baa443893357e0155c9dca9eca96 SHA512 2422c2a28ee3049a7b8da4b27f0dfca5699cb62ac77d39c89de4b9287f32f78167fc4b3eabf20e890c5c5dc1e00ccdce8a745501d3423846e42224f60e8ed110
diff --git a/net-mail/courier-imap/courier-imap-4.17.3.ebuild b/net-mail/courier-imap/courier-imap-4.17.3.ebuild
index 6fe86248dddf..f756c4408199 100644
--- a/net-mail/courier-imap/courier-imap-4.17.3.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.17.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools libtool systemd
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-HOMEPAGE="http://www.courier-mta.org/"
+HOMEPAGE="https://www.courier-mta.org/imap/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
diff --git a/net-mail/courier-imap/courier-imap-4.18.2.ebuild b/net-mail/courier-imap/courier-imap-4.18.2.ebuild
index 0c5927a7d1a2..79b4f380c0c6 100644
--- a/net-mail/courier-imap/courier-imap-4.18.2.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.18.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools libtool readme.gentoo-r1 systemd
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-HOMEPAGE="http://www.courier-mta.org/"
+HOMEPAGE="https://www.courier-mta.org/imap/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index 735829bf98a1..1551cfd9bac3 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -1,5 +1,5 @@
-DIST getmail-5.4.tar.gz 194884 BLAKE2B f6a64b0bb4f5d89e75187fe162ad13e6e3601fd3338e6d9ef30b2100d8ab59328df1446a6771ec992b18e46e75341fff9308af9a994e4e61f41ab89cec20cf4c SHA512 6557cc46df1d31116f9d28cda1232737c01a568e6ada44edb14cdec30a42160966e1e69f42c46855ce139c3b70d77747324adda8abff3dd772a54a79015b0050
 DIST getmail-5.6.tar.gz 197360 BLAKE2B 0833933c4dd4b0b7962070dd3d6738b2c7336f359ca9e40e6febbeaffc6cea6942e4271de6cd3053447af94cc7fd189a25beb99c81d2d1221f1c478807dd7c33 SHA512 7ee34f214ab4d98d1b34e46abba61561133f27edf1f64bb9c5d5f671e6944724d1773234bd8ab626607b732cc54fd335cbfcb69fdff8f4d8fcdb33108b25bafd
-EBUILD getmail-5.4.ebuild 638 BLAKE2B d5474cb28c778be265e73661b42e9375f4cce0ee51bd0bf8771178b6ffa82ed5f6deb471ea76ca315c062fe834d110efa0d01a5763710eb8511ebf1c0d6b51bc SHA512 3d4464bd5f4d878711ffb17f04e4dfaa3e204b923a04f881797fe628b69c2cc880b632fc782031a879e3dd393e08ba585cea8cba58c93b0aed9792c2dc231c53
-EBUILD getmail-5.6.ebuild 636 BLAKE2B e6e381cd97d7652c8e746157daaf3e30f6b477e4243a0436ce2f8eecda777bf92ae7e5e33273d17669e4bcca4b6f7a46aa065534e46e1edbc2ffb84c2375f0aa SHA512 ddc4795213d5110a957364afba95cfea5c1762b079565a2d1a97ca81aa0bc2967fa763be48f6adc800ec6ae3fa56ee47b1f627e709c42b63d81a52975980a3dd
+DIST getmail-5.8.tar.gz 197874 BLAKE2B d5d236c03f1ea5620e773ff47203fe707e7c96bd4267b0267afc8681c3ab4015b291b08967ed0c05a2a1c82bca904236be550bd95d14f781445daf86a9ab6a87 SHA512 8469bc81fb0df4eeb27620b2cc472919bd441cbcb860a0f56b6d2433d22c85a0a326c86e1f566cd2a9d0acc0680d03b84f62cdfd5b92ae0e5bf7293dfdfe466b
+EBUILD getmail-5.6.ebuild 633 BLAKE2B 993e160d1203a4c51f04aa9337ac125afc61cf71adf40fe2bb9937292d869249eae532ec12e0475c4ae48aa78b36e972e2efb585fb8ac6c784197e8dae1249a7 SHA512 92fca063b145200af0e14cc21005be897914688cfce32b34b82302e3e528f12675342fb565fc4ca6d8cab2b442c5246e6c7ec1f4c0adb0f5b0099fb343168bd5
+EBUILD getmail-5.8.ebuild 633 BLAKE2B abb61d6ba2f1b1a70a7c8cbd46aa0e1711a46187176d752cbba72013c826b875eb353612f8a1cace2241a1f8135abbd75b8f8894bc4fc7c9c5dce77b99947ad9 SHA512 2b55155917e7b0dd6f2f19ab8d05f9837b74a9017715cf86d86268c118fa34110feff10f3fc43bb3014955521a90b9b6eb9c6699079d8c759fdd60f2573f4409
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/net-mail/getmail/getmail-5.6.ebuild b/net-mail/getmail/getmail-5.6.ebuild
index 5e4129b2b2eb..e210ae2c78d6 100644
--- a/net-mail/getmail/getmail-5.6.ebuild
+++ b/net-mail/getmail/getmail-5.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pyropus.ca/software/getmail/old-versions/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ppc x86 ~ppc-macos ~x86-macos ~x64-solaris"
 IUSE="ssl"
 
 python_prepare_all() {
diff --git a/net-mail/getmail/getmail-5.4.ebuild b/net-mail/getmail/getmail-5.8.ebuild
index bcf25b422aa1..bcefbf5318b0 100644
--- a/net-mail/getmail/getmail-5.4.ebuild
+++ b/net-mail/getmail/getmail-5.8.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="ssl?"
 
 inherit distutils-r1
 
-DESCRIPTION="A POP3 mail retriever with reliable Maildir and mbox delivery"
+DESCRIPTION="A mail retriever with reliable Maildir and mbox delivery"
 HOMEPAGE="http://pyropus.ca/software/getmail/"
 SRC_URI="http://pyropus.ca/software/getmail/old-versions/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x86-macos ~x64-solaris"
 IUSE="ssl"
 
 python_prepare_all() {
diff --git a/net-mail/lbdb/Manifest b/net-mail/lbdb/Manifest
index 7ba9baffd7fd..dd54c88633eb 100644
--- a/net-mail/lbdb/Manifest
+++ b/net-mail/lbdb/Manifest
@@ -1,7 +1,9 @@
 DIST lbdb_0.41.tar.gz 160632 BLAKE2B 7cbb0178f2983255eef8ce86146e104e33a1d31b6fd5cf3e5dea69cad8fa485424a5d8b89d1e2024f34a688bfb018724b05bf8e5e57ab5338c9973b78d203d4b SHA512 c99d8c4549d781252192e07dfb89adbae6daae5a4f4c94de692c4289848ba8599c2b0aeb28bac69313e6828995eac32acf3fbc76b1695c6464c6339236cdb341
 DIST lbdb_0.42.1.tar.gz 158766 BLAKE2B a55d8c3be598e11ef2ed16f4f68aa8fb0a4abda8816488ad3968155aa7d2d8f471979d1c52ef48f7125b53e552a9e1f99932db6f810cf52dd10ec0b13fc03a91 SHA512 50c405bb05e38f5b23b05c27626262680bcacd6385b636a1e6bed0c3cf4c319a1cc19181587e390c04bb2e5b3a275a9e053c42536df6554b6f44d3b8496fabfd
 DIST lbdb_0.42.tar.gz 158714 BLAKE2B fcc47b7d5d175e6594664b0a84140098381c5e79ee5946bc1fc2a8935222231f2ea4acbe2b7e5419faa562929f7c708f00b68fa638c32590758f9876de44ed0a SHA512 d8d27450fab09ff41e592fb2ef9395b8ed30c2a925136184c0339574f3a58b7e54b5846c722d2e065da5a98b166497e148afd43592f80942cf4aeb35934e91d7
+DIST lbdb_0.47.tar.gz 182477 BLAKE2B 9ac0073ea4151ae84f9aeafb1a6bde52a39809987da87bd252665f9ef729ad1a5ee4cf91e4c1ebec1f8be17e1a9a3e31dbfda5484ae114fc99cd273f93b39cf9 SHA512 95cae9b108d875203dce2a8243c3dcb979606529202fd9b4d1ddd211a3d617a421440f6532abd38432607b39da84a6da4d09b15e95cddc01f94e018b9e712078
 EBUILD lbdb-0.41.ebuild 1362 BLAKE2B 87f3eaca4b680eb27ff7f24287317973a9aa93f95ebfe4a7770f5f73b4327f2ac6391084eb75aff85159fe73caacb19ea4fe8d1f459e405c0600be5a256b6077 SHA512 b483dfd7dd5207045a648283f1b7eda49aca430dac9a54001baf253856a277e6f358951b8d9268573716471b89440d26c338b4e7b5ec42ebf06f9b4f3505c029
 EBUILD lbdb-0.42.1.ebuild 1384 BLAKE2B 172aca3cad92694d81e8da8161a8d440ab84e0cc78fcb86d02e04344a6126c135d6a6a5be6331a596dfc7cb0ce21a5d8e172c3e10196d9d68f0c50c0b363ebf1 SHA512 106b457b72342cbc7ff825b4013dcac2ed61ad2e1da9e772aa2054d1c9cfb2d61acbcea3302b710dee1ca6e5aef0da4b8c04362bacae0e9ebddb5b668a42e644
 EBUILD lbdb-0.42.ebuild 1365 BLAKE2B a16f65e809aadd9fc7783296805b178d79d3b7e37f314a448f3dd6d83052fcdc50d2eb0b75b5a70d0a1777cbfeccb3fc998cc21a7c631c0154c6a5c6c3e694bb SHA512 1c278aa8206024695441843caf7c8f71d8b920981c3643a7da9c92a1c34693724b7e56a5cb5575f49c9403960512e4eac7b3ab3a47f853ebd6557b1900198930
-MISC metadata.xml 470 BLAKE2B 45e950e09e828b119653cb5b4dcd19f3ab322ab13f6175ce67b64a408c7abdda1d1646f745a208967f74e9421aacb7d3e56eb0b169e49fac6d305bf50f00b385 SHA512 3ac5dab8f66deb39c6451a415a5ec6e90f3863da891556fa99cc4b3f9d98962f79b968d99fb4790e17c56b76a4fd00bea733fa1c63ef13be94ad1eedb79f5c1d
+EBUILD lbdb-0.47.ebuild 1460 BLAKE2B 97d7aa58fdf3f8890b4469d434e995767f3d1ddb7ce96af59a3b1a50e70366c06f3df08f82034fabf6791b6802e610e4687aebbc69b4183ce92e181456a7d857 SHA512 c2f9ddef4676ed5dc67cf25888a671ee7577fc65d7dd5aaa0d5263eedc960937732a11a444d6f29bf8618673a70867676974a84d7d3976f8480fee949fd63c8b
+MISC metadata.xml 534 BLAKE2B 09d25b635a791093567859616f8d9b23d1e31cb4945c70d9c4cba2fa35cd79e98b321849cbfc04dec183ea453599ca920067e99dc1cab349c147f9963579a565 SHA512 55e44252701d82b0c25cd23c09ad988957820662fef87c9d09ff481369e8295f5b1d4942b272052165052063ed4f28fb95370006cc7380a74d486cc5bdc3dd53
diff --git a/net-mail/lbdb/lbdb-0.47.ebuild b/net-mail/lbdb/lbdb-0.47.ebuild
new file mode 100644
index 000000000000..c5adc17be89a
--- /dev/null
+++ b/net-mail/lbdb/lbdb-0.47.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${P/-/_}
+DESCRIPTION="Little Brother database"
+HOMEPAGE="https://www.spinnaker.de/lbdb/"
+SRC_URI="https://www.spinnaker.de/lbdb/download/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+IUSE="abook bbdb crypt evo finger ldap pda test"
+
+CDEPEND="dev-libs/libvformat
+	evo? ( mail-client/evolution )
+	finger? ( net-misc/netkit-fingerd )
+	abook? ( app-misc/abook )
+	crypt? ( app-crypt/gnupg )"
+DEPEND="${CDEPEND}
+	test? (
+		dev-perl/Palm
+		dev-perl/perl-ldap
+	)"
+RDEPEND="${CDEPEND}
+	bbdb? ( app-emacs/bbdb )
+	pda? ( dev-perl/Palm )
+	ldap? ( dev-perl/perl-ldap )"
+
+src_configure() {
+	local evoversion
+	local evolution_addressbook_export
+
+	if use evo ; then
+		evoversion=$(best_version mail-client/evolution)
+		evoversion=${evoversion##mail-client/evolution-}
+		evolution_addressbook_export="${EPREFIX}/usr/libexec/evolution/$(ver_cut 1-2 ${evoversion})/evolution-addressbook-export"
+	fi
+
+	econf $(use_with finger) \
+		$(use_with abook) \
+		--without-ypcat \
+		$(use_with crypt gpg) \
+		$(use_with evo evolution-addressbook-export "${evolution_addressbook_export}" ) \
+		--enable-lbdb-dotlock \
+		--without-pgpk --without-pgp \
+		--without-niscat --without-addr-email --with-getent \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/lbdb
+}
+
+src_install () {
+	emake install_prefix="${D}" install
+	dodoc README TODO debian/changelog
+}
diff --git a/net-mail/lbdb/metadata.xml b/net-mail/lbdb/metadata.xml
index dd88703f59ca..184220dccd58 100644
--- a/net-mail/lbdb/metadata.xml
+++ b/net-mail/lbdb/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <use>
     <flag name="abook">Enables <pkg>app-misc/abook</pkg> support</flag>
+    <flag name="bbdb">Include support for app-emacs/bbdb</flag>
     <flag name="evo">Add support for <pkg>mail-client/evolution</pkg></flag>
     <flag name="finger">Enables finger support</flag>
   </use>
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 13651c44277d..50af2de5d823 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -12,9 +12,9 @@ AUX twomsg.at 2216 BLAKE2B 8a0ac15f6c2a8824406d9a74e14f3143e48b9fd7636732bfae918
 AUX weed.at 1100 BLAKE2B 120c50265f45b192afa583e594cbf75d753f33aa129f71f3e076780e71224605d735722cb50ba078aa9747b286291d560d9b5e28393239995c1648407070db97 SHA512 84fa4564cb1876c1b9f1a8b143f8fc95829de5d2b02edf8894d86aa50efcdd5696d66d773737a8989ccc4ae22d4d0e2c4b7c055e281faabb82cea399150b2821
 DIST mailutils-3.1.1.tar.xz 2759000 BLAKE2B 146dbc17f222f5f6293c88861fbe75679bde9497d1e9db577441290a2946632ee946ba726cd618363c3f6c1e3bfc87cbd9e94f701ca90f794e6182370bc35ac3 SHA512 68a6f530935118f60503550aff925c799fee4de77377e726548f418e05687b1c8f29210bcb97e1b1033f9414bdbceeaa41e65496b0648a6356c8363554955e8c
 DIST mailutils-3.4.tar.xz 2619672 BLAKE2B 3a49c319a7171b2659477e6892ae222a342243e84ed2ee93e6d77353e1871d57d101a3a6ee3d2442709adbfb090e4931e134369661e8e8aa407061c1eccdf862 SHA512 548d97a4a036ef0ef5a429c82ffa43dd377b210b4c4d3844e7e5dded0f963060e3733b7766821c06ccf4dc1135002608658bcd6420e75b4ca1f4f17cfc8e2573
-EBUILD mailutils-3.1.1.ebuild 3575 BLAKE2B 27de93350eca9d9ca3c8503ebc3b78ad1661c5b09458cb16835e84c8848b6d818d965ba0c4c1ebaaec3a87bc714c13a056598a1f079da59cf98619ee3b41b610 SHA512 3fa3501b885b254bfaf86786d67a3177f0756cb0346ba630dc9b902c851ceb708abce1057d326de769704ff50d713859f0280433b384a6f17b016a4045d05570
-EBUILD mailutils-3.4-r1.ebuild 3530 BLAKE2B ee9410a41c7e34e425e6c40c09e244c2d739b4cea8063f35090cbbf38ef14815be43de60d4c96b4856c5979f9f7ea0589d16f9c4db11837d2650c76f41fef4d8 SHA512 d08a536c05c6301555750e5ea4139b524aa1f71b99fd1b25b462c710695a3b976c1267a05448386d773650fba524cdc79c4131cb6dc44c0729cc3bfe5cb0e4a6
-EBUILD mailutils-3.4-r2.ebuild 3532 BLAKE2B e81fb4acdc0fff627e6e54222217485854de167f7a3d9f4b91d4b774f1a3ed919065ea08429a7cfbb80b180a2f8e77ea0fcbf668b7f5ef5c343edb8dd4409168 SHA512 6faf7e29b1464272a3fbd93290fdee06366b41f0297acd44bb7c5e2d2e5a1efb2e91952868a46302d769b21848610401f314d21037d5dd79cd22675059978665
-EBUILD mailutils-3.4-r3.ebuild 3662 BLAKE2B 520d119bdc9c6a79a14256aad74a286802cd9ac690b972058b2a240120e6f9802929daf170d000595a1d2fad076e5921714c96840ebacffde3b1d1effbdf622a SHA512 53f308c6bcf435cffa7030e58fc0f0becfd56ee21b75227cf567a26ca814f6380cdc1fa3cfae63d7e96fde22149dd29032925c11973b5c573c2ae4c90edaea3d
-EBUILD mailutils-3.4.ebuild 3487 BLAKE2B 4b101761b0e72649cb83558a1eda59295c92185a334f322581f5d6b882adf74c71d94582b6777beb23107cf5bcb814ec1d6b728ad420572fa9fee228a7de633b SHA512 9337390ec168c2a50dc2316710e5f9f37f032e50873e24f829ea6dd174c1d5360fb7dee9da2cbc7b0174cc395d626c62121d77804bf4c5968469496bf33137a2
+EBUILD mailutils-3.1.1.ebuild 3578 BLAKE2B 332f463f7aebc4b81e43b3f2670d7682a9a26561aeda29161a31a78f118bed64818098ce35b7863d5e80f19f089fec3542755d38e889746e7687d5bf733a1c80 SHA512 880368f9903af459b6c5294eef802538a22c447b3a35b0935056407c2775da9ad94d21bded9926c849cf87da99fb36121c8571352827dafa565e922db6a56bcf
+EBUILD mailutils-3.4-r1.ebuild 3533 BLAKE2B a22b0983f277012c897b44186ffdc00f2b16b137a31fb93d6c9aee7e7c1d6d5a1a6b98bf72adbb925112513596af6f19b0016f1fc410d2755c1e00d76ee26787 SHA512 224984417e6597fcc462b9bef5fe4394d33ded19c8c5b05edfeaf46a2813c31450042e96ccc007674e85b779805e4f2305dd10d04fb538810ee333fcd5b852fe
+EBUILD mailutils-3.4-r2.ebuild 3535 BLAKE2B 2270b2a23bbe9b55950a23415f5c3983f90e608d486207d88e5fa7ad468711372b8343e0532c5aa7777fee3c0ee8bea0509042db690999ca3cc18f0f3c9bcdbf SHA512 ae1ab694f81c90434083a2d180997c8397f9c859e1faa2585db9c8ce70e3f298c7ed78a744bb5a589b8a4773675f25b12f407c6583926a26b8204cf686e2d59e
+EBUILD mailutils-3.4-r3.ebuild 3665 BLAKE2B 1a2a62f7403ad10f534fdfdf9898fb9e24467450fbcad54d0f3c0b7d4a289ed36d400cbf24a11ea92acc2e8f6a8a621dfbb7cebbb55b5d6c246ced31d6af0228 SHA512 1cb84032c3c433bad161c8412f5138719ac8a311f4e904b74a653ce0fbaa7f176f8dfd7cfdc676060a35c7a7808059a8f744949d7b7a1913d1f48d2766db2219
+EBUILD mailutils-3.4.ebuild 3490 BLAKE2B 0f846d498d81d9e66f00c69b8bbef2817e6c8e5c0c3e9d99c54c46224ecca578e538111b6f1b1e1728252d676e0671e033fec77b05c68174ca8431cd83be5208 SHA512 1d7796825701e9c161faeeaf762a6bac0a9385221b886ede431d59b556bf6fe9a765f1db6fe2555d368ac69c63ac5407caf7c858a74fb836b8bc4d90590f3100
 MISC metadata.xml 598 BLAKE2B fce383bd86c8e43d7b9164abae6127ddc98b606b6a5e4afd17826f6a3fb683f92120d8c7877d250196bab51bfb37ab33454d3cfaeffd0b7a69a001481510f9a4 SHA512 16f2b6b082da7c932457df31809c8ca1caca1f8439037f56b5751c28cf1217658ed60fd4155871d4d5d71e7040c01edbe37198dee27beeae1905da954317c8e7
diff --git a/net-mail/mailutils/mailutils-3.1.1.ebuild b/net-mail/mailutils/mailutils-3.1.1.ebuild
index cce58d02ff36..b07d4d2835ea 100644
--- a/net-mail/mailutils/mailutils-3.1.1.ebuild
+++ b/net-mail/mailutils/mailutils-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~s390 x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap \
 	mysql nls pam postgres python servers ssl static-libs +threads tcpd \
 	tokyocabinet"
diff --git a/net-mail/mailutils/mailutils-3.4-r1.ebuild b/net-mail/mailutils/mailutils-3.4-r1.ebuild
index c52787aad2c6..5139756cb96f 100644
--- a/net-mail/mailutils/mailutils-3.4-r1.ebuild
+++ b/net-mail/mailutils/mailutils-3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap \
 	mysql nls pam postgres python servers ssl static-libs +threads tcpd \
 	tokyocabinet"
diff --git a/net-mail/mailutils/mailutils-3.4-r2.ebuild b/net-mail/mailutils/mailutils-3.4-r2.ebuild
index 8d48a1d994e4..459a10b5a305 100644
--- a/net-mail/mailutils/mailutils-3.4-r2.ebuild
+++ b/net-mail/mailutils/mailutils-3.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap \
 	mysql nls pam postgres python servers ssl static-libs +threads tcpd \
 	tokyocabinet"
diff --git a/net-mail/mailutils/mailutils-3.4-r3.ebuild b/net-mail/mailutils/mailutils-3.4-r3.ebuild
index ff55ff32e352..20411ad71538 100644
--- a/net-mail/mailutils/mailutils-3.4-r3.ebuild
+++ b/net-mail/mailutils/mailutils-3.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
 	ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd \
 	tokyocabinet"
diff --git a/net-mail/mailutils/mailutils-3.4.ebuild b/net-mail/mailutils/mailutils-3.4.ebuild
index 45bb51d2ed8b..bb0e216c9319 100644
--- a/net-mail/mailutils/mailutils-3.4.ebuild
+++ b/net-mail/mailutils/mailutils-3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,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 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap \
 	mysql nls pam postgres python servers ssl static-libs +threads tcpd \
 	tokyocabinet"
diff --git a/net-mail/mpop/Manifest b/net-mail/mpop/Manifest
index b4b3c1148b2d..1738207461e5 100644
--- a/net-mail/mpop/Manifest
+++ b/net-mail/mpop/Manifest
@@ -1,9 +1,5 @@
-DIST mpop-1.2.4.tar.xz 268900 BLAKE2B 9469c450930864ca902d333fac0fad492a798ca8012caa38730a31ba70caf11c65b8e56f67d0517c30303d880139ca161163bf52e334fea74a066993163cfcdb SHA512 2ddc395f76adcc9fa1a1bdf0749a29eeb40a51b3c1633fb0e6b967b68be79a160ae8aab8433a2565a2146ca0d24d2ad00e1cb5a66652e737dd0ccdbac27ae70f
-DIST mpop-1.2.5.tar.xz 269204 BLAKE2B bbcaef547676827c89c04dc8afb84f6679788b085d39dac5cc9881b0334ec1aae9752fedc44d762c85f381403a90c1e62306e1fc7ea9ef6fe075b8a1f6f642ee SHA512 9c724915f2f6b776ed0d8f27b3af5e2c86c63ccfd2eb4bcdf69f4f86f47d10ab23a21cd76e5ee173ba18bb7ccbc5f13a2dc9c2cbbfa91b9a40dddc5197c4c1de
-DIST mpop-1.2.6.tar.xz 269912 BLAKE2B cfcdf1cf4bf8e2ba6a9ccc8d7c725f2bcbcbcb545ad27b0bccfceba0d9b6d04d729035c96346027eb9c5821832f740d388163dcc7a15555d4d5c6361ab0824fe SHA512 ba4dedebbe4b7b9f84a339e7c605cc9082e95d8cf0c5331dbc74b83ef64f7de47da996e61dbbaa33dd093650a3021eb75a7f188a9abc985c741108d060b6bd7b
 DIST mpop-1.2.8.tar.xz 272632 BLAKE2B aebea78c44103284929d7819e00377c8d64d0de1c7cd877e8d63ea4e3481ccf05d9d27ec5b5f7433bf723bdd421a7fe8ed54a2e44ede9dbb3a6447a98e5596cd SHA512 34039d6a4b3b316679cb646ed0db6b0a11f47554576e9aad35402388718c3c7787e3854c144cec921cab0aea22e0484a1f71c2283bc1d0a37e6e69a0f6530602
-EBUILD mpop-1.2.4.ebuild 1103 BLAKE2B e377cbfc5858795778c509d3d3db6901dca5fab1ec62189f3500c8461bff0ae66c2aefbac67acc16ec8aa73e4689c536982dce484815e82ca5ad734edfc1f52d SHA512 2e4da67d2793521dd7178faf45b67f800219be22740a1be55858f5de0700afdc7c0cc105e4a692d7075c16ab27287af5de99345d9388e6b3af6948e2de782882
-EBUILD mpop-1.2.5.ebuild 1103 BLAKE2B e377cbfc5858795778c509d3d3db6901dca5fab1ec62189f3500c8461bff0ae66c2aefbac67acc16ec8aa73e4689c536982dce484815e82ca5ad734edfc1f52d SHA512 2e4da67d2793521dd7178faf45b67f800219be22740a1be55858f5de0700afdc7c0cc105e4a692d7075c16ab27287af5de99345d9388e6b3af6948e2de782882
-EBUILD mpop-1.2.6.ebuild 1103 BLAKE2B e377cbfc5858795778c509d3d3db6901dca5fab1ec62189f3500c8461bff0ae66c2aefbac67acc16ec8aa73e4689c536982dce484815e82ca5ad734edfc1f52d SHA512 2e4da67d2793521dd7178faf45b67f800219be22740a1be55858f5de0700afdc7c0cc105e4a692d7075c16ab27287af5de99345d9388e6b3af6948e2de782882
+DIST mpop-1.4.1.tar.xz 296968 BLAKE2B 89304b7c63882dd394ff6797d87ceca1aa8af3efa4198fc0adeeba5b5704b57459ee466319f59657d65dfac2a3b8531a4515e51391e7f5030008589e689a0a92 SHA512 66b2ad8fab2d4a8262eb3689b094ac19cc961ef9fd5fd51c2c72b14c9f759194b906d2450b7c6cbeddb78e871198a2be8b336bc1fc7d6990a2b8b9d66068a2e5
 EBUILD mpop-1.2.8.ebuild 1103 BLAKE2B 48d3ddc531310bdda5557bcb979356081c85a9147ddcc6188dd618e1cea9b29ae8b9df84e1b9bbd7f077f185c960b231b060485f5222b4861d4a549c924fbbea SHA512 8b9ac4154d874b5cddf9e5b5efe50b267f5d31b09ef92ca9fd598c0e1aafb517c85e8c8cd00b9db669b4a433ec7f105f772f7ac717b62fa1124dab3edd94daa9
+EBUILD mpop-1.4.1.ebuild 1131 BLAKE2B 925850c2dcb32599974d63e7d3558ce6d3385ea14cd0118cd4e41fcc28eb17e00985ab514fa6cb4fdb1176294ec380712561061410e24ea2a57f56c9bd9acc2f SHA512 4f1eff4f81c5e78062da15cdcb2e4465bdd5f2d77994f0638b36645a992821185ac3ea6e88ef0d4cd19d59eefb154b875658a43de976413b574adfb5607bd1f2
 MISC metadata.xml 417 BLAKE2B 3c7a493ab2f179da566b98df102d3bfc7df20a3eef4694b1ec6ea8dde00197dd526f77af2d42e9c63670eace496992def5d2d29cc929f52f858935941e2ad669 SHA512 a0e8a9f86bf3a53d1ba38cb3da1c12a9df7372876f3cecf089dbef4048149ec7a11fc3f007aa2c50059a0be72c91a4c608e87d206be89c8f996f246e8a828012
diff --git a/net-mail/mpop/mpop-1.2.5.ebuild b/net-mail/mpop/mpop-1.2.5.ebuild
deleted file mode 100644
index 88d21a14ec47..000000000000
--- a/net-mail/mpop/mpop-1.2.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A small, fast, and portable POP3 client"
-HOMEPAGE="http://mpop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gnutls idn libressl libsecret nls sasl ssl vim-syntax"
-
-RDEPEND="
-	idn? ( net-dns/libidn )
-	libsecret? ( app-crypt/libsecret )
-	nls? ( virtual/libintl )
-	sasl? ( virtual/gsasl )
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-REQUIRED_USE="gnutls? ( ssl )"
-
-DOCS="AUTHORS ChangeLog NEWS NOTES README THANKS"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with ssl ssl $(usex gnutls "gnutls" "openssl")) \
-		$(use_with sasl libgsasl) \
-		$(use_with idn libidn) \
-		$(use_with libsecret )
-}
-
-src_install() {
-	default
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/vim/mpop.vim
-	fi
-}
diff --git a/net-mail/mpop/mpop-1.2.6.ebuild b/net-mail/mpop/mpop-1.2.6.ebuild
deleted file mode 100644
index 88d21a14ec47..000000000000
--- a/net-mail/mpop/mpop-1.2.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A small, fast, and portable POP3 client"
-HOMEPAGE="http://mpop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gnutls idn libressl libsecret nls sasl ssl vim-syntax"
-
-RDEPEND="
-	idn? ( net-dns/libidn )
-	libsecret? ( app-crypt/libsecret )
-	nls? ( virtual/libintl )
-	sasl? ( virtual/gsasl )
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-REQUIRED_USE="gnutls? ( ssl )"
-
-DOCS="AUTHORS ChangeLog NEWS NOTES README THANKS"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with ssl ssl $(usex gnutls "gnutls" "openssl")) \
-		$(use_with sasl libgsasl) \
-		$(use_with idn libidn) \
-		$(use_with libsecret )
-}
-
-src_install() {
-	default
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/vim/mpop.vim
-	fi
-}
diff --git a/net-mail/mpop/mpop-1.2.4.ebuild b/net-mail/mpop/mpop-1.4.1.ebuild
index 88d21a14ec47..04585c354521 100644
--- a/net-mail/mpop/mpop-1.2.4.ebuild
+++ b/net-mail/mpop/mpop-1.4.1.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A small, fast, and portable POP3 client"
-HOMEPAGE="http://mpop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+HOMEPAGE="https://marlam.de/mpop/"
+SRC_URI="https://marlam.de/mpop/releases/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gnutls idn libressl libsecret nls sasl ssl vim-syntax"
+IUSE="gnutls idn libressl gnome-keyring nls sasl ssl vim-syntax"
 
 RDEPEND="
-	idn? ( net-dns/libidn )
-	libsecret? ( app-crypt/libsecret )
+	idn? ( net-dns/libidn2 )
+	gnome-keyring? ( app-crypt/libsecret )
 	nls? ( virtual/libintl )
 	sasl? ( virtual/gsasl )
 	ssl? (
-		gnutls? ( net-libs/gnutls )
+		gnutls? ( net-libs/gnutls:0=[idn?] )
 		!gnutls? (
 			!libressl? ( dev-libs/openssl:0= )
 			libressl? ( dev-libs/libressl:0= )
@@ -38,7 +38,7 @@ src_configure() {
 		$(use_with ssl ssl $(usex gnutls "gnutls" "openssl")) \
 		$(use_with sasl libgsasl) \
 		$(use_with idn libidn) \
-		$(use_with libsecret )
+		$(use_with gnome-keyring libsecret)
 }
 
 src_install() {
diff --git a/net-mail/offlineimap/Manifest b/net-mail/offlineimap/Manifest
index 0f407b010f3c..c6795e5e0685 100644
--- a/net-mail/offlineimap/Manifest
+++ b/net-mail/offlineimap/Manifest
@@ -4,8 +4,10 @@ DIST offlineimap-6.5.6.tar.gz 187801 BLAKE2B 78561ffc0b0dcd3dcd3c75448f1e412661a
 DIST offlineimap-6.7.0.3.tar.gz 679221 BLAKE2B bdc5013dff0a3dc1e79326d6c7bac6ebb524e6b1f2ea7f8492abaa54ec2436406ecbebe981e085e9f4ee572355b798806b76ea5998cbd0225db03c03d5fc9093 SHA512 21800eb14e814fa04b983e9718a5780deda4c99ae55ef900ccec9f1e65f9bb783c3469e00e6595c7dfddb60d760a6b3c98ae979da3219de51c8ae107ff1c077a
 DIST offlineimap-7.1.5.tar.gz 711529 BLAKE2B 055fcaa714529407d404b45afc56f2b9c407865bbb6403a205f916926905c845c3dd9d025824de82850c17e2791c335aa11a38e9688c847d388ffaa97dbf5d2b SHA512 5e49e5e2f13a15f02036860d1622a79a1342c8d3c0ad1c3e56c32a90e9c6e439ed9b9de6b67e36bda19229e28bd17dcb132f093eb19524375b182dde079d6101
 DIST offlineimap-7.2.1.tar.gz 720220 BLAKE2B 309a51e88ebbc8dd7a4d807bc506a0d0d8a355e71f464e5347ba3ea02de6fd89a089bb982475982d62bed0900eb1aa5320163e49ac787b9d8abff029ac47ee7d SHA512 4e6bcda576fbf023e0192e8d19627d72ea824cd795ef65604d56b00f239298031ea512dcc17d47ae340be1515770c8588907bc767489717a9ab136e34843c197
+DIST offlineimap-7.2.2.tar.gz 721359 BLAKE2B f59f26aa3cb7a3a5d994e5e9f48dd9de4f00193a71dbb2cd976dd6c8459b7dc6750c0a0bbcc8b954745ffe18e16cbeb6739f63ec9c4a530fbf2489db36771117 SHA512 de60472d24368ff4f5c43ecb50b021c671e6fe713220475da8bd900de6bfb6a10ec8c585f96f6091caea32344f65886e2870d097974ebef343b0ca56a81ddd7c
 EBUILD offlineimap-6.5.6.ebuild 2378 BLAKE2B a9c962d9f3fcf4d23e46264fc5f877a40e4aa6646f35f7cde9a70003cc4afb5f9811ce74de1733ca2f810bd912fea4e2c4d261b4839c16e3ea83548d9a0ba345 SHA512 13e3f2a90322e9fe125e1d5f61f5df3f43e0db647aab7d289e4012e767fb7c50c76b844551ff6cc42cbc0650700c704c0ae983d80cd4221c27568da1d9e939d4
 EBUILD offlineimap-6.7.0.3.ebuild 1785 BLAKE2B 43edc0187230509d01c5f7044b166b91f705ea25d3ceca46ace97d46257667e097f5ae52bd2c9af95bb21110eefd4b5a2eb34c69b3b525119dfa28ef35fd7407 SHA512 16fa39e4875b3b32526730446bec76d2ac905fbfda2e83c4fcef43004d6c551eed58189dd3a55ad1cd23761d5577d7d1af37d3b92a46df39bf4fbba25ee0cb5e
 EBUILD offlineimap-7.1.5.ebuild 1636 BLAKE2B 045e7fc7932531830b72cedb329948b35145bac6a2c5ac3e777853180c0fa32e335b2577732d3c61d94d11fbeea1d4133a8f912e308889d0dd8c78fe816411ef SHA512 033e5823d7eb6f0aebf8efab0e926f634f4df7299a1faa8c8df11b6b6e72255abb8596197deff53114cc9908d95ea7194d3f3cef2d4b89f9132e4479721b1c22
 EBUILD offlineimap-7.2.1.ebuild 1636 BLAKE2B 5d5280b9461889f799d71f1b756cd5812673b388476c01a857fb2d6e76f1c31c2b688f601f2035d55873d0a243def598191ef0fb0261f5749e8fa45c42903dda SHA512 919380d9ae801b6208403849ae00fbd1ee79996170e2b95eb1a72bbcffbf99832423540a639cfabcd5295eda01608d9b86727d3ec96a507468be6495fb0cff85
+EBUILD offlineimap-7.2.2.ebuild 1633 BLAKE2B 1b20522da321d9292abee87ebb7aa09108ca004e41171f820dbc62730be2cde58d5c08ac4cb4e04bc0d61775563787d283d5d2b51ae73d770e42d1599f64ee5a SHA512 416681831a9bcdba4034f85333fb989b3e588f82481be59b9b6b18920ce98fe7c52a3a700d483f130ce4a5e938a5ad5a534c6fa2c38ff7ae44449ac12fa17678
 MISC metadata.xml 447 BLAKE2B 4bbdba65866601fada2c8123f208ee9f3956478b686a8491a80e092e1705f387b9cef50fdf8ec909e56b225ea5c1c63b74af3436ca95820d5b8d380bea45a01d SHA512 58d5e16ad0ea7a82e114eb99bbb6513229833523a4b3459e567083a6b21a63dbc0ca0c9559a5e4e04c64d66d19e71215154cab275d7114e0f6b57bec8020021b
diff --git a/net-mail/offlineimap/offlineimap-7.2.2.ebuild b/net-mail/offlineimap/offlineimap-7.2.2.ebuild
new file mode 100644
index 000000000000..27f0f2a9ae94
--- /dev/null
+++ b/net-mail/offlineimap/offlineimap-7.2.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Normally you need only one version of this.
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,sqlite,ssl?"
+
+inherit distutils-r1
+
+DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
+HOMEPAGE="http://offlineimap.org"
+SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc ssl"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="doc? ( app-text/asciidoc )"
+
+# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
+PATCHES=(
+	"${FILESDIR}/${PN}-7.0.3-darwin10.patch"
+)
+
+src_compile() {
+	distutils-r1_src_compile
+	use doc && emake -C docs man
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc offlineimap.conf offlineimap.conf.minimal
+	use doc && doman docs/{offlineimap.1,offlineimapui.7}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "You will need to configure offlineimap by creating ~/.offlineimaprc"
+		elog "Sample configurations are in /usr/share/doc/${PF}/"
+		elog ""
+		elog "If you connect via ssl/tls and don't use CA cert checking, it will"
+		elog "display the server's cert fingerprint and require you to add it to the"
+		elog "configuration file to be sure it connects to the same server every"
+		elog "time. This serves to help fixing CVE-2010-4532 (offlineimap doesn't"
+		elog "check SSL server certificate) in cases where you have no CA cert."
+	fi
+}
diff --git a/net-mail/postfix-logwatch/Manifest b/net-mail/postfix-logwatch/Manifest
index 0e8ff5b6a02f..37c220b9287e 100644
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -1,6 +1,8 @@
+AUX all-server-ports-busy-lines.patch 2510 BLAKE2B 152a38abfc0caff5aaa8bce0a0b0c9adbf259a3317503506ad73a29c85745751960e594efca1d58cf7a39f401a443034ccca1bb8d80bc8bc25fa0b8e215d6602 SHA512 01edf0e1fb6db7799618e9e03f7201470e00a71ca4a43539e6a3555c81bab5846007f140ff868fd48a436c3a7a8f0fe6de70edd285887402fd97edfec636506d
 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-r2.ebuild 1069 BLAKE2B 5b0a9903c7622e0033217d2c97c551d8dbe8443e8bc7e60712b945ae364699c4599ca4d96d0ae81c9c1ffbcc1a2f5e33b2adff5b33b2276a433ef4de8c9a8ebb SHA512 c92f554614484baba18a9a3e178e4a6d419f2c41cac23f951a518fd63513b8e9df278391441ec8ae2cf9c68f2923e274e3e436bbbf3761430a6c5d797635c5e7
+EBUILD postfix-logwatch-1.40.03-r3.ebuild 1117 BLAKE2B 07f78be6fa6e9cfc3881ce9259dfbaeb8884114cb41b0989e29e1065789050e6542e5f0ec3e4512a968243ce214561ad8399c8ac2c24510e4d400eeefecb4101 SHA512 fd1ad247b55224b115c00557bc1e23db90db9383bc39b1b27430539c8101d209050b2f292f42aca3737b06275b8ddee6a0a746ed487acefa6307cf7902b1b2cb
 MISC metadata.xml 304 BLAKE2B 48bc40ba602d100542b0515ce426fdab3846135079ef677b11c2024c14243d0d06ecd543c0040420bddd839c2043ca0de3223cb9a02135b5c398f825beafdaa4 SHA512 6df4937b334df95e1178cd70c594d9ef08e52f5b34f4da0a129cd3586192dabe974623b13b6992021231150e8a70b7c2d68e7b65faea39113efe04f9a2244cb1
diff --git a/net-mail/postfix-logwatch/files/all-server-ports-busy-lines.patch b/net-mail/postfix-logwatch/files/all-server-ports-busy-lines.patch
new file mode 100644
index 000000000000..dd5ae5869eb2
--- /dev/null
+++ b/net-mail/postfix-logwatch/files/all-server-ports-busy-lines.patch
@@ -0,0 +1,59 @@
+From 7b3930a9d44f91a63f0edbe765c75dc8f6128b7c Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 26 Dec 2018 12:54:15 -0500
+Subject: [PATCH 1/1] Match postscreen "all server ports busy" lines.
+
+Lines that look like
+
+  NOQUEUE: reject: CONNECT from [192.168.0.1]:39410: all server ports busy
+
+were not being matched. There were two similar matches, one for a
+specific "too many connections" error
+
+ NOQUEUE: reject: CONNECT from [192.168.0.1]:7197: too many connections
+
+and another for a more general form intended to match "all screening
+ports busy" errors from postscreen:
+
+ reject: connect from [192.168.0.1]:21225: all screening ports busy
+
+The general form is preferable in my opinion, but the "screening
+ports" message is a bit of a black sheep. As a result, even the more
+general regular expression didn't match the other two errors due to
+their beginning with "NOQUEUE" and using an uppercase "CONNECT".
+
+To fix this, the general regular expression was made even more
+general. Now, a leading "NOQUEUE: " is optional, and the "CONNECT" can
+be capitalized. Thus, one regular expression now catches all three
+messages.
+---
+ postfix-logwatch | 13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/postfix-logwatch b/postfix-logwatch
+index 827dfe0..648ba7a 100644
+--- a/postfix-logwatch
++++ b/postfix-logwatch
+@@ -4399,14 +4399,11 @@ sub postfix_postscreen {
+       }
+    }
+ 
+-   elsif ($line =~ /^NOQUEUE: reject: CONNECT from \[([^]]+)\](?::\d+)?: too many connections/) {
+-      # NOQUEUE: reject: CONNECT from [192.168.0.1]:7197: too many connections
+-      $Counts{'postscreen'}{'reject'}{'Too many connections'}{$1}{$END_KEY}++      if $Collecting{'postscreen'};
+-   }
+-
+-   elsif ($line =~ /^reject: connect from \[([^]]+)\](?::\d+)?: (.+)$/) {
+-      # reject: connect from [192.168.0.1]:21225: all screening ports busy
+-      $Counts{'postscreen'}{'reject'}{"\u$2"}{$1}{$END_KEY}++      if $Collecting{'postscreen'};
++   elsif ($line =~ /^(NOQUEUE: )?reject: (connect|CONNECT) from \[([^]]+)\](?::\d+)?: (.+)$/) {
++       # NOQUEUE: reject: CONNECT from [192.168.0.1]:7197: too many connections
++       # NOQUEUE: reject: CONNECT from [192.168.0.1]:39410: all server ports busy
++       # reject: connect from [192.168.0.1]:21225: all screening ports busy
++      $Counts{'postscreen'}{'reject'}{"\u$4"}{$3}{$END_KEY}++      if $Collecting{'postscreen'};
+    }
+ 
+    elsif ($line =~ /^(?:WHITELIST VETO) \[([^]]+)\](?::\d+)?$/) {
+-- 
+2.19.2
+
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r3.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r3.ebuild
new file mode 100644
index 000000000000..1e6cf975500f
--- /dev/null
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 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"
+)
+
+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
+}