gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /net-mail
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
97 files changed, 518 insertions, 2852 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 6e82a0587d2d..7562f9360622 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 58dc2922cc48..9bbb51a40370 100644
--- a/net-mail/amavis-logwatch/Manifest
+++ b/net-mail/amavis-logwatch/Manifest
@@ -1,16 +1,3 @@
-AUX SANITIZED-NULL-bytes-messages.patch 1266 BLAKE2B e0bc9f068071c1adeb22c3f2c4b63a735f1af950bbde7f6f21909e66db36efb4914c86081839cd1e61af345006b9d31c80a2e40ccc456008ed3f4cd6c2971db9 SHA512 fa8cbd9e12a22e0a57c66cfd3a93f653780bc26c0bf15967fc423b34627567f976fbdae46c7e0a42afcbe328c9224e63c204b566f30da03b734aa206828d8413
-AUX file-libmagic-errors.patch 1330 BLAKE2B b21498826fb131bd1fd106c38eefdad35ace6465a026a624ce060d88ced90bee896ec28dac89bd678073911a35e8ee0bce88ee9d223df6186559481ed8a1d407 SHA512 8b2603ef414bd54fc2007bccfe6d12083c95f1f4fd81bdbd0bea4c45e6be57d6f1fd7851587ac95c0be740366f536e04512a2ea5220bf7fdb7e3a6317b0ae177
-AUX handle-clamd-select-failed.patch 1462 BLAKE2B add789516837d483a2fe103f8ce811cf5d21194eb433a484e68693e5b6e3a74eb644b73eefcbf8a41cad0a37ea97544052ca73dafd75081fb308d573f758ad57 SHA512 32c9d4b486274c2e2a628b0abecc5192d3ef3929ff713805a3c10671943a9d17c715fb8014a86eeb064f212c010413e8873bb85aeb1e27ebe11ed19f14b6a70b
-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
 DIST amavis-logwatch-1.51.04.tar.xz 66036 BLAKE2B da2ae91db65586497e5e5bf53b94f8eab84f26ebbad26f563d14ff11960d5c3bd2e046f0a056c28c53c5ce40c6193a812abb4f93db5d7a18747c40444b954d3f SHA512 aec2f6ccc1af7744364e734e2893adc68e034bfab8c9f96bd32e74c6c947c1b39faef2d442d32e50f2578fbc4687dfd2b339856624330aef64ae6cf4e408456f
