Merge branch 'edge' into next

11 files changed, 3 insertions, 661 deletions

diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 29bb55b6821d..ae341bc115d1 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,10 +1,6 @@
 AUX comsatd.initd 569 BLAKE2B 1b4ad287b67ef6d95fbc626296e79a857264754159967c54105e9d9f4493e95d3494cfce6082f289358021e02bbaac580a1b4d78ca8b2cc713af57197e532431 SHA512 9c36ddf70bf4f0e3c56f55651a740014078e3a1a79569a62ccd74e1ec7167eac6ecb69d56c15913d815c472fe943d17a1e781a669208d37c97671afea2208f8f
-AUX hdr.at 1400 BLAKE2B f7b3c5a2bf5ca268adefaac2898ce9a2823357ed77b4ab0f73a67cb878ef7f9265214a0ddcceacfbdf2e64a8d7dee3f0572ec044fdba7007b80bf2b4c9dea0a3 SHA512 f9b16a7726068b646dbde37e9c5293a0cfaa6baaa40908df3b36e125c5a06b52d946a8a0568db424009964965e90ac0d568e83345bcc9b1bce3b6f9157584b48
 AUX imap4d.initd 566 BLAKE2B 2d030e47f63b4133eed4b47c9069c54de290f907d9429eb99675380569e1e0efdbb1172664ba1ee0f2924ac7284981fbe350d1543a6d0790722456523d997535 SHA512 51d6cf4285c6823d97e52c7eb408a80aa66376f329685acdc21e096c2099a044b2fd18e7b9e5ed89406a3cd1f16b7aa7b0243f8ea46aa7824da48b566ec00324
 AUX mail 82 BLAKE2B 6d9cc293deff8f99cea0ce8842dd34e658844ca9a1f4e530d3c95f8154ed337ab6ccc2b6263af9cfa8078913a7b70beb5874c999174d5648c1faeace8f68e146 SHA512 80080a3118ed66cfde44ad3663e4b07bcd5fe756b86a213ea4e1ab86e27f8485dcf02af3ee6b7f6f12105a267b9619376668e0cb6e60743ffb7664d2dbea9144
-AUX mailutils-3.4-MH-testsuite.patch 2077 BLAKE2B d9a85a3fe025fb9e3fa240abd901f8567803f94e9cba58055b62a2bcfbd9e60db7cfd332c3c16faf5ac09ab3d9b7a43eb2b2b791ecf006e6d731ad555aa2da67 SHA512 2f10b61c47ec4981f912f180619627959338d7cf73e277bb25d6021044ae4752317773e6f7a13e7cba1dbf6782b3e32e92e77e1c265184bff89e8a79ce813954
-AUX mailutils-3.4-fix-endianness.patch 2871 BLAKE2B e868b624d10ff62fc7508ce66309d9aeec5f66582c9090771d5a132e0f2541943cadd63c37f91f2191145161d336e6e62ede42922f14c4219f3ee768bc6fdfdb SHA512 e219a11c060505d61a7ae14e24c4edeee2f0fbf5a824571c5a497b4702374a1776a2307f3702921a42551c7a229c1739a54d1f2f14b37d896a965712d8ebb2ef
-AUX mailutils-3.4-fno-common.patch 336 BLAKE2B d488e13f63eb41344b1838c2832319625e44d70a226845070e3edf78043349b9b7631706e94749e45be910399adab8cc761adb7412b17230df66ac3c6c07020f SHA512 c4655129cf97b43583402a1f0619f91e38d3482ded2b7f93f1f282d3a572722fd92f0423499922bbe8f6c5382e82ed68126e659e412892ada9d53b2c632bdf32
 AUX mailutils-3.5-add-include.patch 275 BLAKE2B 2502fb3226bc63ae98d018392fa1107b4079ea51cd8e57b4e97522d21e696bd6048fad2de885f88644d23f434a6e407f42ba8fcbcfe5b1e65884f37718e34328 SHA512 0972cde536a1a82fe243c9b048fc15f4863586a2344b54c9b4f6f8a5935762c7272c0af2698239af7de9da62b1c2928bc7f621e01f447423fdd8288cedee88b6
 AUX mailutils-3.6-underlinking.patch 368 BLAKE2B d578b46b45bba39fe8b776abfa4394e3adc10c2f811ed4d20fe7a8cf7b2442ebd040dd8a8c5c9023e1f9b635e252cade01ecb08b898bf8e4e2da97e5349497ba SHA512 a958be77edbd01af80f824c70b5f85fde526eadfd58db2476317d44b1d48fb2c2a90c84e49204a84f9efee91c51c33275f6c8254eecd84fa2681c84230b42173
 AUX mailutils-3.8-fix-tests.patch 1254 BLAKE2B 68fc23fc1a6cc98fd5cc6f50afec22373cba028a8b5c81472a843b00d390cb93b7e3194cb8ecd6274552d0610137286bbbac2d33c548b93f2c8c18cc39cf2775 SHA512 2de6971a0811e2501c55a45bf72c80010c81f347178219fa75725cdfc3263f77cc42fd2d8a9209055e889ea8d6eb918a8fc5d86c3fd7f1ac6d5c387bd6f4dbe5
