gentoo resync : 08.01.2021

16 files changed, 15 insertions, 442 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index d9b3c73beae8..7a21ddc2bb7b 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/mapson/Manifest b/mail-filter/mapson/Manifest
index 7fa6363b460b..dd88d892b1c9 100644
--- a/mail-filter/mapson/Manifest
+++ b/mail-filter/mapson/Manifest
@@ -1,7 +1,4 @@
-AUX mapson-3.3-gcc6.patch 10368 BLAKE2B 8c00a3030276c78e09406e4b8fcbab1cccae183af09c8c2dfa31fecbd7673a1a6008c73ce8e872920f34700816d3095fde35a771e9bfe3196b2c8a6dcbc9a869 SHA512 159e5a3e4b7fafe0b1c12e020c9c37bfefa40218fe2d974a263060eb27b1afebff4215d03a574e6487f36a61fc71f19b1bdc69ce4234095a9bc6a8fdc173f1e7
 AUX mapson-3.3-respect-AR.patch 282 BLAKE2B 56dba922efc554e634ead5e8d155019507c085e757d10917c24469b9d0d522589c23091eabaa1d8353c509a42c27067b2f1044ce77a95465955e6f498cbe70f7 SHA512 c34a84a995bfb7fd6f7fb1c1f80d30a41caa6e9e0729e9498b46d6586c743cef72e36c4bd8c9a3d94879fea6c8cbd23c00a81442077e2df946d7df53778f820b
 DIST mapson-3.3.1.tar.gz 553101 BLAKE2B 5100029e4b650b63cf868de48d9c709ac9fa8dcf773adb9ab70061756604116d69a20421d96ca769e19047efbe806cfc63432269cc83133f7f7f54f71b627d45 SHA512 07ecfdd2f9857a8b3818d065e4c342fda5089b77074ea153f9a380fe655716a214ff06f79eebe768b2470724e11a6ee819c1e457a47670c07537d6fd226dc1db
-DIST mapson-3.3.tar.gz 421820 BLAKE2B e12c358113452a426cd5b55b945b77a303b595362064f6c84fe8bd8799502dd72872ca46cf54ce04022c3d27be52a849e337ae149521ce6ca35e990be73c1e98 SHA512 208d3b21d59689465a5c46619a53b3342c3ca96575d681b9ad01b1b6ffa05f05f56ab6e7ae38a8b2161e3f8d42b90b559baf8ff9db4ab4c83238d7adcb645fd0
-EBUILD mapson-3.3-r1.ebuild 988 BLAKE2B c44904bde0782277b0f9f3ff3df21b9f88329c8c33fbd03beae708a1e11bd7b8f5bb28d8cc68f9d5754072474d02fcd44dd59bef1eccdb858c22d48a2e3c2b66 SHA512 42e4b0c617ece918664bd0fd6ec1bb3d86aa2ef1137d18aa7b78d3a6c7d73fb0525e75a1bf1a2dd6173f6a85a3da944b2b8e54737ce18cfdcf7c946894650044
-EBUILD mapson-3.3.1.ebuild 955 BLAKE2B ef02280c792d82ec866cc6276b90c496934697163afa9b78af5b7b2c83e6fcb57be982134f2c7d8d918d3291aa9320879577dbf3a712aedf3b2b1724804f9edb SHA512 748842b3abd81ca8a79aa725a6162e535ec7f8194eb4557da6c54487020662abba361ccb9370224df84dc0fb20de16388e29129abc92a534c7fe14a79b7325c4
+EBUILD mapson-3.3.1.ebuild 952 BLAKE2B 1a740d359b921d460dca41a19e51babd60b34d7ea42753b6bbcd7b4055449c8453a0e6169b3c865ef5cb8c478cfb2b4464d8837f3c20e07e2129f084739c0403 SHA512 b549c12b0fc71c8f512ac09e02d8002c6944abbc879bb406b0a0fef1e8d0e3ce8d51c178ca8efb855cf819e9bd22903a0f3574601696023e29c9907d38441fe2
 MISC metadata.xml 243 BLAKE2B d67b7acc61a5bb2cbedc654940fe1fe6bee39265ea6526ce527b262efea2e79975f3652c9c56fd31d60d9539f550d91efc7efa07ebd1d3f9f91d0958c2e94f0c SHA512 5d03648b477941f83f642d119d87a9ef99740ac272bbd74cab1b2987eed7e198b3aa658ddeb0db98ee20a2ee4c21d205672290aaeace5ff4dd81e72935a110a1
