gentoo auto-resync : 09:08:2022 - 14:16:10

14 files changed, 2 insertions, 498 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 85a0b1a2ff7e..29ea2bdf731f 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/mpack/Manifest b/net-mail/mpack/Manifest
deleted file mode 100644
index baa708ae528d..000000000000
--- a/net-mail/mpack/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX mpack-1.6-clang.patch 205 BLAKE2B b8b4932b30522c1f3bd2cf4dbb164356f38ba9ff24e29756f31ff716105bf4d76360e37c2f5b8146762f8225ed9f4a421632def57cc33c4dd7471ee4b9c0c1aa SHA512 194b280dfd1b6267ee383be97aa88080ae1d78675741486280357b807c5dd4e75ef3a110f4143b70a8fa628a42d38bde98ea6b72a72eea4ddaa46cdb3d3315a0
-AUX mpack-1.6-compile.patch 2652 BLAKE2B 08fcc15b37781f9819b61725cb24577f13d17135d64d34029ff5f17e94d1843de60261047f01d4d41552f7cb92a215d019450679a5aa3eea6a3aabf9a72b82a9 SHA512 60396619da56d1166c27d6307b7d3437e928311eb2a3120f7062ef9f52bedd729a80fef25e657897b2219af0b4d90633a0827335dd4cc0f5cf8585377ca7cd2d
-AUX mpack-1.6-cve-2011-4919.patch 706 BLAKE2B c457abf39cad8d0bfbc2d6c72c601e1e211dcf2f793407eb22c4b949604e5abab1dccd62df935762d4e7e011a21ad0f2cbdd8194b7186416945ab8e80f1fd471 SHA512 82ddbc6af292c2f695fa45572ce66705ab4e272322bdf4d47b2078e934a1d4e822808b3c174560b3d315431d4fcd095809eb4b4f80958c2dd8c7be955f7a1740
-AUX mpack-1.6-filenames.patch 882 BLAKE2B 0ad7760caafb74e9619493752a9dafc7a3a751a1f4ab01e0cb47f8e43ccb58505cc50aaef8dc946d85e1950edf6bfe26ac6ee600c2acd9719935861ee28cc5a6 SHA512 ec36e1f4775ec5063fc7e8e10b75d0f47e2a7b675b62967726abe6283d9bc3885a8376ea9b264b837959bba65eaee6d92739afbab8237b2eb4a4bd2eda9f0e60
-AUX mpack-1.6-gentoo.patch 2022 BLAKE2B ceb79535e4c27175c00bc6c64461328599713fce15bd65c21d1ad5ab9fae3f5b6a6a13e365a350ae0a956daaef47c1789a0e52f70aee8e0745a781c61a2b7d1e SHA512 543a073bf034914a9484713ca0cb838fd4a23b60b61997f358aaf782d9485f188382dc502f2f1bcab0f48e322fe1c5be15f4120aeeccafd981a1abbb695c0616
-AUX mpack-1.6-munpack.patch 1341 BLAKE2B 9c1a41f1d1e6db8b80369818effc56556d1c2b74b78b0f2375d2cd1c71e7bd3f872bc59d836a38195f9b992d67d483b17d2dcbe4560f246ca20f6797686b6ed6 SHA512 b9a895798d3ffb0c1dc7e0d67cabef1570f64ee02175dd6082f9581caa08f759a4d4488d329433e1f2c529b19df32fe645e08fc079a1aa667ff0f9c38c1e51a1
-AUX mpack-1.6-paths.patch 2729 BLAKE2B aa0cf351e69b2b041ea14c84c651275cf6e2cc8953d18363e7e9fe58c1d8a54aef0ff028ddfe47452dafb2c2c9c4af37d104f5f8a58f6fef106197bfaa1500ca SHA512 918a1f25e5f224d34f2e1b44aae7683b5d31b384d6e124de88c1fe661e42ef5d88810d7380bc4e298a2d7efe152f0da5cfc3b3028c65a3f2a337511d3384fcf7
-AUX mpack-1.6-usage.patch 721 BLAKE2B 9631aed898a8f95fb3e70f29c82994d0f1abcb935c106074c014a56f59f39df46fe6aea5b9eef0e58bfb25d5c9d4084126b88eb1117d8ca124746058b334bc52 SHA512 e07f72e6a0d037f788829904050bbee9f1c8c722a6b363b8a95ab012dda99b952e36bd7a9772a63d22ff4da34fdd44ead8d42db510e8c340f3410b3cd0d52b1a
-DIST mpack-1.6.tar.gz 179850 BLAKE2B d6b79e8514633fd0bfd1c04b167ba1d1a030cf5407dae30ba2a45e3d30157b66955808aed40a5163737c0242349d05f53c27ada920676cf3d7b81a00e7bd5059 SHA512 9bff0d2753d78288e428a20c8cbb4596bd9862de4da7f42176731ce5fd459b15883d758f9b1ec7d4e1281cc1aeaaa046cec54aeb0997a7ffed74de07edd84714
-EBUILD mpack-1.6-r4.ebuild 841 BLAKE2B a54ea46f9a497853c2e34036c0771600f0b24697eb1b930f4b361656a3144c8bf12a1307ae581c3e06339a68975d0fe503f1459db25c9b023053449577f01911 SHA512 9b4d358f2e70c43758a831fd1c310d6330792fc674ac3757c4bf503d2905ba0ceacd7575a4b4673143411423711f370fe713d932d409971784f1f8c3147b9dac
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/mpack/files/mpack-1.6-clang.patch b/net-mail/mpack/files/mpack-1.6-clang.patch
deleted file mode 100644
index fc21d170af5f..000000000000
--- a/net-mail/mpack/files/mpack-1.6-clang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- umpack-1.6/udecode.c	2003-07-21 20:46:37.000000000 +0000
-+++ mpack-1.6/uudecode.c	2014-04-19 10:04:19.000000000 +0000
-@@ -845,7 +845,7 @@
- 	}
- 	line += 4;
-     }
--    return;
-+    return 0;
- }
- 
-     
diff --git a/net-mail/mpack/files/mpack-1.6-compile.patch b/net-mail/mpack/files/mpack-1.6-compile.patch
deleted file mode 100644
index 570319cabe55..000000000000
--- a/net-mail/mpack/files/mpack-1.6-compile.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From a01468c1734129595355af0815d4577af4e265cc Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 7 Dec 2011 23:22:55 +0100
-Subject: [PATCH] Add missing includes, remove conflicting prototypes
-
----
- decode.c   |    1 +
- encode.c   |    1 +
- magic.c    |    1 +
- part.c     |    1 +
- unixos.c   |    5 +----
- unixpk.c   |    2 ++
- unixpk.o   |  Bin 12000 -> 12016 bytes
- unixunpk.c |    1 +
- xmalloc.c  |    2 +-
- 9 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/decode.c b/decode.c
-index c96918f..8b8df56 100644
---- a/decode.c
-+++ b/decode.c
-@@ -28,6 +28,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
-+#include <stdlib.h>
- #include "xmalloc.h"
- #include "common.h"
- #include "part.h"
-diff --git a/encode.c b/encode.c
-index 0ba3934..1377cf8 100644
---- a/encode.c
-+++ b/encode.c
-@@ -24,6 +24,7 @@
-  */
- #include <stdio.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- extern char *magic_look(FILE *infile);
- extern char *os_genid(void);
-diff --git a/magic.c b/magic.c
-index e08c6f8..a452a43 100644
---- a/magic.c
-+++ b/magic.c
-@@ -23,6 +23,7 @@
-  * SOFTWARE.
-  */
- #include <stdio.h>
-+#include <string.h>
- 
- /* Description of the various file formats and their magic numbers */
- struct magic {
-diff --git a/part.c b/part.c
-index 1d4efe6..15fd724 100644
---- a/part.c
-+++ b/part.c
-@@ -28,6 +28,7 @@
- 
- #include <stdio.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #include "part.h"
- #include "xmalloc.h"
-diff --git a/unixos.c b/unixos.c
-index 3f5c4c0..fa6d0a7 100644
---- a/unixos.c
-+++ b/unixos.c
-@@ -30,6 +30,7 @@
- #include <sys/param.h>
- #include <netdb.h>
- #include <fcntl.h>
-+#include <stdlib.h>
- #include "xmalloc.h"
- #include "common.h"
- #include "part.h"
-@@ -38,10 +39,6 @@
- #define MAXHOSTNAMELEN 64
- #endif
- 
--extern int errno;
--extern char *malloc();
--extern char *getenv();
--
- int overwrite_files = 0;
- int didchat;
- 
-diff --git a/unixpk.c b/unixpk.c
-index c2aaa56..1f81ea9 100644
---- a/unixpk.c
-+++ b/unixpk.c
-@@ -25,6 +25,8 @@
- #include <stdio.h>
- #include <string.h>
- #include <errno.h>
-+#include <stdlib.h>
-+#include <unistd.h>
- #include "common.h"
- #include "version.h"
- #include "xmalloc.h"
-diff --git a/unixunpk.c b/unixunpk.c
-index a1f065b..0f5fa85 100644
---- a/unixunpk.c
-+++ b/unixunpk.c
-@@ -23,6 +23,7 @@
-  * SOFTWARE.
-  */
- #include <stdio.h>
-+#include <stdlib.h>
- #include "version.h"
- #include "part.h"
- 
-diff --git a/xmalloc.c b/xmalloc.c
-index 7c74360..46dbbd1 100644
---- a/xmalloc.c
-+++ b/xmalloc.c
-@@ -24,7 +24,7 @@
-  */
- #include <stdio.h>
- #include <string.h>
--extern char *malloc(), *realloc();
-+#include <stdlib.h>
- 
- char *xmalloc (int size)
- {
--- 
-1.7.8
-
diff --git a/net-mail/mpack/files/mpack-1.6-cve-2011-4919.patch b/net-mail/mpack/files/mpack-1.6-cve-2011-4919.patch
deleted file mode 100644
index 62a04faa7936..000000000000
--- a/net-mail/mpack/files/mpack-1.6-cve-2011-4919.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0c87201f64491575350b18d04c62ec142e119d1f Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 31 Dec 2011 20:17:20 +0100
-Subject: [PATCH] Fix permissions
-
----
- unixos.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/unixos.c b/unixos.c
-index fa6d0a7..0e2f469 100644
---- a/unixos.c
-+++ b/unixos.c
-@@ -134,9 +134,9 @@ FILE *os_createnewfile(char *fname)
-     FILE *ret;
-      
- #ifdef O_EXCL
--    fd=open(fname, O_RDWR|O_CREAT|O_EXCL, 0644);
-+    fd=open(fname, O_RDWR|O_CREAT|O_EXCL, 0600);
- #else
--    fd=open(fname, O_RDWR|O_CREAT|O_TRUNC, 0644);
-+    fd=open(fname, O_RDWR|O_CREAT|O_TRUNC, 0600);
- #endif
- 
-     if (fd == -1)
--- 
-1.7.8.1
-
diff --git a/net-mail/mpack/files/mpack-1.6-filenames.patch b/net-mail/mpack/files/mpack-1.6-filenames.patch
deleted file mode 100644
index 6a1fc225a791..000000000000
--- a/net-mail/mpack/files/mpack-1.6-filenames.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 10aad11d7baf7044328fff616b9c6f1859bd2cbd Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 8 Jan 2012 17:36:20 +0100
-Subject: [PATCH 1/2] Use actual filenames for unpacking (rather than
- "part[0-9]+")
-
-Example:
-# curl http://pbot.rmdir.de/b224d87617c5d76d6cd938bd4410fabf | ./munpack
----
- decode.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/decode.c b/decode.c
-index 8b8df56..7349abd 100644
---- a/decode.c
-+++ b/decode.c
-@@ -546,8 +546,8 @@ getDispositionFilename(char *disposition)
- 	SkipWhitespace(&disposition);
- 	if (!disposition) return 0;
- 
--	/* If we're looking at a ";", we found what we're looking for */
--	if (*disposition++ == ';') break;
-+	/* If we're looking at a "=", we found what we're looking for */
-+	if (*disposition++ == '=') break;
-     }
- 
-     SkipWhitespace(&disposition);
--- 
-1.7.8.3
-
diff --git a/net-mail/mpack/files/mpack-1.6-gentoo.patch b/net-mail/mpack/files/mpack-1.6-gentoo.patch
deleted file mode 100644
index faf72eb67e7a..000000000000
--- a/net-mail/mpack/files/mpack-1.6-gentoo.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -bur mpack-1.6-orig/unixos.c mpack-1.6/unixos.c
---- mpack-1.6-orig/unixos.c	2007-03-11 02:02:02.000000000 +0100
-+++ mpack-1.6/unixos.c	2007-03-11 02:04:48.000000000 +0100
-@@ -39,7 +39,7 @@
- #endif
- 
- extern int errno;
--extern char *malloc();
-+extern void *malloc();
- extern char *getenv();
- 
- int overwrite_files = 0;
-@@ -90,7 +90,7 @@
- 	strcpy(buf, getenv("TMPDIR"));
-     }
-     else {
--	strcpy(buf, "/usr/tmp");
-+	strcpy(buf, "/var/tmp");
-     }
-     strcat(buf, "/m-prts-");
-     p = getenv("USER");
-diff -bur mpack-1.6-orig/unixpk.c mpack-1.6/unixpk.c
---- mpack-1.6-orig/unixpk.c	2007-03-11 02:02:02.000000000 +0100
-+++ mpack-1.6/unixpk.c	2007-03-11 02:14:02.000000000 +0100
-@@ -167,7 +167,7 @@
- 	    strcpy(fnamebuf, "/usr/tmp");
- 	}
- 	strcat(fnamebuf, "/mpackXXXXXX");
--	mktemp(fnamebuf);
-+	mkstemp(fnamebuf);
- 	outfname = strsave(fnamebuf);
-     }
- 
-diff -bur mpack-1.6-orig/unixpk.man mpack-1.6/unixpk.man
---- mpack-1.6-orig/unixpk.man	2007-03-11 02:02:02.000000000 +0100
-+++ mpack-1.6/unixpk.man	2007-03-11 02:14:13.000000000 +0100
-@@ -136,7 +136,7 @@
- .SH ENVIRONMENT
- .TP
- .B TMPDIR
--Directory to store temporary files.  Default is /usr/tmp.
-+Directory to store temporary files.  Default is /var/tmp.
- .TP
- .B SPLITSIZE
- Default value of the -m switch.
-diff -bur mpack-1.6-orig/unixunpk.man mpack-1.6/unixunpk.man
---- mpack-1.6-orig/unixunpk.man	2007-03-11 02:02:02.000000000 +0100
-+++ mpack-1.6/unixunpk.man	2007-03-11 02:03:14.000000000 +0100
-@@ -107,7 +107,7 @@
- .SH ENVIRONMENT
- .TP
- .B TMPDIR
--Directory to store temporary files.  Default is /usr/tmp.
-+Directory to store temporary files.  Default is /var/tmp.
- .SH FILES
- .TP
- .B $TMPDIR/m-prts-$USER/
-diff -bur mpack-1.6-orig/xmalloc.c mpack-1.6/xmalloc.c
---- mpack-1.6-orig/xmalloc.c	2007-03-11 02:02:02.000000000 +0100
-+++ mpack-1.6/xmalloc.c	2007-03-11 02:04:29.000000000 +0100
-@@ -24,7 +24,7 @@
-  */
- #include <stdio.h>
- #include <string.h>
--extern char *malloc(), *realloc();
-+extern void *malloc(), *realloc();
- 
- char *xmalloc (int size)
- {
diff --git a/net-mail/mpack/files/mpack-1.6-munpack.patch b/net-mail/mpack/files/mpack-1.6-munpack.patch
deleted file mode 100644
index 9d5c8af6e814..000000000000
--- a/net-mail/mpack/files/mpack-1.6-munpack.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From a4ececa89969adfa53c30878b21178e1427cb6c5 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 18 Jan 2012 05:22:25 +0100
-Subject: [PATCH] Fix unpacking of multiple parts
-
-The problem was reported by Dirk Meyer of FreeBSD.
-
-He shared these commands to reproduce:
-$ ./mpack -s Subject -m 1700 -o zparts md5c.c
-$ ./munpack zparts.*
----
- decode.c |    2 +-
- unixos.c |   13 +++++++++++++
- 2 files changed, 14 insertions(+), 1 deletions(-)
-
-diff --git a/decode.c b/decode.c
-index 7349abd..e8e8d56 100644
---- a/decode.c
-+++ b/decode.c
-@@ -633,7 +633,7 @@ int handlePartial(struct part *inpart, char *headers, params contentParams, int
- 	}
- 	/* Store number of parts in reassembly directory */
- 	sprintf(buf, "%sCT", dir);
--	partfile = os_createnewfile(buf);
-+	partfile = os_resetfile(buf);
- 	if (!partfile) {
- 	    os_perror(buf);
- 	    goto ignore;
-diff --git a/unixos.c b/unixos.c
-index 0e2f469..1650594 100644
---- a/unixos.c
-+++ b/unixos.c
-@@ -146,6 +146,19 @@ FILE *os_createnewfile(char *fname)
-     return ret;
- }
- 
-+FILE *os_resetfile(char *fname)
-+{
-+    int fd;
-+    FILE *ret;
-+
-+    fd=open(fname, O_RDWR|O_CREAT|O_TRUNC, 0600);
-+    if (fd == -1)
-+        return NULL;
-+
-+    ret=fdopen(fd, "w");
-+    return ret;
-+}
-+
-      
- /*
-  * Create a new file, with suggested filename "fname".
--- 
-1.7.8.3
-
diff --git a/net-mail/mpack/files/mpack-1.6-paths.patch b/net-mail/mpack/files/mpack-1.6-paths.patch
deleted file mode 100644
index 0dc2de8b2123..000000000000
--- a/net-mail/mpack/files/mpack-1.6-paths.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From b857da37ec211e4472070c9e870aa5a0b827563b Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Thu, 8 Dec 2011 00:09:03 +0100
-Subject: [PATCH] Use /var/tmp rather than /usr/tmp
-
----
- README.unix  |    2 +-
- mkreadme.pl  |    2 +-
- unixos.c     |    2 +-
- unixpk.c     |    2 +-
- unixpk.man   |    2 +-
- unixunpk.man |    2 +-
- 8 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/README.unix b/README.unix
-index d7a762c..c26b7c8 100644
---- a/README.unix
-+++ b/README.unix
-@@ -188,7 +188,7 @@ The environment variables which control munpack's behavior are:
- 
-      TMPDIR
-           Root of directory to store partial messages awaiting 
--          reassembly.  Default is "/usr/tmp".   Partial messages
-+          reassembly.  Default is "/var/tmp".   Partial messages
- 	  are stored in subdirectories of $TMPDIR/m-prts-$USER/
- 
- 
-diff --git a/mkreadme.pl b/mkreadme.pl
-index a45117b..22e4e81 100755
---- a/mkreadme.pl
-+++ b/mkreadme.pl
-@@ -413,7 +413,7 @@ The environment variables which control munpack's behavior are:
- =unix
-      TMPDIR
-           Root of directory to store partial messages awaiting 
--          reassembly.  Default is "/usr/tmp".   Partial messages
-+          reassembly.  Default is "/var/tmp".   Partial messages
- 	  are stored in subdirectories of $TMPDIR/m-prts-$USER/
- 
- =pc os2
-diff --git a/unixos.c b/unixos.c
-index 2243d12..fa6d0a7 100644
---- a/unixos.c
-+++ b/unixos.c
-@@ -87,7 +87,7 @@ char *os_idtodir(char *id)
- 	strcpy(buf, getenv("TMPDIR"));
-     }
-     else {
--	strcpy(buf, "/usr/tmp");
-+	strcpy(buf, "/var/tmp");
-     }
-     strcat(buf, "/m-prts-");
-     p = getenv("USER");
-diff --git a/unixpk.c b/unixpk.c
-index 3605dd1..0bae849 100644
---- a/unixpk.c
-+++ b/unixpk.c
-@@ -166,7 +166,7 @@ int main(int argc, char **argv)
- 	    strcpy(fnamebuf, getenv("TMPDIR"));
- 	}
- 	else {
--	    strcpy(fnamebuf, "/usr/tmp");
-+	    strcpy(fnamebuf, "/var/tmp");
- 	}
- 	strcat(fnamebuf, "/mpackXXXXXX");
- 	mktemp(fnamebuf);
-diff --git a/unixpk.man b/unixpk.man
-index de251ee..c4c9313 100644
---- a/unixpk.man
-+++ b/unixpk.man
-@@ -136,7 +136,7 @@ Mail the generated messages to the specified addresses.
- .SH ENVIRONMENT
- .TP
- .B TMPDIR
--Directory to store temporary files.  Default is /usr/tmp.
-+Directory to store temporary files.  Default is /var/tmp.
- .TP
- .B SPLITSIZE
- Default value of the -m switch.
-diff --git a/unixunpk.man b/unixunpk.man
-index da384b1..8c9ab7e 100644
---- a/unixunpk.man
-+++ b/unixunpk.man
-@@ -107,7 +107,7 @@ see the section "OPTIONS" above.
- .SH ENVIRONMENT
- .TP
- .B TMPDIR
--Directory to store temporary files.  Default is /usr/tmp.
-+Directory to store temporary files.  Default is /var/tmp.
- .SH FILES
- .TP
- .B $TMPDIR/m-prts-$USER/
--- 
-1.7.8
-
diff --git a/net-mail/mpack/files/mpack-1.6-usage.patch b/net-mail/mpack/files/mpack-1.6-usage.patch
deleted file mode 100644
index f4f07e530ee9..000000000000
--- a/net-mail/mpack/files/mpack-1.6-usage.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 74fd172db4961ab07f134a60cd88955fb170f11d Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 8 Jan 2012 17:39:51 +0100
-Subject: [PATCH 2/2] Mention parameter -t in usage output
-
----
- unixunpk.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/unixunpk.c b/unixunpk.c
-index 0f5fa85..1320b70 100644
---- a/unixunpk.c
-+++ b/unixunpk.c
-@@ -101,7 +101,7 @@ int main(int argc, char **argv)
- 
- void usage(void) {
-     fprintf(stderr, "munpack version %s\n", MPACK_VERSION);
--    fprintf(stderr, "usage: munpack [-f] [-q] [-C directory] [files...]\n");
-+    fprintf(stderr, "usage: munpack [-f] [-q] [-t] [-C directory] [files...]\n");
-     exit(1);
- }
- 
--- 
-1.7.8.3
-
diff --git a/net-mail/mpack/metadata.xml b/net-mail/mpack/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/net-mail/mpack/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/mpack/mpack-1.6-r4.ebuild b/net-mail/mpack/mpack-1.6-r4.ebuild
deleted file mode 100644
index cdc76aa564c7..000000000000
--- a/net-mail/mpack/mpack-1.6-r4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-AT_M4DIR=cmulocal
-
-inherit autotools
-
-DESCRIPTION="Command-line MIME encoding and decoding utilities"
-HOMEPAGE="ftp://ftp.andrew.cmu.edu/pub/mpack/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/mpack/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="HPND"
-KEYWORDS="amd64 x86 ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-PATCHES=( "${FILESDIR}"/${P}-filenames.patch
-	"${FILESDIR}"/${P}-usage.patch
-	"${FILESDIR}"/${P}-munpack.patch
-	# NOTE: These three patches replace <mpack-1.6-gentoo.patch>
-	"${FILESDIR}"/${P}-compile.patch
-	"${FILESDIR}"/${P}-paths.patch
-	"${FILESDIR}"/${P}-cve-2011-4919.patch
-
-	"${FILESDIR}"/${P}-clang.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README.* Changes
-}
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index ae20878212c2..7e887645a7cd 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -5,7 +5,7 @@ DIST mu-1.8.6.tar.xz 539684 BLAKE2B ea220a1a6f1fafab54574aa79638232aac4108d32c1e
 DIST mu-1.8.7.tar.xz 539664 BLAKE2B 2f0081f350c0d6da4b7920c0380a02aab42eda12062011bd03a46ceb925c179089b794b501df53b4fc84daa38e6e977a3510801685aa7c91c1c0be58c9c78929 SHA512 04c2027acec80c7569f055c8324f947862721aa36b093dba07ac80b9051229a51225e5371af7cd48fae71c9d5148bd3dc2081f591b9f733bccb5650b4853df67
 DIST mu-1.8.8.tar.xz 540092 BLAKE2B 3cd3d5f41aaf145dee66fc6d5e71256a650b16d0ee99da253d7ffc87df2e36b5fef6d19dd8831002d040c5d6ed13a53e9df69d18d7c002a05a64fb22fe32f5f5 SHA512 deb48ef7d12d76575f14e5313e9c94a40a04dc916943fa45d4281aa637b6549cbcee3cc0879b9daab51e0409cdfdc619acae12bf2ff3edaeb84fb77c3bee8982
 EBUILD mu-1.6.10.ebuild 1586 BLAKE2B d14b3421814913a85460439407fb4fc90b9537df3132520c64697a20b5b3f35fc8c658395a36d4fabf514da9964333969c4e86d1092866cc6d033732d836a168 SHA512 465f3afbb8e522ce51404d6f0de08984b680498fe322484bec0f9dd2a5740fc4405ea69a78d081d9e07fcc26520c50e3349706d830c8cc2fb5dd4539f719c15a
-EBUILD mu-1.8.5.ebuild 2102 BLAKE2B a026d31582256c907d7cbd37ffad970c7dcd83059087206913139d06ae83f5e938d3f96d17d89487d987df1ea81866e2871431f27614f528e5807444d01970d8 SHA512 eaeff846b61926dfe7f28a555d1d892679295e835e6b569c1dffbb0803320dd1dc9ebbce50c15e2b0fe2dfdff32e18f5e075a3cfb2ef24d11fbfdc319380d783
+EBUILD mu-1.8.5.ebuild 2100 BLAKE2B 1868607753cda6bfd73fc5fc194b7a957a85d2337bbe8c857e4ad23855a995db31a0024f0f544be85e4f483953b339cb0ac3cb1a67f4f266b7c714705f2ebeda SHA512 ab75544c9aabdb51200fe2b1bc67902a3b472d630db89e9419f9fef73c1e528eb3e6798769a40d0cdeb76bec6b86ced9367951a3f7edb371b31d3e79ce7215d2
 EBUILD mu-1.8.6.ebuild 2103 BLAKE2B 3def0840baba20487d6256076c9327c2762cca569af1e1c48589ee7308569f20e88aa32245b449eca9416dc4f819937f1720a0c569799d7ae29cbc7b595eb07a SHA512 f24cb94e4c8d62559a5ef824472d2684ff7b8a5239c9112c8bace36a4df6c0c38089a707bf9138928b874ef445165efd5e18bca644659fb140f1a90abb548459
 EBUILD mu-1.8.7.ebuild 2110 BLAKE2B 2b8f8b9b743c791c4f478d9b845898424f124b1db1cbab5fa8a1f06c5084882772d7df0037aefca9a0c96e0ad85ca5a9b8aa1736a6d35b2b3fb8def46fdd8ef1 SHA512 b23ab25334362138678db0133ee7251159513f2753dcb22f119f074e63ef2d7060d4ed2f5cbf0ed04555b78327c9af30dd6458fd6e9d65ab4c5e7ab362b78e17
 EBUILD mu-1.8.8.ebuild 2110 BLAKE2B 2b8f8b9b743c791c4f478d9b845898424f124b1db1cbab5fa8a1f06c5084882772d7df0037aefca9a0c96e0ad85ca5a9b8aa1736a6d35b2b3fb8def46fdd8ef1 SHA512 b23ab25334362138678db0133ee7251159513f2753dcb22f119f074e63ef2d7060d4ed2f5cbf0ed04555b78327c9af30dd6458fd6e9d65ab4c5e7ab362b78e17
diff --git a/net-mail/mu/mu-1.8.5.ebuild b/net-mail/mu/mu-1.8.5.ebuild
index 5944492e4f63..d76b9a10078f 100644
--- a/net-mail/mu/mu-1.8.5.ebuild
+++ b/net-mail/mu/mu-1.8.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~x86 ~x64-macos"
 IUSE="emacs readline"
 
 DEPEND="