@@ -12,16 +8,9 @@ AUX mailutils-3.8-fno-common.patch 652 BLAKE2B 696761bb11c568fee6c809896702db9fc
 AUX mailutils-3.9-python-config.patch 905 BLAKE2B c7f5553b89a93d025cca13b4a882d02e4dadf7ff55a2a7f1ac9b66586905f59b6516f581d5033c3cda2e3df325d69b5c4c0944221798ac37b7ceaa0a86ab8875 SHA512 42a4e45d1d35f92287d2c1075fcea0aa61c422a4f722f857d7b93b19c2cd41678d98b36b28e78209cef8dab33a0f473b1e3ba0610c6c66b9675480d4066d3a78
 AUX mailutils-3.9-underlinking.patch 404 BLAKE2B d162f818580bcdbba54f0aa56fff49461c8efe1e06e3dee213f9910253e014a8e44a3ae34006c2b8bc56dad687d0522eb86e6bd040c08bc714717c49fe2885ad SHA512 8782f59323ea426ecac65ad5b5e22e37f1150bab8782889b0c16f7d28c10030a78f77210141d1f74edcdaf47db70154616003df4143f664cb01b875e2fee1348
 AUX mailutils.rc 258 BLAKE2B 3dc68190e11c8bf5016b0fe8b22c61f79ba7de96a1f230f7d0743ba23fa903cb9f99fac94a7363c7d80b7bbaf76e2d4de848e7ac726642fb23c56caf43a46568 SHA512 691bcc81fd355d8f2776e72006c149996273579e099f24970ff0c5dd6bdf65cd64e31597f8b3d8e0a900a91c3325b8d2a1a96682a9b3ff53acd41218fe8721fe
-AUX nohdr.at 1032 BLAKE2B 3c18d35edc0b6a8481fa7fd8ef110734da5d79ad3ac4a1e251dd020585832b0e5704a9f6928d150aaaa28abf77eaa1120752eb9b2de6d97b52f3110531be6ab9 SHA512 d244044d0ccc00b23cf01235904b880e3d1e74ab2741dc41c4ab82217b019cb32d3dadae69c73c635bceabb80bccc3db5f3176a1039ee40f365277a102739eb1
 AUX pop3d.initd 563 BLAKE2B fd09d7a7499c888eddfb812644102f979c2423e9b1a9f0077655b6ae4c1eb4214f685ef7843e74a808e52ee988cc3fbefa278754db824256a4972c83fc0ada31 SHA512 7847c29a03f21df82d36c077ccb38329457a332cccdfba24bee3b1c9a8170fc71c07ee674408f069693953dd1bf44b8b8f782dcc35d6b16e62f70b2b32ce018f