diff --git a/mail-filter/mapson/files/mapson-3.3-gcc6.patch b/mail-filter/mapson/files/mapson-3.3-gcc6.patch
deleted file mode 100644
index d43c2cb95ea9..000000000000
--- a/mail-filter/mapson/files/mapson-3.3-gcc6.patch
+++ /dev/null
@@ -1,287 +0,0 @@
---- a/accept-confirmation.cpp
-+++ b/accept-confirmation.cpp
-@@ -52,7 +52,7 @@
-     for (rc = read(fd, tmp, sizeof(tmp)); rc > 0; rc = read(fd, tmp, sizeof(tmp)))
-       mail.append(tmp, rc);
-     if (rc < 0)
--      throw system_error(string("Failed to read mail file '") + filename + "'");
-+      throw mapson_system_error(string("Failed to read mail file '") + filename + "'");
-     deliver(mail);
-     unlink(filename.c_str());
-   }
---- a/address-db.cpp
-+++ b/address-db.cpp
-@@ -26,7 +26,7 @@
- 
-   fd = open(filename.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
-   if (fd < 0)
--    throw system_error(string("Can't open address db '") +
-+    throw mapson_system_error(string("Can't open address db '") +
-                       filename + "' for reading");
-   fd_sentry sentry(fd);
- 
-@@ -36,7 +36,7 @@
-   lock.l_start  = 0;
-   lock.l_len    = 0;
-   if (fcntl(fd, F_SETLKW, &lock) != 0)
--    throw system_error(string("Can't lock file '") + filename + "'");
-+    throw mapson_system_error(string("Can't lock file '") + filename + "'");
- 
-   // Read the file into memory.
- 
-@@ -47,7 +47,7 @@
-        rc = read(fd, buffer, sizeof(buffer)))
-     data.append(buffer, rc);
-   if (rc < 0)
--    throw system_error(string("Failed to read address db '") +
-+    throw mapson_system_error(string("Failed to read address db '") +
-                       filename + "' into memory");
- 
-   // Success. Don't close the file descriptor.
-@@ -107,7 +107,7 @@
-   {
-     ssize_t rc = write(fd, data.data()+len, data.size()-len);
-     if (rc < 0)
--      throw system_error(string("Failed writing to the address db '") + filename + "'");
-+      throw mapson_system_error(string("Failed writing to the address db '") + filename + "'");
-     else
-       len += rc;
-   }
---- a/config.cpp
-+++ b/config.cpp
-@@ -70,9 +70,9 @@
-     string tmp = string(name) + "=" + value;
-     char* env = strdup(tmp.c_str());
-     if (env == 0)
--      throw system_error("strdup() failed");
-+      throw mapson_system_error("strdup() failed");
-     if (putenv(env) != 0)
--      throw system_error("putenv() failed");
-+      throw mapson_system_error("putenv() failed");
-   }
- }
- 
-@@ -84,7 +84,7 @@
- 
-   pwd_sentry sentry(getpwuid(getuid()));
-   if (sentry.pwd == 0)
--    throw system_error("Can't get my user name");
-+    throw mapson_system_error("Can't get my user name");
-   log_file.assign(sentry.pwd->pw_dir).append("/.mapson/log");
-   spool_dir.assign(sentry.pwd->pw_dir).append("/.mapson/spool");
-   address_db.assign(sentry.pwd->pw_dir).append("/.mapson/address-db");
---- a/deliver.cpp
-+++ b/deliver.cpp
-@@ -31,11 +31,11 @@
- 
-     FILE* fh = popen(config->mailbox.c_str()+1, "w");
-     if (fh == NULL)
--      throw system_error(string("Can't start delivery pipe '") + config->mailbox + "'");
-+      throw mapson_system_error(string("Can't start delivery pipe '") + config->mailbox + "'");
-     int len = fwrite(mail.data(), mail.size(), 1, fh);
-     pclose(fh);
-     if (len != 1)
--      throw system_error(string("Failed to pipe to MTA process '") + config->mailbox + "'");
-+      throw mapson_system_error(string("Failed to pipe to MTA process '") + config->mailbox + "'");
-   }
-   else
-   {
-@@ -43,7 +43,7 @@
- 
-     int fd = open(config->mailbox.c_str(), O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR);
-     if (fd < 0)
--      throw system_error(string("Can't open mailbox file '") + config->mailbox + "' for writing");
-+      throw mapson_system_error(string("Can't open mailbox file '") + config->mailbox + "' for writing");
-     fd_sentry sentry(fd);
- 
-     struct flock lock;
-@@ -52,13 +52,13 @@
-     lock.l_start  = 0;
-     lock.l_len    = 0;
-     if (fcntl(fd, F_SETLKW, &lock) != 0)
--      throw system_error(string("Can't lock file '") + config->mailbox + "'");
-+      throw mapson_system_error(string("Can't lock file '") + config->mailbox + "'");
- 
-     for (size_t len = 0; len < mail.size(); )
-     {
-       ssize_t rc = write(fd, mail.data()+len, mail.size()-len);
-       if (rc < 0)
--        throw system_error(string("Failed writing to the mailbox file '") + config->mailbox + "'");
-+        throw mapson_system_error(string("Failed writing to the mailbox file '") + config->mailbox + "'");
-       else
-         len += rc;
-     }
---- a/lines2regex.cpp
-+++ b/lines2regex.cpp
-@@ -29,7 +29,7 @@
-     if (errno == ENOENT)
-       return "";
-     else
--      throw system_error(string("Can't open regex db '") +
-+      throw mapson_system_error(string("Can't open regex db '") +
-                         filename + "' for reading");
-   }
-   fd_sentry sentry(fd);
-@@ -40,7 +40,7 @@
-   lock.l_start  = 0;
-   lock.l_len    = 0;
-   if (fcntl(fd, F_SETLKW, &lock) != 0)
--    throw system_error(string("Can't lock file '") + filename + "'");
-+    throw mapson_system_error(string("Can't lock file '") + filename + "'");
- 
-   // Read the file into memory.
- 
-@@ -52,7 +52,7 @@
-        rc = read(fd, buffer, sizeof(buffer)))
-     data.append(buffer, rc);
-   if (rc < 0)
--    throw system_error(string("Failed to read regex db '") +
-+    throw mapson_system_error(string("Failed to read regex db '") +
-                       filename + "' into memory");
- 
-   // Walk through the lines and compile the regexes.
---- a/log.cpp
-+++ b/log.cpp
-@@ -30,10 +30,10 @@
-   char buf[64];
-   time_t tstamp = time(0);
-   if (tstamp == static_cast<time_t>(-1))
--    throw system_error("time(2) failed");
-+    throw mapson_system_error("time(2) failed");
-   struct tm* tmtime = localtime(&tstamp);
-   if (tmtime == 0)
--    throw system_error("localtime(3) failed");
-+    throw mapson_system_error("localtime(3) failed");
-   strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", tmtime);
-   return buf;
- }
-@@ -42,7 +42,7 @@
- {
-   fileh.file = fopen(file, "a");
-   if (fileh.file == 0)
--    throw system_error(string("Could not open log file ") + file);
-+    throw mapson_system_error(string("Could not open log file ") + file);
- 
-   struct flock lock;
-   lock.l_type = F_WRLCK;
-@@ -50,7 +50,7 @@
-   lock.l_start  = 0;
-   lock.l_len    = 0;
-   if (fcntl(fileno(fileh.file), F_SETLKW, &lock) != 0)
--    throw system_error(string("Can't lock file '") + file + "'");
-+    throw mapson_system_error(string("Can't lock file '") + file + "'");
- }
- 
- void _debug(const char* fmt, ...)
---- a/mapson.cpp
-+++ b/mapson.cpp
-@@ -62,7 +62,7 @@
- 
-       fd = open(argv[i], O_RDONLY, 0);
-       if (fd < 0)
--        throw system_error("Can't open file for reading");
-+        throw mapson_system_error("Can't open file for reading");
-       fd_sentry sentry(fd);
-       string mail;
-       for (rc = read(fd, buffer, sizeof(buffer));
-@@ -72,7 +72,7 @@
-         mail.append(buffer, rc);
-       }
-       if (rc < 0)
--        throw system_error("Failed to read from file");
-+        throw mapson_system_error("Failed to read from file");
- 
-       // Extract the mail addresses.
- 
-@@ -196,7 +196,7 @@
-     mail.append(buffer, rc);
-   }
-   if (rc < 0)
--    throw system_error("Failed to read mail from standard input");
-+    throw mapson_system_error("Failed to read mail from standard input");
- 
-   // Check whether the mail contains a valid cookie. If it does,
-   // mail will be replaced with the original e-mail, that was
---- a/parse-config-file.cpp
-+++ b/parse-config-file.cpp
-@@ -55,7 +55,7 @@
- 
-   std::ifstream file(filename);
-   if (!file)
--    throw system_error(std::string("parse_config_file() failed to open '") + filename + "'");
-+    throw mapson_system_error(std::string("parse_config_file() failed to open '") + filename + "'");
- 
-   // Now we read line by line and process each one seperately.
- 
---- a/request-confirmation.cpp
-+++ b/request-confirmation.cpp
-@@ -157,7 +157,7 @@
-   string filename = config->request_for_confirmation_file;
-   int fd = multi_open(filename, O_RDONLY, S_IRUSR | S_IWUSR);
-   if (fd < 0)
--    throw system_error(string("Can't open request-mail template file '") + filename + "' for reading");
-+    throw mapson_system_error(string("Can't open request-mail template file '") + filename + "' for reading");
-   fd_sentry sentry(fd);
- 
-   // Read the file into memory.
-@@ -167,7 +167,7 @@
-   for (rc = read(fd, buffer, sizeof(buffer)); rc > 0; rc = read(fd, buffer, sizeof(buffer)))
-     mail_template.append(buffer, rc);
-   if (rc < 0)
--    throw system_error(string("Failed to read request-mail template file '") + filename + "' into memory");
-+    throw mapson_system_error(string("Failed to read request-mail template file '") + filename + "' into memory");
- 
-   // Expand variables in the template.
- 
-@@ -180,11 +180,11 @@
-   debug(("Executing mail transport agent '%s'.", config->mta.c_str()));
-   FILE* fh = popen(config->mta.c_str(), "w");
-   if (fh == NULL)
--    throw system_error(string("Can't start MTA '") + config->mta + "'");
-+    throw mapson_system_error(string("Can't start MTA '") + config->mta + "'");
-   if (fwrite(mail_template.data(), mail_template.size(), 1, fh) != 1)
-   {
-     pclose(fh);
--    throw system_error(string("Failed to pipe to MTA process '") + config->mta + "'");
-+    throw mapson_system_error(string("Failed to pipe to MTA process '") + config->mta + "'");
-   }
-   pclose(fh);
- }
---- a/spool.cpp
-+++ b/spool.cpp
-@@ -44,13 +44,13 @@
-   info("Spooling e-mail '%s' as '%s'.", config->message_id.c_str(), filename.c_str());
-   int fd = open(filename.c_str(), O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
-   if (fd < 0)
--    throw system_error(string("Can't open spool file '") + filename + "' for writing");
-+    throw mapson_system_error(string("Can't open spool file '") + filename + "' for writing");
-   fd_sentry sentry(fd);
-   for (size_t len = 0; len < mail.size(); )
-   {
-     ssize_t rc = write(fd, mail.data()+len, mail.size()-len);
-     if (rc < 0)
--      throw system_error(string("Failed writing to the spool file '") + filename + "'");
-+      throw mapson_system_error(string("Failed writing to the spool file '") + filename + "'");
-     else
-       len += rc;
-   }
---- a/system-error.hpp
-+++ b/system-error.hpp
-@@ -23,14 +23,14 @@
- #include <string>
- #include <cstring>
- 
--class system_error : public std::runtime_error
-+class mapson_system_error : public std::runtime_error
- {
- public:
--  system_error() : runtime_error(str())
-+  mapson_system_error() : runtime_error(str())
-   {
-   }
- 
--  explicit system_error(std::string const & msg)
-+  explicit mapson_system_error(std::string const & msg)
-     : runtime_error(msg + ": " + str())
-   {
-   }
diff --git a/mail-filter/mapson/mapson-3.3-r1.ebuild b/mail-filter/mapson/mapson-3.3-r1.ebuild
deleted file mode 100644
index 9903dbb7f789..000000000000
--- a/mail-filter/mapson/mapson-3.3-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A challenge/response-based white-list spam filter"
-HOMEPAGE="http://mapson.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mapson/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug"
-
-RDEPEND="
-	acct-user/mail
-	virtual/mta
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3-gcc6.patch
-	"${FILESDIR}"/${PN}-3.3-respect-AR.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with debug)
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	dodoc AUTHORS INSTALL NEWS README
-	doman doc/mapson.1
-
-	docinto html
-	dodoc doc/mapson.html
-
-	insinto /etc/mapson
-	newins sample-config mapson.config
-
-	insinto /usr/share/mapson
-	newins sample-challenge-template challenge-template
-
-	rm -f "${ED}"/etc/sample-config || die
-	rm -f "${ED}"/usr/share/{mapson.html,sample-challenge-template} || die
-}
diff --git a/mail-filter/mapson/mapson-3.3.1.ebuild b/mail-filter/mapson/mapson-3.3.1.ebuild
index 4735517e167c..33a42b0d4cf3 100644
--- a/mail-filter/mapson/mapson-3.3.1.ebuild
+++ b/mail-filter/mapson/mapson-3.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mapson/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/mail-filter/procmail/Manifest b/mail-filter/procmail/Manifest
index 3f93678278ac..cd97e9da00f5 100644
--- a/mail-filter/procmail/Manifest
+++ b/mail-filter/procmail/Manifest
@@ -9,5 +9,5 @@ AUX procmail-maxprocs-fix.diff 465 BLAKE2B 05df3e8111ec4953a034fbdd93c9342b1581e
 AUX procmail-pipealloc.diff 825 BLAKE2B 532fe5fe01b34989e6d5805c0e5e1681d0b64f3838214b9715b44431c58d3f681ec4c889935071542b832b0ca7d96cd07d043918d2cf592ec4d150a483a58480 SHA512 e2a93060ff133f073c8a988db1bd92cfe3aac149ee04eda65862c468576fe194cd09379a545a94bbb1e20dbe1e142eae9f7949e930288178968fd95f5450fdbc
 AUX procmail-prefix.patch 5748 BLAKE2B c25d1de87d59771f959940d59195096711e70cc2a586d6eb585a58dfa96da8eb02ebe1bc03e08c0f8d6678da97d6c6016f99ae2669f4931e9cfdeb39ff23d230 SHA512 be61e6e0c89145caea1351241196c3bc986382340ecba0360d10918691cf1e35c67028a33ffaf22c83a0c747d06e58f437bf84854fc819206fa6e7bf0bbeb0d5
 DIST procmail-3.22.tar.gz 226817 BLAKE2B 4fd4641abcd3a897ea19bd8f76446f88806d22649d5221f8cef6f9efc29f7fcc02c9707cbf00c32fe247f16579d28fd887d3c18c4d3a2f8877c351bf92e85866 SHA512 3d0658329a55957a8d5741e03b0853b030c4524acef30641663213aa9eefc8264f8cc2b68a00a89e5f9f0f7c916c41a42e1b6c8df562c545ba97d8ab9049a936
