reinit the tree, so we can have metadata

17 files changed, 803 insertions, 0 deletions

diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
new file mode 100644
index 000000000000..c04976ca6214
--- /dev/null
+++ b/net-mail/mailutils/Manifest
@@ -0,0 +1,21 @@
+AUX comsatd.initd 569 SHA256 04983a4c4cb4736a9a58eb15991f9fa1f9f0d36565e25762e021318f045a4e83 SHA512 9c36ddf70bf4f0e3c56f55651a740014078e3a1a79569a62ccd74e1ec7167eac6ecb69d56c15913d815c472fe943d17a1e781a669208d37c97671afea2208f8f WHIRLPOOL f357914c5fb65d17bf4df0a80af8a47855bb4439f5150069f496a7cc7a712894d1cdef0639b637ea564452c8c25621c04d01da80479bf4d430863cfb14bb8e6d
+AUX hdr.at 1400 SHA256 28354d253a10a9bf19744b2eadc7b3c890d49b37da4a3e8c85cc080d3d9e175e SHA512 f9b16a7726068b646dbde37e9c5293a0cfaa6baaa40908df3b36e125c5a06b52d946a8a0568db424009964965e90ac0d568e83345bcc9b1bce3b6f9157584b48 WHIRLPOOL ac4aa608bb0c236515b541efbc972049ba2ea553be7359a5376ccdc48bf8afbe891774876e0153c9db4b77ec953ed5ee481c5cbd071e2dc2448502602e1f7463
+AUX imap4d.initd 566 SHA256 008e9597107b28099f743245793d67148b169484b8a666eeb40b4d16cbd0b687 SHA512 51d6cf4285c6823d97e52c7eb408a80aa66376f329685acdc21e096c2099a044b2fd18e7b9e5ed89406a3cd1f16b7aa7b0243f8ea46aa7824da48b566ec00324 WHIRLPOOL 0c4e976c82b039529cb537567c5e750553238248ffaf09f370a256dff9b47040a53f2cc8ff9da126b41470db2bcaa5a327bcfe0d15dae4bcf3aac20929840822
+AUX mail 82 SHA256 639caffcadbe11530f2296cf22f155b1204b7cb51b952b868467be40fb4dfa85 SHA512 80080a3118ed66cfde44ad3663e4b07bcd5fe756b86a213ea4e1ab86e27f8485dcf02af3ee6b7f6f12105a267b9619376668e0cb6e60743ffb7664d2dbea9144 WHIRLPOOL 3205ffeb942b2d89d639baa219a2c40395ba85430aba8a347dc65b109a3a52f0e4eb3c67219bef22d6fa2adc88647eee34ebdaac694e21645d260d7a905f1c81
+AUX mailutils-2.99.98-array_bounds.patch 271 SHA256 51e146ed31205d565d6a7357de4977b02af7979e17467e31dc88210ee2fce448 SHA512 01de8bdaa7af244434fdbc5df9652f0127865d96b1e5f7b3495d4191c6dc53383d5246d8183efc913ae606b609141e9440d37afd8028278cc054840f039c5c5c WHIRLPOOL 1f6334678eabe598a622164334ff13f9e0452442b610de8b333c4e7695151985b9c3ae971f7cfe49be28462b7a895df56e48294608f9f260d0fc7a28cb08d095
+AUX mailutils-2.99.98-readline-6.3.patch 1321 SHA256 616b40e493496d8a7d9224e84b27c572c7bee51a789bbd687aa3e0f11665cd41 SHA512 cba6cd29af43b84bb9f13c6850756408e942b5cdf512f04582b3b3ae8e5532c615f8ed71cd8c19088aff4ef30f41861efab6e419d2300f99ad85f8b6abf30fa5 WHIRLPOOL 30312962f103bb2f10c43467d78a763826a1f27acf5932bb00b17f3ee0aa86f96ae0a4215c09361a3ac5ebbc76771a75688c3970b9f3a0d8403099cdfe138761
+AUX mailutils-3.2-fix-build.patch 2100 SHA256 09d29aa1853d16a6bcbe6c1440737ef035617f5b015caac53a83eb90de46c5d5 SHA512 4ec7dc7c10dfed4862c0ecb7f9b5225abc957d03760f4cfb1982e7d3076244b45ef78b85b064f3aba925a09c67ab5103b37fefd4a8f9d45efefa9d481bb15505 WHIRLPOOL fd3bc7dfb448ef48e275d813038faa98b6039b6d4c129cd0e80bd9a4bc1bcb60d280e2d3160d1100b45e9eac93caf01180d2d60c416ed3d0c3dd60924d57eb68
+AUX mailutils.rc 258 SHA256 a8618dcea1117d62e728ad8036018063a59e20bba0e6e23ce17ec9f498fa9220 SHA512 691bcc81fd355d8f2776e72006c149996273579e099f24970ff0c5dd6bdf65cd64e31597f8b3d8e0a900a91c3325b8d2a1a96682a9b3ff53acd41218fe8721fe WHIRLPOOL fb690a12d7b9687b3f9b785fab3c849b8bb8170f1c313fe5bd580bb3a9783f105da7c131d3e8fca659de01c7d6924bde42a15ab77ab88701ca373a186bb835dd
+AUX nohdr.at 1032 SHA256 679139793c3148104504d82eb8aabe9677689088a8aaa085a1d548bca69b6bee SHA512 d244044d0ccc00b23cf01235904b880e3d1e74ab2741dc41c4ab82217b019cb32d3dadae69c73c635bceabb80bccc3db5f3176a1039ee40f365277a102739eb1 WHIRLPOOL 0e58660c30e43c53c475534deccb0a0249c7fac97da9dd5475f2e9f38e03abb0328010590df3633648e68f26d7ccf35f21d40c92fd6a4a425be9de2874f110b9
+AUX pop3d.initd 563 SHA256 470db1e9b766bf9666035552b4471fa3685bf39b0b11921fe1c32087ffc967c1 SHA512 7847c29a03f21df82d36c077ccb38329457a332cccdfba24bee3b1c9a8170fc71c07ee674408f069693953dd1bf44b8b8f782dcc35d6b16e62f70b2b32ce018f WHIRLPOOL ee1fe66b85fea66b07736f64bf4159881cc4a012d5ac24af3d4b6aa3842d5c401de7c94b43783aadab5be569b61af208c9e7ffeb7726ab8e4ddd5b9ede4aa0b2
+AUX twomsg.at 2216 SHA256 2f4daa90e190f2859fbf5b2480389ca425c5b7d0e44ad3613f41f52e5e4ea296 SHA512 dc84c7b0c3ce6fb919eabaf574b63943e9e318432ea11d6b65d13caa7f978b2dab6c70413e565b49e3b7e59aa791975dcd95e9a8e24024154f7c2f4dfd4d91aa WHIRLPOOL 083e915fc92d6c38f4b59bb030c51b59f3dd16ca1be0200dde150f12bbb3164eef15992d8ae1a7e0e4888f6158a70d6ea7e20baa1f0996993b2a2e3da9b61f8c
+AUX weed.at 1100 SHA256 d08206e05e39b903f7fa171cb14ea45e0d629baf756896d62b2e2506a7ea0184 SHA512 84fa4564cb1876c1b9f1a8b143f8fc95829de5d2b02edf8894d86aa50efcdd5696d66d773737a8989ccc4ae22d4d0e2c4b7c055e281faabb82cea399150b2821 WHIRLPOOL acf6bf42d1bf5ffde5b636bc12d9acd9a04010792e55f2efd1bf79ce794316dbd8fa5742d1f32531a3568af373849cb8ea183eebfe0f7ea5bf8c8390e59ef504
+DIST mailutils-2.99.98.tar.xz 2505252 SHA256 62e2c28aed77e451e05ed15e68b5abc3932bcc3d2d6caf9b4a6864258c6a7b1a SHA512 fc20d97b3eed0f0ff7f1d7885e59f8de6ffd5b4646cd06c3636bda4a6bc9f7a0d5acdc7bb3bb573cdc80d63dfdc0be6464033ef2f6d88514bd2190f6611a1083 WHIRLPOOL c0f6f4f9dc2d60074c06a6c8f604fa4d92df4dafd6e205df8c360e97663e96c9b64a02aab9af7eab0659abc39e8aed70bbb0761b7d5a21b5873beabbcd409030
+DIST mailutils-3.1.1.tar.xz 2759000 SHA256 e5a07994924f63d8f29efe94e63ba6b110ac70b2b7f61ffa6f54ae4c9287bc21 SHA512 68a6f530935118f60503550aff925c799fee4de77377e726548f418e05687b1c8f29210bcb97e1b1033f9414bdbceeaa41e65496b0648a6356c8363554955e8c WHIRLPOOL 37c475e488f1967658e0f204cd9a47d402976f2af31566de6f9b815a4c4e1cace83a9367e8e343eb575a7128653f3e82f114c4966b1b1ac32c7512aa2246baf2
+DIST mailutils-3.2.tar.xz 2795512 SHA256 96d354e69e93d5ed6dc2e1019bc3ed3c6e322248a2c477d8fc89dbed91ed077e SHA512 48499d64da65653f996257bd920ee6574840ce9872476425c499d2af6dda5f2cd88a6dc89affba5451ab28c347308a2ae1b53ec40679289d63d74775cd722f96 WHIRLPOOL 99eb034c708dcbbc0b2dcb086ea33010c5d90b3cc8b4b7b5eba2c786d042bd5ac517a611d3f185a84084c03f16b62e8c4efd75f1be315dd19df5868d2cfff82d
+EBUILD mailutils-2.99.98-r1.ebuild 3404 SHA256 1a3da14ca7d67212ae0b74fe5ce0c89dfea03f61ca5a0544ed2bd707f40356e0 SHA512 cc5c474cf3fd9944a02b4d3cc35310af2e0b3bbead99f1a2ced78ebfacf27d187b4b30038b94e0204f5922b6528e861c14d036522622108e0f8ef36d9bcf26bb WHIRLPOOL 86fb246484632c3bba9ff018d209d2e512c668f869da7be22fd8e2804758909de3409c7597eaf754e5d360dbd5db35be901da9d2a2df887dfca90bfd516c66dd
+EBUILD mailutils-3.1.1.ebuild 3575 SHA256 a3a8f2f6878946f91853ad2989e277e90e4c7abad868778b5ad275d84b7c4b74 SHA512 3fa3501b885b254bfaf86786d67a3177f0756cb0346ba630dc9b902c851ceb708abce1057d326de769704ff50d713859f0280433b384a6f17b016a4045d05570 WHIRLPOOL efb958c29b2e8ed499997cdc5e6e4fb78a2069750077acb605a17ef828f21931a9a5e3d2a6b00fac20f15c7d530ca18def937c2898fce872a6ec1193e154c8cc
+EBUILD mailutils-3.2.ebuild 3572 SHA256 2444d17d022ceedd371f2a76906d62b2778f04d45b6758c5205a182418980ec7 SHA512 eb2de61804c2e6da6a6c704f7df7e88b6ab8682b1e023e2f47661c504a38bea4fbe391fb4fce462f6674e1de645422c0a991f4d906635d41163dd9ac7874ad03 WHIRLPOOL 884887b2ecf8a6928e5b9f3af118dc808977f9826b7f19c59b1965a798471e16634e542f5e4f8b6712c6c5de7770c90839fe655802d4167e491911a52405adb8
+MISC ChangeLog 5455 SHA256 22024cf49b78294fdbf350d540c1cbff74ded9b5ed5790552ad3063ff7940ba5 SHA512 b16a07cda1196de4eb31e60ad88a0aa9e28e43d7dd810d18269892a849ec70ebe4d1af7299a76557ef10289eade0c85cfa1fe4fc8af2ab6f622b5b70128ba7c4 WHIRLPOOL 57e8d636f52f82d34a233ceed610cdae1f84d4f73924fc2ce170cfd2c72105ca1924af35f59ab3bd7a0ff37113502597f1634ed2bcbf4cba3fbe22d8bd2cf38c
+MISC ChangeLog-2015 10533 SHA256 6005cfed69eb8d6065cbc67be396bb130ceb3a4c40427e17b5608ac72ed719cb SHA512 8351be5fb052ca348935f535ac456034fb1342871d6eb0ff3a66cd6565b33a383c197be33b6a42f0b57f15f6730f8f549f48d7a96142a124ef3f17a83651963f WHIRLPOOL 11932cba8f90b74c53f55de61748f1ca217ad5137376572d34166f19345e12bb5ce1b3fffb16b6a3e051c8e0407c2616b6d52d433b367bad1746740be1184fc0
+MISC metadata.xml 598 SHA256 11e28455f0762275ad80e82ebb26de0119b7791916fbb5a6c677185e213b6ecc SHA512 16f2b6b082da7c932457df31809c8ca1caca1f8439037f56b5751c28cf1217658ed60fd4155871d4d5d71e7040c01edbe37198dee27beeae1905da954317c8e7 WHIRLPOOL 34b3346cb70bb38e74fd021b28b21578dfa82a7b038db8ec5109b0e58a489cf8dece99cf33c970d22e7f410641c58ccc39ef8fea57b72f109b8c883791e74d0f
diff --git a/net-mail/mailutils/files/comsatd.initd b/net-mail/mailutils/files/comsatd.initd
new file mode 100644
index 000000000000..83da288a41d9
--- /dev/null
+++ b/net-mail/mailutils/files/comsatd.initd
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+
+#---------------------------------------------------------------------------
+# This script starts/stops the GNU Mailutils Comsatd
+#---------------------------------------------------------------------------
+
+daemon="GNU Mailutils Comsatd"
+exec="/usr/sbin/comsatd"
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting $daemon"
+	start-stop-daemon --start --quiet --exec ${exec} -- -d 1>&2
+	eend $? "Error starting $daemon"
+}
+
+stop() {
+	ebegin "Stopping $daemon"
+	start-stop-daemon --stop --quiet --exec ${exec} 1>&2
+	eend $? "Error stopping $daemon"
+}
diff --git a/net-mail/mailutils/files/hdr.at b/net-mail/mailutils/files/hdr.at
new file mode 100644
index 000000000000..7c9d5e85c693
--- /dev/null
+++ b/net-mail/mailutils/files/hdr.at
@@ -0,0 +1,36 @@
+# 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/imap4d.initd b/net-mail/mailutils/files/imap4d.initd
new file mode 100644
index 000000000000..39617b994d11
--- /dev/null
+++ b/net-mail/mailutils/files/imap4d.initd
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+
+#---------------------------------------------------------------------------
+# This script starts/stops the GNU Mailutils Imap4d
+#---------------------------------------------------------------------------
+
+daemon="GNU Mailutils Imap4d"
+exec="/usr/sbin/imap4d"
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting $daemon"
+	start-stop-daemon --start --quiet --exec ${exec} -- -d 1>&2
+	eend $? "Error starting $daemon"
+}
+
+stop() {
+	ebegin "Stopping $daemon"
+	start-stop-daemon --stop --quiet --exec ${exec} 1>&2
+	eend $? "Error stopping $daemon"
+}
diff --git a/net-mail/mailutils/files/mail b/net-mail/mailutils/files/mail
new file mode 100644
index 000000000000..413ca858a645
--- /dev/null
+++ b/net-mail/mailutils/files/mail
@@ -0,0 +1,5 @@
+# Sample mail config file
+# See info mail for more options
+
+# no debug
+debug { };
diff --git a/net-mail/mailutils/files/mailutils-2.99.98-array_bounds.patch b/net-mail/mailutils/files/mailutils-2.99.98-array_bounds.patch
new file mode 100644
index 000000000000..8ac418c7c037
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-2.99.98-array_bounds.patch
@@ -0,0 +1,11 @@
+--- libmu_auth/ldap.c	2012-03-25 14:02:22.000000000 +0300
++++ libmu_auth/ldap.c	2013-03-22 12:29:19.034880845 +0200
+@@ -534,7 +534,7 @@
+ 
+   env[0] = "user";
+   env[1] = key;
+-  env[3] = NULL;
++  env[2] = NULL;
+ 
+   ws.ws_env = env;
+   if (mu_wordsplit (filter_pat, &ws,
diff --git a/net-mail/mailutils/files/mailutils-2.99.98-readline-6.3.patch b/net-mail/mailutils/files/mailutils-2.99.98-readline-6.3.patch
new file mode 100644
index 000000000000..de9a487aaaf3
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-2.99.98-readline-6.3.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/503954
+
+fix build w/readline-6.3
+
+patch by Martin von Gagern
+
+--- mailutils-2.99.98/mu/shell.c
++++ mailutils-2.99.98/mu/shell.c
+@@ -336,7 +336,7 @@ mutool_initialize_readline (const char *
+ {
+   /* Allow conditional parsing of the ~/.inputrc file. */
+   rl_readline_name = (char *) name;
+-  rl_attempted_completion_function = (CPPFunction *) shell_completion;
++  rl_attempted_completion_function = shell_completion;
+   rl_getc_function = _shell_getc;
+   read_history (get_history_file_name ());
+ }
+--- mailutils-2.99.98/mail/mailline.c
++++ mailutils-2.99.98/mail/mailline.c
+@@ -93,7 +93,7 @@ ml_readline_init ()
+ 
+ #ifdef WITH_READLINE
+   rl_readline_name = "mail";
+-  rl_attempted_completion_function = (CPPFunction*)ml_command_completion;
++  rl_attempted_completion_function = ml_command_completion;
+   rl_getc_function = ml_getc;
+ #endif
+ #ifdef HAVE_SIGACTION
+--- mailutils-2.99.98/examples/nntpclient.c
++++ mailutils-2.99.98/examples/nntpclient.c
+@@ -163,7 +163,7 @@ initialize_readline ()
+   rl_readline_name = (char *) "nntp";
+ 
+   /* Tell the completer that we want a crack first. */
+-  rl_attempted_completion_function = (CPPFunction *) nntp_completion;
++  rl_attempted_completion_function = nntp_completion;
+ }
+ 
+ /* Attempt to complete on the contents of TEXT.  START and END bound the
diff --git a/net-mail/mailutils/files/mailutils-3.2-fix-build.patch b/net-mail/mailutils/files/mailutils-3.2-fix-build.patch
new file mode 100644
index 000000000000..7036cd68ca34
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.2-fix-build.patch
@@ -0,0 +1,70 @@
+From afbb33cf9ff750e93a9a4c1f51a3b62d584f056e Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Sun, 19 Mar 2017 17:31:08 +0200
+Subject: Fix a bug in field-map handling.
+
+* libmailutils/cfg/driver.c (parse_mapping): Fix expected value type.
+* libmu_auth/sql.c (get_field): Remove left-over mu_assoc_ref call
+(see 622bc770).
+---
+ NEWS                      |  2 +-
+ libmailutils/cfg/driver.c |  7 ++++++-
+ libmu_auth/sql.c          | 11 +++++++----
+ 3 files changed, 14 insertions(+), 6 deletions(-)
+
+diff --git a/libmailutils/cfg/driver.c b/libmailutils/cfg/driver.c
+index 7da75a8..8af543d 100644
+--- a/libmailutils/cfg/driver.c
++++ b/libmailutils/cfg/driver.c
+@@ -617,10 +617,15 @@ static int
+ parse_mapping (void *item, void *data)
+ {
+   struct mapping_closure *clos = data;
+-  char *str = item;
++  struct mu_config_value *cval = item;
++  char const *str;
+   size_t len;
+   char *key, *val;
+   int rc;
++
++  if (mu_cfg_assert_value_type (cval, MU_CFG_STRING))
++    return 1;
++  str = cval->v.string;
+   
+   len = strcspn (str, "=");
+   if (str[len] == 0)
+diff --git a/libmu_auth/sql.c b/libmu_auth/sql.c
+index d69c36c..c50598d 100644
+--- a/libmu_auth/sql.c
++++ b/libmu_auth/sql.c
+@@ -214,20 +214,23 @@ mu_sql_expand_query (const char *query, const char *ustr)
+ static int
+ get_field (mu_sql_connection_t conn, const char *id, char **ret, int mandatory)
+ {
+-  const char **name = mu_assoc_ref (mu_sql_module_config.field_map, id);
+-  int rc = mu_sql_get_field (conn, 0, name ? *name : id, ret);
++  int rc;
++  const char *name = mu_assoc_get (mu_sql_module_config.field_map, id);
++  if (!name)
++    name = id;
++  rc = mu_sql_get_field (conn, 0, name, ret);
+   if (rc)
+     {
+       if (mandatory || rc != MU_ERR_NOENT)
+ 	mu_error (_("cannot get SQL field `%s' (`%s'): %s"),
+-		  id, name ? *name : id, mu_strerror (rc));
++		  id, name, mu_strerror (rc));
+     }
+   else if (!*ret)
+     {
+       if (mandatory)
+ 	{
+ 	  mu_error (_("SQL field `%s' (`%s') has NULL value"),
+-		    id, name ? *name : id);
++		    id, name);
+ 	  rc = MU_ERR_READ;
+ 	}
+       else
+-- 
+cgit v1.0-41-gc330
+
diff --git a/net-mail/mailutils/files/mailutils.rc b/net-mail/mailutils/files/mailutils.rc
new file mode 100644
index 000000000000..07a551963ec3
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils.rc
@@ -0,0 +1,11 @@
+# Sample mailutils config file.  Read by all mailutils programs.
+# See info mailutils for details.
+
+# Gentoo default is maildir
+mailbox {
+  mailbox-type maildir;
+  mailbox-pattern .maildir;
+};
+
+# Place individual config files here
+include /etc/mailutils.d/;
diff --git a/net-mail/mailutils/files/nohdr.at b/net-mail/mailutils/files/nohdr.at
new file mode 100644
index 000000000000..4caf85570f1e
--- /dev/null
+++ b/net-mail/mailutils/files/nohdr.at
@@ -0,0 +1,26 @@
+# 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/pop3d.initd b/net-mail/mailutils/files/pop3d.initd
new file mode 100644
index 000000000000..dcbe9cca5024
--- /dev/null
+++ b/net-mail/mailutils/files/pop3d.initd
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+
+#---------------------------------------------------------------------------
+# This script starts/stops the GNU Mailutils Pop3d
+#---------------------------------------------------------------------------
+
+daemon="GNU Mailutils Pop3d"
+exec="/usr/sbin/pop3d"
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting $daemon"
+	start-stop-daemon --start --quiet --exec ${exec} -- -d 1>&2
+	eend $? "Error starting $daemon"
+}
+
+stop() {
+	ebegin "Stopping $daemon"
+	start-stop-daemon --stop --quiet --exec ${exec} 1>&2
+	eend $? "Error stopping $daemon"
+}
diff --git a/net-mail/mailutils/files/twomsg.at b/net-mail/mailutils/files/twomsg.at
new file mode 100644
index 000000000000..20af66173d6a
--- /dev/null
+++ b/net-mail/mailutils/files/twomsg.at
@@ -0,0 +1,73 @@
+# 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
new file mode 100644
index 000000000000..ec82c6ce23b5
--- /dev/null
+++ b/net-mail/mailutils/files/weed.at
@@ -0,0 +1,29 @@
+# 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-2.99.98-r1.ebuild b/net-mail/mailutils/mailutils-2.99.98-r1.ebuild
new file mode 100644
index 000000000000..b42056d47eff
--- /dev/null
+++ b/net-mail/mailutils/mailutils-2.99.98-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools 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"
+SRC_URI="mirror://gnu-alpha/mailutils/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos ldap mysql nls pam postgres
+python servers ssl static-libs +threads tcpd tokyocabinet"
+
+# Drop the libtool dep once libltdl goes stable.
+RDEPEND="!mail-client/nmh
+	!mail-filter/libsieve
+	!mail-client/mailx
+	!mail-client/nail
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
+	virtual/mta
+	berkdb? ( sys-libs/db:= )
+	bidi? ( dev-libs/fribidi )
+	gdbm? ( sys-libs/gdbm )
+	guile? ( dev-scheme/guile:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	nls? ( sys-devel/gettext )
+	pam? ( virtual/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} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Disable bytecompilation of Python modules.
+	echo "#!/bin/sh" > build-aux/py-compile
+	epatch "${FILESDIR}/${P}-array_bounds.patch"
+	epatch "${FILESDIR}/${P}-readline-6.3.patch" #503954
+	if use mysql; then
+		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
+			sql/Makefile.am || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# maildir is the Gentoo default
+	# but fails tests. So set it in config file instead.
+	#econf MU_DEFAULT_SCHEME=maildir \
+	econf 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_enable servers build-servers) \
+		$(use_enable clients build-clients) \
+		--with-mail-spool=/var/spool/mail \
+		--with-readline \
+		--enable-sendmail \
+		--disable-debug \
+		--disable-rpath
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc
+	doins "${FILESDIR}/mailutils.rc"
+	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
+
+	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
+
+	# compatibility link
+	use clients && dosym /usr/bin/mail /bin/mail
+
+	use static-libs || find "${D}" -name "*.la" -delete
+}
diff --git a/net-mail/mailutils/mailutils-3.1.1.ebuild b/net-mail/mailutils/mailutils-3.1.1.ebuild
new file mode 100644
index 000000000000..cce58d02ff36
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.1.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools 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"
+SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap \
+	mysql nls pam postgres python servers 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 )
+	gdbm? ( sys-libs/gdbm )
+	guile? ( dev-scheme/guile:= )
+	kerberos? ( virtual/krb5 )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	nls? ( sys-devel/gettext )
+	pam? ( virtual/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}/${PN}-2.99.98-readline-6.3.patch" #503954
+	# bug 567976
+	sed -i -e /AM_GNU_GETTEXT_VERSION/s/0.18/0.19/ configure.ac || die
+	# 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) \
+		--with-mail-spool=/var/spool/mail \
+		--with-readline \
+		--enable-sendmail \
+		--disable-debug \
+		--disable-rpath
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc
+	doins "${FILESDIR}/mailutils.rc"
+	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
+
+	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
+
+	# compatibility link
+	use clients && dosym /usr/bin/mail /bin/mail
+
+	use static-libs || find "${D}" -name "*.la" -delete
+}
diff --git a/net-mail/mailutils/mailutils-3.2.ebuild b/net-mail/mailutils/mailutils-3.2.ebuild
new file mode 100644
index 000000000000..c06e69e20eee
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools 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"
+SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap \
+	mysql nls pam postgres python servers 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 )
+	gdbm? ( sys-libs/gdbm )
+	guile? ( dev-scheme/guile:= )
+	kerberos? ( virtual/krb5 )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	nls? ( sys-devel/gettext )
+	pam? ( virtual/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
+	# bug 567976
+	sed -i -e /AM_GNU_GETTEXT_VERSION/s/0.18/0.19/ configure.ac || die
+	# 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
+	# bug #612712
+	eapply "${FILESDIR}"/${P}-fix-build.patch
+	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) \
+		--with-mail-spool=/var/spool/mail \
+		--with-readline \
+		--enable-sendmail \
+		--disable-debug \
+		--disable-rpath
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc
+	doins "${FILESDIR}/mailutils.rc"
+	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
+
+	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
+
+	# compatibility link
+	use clients && dosym /usr/bin/mail /bin/mail
+
+	use static-libs || find "${D}" -name "*.la" -delete
+}
diff --git a/net-mail/mailutils/metadata.xml b/net-mail/mailutils/metadata.xml
new file mode 100644
index 000000000000..c54e413ee7d7
--- /dev/null
+++ b/net-mail/mailutils/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>net-mail@gentoo.org</email>
+  <name>Net-Mail</name>
+</maintainer>
+<use>
+  <flag name="tokyocabinet">Enable Tokyo Cabinet database support</flag>
+  <flag name="kyotocabinet">Enable Kyoto Cabinet database support</flag>
+  <flag name="clients">Build client programs - frm maidag mail sieve messages readmsg dotlock movemail mimeview mh</flag>
+  <flag name="servers">Build server programs - imap4d pop3d comsatd</flag>
+</use>
+</pkgmetadata>