-AUX twomsg.at 2216 BLAKE2B 8a0ac15f6c2a8824406d9a74e14f3143e48b9fd7636732bfae9189a318c13c273a47ceabcc8ee26de5e04604ae198895a51b175e0b2e430eb7c6a08d7f89edc8 SHA512 dc84c7b0c3ce6fb919eabaf574b63943e9e318432ea11d6b65d13caa7f978b2dab6c70413e565b49e3b7e59aa791975dcd95e9a8e24024154f7c2f4dfd4d91aa
-AUX weed.at 1100 BLAKE2B 120c50265f45b192afa583e594cbf75d753f33aa129f71f3e076780e71224605d735722cb50ba078aa9747b286291d560d9b5e28393239995c1648407070db97 SHA512 84fa4564cb1876c1b9f1a8b143f8fc95829de5d2b02edf8894d86aa50efcdd5696d66d773737a8989ccc4ae22d4d0e2c4b7c055e281faabb82cea399150b2821
-DIST mailutils-3.4.tar.xz 2619672 BLAKE2B 3a49c319a7171b2659477e6892ae222a342243e84ed2ee93e6d77353e1871d57d101a3a6ee3d2442709adbfb090e4931e134369661e8e8aa407061c1eccdf862 SHA512 548d97a4a036ef0ef5a429c82ffa43dd377b210b4c4d3844e7e5dded0f963060e3733b7766821c06ccf4dc1135002608658bcd6420e75b4ca1f4f17cfc8e2573
-DIST mailutils-3.7.tar.xz 2846864 BLAKE2B d407d370a4823972c060ea6c6a6e16eefe46598fee8302159f9d44fe150ace32b6915e7e3d4ddaca63ed5d5a5cffce48514f7f6297413a97692eb609a295622d SHA512 aa93ee1cde76392808f492dae6c69625ab124a2c31a296449ba217fc26f292871b4d04f8720bf20377177eab33c01cbfe195d6ac3674c35e1db53157a6916a4d
 DIST mailutils-3.8.tar.xz 2998596 BLAKE2B 4d09c7b5113129b3d2f3b113808d4460d025d4f0eec00dd1209a95f23abe97683b5d50cfe5229f1e5db48ddd6ca66c73fa6b0c1bfe03b324dbf40b6a26ff76f5 SHA512 4d081ae492beb0f9c1945541d63b52f155f11ca172abaedbe465955ac11097037f440e1aaed8d512cd3aab65f7792b755a7e4b9428a90ad7a833de87b1c4f1f9
 DIST mailutils-3.9.tar.xz 3075268 BLAKE2B 43ee5bf297951b3c894b467a46d3983dac3e115c02169da0ee2ccbc23f8b71d7439083093f4b0710f19c78f108df99dee3310f5f6adc5b7c1792a0a7be33aab6 SHA512 1eef9bebeeafbf974e54b87705444ee02b663a86e22442a9ec5db16ade38e6e9a3079ee8a8267393e97d6e9e477917617b2e1d57d3287ab19e4df73b66e5a8d4
-EBUILD mailutils-3.4-r3.ebuild 3712 BLAKE2B 12a6315b5804e7abfff890b0b08fb1636249bb1c714c5a8588aafbc1310912447fdbe9efdfa8153965ac40c236ae809f090249ce563aa10d708ac134fdfe1e9d SHA512 8be1c0092abf75b4c4f1211e4bf4177479e409d8925218d19cf958a7c4ea5fe23acb46ee84561485ac40816fc73f42c119b4a38e2c286168e69fb1b639497999
-EBUILD mailutils-3.7.ebuild 3704 BLAKE2B 7bcfa3e918b18352dda1e232c06ae304f7ec773927e45cd54b4606cbe96c969277077f659a7d7b3082604067d1c300662535db99e881f3399353d9d030a71dd4 SHA512 6a2d9ffa39b13ce2dc4e3933256e525e27c19984a5d85eb1372df5b14f507a093ad64b5b5c0151f1878c8966c7623824984d729143cdfe8eddc22fb4d8735620
-EBUILD mailutils-3.8.ebuild 3739 BLAKE2B 1c840153f7b02ec605dec553b18ea16939037fadc6dcb5fe10870ae7b61d1bac920caf46d0a6723e26afa5fa5231a2325f00035d25fadd76d3d340eca178a273 SHA512 1d9dbe4b7555cfef6885a71e85852a707d3b7faf4a3ec7134cf4834ea0afedb4e93e1f5c76647399216ae7376b9722c34f449f4507c78ba43814f160d1ee149c
+EBUILD mailutils-3.8.ebuild 3728 BLAKE2B d09f95b50dab9521553121380f839d30babf0c00c607051c73f8c0a6db58f04dbc17219536ac1d8d445df5185869b4fa8d315b939006b5fad8d786d599be447c SHA512 4add163fc3f0d120fcb75405858f993f36ed1e44bbb5fa3f40221e18653aea750bb0a9ac35026755a3bf160ce046d95ad98bf0f7b13ec0488461b1f0c8c7f4c6
 EBUILD mailutils-3.9.ebuild 3741 BLAKE2B 29e29b6c2d8004b5fc068d3eb8cef0535a82ec852f4ec9f9b4ac54381a640c834765184b903563e52428ce757ab9dac4be53f4e2e5015f97e351a773152631bf SHA512 8cda64711c04bd89ea8355ec5c333eceab3db2510894940b53a8967294afc2dc8cc39b258ab51eeee76c1942646262300dc8814c48f40f4984ad3caf7e680f09
 MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/files/hdr.at b/net-mail/mailutils/files/hdr.at