-EBUILD procmail-3.22-r14.ebuild 3596 BLAKE2B 013e812f49b8e823df52a5b25dac25860e4965767da7dde8b6b057b91be2284da1b3942bb5c2992edb8fbab9f864161afae2ea7375b5bae9c9e306eaf65d6a4b SHA512 0abf31abdb02e9176791802a7b09a75f1605fe6885b84e9b9fef28e5989026b29932536da3004832c5e2a60d35006e96b1f85bb1c698c3dcad4895b3277d1aa8
+EBUILD procmail-3.22-r14.ebuild 3585 BLAKE2B 22ddb8480f28c47d634309d7382f56db9ceb359b8b1159e664e78d35f203bad849829425e145264d22b240a03075fcafd15cd0f1b13e1d4a6242dd46ca1c5b0c SHA512 3b3b40da452c1a1be00917370ea487871e33ce2b92b39d5855ae605ef999dc0bf37770cab5dd2e1cdf04e5808cd38eab439a012ed9822ff1646781ccd480582f
 MISC metadata.xml 265 BLAKE2B a79a9f0aec856d7f6890b8adf1dbb728c1218426404e815e308bef910ff6b80a97dc487084ea81f93823fcd3a909f3eca5bec488c252cb886c46c55544f370f2 SHA512 82df2df703946d60d4906f91f64fb4158cd88219b613221005996ff953451c0a659d761d1ced61971be2d6be6f968bc8471c26e001353f6dee6033a2012c265a