-EBUILD amavis-logwatch-1.51.03-r5.ebuild 1419 BLAKE2B 473dacf0d49b067d0a6354c7026f54c9d8d320997ef7f2abeb2b4ac6a42f992235b64b213322f2e28995a1f338b97550a617913f8d84e7542488b351fde689a5 SHA512 bc2bf187d2165207c5ac62964444dcbcc994101bce9baa50dfec1798750bfe53ba2b38c5ef1152950ab2ec4529d08a82665c76dccc4a8f1d0c20ec6c02352fcd
-EBUILD amavis-logwatch-1.51.04.ebuild 930 BLAKE2B e382e23df0018aa557838f4dc19eb56af29068012b71bc0277aa4649aa37ee2e55cc2b904e5c9b9bcf3f7e640f19dfcdcfef03fa193c2db56e5c30622c059e29 SHA512 dbcbeedc6410db6bf7ca764a22eebe045cb53b1cd1059601c941ca780074058923a5da6545a5c2c85d0a662864160de52d81e3c73189d52cb1e680e59f922d35
+EBUILD amavis-logwatch-1.51.04.ebuild 928 BLAKE2B b43556ae3a6b51b79d9c7b1a60374d78a52df4d8a9cc3d0ec16524c76cb578a4f4b46088b67f82aa1e47873f7f4862261edca8c95846675cdaa191021d06c128 SHA512 cf6d542b6d4277ac800f2c1083464049c1f3e83b3a8d73b9c1120c73151cc913c00573d5ebd465d529d444b4c761c28a07879b993d477aeb2f36fc5659cabca2
 MISC metadata.xml 219 BLAKE2B 27094593eb47f098fe9df926d3a827b65c2ca39ac6b03d392efe2c19d646274e5b462f65a7177ba2556a9167c994544688e53a3df810dc7f86ae43c4a75fd59e SHA512 e990bf6d766d6c0380344187a03b66380e4ed7a1554dd7a900ccf1f6f2dd3a51b06b382cedd5c73e0ad75301436b351fea0e7f1fb720c3d1345a8958554d341c
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild
deleted file mode 100644
index 17b9ad2d5afe..000000000000
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 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"
-	"${FILESDIR}/handle-clamd-select-failed.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/amavis-logwatch-1.51.04.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
index 3369b162db4f..fcb4e13709c5 100644
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/net-mail/amavis-logwatch/files/SANITIZED-NULL-bytes-messages.patch b/net-mail/amavis-logwatch/files/SANITIZED-NULL-bytes-messages.patch
deleted file mode 100644
index 0cc27f0bd226..000000000000
--- a/net-mail/amavis-logwatch/files/SANITIZED-NULL-bytes-messages.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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/file-libmagic-errors.patch b/net-mail/amavis-logwatch/files/file-libmagic-errors.patch
deleted file mode 100644
index 2a28c4ee623b..000000000000
--- a/net-mail/amavis-logwatch/files/file-libmagic-errors.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 63421f1c92403149be838c64ebb731778c148dde Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 7 Sep 2017 07:36:39 -0400
-Subject: [PATCH 1/1] Ignore errors from the File::LibMagic describe_filename
- function.
-
-Newer versions of amavisd-new can make use of the File::LibMagic
-library (as opposed to the "file" executable) to get information about
-attachments. Using the library should be faster, but when it fails, it
-does so in a novel way:
-
-  (02859-21) File::LibMagic::describe_filename failed on p003: libmagic
-  JPEG image data, Exif standard: [TIFF image data, big-endian,...
-
-This commit adds such lines to the global ignore list, since they
-don't provide us with any useful information.
----
- amavis-logwatch | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/amavis-logwatch b/amavis-logwatch
-index 448de3a..ac93cbc 100644
---- a/amavis-logwatch
-+++ b/amavis-logwatch
-@@ -2033,6 +2033,7 @@ sub create_ignore_list() {
- 
-    push @ignore_list_final, qr/^Inserting header field: X-Amavis-Hold: /;
-    push @ignore_list_final, qr/^Decoding of .* failed, leaving it unpacked: /;
-+   push @ignore_list_final, qr/^File::LibMagic::describe_filename failed on p\d+: /;
- 
-       # various forms of "Using ..."
-       # more specific, interesting variants already captured: search "Using"
--- 
-2.13.0
-
diff --git a/net-mail/amavis-logwatch/files/handle-clamd-select-failed.patch b/net-mail/amavis-logwatch/files/handle-clamd-select-failed.patch
deleted file mode 100644
index 83dad161e18a..000000000000
--- a/net-mail/amavis-logwatch/files/handle-clamd-select-failed.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 869fa9d8b2113f50c3a97ef9f4a1f95171702be4 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 13 Feb 2019 11:25:33 -0500
-Subject: [PATCH 1/1] Catch "Select failed: Interrupted system call" entries
- from clamd.
-
-When a select() call in clamd is interrupted, amavis logs the
-following warning:
-
-  ClamAV-clamd: Select failed: Interrupted system call at /usr/sbin/amavisd
-  line 8472, <GEN16> line 296., retrying (1)
-
-These are harmless in and of themselves, but we would like to classify
-them as warnings. Currently they are unmatched. This commit adds a
-pattern for them, moving them from the "Unmatched Entries" heading to
-"Miscellaneous warnings" instead. Afterwards, the report looks like,
-
-  24   Miscellaneous warnings --------------------------------
-   2      ClamAV-clamd: Select failed: Interrupted system call
----
- amavis-logwatch | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/amavis-logwatch b/amavis-logwatch
-index 044c94d..4c9b59f 100644
---- a/amavis-logwatch
-+++ b/amavis-logwatch
-@@ -2817,6 +2817,7 @@ while (<>) {
-           ($p1 =~ /^TROUBLE/) or
-           ($p1 =~ /Can't (?:connect to UNIX|send to) socket/) or
-           ($p1 =~ /: Empty result from /) or
-+          ($p1 =~ /: Select failed: Interrupted system call/) or
-           ($p1 =~ /: Error reading from socket: Connection reset by peer/) or
-           ($p1 =~ /open\(.*\): Permission denied/) or
-           ($p1 =~ /^_?WARN: /) or
--- 
-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
deleted file mode 100644
index f3ce1d1091af..000000000000
--- a/net-mail/amavis-logwatch/files/ignore-all-sd_notify-lines.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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/ignore-amavis-startup-notifications.patch b/net-mail/amavis-logwatch/files/ignore-amavis-startup-notifications.patch
deleted file mode 100644
index 4dd019186e41..000000000000
--- a/net-mail/amavis-logwatch/files/ignore-amavis-startup-notifications.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 15bf4096ea496a28210e2f4c1f34ab28b413566a Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 24 Aug 2017 08:52:18 -0400
-Subject: [PATCH 3/4] Ignore amavisd-new "starting child processes"
- notifications.
-
-Newer versions of amavisd-new log the following constantly:
-
-  sd_notify (no socket): STATUS=Starting child process(es), ready for work.
-
-It's of no use to us, so add it to the global "ignore" list.
----
- amavis-logwatch | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/amavis-logwatch b/amavis-logwatch
-index 1aab787..06b60c8 100644
---- a/amavis-logwatch
-+++ b/amavis-logwatch
-@@ -2044,6 +2044,8 @@ sub create_ignore_list() {
-         # unanchored
-    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./
- }
- 
- # Notes:
--- 
-2.13.0
-
diff --git a/net-mail/amavis-logwatch/files/ignore-utf8smtp-lines.patch b/net-mail/amavis-logwatch/files/ignore-utf8smtp-lines.patch
deleted file mode 100644
index 83fd4cb80a42..000000000000
--- a/net-mail/amavis-logwatch/files/ignore-utf8smtp-lines.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a8dac25fe398e42abdb89b85b1435d52386827b4 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 24 Aug 2017 09:05:04 -0400
-Subject: [PATCH 4/4] Ignore UTF8SMTP lines.
-
-Lines that look like,
-
-  UTF8SMTP :10024 /var/...: <sender@example.net> -> <rcpt@example.com>
-  BODY=8BITMIME SMTPUTF8 Received: from mx.example.com ([127.0.0.1]) by...
-
-were previously unmatched because of the relatively-new "UTF8SMTP".
-Similar lines that have "ESMTP" instead of "UTF8SMTP" are already
-ignored, so it makes sense to ignore the "UTF8SMTP" lines too.
----
- amavis-logwatch | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/amavis-logwatch b/amavis-logwatch
-index 06b60c8..deb9146 100644
---- a/amavis-logwatch
-+++ b/amavis-logwatch
-@@ -2132,6 +2132,7 @@ while (<>) {
-         or ($p1 =~ /^SpamControl/)
-         or ($p1 =~ /^Perl/)
-         or ($p1 =~ /^ESMTP/)
-+        or ($p1 =~ /^UTF8SMTP/)
-         or ($p1 =~ /^(?:\(!+\))?(\S+ )?(?:FWD|SEND) from /)            # log level 4
-         or ($p1 =~ /^(?:\(!+\))?(\S+ )?(?:ESMTP|FWD|SEND) via /)       # log level 4
-         or ($p1 =~ /^tempdir being removed/)
--- 
-2.13.0
-
diff --git a/net-mail/amavis-logwatch/files/no-pid_file-configured.patch b/net-mail/amavis-logwatch/files/no-pid_file-configured.patch
deleted file mode 100644
index 5f23955366e3..000000000000
--- a/net-mail/amavis-logwatch/files/no-pid_file-configured.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/redundant-argument-to-sprintf.patch b/net-mail/amavis-logwatch/files/redundant-argument-to-sprintf.patch
deleted file mode 100644
index 91f456afdd11..000000000000
--- a/net-mail/amavis-logwatch/files/redundant-argument-to-sprintf.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 02cf771776d2f1ad9d7872f3959e41a548adfab9 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 24 Aug 2017 08:20:59 -0400
-Subject: [PATCH 2/4] Fix redundant argument to sprintf warning.
-
-Perl 5.22 now warns about redundant (i.e. extra) arguments to the
-sprintf function. If your format string only has two place-holders but
-you pass three place-fillers, you get warned:
-
-  Redundant argument in sprintf at ./amavis-logwatch line 1338...
-
-The issue there was that the format string passed to sprintf was
-constructed dynamically; sometimes it would contain two place-holders,
-and sometimes three. Three place-fillers were always passed, so when
-only two place-holders were used, the warning would be thrown. This was
-fixed by testing whether or not there are two or three place-holders,
-and passing the appropriate number of place-fillers.
----
- amavis-logwatch | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/amavis-logwatch b/amavis-logwatch
-index 8972497..1aab787 100644
---- a/amavis-logwatch
-+++ b/amavis-logwatch
-@@ -1334,8 +1334,17 @@ sub print_summary_report (\@) {
-                      $$divisor == $Totals{$keyname} ? 100.00 : $Totals{$keyname} * 100 / $$divisor;
-             }
-             else {
--               push @{$lines[$cur_level]}, 
--                  sprintf "$fmt  %-23s $extra\n", $total, $desc, commify ($Totals{$keyname});
-+		my $new_line;
-+		if ($extra eq '') {
-+		    $new_line = sprintf("$fmt  %-23s \n", $total, $desc);
-+		}
-+		else {
-+		    $new_line = sprintf("$fmt  %-23s $extra\n",
-+					$total,
-+					$desc,
-+					commify ($Totals{$keyname}));
-+		}
-+		push @{$lines[$cur_level]}, $new_line
-             }
-          }
-       }
--- 
-2.13.0
-
diff --git a/net-mail/amavis-logwatch/files/unchecked-encrypted.patch b/net-mail/amavis-logwatch/files/unchecked-encrypted.patch
deleted file mode 100644
index 33c2214a2d09..000000000000
--- a/net-mail/amavis-logwatch/files/unchecked-encrypted.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From e9f83dde1b241ce449264db7a517124bb115dd99 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 6 Sep 2017 09:19:42 -0400
-Subject: [PATCH 1/1] Catch mail that is passed UNCHECKED-ENCRYPTED.
-
-Some encrypted mail can pass through the system with a log line like,
-
-  (01495-17) Passed UNCHECKED-ENCRYPTED {RelayedTaggedInbound}, ...
-
-These were unmatched, because the "-ENCRYPTED" suffix is new. One
-regular expression and a dictionary have been updated to catch those
-lines and dump them into the "unchecked" bin with the rest of the
-UNCHECKED lines.
----
- amavis-logwatch | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/amavis-logwatch b/amavis-logwatch
-index deb9146..448de3a 100644
---- a/amavis-logwatch
-+++ b/amavis-logwatch
-@@ -1799,6 +1799,7 @@ my %ccatmajor_to_sectkey = (
-    'INFECTED'    => 'malware',
-    'BANNED'      => 'bannedname',
-    'UNCHECKED'   => 'unchecked',
-+   'UNCHECKED-ENCRYPTED' => 'unchecked',
-    'SPAM'        => 'spam',
-    'SPAMMY'      => 'spammy',
-    'BAD-HEADER'  => 'badheader',
-@@ -2295,7 +2296,7 @@ while (<>) {
-       #XXX elsif (($action, $key, $ip, $from, $to) = ( $p1 =~ /^(?:Virus found - quarantined|(?:(Passed|Blocked) )?INFECTED) \(([^\)]+)\),[A-Z .]*(?: \[($re_IP)\])?(?: \[$re_IP\])* [<(]([^>)]*)[>)] -> [(<]([^(<]+)[(>]/o ))
- 
-       # the first IP is the envelope sender.
--      if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: \{[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) {
-+      if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|UNCHECKED-ENCRYPTED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: \{[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) {
-          inc_unmatched('passblock');
-          next;
-       }
--- 
-2.13.0
-
diff --git a/net-mail/amavis-logwatch/files/unescaped-left-brace.patch b/net-mail/amavis-logwatch/files/unescaped-left-brace.patch
deleted file mode 100644
index 2cb293b89e8b..000000000000
--- a/net-mail/amavis-logwatch/files/unescaped-left-brace.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 79f37650aa72fe3feeed682ee2b79686ee2b6547 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 24 Aug 2017 08:16:05 -0400
-Subject: [PATCH 1/4] Fix unescaped left brace warning in monster regex.
-
-New versions of Perl are starting to complain about unescaped braces
-in regular expressions, and supposedly the warning will become a fatal
-error in Perl 5.30. This particular warning is,
-
-  Unescaped left brace in regex is deprecated, passed through in regex;
-  marked by <-- HERE in m/^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)
-  |BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?:
-  { <-- HERE [^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]),
-  (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/ at
-  /usr/bin/amavis-logwatch line 2286.
-
-and it was fixed by going to line 2286 and putting a backslash before
-the left brace.
----
- amavis-logwatch | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/amavis-logwatch b/amavis-logwatch
-index 4ad07f6..8972497 100644
---- a/amavis-logwatch
-+++ b/amavis-logwatch
-@@ -2283,7 +2283,7 @@ while (<>) {
-       #XXX elsif (($action, $key, $ip, $from, $to) = ( $p1 =~ /^(?:Virus found - quarantined|(?:(Passed|Blocked) )?INFECTED) \(([^\)]+)\),[A-Z .]*(?: \[($re_IP)\])?(?: \[$re_IP\])* [<(]([^>)]*)[>)] -> [(<]([^(<]+)[(>]/o ))
- 
-       # the first IP is the envelope sender.
--      if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: {[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) {
-+      if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: \{[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) {
-          inc_unmatched('passblock');
-          next;
-       }
--- 
-2.13.0
-
diff --git a/net-mail/amavis-logwatch/files/will-bind-to-lines.patch b/net-mail/amavis-logwatch/files/will-bind-to-lines.patch
deleted file mode 100644
index 464a85b1c56d..000000000000
--- a/net-mail/amavis-logwatch/files/will-bind-to-lines.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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/automx2/Manifest b/net-mail/automx2/Manifest
index 4983e620ab52..713bfafeacc3 100644
--- a/net-mail/automx2/Manifest
+++ b/net-mail/automx2/Manifest
@@ -1,8 +1,8 @@
 AUX conf 721 BLAKE2B 976a2936da5e9eef71d9d08f7f12c51151549c23c27918de28da355e87e4927f84cc63904ab0feb0d10a11326ce6e44cc11531d65f6abe3d1ce213ea2e632e24 SHA512 f931acb2e5060872219709b525d64cae630062eb842e55614d57324ff5e801b4b9a99faf47c706ffe67822b29a7fb680ed59db550470afa9ded80621d4bbe3b8
 AUX confd 213 BLAKE2B 2573f19bdc9022357f2f92ff17d84a1e77078c6c05a46a09b6e57ab7132d1f1078fb5003640f83213f746f94e3ab5b482b01d92feb94684665eb4e796a642841 SHA512 6c04de3ef26fd132269532c7bdca3263e95cebf5078ddd57e8ebff62229fabfb64b8ad4d988dfe99c9611c5d1081b4d3862f09d11c08aa1aabc1d5bc7c987439
 AUX init-r1 608 BLAKE2B 7d2b93482c62fe0219c7194279ee495274e4b0b8319ccf2d24e7816abe7eb23452bc21c01305283deeb8224c3668641b1bd5a7f3fbf8fe783a28e58268511ace SHA512 4a1ed2c45e1414734b8e5cbb731377da2087bd4f1a1075b4acb81b5057a65c0557e9e1a05cdf6856da35067a589d9c56fcf13156e8872facfc8f161bb3cade0f
-DIST automx2-2021.6.tar.gz 175423 BLAKE2B 26c83f0932b7a6b13b2c0f476a90bf1a3f134ab33e07b16a13034495c51b5d6ee744d7735352c7833c4a5a5c441dba003b68d4b2de95cb4e75aa7d0b726917d6 SHA512 0a2bc51f1ba70bf4e27f234e6a25f97eae5e4a841b93ade7baa2a87ffa485185220bd70779018d5e438ab04f4f6e9b9605be780efd1b803dd7133520fd4ef360
 DIST automx2-2022.0.tar.gz 183324 BLAKE2B 1fda53019cc20979806157db3b740d5bd0c41d545745471188ca6d200dee490c84abb1e353694f5fe45e75983ca8449258ad7fd75e085d10523fd8b0e6310e87 SHA512 2fde481c3b5459a8a0441edf0f8a664615734859a299924207edd35a2e254e2900d88c41e6ec6e7379effbe9c4b7ab7db39ffa81bfc8691a3de5643bbd20d4be
-EBUILD automx2-2021.6.ebuild 1154 BLAKE2B 4c33ad82507464e736df8d57893922ea09ebcbd438d632d0ca69aaed3ab98193bcc3aada60f70575ebceeb2fe19f4de07468425e47a95d03fba307567b5fd99c SHA512 6b0b80afc146cf01e9140e686b276afe09f0d24450478bc4c49c31b3d12e6b68f57f32400b127cc845b3ee33b76f0512118c5088e8e91f78ce539073783ffd01
-EBUILD automx2-2022.0.ebuild 1144 BLAKE2B 43bad3ad273039a30a3eb3bd0b54b5f604fea36786e1756a54a76e4c8e1e47a25f2412a15fa7d2f60cd8ae6dd28d1d302ef5fd09353c99a68f6daaab274c4bb5 SHA512 242bd6ad54d72e2c6c43386cf30a9fb2099d7ab11d14bf60d91224cfad8fe71bfa236d5a80f21896b4cd9a10341637005c4b1cdcae7466ec7ff4497d652589ba
+DIST automx2-2022.1.tar.gz 182519 BLAKE2B baf2ecc801f6f024eb6a6fe2610d6cb7c3dd0726cfa877fdea76d94ebf16b9393addc5be8844f3017fd664b73adc74f2cd898736bbcad1fa0b2b3c1022cb638a SHA512 3d6fb9cf01cff641c78851560d72e3d80f9011cca4cd438cd49e999feef3f290bbd9495655f41319eb5456beac09bb8862dc327b521254266e0d53aa17b0bbd3
+EBUILD automx2-2022.0.ebuild 1149 BLAKE2B d9a19cb43b90c72230cfc6af5ad17cf6aa43ecb8aa6d6cc700399580c5a289b31e508fcdb4106ca1d4bc12bcf72e4b78814734d677bc3f1f73dfab9c037122a3 SHA512 62137e5f4a7c4d2d4277c56c43e2f24118b77dbf70eac85c3f8a02ea7a396a0381267cf03e958c3ddb4cebf65cf8a1428210151c39da3efd15c47de179fd4713
+EBUILD automx2-2022.1.ebuild 1182 BLAKE2B 370cfea84f89c7b2d667d35100df8bdd62f5044f5511c88c3d810a066861c65cef0e5086b6b571043dc26d20decc7c4b7114fbb748e30c43c8697eb190a334c5 SHA512 71c0c29386ff2453c14985e2fb6b8ce59df07b115c42ab0864de5fa2041470ce7ca51072e2eeb69aac27107997ad878db041c6beb8a6657014d751f00227556a
 MISC metadata.xml 918 BLAKE2B 8f693feed959a0394e8be4a0f489c4913e142aaec8e71920fc0ace1e3ef1f8b5c79a312139bca612c3d204854f6e222252b25b1343539829f3950d1ae344483c SHA512 77e8f20c9af068189d12ba06ac566d03f8b86435b3c88682c6819975fc0636e4e427ab07b76db9d0e32a5b51b7861715c60209f6ee5ae0d4fb0a19a53c4b98a0
diff --git a/net-mail/automx2/automx2-2022.0.ebuild b/net-mail/automx2/automx2-2022.0.ebuild
index 8242a1ded8da..20fbebce7c04 100644
--- a/net-mail/automx2/automx2-2022.0.ebuild
+++ b/net-mail/automx2/automx2-2022.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rseichter/automx2/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="acct-user/automx2
 	dev-python/flask[${PYTHON_USEDEP}]
@@ -35,8 +35,8 @@ python_test() {
 }
 
 python_install_all() {
-	local DOCS=( ${S}/docs/*.adoc ${S}/contrib/*sample.conf )
-	local HTML_DOCS=( ${S}/docs/*.{html,svg} )
+	local DOCS=( "${S}"/docs/*.adoc "${S}"/contrib/*sample.conf )
+	local HTML_DOCS=( "${S}"/docs/*.{html,svg} )
 	newconfd "${FILESDIR}/confd" "${PN}"
 	newinitd "${FILESDIR}/init-r1" "${PN}"
 	insinto /etc
diff --git a/net-mail/automx2/automx2-2021.6.ebuild b/net-mail/automx2/automx2-2022.1.ebuild
index 8f23e1fc2e4c..43acbf695022 100644
--- a/net-mail/automx2/automx2-2021.6.ebuild
+++ b/net-mail/automx2/automx2-2022.1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -13,10 +14,9 @@ SRC_URI="https://github.com/rseichter/automx2/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
-BDEPEND="acct-user/automx2"
-RDEPEND="
+RDEPEND="acct-user/automx2
 	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/flask-migrate[${PYTHON_USEDEP}]
 	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
@@ -36,8 +36,8 @@ python_test() {
 }
 
 python_install_all() {
-	local DOCS=( ${S}/docs/*.adoc ${S}/contrib/*sample.conf )
-	local HTML_DOCS=( ${S}/docs/*.{html,svg} )
+	local DOCS=( "${S}"/docs/*.adoc "${S}"/contrib/*sample.conf )
+	local HTML_DOCS=( "${S}"/docs/*.{html,svg} )
 	newconfd "${FILESDIR}/confd" "${PN}"
 	newinitd "${FILESDIR}/init-r1" "${PN}"
 	insinto /etc
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 76c99de80e35..0d905c5498a0 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -8,8 +8,10 @@ DIST cyrus-imapd-3.0.16.tar.gz 10875516 BLAKE2B 10915418b4de3f460a20d3808274f9ea
 DIST cyrus-imapd-3.0.17.tar.gz 11445224 BLAKE2B bf2cd85f878c1b4198be5ce96cf6a4ae1e4fcc765b0c7fe60a6bfd04dd066c0420f86508cbfc1030831b57c2732715440cbf0e327f5147b074fe12926dcda85f SHA512 75519bf8a2ae4a8ff844338bee641d519eaf3419fb81b819dc7a42e5956ef57569e47a0e094ccb9726a9c43f0469cd3def6c62783565b2a2aaa863bda354a7da
 DIST cyrus-imapd-3.4.2.tar.gz 12603768 BLAKE2B 515c36fc3d6a29991283d47a3e523d87a68c3191b4aae85074f40b2416fe3a89793f1991dc5729912a3d56247f6fbf4aed52abcadbc37ca7cc9bf857a8641871 SHA512 4d7d14e222bc1e97b2d8188804139c4c477de66cb621caba475b57533739ee59d88504d4f47735bb6a6b3c9097dbec382ecfa2c678f978791b9a6956a3cd91d6
 DIST cyrus-imapd-3.4.3.tar.gz 13182110 BLAKE2B 485df8e2518a55a3b096d0c330d55f7ed93209ca4ab5851dda53083082e203ad9b1d9218c0863a9bd1e678a732427ef499ff78bacf2d3fb2fe18464186a9e6d2 SHA512 5c4db2a0c26d2323332c1ba67f7b207acfad15f0442f20c6c8a205b5423498465524398315946213c8168bc7eba1fd9f7dc573a91efac6708bfbaf2cb57e9276
+DIST cyrus-imapd-3.4.4.tar.gz 13236335 BLAKE2B 105ae3defcf321a01394b38672b080ea58f68ecdc41384af46186c6ef88c02061ac066bd3e382d7b649761d5e462f2310a4568989c87e5ec518e08051179f4b3 SHA512 7904a9d0535e9d606bbb7748a4886e10092e2b682180dddf94933199f19402ae6f5cc4472a3797decf9ef20d3a8b7f1715ab00f6751037f14b19cd7322942dc2
 EBUILD cyrus-imapd-3.0.16-r2.ebuild 6016 BLAKE2B e85d06a61f6c6573624cbbc92a118712dde2e095174fd7726ee09d4e765d435613e0534d7a76d0df4c94118207b799507d18d27670607c852c12c2b74cb127cb SHA512 35ac8660c0d6812b162083004559dd71ddaef2ea7d34320901b2639a4d6033bbe0d7b448292df2117a5cd03f3469e172cdc6b9645281979a6befe85ab56edcbe
 EBUILD cyrus-imapd-3.0.17-r1.ebuild 6022 BLAKE2B 619618570289290e0a697e9280a18f249ef8898d1324f77f43b8ae0b275694f7b4f94b34ad822e4c90a923ed86b5d542d8b232e3a762aa093f353c0aad721f74 SHA512 17bc28ca592afc4c6a29fc765738c41c753e1f58996c40017d24c81584bf58493bc9e619ed36b4a6b6c90003cc9c4cd6e392f89a7b252bde16ed07af30240dbc
 EBUILD cyrus-imapd-3.4.2-r2.ebuild 5964 BLAKE2B d3b7b21d6da88a922562ab86a32995c89c4e18b550b20eef3e1f7c7b152262b01c0b57839b12acbe7afff20be07908557a43669eb853c1cf44ad2899a3cdba30 SHA512 c7645c12b7506b83f7db973eea2719f9fb4ce902ac312338df9c5a2faca0e22520c8af04c9e0e65348b672d61796789952b910a8e60b8476c876360e05d85d63
 EBUILD cyrus-imapd-3.4.3-r2.ebuild 6312 BLAKE2B e9bf941312e9e622202abadc96e292449eb546c8dc8c432175ec15c723ddb18a5d46a66f86e4a93bbe5235c65458b14b6894d401b69879835a7598acf5fbaf7a SHA512 97056231855cdce65e008aa8b4bb56bd79c2c617606df61e0e662c7c818521567b04f7677b67684f06d87d813d4053d98b5d9b0ba61a1a68c08b9fba64a71527
+EBUILD cyrus-imapd-3.4.4.ebuild 6312 BLAKE2B e9bf941312e9e622202abadc96e292449eb546c8dc8c432175ec15c723ddb18a5d46a66f86e4a93bbe5235c65458b14b6894d401b69879835a7598acf5fbaf7a SHA512 97056231855cdce65e008aa8b4bb56bd79c2c617606df61e0e662c7c818521567b04f7677b67684f06d87d813d4053d98b5d9b0ba61a1a68c08b9fba64a71527
 MISC metadata.xml 756 BLAKE2B e67e371c0daf545e354680a35bbfda109d5bac966c75d048f3fef045def983410926fb02bd9f36906251b32696cba41733969912c0d5a5496717de0626fd10ae SHA512 0e558ce2562227134bb7c5ebc95b44b353b2e4361744366862708ff8942a1cddffb931d58811fa6c511b7057a083e05c47c76453ba3dfba89d77ba8db0402b7b
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild
new file mode 100644
index 000000000000..fd888906a05d
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Keep an eye on https://www.cyrusimap.org/imap/developer/compiling.html!
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap \
+	mysql nntp pam perl postgres replication +server sieve \
+	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson:=
+	dev-libs/icu:=
+	sys-apps/util-linux
+	sys-fs/e2fsprogs:=
+	sys-libs/zlib:=
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical:= )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? (
+		app-arch/brotli:=
+		app-arch/zstd:=
+		dev-libs/libxml2
+		dev-libs/libical:=
+		net-libs/nghttp2:=
+		sci-libs/shapelib:=
+	)
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+		>=net-mail/mailbase-1
+		sys-libs/pam
+	)
+	perl? (
+		dev-lang/perl:=
+		virtual/perl-Term-ReadLine
+	)
+	postgres? ( dev-db/postgresql:* )
+	ssl? ( >=dev-libs/openssl-1.0.1e:=[-bindist(-)] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	xapian? ( >=dev-libs/xapian-1.4.0:= )"
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${DEPEND}
+	acct-group/mail
+	acct-user/cyrus
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump"
+DEPEND+=" test? ( dev-util/cunit )"
+BDEPEND="sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc"
+
+REQUIRED_USE="afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+#PATCHES=(
+#	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+#)
+
+src_prepare() {
+	default
+
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# bug #604466
+	append-ldflags $(no-as-needed)
+
+	# Workaround runtime crash
+	# bug #834573
+	append-flags -fno-toplevel-reorder
+
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+
+	# TODO:
+	# - revisit --with-sphinx-build=no? (it's docs this time, not the search engine)
+	# - post-emerge message re lmdb removal?
+	econf \
+		--enable-murder \
+		--enable-idled \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--with-sphinx-build=no \
+		--without-krb \
+		--without-krbdes \
+		--enable-squat \
+		--with-zlib \
+		--without-wslay \
+		--without-chardet \
+		--without-cld2 \
+		--disable-srs \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_with http nghttp2) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		$(use_enable test unit-tests) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+
+	cp -r contrib tools "${ED}"/usr/share/doc/${PF} || die
+	rm -f doc/text/Makefile* || die
+
+	mv "${ED}"/usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${ED}"/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf cyrus.conf
+	newins "${ED}"/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${ED}"/etc/imapd.conf || die
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${ED}"/etc/cyrus.conf || die
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${ED}"/etc/cyrus.conf || die
+	fi
+
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${ED}"/etc/cyrus.conf || die
+	fi
+
+	newinitd "${FILESDIR}"/cyrus.rc8 cyrus
+	newconfd "${FILESDIR}"/cyrus.confd cyrus
+	newpamd "${FILESDIR}"/cyrus.pam-include sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [[ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+}
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index bbf249b72cf0..0293572b7211 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -6,6 +6,6 @@ AUX dbmail-pop3d.initd 867 BLAKE2B 2d24bbe482c28fab0884377bbd47fe7a859313d8c8b20
 AUX dbmail-timsieved.initd 930 BLAKE2B 4eb24e608540d994d75c8aea44aa8128e603fd9c64c4a8205c9581cc521e4a0ca75391796d4a9b369cdcbe74636cdaf55c00408c14b7cc9ec4ad4db307445909 SHA512 7f66fa4b77a638e803f1763809da66bd26f54b435f8e4cff3304d4b4e62d1510485c1af943046489a8c37b3b93a8b6cf4901feefa9f1f38dcdaa313211f19fa0
 DIST dbmail-3.2.3.tar.gz 2444227 BLAKE2B baa812fb3e925e6d896762596426208fc2ac5fcb01cb8100cfbd0464f1342f934c099ca52fd857e05fc82b97227155e9dcfc987d6c9b5c37e7daf21b167c9841 SHA512 29cc89830278f2ff28a4221fc81d4ff13cc371fbca7fb51d5376e9243234220b552cb4b6ec035c150e6cfa178435c4f36b9ce132fc02334bc6cdeb1a41c8ed85
 DIST dbmail-3.2.5.tar.gz 2463966 BLAKE2B f4099c6f869dbb041d7eccdf20f3a34d36918237cc0386c71a1d339da8651b9301e676b25201856038045bb9590f880353c6ccafd57330f9cf48382c1b4c603c SHA512 6b0d7e1f6f7449869db1e094ffce9e1ef315c60784ea5ae5f814f2cf9a18c358b4c5d107a420c7317961ffa343fc59c9083789177514aee96523927688f276a0
-EBUILD dbmail-3.2.3-r5.ebuild 3962 BLAKE2B fadb891d448426025b7f49248f3cd110c48aeba946181f2d113a92e344f3cf0dfac3b1026db42037bfb296e62a552fb3004f63ea4beca7e04f09d2d68e5caa62 SHA512 4dba4024c5407ea654ae25eef87dabdaa571e149b2dc3b9fc77804cf85ce058fbcd655334bcaad5507e6f01200a61b1239bfd61735cca1cd8c5d23f2b68db924
-EBUILD dbmail-3.2.5-r2.ebuild 2396 BLAKE2B 59abc9fed5451bdbdd8565f37b7601347140a183229084cc4c96a7f0f149fb7740fecf4fb1645dce3452d0ac948ef151413036bf41f3e02b241b6377bca8a542 SHA512 043b8ed0108326c07a169a4f10715d4a6b9b7e904bfc73be784d7bf46dbc80eaf242838dff26ba0daa3247bdbbb8e6d8f93d70b10ba03f66fb9cca6e359789a4
+EBUILD dbmail-3.2.3-r5.ebuild 4005 BLAKE2B f39773fa94f3af0d031a8fa7c7666aa91ac9de95a55314b8e82356168f2896264cd4fe15aaeca2311a0e981cc1aafb3d792d07a1d8bb9feb536000ab608488cb SHA512 92379e527e1215bf40c3c16db02a25977d680c638dc7fba5ec074c0a0b24a7d8ec3a39acaae1cf5566f646bb6272b4e88ab9780e36d8e510a457bc04c2c8fab0
+EBUILD dbmail-3.2.5-r2.ebuild 2492 BLAKE2B de0e331eed68d1a5c5b75f393e5a9571b49b73a8eccd095d7af67b7edf2503da0e528e38ad586ab9ce285f70646d464cd05521d72388c994d587ea7ec73414cd SHA512 50522c2f81760878f374c7a91a98c50ecb0f77f58fdee9249f45d4c6a90ccf0f1d94a1a7eae31c680a938341dcbcc2225adb099853f88f23620c21f7fc77d026
 MISC metadata.xml 571 BLAKE2B 68a2a0a6d1b2cb2837c7589125f4895269d60588760a43d7b275619b5e7a01cd4625f754da41a7a377673d09ae097f53144d62c451a316a5cf1f786ee18ac74e SHA512 b3e72b2de1aa541129542f907b0a3b332402bd7f3d5d1029c36769834eae1e9e5f67fdedc40d024630d93fe766c5f346eb7e6e366b443a82a8a5bc12f1ace7e6
diff --git a/net-mail/dbmail/dbmail-3.2.3-r5.ebuild b/net-mail/dbmail/dbmail-3.2.3-r5.ebuild
index edabceb37645..50a1edf5ed0b 100644
--- a/net-mail/dbmail/dbmail-3.2.3-r5.ebuild
+++ b/net-mail/dbmail/dbmail-3.2.3-r5.ebuild
@@ -31,7 +31,8 @@ RDEPEND="
 	ssl? (
 		dev-libs/openssl:=
 	)"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
diff --git a/net-mail/dbmail/dbmail-3.2.5-r2.ebuild b/net-mail/dbmail/dbmail-3.2.5-r2.ebuild
index 17e33e79a6f2..0c48f3c6305c 100644
--- a/net-mail/dbmail/dbmail-3.2.5-r2.ebuild
+++ b/net-mail/dbmail/dbmail-3.2.5-r2.ebuild
@@ -18,6 +18,7 @@ DEPEND="dev-db/libzdb
 	sieve? ( >=mail-filter/libsieve-2.2.1 )
 	ldap? ( >=net-nds/openldap-2.3.33:= )
 	jemalloc? ( dev-libs/jemalloc:= )
+	elibc_musl? ( sys-libs/queue-standalone )
 	app-text/asciidoc
 	app-text/xmlto
 	app-crypt/mhash
@@ -32,6 +33,7 @@ DEPEND="dev-db/libzdb
 RDEPEND="${DEPEND}
 	acct-group/dbmail
 	acct-user/dbmail"
+DEPEND+=" elibc_musl? ( sys-libs/queue-standalone )"
 DOCS=( AUTHORS README.md INSTALL THANKS UPGRADING )
 
 README_GENTOO_SUFFIX=""
diff --git a/net-mail/django-mailman3/Manifest b/net-mail/django-mailman3/Manifest
deleted file mode 100644
index fc264e9b218e..000000000000
--- a/net-mail/django-mailman3/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST django-mailman3-1.3.4.tar.gz 390310 BLAKE2B 0f28e5191ddfec8196824362ffb6b406f8bbcc64e85f93ded37317502673140693c48c60a34713a90cd6651839edaa788f9f73ec8a1836a1597854316ffd3481 SHA512 0b28636caec452efeda2b1b44f1d5ad44740ab0c3ea7b03d7d2e6bf420b1a788d5858e5c827824ef6baf2a463232ec53f404d3de0c22cf6ee17065236f7fcd91
-DIST django-mailman3-1.3.7.tar.gz 404133 BLAKE2B cabaabd9514b28caf571af56b966b37893d582b3fc61b945096dd4b898635b321b239d88082c496f9b972a42bd773354e081e397418bc07c219596e7f9e0edda SHA512 923ca67cc813f59ee9e84b639c4a0b2cfe5b39b63a1a19c5b28c7727540a0ca1f1ee9ecfa12d91a314ee3d7cdb3535c939b9a240281ba277b9af276f18be28e8
-EBUILD django-mailman3-1.3.4.ebuild 657 BLAKE2B dcde478a57d048ccd605b6fb17585fb3ff569d5b1b80384335b535eddbf905a66477b115c7adb0c9942b13fb7e6af104e0af62e8d49a19c4bd815b7267c07ac3 SHA512 ad28c00eeca189b37ef7dd7cc219d830c8f07929ccb7b0887886e13faa006f525fcb6aaea9ae8c98741c43cb88cfa2dc76d014d682aa6dcba598ad537ed6d21a
-EBUILD django-mailman3-1.3.7.ebuild 748 BLAKE2B 2929115e607101c92f321fd21c6229ccebc180fbf82ddd87a8e5a76dc5616e4b2ddc7c6acb1bb3f3d3a7b9d51bfe780ce3fab5cc572d5f2cf955c48bdcdff5e3 SHA512 c8069659ce3352440bc5373c4badb35a173c123be899e46e655469b53c8062f9715dff504015a01580de854b0b682cf18e7416211e1f7d7641b5fb696b99c732
-MISC metadata.xml 333 BLAKE2B 4807a9697a54fc76817cbac659a754dd9729ee84080ad7c0609a06b7fb3f4dd76be290d115822c10fcbaea4ca651c1064af470bb577ee8ef1b1d8647fa1bce38 SHA512 eaf1b9bef0021fccddd24523e1f3b5ca1cff0d4e9e7fdc9e22812e90b0ec837c0b4e107a1aef6586d1ff63d2ae272a1ad5e3cc022aa2453bc500cc4f4147cd9f
diff --git a/net-mail/django-mailman3/django-mailman3-1.3.4.ebuild b/net-mail/django-mailman3/django-mailman3-1.3.4.ebuild
deleted file mode 100644
index 42fef6919102..000000000000
--- a/net-mail/django-mailman3/django-mailman3-1.3.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Django-based interfaces interacting with Mailman 3"
-HOMEPAGE="https://www.list.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]
-	net-mail/mailmanclient[${PYTHON_USEDEP}]
-	dev-python/django-allauth[${PYTHON_USEDEP}]
-	dev-python/django-gravatar2[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-
-DOCS=( README.rst )
diff --git a/net-mail/django-mailman3/django-mailman3-1.3.7.ebuild b/net-mail/django-mailman3/django-mailman3-1.3.7.ebuild
deleted file mode 100644
index f241f724a959..000000000000
--- a/net-mail/django-mailman3/django-mailman3-1.3.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Django-based interfaces interacting with Mailman 3"
-HOMEPAGE="https://www.list.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]
-	net-mail/mailmanclient[${PYTHON_USEDEP}]
-	dev-python/django-allauth[${PYTHON_USEDEP}]
-	dev-python/django-gravatar2[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-
-DOCS=( README.rst )
-
-python_test() {
-	local -x DJANGO_SETTINGS_MODULE=django_mailman3.tests.settings_test
-	local -x PYTHONPATH="${S}"
-	django-admin test -v 2 || die
-}
diff --git a/net-mail/django-mailman3/metadata.xml b/net-mail/django-mailman3/metadata.xml
deleted file mode 100644
index 8aed0b944d8a..000000000000
--- a/net-mail/django-mailman3/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">django-mailman3</remote-id>
-		<remote-id type="gitlab">mailman/django-mailman3</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 2b23766d6abd..a6c8a517cfb9 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,18 +1,10 @@
 AUX dovecot-autoconf-lua-version-v2.patch 524 BLAKE2B a0cb51a21169e55fe0ae92ed7fad3ccc898585ed4b0c9ed3db243b6f41165d5a4ad6470a6a76f5a04a44d450068da1b7173707f272f65a72265d4b49a630ac2e SHA512 cc9319926f90a4c4aaf1d1e77944bfa5df9f7f15ee9581469ff8c1a069ef18e55addb69fcfe88e024cad8544c0efb90f5b83c2b6d803e0c68770467849d31f78
-AUX dovecot-autoconf-lua-version.patch 538 BLAKE2B 3978ebff83cb42591f60fc1cc155bd67a743d78c24d7d7ddfc0776c8df53fbdfad5cee79d1377e6436d69f6ca429ccf33b154adf470f8fc9d6429a746d49788f SHA512 a3e7403fb636078607b5452a580d229ce1d2e240d30e24138f33c3964ff008d99fef6477605f3d64dbdd8fc53187c9c6ad4eb82c58375b329dc9f8be87192eb7
 AUX dovecot-socket-name-too-long.patch 356 BLAKE2B ada5007b620cd5eef5a950d64add7d83ac366f126e1a9a70268e528d44a0a036fec096015bee2421caeca8a052d118011c5911b3c432fa73e846c66781df4da9 SHA512 f362bad725c9e408830dc9d5908a2b35b8ee82cb05f3d58795079b32d5ac4712779e71bd0f479fe072906fcaf01e4e08f08cedb9fd5ee08931409887480b8349
 AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed288c787dc81f8902e770f7774c54eba90de49e9634eb93873046a043bd7825cfb65bab5b2ea9ce108 SHA512 982f9897e4a0a5a3957bb12785961c9cde72a2c941f55efdb23e9a26cec19efe89e3be4effe79522c297ea2b258d201db78c19b6e3f9cd5e68d3736c2a0f0063
-DIST dovecot-2.3-pigeonhole-0.5.14.tar.gz 1910607 BLAKE2B 5c08214535d298ce2b8defd8c945e96597a98bda6493a3e27481fdadc0e149e6dd01c6ececaa583dd331614669bd8e033cd1b91d64d03a9e0cdcef67fa9c27b8 SHA512 c5d5d309769eabe2c0971646d0c14d166b6b524acf59e1069eca803f764544fa2535c09c9a630ca706aa70442b688ee26af831d29e674823bac7ea7c0e1f33cc
-DIST dovecot-2.3-pigeonhole-0.5.17.1.tar.gz 1952704 BLAKE2B 7dfc6b5bdb82bcaa60e0f41722f9a884edee7853ce09c9391d4c610be16728f58cc7095b8dd2d47e89296ff36aa926c687b39a418bc74ca0bfc3c4eab98156df SHA512 632a963d90a3fa052f314360d59ff25274d80952307ab5dd9193a2713ebf686500a7b2559b56f04b07e0a261066eed9b8525b14197f3be51728af09acb76e894
 DIST dovecot-2.3-pigeonhole-0.5.18.tar.gz 1953892 BLAKE2B 478da07a2f507a3322c6b6035f8cb74a720c030cc9413496f90a793d165178617207e26b0b57f710a9b9c7671be3fffdbaccaacb8747198abf82943dcb4a24df SHA512 44c3d945a5aebb8935e6e46751e44f505f2abd529c31e3efb689d3b5b9cdf9bca4f5231fc42a8d19837cb95c7618f5b64dfdf5964f40a0a6987144a37cdbaaec
 DIST dovecot-2.3-pigeonhole-0.5.19.tar.gz 1954148 BLAKE2B 0c52293f9447260f3e95f31c5ea3c04a1971b1a5621b56be1c79a8575aceb4f7e7fef62e7d0a3d980dcb5b8e1a8eeec543adcf0b016b65eb34ca4a26e8d2fe23 SHA512 5b0a61c7711232ea3651b818a970b500b05bd340a04bcd5a5f0ea0529eda65f498912a845c8f3b3b80196d010bc22bd4a380e1f682cb42f62b80d2d43a94993a
-DIST dovecot-2.3.14.1.tar.gz 7534719 BLAKE2B 1ba5143711fe340b9fad61db41ba658485e42be52f3b0f196eeb9b8e4b7c1b865b6a08f879dadeb2db3979b17be34699ce5febc4545887307f62bd5b72076f86 SHA512 b71b82c2918ac9940ef6bc274bc9c2b3e56a08cf5054244d80547ad89c421b9180c5afa8b5b140831239fbe2cbeeceb83a0052e037eb198d8fc27d07cba4ba35
-DIST dovecot-2.3.17.1.tar.gz 7700848 BLAKE2B adf12c84def899795d8446766b5c88fd5c68a5969a1807b4dd9c2e4894ddc0693a771ce4d4c0c72b0b03501903c39c650eace97b6708114b7fe038b62ea2ecce SHA512 976aa4f68e86f401e5766017e1702740d5b03892aff98f31f9ef0c6d242311d0f4b50d7faa426306bf1c902d7fc6d021438977bc887fa66ee360b069ec32ad79
 DIST dovecot-2.3.18.tar.gz 7763230 BLAKE2B ff3e0c2cad87d2e2632345a25825eebd0a6c1520376d85286453bde7505f22410d03911cd588a0d102b75f22cc1de051b01c43a57c90138340186e8cb024247a SHA512 b5eccf790a3960614876f122efb6296fe49ab7c523b08c10347fd4d10ed293fbd327279511c227b420f7c0786975186157eaa0fb5cd3aab1f3be9a4c5c3ad233
-DIST dovecot-2.3.19.tar.gz 7790661 BLAKE2B 060364dc83a5fcb7ee7a5a77467aedb79de13e65c5abfb1a9c1e76c7fac4b5b1ad07157917d095631ea72b194efdde38829d4c7274ced65dca7b457c0cc4bb13 SHA512 a61ce88b53c4f24faddf4951f16cb75dfe52aa7057d072c727566a7c9a683cc487d26cea9a83ad8aca161a053949d2f2196ba6a58015e3d33be897094aabf887
-EBUILD dovecot-2.3.14.1-r2.ebuild 8701 BLAKE2B 6358279ab6e561cef151cd5bd57d383342588ef8af60b74da03282480ef44fa6e7941b30804e38376575eb6e51e24308b7070dbfcc671cfbcc72f94dff700daa SHA512 c7fb4f436942bcc65482fe4e93aa8c7a8215b835fc17de7cb772e6cf8dc95a54bc495c9f5e42edd84adeebb0ea4f91d786589213d8bd1b8888e03b35244b371c
-EBUILD dovecot-2.3.17.1-r1.ebuild 8866 BLAKE2B a34542d194d6479653b264a1e1c8918dac51e9580dcf5a37eb6fddbf0843575e28b254da3878853d6efd7a56f8cd810d9335940b8373388f5df17fe531a8583d SHA512 e9029be65421a0e913edac76fa4c2cc66750124be05992e8adaa5c684958e9187c2dbf0875e2bd2ab67cb7170a50cfaaa64989a99c9821f651e62ac73ad2f86f
-EBUILD dovecot-2.3.18-r1.ebuild 8860 BLAKE2B e45ff2afef6ba6b518bf14dd6abe82cd56eb2f5fd8c5ea5f017d3fa9445927a680f8368ee973ecf930684ad2afe7f4cbe3f0b3cf4ff605275e30d1061816257b SHA512 89f3e3fd3376ac544264b7cd084b25e916a7d6b114443657d9a124ac86f0a1c8f547bdb173c982090369e9bfcf0ce9edf236460d22ea4bb21fa01b7783c9be59
-EBUILD dovecot-2.3.18-r2.ebuild 8831 BLAKE2B a40f408980018005c8232064ad806132b11e448ef7f1aef0aa22b37a5b8583b1e575774b34a85346152c76b71bfcf2b66ea04dff7bcae7049e5baa5a592a0677 SHA512 e40c094f190fd94afb2722cc58f9f5f61b4a72c6bb0550e89619948ca54d195e8e2702d04552948cf58766430a1adbbb549d496d7c14cdb5075bbd2b0a07ee5b
-EBUILD dovecot-2.3.19.ebuild 8658 BLAKE2B d9edf93a3287d299403509f0991f1c0a976207a2693ee62404a323803c22574ced457503297c209432f0d2a942be60780a40e913f62c11e3d600449d63a481ff SHA512 85c3138977452eb8ef341d5c67c30694230606d47dccec99feea37efafb8d9e6fa956fbe6d43d3e3670cc3183e0a26cf390e264f634ed7e97d2acbe5a8a62f29
-MISC metadata.xml 1091 BLAKE2B 5852eefa5b3be607a1e7d1bd5e8aa8ce2317db6ccc8c915438ab1aef54d59d2bd6953b1015c429a391c4b7cf69bdb562da80bfd66451dc40f21cc5d6adc28c10 SHA512 9eb91f5290af634e94abd0d1542c88c69da77f892bb15cc5a90d461cd456df5c68f4c9b783a63705297e88291c7d9d917a9adcfb55a32fbc04da82ae0528dad3
+DIST dovecot-2.3.19.1.tar.gz 7790851 BLAKE2B 6826977a0febfcb56eb99baf6e0dc0a130fc24a14f113ca7ce0f72b26b8c9755d8352999c5965e21320a62621787e02428c99dd6888768e8c35a46e4082ba071 SHA512 ceb87a5f76b6352d28fd030aae5ad2165a133e9a8a6309891e793911203fc0ada9fb254dc05d183eaaa7e2b9851d3f1755b33f08fa6ff5b4b415ac4272bfe150
+EBUILD dovecot-2.3.18-r1.ebuild 8859 BLAKE2B a022d5c3fb0da72559ecd071711ca2bbea7dbd999a75449f7b6e50047d74497895ad00a74de6c0653e61d78f76600d5aab9204133476558ee6c59b1628180438 SHA512 e3c1b3f2733a348344d3349091622b0e3827bdedd4575fef0ada44d13346f22bef33ef9817540c2cc5c15fd6142050a36bfdc32ecf905a64ee67e3283e6c6981
+EBUILD dovecot-2.3.19.1.ebuild 8658 BLAKE2B d9edf93a3287d299403509f0991f1c0a976207a2693ee62404a323803c22574ced457503297c209432f0d2a942be60780a40e913f62c11e3d600449d63a481ff SHA512 85c3138977452eb8ef341d5c67c30694230606d47dccec99feea37efafb8d9e6fa956fbe6d43d3e3670cc3183e0a26cf390e264f634ed7e97d2acbe5a8a62f29
+MISC metadata.xml 1025 BLAKE2B 5e9309f0cf659eb51dbf908776fd0f6a97c06c305380ff0b66f969d92382c78e1460310b0d4dd323e1193d622f5bd9cc796d31e8bda304e833d5ab974b934992 SHA512 befdb4837de276d9a73a77a926d972dae9a6c5a39a28137d4ef8f1e9e51c4885b8df24b8a144b9ba5d9533af7430ea531cada49944d529651bf63bc98aeff92f
diff --git a/net-mail/dovecot/dovecot-2.3.14.1-r2.ebuild b/net-mail/dovecot/dovecot-2.3.14.1-r2.ebuild
deleted file mode 100644
index 4d1f997aae09..000000000000
--- a/net-mail/dovecot/dovecot-2.3.14.1-r2.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools lua-single ssl-cert systemd toolchain-funcs
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.14"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-DEPEND="argon2? ( dev-libs/libsodium:= )
-	bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	lua? ( ${LUA_DEPS} )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	pam? ( sys-libs/pam:= )
-	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-	rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite:* )
-	dev-libs/openssl:0=
-	suid? ( acct-group/mail )
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	unwind? ( sys-libs/libunwind:= )
-	zlib? ( sys-libs/zlib:= )
-	zstd? ( app-arch/zstd:= )
-	virtual/libcrypt:=
-	virtual/libiconv
-	dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-	acct-group/dovecot
-	acct-group/dovenull
-	acct-user/dovecot
-	acct-user/dovenull
-	net-mail/mailbase"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-autoconf-lua-version.patch
-	"${FILESDIR}/${PN}"-socket-name-too-long.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-}
-
-src_prepare() {
-	default
-	# bug 657108
-	#elibtoolize
-	eautoreconf
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no LUAPC="${ELUA}" econf \
-		--with-rundir="${EPREFIX}/run/dovecot" \
-		--with-statedir="${EPREFIX}/var/lib/dovecot" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--disable-rpath \
-		--without-libbsd \
-		--with-icu \
-		--with-ssl \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$( use_with argon2 sodium ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with lua ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with lzma ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with unwind libunwind ) \
-		$( use_with zlib ) \
-		$( use_with zstd ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="${S}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install() {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	# Let's not make a new certificate if we already have one
-	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-		einfo "Creating SSL	certificate"
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-		install_cert /etc/ssl/dovecot/server
-	fi
-
-	elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.3.17.1-r1.ebuild b/net-mail/dovecot/dovecot-2.3.17.1-r1.ebuild
deleted file mode 100644
index 6b967f8f9444..000000000000
--- a/net-mail/dovecot/dovecot-2.3.17.1-r1.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 lua5-3 )
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.17.1"
-if [[ ${PV} == *_rc* ]]; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
-IUSE_DOVECOT_COMPRESS="lz4 zstd"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc
-	selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-DEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-libs/icu:=
-	dev-libs/openssl:0=
-	sys-libs/zlib:=
-	virtual/libiconv
-	argon2? ( dev-libs/libsodium:= )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	lua? ( ${LUA_DEPS} )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lz4? ( app-arch/lz4 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	pam? ( sys-libs/pam:= )
-	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-	rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite:* )
-	stemmer? ( dev-libs/snowball-stemmer:= )
-	suid? ( acct-group/mail )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	unwind? ( sys-libs/libunwind:= )
-	zstd? ( app-arch/zstd:= )
-	virtual/libcrypt:=
-	"
-
-RDEPEND="
-	${DEPEND}
-	acct-group/dovecot
-	acct-group/dovenull
-	acct-user/dovecot
-	acct-user/dovenull
-	net-mail/mailbase
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch
-	"${FILESDIR}/${PN}"-socket-name-too-long.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-}
-
-src_prepare() {
-	default
-	# bug 657108
-	#elibtoolize
-	eautoreconf
-
-	# Bug #727244
-	append-cflags -fasynchronous-unwind-tables
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no \
-	LUAPC="${ELUA}" \
-	systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-	econf \
-		--with-rundir="${EPREFIX}/run/dovecot" \
-		--with-statedir="${EPREFIX}/var/lib/dovecot" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--disable-rpath \
-		--with-bzlib \
-		--without-libbsd \
-		--with-lzma \
-		--with-icu \
-		--with-ssl \
-		--with-zlib \
-		$( use_with argon2 sodium ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with lua ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with stemmer ) \
-		$( use_with systemd ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with unwind libunwind ) \
-		$( use_with zstd ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="${S}" \
-			$( use_with ldap ) \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install() {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid; then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	# Let's not make a new certificate if we already have one
-	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-		einfo "Creating SSL	certificate"
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-		install_cert /etc/ssl/dovecot/server
-	fi
-
-	elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.3.18-r1.ebuild b/net-mail/dovecot/dovecot-2.3.18-r1.ebuild
index 1ae67c0e85da..1017a340f6a0 100644
--- a/net-mail/dovecot/dovecot-2.3.18-r1.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.18-r1.ebuild
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
 IUSE_DOVECOT_COMPRESS="lz4 zstd"
diff --git a/net-mail/dovecot/dovecot-2.3.18-r2.ebuild b/net-mail/dovecot/dovecot-2.3.18-r2.ebuild
deleted file mode 100644
index a0a7853cfdc8..000000000000
--- a/net-mail/dovecot/dovecot-2.3.18-r2.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 lua5-3 )
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.18"
-if [[ ${PV} == *_rc* ]]; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
-IUSE_DOVECOT_COMPRESS="lz4 zstd"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc
-	selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-DEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-libs/icu:=
-	dev-libs/openssl:0=
-	sys-libs/zlib:=
-	virtual/libiconv
-	argon2? ( dev-libs/libsodium:= )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	lua? ( ${LUA_DEPS} )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lz4? ( app-arch/lz4 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	pam? ( sys-libs/pam:= )
-	postgres? ( dev-db/postgresql:* )
-	rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite:* )
-	stemmer? ( dev-libs/snowball-stemmer:= )
-	suid? ( acct-group/mail )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	unwind? ( sys-libs/libunwind:= )
-	zstd? ( app-arch/zstd:= )
-	virtual/libcrypt:=
-	"
-
-RDEPEND="
-	${DEPEND}
-	acct-group/dovecot
-	acct-group/dovenull
-	acct-user/dovecot
-	acct-user/dovenull
-	net-mail/mailbase
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch
-	"${FILESDIR}/${PN}"-socket-name-too-long.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-}
-
-src_prepare() {
-	default
-	# bug 657108
-	#elibtoolize
-	eautoreconf
-
-	# Bug #727244
-	append-cflags -fasynchronous-unwind-tables
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no \
-	LUAPC="${ELUA}" \
-	systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-	econf \
-		--with-rundir="${EPREFIX}/run/dovecot" \
-		--with-statedir="${EPREFIX}/var/lib/dovecot" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--disable-rpath \
-		--with-bzlib \
-		--without-libbsd \
-		--with-lzma \
-		--with-icu \
-		--with-ssl \
-		--with-zlib \
-		$( use_with argon2 sodium ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with lua ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with stemmer ) \
-		$( use_with systemd ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with unwind libunwind ) \
-		$( use_with zstd ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="${S}" \
-			$( use_with ldap ) \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install() {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid; then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	# Let's not make a new certificate if we already have one
-	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-		einfo "Creating SSL	certificate"
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-		install_cert /etc/ssl/dovecot/server
-	fi
-
-	elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.3.19.ebuild b/net-mail/dovecot/dovecot-2.3.19.1.ebuild
index 1fa7a3cfb45f..1fa7a3cfb45f 100644
--- a/net-mail/dovecot/dovecot-2.3.19.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.19.1.ebuild
diff --git a/net-mail/dovecot/files/dovecot-autoconf-lua-version.patch b/net-mail/dovecot/files/dovecot-autoconf-lua-version.patch
deleted file mode 100644
index 5572271929ef..000000000000
--- a/net-mail/dovecot/files/dovecot-autoconf-lua-version.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/m4/want_lua.m4
-+++ b/m4/want_lua.m4
-@@ -13,13 +13,12 @@
-   AC_MSG_RESULT([$with_lua])
- 
-   AS_IF([test "x$with_lua" != "xno"],
--    [for LUAPC in lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua; do
-+    [
-        PKG_CHECK_MODULES([LUA], $LUAPC >= 5.1, [
-          AC_DEFINE([HAVE_LUA], [1], [Define to 1 if you have lua])
-          with_lua=yes
-        ], [LUAPC=""]) # otherwise pkg_check will fail
-        if test "x$LUA_LIBS" != "x"; then break; fi
--     done
-   ])
- 
-   AS_IF([test "x$with_lua" = "xyes"], [
diff --git a/net-mail/dovecot/metadata.xml b/net-mail/dovecot/metadata.xml
index ad663f242b91..510eca854311 100644
--- a/net-mail/dovecot/metadata.xml
+++ b/net-mail/dovecot/metadata.xml
@@ -10,7 +10,6 @@
     <flag name="managesieve">Add managesieve protocol support</flag>
     <flag name="sieve">Add sieve support</flag>
     <flag name="lucene">Add lucene full text search (FTS) support using <pkg>dev-cpp/clucene</pkg></flag>
-    <flag name="lzma">Add support for lzma (de)compression</flag>
     <flag name="rpc">Add support for NFS quotas</flag>
     <flag name="solr">Add solr full text search (FTS) support</flag>
     <flag name="stemmer">Add libstemmer support (for FTS)</flag>
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 494dd873abd1..0c68d26eb002 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -4,12 +4,8 @@ AUX fetchmail.confd 297 BLAKE2B 00f9a55be3b6351dc7b97758f3403feab9d1025bb2b0398a
 AUX fetchmail.initd 993 BLAKE2B 76fb355805afc0b62f350f02dc0b0d6ac83659d2e15a49309192de313fa38b61e32db0bb9e5148c3d56bae61ca5e714f8d9576e0f95997d45a44d51f56c8235c SHA512 06091152111059425e86207e968ad5819eb67cd2dd264855e7b77a163b95591abc29befe4b3eb8bf2d2af105efb5006bb048f3db4ef3f8f4fafbb78767f69ebb
 AUX fetchmail.service 204 BLAKE2B 4683577d0da4929b068bd2f49516838644ac399e6ab27fb6ff9f3d5f1d8357302e11e6fc4d22d8944d504bdbb600e87b853e039601b8cca9763e1ca465573508 SHA512 088d7ff2c473d4b514cc5349ba6f10bb7f29ace1141d152db082c801a9dd0e6144a2dd350e27e97f633aaf286c2daa5253e52b5c410737c44f3fd9b5b57bab75
 AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3792d20eecded0ef42f15ddd768470a9dd541a66a495e954632e9b12ba3c0cfb446c4e2832eb9d3993f8c3 SHA512 4f8208a286f2868a466e69919b7c9d965da099b44675105689bcc52b0d16acc8d46e77f6b9a72968e82a6cf900e20d07a9a7373fe26a1ba9c925edf6663180ed
-DIST fetchmail-6.4.21.tar.xz 1318996 BLAKE2B 4c2befad2b7dfa6957889e029572c259be7a20e4b54b864e2cca827540d745a57ad227f8e1fce1336e8f3a1005c780d8fa7c1b10b9ee05ce68dbcfac75afa179 SHA512 c9300f63c0e4073f199a9a7d9061774a7f88aad496b696cad96c0ee85107cae506461f0cd083903c60104b1e7654461213f3f759c1cdaffaf1c85fb1956faa67
-DIST fetchmail-6.4.22.tar.xz 1330176 BLAKE2B 7086f8a3df263f68ae2034321f63c40fcf4759517f46c67ba4b5d3b33ba07d3bb4f512d749a67a2d76991b46847b6dd9df0795a7a28e8166842454001497cfc9 SHA512 ff6db2705b6e3806e22c326da8a0f6bdc0909965cd283b50f9d55bd3a18a52fc4b2f4b4afece1e81aa25b6f1037450cb2b579c4d2cfe4705d34b31d4c1a47e00
 DIST fetchmail-6.4.27.tar.xz 1326668 BLAKE2B fb349f8e4b17929d8ab5ec144e2d6e4227b56143112eb3745830c339f8dfdaa80fb47060ad3671258563198ed1283a903fcd5a82564b7320a829ceb4c5826642 SHA512 75650c2a8bcfa6f4364dacd6964f00848a23e1bc96eed10f7fcfd9c8c6f6b6fe60eee2730c57c8a5263c11f01b3031cbef7d6b2bffa730de63e7ec262448af2f
-DIST fetchmail-7.0.0-alpha9.tar.xz 1213244 BLAKE2B 895fe178993cc34500e276bef5ebe9a4fd81fea522d39fd271433320afc46faa9657d8b85b2d28cd5dbc6d3dbbb233d5eb27d3e26205f5406de9f750c50d7f1b SHA512 7ac1c26edfd2a0d69ba3c1e9f47d96aa48f1cdc10060ff928f952e43141651896f5c5190c41064075fb5c5837516f63d6ff3e7fb0cdc7d389c44b6e39db01d8f
-EBUILD fetchmail-6.4.21-r1.ebuild 2404 BLAKE2B 0526de2e2c4b499d00c87cf303b69bf92831ef57508c1736f0778b10d95f801e7ed2a53755e481ae5457ca081e3fe8feaa97ecbc7aedcdabf093ea7b9082d19f SHA512 a6311cf3cdf4b349ecced75080bac3f6929efec60d69b17474ca2638c0f9f1ccfaa87d970bcb3058768ef17e5bf96912e2b90be5cd8745c81974c2c49ff5e961
-EBUILD fetchmail-6.4.22.ebuild 2410 BLAKE2B 6cc76486f6785669f7f33b6253f0f6f0806e52b92d620be4937fbc59bbbd2f5089d8df3a5be15fe90190bc93190e72e80ad4014455df2be25f3d74ab1363ca77 SHA512 ec65e9036f5ba09e2b85cafeaefcd5fbdc7bb677d39812629fced391a1216688035acf78ce13af75dc193974662f8f53fa29d9ffb3b353720a725fec902e099d
-EBUILD fetchmail-6.4.27.ebuild 2419 BLAKE2B fcedadeae6c40f592d804d35d785afcc96a56240e457becef83514d0a70eac06fa53a692fc013b9ef4ebd4fb4bdc3b9e8641f97e033393863b745fe8405e3fb5 SHA512 e2cafac3c823a71b4029abe839d34ecf7a92c4e257a8a05e5a34b96fbb63ea65f84a970397272e1461a08ab385e15d1ab98891c29fdad632660db526eec24ce2
-EBUILD fetchmail-7.0.0_alpha9-r1.ebuild 2531 BLAKE2B 9dc659ea3187b6d7bf5c48f85201c3c844b491fe82f7f4f396afad2057d28b4dbaf2ad3e3569d1563b81dd660bb8cf3fffd4da4e225dfd66a613551972191998 SHA512 385e30678b4fc99c3886d1a5e1f0e346858f32435a72d0d9a1939a6e2a93a3c7cb121e4af0ce9fa80add6fd23ef362c26f06b40073de0130f1e460fb12a1eaa5
+DIST fetchmail-6.4.30.tar.xz 1333524 BLAKE2B 67e6aff00b1678ad68a4539c40147c79fbb22970248a97fd16340dbc64e90339a476ea322afde7345858b7041a00364e181af37dc96a09dcdca2e096f62922ea SHA512 0ec540c4102267e6e72fefa5e76aa76f45d25a0e68ec40f1fd834719f2a4b5f3f78c587b050fc33d97dd8fc6f674950949e5c23f960ebcd3046d5cc2e06db1d0
+EBUILD fetchmail-6.4.27.ebuild 2413 BLAKE2B 7675de36cc7c77cb6817b29cf3e3c0c8706333f45f3d8262c542aae951b8ff3d6cdfb640169369c9b74af2089d89f50dd421dc05ac7ece94763ea6ba7d56ee7b SHA512 8ed1f0fa8da9713a59b8f73875b531f8dd9a6ff9e8f8509b837108538506e2ede824f12e814bbbed159a761c823e849ab692b61111def9ef66d0e5957e32905d
+EBUILD fetchmail-6.4.30.ebuild 2419 BLAKE2B fcedadeae6c40f592d804d35d785afcc96a56240e457becef83514d0a70eac06fa53a692fc013b9ef4ebd4fb4bdc3b9e8641f97e033393863b745fe8405e3fb5 SHA512 e2cafac3c823a71b4029abe839d34ecf7a92c4e257a8a05e5a34b96fbb63ea65f84a970397272e1461a08ab385e15d1ab98891c29fdad632660db526eec24ce2
 MISC metadata.xml 522 BLAKE2B 34e08c52e9391d8f01d717516857cde4c2c77af269d587a29ce6d6e3c6c2e989898f5afcb1240f6718dbdb18be2700b66980f5a684c253c69ed4123e6bb6905e SHA512 8c6fd6c541834669a9518b31859990c8d6e9946e35bc1aa00bf2e0c1822392508ff712119005b97f5e85ca74e97c0d5cf3ced5798a388c23f9c8fd959feaf8cc
diff --git a/net-mail/fetchmail/fetchmail-6.4.21-r1.ebuild b/net-mail/fetchmail/fetchmail-6.4.21-r1.ebuild
deleted file mode 100644
index ee54777b53af..000000000000
--- a/net-mail/fetchmail/fetchmail-6.4.21-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="tk"
-
-inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="https://www.fetchmail.info/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="ssl nls kerberos tk socks"
-REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="acct-user/fetchmail
-	ssl? (
-		>=dev-libs/openssl-1.1.1:=
-	)
-	kerberos? (
-		virtual/krb5
-		>=dev-libs/openssl-1.0.2:=
-	)
-	nls? ( virtual/libintl )
-	!elibc_glibc? ( sys-fs/e2fsprogs )
-	socks? ( net-proxy/dante )
-	tk? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_USEDEP}]
-		')
-	)"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	sys-devel/flex
-	nls? ( sys-devel/gettext )"
-
-DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO"
-HTML_DOCS="*.html"
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.3.26-python-optional.patch
-)
-S=${WORKDIR}/${P/_/.}
-
-pkg_setup() {
-	use tk && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# don't compile during src_install
-	use tk && : > "${S}"/py-compile
-	eautoreconf
-}
-
-src_configure() {
-	use tk || export PYTHON=:
-
-	econf \
-		--enable-RPA \
-		--enable-NTLM \
-		--enable-SDPS \
-		$(use_enable nls) \
-		$(use_with ssl ssl "${EPREFIX}/usr") \
-		$(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos kerberos5) \
-		--without-hesiod \
-		$(use_with socks)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/fetchmail.initd fetchmail
-	newconfd "${FILESDIR}"/fetchmail.confd fetchmail
-
-	systemd_dounit  "${FILESDIR}"/${PN}.service
-	systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service"
-	dotmpfiles "${FILESDIR}"/${PN}.conf
-
-	docinto contrib
-	local f
-	for f in contrib/* ; do
-		[ -f "${f}" ] && dodoc "${f}"
-	done
-
-	use tk && python_optimize
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Please see /etc/conf.d/fetchmail if you want to adjust"
-		elog "the polling delay used by the fetchmail init script."
-	fi
-}
diff --git a/net-mail/fetchmail/fetchmail-6.4.27.ebuild b/net-mail/fetchmail/fetchmail-6.4.27.ebuild
index 98b1ae2dae89..55d1c2aeeed7 100644
--- a/net-mail/fetchmail/fetchmail-6.4.27.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.27.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ssl nls kerberos tk socks"
 REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-mail/fetchmail/fetchmail-6.4.22.ebuild b/net-mail/fetchmail/fetchmail-6.4.30.ebuild
index 9d676c85c586..98b1ae2dae89 100644
--- a/net-mail/fetchmail/fetchmail-6.4.22.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.30.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="tk"
 
 inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ssl nls kerberos tk socks"
 REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-mail/fetchmail/fetchmail-7.0.0_alpha9-r1.ebuild b/net-mail/fetchmail/fetchmail-7.0.0_alpha9-r1.ebuild
deleted file mode 100644
index c0b4ff885c7c..000000000000
--- a/net-mail/fetchmail/fetchmail-7.0.0_alpha9-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="tk?"
-
-inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="https://www.fetchmail.info/"
-SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="kerberos nls +python socks +ssl tk"
-REQUIRED_USE="tk? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="acct-user/fetchmail
-	ssl? (
-		>=dev-libs/openssl-1.1.1:=
-	)
-	kerberos? (
-		virtual/krb5
-		>=dev-libs/openssl-1.0.2:=
-	)
-	nls? ( virtual/libintl )
-	!elibc_glibc? ( sys-fs/e2fsprogs )
-	socks? ( net-proxy/dante )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_USEDEP}]
-		')
-	)"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	sys-devel/flex
-	nls? ( sys-devel/gettext )"
-
-DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO"
-HTML_DOCS="*.html"
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.3.26-python-optional.patch
-)
-
-S=${WORKDIR}/${P/_/-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# don't compile during src_install
-	use python && : > "${S}"/py-compile
-	eautoreconf
-}
-
-src_configure() {
-	use python || export PYTHON=:
-
-	econf \
-		--enable-RPA \
-		--enable-NTLM \
-		--enable-SDPS \
-		$(use_enable nls) \
-		$(use_with ssl ssl "${EPREFIX}/usr") \
-		$(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos kerberos5) \
-		--without-hesiod \
-		$(use_with socks)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-	use python && python_doscript contrib/fetchmail-oauth2.py
-
-	newinitd "${FILESDIR}"/fetchmail.initd fetchmail
-	newconfd "${FILESDIR}"/fetchmail.confd fetchmail
-
-	systemd_dounit  "${FILESDIR}"/${PN}.service
-	systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service"
-	dotmpfiles "${FILESDIR}"/${PN}.conf
-
-	docinto contrib
-	local f
-	for f in contrib/* ; do
-		[ -f "${f}" ] && dodoc "${f}"
-	done
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Please see /etc/conf.d/fetchmail if you want to adjust"
-		elog "the polling delay used by the fetchmail init script."
-	fi
-}
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index a055bf486a6f..9308f9ab3661 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -1,3 +1,5 @@
 DIST getmail-6.14.tar.gz 185308 BLAKE2B c74fce627e6a23e0b209dddca690301f80626d9c4489d8cd2391884908e6f1c017602ed23ca4d343e2dd400b911d3f808235231217afd38f96017d8f0d20b3a2 SHA512 b8d2df52cbf145ee7e00ec1dbf589013d3caf8e39a3981e6ae4f1e36fe0b3d3d88df639e03e8697c39e6d00e20ddf1e995ed17f0b1fa1fa2ea52a803c16f062f
+DIST getmail-6.18.9.tar.gz 204488 BLAKE2B 4bf95cec36ce10d5fd6c9fbb6b96923915a13f4b339a9846caafc5602a56612fb9f4b7209a138a03b81b19b7d28328bb46c60165215384650e7dcf98294cc5fa SHA512 dfeaebbca0c8766a16783d27171e65595d97a4b557943677dd7e7a66a9da8b49dfdbfb4aba9655ce3815ff6e2f991905317085b156ba6dbac841bb0fbb26c8b5
 EBUILD getmail-6.14.ebuild 778 BLAKE2B aca076c12f21939cc7db0546db6a6d4b432dc0142b22d1517feffbe044f663ef5b999b04b096fdb6ce267655c4f41fcf24776ab7280f9ada937e479cc65daec1 SHA512 a7ce4ddda04bafe7a04e0e3ce90c5a8b71e4df05e40689b978c88e97d72adf959b66a81eda58132dcf0964225d0985d97a50e4b84558c649f6d343e6b1ea96a8
+EBUILD getmail-6.18.9.ebuild 799 BLAKE2B 19905ca83e4a4988d8afc1c7b97d3d0fdd665c105d63e0367ab2a8f0c19bfdb5890a710c97afe6bb1377bb22a2c0f4f8d56d56bc66ea02cfd6b9e272327b89c2 SHA512 62e07c2b574fff86576512fd5f3ca1ae6d3dbb1f5af8efb88128548262bd51f6610fc21343029cfe6672dc5167e7875836c67e5e694d678f32fea9164c1b0b0c
 MISC metadata.xml 716 BLAKE2B 4e72451457ace0c7335d06a94ad5f01e8d7efcd03520f5c058ab989bd962a8e719c742b23c4628e928197b002578b8f3d92c69d70f55f902b352d159b514eb3a SHA512 f4d28a26166d50307bb2a8d5bb7628725ca8af089043d4f8b40b79f31307b3fea56abdefab4c50af1d486942475b311d1072164f096d0d31b9f9668ffecf0e6e
diff --git a/net-mail/getmail/getmail-6.18.9.ebuild b/net-mail/getmail/getmail-6.18.9.ebuild
new file mode 100644
index 000000000000..734f390f84cf
--- /dev/null
+++ b/net-mail/getmail/getmail-6.18.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="ssl"
+inherit distutils-r1
+
+DESCRIPTION="A mail retriever with reliable Maildir and mbox delivery"
+HOMEPAGE="https://www.getmail6.org/ https://github.com/getmail6/getmail6"
+SRC_URI="https://github.com/getmail6/getmail6/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/getmail6-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+python_prepare_all() {
+	# Use gentoo version number (including revision) for doc dir and remove COPYING file
+	sed -i -e "s,'getmail-%s' % __version__,'${PF}'," \
+		-e "/docs\/COPYING/d" "${S}"/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/net-mail/hyperkitty/Manifest b/net-mail/hyperkitty/Manifest
deleted file mode 100644
index d1a61d849403..000000000000
--- a/net-mail/hyperkitty/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST HyperKitty-1.3.3.tar.gz 1936346 BLAKE2B 8014b62a44989faeb0467779fb53a9e5a0c381bae44fae8102b211a6d3c7dfa63cb76b6cc25ae29bb1b260fdc4bafd9d2c61c39103cc29d76a229263fe704c40 SHA512 4be4630bc0344c3e1633772978880fea996fbf2bb49b728c1d05ae13ab1df8c63b6b7b9b735df32eb2ae31798e76be537748e42c830a63aa01eeff0680f1dc76
-EBUILD hyperkitty-1.3.3.ebuild 1325 BLAKE2B 58b2d072283eba93f47fafe7d02817b524c845061ff1f47339b5149db7f3005a116b5d2e069463df83519f96717c9eb4675f57117aca4f9066cbd63bc36fabdf SHA512 7da7ad023b908633836d1094e8612b3985bc47b161be89355b0a8d91c633a62810cbc5c37ca3547be857f1940d1dd421cb76480efe99e7089b069246e4a12db9
-MISC metadata.xml 299 BLAKE2B 4a1e8eceb1aff96b9f3b52d4db8a262dc66e665c3d90582ed9e676df5d9cb415df914469fd6f4c386c71da8e839efc320ea864e88be9672e0b385c71acaaae27 SHA512 65fb75078b671353ca4954421b8ea4dea9a34d005f53513ac41cd32c45b3073b12696432b3c453fa11578415acac7554c0a807a05b5f94615911365079903d45
diff --git a/net-mail/hyperkitty/hyperkitty-1.3.3.ebuild b/net-mail/hyperkitty/hyperkitty-1.3.3.ebuild
deleted file mode 100644
index bf751073a211..000000000000
--- a/net-mail/hyperkitty/hyperkitty-1.3.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A web interface to access GNU Mailman v3 archives"
-HOMEPAGE="https://www.list.org"
-SRC_URI="mirror://pypi/H/HyperKitty/HyperKitty-${PV}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]
-	net-mail/django-mailman3[${PYTHON_USEDEP}]
-	dev-python/django-gravatar2[${PYTHON_USEDEP}]
-	dev-python/djangorestframework[${PYTHON_USEDEP}]
-	dev-python/robot-detection[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/django-compressor[${PYTHON_USEDEP}]
-	net-mail/mailmanclient[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/django-haystack[${PYTHON_USEDEP}]
-	dev-python/django-extensions[${PYTHON_USEDEP}]
-	dev-python/flufl-lock[${PYTHON_USEDEP}]
-	dev-python/django-q[${PYTHON_USEDEP}]
-	dev-python/whoosh[${PYTHON_USEDEP}]
-	dev-lang/sassc"
-
-BDEPEND="dev-python/isort[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/django-debug-toolbar[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( README.rst )
-S="${WORKDIR}/HyperKitty-${PV}"
diff --git a/net-mail/hyperkitty/metadata.xml b/net-mail/hyperkitty/metadata.xml
deleted file mode 100644
index 26ffc33ff760..000000000000
--- a/net-mail/hyperkitty/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="pypi">hyperkitty</remote-id>
-		<remote-id type="gitlab">mailman/hyperkitty</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index 09eb48464d8d..c25da7d5f57b 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -2,6 +2,8 @@ AUX aliases 809 BLAKE2B bc6295e7cddae8ee29450f4054992b6fe47f301303be7ea284d42f9e
 AUX common-pamd 308 BLAKE2B 95a2b44b1bd2112da1160cf5c3f993debb85692111e046a79c14f89a83cd82eebc5580ea0375f6548d373a04ac17f214a0135047d99f7ed3cf62f5500953bf6a SHA512 5b7d878969e644aac8aa9355e1a8ff9e2a9c1b07edb5a62c694bd7a4f87961242db7c85b1030540c9ad733a4d3d4c5367a047a188b21517d1d077bec6e620ec7
 AUX common-pamd-include 245 BLAKE2B 3c2a5133b232869a5749df49a7e1f94a51f68d3bd37037d3ea10bfab18fb48fae565304bd2eba6fc686da3f3bf71249975e8f8bc9deada66eb3665d20929020d SHA512 3516815034b419bf4fd57a43536e7a25b820013d5339cb818bbbee3f0e8e26651f6b4aefae0177240219e05010ba8a2aaf6d0337220cf176801992204c3216f0
 AUX mailcap-r3 1584 BLAKE2B eac2e35ea578079c4a67f71a690443d616f99d666dad12553ae2020fc0affcbc121529c62d9cad1419e42b5a9d95ec3166c3f71385b047827c97acc0cc81d460 SHA512 3be98f171d9b6d891a24cc759d595eb856e28bbe29a2578d409993a6dec33ffd369f1c40bdb143e3e0a3698d009b06d5a0a5d329563c886fc592d58d874eab35
+AUX mailcap-r4 1569 BLAKE2B 33100eb2bf0f0bf1b07584894f3c385635388b8446dba33e7949cbf5ae21c607f4c86360b8d88fd73f5af9323a9ae17dda3c0ab320c2223b15a1eea64588969d SHA512 6c326b4b90f680cd278543c7fdbd086617ce22bba0ecd4de6ab3c06b5da1ae627bdbc782c9a7147d40d49373b3e10d1946dae72e3cdc429345285d1ba0eec257
 AUX mailcap.5 8951 BLAKE2B 6bd704c8efe861471343e318734abed30c5f406a06646877286d91bfe3cb9afaf128ddf77675d4a14dd1e19a6979772cf013923cf30b02f62e54eac2a7fe02b7 SHA512 6973397bdd389e8eaf1977d8eeee271beda2ad1bd0b01ed7408156af0e7cf430a45e2b7261213a3278fbc2cbb250b65a3f34c11d3c5603cffffade4f1fba24e5
+EBUILD mailbase-1.8.1.ebuild 1016 BLAKE2B 064e5e98eb89df74bf9ef4dbc54e8cd7a09ba601379019c71d9c0c85c1e99c62d6cab7b54f68a86057c9640a33f196e17db970be2e58da54495a79d7b277c390 SHA512 fddb156152e9140dd892e19c1e3757638ac8abb5341bf2194ac4a6f2a6fa8f28184b2e76d10ff85e4ad031e8d123d78a72a9702f7d35205831b22a576a39bbb6
 EBUILD mailbase-1.8.ebuild 1008 BLAKE2B 548491b99107ec8e4b6a65d5993f4feb4e393ee60d6aae8aa1aae968096eebb26fb63bfda967506b0dd955c3337e941af562ee9c6c7e151e0fd2f9a29f231e3d SHA512 be4f5edcc5f207654560306decfc091e87fa986ccb8e6e8ab9a9ceb93aaccf4b59b0bf007614d1b22e72fd1f107c222e2f423c894eb1e239cec51d11d9287c43
 MISC metadata.xml 273 BLAKE2B b4cfe539dd0b8abaa460e6a58d4eb4abca02c82a3174ed097dce35389b4d6aa0f80c0ae9fcb6cec3b57b0d5de6e8105f569a7872193177fade6a3ca96939ef9c SHA512 ea73916029216f884fa542103def24e21b8e7bd9efd6764554d14e7c34e0d4b289c39bb81b07524dc3ce87adc5abfd4c421a965506c583430e134e235f26012d
diff --git a/net-mail/mailbase/files/mailcap-r4 b/net-mail/mailbase/files/mailcap-r4
new file mode 100644
index 000000000000..8c1bd310e3de
--- /dev/null
+++ b/net-mail/mailbase/files/mailcap-r4
@@ -0,0 +1,30 @@
+# Database binding MIME types to programs that can process them.
+# This file is generally used by mail clients to view attachments.
+#
+# Users should add their own rules to their ~/.mailcap file.  That file will be
+# processed first before falling back to this one.
+#
+# For more information, see the mailcap(5) man page.
+
+# NB: Do not quote %s.  Clients will handle expanding it with proper quoting,
+# so adding quotes ourselves just confuses things.
+
+application/pdf; xdg-open %s; needsterminal
+application/postscript; xdg-open %s; needsterminal
+application/x-info; info --subnodes -o /dev/stdout -f %s 2>/dev/null; copiousoutput; description=GNU Info document
+application/x-gtar; tar tvzf -; print=tar tvzf - | print text/plain:-; copiousoutput
+application/x-tar; tar tvf -; print=tar tvf - | print text/plain:-; copiousoutput
+application/x-troff-man; nroff -mandoc -Tutf8; copiousoutput; print=nroff -mandoc -Tutf8 | print text/plain:-
+# It'd be nice to limit this to compressed formats (e.g. x-*), but the file
+# format doesn't support that, and less has good fallbacks already.
+application/*; less %s; needsterminal
+
+audio/*; xdg-open %s; needsterminal
+image/*; xdg-open %s; needsterminal
+
+text/html; lynx -dump -assume_charset=%{charset} %s; copiousoutput; description=HTML Text; nametemplate=%s.html
+text/troff; man -l %s; needsterminal; description=Man page
+text/*; less %s; needsterminal
+text/*; gview %s; edit=gvim -f %s; compose=gvim -f %s; test=test "$DISPLAY" != ""
+text/*; view %s; edit=vim %s; compose=vim %s; needsterminal
+text/*; more %s; needsterminal
diff --git a/net-mail/mailbase/mailbase-1.8.1.ebuild b/net-mail/mailbase/mailbase-1.8.1.ebuild
new file mode 100644
index 000000000000..31a62191a865
--- /dev/null
+++ b/net-mail/mailbase/mailbase-1.8.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit pam
+
+DESCRIPTION="MTA layout package"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="pam"
+
+RDEPEND="
+	acct-group/mail
+	acct-user/mail
+	acct-user/postmaster
+	pam? ( sys-libs/pam )
+"
+
+src_install() {
+	insinto /etc/mail
+	doins "${FILESDIR}"/aliases
+	insinto /etc
+	newins "${FILESDIR}"/mailcap-r4 mailcap
+	doman "${FILESDIR}"/mailcap.5
+
+	dosym spool/mail /var/mail
+
+	if use pam ; then
+		newpamd "${FILESDIR}"/common-pamd-include pop
+		newpamd "${FILESDIR}"/common-pamd-include imap
+		local p
+		for p in pop3 pop3s pops ; do
+			dosym pop /etc/pam.d/${p}
+		done
+		for p in imap4 imap4s imaps ; do
+			dosym imap /etc/pam.d/${p}
+		done
+	fi
+}
diff --git a/net-mail/mailman-meta/Manifest b/net-mail/mailman-meta/Manifest
deleted file mode 100644
index 33cb0a94303e..000000000000
--- a/net-mail/mailman-meta/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD mailman-meta-3.ebuild 319 BLAKE2B 8ca7b8aa435d3e0b92e7fc47b249950cdb4b78a2ac2cd9e80e701f335f8787a40886c97f692b0d2e56633a6449798fbf82aa2888884251c349fd7ae1656cf39a SHA512 3adb2c0833a65d15a4dd3e972d42c4fa4065db85e8be80869fe171eac36eff60acb1af4d6a9f3840cca689ad094c4540338d9ef27a9a4c2f0dc86fb6b6d18dd6
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-mail/mailman-meta/mailman-meta-3.ebuild b/net-mail/mailman-meta/mailman-meta-3.ebuild
deleted file mode 100644
index e5399bc8b028..000000000000
--- a/net-mail/mailman-meta/mailman-meta-3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Meta ebuild for GNU Mailman 3"
-HOMEPAGE="https://list.org/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=net-mail/mailman-3.0
-	net-mail/postorius
-	net-mail/hyperkitty"
diff --git a/net-mail/mailman-meta/metadata.xml b/net-mail/mailman-meta/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/net-mail/mailman-meta/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
deleted file mode 100644
index 66df0619c738..000000000000
--- a/net-mail/mailman/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX mailman-3.3.4-fix-click-8.patch 3704 BLAKE2B 4055807ee7546d94d6358c3d1c1cd46e8a964d7aca151cf4c11ba4b093809186bb75f3f01cf63b0a6a30a72c5b72b0cf86065038fa660e68ebd01342c2b48da2 SHA512 ab2ddc4ddcb8ab841c7de07749b78ae6856d3c86a80b84de5b0b06024fdf65a22b0f42b6e136282a5719b30d6980bb583187b7750c1df9402faff9d07d1d7ad9
-AUX mailman-3.3.4-py3.9-importlib.patch 2738 BLAKE2B a77f1d5a5a8ceb731484f290aa33734d2754b38594c40b7f7ecdea3321aa8dcd7902f6062b60357b34c99cddee11c77d2e6500022edf51e2c6fb9fba33b0e0c4 SHA512 0952811aa467ed7f30e206cf1132e3af120ac14b513c2edc2e00b05563e811f04d259d1e508c011a7c7b92e2fce12d6f7af4d934a5be6baf13cab86298683a94
-DIST mailman-3.3.2.tar.gz 1396750 BLAKE2B f7db82d8cb217d80313ee7a6c28f7b62876a6d176a108b3fafdc744e0a9fcec3d11a0665069a5c27a42d49c22257bfe2ca8f18233d30fc9acb964027fea3bf12 SHA512 af8b300a9fea9e40a9a42f97531cf0fcd36f9b30a88a5b062994ec6480d91a698dbc37f4910045aacf3bedebf7c9ccacdf8d11bb0ee560d11e1eeef266f19b29
-DIST mailman-3.3.4.tar.gz 1578084 BLAKE2B d0c8ba6dd0df481915397b55521c9a524b44bbdb7c4efe789c6fe92c1383950b6107a76db43337b7a310a7d97eb3931a4289566271ac5b6360645ec8d316230a SHA512 52d7e8355744730f608605b05bc9c977c3e4daf22a78267b1ea6cd3922b2826d3f70dd61a591f13633fc7cbcc536b6d56a2076c00752a6590964cbd4e1aec3cc
-EBUILD mailman-3.3.2.ebuild 1402 BLAKE2B 89a4684901834c58bd6cae588f917f686fecd0500df16ec42c26a324c59ddace83c55d2ef3f674b16f1da0d47b8c0d3459751ff64abe1ff67872b770fce5aaed SHA512 577e48ff8745a2221add6e4228ef7851c0762bbeea6d3e1d7e2e17d9b77a5da4b57a402b4de5d3692c069b572049928cf62f00dc0377cde393d4c0985dd42fd9
-EBUILD mailman-3.3.4.ebuild 1764 BLAKE2B 9e32da093e3b42b092cdcc9d226a1ac95f8862bd1ad239700aaf75dff653e2523c5715d245065225ae9295b97a5cdc97a7ad618372f115c1175340f4d9ca7eac SHA512 b3ec8bead3c034bd03cc698074e6b124ef2f37704f6d0269b7e82c21e82554ddf2fa3f40703c8239235e22b79cc7b2301670cb31c9408e245e79347f8e246317
-MISC metadata.xml 317 BLAKE2B 9cbeb595dd1db7a2a8a213dcfae0cb88eca043d42dc9023253204202f274d68db3580063973f6df5fa4f56ccaa6fcb3cd04e16971deab92a5c22c09e00245f9a SHA512 6694fd604a01478e1c2d5d8cd9c0d00780d1642c34e35585f43410a6fb593cd3c885b68495843974b7771ff41a588eddcb469691d509de84ab1b3d065680f2c4
diff --git a/net-mail/mailman/files/mailman-3.3.4-fix-click-8.patch b/net-mail/mailman/files/mailman-3.3.4-fix-click-8.patch
deleted file mode 100644
index c5f5d774fdaa..000000000000
--- a/net-mail/mailman/files/mailman-3.3.4-fix-click-8.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 5d27492403f80c4b4ea1820b3d6f821bd8401ca8 Mon Sep 17 00:00:00 2001
-From: Mark Sapiro <mark@msapiro.net>
-Date: Tue, 11 May 2021 18:14:59 -0700
-Subject: [PATCH] Require click >=8.0.0 and fix the tests it breaks.
-
---- a/src/mailman/commands/docs/import.rst
-+++ b/src/mailman/commands/docs/import.rst
-@@ -58,5 +58,6 @@ import, the mailing list's "real name" will change.
-     Import
- 
-     >>> command('mailman import21 import@example.com ' + pickle_file)
-+    Importing ...
-     >>> print(mlist.display_name)
-     Test
---- a/src/mailman/commands/tests/test_cli_addmembers.py
-+++ b/src/mailman/commands/tests/test_cli_addmembers.py
-@@ -57,8 +57,8 @@ class TestCLIAddMembers(unittest.TestCase):
-             result.output,
-             'Usage: addmembers [OPTIONS] FILENAME LISTSPEC\n'
-             'Try \'addmembers --help\' for help.\n\n'
--            'Error: Invalid value for \'FILENAME\': Could not open '
--            'file: bad: No such file or directory\n')
-+            'Error: Invalid value for \'FILENAME\': '
-+            '\'bad\': No such file or directory\n')
- 
-     def test_already_subscribed_with_display_name(self):
-         subscribe(self._mlist, 'Anne')
-@@ -265,8 +265,8 @@ class TestCLIAddMembers(unittest.TestCase):
-             'Usage: addmembers [OPTIONS] FILENAME LISTSPEC\n'
-             'Try \'addmembers --help\' for help.\n\n'
-             'Error: Invalid value for \'--delivery\' / \'-d\': '
--            'invalid choice: bogus. (choose from regular, mime, '
--            'plain, summary, disabled)\n')
-+            '\'bogus\' is not one of \'regular\', \'mime\', '
-+            '\'plain\', \'summary\', \'disabled\'.\n')
- 
-     def test_invite_member(self):
-         with NamedTemporaryFile('w', buffering=1, encoding='utf-8') as infp:
---- a/src/mailman/commands/tests/test_cli_delmembers.py
-+++ b/src/mailman/commands/tests/test_cli_delmembers.py
-@@ -56,8 +56,8 @@ class TestCLIDelMembers(unittest.TestCase):
-             result.output,
-             'Usage: delmembers [OPTIONS]\n'
-             'Try \'delmembers --help\' for help.\n\n'
--            'Error: Invalid value for \'--file\' / \'-f\': Could not open '
--            'file: bad: No such file or directory\n')
-+            'Error: Invalid value for \'--file\' / \'-f\': '
-+            '\'bad\': No such file or directory\n')
- 
-     def test_not_subscribed_without_display_name(self):
-         with NamedTemporaryFile('w', buffering=1, encoding='utf-8') as infp:
---- a/src/mailman/commands/tests/test_cli_syncmembers.py
-+++ b/src/mailman/commands/tests/test_cli_syncmembers.py
-@@ -58,8 +58,8 @@ class TestCLISyncMembers(unittest.TestCase):
-             result.output,
-             'Usage: syncmembers [OPTIONS] FILENAME LISTSPEC\n'
-             'Try \'syncmembers --help\' for help.\n\n'
--            'Error: Invalid value for \'FILENAME\': Could not open '
--            'file: bad: No such file or directory\n')
-+            'Error: Invalid value for \'FILENAME\': '
-+            '\'bad\': No such file or directory\n')
- 
-     def test_sync_invalid_email(self):
-         with NamedTemporaryFile('w', buffering=1, encoding='utf-8') as infp:
-@@ -374,8 +374,8 @@ class TestCLISyncMembers(unittest.TestCase):
-             'Usage: syncmembers [OPTIONS] FILENAME LISTSPEC\n'
-             'Try \'syncmembers --help\' for help.\n\n'
-             'Error: Invalid value for \'--delivery\' / \'-d\': '
--            'invalid choice: bogus. (choose from regular, mime, '
--            'plain, summary, disabled)\n')
-+            '\'bogus\' is not one of \'regular\', \'mime\', '
-+            '\'plain\', \'summary\', \'disabled\'.\n')
- 
-     def test_override_no_welcome(self):
-         self._mlist.send_welcome_message = False
diff --git a/net-mail/mailman/files/mailman-3.3.4-py3.9-importlib.patch b/net-mail/mailman/files/mailman-3.3.4-py3.9-importlib.patch
deleted file mode 100644
index f8771678b3e9..000000000000
--- a/net-mail/mailman/files/mailman-3.3.4-py3.9-importlib.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 0eced2d273535577645493340c7319ebf27a559c Mon Sep 17 00:00:00 2001
-From: Neal Gompa <ngompa13@gmail.com>
-Date: Fri, 16 Oct 2020 03:47:38 -0400
-Subject: [PATCH] Use importlib.resources for Python 3.9+ and
- importlib_resources otherwise
-
-This makes it possible to use Mailman 3 in environments where importlib_resources
-is not available.
-
-Signed-off-by: Neal Gompa <ngompa13@gmail.com>
----
- setup.py                        |  2 +-
- src/mailman/__init__.py         |  5 +++++
- src/mailman/testing/__init__.py | 23 +++++++++++++++++++++++
- 3 files changed, 29 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index cd3645611..6d871fbfd 100644
---- a/setup.py
-+++ b/setup.py
-@@ -121,7 +121,7 @@ case second 'm'.  Any other spelling is incorrect.""",
-         'flufl.bounce',
-         'flufl.i18n>=2.0',
-         'flufl.lock>=3.1',
--        'importlib_resources>=1.1.0',
-+        'importlib_resources>=1.1.0 ; python_version<"3.9"',
-         'gunicorn',
-         'lazr.config',
-         'python-dateutil>=2.0',
-diff --git a/src/mailman/__init__.py b/src/mailman/__init__.py
-index 2d94288e0..1c760008d 100644
---- a/src/mailman/__init__.py
-+++ b/src/mailman/__init__.py
-@@ -37,3 +37,8 @@ if 'build_sphinx' not in sys.argv:                  # pragma: nocover
-     else:
-         from mailman.core.i18n import initialize
-     initialize()
-+
-+# Switch over to the internal importlib.resources module on Python 3.9+
-+if sys.version_info >= (3, 9, 0):
-+    import importlib.resources
-+    sys.modules['importlib_resources'] = importlib.resources
-diff --git a/src/mailman/testing/__init__.py b/src/mailman/testing/__init__.py
-index e69de29bb..2b2ed536a 100644
---- a/src/mailman/testing/__init__.py
-+++ b/src/mailman/testing/__init__.py
-@@ -0,0 +1,23 @@
-+# Copyright (C) 2009-2020 by the Free Software Foundation, Inc.
-+#
-+# This file is part of GNU Mailman.
-+#
-+# GNU Mailman is free software: you can redistribute it and/or modify it under
-+# the terms of the GNU General Public License as published by the Free
-+# Software Foundation, either version 3 of the License, or (at your option)
-+# any later version.
-+#
-+# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
-+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+# more details.
-+#
-+# You should have received a copy of the GNU General Public License along with
-+# GNU Mailman.  If not, see <https://www.gnu.org/licenses/>.
-+
-+import sys
-+
-+# Switch over to the internal importlib.resources module on Python 3.9+
-+if sys.version_info >= (3, 9, 0):
-+    import importlib.resources
-+    sys.modules['importlib_resources'] = importlib.resources
--- 
-GitLab
-
diff --git a/net-mail/mailman/mailman-3.3.2.ebuild b/net-mail/mailman/mailman-3.3.2.ebuild
deleted file mode 100644
index 825b5d0deff1..000000000000
--- a/net-mail/mailman/mailman-3.3.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Mailman -- the GNU mailing list manager"
-HOMEPAGE="https://www.list.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/aiosmtpd-1.1[${PYTHON_USEDEP}]
-	dev-python/alembic[${PYTHON_USEDEP}]
-	dev-python/atpublic[${PYTHON_USEDEP}]
-	>=dev-python/authheaders-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/authres-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/falcon-2.0.0[${PYTHON_USEDEP}]
-	dev-python/flufl-bounce[${PYTHON_USEDEP}]
-	>=dev-python/flufl-i18n-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/flufl-lock-3.1[${PYTHON_USEDEP}]
-	>=dev-python/importlib_resources-1.5.0[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	dev-python/lazr-config[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
-	dev-python/passlib[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.3[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-configuration[${PYTHON_USEDEP}]
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-5.0[${PYTHON_USEDEP}]
-"
diff --git a/net-mail/mailman/mailman-3.3.4.ebuild b/net-mail/mailman/mailman-3.3.4.ebuild
deleted file mode 100644
index d6f428c545b1..000000000000
--- a/net-mail/mailman/mailman-3.3.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Mailman -- the GNU mailing list manager"
-HOMEPAGE="https://www.list.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/aiosmtpd-1.4.1[${PYTHON_USEDEP}]
-	dev-python/alembic[${PYTHON_USEDEP}]
-	dev-python/atpublic[${PYTHON_USEDEP}]
-	>=dev-python/authheaders-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/authres-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/click-8.0[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/falcon-2.0.0[${PYTHON_USEDEP}]
-	dev-python/flufl-bounce[${PYTHON_USEDEP}]
-	>=dev-python/flufl-i18n-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/flufl-lock-3.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' python3_8)
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	dev-python/lazr-config[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
-	dev-python/passlib[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	<dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-configuration[${PYTHON_USEDEP}]
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/flufl-testing[${PYTHON_USEDEP}]
-		virtual/python-greenlet[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-py3.9-importlib.patch"
-	"${FILESDIR}/${P}-fix-click-8.patch"
-)
-
-python_test() {
-	distutils_install_for_testing --via-venv
-	"${EPYTHON}" -m nose2 -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/net-mail/mailman/metadata.xml b/net-mail/mailman/metadata.xml
deleted file mode 100644
index 09728cc88638..000000000000
--- a/net-mail/mailman/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">mailman</remote-id>
-		<remote-id type="gitlab">mailman/mailman</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-mail/mailmanclient/Manifest b/net-mail/mailmanclient/Manifest
deleted file mode 100644
index e4e1c8fd1205..000000000000
--- a/net-mail/mailmanclient/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST mailmanclient-3.3.1.tar.gz 78807 BLAKE2B 04542069b3a7a4b0069363f09c21ce321350fe25e57a86e5ac9ac9ec5329777acfdd1ccf62354d9df86f615f37328a8c9700811e05823ec39a648c4477b9321e SHA512 bb23d47b4c5c9f4881298330f530624c7af243e9e583f8c20cac2de77fc4a789dae729e8daa96b6a6bbe775ac549d0fc118773697b7a156fb74e4365a18683b7
-DIST mailmanclient-3.3.3.tar.gz 90137 BLAKE2B d354123fb7735d8b670422461f3d5697a30ac83d1b2f9c7f642583423ab383f58b0d0604f18be23175fcdabe42721ee02102e764211fd0723c9146f8c39581fd SHA512 a4d18a7fc6084dfb20a7028cc085c31e696b8c2db4eec674852929b1d3a221a065b8e33d8047d018d4a0edf1afb3bcb55e76906808c0f6b3715abb8a81437b9e
-EBUILD mailmanclient-3.3.1.ebuild 488 BLAKE2B 9c5e9efd6be97e8cc3e9ace25ee35453cc865c50079ec9478eefc482f06df4e9c55ab331e192155ca0bb17b27053779b5d8a8e96b5040deb720c390f841f77d0 SHA512 f05454c071395effff6349ace296c6c93988f818d66e80b30580635959155c01b3b33a656e33d4b5dc2337a857132b5c033ed3d3c1649fed283e97db486dddc0
-EBUILD mailmanclient-3.3.3.ebuild 926 BLAKE2B 3d4a9241d840958570b8dacd47df0ec24da7d04d50b5538e2ba6fa5a9530000960bb2c1089150968858b5a249d47eeb491a487b7b80d3911f050037b664cb32c SHA512 371b37aa667c9bc83056676582ea6e4f602e0080cabc57b3ad4073b832ba40451cad175ee5521dff5831ed600576fa24c746445b35fccc66daae368499bf73e1
-MISC metadata.xml 329 BLAKE2B 45f2cb03be083186f0b017dcc6b132e07814210de46c634694a4e71c830ee5ba167d0a0d611ea455c4e0078b2af95bdfa6b15a901c267281dfb11b60a0005216 SHA512 41ba1ab2012ae6be4720a059723d516dd28c0fd8c863bce795b31bf5f68007c801a0c520859f254feada5c3ad3d6bddf30dae57e771997c0e7566f70eaaa8724
diff --git a/net-mail/mailmanclient/mailmanclient-3.3.1.ebuild b/net-mail/mailmanclient/mailmanclient-3.3.1.ebuild
deleted file mode 100644
index 7ada696e8dc5..000000000000
--- a/net-mail/mailmanclient/mailmanclient-3.3.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the GNU Mailman 3 REST API"
-HOMEPAGE="https://www.list.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-
-DOCS=( README.rst )
diff --git a/net-mail/mailmanclient/mailmanclient-3.3.3.ebuild b/net-mail/mailmanclient/mailmanclient-3.3.3.ebuild
deleted file mode 100644
index 00d0bcb61d8a..000000000000
--- a/net-mail/mailmanclient/mailmanclient-3.3.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the GNU Mailman 3 REST API"
-HOMEPAGE="https://www.list.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-services[${PYTHON_USEDEP}]
-		net-mail/mailman[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Needs network
-	src/mailmanclient/tests/test_client.py::TestFindUsers::test_find_user_page
-	src/mailmanclient/tests/test_client.py::TestFindUsers::test_find_users
-)
-
-src_prepare() {
-	sed -e '/addopts/d' -i pytest.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/net-mail/mailmanclient/metadata.xml b/net-mail/mailmanclient/metadata.xml
deleted file mode 100644
index e498aa8e9dfe..000000000000
--- a/net-mail/mailmanclient/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">mailmanclient</remote-id>
-		<remote-id type="gitlab">mailman/mailmanclient</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-mail/mailshears/Manifest b/net-mail/mailshears/Manifest
index c9cb0d0dfbcf..23d7f9107161 100644
--- a/net-mail/mailshears/Manifest
+++ b/net-mail/mailshears/Manifest
@@ -1,3 +1,3 @@
-DIST mailshears-0.0.4.gem 68608 BLAKE2B 8adca0b902145f9ed97f9154db927f0ba9aa4696c37485c6ee9c3001f728f6f0554d0d8330b6173d7b636712f123107aa71cd818dba91aa8abf956df016775e1 SHA512 6c808ae2d1f2393c19fcad2a0c9c437a7a79354f779dfbbe8ec1662c39a534b1318ee30355593db9027d8b9eb418b4f99f4b87d06441668a3c15c0987ea8cf57
-EBUILD mailshears-0.0.4-r1.ebuild 667 BLAKE2B fef1b84942e99b905075c58e4c5d7abd3188df64042c3752460322278e3655384921fce0a1227ed065671e76e2c968814fd767e4cc86ecafdee16f066896f6b3 SHA512 2ed8f82c2b9d700733d0ea5ce89a933ebe0a2b969653e8ea50633640ce568843d11a896815c3ee7db2167eab56df90e6ae69e910c5aa534b1cf080de55016e58
+DIST mailshears-0.0.5.gem 68608 BLAKE2B bee5c44121e9a5fb746af0ba525e749ae6f0a772a37cff00325ee8e2d3d5f6bf39a20e90bffcf8b9d863525beeb93cf757469412a5dd4b23d566215aaabe134d SHA512 873e906ba5332b5589feb0aa24a7c9e5372971bc821ad290b536412d826fc0b103ed62cff73a33d80ada7e862d66c43808d73c46c46c49b319104022a04f3026
+EBUILD mailshears-0.0.5.ebuild 686 BLAKE2B 75783d3be394e47ff3762719ab7ee61f3590304f867729ca7ef127d4d78550a6497e7de8c667f5204760b43b29c8394a0c3bf7a79cfeb242dde1700145c2d8a3 SHA512 26639d56e36aa4a0d6c2bef0f8c758d092a4d0de04837940d23b5674442477e56fcaa6a54cfdb29aa87208e07070e562480a4eb4a55408e0137cabe2e993c365
 MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/net-mail/mailshears/mailshears-0.0.4-r1.ebuild b/net-mail/mailshears/mailshears-0.0.5.ebuild
index 9c6e50724d69..06a584f9a770 100644
--- a/net-mail/mailshears/mailshears-0.0.4-r1.ebuild
+++ b/net-mail/mailshears/mailshears-0.0.5.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-USE_RUBY="ruby24 ruby25 ruby26"
+# ruby31 is ok too
+USE_RUBY="ruby26 ruby27 ruby30"
 
 # The tests are dangerous and shouldn't be run by anyone!
 # They mess with your local postgres databases.
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index c50264100447..3bda71c4dbc6 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,18 +1,11 @@
 AUX comsatd.initd 569 BLAKE2B 1b4ad287b67ef6d95fbc626296e79a857264754159967c54105e9d9f4493e95d3494cfce6082f289358021e02bbaac580a1b4d78ca8b2cc713af57197e532431 SHA512 9c36ddf70bf4f0e3c56f55651a740014078e3a1a79569a62ccd74e1ec7167eac6ecb69d56c15913d815c472fe943d17a1e781a669208d37c97671afea2208f8f
 AUX imap4d.initd 566 BLAKE2B 2d030e47f63b4133eed4b47c9069c54de290f907d9429eb99675380569e1e0efdbb1172664ba1ee0f2924ac7284981fbe350d1543a6d0790722456523d997535 SHA512 51d6cf4285c6823d97e52c7eb408a80aa66376f329685acdc21e096c2099a044b2fd18e7b9e5ed89406a3cd1f16b7aa7b0243f8ea46aa7824da48b566ec00324
 AUX mail 82 BLAKE2B 6d9cc293deff8f99cea0ce8842dd34e658844ca9a1f4e530d3c95f8154ed337ab6ccc2b6263af9cfa8078913a7b70beb5874c999174d5648c1faeace8f68e146 SHA512 80080a3118ed66cfde44ad3663e4b07bcd5fe756b86a213ea4e1ab86e27f8485dcf02af3ee6b7f6f12105a267b9619376668e0cb6e60743ffb7664d2dbea9144
-AUX mailutils-3.12-disable_escapes.patch 781 BLAKE2B fdd350688f96d4b073154005a68f3eff179a0264bb4611916cb24955fb6759de534ec3cdc04bd9bb687eeaf4f714de5c590030c3a897dc8b54ca4d843ebdd6b0 SHA512 383dbe4d55a5fdaf3b62ee4a3743c04eb53b46246d1a08aff1c4b42171914014b39c1e2c3cad5b0c7bd6649d97ee5377c5643319d875b4fb6f7a93aea0b5fec3
-AUX mailutils-3.12-fix-big-endians.patch 698 BLAKE2B 5d73570756063047633c82df2038c29999b3f9aaa48d7bfe58cf48c985107c43e36a717203b323506a9c8e24dfc579c218c2107e5a59de642290d3699a9c8867 SHA512 78af75afb332a47b4780ea1a1d67113e7e71febcff6044c8e9281e09017181309d1665da50010db1ccfebffd2c0d9ddd10e753a867c9aee9d99b67f9475ffce1
-AUX mailutils-3.12-misssing-endif.patch 689 BLAKE2B a54f086b1fccd4c5965ef849158e0e667f25abb6f095bd5e8aa63b53199e01327c3de33b43892da1eb1429dc0443a5133880bb27374f128a4f00e58d476a7740 SHA512 40dc7fe324014eadde44e55af2a2de4e474a2f6c2bd3a3fbea10446156b4505cf36c89c7458da74749ab276570f5bdbaddf842ac9cf289ca7e7a4888d463a5d0
 AUX mailutils-3.5-add-include.patch 275 BLAKE2B 2502fb3226bc63ae98d018392fa1107b4079ea51cd8e57b4e97522d21e696bd6048fad2de885f88644d23f434a6e407f42ba8fcbcfe5b1e65884f37718e34328 SHA512 0972cde536a1a82fe243c9b048fc15f4863586a2344b54c9b4f6f8a5935762c7272c0af2698239af7de9da62b1c2928bc7f621e01f447423fdd8288cedee88b6
 AUX mailutils.rc 258 BLAKE2B 3dc68190e11c8bf5016b0fe8b22c61f79ba7de96a1f230f7d0743ba23fa903cb9f99fac94a7363c7d80b7bbaf76e2d4de848e7ac726642fb23c56caf43a46568 SHA512 691bcc81fd355d8f2776e72006c149996273579e099f24970ff0c5dd6bdf65cd64e31597f8b3d8e0a900a91c3325b8d2a1a96682a9b3ff53acd41218fe8721fe
 AUX pop3d.initd 563 BLAKE2B fd09d7a7499c888eddfb812644102f979c2423e9b1a9f0077655b6ae4c1eb4214f685ef7843e74a808e52ee988cc3fbefa278754db824256a4972c83fc0ada31 SHA512 7847c29a03f21df82d36c077ccb38329457a332cccdfba24bee3b1c9a8170fc71c07ee674408f069693953dd1bf44b8b8f782dcc35d6b16e62f70b2b32ce018f
-DIST mailutils-3.12.tar.xz 3134484 BLAKE2B eac7934e9332482adffa3d4b1574d89a65949644ca8dd14e507e9c5f268d485b97f4d61deadf34b2ddcae1b91deee93372e9ebd53c88a0c0092346a0d83fd67e SHA512 a7d681bc7a763b7f09b704c8a536ea1c2444c52ca736eca321ca72fd32e2e62c0e14687ba79654d9162d45189d0621b1c75c639b81e04a79bbf3b3c09b9cebd2
-DIST mailutils-3.13.tar.xz 3152892 BLAKE2B cd7d9ce0391d85482581eeb52f60fcc175647d21e433a4dacee3547aa4dcd710331ad780b6706c242d1a7501ec7fc50ff0c25f9b5f4ceeed84893c637ca366c1 SHA512 fd0b23aa535c6446af1ae633d68d41d1aa243d489b2623d346f6a0d6b543c43ab6c2b9bb1449d664abacbcd3ec3a0a5e7a0a5d56d2762e8a961544c77ccc592a
 DIST mailutils-3.14.tar.xz 3215944 BLAKE2B 64965c177065eacab9f5545fbeacd538492995f808dab731d02acbe7d63161f3bfb1528a0ca71e30c32ba12edc7e4f68642f2e5154b66d3bb48c479cae95c754 SHA512 9797deb8901d03a231c3503d75a758fbfb1220d1e064dd8be74735e6c88aa04c94533e802a60fdfbe12f1bd7daec4a39249cd957b103f09b89df364bd9a8869d
 DIST mailutils-3.15.tar.xz 3112212 BLAKE2B 78101178c101897bc75897a1e134796150fafccd7e8f4b603c82698dd0cd27a98dd1ed7837a87be4760e8bdb39ec7275023a8e2847f832e683b8e97e5e95d75d SHA512 b6b90ad4f71c83e500a9b176694f5fb51a99baf26e52d567d222d6f037a23a0814ac84f88762cbfb4f22382c0e662191af89fb74a8a287134b8fffa58086bdd8
-EBUILD mailutils-3.12-r4.ebuild 3707 BLAKE2B e4427c611c1e14ac75bd100e212546a77086dd908699a4a63c58f824906fbfd0166c5546892ad5dd25ae30d339848efbb620509a8e40e8e48f671431b537cb9b SHA512 3bd0d885e6abd126ebb1cd987b238509853a04366e7c6ec84224f98649f4f20c6ba7b9c731d7a972e580ece1d71652f1c84c49c6220416d2718636194380efdc
-EBUILD mailutils-3.13-r1.ebuild 3589 BLAKE2B 34888aa7a2fadb732a39637ad3d4db29b17aa69803f658b0995a9c32e849ad103f1ed75619704c54ddbb8c1f4864f011d1008cdde5ab14e246eb5168bee0591f SHA512 c5fb2e09ad2284563a95af4e0596aef656068b3eb49cc7c781109acb5f6d3f69a6d30a65a2c92f70c401700ea6e7a9c0801659eb57f9de5e6de4c1c918229e5e
-EBUILD mailutils-3.14-r1.ebuild 3573 BLAKE2B f1dc990a14ae2d5a351cbec64929958fab59fba130cc9759a535d6ffdf15af074dafe2898a4ce88b66442514ccd047bef268a1e2e503112764e8edc6a0715f96 SHA512 8aab533a2a5a95479ab8eeec03105b75d13d31a6a3d9778d2ee489ccb8a8ac0b603d7260564f5184d917e48b5fcca743f57ed23bdc6085bd4f8b2497654cae27
+EBUILD mailutils-3.14-r1.ebuild 3572 BLAKE2B 249fd9f589c1ded372d8c088727c40bc21b4fdaca6bb8091fb0ed5a4fe4c5d9b1c7abd82880249e9971fc86ae844693e37855c0357204498556964af8ef05241 SHA512 7f554d52466a5eb049860f9ead74820873ce4cd65c5b880d986d50e1bf3246d0b1e4eb5ee00f9f448c057b106b4cf3f094e263872386591f23f6da8de5c1c5dd
 EBUILD mailutils-3.15.ebuild 3579 BLAKE2B b09f6992d5dad6c983577f1897c9f2dda0116f211acbb2bd5351c18e1d77bebe57382a432e331ea2f2bf0627ebaa6f63280bd0f828f95dcf76895f152508bd32 SHA512 a7ebeaac8ee01e59c74408a1bd75f09e13673f9b7b2a50f3b0495165d7ca1a7167429147b82f5544b0469e55b776e8d437a1f3628b0099d4ac96bb79b6698c9e
 MISC metadata.xml 603 BLAKE2B 1283fff637c3bc43fa0df8e17afe62bb83b38aa973337ad7082ef902f5c2d64e4b70db8775cad2a16610e07dea0b677769a810d7c9a730bfcca874b78b50da4e SHA512 a6eefadb824f089b2de3c61b30314fbbc82413c1c40be1cf243e82bc4fcaf9000c43fc00d73f19f2f7696cd06e71d72b0c6803ad329859574a0a6907a302f8c0
diff --git a/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch b/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch
deleted file mode 100644
index 073d1b671219..000000000000
--- a/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4befcfd015256c568121653038accbd84820198f Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Mon, 19 Jul 2021 11:27:40 +0300
-Subject: mail: disable compose escapes in non-interctive mode.
-
-diff --git a/mail/send.c b/mail/send.c
-index 1bdfe1134..098374dab 100644
---- a/mail/send.c
-+++ b/mail/send.c
-@@ -1324,8 +1324,9 @@ mail_compose_send (compose_env_t *env, int save_to)
- 
-       if (strcmp (buf, ".") == 0 && mailvar_is_true (mailvar_name_dot))
- 	done = 1;
--      else if (mailvar_get (&escape, mailvar_name_escape,
--			    mailvar_type_string, 0) == 0
-+      else if (interactive
-+	       && mailvar_get (&escape, mailvar_name_escape,
-+			       mailvar_type_string, 0) == 0
- 	       && buf[0] == escape[0])
- 	{
- 	  if (buf[1] == buf[0])
--- 
-cgit v1.2.1
-
diff --git a/net-mail/mailutils/files/mailutils-3.12-fix-big-endians.patch b/net-mail/mailutils/files/mailutils-3.12-fix-big-endians.patch
deleted file mode 100644
index 5dd2f8f035d1..000000000000
--- a/net-mail/mailutils/files/mailutils-3.12-fix-big-endians.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c0af3be2fcee73c1a61f58572ecef1ef3f385015 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Thu, 15 Apr 2021 08:37:29 +0300
-Subject: Bugfix in mimeview testsuite
-
-* mimeview/tests/bf.c (write_byte): Fix type of the character buffer.
----
- mimeview/tests/bf.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mimeview/tests/bf.c b/mimeview/tests/bf.c
-index 6ccce848c..2e6b37e4a 100644
---- a/mimeview/tests/bf.c
-+++ b/mimeview/tests/bf.c
-@@ -68,7 +68,7 @@ write_string (FILE *fp, char *arg)
- int
- write_byte (FILE *fp, char *arg)
- {
--  int c;
-+  char c;
-   if (strlen (arg) == 3
-       && (arg[0] == '\'' || arg[0] == '"'))
-     c = arg[1];
--- 
-cgit v1.2.1
-
diff --git a/net-mail/mailutils/files/mailutils-3.12-misssing-endif.patch b/net-mail/mailutils/files/mailutils-3.12-misssing-endif.patch
deleted file mode 100644
index 12d03af7b337..000000000000
--- a/net-mail/mailutils/files/mailutils-3.12-misssing-endif.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 4cc284cfb38306989694a7828e880f0cf6d0c4e0 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Thu, 15 Apr 2021 08:36:56 +0300
-Subject: Minor fix
-
-* include/mailutils/sys/streamtrans.h: Add missing #endif
----
- include/mailutils/sys/streamtrans.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/mailutils/sys/streamtrans.h b/include/mailutils/sys/streamtrans.h
-index 8a4727cee..c9c866013 100644
---- a/include/mailutils/sys/streamtrans.h
-+++ b/include/mailutils/sys/streamtrans.h
-@@ -25,3 +25,5 @@ struct _mu_streamtrans
-   struct _mu_stream base;      /* Superclass */
-   mu_stream_t transport;       /* Transport stream */
- };
-+
-+#endif
--- 
-cgit v1.2.1
-
diff --git a/net-mail/mailutils/mailutils-3.12-r4.ebuild b/net-mail/mailutils/mailutils-3.12-r4.ebuild
deleted file mode 100644
index c4e8479b9649..000000000000
--- a/net-mail/mailutils/mailutils-3.12-r4.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://mailutils.org/"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
-IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
-	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
-	tokyocabinet"
-
-RDEPEND="
-	!mail-filter/libsieve
-	!mail-client/mailx
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	dev-libs/libltdl:0
-	virtual/libcrypt:=
-	virtual/mta
-	berkdb? ( sys-libs/db:= )
-	bidi? ( dev-libs/fribidi )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gdbm? ( sys-libs/gdbm:= )
-	guile? ( dev-scheme/guile:12/2.2-1 )
-	kerberos? ( virtual/krb5 )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	ldap? ( net-nds/openldap:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	nls? ( sys-devel/gettext )
-	pam? ( sys-libs/pam:= )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS} )
-	sasl? ( virtual/gsasl )
-	servers? ( virtual/libiconv dev-libs/libunistring:= )
-	ssl? ( net-libs/gnutls:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	servers? ( tcpd ldap )"
-
-DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-add-include.patch
-	"${FILESDIR}"/${P}-misssing-endif.patch
-	"${FILESDIR}"/${P}-fix-big-endians.patch
-	"${FILESDIR}"/${P}-disable_escapes.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if use mysql; then
-		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
-			sql/Makefile.am || die
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# maildir is the Gentoo default
-	econf \
-		MU_DEFAULT_SCHEME=maildir \
-		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
-		$(use_with berkdb berkeley-db) \
-		$(use_with bidi fribidi) \
-		$(use_enable ipv6) \
-		$(use_with gdbm) \
-		$(use_with sasl gsasl) \
-		$(use_with guile) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with mysql) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		$(use_with postgres) \
-		$(use_enable python) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread) \
-		$(use_with tokyocabinet) \
-		$(use_with kyotocabinet) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable servers build-servers) \
-		$(use_with servers unistring ) \
-		$(use_enable clients build-clients) \
-		EMACS=$(usex emacs emacs no) \
-		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		--with-mail-spool=/var/spool/mail \
-		--with-readline \
-		--enable-sendmail \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	# bug 613112
-	newins "${FILESDIR}/mailutils.rc" mailutils.conf
-	keepdir /etc/mailutils.d/
-	insinto /etc/mailutils.d
-	doins "${FILESDIR}/mail"
-
-	if use python; then
-		python_optimize
-		if use static-libs; then
-			rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
-		fi
-	fi
-
-	if use servers; then
-		newinitd "${FILESDIR}"/imap4d.initd imap4d
-		newinitd "${FILESDIR}"/pop3d.initd pop3d
-		newinitd "${FILESDIR}"/comsatd.initd comsatd
-	fi
-
-	# compatibility link
-	if use clients && use split-usr; then
-		dosym ../usr/bin/mail /bin/mail
-	fi
-
-	if ! use static-libs; then
-		find "${D}" -name "*.la" -delete || die
-	fi
-}
diff --git a/net-mail/mailutils/mailutils-3.13-r1.ebuild b/net-mail/mailutils/mailutils-3.13-r1.ebuild
deleted file mode 100644
index d2d6db7cf078..000000000000
--- a/net-mail/mailutils/mailutils-3.13-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://mailutils.org/"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
-IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
-	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
-	tokyocabinet"
-
-RDEPEND="
-	!mail-filter/libsieve
-	!mail-client/mailx
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	dev-libs/libltdl:0
-	virtual/libcrypt:=
-	virtual/mta
-	berkdb? ( sys-libs/db:= )
-	bidi? ( dev-libs/fribidi )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gdbm? ( sys-libs/gdbm:= )
-	guile? ( dev-scheme/guile:12/2.2-1 )
-	kerberos? ( virtual/krb5 )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	ldap? ( net-nds/openldap:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	nls? ( sys-devel/gettext )
-	pam? ( sys-libs/pam:= )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS} )
-	sasl? ( virtual/gsasl )
-	servers? ( virtual/libiconv dev-libs/libunistring:= )
-	ssl? ( net-libs/gnutls:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	servers? ( tcpd ldap )"
-
-DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-add-include.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if use mysql; then
-		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
-			sql/Makefile.am || die
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# maildir is the Gentoo default
-	econf \
-		MU_DEFAULT_SCHEME=maildir \
-		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
-		$(use_with berkdb berkeley-db) \
-		$(use_with bidi fribidi) \
-		$(use_enable ipv6) \
-		$(use_with gdbm) \
-		$(use_with sasl gsasl) \
-		$(use_with guile) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with mysql) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		$(use_with postgres) \
-		$(use_enable python) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread) \
-		$(use_with tokyocabinet) \
-		$(use_with kyotocabinet) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable servers build-servers) \
-		$(use_with servers unistring ) \
-		$(use_enable clients build-clients) \
-		EMACS=$(usex emacs emacs no) \
-		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		--with-mail-spool=/var/spool/mail \
-		--with-readline \
-		--enable-sendmail \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	# bug 613112
-	newins "${FILESDIR}/mailutils.rc" mailutils.conf
-	keepdir /etc/mailutils.d/
-	insinto /etc/mailutils.d
-	doins "${FILESDIR}/mail"
-
-	if use python; then
-		python_optimize
-		if use static-libs; then
-			rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
-		fi
-	fi
-
-	if use servers; then
-		newinitd "${FILESDIR}"/imap4d.initd imap4d
-		newinitd "${FILESDIR}"/pop3d.initd pop3d
-		newinitd "${FILESDIR}"/comsatd.initd comsatd
-	fi
-
-	# compatibility link
-	if use clients && use split-usr; then
-		dosym ../usr/bin/mail /bin/mail
-	fi
-
-	if ! use static-libs; then
-		find "${D}" -name "*.la" -delete || die
-	fi
-}
diff --git a/net-mail/mailutils/mailutils-3.14-r1.ebuild b/net-mail/mailutils/mailutils-3.14-r1.ebuild
index e952d5b22b07..21cd5764b216 100644
--- a/net-mail/mailutils/mailutils-3.14-r1.ebuild
+++ b/net-mail/mailutils/mailutils-3.14-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
 	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
 	tokyocabinet"
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index fa0b19f0045c..08fe22939479 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -2,9 +2,11 @@ AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f485
 AUX mu-1.7.12-gcc12.patch 279 BLAKE2B 6b193a92ffbb3d126d39b45c09c4ccc971fe362af9e2621fc6e21e5e697d376f3a21c8e7f3521340d169ba572f9ad857bcd2ef69917650a5e5be0c99fef3aa31 SHA512 59887f801811bc86de2a562ab93304887725421baf7cf878c33bd5bc3b12eca68db951008899b18050c9b597580bc98f676881e58aafdda4af49d20e2fc64d45
 AUX mu-1.7.12-optional-mu4e.patch 1047 BLAKE2B a951fe687e59dc6cfd4266c3c3f18aa6a80e562f3bcd617526fc14c8c076768cff444d683a016100e829d6ee80c11d4701db62bcec3a13e28b40ef9b0d1505fe SHA512 3f79f0c8591170231ca800e6fd4476fa1475aea18ec5b1f6c035c88f6b947755527cfa6674a0b221cbae7808e4841b03aed8bbf56b71f2b68d84fe9c2562c363
 DIST mu-1.6.10.tar.xz 867008 BLAKE2B 6cce22f18691c3ad6dda1ec012d72c398df2ba4d1beca70fc6f88d87aa9b749e2aa4c03f5c0e0d70f4f9978e2beb60ea02642b8ff71e86e0668df726e5923b52 SHA512 a51847b338afeff9c9fa88c4698df4b85289d017063cb5e3410eb967c605d8779618dcbd988e2d923a92291c1e0738ec84afecf017c76a63776149619d134887
-DIST mu-1.7.12.tar.xz 2129072 BLAKE2B 3518a361bc06b632899f9296ec211dc926a07973433247bf6f9ecfb069dcfd8b762f358aa32418276bf7dcba40bad768dd4599534613a1fae285cef9c6ceedd0 SHA512 fe0f41520959df7f78525317bf5caad4ae7f7468ac6291b84c48805e133883192458a8f79a929c0ebda2e45ec2014db1aa72650d0a6e176d7678449be36fc4f2
-DIST mu-1.7.13.tar.xz 2139140 BLAKE2B c5eea94df8640e0362fd7bd18da78cc53023e7c85c3b4a653df7ae52e57dc64433572bfb2bc41494ce60a1b26abdd75ee07cb945a282754a12f65835a4545e6d SHA512 c5c447cdcf6fd2a3c3dfb8c7cffc9c50e147de2779db04fedaf59897fd135a76b309576f2c9473919221f0dcd6b8793732af3483d86dbe0f073a66d2559fe315
+DIST mu-1.6.11.tar.xz 870188 BLAKE2B ec2ab4312800e8357b4fc902251708e27968cdde389e2403fca9ad6b1ef5e00154aa018d5a7751ec5372b5ca2be2eb030a9148c0d53f35040f420877d51ca3f3 SHA512 78faa4f9b34827676203ab305797deb96c0c0f9b0e8158e627c9a992bccd9c5708d4a1f5cc93c0b9c7f9a224b047800bd389bf3fceb163aa139ecff0cfa19274
+DIST mu-1.7.23.tar.xz 2136016 BLAKE2B 9b0a27fc07072e52c06d8d4b807a77491d314d4c531799a83b1281ce935b79f5eab3510dc94be98ee0effe86c69379331172cfea3db330b8302d03582f7bf364 SHA512 412789146e4962f670c356576906e5eabc5783dd0fc7d04440146f064877f53b4e948713ed557e97b114a96d7a41b3087a8e3c528b48bb363e68fd0eabfe42fc
+DIST mu-1.8.1.tar.xz 537892 BLAKE2B dda0cdd3a45572000861557b04d8c92c0d61c283c6ace69a034ce209d22dc7e26ea4ac77c6493c505e0c7bcbf47ace82cd82ab20295170b2a986fcccaa0c5df9 SHA512 01b4c349aecf4134c700b6e4b1bc58d1e1360a74feec3f3ee56d1f350c7640b7447bdc35f158ce892427b7b7fbe15cfb00ab28d5aa05b9eaba1d4b4f32e5ed26
 EBUILD mu-1.6.10.ebuild 1586 BLAKE2B d14b3421814913a85460439407fb4fc90b9537df3132520c64697a20b5b3f35fc8c658395a36d4fabf514da9964333969c4e86d1092866cc6d033732d836a168 SHA512 465f3afbb8e522ce51404d6f0de08984b680498fe322484bec0f9dd2a5740fc4405ea69a78d081d9e07fcc26520c50e3349706d830c8cc2fb5dd4539f719c15a
-EBUILD mu-1.7.12.ebuild 1942 BLAKE2B c708aa3c6c104199eb7dad3d1b1c80337236549446fc4401fdf916be5dfa6b5b48888577253dd7a873247251827091ac0f69795abe12dfa79ea437044a984d9f SHA512 77c977665deea2fc90f75e672e99fda1dc1c710dabc8cb946ccfcda01bd8cb6a7bfc090883dc01817c1f5ac787cf84563801f564f49a83ae684628ec9f7d24c9
-EBUILD mu-1.7.13.ebuild 1942 BLAKE2B c708aa3c6c104199eb7dad3d1b1c80337236549446fc4401fdf916be5dfa6b5b48888577253dd7a873247251827091ac0f69795abe12dfa79ea437044a984d9f SHA512 77c977665deea2fc90f75e672e99fda1dc1c710dabc8cb946ccfcda01bd8cb6a7bfc090883dc01817c1f5ac787cf84563801f564f49a83ae684628ec9f7d24c9
+EBUILD mu-1.6.11.ebuild 1590 BLAKE2B ab43c3330249f7fb9175dcb4f4e47a679efac9491ff184fed07e50e107e0eb73a1e95d269eec56b32fb13ab753ebc0daf884a6a812bc93af1afad204fec19a58 SHA512 1b3f0ba75c9baf1761cb853a2c2142137bceed8b106914b19b9598e0bc7c4644b5f8a5000be793d9f6eb3c4818dc9a777169e77b7e1b6dbfc48b48b3619ba01e
+EBUILD mu-1.7.23.ebuild 2073 BLAKE2B 5f0eae7568d09af9d62a8475c056a0f74b96517372a46cdf81538f1a43bffdfc75fc813cb086cc6f876a2b099e9bdef247e47e54ea9b0868c926e92e3a8497ab SHA512 56cf8c574b242910c1d787bae63ed04bfdf03298f27852baa373b599b087da8816035b55507f29665192f5fc7cb8c8a43cedd6dbcd2f68c9baff6f5522bd5af1
+EBUILD mu-1.8.1.ebuild 2043 BLAKE2B 2122817aade6a310834d42c3f2720424a1506c13497f063794a95b5cd1eca05a0601fb16db335698523e4620bf7d7a2393560cf6fd577210b6646e7a7e32d63b SHA512 a3130bbcafaa38c64168ec87ef82fd23bfb5a2dc83b9b2e8e1de8d3a6ae90aa732fe6d58cfcdc840e0ad634544ea3b2bde6a9148c3ccfa5b0a30b3387134be40
 MISC metadata.xml 893 BLAKE2B 4d21c0794fc184957939ebaab628b9a1abe0bbdb63915157e266ce0a773fe3acc52722d010d3b4e096f86257e945c0f9dd51cd0dbe54c37f717408ffe942bc06 SHA512 7f499e039820d12c9acd0affe2a402fc53ee6367684a3c2ba25669987f02b0fabb3db0de978e197876bd9e3af315734af398ba7c8305119c511d59c709b6e225
diff --git a/net-mail/mu/mu-1.6.11.ebuild b/net-mail/mu/mu-1.6.11.ebuild
new file mode 100644
index 000000000000..311a0e76b0b5
--- /dev/null
+++ b/net-mail/mu/mu-1.6.11.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit 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/releases/download/${PV}/mu-${PV}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="emacs guile readline"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/gmime:3.0
+	>=dev-libs/xapian-1.4:=
+	emacs? ( >=app-editors/emacs-25.3:* )
+	guile? ( >=dev-scheme/guile-2.2:* )
+	readline? ( sys-libs/readline:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+SITEFILE="70mu-gentoo-autoload.el"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable emacs mu4e)
+		$(use_enable guile)
+		$(use_enable readline)
+		--disable-gtk
+		--disable-webkit
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# On some systems make -n errors out so the default src_test
+	# implementation does not call the tests.  Bug #836782
+	emake test
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -type f -delete || die
+}
+
+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/"
+
+		elisp-site-regen
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/mu/mu-1.7.13.ebuild b/net-mail/mu/mu-1.7.23.ebuild
index 902c7c8d9e4b..39d5cb8ad147 100644
--- a/net-mail/mu/mu-1.7.13.ebuild
+++ b/net-mail/mu/mu-1.7.23.ebuild
@@ -38,6 +38,7 @@ src_prepare() {
 
 	# Don't install NEWS.org into /usr/share/doc.
 	sed -i '/NEWS.org/,+1 d' meson.build || die
+	sed -i '/mu4e-about.org/d' mu4e/meson.build || die
 
 	# Instead, put it in /usr/share/doc/${PF}.
 	sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
@@ -49,7 +50,6 @@ src_configure() {
 		$(meson_feature readline)
 		# NOTE: Guile interface is deprecated to be removed shortly.
 		-Dguile=disabled
-		-Dtoys=disabled
 	)
 	meson_src_configure
 }
@@ -62,6 +62,10 @@ src_install() {
 	# mu4e-info.
 	docompress -x /usr/share/doc/${PF}/NEWS.org
 	dodoc NEWS.org
+
+	# Same as above.
+	docompress -x /usr/share/doc/${PF}/mu4e-about.org
+	dodoc mu4e/mu4e-about.org
 }
 
 pkg_preinst() {
diff --git a/net-mail/mu/mu-1.7.12.ebuild b/net-mail/mu/mu-1.8.1.ebuild
index 902c7c8d9e4b..ef60bb7e559f 100644
--- a/net-mail/mu/mu-1.7.12.ebuild
+++ b/net-mail/mu/mu-1.8.1.ebuild
@@ -7,7 +7,7 @@ inherit elisp-common meson
 
 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://dev.gentoo.org/~matthew/distfiles/${P}.tar.xz"
+SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -28,7 +28,6 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.12-optional-mu4e.patch
-	"${FILESDIR}"/${PN}-1.7.12-gcc12.patch
 )
 
 SITEFILE="70mu-gentoo-autoload.el"
@@ -38,6 +37,7 @@ src_prepare() {
 
 	# Don't install NEWS.org into /usr/share/doc.
 	sed -i '/NEWS.org/,+1 d' meson.build || die
+	sed -i '/mu4e-about.org/d' mu4e/meson.build || die
 
 	# Instead, put it in /usr/share/doc/${PF}.
 	sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
@@ -49,7 +49,6 @@ src_configure() {
 		$(meson_feature readline)
 		# NOTE: Guile interface is deprecated to be removed shortly.
 		-Dguile=disabled
-		-Dtoys=disabled
 	)
 	meson_src_configure
 }
@@ -62,6 +61,10 @@ src_install() {
 	# mu4e-info.
 	docompress -x /usr/share/doc/${PF}/NEWS.org
 	dodoc NEWS.org
+
+	# Same as above.
+	docompress -x /usr/share/doc/${PF}/mu4e-about.org
+	dodoc mu4e/mu4e-about.org
 }
 
 pkg_preinst() {
diff --git a/net-mail/poppassd_ceti/Manifest b/net-mail/poppassd_ceti/Manifest
index ac9ef6dd4bc9..bf476357fe44 100644
--- a/net-mail/poppassd_ceti/Manifest
+++ b/net-mail/poppassd_ceti/Manifest
@@ -1,6 +1,6 @@
 AUX poppassd.xinetd 245 BLAKE2B 28fe0bc0c1c87c4ff48cae52c703a4a6c3e776bf91b869040025951dbaf1f07345a95c9bc45d40f87c3ad9a83d6556421f805d65952f4f9d7588abed9bb5b25f SHA512 333d331433a0b43f414f83e51cad3502afb6f5b287967e55d0dedd90ac06955ccbcbe598a3dafe682c97a7ac4ecf501c0842ade940c0702fb797717e8844ffd4
 DIST poppassd-ceti-1.8.7.tar.xz 71400 BLAKE2B ca26f7298a8f679c595a9cd66622f1e8ddeff80a7b1655df91a7a15668337112113806d0aef788a374c483cbc957e765b178428d839da2c853ebf87e16039548 SHA512 d50549a4f6bdd9eac7fa74a7787e47dbffff14da883d4e8e23e24802883761c1a392b8a7fbffe5fa726845f48b3b33e0dbc1743ad2d689a4d396c91d0a42f8f1
 DIST poppassd-ceti-1.8.9.tar.gz 15465 BLAKE2B 22f6b521d83c4b7c4a8842cde22710c17dda26f9cbfb39d020de05b14c045a1606fcebf51557c2e38c932e009554c5f0d1f770d5cfbf1666f81eb03a342c25f4 SHA512 cc8953aaed8cd6d2633d1c2040e364770598eb71d563a29fd3f4798730654d002ba720babab0596cc336ea8aff403064e17e8b17c3df657e5c840db2230a2077
-EBUILD poppassd_ceti-1.8.7.ebuild 1678 BLAKE2B bb77369d9c5ed2ec923a00c5813a16d6c55f92e429d16011d20398ee95f6999137ad3e9f4b43f72d927ec85faf3dcb58cef203e9d4cc4f5f63bc1ba6b4ca788a SHA512 93fc50a9205e0a543e2d9d729b6450a3b736079a83061fd912e491c2d5dd1149658ec2d8d4349ccea6f183f40837b143a724649d8e2a861695126895dc96c521
-EBUILD poppassd_ceti-1.8.9.ebuild 1867 BLAKE2B c63efac501b2d46ea7904c3c155c019393539b6776f2829335de7ba6bfaf6ce73dc73728724f2af9dac50a33a6dcd5e9ab35cba2f64c3cf28af3ad57064b3430 SHA512 1dd364f1978f08e4a559c756c21441ffdec30c87be8d4bc74583d1c27bf961ce7f13e4b84a2501115d024452c496797767bd117f8b0037f19f7a7076e4b6a107
+EBUILD poppassd_ceti-1.8.7.ebuild 1669 BLAKE2B 6c6bbc9c8ac6c04b772d60ca90afd38a72f058058b701eb5aabca630e04f1eb0c5c604bdb35c8ad45bb8ad277d19b0b0cb469ab2753f5f8a25615fbfa1f5eb61 SHA512 d7fa9305991753ccb2d42d6f5cfe06bf5d57eae03cd83162a144542438ecc749af22c1ec47bac2088e3f98cdcff798c01198459d59d14e854c8b452b4efd2f59
+EBUILD poppassd_ceti-1.8.9.ebuild 1858 BLAKE2B 575d77175b29e08b6ef17d3cc0a4c5285e97964fcc41b5759b9c6e1a50ceeba4211401ea5d0f8f7e03c8e4eab5ca3f20c961635bf60f3559c3173fd9bfdfe0d4 SHA512 8235d0fc10ff537fe3c55f078b678dd02703baac56fff1f1368db76dc159a2c437624f49ae77240d404282c5fa21e9d28327a2000c9229e4a61db2997ee6c65c
 MISC metadata.xml 945 BLAKE2B 908fc2f18052b0da8ef0e74d40d5886b9d66e6ff8907987a7533337507f36b835fb76580f9fca641bc50cb297629cf4a64553a7f9393e3dc7b4fdbdd9f35adef SHA512 40388f7a33c9879d5666920b38e665ed5a329dca4f7d042aceb8faf9b2ff43cf3b4e6d414f7233c6ca4ecc237cde2e98065325ea11ba55cd7187bacae2233a5d
diff --git a/net-mail/poppassd_ceti/poppassd_ceti-1.8.7.ebuild b/net-mail/poppassd_ceti/poppassd_ceti-1.8.7.ebuild
index 0e359ed3991f..f32d4839e2d0 100644
--- a/net-mail/poppassd_ceti/poppassd_ceti-1.8.7.ebuild
+++ b/net-mail/poppassd_ceti/poppassd_ceti-1.8.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ Alternatively, a front end may be able to run it directly (if already
 root), or might use app-admin/sudo.  To use sudo, you'll need to configure
 /etc/sudoers with something similar to:
 
-    apache ALL=(ALL)       NOPASSWD: /usr/sbin/poppassd
+	apache ALL=(ALL) NOPASSWD: /usr/sbin/poppassd
 
 See also README.md.bz2 for related configuration and security
 considerations.
diff --git a/net-mail/poppassd_ceti/poppassd_ceti-1.8.9.ebuild b/net-mail/poppassd_ceti/poppassd_ceti-1.8.9.ebuild
index be579701be42..3b4b5b17dc22 100644
--- a/net-mail/poppassd_ceti/poppassd_ceti-1.8.9.ebuild
+++ b/net-mail/poppassd_ceti/poppassd_ceti-1.8.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,7 +44,7 @@ Alternatively, a front end may be able to run it directly (if already
 root), or might use app-admin/sudo.  To use sudo, you'll need to configure
 /etc/sudoers with something similar to:
 
-    apache ALL=(ALL)       NOPASSWD: /usr/sbin/poppassd
+	apache ALL=(ALL) NOPASSWD: /usr/sbin/poppassd
 
 See also README.md.bz2 for related configuration and security
 considerations.
diff --git a/net-mail/postfix-logwatch/Manifest b/net-mail/postfix-logwatch/Manifest
index d953d2b384a4..f80346ad77b0 100644
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -1,10 +1,5 @@
-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
 DIST postfix-logwatch-1.40.04.tar.xz 78996 BLAKE2B fea2a08a7bc776cf0106a60bc0f86730c562d6c893629a1028183150a246803bda8ada6a5ec7e264685fe40016b82ce4140031af7e508ac4b1d9a34e552b865d SHA512 194917fe4d05e9808893da0c175859e932d5e48956d1dda96129dd5de7f9ee23131ae1831b558c8c2d32d03ffda80aa95cfd5048543b7766a0486a71efa6c19b
-EBUILD postfix-logwatch-1.40.03-r4.ebuild 1160 BLAKE2B 9c269a1abd9c561a8f514ac99e991d57344286705b91cbfa53b464a4267e024442ab324b4973c5962e27bec8da601feb6bf550969bae4fb030d05651642a0e6e SHA512 5c9d736880a06bd66c2ea75827d75610b826392e95573c7b75a654cd613afada7aadcc6bcfa8d0cfe365ade3c5ae7e9944c6c7bb304c4bce657a897220336cfe
-EBUILD postfix-logwatch-1.40.04.ebuild 796 BLAKE2B cc8aab5fd6c69efb2c31d14559a48539fcae3cede5659f53f79001d554d55c955b39993fe4dfd69aea7e8c0842e53687a7a285825282a6ae871d05c22cf34b47 SHA512 ea8dbfd64225f7aed6847b46641aff571ed171237845c693b9976d554482043877260f06e8954d7437f6648dbaa0d487ba024f44559536d2fcd17212121816bf
+DIST postfix-logwatch-1.40.05.tar.xz 79504 BLAKE2B 5d45a43ef2206b77092a90cd463a1718fada286fdd499df4416739aea7246c79b0670503585e7e057174ac715986767e3a72974d9790f33a2cd251221d883687 SHA512 15ba438701be110ce75c59bb6803cbb308bd53876428b01a457f42b3fb12e565c9b0c2d4559d71451475ec4986fccfc9f06854760035b4653c72508b968d5a0d
+EBUILD postfix-logwatch-1.40.04.ebuild 794 BLAKE2B 0658e0adb712ffae2973819c7ffc0c309f0030b209eaad9430284911c393e8d33440ad5bfdf72e1ece11cf34114eaec8200c7b79465f8b66490d9bc5a3166982 SHA512 d3b60889f683414a8ea6fa58d4c43068e20a96d1b004c4899f7e0404389d096764c33a93fe52427153574aae778483ad83c3ecd0ce179448ced50657ca8ec859
+EBUILD postfix-logwatch-1.40.05.ebuild 796 BLAKE2B 0ab46353e3f9518186cc515f4c37cdc703d4c8b9ae7fe72f6f06aa9f95bfa5217971009665fc134f4b104c3860030616db3a9eff86a0a536c353fa34805914f7 SHA512 5d833f806fc1d3fbec465dacadd2c6d6a6a6df1cd9d95ccb725608ef1188e4e70d27cbc3400a0b03d20985697e96140a9ff67150d221fcd683e373f1e30b49f8
 MISC metadata.xml 219 BLAKE2B 27094593eb47f098fe9df926d3a827b65c2ca39ac6b03d392efe2c19d646274e5b462f65a7177ba2556a9167c994544688e53a3df810dc7f86ae43c4a75fd59e SHA512 e990bf6d766d6c0380344187a03b66380e4ed7a1554dd7a900ccf1f6f2dd3a51b06b382cedd5c73e0ad75301436b351fea0e7f1fb720c3d1345a8958554d341c
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
deleted file mode 100644
index dd5ae5869eb2..000000000000
--- a/net-mail/postfix-logwatch/files/all-server-ports-busy-lines.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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/files/data-without-valid-rcpt.patch b/net-mail/postfix-logwatch/files/data-without-valid-rcpt.patch
deleted file mode 100644
index 4c743a21c17a..000000000000
--- a/net-mail/postfix-logwatch/files/data-without-valid-rcpt.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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/files/multi-digit-enhanced-status.patch b/net-mail/postfix-logwatch/files/multi-digit-enhanced-status.patch
deleted file mode 100644
index f07ab22813c9..000000000000
--- a/net-mail/postfix-logwatch/files/multi-digit-enhanced-status.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ced6e6fcbf1a025419e8ee9f940e5022ed440532 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Tue, 5 Sep 2017 09:19:44 -0400
-Subject: [PATCH 1/1] Allow multi-digit numbers in enhanced SMTP status codes.
-
-The re_DSN regular expression is intended to match a response like
-"550 1.2.3", where "1.2.3" is an enhanced status code. However, the
-regular expression was only expecting single-digit numbers between the
-dots; thus it was missing codes like "550 5.7.23". The expression has
-been updated to accept any number of digits between the dots.
-
-This fixes unmatched rejection lines that begin with,
-
-  550 5.7.23 <user@example.com>: Recipient address rejected...
-
-Such lines appear with newer versions of the python SPF policy daemon.
----
- postfix-logwatch | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/postfix-logwatch b/postfix-logwatch
-index 92ed621..827dfe0 100644
---- a/postfix-logwatch
-+++ b/postfix-logwatch
-@@ -66,7 +66,9 @@ my $re_QID_s   = qr/[A-Z\d]+/;
- my $re_QID_l   = qr/(?:NOQUEUE|[bcdfghjklmnpqrstvwxyzBCDFGHJKLMNPQRSTVWXYZ\d]+)/;
- our $re_QID;
- 
--our $re_DSN     = qr/(?:(?:\d{3})?(?: ?\d\.\d\.\d)?)/;
-+# The enhanced status codes can contain two-digit (or more) numbers;
-+# for example, "550 5.7.23".
-+our $re_DSN     = qr/(?:(?:\d{3})?(?: ?\d+\.\d+\.\d+)?)/;
- our $re_DDD     = qr/(?:(?:conn_use=\d+ )?delay=-?[\d.]+(?:, delays=[\d\/.]+)?(?:, dsn=[\d.]+)?)/;
- 
- #MODULE: ../Logreporters/Utils.pm
--- 
-2.13.0
-
diff --git a/net-mail/postfix-logwatch/files/redundant-argument-to-sprintf.patch b/net-mail/postfix-logwatch/files/redundant-argument-to-sprintf.patch
deleted file mode 100644
index ee0e79bd41d9..000000000000
--- a/net-mail/postfix-logwatch/files/redundant-argument-to-sprintf.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 6afb8e258a5a2a0e7c72c4c25927dde9d1e2ad89 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 24 Aug 2017 07:34:36 -0400
-Subject: [PATCH 2/2] Fix redundant argument to sprintf warning.
-
-Perl 5.22 now warns about redundant (i.e. extra) arguments to the
-sprintf function. If your format string only has two place-holders but
-you pass three place-fillers, you get warned:
-
-  Redundant argument in sprintf at ./postfix-logwatch line 1382...
-
-The issue there was that the format string passed to sprintf was
-constructed dynamically; sometimes it would contain two place-holders,
-and sometimes three. Three place-fillers were always passed, so when
-only two place-holders were used, the warning would be thrown. This was
-fixed by testing whether or not there are two or three place-holders,
-and passing the appropriate number of place-fillers.
----
- postfix-logwatch | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/postfix-logwatch b/postfix-logwatch
-index 1e58a95..92ed621 100644
---- a/postfix-logwatch
-+++ b/postfix-logwatch
-@@ -1378,8 +1378,17 @@ sub print_summary_report (\@) {
-                      $$divisor == $Totals{$keyname} ? 100.00 : $Totals{$keyname} * 100 / $$divisor;
-             }
-             else {
--               push @{$lines[$cur_level]}, 
--                  sprintf "$fmt  %-23s $extra\n", $total, $desc, commify ($Totals{$keyname});
-+		my $new_line;
-+		if ($extra eq '') {
-+		    $new_line = sprintf("$fmt  %-23s \n", $total, $desc);
-+		}
-+		else {
-+		    $new_line = sprintf("$fmt  %-23s $extra\n",
-+					$total,
-+					$desc,
-+					commify ($Totals{$keyname}));
-+		}
-+		push @{$lines[$cur_level]}, $new_line
-             }
-          }
-       }
--- 
-2.13.0
-
diff --git a/net-mail/postfix-logwatch/files/unescaped-left-brace.patch b/net-mail/postfix-logwatch/files/unescaped-left-brace.patch
deleted file mode 100644
index 65139a3aff14..000000000000
--- a/net-mail/postfix-logwatch/files/unescaped-left-brace.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 84f9fb47783e63757f27e5990ee606ff01e079a9 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 24 Aug 2017 07:09:28 -0400
-Subject: [PATCH 1/2] Fix unescaped left brace warning for "Config: {".
-
-New versions of Perl are starting to complain about unescaped braces
-in regular expressions, and supposedly the warning will become a fatal
-error in Perl 5.30. This particular warning is,
-
-  Unescaped left brace in regex is deprecated, passed through in regex;
-  marked by <-- HERE in m/^Config: { <-- HERE / at ./postfix-logwatch
-  line 1850.
-
-and it was fixed by going to line 1850 and putting a backslash before
-the left brace.
-
-Bug: https://sourceforge.net/p/logreporters/bugs/4/
----
- postfix-logwatch | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/postfix-logwatch b/postfix-logwatch
-index 3e4a673..1e58a95 100644
---- a/postfix-logwatch
-+++ b/postfix-logwatch
-@@ -1847,7 +1847,7 @@ sub postfix_policy_spf($) {
-         # KeyboardInterrupt 
-         $line =~ /^Read line: "/ or
-         $line =~ /^Found the end of entry$/ or
--        $line =~ /^Config: {/ or
-+        $line =~ /^Config: \{/ or
-         $line =~ /^spfcheck: pyspf result/ or
-         $line =~ /^Starting$/ or
-         $line =~ /^Normal exit$/ or
--- 
-2.13.0
-
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild
index bab89768c04c..43edbac64654 100644
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild
index 9bf2ef83569d..dc661eb713af 100644
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild
@@ -1,26 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="A log analyzer for postfix"
-HOMEPAGE="http://logreporters.sourceforge.net/"
-SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
+HOMEPAGE="http://michael.orlitzky.com/code/postfix-logwatch.xhtml"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+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.
@@ -30,12 +22,6 @@ src_prepare() {
 		|| 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
diff --git a/net-mail/postorius/Manifest b/net-mail/postorius/Manifest
deleted file mode 100644
index fc803cefd66a..000000000000
--- a/net-mail/postorius/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST postorius-1.3.5.tar.gz 2775722 BLAKE2B 85f3408b7205ce4f89c36906280ff7ccecca0752ae611f4631e16d43972d0b52321be0f533fdabe6bf7d503120ab7a3794ef25f64a72369dec782b60347e33bb SHA512 f5f90ade87ae028fe665918b0aef69ac6c79f8d45ee4d105825ed9113661f084f3a82db9ac6ee850fa0feb5fd5afe7b66e49040d22c2e0599a95c3aa8ad56a31
-EBUILD postorius-1.3.5.ebuild 1086 BLAKE2B 52717d8e94fa1c643e2c4d1d1571fa8a827d2b18cdde76e920bbc2fcd91f0f39a10cb478bdb84f1da033e193703091ea5f912bb0d6acc86367644526851d4e74 SHA512 78fd56488c66d493caaec4b8552615b7970fed90956233e9a95ea59a708f72ba70fb21f4fc50536a1a1f594be5a0b812669c935b94b7852a8d2b873bd23b3d19
-MISC metadata.xml 321 BLAKE2B fc9a5998ced15f2b3d9e0c64c986c03e29fc630478a407bbace047d003fe42fe2d83325145c2ea3642fba760c8cd6dbbcfa1e3e9eb22cfa08f68000ab2f6b0fe SHA512 11951d329daee35e104e7a6082ba9b0cb1309965055882b5e772973407cc09aa1a9cb30ccfb3f18184eda44cf16853bd2f0fa196f2633758e6473528ea57db87
diff --git a/net-mail/postorius/metadata.xml b/net-mail/postorius/metadata.xml
deleted file mode 100644
index 17b555894f92..000000000000
--- a/net-mail/postorius/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">postorius</remote-id>
-		<remote-id type="gitlab">mailman/postorius</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-mail/postorius/postorius-1.3.5.ebuild b/net-mail/postorius/postorius-1.3.5.ebuild
deleted file mode 100644
index 18b4965e46dd..000000000000
--- a/net-mail/postorius/postorius-1.3.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A web user interface for GNU Mailman 3"
-HOMEPAGE="https://www.list.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/django[${PYTHON_USEDEP}]
-	dev-python/readme_renderer[${PYTHON_USEDEP}]
-	net-mail/django-mailman3[${PYTHON_USEDEP}]
-	net-mail/mailmanclient[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/vcrpy[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/isort[${PYTHON_USEDEP}]
-		net-mail/mailman[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e 's/test_list_info/_&/' -i src/postorius/tests/mailman_api_tests/test_list_summary.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTHONPATH="${S}/src"
-	cd example_project || die
-	epytest ../src
-}
diff --git a/net-mail/qprint/Manifest b/net-mail/qprint/Manifest
index 044fb98a6825..dd90da6ad029 100644
--- a/net-mail/qprint/Manifest
+++ b/net-mail/qprint/Manifest
@@ -1,3 +1,3 @@
 DIST qprint-1.1.tar.gz 358575 BLAKE2B 6c2a756b3e245584ed4ff81a072a63f29ee14cca5a61f7d376b8794a91c69e604fb33bbde310e870cc712d7fbeb2758eb5e649a7b153bf29807cbd891e3f4c1a SHA512 4748f52cc8cabf72a2685fba93ee9957a9a36658a8b0c9fc1994e1779aad59a94b942ed3dd2501c6a35636e7c75e24d512a5de5f95b0ba66ae40acee8bbe1cca
-EBUILD qprint-1.1.ebuild 513 BLAKE2B 2941c85ad80b81b12c7f308495842268f84e35c0aee4ad7694576683953b764297f1ffba349541740d86fa11cbcbcb1119bc5f9bee868262d3e346b2d4d0ceca SHA512 985ba623870ffce67b0b521ec9b18be5fd33dd85e797545a3683831e1046c6b151189535cf0c9a40f9ccafb6f95b51083e0dd5636385731c0e12cde4d1a8fcac
-MISC metadata.xml 332 BLAKE2B f5662fbf1a2b769f5c39f685fd64111f327ad8089e6a80fc172f86dbaa773b4e17efa056ac7a333933f48db55995b3b5cda30e0b1576e4be8e218d331b596055 SHA512 0b27d11ec66c33c8311f67dd53e09d89a60f95fa46350299b1ba7498d5d8900cb63d509a06be4bc87aa88248bef716b0c4b3bda59aa863178e628f4e8f139fd9
+EBUILD qprint-1.1-r1.ebuild 502 BLAKE2B c5ad47628cac58e65a2d1fccf4d32e330170a45885f02b1bee72cff2004ca6dca95c93414c200f14468f7999f1a35c3d4f66ef79e42e6ff147786188986ac128 SHA512 5eae02532faeef34da80bf873a9b7ee2e0fc9a98eb10aa29f491094030728fde0395b683eabf0d88bf172b1c28eb7089b3a12aee048b00799141f42708219d78
+MISC metadata.xml 334 BLAKE2B d8830eb05306fdbf876c7e923546cedbecac1e1845f29c4081e65043ef0b195ec0685af8f4c2019bcb35fac1c8d8ff0d889ba202ee78ea03e8dea6537f81ffa6 SHA512 5553357896eb3cd0b38d2bc625cb96baa35a471d6d366e23920d4708bf58ec29cd6673a45316ae04bca419cde0455993599b172eae99ed48dda76d908377b7c9
diff --git a/net-mail/qprint/metadata.xml b/net-mail/qprint/metadata.xml
index 0cfab1830104..9ca7a1bd5939 100644
--- a/net-mail/qprint/metadata.xml
+++ b/net-mail/qprint/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>qprint is a command-line filter for decoding or encoding a block of text in MIME Quoted-Printable format, as defined in RFC 1521.</longdescription>
+	<!-- maintainer-needed -->
+	<longdescription>qprint is a command-line filter for decoding or encoding a block of text in MIME Quoted-Printable format, as defined in RFC 1521.</longdescription>
 </pkgmetadata>
diff --git a/net-mail/qprint/qprint-1.1.ebuild b/net-mail/qprint/qprint-1.1-r1.ebuild
index abe9228eea65..bf12e9111a4e 100644
--- a/net-mail/qprint/qprint-1.1.ebuild
+++ b/net-mail/qprint/qprint-1.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="MIME quoted-printable data encoding and decoding utility"
 HOMEPAGE="http://www.fourmilab.ch/webtools/qprint/"
@@ -10,7 +10,6 @@ SRC_URI="http://www.fourmilab.ch/webtools/${PN}/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~ppc-macos"
-IUSE=""
 
 src_install() {
 	dodir /usr/bin
diff --git a/net-mail/relay-ctrl/Manifest b/net-mail/relay-ctrl/Manifest
index 8379f558b51d..e8cf98a0861b 100644
--- a/net-mail/relay-ctrl/Manifest
+++ b/net-mail/relay-ctrl/Manifest
@@ -2,7 +2,7 @@ AUX authenticated.c-relayfixup.diff 702 BLAKE2B c597a6dbf6fc7161caa769aafc3938bc
 AUX relay-ctrl-3.1.1-NOFILE-overstep.patch 671 BLAKE2B 93af856d842f1493afa35addb3077b750345e7b2ce4d5274f01f23a3081b3e873d12a826281e23c0d6a1e4815082e98be7e32f539d70d98ec2412ae610bd20c4 SHA512 83508f61caf936196a7093e8124267663ce89302e66832de30383432b68f08cbee26026ef1d18c5125fbcfd1c59477c14e406917370bfa1d3ea33a5c6b405377
 DIST relay-ctrl-3.1.1.tar.gz 35046 BLAKE2B 91e4ce0f1f6ce5933f64e0d60407004d409474180f42bf40632bdb3bce1f3f974abdb597d34ab7ee4113e041323bd55965ce57f271fe79cfb8c56972fe8612b4 SHA512 738a001f6a058809955f04664919f261ff1a0bfc280ec5e805b870baf448b27664e1b376dd078100a2847e38248eb16651e23812f00609a437893e7b1dc9102c
 DIST relay-ctrl-3.2.tar.gz 23119 BLAKE2B 663a95e7ef075b1b1fa390ab4d144a83c02eec615aa2a359892da1c5878ffe44995ed28df792a7cf1c179c93c1f874c87ffe4b781a28694c5fd81cec38228056 SHA512 aa2c7516e330ba3c4f466848e59b60cf5649393c3f9c87a3a5e5dfa170f96b9b1ad519098dfa153f9e06f9e02bd48d2a22118e1e8ccfe3e2585250e8feb4e5af
-EBUILD relay-ctrl-3.1.1-r2.ebuild 2094 BLAKE2B 30a58a02ba1c68387251dafd38eb942aaea325224ae97f6b50a70c8d4ebdab3f18720c634afcb9fb004ec2ed1453ae672a6fe300a7dd8d654435cbf30ad8be40 SHA512 cfc96e7dabc169c21d7bf64a00e51a8a8565d16f13e4a59cbadc5508243d9d514b4e8d5dffb232fd29392e5132cbed787e2d586eec460dd4359e7ab0da84bb92
-EBUILD relay-ctrl-3.1.1-r3.ebuild 2406 BLAKE2B 25e961bcc5222f55d3ac911b368386acb2f431e4664ef2f146bff25dede2ef06669210f3985e94bbbf6b40da42f9e6b17263ed42071133f843c23373cef5067d SHA512 3352b06bf68173814b66ba8ad147e36d4517d9a5e86d4d1e907eeacfa437cb4d4d9d1541d3aadc5d97d88fef3ec908f428a9b8df3b75ad39eca7f28ea6b20a2a
-EBUILD relay-ctrl-3.2.ebuild 2469 BLAKE2B 5e7e0b212988705c418bdd65b63ba7771a5ba4e04e8603ad437810f0f616e5b04487415877d3601d359569c7f5471226872002fa8ae956c72ad58e2ba99d8ff5 SHA512 0ed0929b47c0ac6f7eb75c94e409579120ee73a1bcb2904d5a45710b91a0ac853cd04b1c48cbc0da4221c7ea9e3de5f11f31a2a38590c2b767e370c26563105f
+EBUILD relay-ctrl-3.1.1-r2.ebuild 2098 BLAKE2B a024d1bc382f7c7465cf66145ec90d1c97c7168397cfbc2d6f2d423c4127c660a1e4d4f91c568960e3de52472f3816e0e6417adc2630d40902c97c4229508dc8 SHA512 2d268a0e5c8b57b3c4f1ecc1c9027bb9ddee5f28ec0abf49cb8da91fb842fd585a9f447b7a32f549f98bccd93d3d19b60cc6648775ff285b81a590fa2541c068
+EBUILD relay-ctrl-3.1.1-r3.ebuild 2412 BLAKE2B 2ab11c630819e30aa2213c8aa15854d02c47b7e39c5faa60b310cf96a5338c3d9c634580f415d0f918af8c54c7c524105251dc1b2fa65972fbffeb2916472741 SHA512 adb323748637b92d72ffb5b957f89adb45d430cfac09b3df91292de53e9a8076a25248fbde8dc1860ab8830dc7ed1b8df979d83f7ec91db654c3e3042b3e8de4
+EBUILD relay-ctrl-3.2.ebuild 2475 BLAKE2B dfb42c15fb63858399f1010f9be53bb7a34eaa7476066428e7a4558cb0a724471b8a907177d1d93eab9b7c58f9d45d05091d13a1daf55d20922aa989e97396ff SHA512 ae2f50ee9bc4eb314d6f74c5367ca6cf6726e6e74bf5e6e561c4f4fefbdbdc1462a2119348482564371ee1c2947e07d37dc3b47f61a224bc300bb1e2fa26c99b
 MISC metadata.xml 269 BLAKE2B 43d9731cf9f56bf0639c05f7299cbdadfaaf03fe439dda719287de85a226d301d3bfee81ac2e7f37fc9f25d8e3a3045324f9214e0c1c6c0ff22b1c085a238414 SHA512 818b094a5a00192f09ca69f6ebdb6bfa91f9a94150d2c0861cfdaf0ff78919e5fdac9b58334f0beb73de1f0608372eb86f0c283cd095c0d67224efd9bb5d3ddb
diff --git a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
index 9a9a53077df7..71b22356857f 100644
--- a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
+++ b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -52,9 +52,9 @@ src_install() {
 
 	# tell it our storage dir
 	echo "${RELAYCTRL_BASE}/${RELAYCTRL_STORAGE}" \
-		> ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR || die
+		> "${D}"${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR || die
 	# default to 30 minutes
-	echo "1800" > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY || die
+	echo "1800" > "${D}"${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY || die
 
 	dodir /etc/cron.hourly
 	echo "/usr/bin/envdir ${RELAYCTRL_CONFDIR} ${RELAYCTRL_BINDIR}/relay-ctrl-age" \
diff --git a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r3.ebuild b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r3.ebuild
index 9e71696f8480..d3a9174042cd 100644
--- a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r3.ebuild
+++ b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -54,12 +54,12 @@ src_install() {
 
 	# tell it our storage dir
 	echo "${RELAYCTRL_BASE}/${RELAYCTRL_STORAGE}" \
-		> ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR || die
+		> "${D}"${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR || die
 	# default to 30 minutes
-	echo "1800" > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY || die
+	echo "1800" > "${D}"${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY || die
 
 	dodir /etc/cron.hourly
-	echo "#!/bin/sh" > ${D}/etc/cron.hourly/relay-ctrl-age
+	echo "#!/bin/sh" > "${D}"/etc/cron.hourly/relay-ctrl-age
 	echo "/usr/bin/envdir ${RELAYCTRL_CONFDIR} ${RELAYCTRL_BINDIR}/relay-ctrl-age" \
 		>> "${D}"/etc/cron.hourly/relay-ctrl-age
 	fperms 755 /etc/cron.hourly/relay-ctrl-age
diff --git a/net-mail/relay-ctrl/relay-ctrl-3.2.ebuild b/net-mail/relay-ctrl/relay-ctrl-3.2.ebuild
index 2c858db5f652..a42ba4bce9b4 100644
--- a/net-mail/relay-ctrl/relay-ctrl-3.2.ebuild
+++ b/net-mail/relay-ctrl/relay-ctrl-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -55,12 +55,12 @@ src_install() {
 
 	# tell it our storage dir
 	echo "${RELAYCTRL_BASE}/${RELAYCTRL_STORAGE}" \
-		> ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR || die
+		> "${D}"${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR || die
 	# default to 30 minutes
-	echo "1800" > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY || die
+	echo "1800" > "${D}"${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY || die
 
 	dodir /etc/cron.hourly
-	echo "#!/bin/sh" > ${D}/etc/cron.hourly/relay-ctrl-age
+	echo "#!/bin/sh" > "${D}"/etc/cron.hourly/relay-ctrl-age
 	echo "/usr/bin/envdir ${RELAYCTRL_CONFDIR} ${RELAYCTRL_BINDIR}/relay-ctrl-age" \
 		>> "${D}"/etc/cron.hourly/relay-ctrl-age
 	fperms 755 /etc/cron.hourly/relay-ctrl-age
diff --git a/net-mail/ytnef/Manifest b/net-mail/ytnef/Manifest
index b6c198afc991..c10afe993665 100644
--- a/net-mail/ytnef/Manifest
+++ b/net-mail/ytnef/Manifest
@@ -2,4 +2,4 @@ DIST ytnef-1.9.3.tar.gz 301338 BLAKE2B 2a70453225c1c6acaa4a73f0d50e9be3076e0fd1e
 DIST ytnef-2.0.tar.gz 301906 BLAKE2B 3d42cf3bfc311a8d227424939cdb1e7b37a038314655b24ce54e26fbc0e5a0a7aa9fad0d4592297a5c521d3957c753b492e9724edb06c449d654faf68c7f43e7 SHA512 9ceba15a774f552911779859b7de11baddb7f980b0e8751c02a0c27275fa5624a4d4d24177bb4edba243acf3a9c5b89ddbbed1e759a330794bed8b2da63ffeb6
 EBUILD ytnef-1.9.3.ebuild 656 BLAKE2B 42b30acd8f24496c334f32464cabdd6e1c27e98139a5f099d299949529ee3964fc580de113676461cb7c46dbd3e8faf1bb4194ff42d7c3e3ccc5fc184a7b88e7 SHA512 78888fd6143639cd63b63921d29cef8ab61e48db330c0722ad1f703475238d189560368466d71528991074ee216016b63037371fc47df5e3efb25fa0c08ece5d
 EBUILD ytnef-2.0.ebuild 663 BLAKE2B b729093667e91ccc8b48f5ee4645b90280ddd256ab32495418f1f47a27ce05e3201b60d619aac79601323be945e7d73dfa3e72a53ca48ac049096dc259d83ffb SHA512 601f592a1c9ed61093841032ee11371af9f52154aa7b48b172374bee8fa03054ac2532e12820ee567e17449ae9639b9b310cf0bd55e0242150c15dde34fe0186
-MISC metadata.xml 339 BLAKE2B 79e43f2b239bfac12ef7299f3b3ff7acd72d6b07eb96f3639e47d3ade39b166501d85740a23a3fb022e3b4b3d3854fc5f6262aad893864f94cd8250c07c6243d SHA512 4af83ab6ff0de7bfdb54c14098fd328855c6b0d433e827c6c17e4f49c8a6bb31c0643752844d8988b36fb8b4f500f9c51af573128ecc894d1938c3fe4674f40b
+MISC metadata.xml 250 BLAKE2B 859c75fa76b8d426fcb283cde42da32adc02e6a245e3c79fcc90feca26b4d2ee4d8939210543fef5cd60daee092a035b3b1b57e4bc9593a1698199328f68653e SHA512 6cb2f4b36033a6fb6f249a4698596c4c807e2396f2b0a324ac7577e2fd3fffc32ea44fc363821d25511a7ffdcf0c4e8152f8500a84386cd58696f9552ca16b79
diff --git a/net-mail/ytnef/metadata.xml b/net-mail/ytnef/metadata.xml
index 95c76211f82e..fe4e02dd19cb 100644
--- a/net-mail/ytnef/metadata.xml
+++ b/net-mail/ytnef/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">Yeraze/ytnef</remote-id>
   </upstream>
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /net-mail
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)