deleted file mode 100644
index 7c9d5e85c693..000000000000
--- a/net-mail/mailutils/files/hdr.at
+++ /dev/null
@@ -1,36 +0,0 @@
-# This file is part of GNU Mailutils. -*- Autotest -*-
-# Copyright (C) 2007-2012, 2014-2015 Free Software Foundation, Inc.
-#
-# GNU Mailutils 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, or (at
-# your option) any later version.
-#
-# GNU Mailutils 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 Mailutils.  If not, see <http://www.gnu.org/licenses/>.
-
-READMSGTEST([readmsg -h],[hdr],
-[readmsg -h SOMETHING],
-[0],
-[From bar@dontmailme.org  Fri Dec 28 23:28:09 2001
-Received: (from bar@dontmailme.org) 
-	by dontmailme.org id fERKR9N16790
-	for foobar@nonexistent.net; Fri, 28 Dec 2001 22:18:08 +0200
-Date: Fri, 28 Dec 2001 23:28:08 +0200
-From: Bar <bar@dontmailme.org>
-To: Foo Bar <foobar@nonexistent.net>
-Message-Id: <200112232808.fERKR9N16790@dontmailme.org>
-Subject: Re: Jabberwocky
-
-It seems very pretty, but it's *rather* hard to understand!'
-Somehow it seems to fill my head with ideas -- only I don't
-exactly know what they are!  However, SOMEBODY killed SOMETHING:
-that's clear, at any rate...
-
-
-])
diff --git a/net-mail/mailutils/files/mailutils-3.4-MH-testsuite.patch b/net-mail/mailutils/files/mailutils-3.4-MH-testsuite.patch
deleted file mode 100644
index 919b6619e5f1..000000000000
--- a/net-mail/mailutils/files/mailutils-3.4-MH-testsuite.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 696754b9332922a00e977903d6df3def6ddb3fb6 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Fri, 10 Nov 2017 21:28:17 +0200
-Subject: Minor fix in MH testsuite
-
-Running fmtcheck without .mh_profile triggers mh_install, which
-surprises the testsuite with unexpected output "I'm going to
-create the standard MH path for you." Defining the MH envar to
-an existing file name suppresses it.
-
-* mh/tests/fmtcnd00.at: Always define MH prior to starting fmtcheck.
-* mh/tests/fmtcomp.at: Likewise.
-* mh/tests/fmtfunc.at: Likewise.
----
- mh/tests/fmtcnd00.at | 2 +-
- mh/tests/fmtcomp.at  | 4 ++--
- mh/tests/fmtfunc.at  | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/mh/tests/fmtcnd00.at b/mh/tests/fmtcnd00.at
-index 507e8e5..f674d41 100644
---- a/mh/tests/fmtcnd00.at
-+++ b/mh/tests/fmtcnd00.at
-@@ -28,7 +28,7 @@ m4_pushdef([FMTCOND],[
- AT_SETUP([$1])
- AT_KEYWORDS([format fmtcond fmtcnd00])
- AT_DATA([msg],[$2])
--AT_CHECK([fmtcheck -format 'FORMAT' msg
-+AT_CHECK([MH=/dev/null fmtcheck -format 'FORMAT' msg
- ],
- [0],
- [$3])
-diff --git a/mh/tests/fmtcomp.at b/mh/tests/fmtcomp.at
-index 72cd823..615470a 100644
---- a/mh/tests/fmtcomp.at
-+++ b/mh/tests/fmtcomp.at
-@@ -22,7 +22,7 @@ dnl
- m4_pushdef([FMTCOMP],[
- AT_SETUP([$1])
- AT_KEYWORDS([format fmtcomp])
--AT_CHECK([fmtcheck -disass -dump -format '$2'
-+AT_CHECK([MH=/dev/null fmtcheck -disass -dump -format '$2'
- ],
- [m4_if([$4],[],[0],[1])],
- [$3],[$4])
-@@ -296,7 +296,7 @@ m4_pushdef([FMTCOMP],[
- AT_SETUP([$1])
- AT_KEYWORDS([format fmtdiag])
- AT_DATA([input.fmt],[$2])
--AT_CHECK([fmtcheck -form input.fmt
-+AT_CHECK([MH=/dev/null fmtcheck -form input.fmt
- ],
- [1],
- [],
-diff --git a/mh/tests/fmtfunc.at b/mh/tests/fmtfunc.at
-index 844a777..0829d45 100644
---- a/mh/tests/fmtfunc.at
-+++ b/mh/tests/fmtfunc.at
-@@ -212,7 +212,7 @@ AT_DATA([input.fmt],[%(getenv MH_TEST)
- AT_DATA([message],[
- 
- ])
--AT_CHECK([MH_TEST=defined fmtcheck -form input.fmt -width 80 message
-+AT_CHECK([MH=/dev/null MH_TEST=defined fmtcheck -form input.fmt -width 80 message
- ],
- [0],
- [defined
--- 
-cgit v1.0-41-gc330
-
diff --git a/net-mail/mailutils/files/mailutils-3.4-fix-endianness.patch b/net-mail/mailutils/files/mailutils-3.4-fix-endianness.patch
deleted file mode 100644
index 0e52fae20c1b..000000000000
--- a/net-mail/mailutils/files/mailutils-3.4-fix-endianness.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From feecde8c46cdb597a76df5e6ef02b854843a8a5c Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Thu, 21 Jun 2018 09:46:43 +0300
-Subject: Fix endianness bug in string to IP conversion
-
-* libmailutils/cidr/fromsa.c (_mu_inaddr_to_bytes)
-(_mu_sockaddr_to_bytes): Fix improper endianness conversion.
-* libmailutils/cidr/tosa.c (mu_cidr_to_sockaddr): Simplify conversion.
----
- libmailutils/cidr/fromsa.c | 45 ++++++++++++++++++++-------------------------
- libmailutils/cidr/tosa.c   |  9 ++-------
- 2 files changed, 22 insertions(+), 32 deletions(-)
-
-diff --git a/libmailutils/cidr/fromsa.c b/libmailutils/cidr/fromsa.c
-index f57aadc..39d24fd 100644
---- a/libmailutils/cidr/fromsa.c
-+++ b/libmailutils/cidr/fromsa.c
-@@ -29,55 +29,50 @@
- #include <mailutils/cidr.h>
- #include <mailutils/errno.h>
- 
--static void
--uint32_to_bytes (unsigned char *bytes, uint32_t u)
--{
--  int i;
--  
--  for (i = 0; i < 4; i++)
--    {
--      bytes[i] = u & 0xff;
--      u >>= 8;
--    }
--}
--
- int
- _mu_inaddr_to_bytes (int af, void *buf, unsigned char *bytes)
- {
--  uint32_t u;
-+  size_t len;
-   
-   switch (af)
-     {
-     case AF_INET:
--      memcpy (&u, buf, sizeof u);
--      uint32_to_bytes (bytes, u);
--      return 4;
--
-+      len = 4;
-+      break;
-+      
- #ifdef MAILUTILS_IPV6
-     case AF_INET6:
--      memcpy (bytes, buf, 16);
--      return 16;
-+      len = 16;
-+      break;
- #endif
-+
-+    default:
-+      len = 0;
-     }
--  return 0;
-+  memcpy (bytes, buf, len);
-+  return len;
- }
- 
- int
- _mu_sockaddr_to_bytes (unsigned char *bytes, struct sockaddr const *sa)
- {
-+  void *buf;
-   switch (sa->sa_family)
-     {
-     case AF_INET:
--      uint32_to_bytes (bytes, ((struct sockaddr_in*)sa)->sin_addr.s_addr);
--      return 4;
-+      buf = &(((struct sockaddr_in*)sa)->sin_addr.s_addr);
-+      break;
- 
- #ifdef MAILUTILS_IPV6
-     case AF_INET6:
--      memcpy (bytes, &((struct sockaddr_in6*)sa)->sin6_addr, 16);
--      return 16;
-+      buf = &(((struct sockaddr_in6*)sa)->sin6_addr);
-+      break;
- #endif
-+      
-+    default:
-+      return 0;
-     }
--  return 0;
-+  return _mu_inaddr_to_bytes (sa->sa_family, buf, bytes);
- }
- 
- int
-diff --git a/libmailutils/cidr/tosa.c b/libmailutils/cidr/tosa.c
-index 33715e1..2b372b1 100644
---- a/libmailutils/cidr/tosa.c
-+++ b/libmailutils/cidr/tosa.c
-@@ -42,19 +42,14 @@ mu_cidr_to_sockaddr (struct mu_cidr *cidr, struct sockaddr **psa)
-   } addr;
-   struct sockaddr *sa;
-   int socklen;
--  int i;
--  
-+
-   memset (&addr, 0, sizeof (addr));
-   addr.sa.sa_family = cidr->family;
-   switch (cidr->family)
-     {
-     case AF_INET:
-       socklen = sizeof (addr.s_in);
--      for (i = 0; i < cidr->len; i++)
--	{
--	  addr.s_in.sin_addr.s_addr <<= 8;
--	  addr.s_in.sin_addr.s_addr |= cidr->address[i];
--	}
-+      memcpy (&addr.s_in.sin_addr.s_addr, cidr->address, 4);
-       break;
- 
- #ifdef MAILUTILS_IPV6
--- 
-cgit v1.0-41-gc330
-
diff --git a/net-mail/mailutils/files/mailutils-3.4-fno-common.patch b/net-mail/mailutils/files/mailutils-3.4-fno-common.patch
deleted file mode 100644
index d981ae6891a8..000000000000
--- a/net-mail/mailutils/files/mailutils-3.4-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/tcpwrap.h
-+++ b/lib/tcpwrap.h
-@@ -18,7 +18,7 @@
- #include <mailutils/types.h>
- 
- extern int mu_tcp_wrapper_enable;
--const char *mu_tcp_wrapper_daemon;
-+extern const char *mu_tcp_wrapper_daemon;
- extern int mu_tcpwrapper_access (int fd);
- extern void mu_tcpwrapper_cfg_init (void);
- extern int mu_tcp_wrapper_prefork (int fd, 
diff --git a/net-mail/mailutils/files/nohdr.at b/net-mail/mailutils/files/nohdr.at
deleted file mode 100644
index 4caf85570f1e..000000000000
--- a/net-mail/mailutils/files/nohdr.at
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file is part of GNU Mailutils. -*- Autotest -*-
-# Copyright (C) 2007-2012, 2014-2015 Free Software Foundation, Inc.
-#
-# GNU Mailutils 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, or (at
-# your option) any later version.
-#
-# GNU Mailutils 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 Mailutils.  If not, see <http://www.gnu.org/licenses/>.
-
-READMSGTEST([readmsg -n],[nohdr],
-[readmsg -n SOMETHING],
-[0],
-[It seems very pretty, but it's *rather* hard to understand!'
-Somehow it seems to fill my head with ideas -- only I don't
-exactly know what they are!  However, SOMEBODY killed SOMETHING:
-that's clear, at any rate...
-
-
-])
diff --git a/net-mail/mailutils/files/twomsg.at b/net-mail/mailutils/files/twomsg.at
deleted file mode 100644
index 20af66173d6a..000000000000
--- a/net-mail/mailutils/files/twomsg.at
+++ /dev/null
@@ -1,73 +0,0 @@
-# This file is part of GNU Mailutils. -*- Autotest -*-
-# Copyright (C) 2007-2012, 2014-2015 Free Software Foundation, Inc.
-#
-# GNU Mailutils 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, or (at
-# your option) any later version.
-#
-# GNU Mailutils 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 Mailutils.  If not, see <http://www.gnu.org/licenses/>.
-
-READMSGTEST([readmsg 1 2],[twomsg],
-[1 2],
-[0],
-[Date: Fri, 28 Dec 2001 22:18:08 +0200
-From: Foo Bar <foobar@nonexistent.net>
-To: Bar <bar@dontmailme.org>
-Subject: Jabberwocky
-
-`Twas brillig, and the slithy toves
-Did gyre and gimble in the wabe;
-All mimsy were the borogoves,
-And the mome raths outgrabe.
-
-`Beware the Jabberwock, my son!
-The jaws that bite, the claws that catch!
-Beware the Jujub bird, and shun
-The frumious Bandersnatch!'
-
-He took his vorpal sword in hand:
-Long time the manxome foe he sought --
-So rested he by the Tumtum gree,
-And stood awhile in thought.
-
-And as in uffish thought he stood,
-The Jabberwock, with eyes of flame,
-Came whiffling through the tulgey wook,
-And burbled as it came!
-
-One, two!  One, two!  And through and through
-The vorpal blade went snicker-snack!
-He left it dead, and with its head
-He went galumphing back.
-
-`And has thou slain the Jabberwock?
-Come to my arms, my beamish boy!
-O frabjous day!  Calloh!  Callay!
-He chortled in his joy.
-
-`Twas brillig, and the slithy toves
-Did gyre and gimble in the wabe;
-All mimsy were the borogoves,
-And the mome raths outgrabe.
-
-
-Date: Fri, 28 Dec 2001 23:28:08 +0200
-From: Bar <bar@dontmailme.org>
-To: Foo Bar <foobar@nonexistent.net>
-Subject: Re: Jabberwocky
-
-It seems very pretty, but it's *rather* hard to understand!'
-Somehow it seems to fill my head with ideas -- only I don't
-exactly know what they are!  However, SOMEBODY killed SOMETHING:
-that's clear, at any rate...
-
-
-])
-
diff --git a/net-mail/mailutils/files/weed.at b/net-mail/mailutils/files/weed.at
deleted file mode 100644
index ec82c6ce23b5..000000000000
--- a/net-mail/mailutils/files/weed.at
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file is part of GNU Mailutils. -*- Autotest -*-
-# Copyright (C) 2007-2012, 2014-2015 Free Software Foundation, Inc.
-#
-# GNU Mailutils 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, or (at
-# your option) any later version.
-#
-# GNU Mailutils 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 Mailutils.  If not, see <http://www.gnu.org/licenses/>.
-
-READMSGTEST([readmsg -w],[weed],
-[-w date,subject SOMETHING],
-[0],
-[Date: Fri, 28 Dec 2001 23:28:08 +0200
-Subject: Re: Jabberwocky
-
-It seems very pretty, but it's *rather* hard to understand!'
-Somehow it seems to fill my head with ideas -- only I don't
-exactly know what they are!  However, SOMEBODY killed SOMETHING:
-that's clear, at any rate...
-
-
-])
diff --git a/net-mail/mailutils/mailutils-3.4-r3.ebuild b/net-mail/mailutils/mailutils-3.4-r3.ebuild
deleted file mode 100644
index 67cffc2dc93e..000000000000
--- a/net-mail/mailutils/mailutils-3.4-r3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-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://www.gnu.org/software/mailutils/mailutils.html"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
-	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
-	tokyocabinet"
-
-RDEPEND="!mail-client/nmh
-	!mail-filter/libsieve
-	!mail-client/mailx
-	!mail-client/nail
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	dev-libs/libltdl:0
-	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/22 )
-	kerberos? ( virtual/krb5 )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	nls? ( sys-devel/gettext )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS} )
-	sasl? ( virtual/gsasl )
-	ssl? ( net-libs/gnutls:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	tokyocabinet? ( dev-db/tokyocabinet )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	servers? ( tcpd )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable bytecompilation of Python modules.
-	echo "#!/bin/sh" > build-aux/py-compile
-	eapply \
-		"${FILESDIR}"/${P}-MH-testsuite.patch \
-		"${FILESDIR}"/${P}-fix-endianness.patch \
-		"${FILESDIR}"/${PN}-3.4-fno-common.patch
-	# add missing tests so that make check doesn't fail
-	cp "${FILESDIR}"/{hdr,nohdr,twomsg,weed}.at "${S}"/readmsg/tests || die
-	if use mysql; then
-		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
-			sql/Makefile.am || die
-	fi
-	eapply_user
-	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_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 \
-		--disable-rpath
-}
-
-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.7.ebuild b/net-mail/mailutils/mailutils-3.7.ebuild
deleted file mode 100644
index 344b83bfb471..000000000000
--- a/net-mail/mailutils/mailutils-3.7.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-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://www.gnu.org/software/mailutils/mailutils.html"
-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 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
-	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
-	tokyocabinet"
-
-RDEPEND="!mail-client/nmh
-	!mail-filter/libsieve
-	!mail-client/mailx
-	!mail-client/nail
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	dev-libs/libltdl:0
-	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}
-	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}"/${PN}-3.6-underlinking.patch
-	"${FILESDIR}"/${PN}-3.8-fno-common.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.8.ebuild b/net-mail/mailutils/mailutils-3.8.ebuild
index abce1e8cec39..338c88ced77f 100644
--- a/net-mail/mailutils/mailutils-3.8.ebuild
+++ b/net-mail/mailutils/mailutils-3.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
 
@@ -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 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
 	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
 	tokyocabinet"