diff --git a/mail-filter/procmail/procmail-3.22-r14.ebuild b/mail-filter/procmail/procmail-3.22-r14.ebuild
index 1d902b0f8625..47a3f029c6ab 100644
--- a/mail-filter/procmail/procmail-3.22-r14.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="mbox selinux"
 
 DEPEND="virtual/mta"
diff --git a/mail-filter/razor/Manifest b/mail-filter/razor/Manifest
index 701c4379a6eb..6239a4d6487d 100644
--- a/mail-filter/razor/Manifest
+++ b/mail-filter/razor/Manifest
@@ -2,5 +2,5 @@ AUX razor-2.85-cosmetic-pv-fix.patch 616 BLAKE2B 58def0277c1142b664f65ae9f6e7f31
 AUX razor-2.85-makefile-quoting-fix.patch 574 BLAKE2B 03616893b3537e00f0a56b357a70956cb87e266feb72d588343427f248d73c2e61d8c9515572d7bc0f312420d5328dd6e0039a297be322f83dfd270615922289 SHA512 ee43993dbf4e1ed932a293636cfad98c8c4bb5b94a8df00262c39d34dd9c95143ba8dca1f088185123d352b940e0dd19d5b0a6f4afc04e63b36cc49a4963cbe4
 AUX razor-2.85-use-sha-not-sha1.patch 3897 BLAKE2B 5cbdd0cbf6a80f4d2e1eba364d2db5ef972368257110daaf07c8ee6444884b07ff930184a4c92c1b0e7af89cfd5384ada7d00ddd79114c799bc8ad34e8f61a51 SHA512 891a93408f56bb6a7b43814a501cce8775c51abe7cf227c39dd18699ac5f4c1aa5484842435edda58f7141a87e5ebe1496bfe959afab09fb44c3558c66511289
 DIST razor-agents-2.85.tar.bz2 81691 BLAKE2B fdb389ca4192dc2a3b87935fe97a4750ab715ae163aa1cf8adf5c6dd54e8e2f2ca53f1fcc37505b5ea0ec4e9bdb78a14ae8b30fca770de80a2a69e3e534ec3ab SHA512 31dded1969dde963389a5939514c29638ad07f45dbb2f4c633cf20ebc4abab94e65e9a6d8885233cdde686ef365aab11fa5eba2ca38d79c5b8fab689143ff5db
-EBUILD razor-2.85-r3.ebuild 2595 BLAKE2B e932ecfad8f5199ffcc4359845cc5320d132c8c87dca6564f9e84fb34ad07cccfc0b7a6a7a52acd918b725244826f76f6b02d71c1fc7453b3fb1ea913fd30780 SHA512 c0816c276ad8e450a702fd05ecf8f1a987ee916be0ecdcd7b4a550f654402f46e45ab16f99ef6fde6e819392bef832b85727cc90d08a2a47ad5b187e74bc188a
+EBUILD razor-2.85-r3.ebuild 2584 BLAKE2B f9ed418ffac4d0a3286464e0d2c6b96a93b6b6ccbf83e8db296844033c8def3ed853c03e12397b1b9825427ab1570c55f3989a73db0a509871ca2b187727685d SHA512 ecb702eee2ed3760474d408a63a30086412fd5e96f4ddd36d0d3ea3bf8746f1f200dfaef146439f5cb3629f5c7a2b72f2d1b3a08edd6e05c843e84b7497700cc
 MISC metadata.xml 581 BLAKE2B 7a4fa065ec593200d844a2c5cba9df1711608fb089b4c568bc4095e4feee3ebfbeb53aa866b6c6a3044ccc9e6d5fb5b71319ca1f12f7ad7b8693567a1eda4b1c SHA512 6de4a7f82c7b1bacda76f5bb13df29a130c7c7cc4612071178b78a252cc029deb6b596847db37d6b305b5776fa2ce5e0475856fd0e0ea71b56cae36f89d389c8
diff --git a/mail-filter/razor/razor-2.85-r3.ebuild b/mail-filter/razor/razor-2.85-r3.ebuild
index 25a70af6703a..d32ddaffbd55 100644
--- a/mail-filter/razor/razor-2.85-r3.ebuild
+++ b/mail-filter/razor/razor-2.85-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/razor/${MY_P}.tar.bz2"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-perl/URI
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 2e19487f1ff1..2cb412b8f000 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -14,6 +14,6 @@ DIST rspamd-2.5.tar.gz 4490310 BLAKE2B 8d117b1b03e8092d0c724a4da4de23dd145f5b226
 DIST rspamd-2.6.tar.gz 5079444 BLAKE2B acb9d9471d0bb457da33b4d23e3c75ef87ea26a47e6c731bfd5fbbfe28567244e2bc72fd25ca3408db0928dab4e4ab66596e38cf3eff7cb9690eec59d3b62372 SHA512 79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a
 EBUILD rspamd-2.5-r1.ebuild 2565 BLAKE2B b8e44e7c74887186c9a228e0fa706f8070b95238a2d63e1ecb0e26d89b930442f8e72c5371d50236e34e67c1f6991c1a36e74fc06bb66fe965fd2565c238a9d3 SHA512 c34e5d2ec35dd9dfb2586a4690221c7aab98459c69694f1c82795c264e41723fc791c830c940df97bcbfd611ff1461fb0ddd142bf0e6c8c6dce25e6110db08b0
 EBUILD rspamd-2.6-r100.ebuild 2746 BLAKE2B cb91e2db0ade31521975900a4d3ccd3bb68119aca71eec4139843d204477ee556b59ff5082e3eba1b0afbf49af1e4ed182bf9b165e58bd7b9c3608676fbcdf71 SHA512 668e8baeea10cd5e213f9d2d259447c678726ab5dc11bf1b95ffe716e321c5900a85ef98c4d459722e163be5730511b6eede0151700b5b323ddb3a6897916538
-EBUILD rspamd-2.6-r2.ebuild 2534 BLAKE2B f9a60233509527d4e593f832083cd7414390ada25a036ea1e388f3303ca29d96e38eac9a262d11b47e2889b007f598907ec9d899d388210760f2069b735634b8 SHA512 a1b1334e4a97685cef7a3a01934accb9a7ceac19e6cbdba240717cc65f53cba52fc83bc15035bd78d79a0258c05752f07bad1afbd3ab63155e6324ef5f588210
+EBUILD rspamd-2.6-r2.ebuild 2533 BLAKE2B 8111cc5a487933dbf92813d1caff0f3cc34410b179059d15b97e06a91ede54fd2166c1ce7130102a8025992b4c9832c26813f73ab70b1827528359519d437fed SHA512 d279f33c22ece4e9f811dab44fbea8e8717b5f25af836189808310a2a416afced9a837d55d198fc00eaacc3843b6bd4c738e273a7572055200e83bb07bfd36e7
 EBUILD rspamd-9999.ebuild 2747 BLAKE2B e3f88f2d25c948628dcd8619137ee9aeff91bedde69e7e328a1113858867ef53116cdcf06b21fc6c86b8f0e51d81d2657913243d34b645d099abb858d66044e7 SHA512 95f70ab731b647f74fa433c86f6ec3692f6b746c8064da41ecde3b79e705467bac28f03069b623c7c1fff1837d06e5ee9d9ba1f5915a5b77bceb6f5361e0f9b2
 MISC metadata.xml 639 BLAKE2B 935ca7becc486efc41fa07b224808a67893e8a609819a1d7a299f03689d94ea6c959f0e606896f0bd899294e7a48c48279125f9e8508981aebaa42a55a8eb4a7 SHA512 22cadde54711e1b4b7324fe68dfacc95fac4477910001b99e0423b9735e83f69801580822aa5f6ea6460955eda6fe4cd4702d9c22cfe1b09721203744f556a80
diff --git a/mail-filter/rspamd/rspamd-2.6-r2.ebuild b/mail-filter/rspamd/rspamd-2.6-r2.ebuild
index d22ac2c67f30..d45893559286 100644
--- a/mail-filter/rspamd/rspamd-2.6-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-2.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Rapid spam filtering system"
diff --git a/mail-filter/sieve-connect/Manifest b/mail-filter/sieve-connect/Manifest
index a13f7b253329..0b607661d551 100644
--- a/mail-filter/sieve-connect/Manifest
+++ b/mail-filter/sieve-connect/Manifest
@@ -1,5 +1,3 @@
-DIST sieve-connect-0.87.tar.bz2 40023 BLAKE2B 510f5c2a42524f7d412b0b13ab549667cd912411b069e7328ab13a1284c2877a78084495e19be6cac643dec4c952a2672b2f3b11bba755fa11aabc3e58008693 SHA512 28ed4f5cd929ee5edb420afcbac238399463beecf551643b9ee5ea41debbb1e5401a619b39b6422ec47885ea3cc207866e09da2e46a65bcc3d4f3ca5bdbf016a
 DIST sieve-connect-0.90.tar.bz2 46481 BLAKE2B d6bc466caffa3344537b1777b00a66f34697139d474763862c5296367f1e69174078a5e864225c1e967fbc5677c97d3ef71a4b75b677952d7b4993a5b8a08108 SHA512 3b4d4a6a7eb7d48f8b2dbc4c302c3de1a2a193282c7b2d25581e1131d6c7598cc2a47edabf8b108e94e0fd1a9cc50e48a103c133dba233f180f12d36c0da0718
-EBUILD sieve-connect-0.87-r1.ebuild 700 BLAKE2B 2df5710e30678ae8c92a8a437a88354c540e06df56ee6d676b6318879f91441d06bf254fe127c59f67db870d28e7b499ddc2120ccc8043d8736745c5b10a93bb SHA512 7a09c950c2fb8bca148adcc30abe2109384a4a9d05679d6f0e7f42a30d9e26c75529480b03ad779a0554b082c117ccebf6002896823a954bd7bc2cb598d2bb99
-EBUILD sieve-connect-0.90.ebuild 702 BLAKE2B f3dc77a73c80e3e0486366e9844866d347dca956adfcec1e046a0e0c58e67b9040afcb96db19777ba8fd056436aa9b803674e5c759609974111c5c5ed4d0da1f SHA512 6b00cba23d63b9f36ada0c1a24296a4663c37c3316593da8cc5d687e984b4ce55c8680dd550cde90c857860b47b65d01b54833ed75fa4cda85c27286737582d1
+EBUILD sieve-connect-0.90.ebuild 700 BLAKE2B 1c683f20f790634bb2e6089469e4ca318f7c4a18d09eecdd9f8de133d8fc7d3093e765a4b3bd3062e790a684d1bbd36afe4522226e7683ab7a621bf2084db044 SHA512 51bd0ad057466dbd1c0ecdfe789b22b1a9ab0b509346a1d937422547a07a051fba9de9cf8e0d3cccf6eba94d2184a601f90e72b3643dd1685838dd921c4aeae7
 MISC metadata.xml 2216 BLAKE2B 9a9588705d82d6c6c7d19c17aa7039169f1093a906033ee01bdb6f55eee5ad599f74de26d41aa9655eb32ab5ca16d058b1202c1532fb6a7e4620a025305560b4 SHA512 af2f045a99755c8224f19adebc36401e59b7932dc323063bec97a1135d0d34f77548d5ad96f8e7193b82284633a7e39b5ded9edae20f244b0d74ea06dd3489de
diff --git a/mail-filter/sieve-connect/sieve-connect-0.87-r1.ebuild b/mail-filter/sieve-connect/sieve-connect-0.87-r1.ebuild
deleted file mode 100644
index 64296aadb71d..000000000000
--- a/mail-filter/sieve-connect/sieve-connect-0.87-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Sieve Command Line Interface"
-HOMEPAGE="https://people.spodhuis.org/phil.pennock/software/"
-SRC_URI="https://github.com/syscomet/sieve-connect/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=dev-lang/perl-5"
-RDEPEND="${DEPEND}
-	>=dev-perl/Authen-SASL-2.11
-	dev-perl/IO-Socket-INET6
-	>=dev-perl/IO-Socket-SSL-0.97
-	dev-perl/Net-DNS
-	dev-perl/Net-SSLeay
-	dev-perl/TermReadKey
-	dev-perl/Term-ReadLine-Gnu"
-
-src_compile() {
-	emake all sieve-connect.1
-}
-
-src_install() {
-	dobin sieve-connect
-	doman sieve-connect.1
-	dodoc README*
-}
diff --git a/mail-filter/sieve-connect/sieve-connect-0.90.ebuild b/mail-filter/sieve-connect/sieve-connect-0.90.ebuild
index cee4de699910..69c84c1baa99 100644
--- a/mail-filter/sieve-connect/sieve-connect-0.90.ebuild
+++ b/mail-filter/sieve-connect/sieve-connect-0.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/syscomet/sieve-connect/releases/download/v${PV}/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=dev-lang/perl-5"
 RDEPEND="${DEPEND}
diff --git a/mail-filter/sigh/Manifest b/mail-filter/sigh/Manifest
index 3ff85689d633..120ed28c18a9 100644
--- a/mail-filter/sigh/Manifest
+++ b/mail-filter/sigh/Manifest
@@ -1,7 +1,5 @@
 AUX sigh-1607.1.6-fno-common.patch 565 BLAKE2B 6c6c7e97a20a098ab7dd6924a5156f718a293cda0e0106ee0f96219d7183542cd7a363ae2b7cddcb85026a14cf60f9870247d8024822e8ebb57f99c956955e84 SHA512 4a80085b4da8df37bc8577d598f0966be402be77fed26f7d59e47c2c5836c45e0fba83bf00dc5b5e52be53e54eaa670364244f5405cf52653f41904347987523
 AUX sigh.initd 485 BLAKE2B 329efca4f269586b191e3cef3311d465ef1fbe760d34a7dbe8089cc187fe2c35b4b64be283edf8cef3efff1b3bd90cbc092a22bcdb9de3a2e118b204bbec5230 SHA512 34e1cc17fdc09ad0377604c951cc85682f56ed4a2a2f6f396d2e4d30777fa1bb8ddf693487eb100ff45fe15612bb68ba641eca3c28008431649b7f980cb3fec0
-DIST sigh-1607.1.2.tar.gz 57662 BLAKE2B 288430b3016483340f7bb6c69060f6c2f38efee525b45d505e965c12e84c66d241d0a90c8a3f55e0b9bf801d8686ee1d2fa5eb03afad4795df620e594468afd9 SHA512 410883b55072b6476fc454440cf5f0e048587853a5095fddd7870b0efb5eca82e257f34ddef821f1a1968e1859207e7972e645922675fddaa2bf05b314bf5f60
 DIST sigh-1607.1.6.tar.gz 58258 BLAKE2B 6d2743c4a850af4f28ba0f2b7a0d6fdef5b699f9521e0631b9bc534be872af4cfccd10de7648080389046faf3f34ba58e3ce68aa318d76ed8e1af5f495f47f70 SHA512 640fa35ea89d7aab956e597ef089a8b7f57af2a7e3de7087e6bd01b60715cc33263cd4fd84a8826ae37387ec802d4bb78c5fe9c83e5d404029d69de010b1ce6b
-EBUILD sigh-1607.1.2.ebuild 824 BLAKE2B 450f88ec31ccb9904bf61d019b70a9dfde190a5601420547d0229ea0bb5e7c21a26febe06f895cbe648fc729e5bac7771b6b45e8e2b2cd0d00e5fc7826f28789 SHA512 c53474a0a48bd3e3fc26874da3896bd2282de2b4a2365b69b6a1ec8eda87b6fb0592767899859dacb84d367cf06557c30c08c6f61f65fffb666b600cf9150203
 EBUILD sigh-1607.1.6-r1.ebuild 612 BLAKE2B 7f583ba82990777fd20784686f8f00769f5e63c617c4c130faa2b8ea0603b3c724306a574bf02ba68f0e22f57c64ede168aa2edf6aba2f3ad9f073e55d2b0760 SHA512 7d403598c1bd858102282eb07665bc59215635b06b18626cfe58f4f21ed8b8c68118f16f380d0425e0495ff6aa383912a1b06ff555ac5cf921fe8f13c53b34a1
 MISC metadata.xml 554 BLAKE2B a5d8c99d19476f1bb337117ec670d81fca6ec22198276eb2d81831c787652acbed6b4f2c895f337e78e54b7870fd13d34a55c4ba783fcc086b48ff6b341760f4 SHA512 756248356f113ab607ace3d3b4688f09d5e1d4e908bd65b1bbdedef9ed607cac6b458c43fd6db8abf21874e1a8e0bc04d0c5b480c29ea96ff559ffd2d1c65bf3
diff --git a/mail-filter/sigh/sigh-1607.1.2.ebuild b/mail-filter/sigh/sigh-1607.1.2.ebuild
deleted file mode 100644
index 04b2490222d7..000000000000
--- a/mail-filter/sigh/sigh-1607.1.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils user
-
-DESCRIPTION="S/MIME signing milter"
-HOMEPAGE="https://signing-milter.org/"
-SRC_URI="https://github.com/croessner/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="mail-filter/libmilter
-	dev-libs/boost
-	dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-
-DOCS=( README README.build AUTHORS LICENSE )
-CMAKE_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	enewgroup sigh
-	enewuser sigh -1 -1 /var/lib/sigh sigh
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dodoc "${DOCS[@]}"
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-}